Skip to content

Commit

Permalink
style: prettier format
Browse files Browse the repository at this point in the history
  • Loading branch information
u3u committed Jul 1, 2023
1 parent 3bcbdc9 commit 88d1054
Show file tree
Hide file tree
Showing 18 changed files with 77 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
module.exports = {
extends: ['@u3u'],
ignorePatterns: ['dist', '__fixtures__'],
}
};
4 changes: 2 additions & 2 deletions src/base.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineConfig } from './utils'
import { defineConfig } from './utils';

export default defineConfig({
endOfLine: 'lf',
Expand All @@ -7,4 +7,4 @@ export default defineConfig({
singleQuote: true,
tabWidth: 2,
useTabs: false,
} as const)
} as const);
12 changes: 6 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { getPackageInfoSync } from 'local-pkg'
import base from './base'
import { defineConfig } from './utils'
import { require } from './utils/require'
import { getPackageInfoSync } from 'local-pkg';
import base from './base';
import { defineConfig } from './utils';
import { require } from './utils/require';

const typescript = getPackageInfoSync('typescript')
const typescript = getPackageInfoSync('typescript');

export default defineConfig({
...base,
Expand Down Expand Up @@ -47,4 +47,4 @@ export default defineConfig({
require.resolve('@shufo/prettier-plugin-blade'),
require.resolve('prettier-plugin-prisma'),
],
})
});
6 changes: 3 additions & 3 deletions src/tw.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { extendConfig } from './utils'
import { require } from './utils/require'
import { extendConfig } from './utils';
import { require } from './utils/require';

export default extendConfig({
plugins: [require.resolve('prettier-plugin-tailwindcss')],
tailwindAttributes: ['tw'],
tailwindFunctions: ['clsx', 'tw', 'twMerge', 'twJoin'],
})
});
8 changes: 4 additions & 4 deletions src/twin.macro.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import config from '.'
import { defineConfig } from './utils'
import { require } from './utils/require'
import config from '.';
import { defineConfig } from './utils';
import { require } from './utils/require';

export default defineConfig({
...config,
plugins: [require.resolve('./with-twin.macro'), ...config.plugins.slice(1)],
})
});
6 changes: 3 additions & 3 deletions src/types/prettier-plugin-sort-imports.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
declare module '@ianvs/prettier-plugin-sort-imports' {
import { type Plugin } from 'prettier'
import { type Plugin } from 'prettier';

const sortImportsPlugin: Required<Plugin>
const sortImportsPlugin: Required<Plugin>;

export default sortImportsPlugin
export default sortImportsPlugin;
}
6 changes: 3 additions & 3 deletions src/types/prettier-plugin-twin.macro.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
declare module 'prettier-plugin-twin.macro' {
import { type Plugin } from 'prettier'
import { type Plugin } from 'prettier';

const tailwindPlugin: Required<Plugin>
const tailwindPlugin: Required<Plugin>;

export default tailwindPlugin
export default tailwindPlugin;
}
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './utils/index'
export * from './utils/index';
4 changes: 2 additions & 2 deletions src/utils/define-config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { type Config } from 'prettier'
import { type Config } from 'prettier';

export const defineConfig = <T extends Config>(config: T) => config
export const defineConfig = <T extends Config>(config: T) => config;
4 changes: 2 additions & 2 deletions src/utils/define-plugin.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { type Plugin } from 'prettier'
import { type Plugin } from 'prettier';

export const definePlugin = <T extends Plugin>(plugin: T) => plugin
export const definePlugin = <T extends Plugin>(plugin: T) => plugin;
10 changes: 5 additions & 5 deletions src/utils/extend-config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import deepmerge from 'deepmerge'
import { type Config } from 'prettier'
import config from '..'
import deepmerge from 'deepmerge';
import { type Config } from 'prettier';
import config from '..';

export const extendConfig = <T extends Config | typeof config>(userConfig: T, options?: deepmerge.Options) => {
return deepmerge(config, userConfig, options)
}
return deepmerge(config, userConfig, options);
};
8 changes: 4 additions & 4 deletions src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export * from './define-config'
export * from './define-plugin'
export * from './extend-config'
export * from './with-sort-plugin'
export * from './define-config';
export * from './define-plugin';
export * from './extend-config';
export * from './with-sort-plugin';
4 changes: 2 additions & 2 deletions src/utils/require.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { createRequire } from 'node:module'
import { createRequire } from 'node:module';

export const require = createRequire(import.meta.url)
export const require = createRequire(import.meta.url);
14 changes: 7 additions & 7 deletions src/utils/with-sort-plugin.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { type Plugin } from 'prettier'
import { mapValues } from 'remeda'
import { definePlugin } from './define-plugin'
import { require } from './require'
import { type Plugin } from 'prettier';
import { mapValues } from 'remeda';
import { definePlugin } from './define-plugin';
import { require } from './require';

export const withSortPlugin = (plugin: Required<Pick<Plugin, 'parsers'>>) => {
const sortImportsPlugin = require('@ianvs/prettier-plugin-sort-imports')
const sortImportsPlugin = require('@ianvs/prettier-plugin-sort-imports');

return definePlugin({
options: {
Expand All @@ -17,5 +17,5 @@ export const withSortPlugin = (plugin: Required<Pick<Plugin, 'parsers'>>) => {
preprocess: sortImportsPlugin.parsers[key].preprocess,
})),
},
} as const)
}
} as const);
};
6 changes: 3 additions & 3 deletions src/with-twin.macro.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { withSortPlugin } from './utils'
import { require } from './utils/require'
import { withSortPlugin } from './utils';
import { require } from './utils/require';

export default withSortPlugin(require('prettier-plugin-twin.macro'))
export default withSortPlugin(require('prettier-plugin-twin.macro'));
26 changes: 13 additions & 13 deletions test/format.ts
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import fs from 'node:fs/promises'
import path from 'node:path'
import prettier from 'prettier'
import { require } from '../src/utils/require'
import fs from 'node:fs/promises';
import path from 'node:path';
import prettier from 'prettier';
import { require } from '../src/utils/require';

export const format = async (file: string, config = '@u3u/prettier-config') => {
const filepath = path.resolve('test/__fixtures__', file)
const options = await prettier.resolveConfig('', { config: require.resolve(config) })
const filepath = path.resolve('test/__fixtures__', file);
const options = await prettier.resolveConfig('', { config: require.resolve(config) });

const info = await prettier.getFileInfo(filepath, {
// https://github.com/prettier/prettier-vscode/blob/d5ac67aa66822641491039a53dbe6388e5cd2594/src/PrettierEditService.ts#L420
plugins: options?.plugins?.filter((item): item is string => typeof item === 'string'),
resolveConfig: true,
})
});

console.log(file, info)
console.log(file, info);

const buffer = await fs.readFile(filepath)
const code = buffer.toString('utf8')
const buffer = await fs.readFile(filepath);
const code = buffer.toString('utf8');

const result = prettier.format(code, {
...options,
filepath,
parser: info.inferredParser || undefined,
})
});

return result
}
return result;
};
28 changes: 14 additions & 14 deletions test/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
import path from 'node:path'
import { globby } from 'globby'
import { expect, it } from 'vitest'
import { format } from './format'
import path from 'node:path';
import { globby } from 'globby';
import { expect, it } from 'vitest';
import { format } from './format';

it('should match snapshots', async () => {
const paths = await globby('*', {
cwd: 'test/__fixtures__',
dot: true,
ignore: ['tw.ts', 'twin.macro.ts'],
})
});

for (const filepath of paths) {
const result = await format(filepath)
const result = await format(filepath);

expect(result).toMatchSnapshot(path.basename(filepath))
expect(result).toMatchSnapshot(path.basename(filepath));
}
})
});

it('tailwindcss classes should sorted', async () => {
const result = await format('tw.ts', '@u3u/prettier-config/tw')
const result = await format('tw.ts', '@u3u/prettier-config/tw');

expect(result).toMatchSnapshot()
})
expect(result).toMatchSnapshot();
});

it('twin.macro classes should sorted', async () => {
const result = await format('twin.macro.ts', '@u3u/prettier-config/twin.macro')
const result = await format('twin.macro.ts', '@u3u/prettier-config/twin.macro');

expect(result).toMatchSnapshot()
})
expect(result).toMatchSnapshot();
});
4 changes: 2 additions & 2 deletions tsup.config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { defineConfig } from 'tsup'
import { defineConfig } from 'tsup';

export default defineConfig({
clean: true,
dts: { resolve: true },
entry: ['src/*.ts'],
format: ['cjs', 'esm'],
shims: true,
})
});

0 comments on commit 88d1054

Please sign in to comment.