happy-css-modules 0.3.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (77) hide show
  1. package/README.md +95 -48
  2. package/dist/cli.js +42 -4
  3. package/dist/cli.js.map +1 -1
  4. package/dist/cli.test.js +21 -0
  5. package/dist/cli.test.js.map +1 -1
  6. package/dist/emitter/dts.js +9 -1
  7. package/dist/emitter/dts.js.map +1 -1
  8. package/dist/index.d.ts +3 -2
  9. package/dist/index.js +2 -0
  10. package/dist/index.js.map +1 -1
  11. package/dist/integration-test/go-to-definition.test.js +9 -8
  12. package/dist/integration-test/go-to-definition.test.js.map +1 -1
  13. package/dist/loader/index.test.js +79 -1
  14. package/dist/loader/index.test.js.map +1 -1
  15. package/dist/loader/postcss.d.ts +5 -1
  16. package/dist/loader/postcss.js +26 -30
  17. package/dist/loader/postcss.js.map +1 -1
  18. package/dist/resolver/index.d.ts +3 -1
  19. package/dist/resolver/index.js +17 -14
  20. package/dist/resolver/index.js.map +1 -1
  21. package/dist/resolver/webpack-resolver.d.ts +23 -1
  22. package/dist/resolver/webpack-resolver.js +82 -59
  23. package/dist/resolver/webpack-resolver.js.map +1 -1
  24. package/dist/resolver/webpack-resolver.test.js +70 -7
  25. package/dist/resolver/webpack-resolver.test.js.map +1 -1
  26. package/dist/runner.d.ts +25 -0
  27. package/dist/runner.js +30 -12
  28. package/dist/runner.js.map +1 -1
  29. package/dist/runner.test.js +62 -11
  30. package/dist/runner.test.js.map +1 -1
  31. package/dist/test/tsserver.d.ts +10 -6
  32. package/dist/test/tsserver.js +94 -85
  33. package/dist/test/tsserver.js.map +1 -1
  34. package/dist/test/util.d.ts +1 -1
  35. package/dist/test/util.js +15 -8
  36. package/dist/test/util.js.map +1 -1
  37. package/dist/transformer/index.d.ts +3 -1
  38. package/dist/transformer/index.js +15 -9
  39. package/dist/transformer/index.js.map +1 -1
  40. package/dist/transformer/index.test.d.ts +1 -0
  41. package/dist/transformer/index.test.js +66 -0
  42. package/dist/transformer/index.test.js.map +1 -0
  43. package/dist/transformer/less-transformer.js +1 -2
  44. package/dist/transformer/less-transformer.js.map +1 -1
  45. package/dist/transformer/less-transformer.test.js +6 -6
  46. package/dist/transformer/postcss-transformer.d.ts +12 -0
  47. package/dist/transformer/postcss-transformer.js +32 -0
  48. package/dist/transformer/postcss-transformer.js.map +1 -0
  49. package/dist/transformer/postcss-transformer.test.d.ts +1 -0
  50. package/dist/transformer/postcss-transformer.test.js +176 -0
  51. package/dist/transformer/postcss-transformer.test.js.map +1 -0
  52. package/dist/transformer/scss-transformer.js +19 -64
  53. package/dist/transformer/scss-transformer.js.map +1 -1
  54. package/dist/transformer/scss-transformer.test.js +8 -8
  55. package/package.json +6 -3
  56. package/src/cli.test.ts +29 -0
  57. package/src/cli.ts +41 -4
  58. package/src/emitter/dts.ts +10 -1
  59. package/src/index.ts +8 -2
  60. package/src/integration-test/go-to-definition.test.ts +10 -8
  61. package/src/loader/index.test.ts +79 -1
  62. package/src/loader/postcss.ts +42 -40
  63. package/src/resolver/index.ts +21 -12
  64. package/src/resolver/webpack-resolver.test.ts +100 -8
  65. package/src/resolver/webpack-resolver.ts +111 -57
  66. package/src/runner.test.ts +67 -11
  67. package/src/runner.ts +56 -13
  68. package/src/test/tsserver.ts +106 -129
  69. package/src/test/util.ts +15 -9
  70. package/src/transformer/index.test.ts +71 -0
  71. package/src/transformer/index.ts +18 -8
  72. package/src/transformer/less-transformer.test.ts +6 -6
  73. package/src/transformer/less-transformer.ts +1 -2
  74. package/src/transformer/postcss-transformer.test.ts +188 -0
  75. package/src/transformer/postcss-transformer.ts +57 -0
  76. package/src/transformer/scss-transformer.test.ts +8 -8
  77. package/src/transformer/scss-transformer.ts +25 -78
@@ -1,10 +1,13 @@
1
1
  import { readFile, writeFile } from 'fs/promises';
2
+ import { randomUUID } from 'node:crypto';
3
+ import { createRequire } from 'node:module';
2
4
  import { jest } from '@jest/globals';
3
5
  import chalk from 'chalk';
4
6
  import dedent from 'dedent';
5
7
  import AggregateError from 'es-aggregate-error';
6
8
  import { run } from './runner.js';
7
9
  import { createFixtures, exists, getFixturePath, waitForAsyncTask } from './test/util.js';
10
+ const require = createRequire(import.meta.url);
8
11
  // eslint-disable-next-line @typescript-eslint/no-empty-function
9
12
  const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => { });
10
13
  const defaultOptions = {
@@ -77,9 +80,9 @@ test('returns an error if the file fails to process in non-watch mode', async ()
77
80
  // The error is logged to console.error.
78
81
  expect(consoleErrorSpy).toHaveBeenCalledTimes(2);
79
82
  // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
80
- expect(consoleErrorSpy).toHaveBeenNthCalledWith(1, chalk.red('[Error] ' + error.errors[0]));
83
+ expect(consoleErrorSpy).toHaveBeenNthCalledWith(1, chalk.red('[Error] ' + error.errors[0].stack));
81
84
  // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
82
- expect(consoleErrorSpy).toHaveBeenNthCalledWith(2, chalk.red('[Error] ' + error.errors[1]));
85
+ expect(consoleErrorSpy).toHaveBeenNthCalledWith(2, chalk.red('[Error] ' + error.errors[1].stack));
83
86
  // The valid files are emitted.
84
87
  expect(await exists(getFixturePath('/test/1.css.d.ts'))).toBe(true);
85
88
  expect(await exists(getFixturePath('/test/1.css.d.ts.map'))).toBe(true);
@@ -105,15 +108,63 @@ describe('handles external files', () => {
105
108
  test('treats imported tokens from external files the same as local tokens', async () => {
106
109
  await run({ ...defaultOptions });
107
110
  expect(await readFile(getFixturePath('/test/1.css.d.ts'), 'utf8')).toMatchInlineSnapshot(`
108
- "declare const styles:
109
- & Readonly<Pick<(typeof import("./2.css"))["default"], "b">>
110
- & Readonly<{ "c": string }>
111
- & Readonly<{ "a": string }>
112
- ;
113
- export default styles;
114
- //# sourceMappingURL=./1.css.d.ts.map
115
- "
116
- `);
111
+ "declare const styles:
112
+ & Readonly<Pick<(typeof import("./2.css"))["default"], "b">>
113
+ & Readonly<{ "c": string }>
114
+ & Readonly<{ "a": string }>
115
+ ;
116
+ export default styles;
117
+ //# sourceMappingURL=./1.css.d.ts.map
118
+ "
119
+ `);
117
120
  });
118
121
  });
122
+ test('sassLoadPaths', async () => {
123
+ const sassLoadPaths = ['test/relative'];
124
+ createFixtures({
125
+ '/test/1.scss': dedent `
126
+ @import '2.scss';
127
+ `,
128
+ '/test/relative/2.scss': `.a { dummy: ''; }`,
129
+ });
130
+ await run({ ...defaultOptions, sassLoadPaths }); // not throw
131
+ });
132
+ test('lessIncludePaths', async () => {
133
+ const lessIncludePaths = ['test/relative'];
134
+ createFixtures({
135
+ '/test/1.less': dedent `
136
+ @import '2.less';
137
+ `,
138
+ '/test/relative/2.less': `.a { dummy: ''; }`,
139
+ });
140
+ await run({ ...defaultOptions, lessIncludePaths }); // not throw
141
+ });
142
+ test('webpackResolveAlias', async () => {
143
+ const webpackResolveAlias = { '@relative': 'test/relative' };
144
+ createFixtures({
145
+ '/test/1.less': dedent `
146
+ @import '@relative/2.less';
147
+ `,
148
+ '/test/relative/2.less': `.a { dummy: ''; }`,
149
+ });
150
+ await run({ ...defaultOptions, webpackResolveAlias }); // not throw
151
+ });
152
+ test('postcssConfig', async () => {
153
+ const uuid = randomUUID();
154
+ const postcssConfig = `${uuid}/postcss.config.js`;
155
+ createFixtures({
156
+ [`/${uuid}/postcss.config.js`]: dedent `
157
+ module.exports = {
158
+ plugins: [
159
+ require('${require.resolve('postcss-simple-vars')}'),
160
+ ],
161
+ };
162
+ `,
163
+ '/test/1.css': dedent `
164
+ $prefix: foo;
165
+ .$(prefix)_bar {}
166
+ `,
167
+ });
168
+ await run({ ...defaultOptions, postcssConfig }); // not throw
169
+ });
119
170
  //# sourceMappingURL=runner.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"runner.test.js","sourceRoot":"","sources":["../src/runner.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"runner.test.js","sourceRoot":"","sources":["../src/runner.test.ts"],"names":[],"mappings":"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"}
@@ -18,10 +18,14 @@ declare type Definition = {
18
18
  offset: number;
19
19
  };
20
20
  };
21
- export declare function getIdentifierDefinitions(filePath: string, identifier: string): Promise<Definition[]>;
22
- export declare function getMultipleIdentifierDefinitions(filePath: string, identifiers: string[]): Promise<{
23
- identifier: string;
24
- definitions: Definition[];
25
- }[]>;
26
- export declare function getModuleDefinitions(filePath: string): Promise<Definition[]>;
21
+ export declare function createTSServer(): Promise<{
22
+ getIdentifierDefinitions(filePath: string, identifier: string): Promise<Definition[]>;
23
+ getMultipleIdentifierDefinitions(filePath: string, identifiers: string[]): Promise<{
24
+ identifier: string;
25
+ definitions: Definition[];
26
+ }[]>;
27
+ getModuleDefinitions(filePath: string): Promise<Definition[]>;
28
+ refreshCache(): Promise<void>;
29
+ exit: () => Promise<void>;
30
+ }>;
27
31
  export {};
@@ -1,104 +1,113 @@
1
1
  import { readFileSync } from 'fs';
2
+ import { mkdir, writeFile as nativeWriteFile } from 'fs/promises';
3
+ import { dirname } from 'path';
2
4
  import { fileURLToPath } from 'url';
5
+ import { promisify } from 'util';
3
6
  import serverHarness from '@typescript/server-harness';
7
+ import _glob from 'glob';
4
8
  import { resolve } from 'import-meta-resolve';
5
9
  import lineColumn from 'line-column';
6
10
  import { getFixturePath } from './util.js';
7
- export async function getIdentifierDefinitions(filePath, identifier) {
8
- const results = await getMultipleIdentifierDefinitions(filePath, [identifier]);
9
- return results[0].definitions;
11
+ const glob = promisify(_glob);
12
+ async function writeFile(path, content) {
13
+ await mkdir(dirname(path), { recursive: true });
14
+ return nativeWriteFile(path, content, 'utf8');
10
15
  }
11
- export async function getMultipleIdentifierDefinitions(filePath, identifiers) {
16
+ export async function createTSServer() {
12
17
  const server = serverHarness.launchServer(fileURLToPath(await resolve('typescript/lib/tsserver.js', import.meta.url)), [
13
18
  // ATA generates some extra network traffic and isn't usually relevant when profiling
14
19
  '--disableAutomaticTypingAcquisition',
15
20
  ]);
16
- const tmpFilePath = getFixturePath('/server-harness/tmp.ts');
17
- const tmpFileContent = [
18
- `import styles from '${filePath}';`,
19
- ...identifiers.map((identifier) => `styles.${identifier};`),
20
- ].join('\n');
21
- await server.message({
22
- type: 'request',
23
- command: 'updateOpen',
24
- arguments: {
25
- changedFiles: [],
26
- closedFiles: [],
27
- openFiles: [
28
- {
21
+ return {
22
+ async getIdentifierDefinitions(filePath, identifier) {
23
+ const results = await this.getMultipleIdentifierDefinitions(filePath, [identifier]);
24
+ return results[0].definitions;
25
+ },
26
+ async getMultipleIdentifierDefinitions(filePath, identifiers) {
27
+ const tmpFilePath = getFixturePath('/server-harness/tmp.ts');
28
+ const tmpFileContent = [
29
+ `import styles from '${filePath}';`,
30
+ ...identifiers.map((identifier) => `styles.${identifier};`),
31
+ ].join('\n');
32
+ await writeFile(tmpFilePath, tmpFileContent);
33
+ await this.refreshCache();
34
+ const results = [];
35
+ for (let i = 0; i < identifiers.length; i++) {
36
+ const response = await server.message({
37
+ seq: 0,
38
+ type: 'request',
39
+ command: 'definition',
40
+ arguments: {
41
+ file: tmpFilePath,
42
+ line: i + 2,
43
+ offset: 8, // column, 1-based
44
+ },
45
+ });
46
+ const definitions = response.body.map((definition) => {
47
+ const { file, start, end } = definition;
48
+ const fileContent = readFileSync(file, 'utf-8');
49
+ const startIndex = lineColumn(fileContent).toIndex(start.line, start.offset);
50
+ const endIndex = lineColumn(fileContent).toIndex(end.line, end.offset);
51
+ const text = fileContent.slice(startIndex, endIndex);
52
+ return { file, text, start, end };
53
+ });
54
+ results.push({ identifier: identifiers[i], definitions });
55
+ }
56
+ return results;
57
+ },
58
+ async getModuleDefinitions(filePath) {
59
+ await this.refreshCache();
60
+ const tmpFilePath = getFixturePath('/server-harness/tmp.ts');
61
+ const tmpFileContent = `import styles from '${filePath}';`;
62
+ await writeFile(tmpFilePath, tmpFileContent);
63
+ await this.refreshCache();
64
+ const response = await server.message({
65
+ seq: 0,
66
+ type: 'request',
67
+ command: 'definition',
68
+ arguments: {
29
69
  file: tmpFilePath,
30
- fileContent: tmpFileContent,
31
- projectRootPath: getFixturePath('/server-harness'),
32
- scriptKindName: 'TS', // It's easy to get this wrong when copy-pasting
70
+ line: 1,
71
+ offset: 20, // column, 1-based
33
72
  },
34
- ],
73
+ });
74
+ const definitions = response.body.map((definition) => {
75
+ const { file, start, end } = definition;
76
+ const fileContent = readFileSync(file, 'utf-8');
77
+ const startIndex = lineColumn(fileContent).toIndex(start.line, start.offset);
78
+ const endIndex = lineColumn(fileContent).toIndex(end.line, end.offset);
79
+ const text = fileContent.slice(startIndex, endIndex);
80
+ return { file, text, start, end };
81
+ });
82
+ return definitions;
35
83
  },
36
- });
37
- const results = [];
38
- for (let i = 0; i < identifiers.length; i++) {
39
- const response = await server.message({
40
- type: 'request',
41
- command: 'definition',
42
- arguments: {
43
- file: tmpFilePath,
44
- line: i + 2,
45
- offset: 8, // column, 1-based
46
- },
47
- });
48
- const definitions = response.body.map((definition) => {
49
- const { file, start, end } = definition;
50
- const fileContent = readFileSync(file, 'utf-8');
51
- const startIndex = lineColumn(fileContent).toIndex(start.line, start.offset);
52
- const endIndex = lineColumn(fileContent).toIndex(end.line, end.offset);
53
- const text = fileContent.slice(startIndex, endIndex);
54
- return { file, text, start, end };
55
- });
56
- results.push({ identifier: identifiers[i], definitions });
57
- }
58
- await server.message({ command: 'exit' });
59
- return results;
60
- }
61
- export async function getModuleDefinitions(filePath) {
62
- const server = serverHarness.launchServer(fileURLToPath(await resolve('typescript/lib/tsserver.js', import.meta.url)), [
63
- // ATA generates some extra network traffic and isn't usually relevant when profiling
64
- '--disableAutomaticTypingAcquisition',
65
- ]);
66
- const tmpFilePath = getFixturePath('/server-harness/tmp.ts');
67
- const tmpFileContent = `import styles from '${filePath}';`;
68
- await server.message({
69
- type: 'request',
70
- command: 'updateOpen',
71
- arguments: {
72
- changedFiles: [],
73
- closedFiles: [],
74
- openFiles: [
75
- {
76
- file: tmpFilePath,
77
- fileContent: tmpFileContent,
78
- projectRootPath: getFixturePath('/server-harness'),
79
- scriptKindName: 'TS', // It's easy to get this wrong when copy-pasting
84
+ async refreshCache() {
85
+ // tsserver caches the contents of opened files.
86
+ // When a file is updated, its cache remains with the old content.
87
+ // Therefore we need to overwrite the cache with the latest content.
88
+ const fixtureFilePaths = await glob(getFixturePath('/**/*.ts'), { dot: true });
89
+ // latest contents
90
+ const openFiles = fixtureFilePaths.map((filePath) => ({
91
+ file: filePath,
92
+ fileContent: readFileSync(filePath, 'utf-8'),
93
+ projectRootPath: getFixturePath('/server-harness'),
94
+ scriptKindName: 'TS', // It's easy to get this wrong when copy-pasting
95
+ }));
96
+ // override the cache
97
+ await server.message({
98
+ seq: 0,
99
+ type: 'request',
100
+ command: 'updateOpen',
101
+ arguments: {
102
+ changedFiles: [],
103
+ closedFiles: [],
104
+ openFiles,
80
105
  },
81
- ],
106
+ });
82
107
  },
83
- });
84
- const response = await server.message({
85
- type: 'request',
86
- command: 'definition',
87
- arguments: {
88
- file: tmpFilePath,
89
- line: 1,
90
- offset: 20, // column, 1-based
108
+ exit: async () => {
109
+ await server.message({ command: 'exit' });
91
110
  },
92
- });
93
- const definitions = response.body.map((definition) => {
94
- const { file, start, end } = definition;
95
- const fileContent = readFileSync(file, 'utf-8');
96
- const startIndex = lineColumn(fileContent).toIndex(start.line, start.offset);
97
- const endIndex = lineColumn(fileContent).toIndex(end.line, end.offset);
98
- const text = fileContent.slice(startIndex, endIndex);
99
- return { file, text, start, end };
100
- });
101
- await server.message({ command: 'exit' });
102
- return definitions;
111
+ };
103
112
  }
104
113
  //# sourceMappingURL=tsserver.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tsserver.js","sourceRoot":"","sources":["../../src/test/tsserver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tsserver.js","sourceRoot":"","sources":["../../src/test/tsserver.ts"],"names":[],"mappings":"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"}
@@ -13,7 +13,7 @@ export declare function fakeToken(args: {
13
13
  name: Token['name'];
14
14
  originalLocations: {
15
15
  filePath?: Location['filePath'];
16
- start: Location['start'];
16
+ start?: Location['start'];
17
17
  }[];
18
18
  }): Token;
19
19
  export declare function waitForAsyncTask(ms?: number): Promise<void>;
package/dist/test/util.js CHANGED
@@ -21,14 +21,21 @@ export function createComposesDeclarations(root) {
21
21
  export function fakeToken(args) {
22
22
  return {
23
23
  name: args.name,
24
- originalLocations: args.originalLocations.map((location) => ({
25
- filePath: location.filePath ?? getFixturePath('/test/1.css'),
26
- start: location.start,
27
- end: {
28
- line: location.start.line,
29
- column: location.start.column + args.name.length - 1,
30
- },
31
- })),
24
+ originalLocations: args.originalLocations.map((location) => {
25
+ if (location.filePath === undefined || location.start === undefined) {
26
+ return { filePath: undefined, start: undefined, end: undefined };
27
+ }
28
+ else {
29
+ return {
30
+ filePath: location.filePath ?? getFixturePath('/test/1.css'),
31
+ start: location.start,
32
+ end: {
33
+ line: location.start.line,
34
+ column: location.start.column + args.name.length - 1,
35
+ },
36
+ };
37
+ }
38
+ }),
32
39
  };
33
40
  }
34
41
  export async function waitForAsyncTask(ms) {
@@ -1 +1 @@
1
- {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/test/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,IAAI,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,OAAgE,MAAM,SAAS,CAAC;AAEvF,OAAO,EAAc,YAAY,EAAiB,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CACrC,YAAY,CAAC,MAAM,EAAE,CAAC,EACtB,4BAA4B,EAC5B,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAE,CAC/B,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,IAAa;IACpD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,gBAAgB,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAU;IACxC,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAU;IAC7C,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAU;IACnD,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC,oBAAoB,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAGzB;IACC,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC3D,QAAQ,EAAE,QAAQ,CAAC,QAAQ,IAAI,cAAc,CAAC,aAAa,CAAC;YAC5D,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,GAAG,EAAE;gBACH,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI;gBACzB,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;aACrD;SACF,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAW;IAChD,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,IAAY;IACvC,IAAI;QACF,MAAM,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAUD,SAAS,MAAM,CAAC,IAAmB;IACjC,OAAO,OAAO,IAAI,KAAK,QAAQ,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAqB;IAClD,SAAS,kBAAkB,CAAC,KAAqB,EAAE,OAAe;QAChE,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAChD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACjC,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;gBAChB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC9C,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;oBAC5B,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBAC3B;aACF;iBAAM;gBACL,SAAS,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACrC,kBAAkB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;aAChC;SACF;IACH,CAAC;IACD,cAAc,EAAE,CAAC;IACjB,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,2DAA2D;IACzE,kBAAkB,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,cAAc;IAC5B,MAAM,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,IAAY;IACzC,OAAO,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC"}
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/test/util.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
2
  import type { StrictlyResolver } from '../loader/index.js';
3
+ import type { PostcssTransformerOptions } from './postcss-transformer.js';
3
4
  /**
4
5
  * The value returned from the transformer.
5
6
  * `false` means to skip transpiling on that file.
@@ -25,4 +26,5 @@ export declare type TransformerOptions = {
25
26
  /** The function to transform source code. */
26
27
  export declare type Transformer = (source: string, options: TransformerOptions) => TransformResult | Promise<TransformResult>;
27
28
  export declare const handleImportError: (packageName: string) => (e: unknown) => never;
28
- export declare const createDefaultTransformer: () => Transformer;
29
+ export declare type DefaultTransformerOptions = PostcssTransformerOptions;
30
+ export declare const createDefaultTransformer: (defaultTransformerOptions?: DefaultTransformerOptions) => Transformer;
@@ -1,19 +1,25 @@
1
1
  import { createLessTransformer } from './less-transformer.js';
2
+ import { createPostcssTransformer } from './postcss-transformer.js';
2
3
  import { createScssTransformer } from './scss-transformer.js';
3
4
  export const handleImportError = (packageName) => (e) => {
4
5
  console.error(`${packageName} import failed. Did you forget to \`npm install -D ${packageName}\`?`);
5
6
  throw e;
6
7
  };
7
- export const createDefaultTransformer = () => async (source, options) => {
8
+ export const createDefaultTransformer = (defaultTransformerOptions) => {
8
9
  const scssTransformer = createScssTransformer();
9
10
  const lessTransformer = createLessTransformer();
10
- if (options.from.endsWith('.scss')) {
11
- return scssTransformer(source, options);
12
- }
13
- else if (options.from.endsWith('.less')) {
14
- return lessTransformer(source, options);
15
- }
16
- // TODO: support postcss
17
- return false;
11
+ const postcssTransformer = createPostcssTransformer(defaultTransformerOptions);
12
+ return async (source, options) => {
13
+ if (options.from.endsWith('.scss')) {
14
+ return scssTransformer(source, options);
15
+ }
16
+ else if (options.from.endsWith('.less')) {
17
+ return lessTransformer(source, options);
18
+ }
19
+ else {
20
+ // TODO: Support multi-stage transformations by sass and less.
21
+ return postcssTransformer(source, options);
22
+ }
23
+ };
18
24
  };
19
25
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transformer/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AA+B9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,WAAmB,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE;IACvE,OAAO,CAAC,KAAK,CAAC,GAAG,WAAW,sDAAsD,WAAW,KAAK,CAAC,CAAC;IACpG,MAAM,CAAC,CAAC;AACV,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAsB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;IACzF,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAClC,OAAO,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACzC;SAAM,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACzC,OAAO,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACzC;IACD,wBAAwB;IACxB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/transformer/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AA+B9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,WAAmB,EAAE,EAAE,CAAC,CAAC,CAAU,EAAE,EAAE;IACvE,OAAO,CAAC,KAAK,CAAC,GAAG,WAAW,sDAAsD,WAAW,KAAK,CAAC,CAAC;IACpG,MAAM,CAAC,CAAC;AACV,CAAC,CAAC;AAIF,MAAM,CAAC,MAAM,wBAAwB,GAA2E,CAC9G,yBAAyB,EACzB,EAAE;IACF,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,MAAM,eAAe,GAAG,qBAAqB,EAAE,CAAC;IAChD,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,yBAAyB,CAAC,CAAC;IAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC/B,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAClC,OAAO,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACzC;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACzC,OAAO,eAAe,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACzC;aAAM;YACL,8DAA8D;YAC9D,OAAO,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAC5C;IACH,CAAC,CAAC;AACJ,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ export {};
@@ -0,0 +1,66 @@
1
+ import { randomUUID } from 'node:crypto';
2
+ import { createRequire } from 'node:module';
3
+ import dedent from 'dedent';
4
+ import { Loader } from '../loader/index.js';
5
+ import { createFixtures, getFixturePath } from '../test/util.js';
6
+ import { createDefaultTransformer } from './index.js';
7
+ const require = createRequire(import.meta.url);
8
+ const cwd = getFixturePath('/');
9
+ const loader = new Loader({ transformer: createDefaultTransformer({ cwd }) });
10
+ test('processes .scss with scss transformer', async () => {
11
+ createFixtures({
12
+ '/test/1.scss': dedent `
13
+ .a {
14
+ // scss feature test (nesting)
15
+ .a_1 { dummy: ''; }
16
+ }
17
+ `,
18
+ });
19
+ const result = await loader.load(getFixturePath('/test/1.scss'));
20
+ expect(result.tokens.map((token) => token.name)).toStrictEqual(['a', 'a_1']);
21
+ });
22
+ test('processes .less with less transformer', async () => {
23
+ createFixtures({
24
+ '/test/1.less': dedent `
25
+ .a {
26
+ // less feature test (nesting)
27
+ .a_1 { dummy: ''; }
28
+ }
29
+ `,
30
+ });
31
+ const result = await loader.load(getFixturePath('/test/1.less'));
32
+ expect(result.tokens.map((token) => token.name)).toStrictEqual(['a', 'a_1']);
33
+ });
34
+ test('processes .css with postcss transformer if postcssrc is found', async () => {
35
+ // if postcssrc is not found
36
+ const loader1 = new Loader({ transformer: createDefaultTransformer() });
37
+ createFixtures({
38
+ '/test/1.css': dedent `
39
+ $prefix: foo;
40
+ .$(prefix)_bar {}
41
+ `,
42
+ });
43
+ const result1 = await loader1.load(getFixturePath('/test/1.css'));
44
+ expect(result1.tokens.map((token) => token.name)).toStrictEqual(['$(prefix)']);
45
+ // if postcssrc is found
46
+ const uuid = randomUUID();
47
+ const loader2 = new Loader({
48
+ transformer: createDefaultTransformer({ cwd, postcssConfig: `${uuid}/postcss.config.js` }),
49
+ });
50
+ createFixtures({
51
+ [`/${uuid}/postcss.config.js`]: dedent `
52
+ module.exports = {
53
+ plugins: [
54
+ require('${require.resolve('postcss-simple-vars')}'),
55
+ ],
56
+ };
57
+ `,
58
+ '/test/1.css': dedent `
59
+ $prefix: foo;
60
+ .$(prefix)_bar {}
61
+ `,
62
+ });
63
+ const result2 = await loader2.load(getFixturePath('/test/1.css'));
64
+ expect(result2.tokens.map((token) => token.name)).toStrictEqual(['foo_bar']);
65
+ });
66
+ //# sourceMappingURL=index.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../src/transformer/index.test.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { handleImportError } from './index.js';
2
- // eslint-disable-next-line @typescript-eslint/naming-convention, @typescript-eslint/consistent-type-imports
2
+ // eslint-disable-next-line @typescript-eslint/naming-convention
3
3
  function createLessPluginResolver(Less, options) {
4
4
  class ResolverFileManager extends Less.FileManager {
5
5
  constructor(options) {
@@ -29,7 +29,6 @@ function createLessPluginResolver(Less, options) {
29
29
  return new LessPluginResolver(options);
30
30
  }
31
31
  export const createLessTransformer = () => {
32
- // eslint-disable-next-line @typescript-eslint/consistent-type-imports
33
32
  let less;
34
33
  return async (source, options) => {
35
34
  less ??= (await import('less').catch(handleImportError('less'))).default;
@@ -1 +1 @@
1
- {"version":3,"file":"less-transformer.js","sourceRoot":"","sources":["../../src/transformer/less-transformer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,4GAA4G;AAC5G,SAAS,wBAAwB,CAAC,IAA2B,EAAE,OAA2B;IACxF,MAAM,mBAAoB,SAAQ,IAAI,CAAC,WAAW;QAEhD,YAAY,OAA2B;YACrC,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;QACe,QAAQ;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QACe,KAAK,CAAC,QAAQ,CAC5B,QAAgB,EAChB,gBAAwB,EACxB,OAA6B,EAC7B,WAA6B;YAE7B,mDAAmD;YACnD,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC;gBAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;YAEjF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;YACtF,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAC1E,CAAC;KACF;IAED,MAAM,kBAAkB;QAEtB,YAAY,OAA2B;YAMhC,eAAU,GAA6B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YALtD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;QACM,OAAO,CAAC,IAAgB,EAAE,aAAiC;YAChE,aAAa,CAAC,cAAc,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,CAAC;KAEF;IAED,OAAO,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAsB,GAAG,EAAE;IAC3D,sEAAsE;IACtE,IAAI,IAA2B,CAAC;IAChC,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC/B,IAAI,KAAK,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvC,QAAQ,EAAE,OAAO,CAAC,IAAI;YACtB,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClD,UAAU,EAAE,KAAK,EAAE,6CAA6C;SACjE,CAAC,CAAC;QACH,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"less-transformer.js","sourceRoot":"","sources":["../../src/transformer/less-transformer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,gEAAgE;AAChE,SAAS,wBAAwB,CAAC,IAA2B,EAAE,OAA2B;IACxF,MAAM,mBAAoB,SAAQ,IAAI,CAAC,WAAW;QAEhD,YAAY,OAA2B;YACrC,KAAK,EAAE,CAAC;YACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;QACe,QAAQ;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QACe,KAAK,CAAC,QAAQ,CAC5B,QAAgB,EAChB,gBAAwB,EACxB,OAA6B,EAC7B,WAA6B;YAE7B,mDAAmD;YACnD,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC;gBAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;YAEjF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,CAAC,CAAC;YACtF,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;QAC1E,CAAC;KACF;IAED,MAAM,kBAAkB;QAEtB,YAAY,OAA2B;YAMhC,eAAU,GAA6B,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YALtD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;QACM,OAAO,CAAC,IAAgB,EAAE,aAAiC;YAChE,aAAa,CAAC,cAAc,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QACtE,CAAC;KAEF;IAED,OAAO,IAAI,kBAAkB,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAsB,GAAG,EAAE;IAC3D,IAAI,IAA2B,CAAC;IAChC,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC/B,IAAI,KAAK,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QACzE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACvC,QAAQ,EAAE,OAAO,CAAC,IAAI;YACtB,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAClD,UAAU,EAAE,KAAK,EAAE,6CAA6C;SACjE,CAAC,CAAC;QACH,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IAC5E,CAAC,CAAC;AACJ,CAAC,CAAC"}