happy-css-modules 3.0.0 → 3.0.1
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.
- package/dist/integration-test/go-to-definition.test.js +0 -35
- package/dist/integration-test/go-to-definition.test.js.map +1 -1
- package/dist/locator/index.d.ts +1 -1
- package/dist/locator/index.js +2 -17
- package/dist/locator/index.js.map +1 -1
- package/dist/locator/index.test.js +23 -119
- package/dist/locator/index.test.js.map +1 -1
- package/dist/locator/postcss.d.ts +1 -12
- package/dist/locator/postcss.js +3 -42
- package/dist/locator/postcss.js.map +1 -1
- package/dist/locator/postcss.test.js +7 -53
- package/dist/locator/postcss.test.js.map +1 -1
- package/dist/test-util/util.d.ts +1 -2
- package/dist/test-util/util.js +0 -3
- package/dist/test-util/util.js.map +1 -1
- package/dist/transformer/less-transformer.test.js +1 -9
- package/dist/transformer/less-transformer.test.js.map +1 -1
- package/dist/transformer/scss-transformer.test.js +1 -9
- package/dist/transformer/scss-transformer.test.js.map +1 -1
- package/dist/util.js +1 -1
- package/dist/util.js.map +1 -1
- package/package.json +1 -1
- package/src/integration-test/go-to-definition.test.ts +0 -35
- package/src/locator/index.test.ts +23 -124
- package/src/locator/index.ts +3 -24
- package/src/locator/postcss.test.ts +7 -74
- package/src/locator/postcss.ts +3 -44
- package/src/test-util/util.ts +1 -5
- package/src/transformer/less-transformer.test.ts +1 -9
- package/src/transformer/scss-transformer.test.ts +1 -9
- package/src/util.ts +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import dedent from 'dedent';
|
|
2
|
-
import { createRoot, createClassSelectors, createAtImports,
|
|
3
|
-
import { generateLocalTokenNames, getOriginalLocation, parseAtImport,
|
|
2
|
+
import { createRoot, createClassSelectors, createAtImports, createFixtures } from '../test-util/util.js';
|
|
3
|
+
import { generateLocalTokenNames, getOriginalLocation, parseAtImport, collectNodes } from './postcss.js';
|
|
4
4
|
describe('generateLocalTokenNames', () => {
|
|
5
5
|
test('basic', async () => {
|
|
6
6
|
expect(await generateLocalTokenNames(createRoot(`
|
|
@@ -24,10 +24,6 @@ describe('generateLocalTokenNames', () => {
|
|
|
24
24
|
.local_class_name_3 {}
|
|
25
25
|
}
|
|
26
26
|
:local(.local_class_name_4) {}
|
|
27
|
-
.composes_target {}
|
|
28
|
-
.composes {
|
|
29
|
-
composes: composes_target;
|
|
30
|
-
}
|
|
31
27
|
`))).toStrictEqual([
|
|
32
28
|
'basic',
|
|
33
29
|
'cascading',
|
|
@@ -45,8 +41,6 @@ describe('generateLocalTokenNames', () => {
|
|
|
45
41
|
'local_class_name_2',
|
|
46
42
|
'local_class_name_3',
|
|
47
43
|
'local_class_name_4',
|
|
48
|
-
'composes_target',
|
|
49
|
-
'composes',
|
|
50
44
|
]);
|
|
51
45
|
});
|
|
52
46
|
test('does not track styles imported by @import in other file because it is not a local token', async () => {
|
|
@@ -155,17 +149,6 @@ describe('getOriginalLocation', () => {
|
|
|
155
149
|
expect(getOriginalLocation(local_class_name_3.rule, local_class_name_3.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 4, column: 3 }, end: { line: 4, column: 21 } }`);
|
|
156
150
|
expect(getOriginalLocation(local_class_name_4.rule, local_class_name_4.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 6, column: 8 }, end: { line: 6, column: 26 } }`);
|
|
157
151
|
});
|
|
158
|
-
test('composes', () => {
|
|
159
|
-
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
160
|
-
const [composes_target, composes] = createClassSelectors(createRoot(dedent `
|
|
161
|
-
.composes_target {}
|
|
162
|
-
.composes {
|
|
163
|
-
composes: composes_target;
|
|
164
|
-
}
|
|
165
|
-
`));
|
|
166
|
-
expect(getOriginalLocation(composes_target.rule, composes_target.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 16 } }`);
|
|
167
|
-
expect(getOriginalLocation(composes.rule, composes.classSelector)).toMatchInlineSnapshot(`{ filePath: "/test/test.css", start: { line: 2, column: 1 }, end: { line: 2, column: 9 } }`);
|
|
168
|
-
});
|
|
169
152
|
test('with_newline', () => {
|
|
170
153
|
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
171
154
|
const [with_newline_1, with_newline_2, with_newline_3] = createClassSelectors(createRoot(dedent `
|
|
@@ -183,21 +166,18 @@ test('collectNodes', () => {
|
|
|
183
166
|
@import;
|
|
184
167
|
@import "test.css";
|
|
185
168
|
@ignored;
|
|
186
|
-
.a { ignored: "ignored";
|
|
187
|
-
.b { ignored: "ignored";
|
|
169
|
+
.a { ignored: "ignored"; }
|
|
170
|
+
.b { ignored: "ignored"; }
|
|
188
171
|
`);
|
|
189
|
-
const { atImports, classSelectors
|
|
172
|
+
const { atImports, classSelectors } = collectNodes(ast);
|
|
190
173
|
expect(atImports).toHaveLength(2);
|
|
191
174
|
expect(atImports[0].toString()).toEqual('@import');
|
|
192
175
|
expect(atImports[1].toString()).toEqual('@import "test.css"');
|
|
193
176
|
expect(classSelectors).toHaveLength(2);
|
|
194
|
-
expect(classSelectors[0].rule.toString()).toEqual('.a { ignored: "ignored";
|
|
177
|
+
expect(classSelectors[0].rule.toString()).toEqual('.a { ignored: "ignored"; }');
|
|
195
178
|
expect(classSelectors[0].classSelector.toString()).toEqual('.a');
|
|
196
|
-
expect(classSelectors[1].rule.toString()).toEqual('.b { ignored: "ignored";
|
|
179
|
+
expect(classSelectors[1].rule.toString()).toEqual('.b { ignored: "ignored"; }');
|
|
197
180
|
expect(classSelectors[1].classSelector.toString()).toEqual('.b');
|
|
198
|
-
expect(composesDeclarations).toHaveLength(2);
|
|
199
|
-
expect(composesDeclarations[0].toString()).toEqual('composes: a');
|
|
200
|
-
expect(composesDeclarations[1].toString()).toEqual('composes: b');
|
|
201
181
|
});
|
|
202
182
|
test('parseAtImport', () => {
|
|
203
183
|
const atImports = createAtImports(createRoot(dedent `
|
|
@@ -213,30 +193,4 @@ test('parseAtImport', () => {
|
|
|
213
193
|
expect(parseAtImport(atImports[3])).toBe('test.css');
|
|
214
194
|
expect(parseAtImport(atImports[4])).toBe('test.css');
|
|
215
195
|
});
|
|
216
|
-
test('parseComposesDeclarationWithFromUrl', () => {
|
|
217
|
-
const composesDeclarations = createComposesDeclarations(createRoot(dedent `
|
|
218
|
-
.a {
|
|
219
|
-
composes: a;
|
|
220
|
-
composes: a b c;
|
|
221
|
-
composes: a from "test.css";
|
|
222
|
-
composes: a b c from "test.css";
|
|
223
|
-
composes: from from from from "test.css";
|
|
224
|
-
/* NOTE: CSS Modules do not support '... from url("test.css")'. */
|
|
225
|
-
}
|
|
226
|
-
`));
|
|
227
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[0])).toStrictEqual(undefined);
|
|
228
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[1])).toStrictEqual(undefined);
|
|
229
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[2])).toStrictEqual({
|
|
230
|
-
from: 'test.css',
|
|
231
|
-
tokenNames: ['a'],
|
|
232
|
-
});
|
|
233
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[3])).toStrictEqual({
|
|
234
|
-
from: 'test.css',
|
|
235
|
-
tokenNames: ['a', 'b', 'c'],
|
|
236
|
-
});
|
|
237
|
-
expect(parseComposesDeclarationWithFromUrl(composesDeclarations[4])).toStrictEqual({
|
|
238
|
-
from: 'test.css',
|
|
239
|
-
tokenNames: ['from', 'from', 'from'], // do not deduplicate.
|
|
240
|
-
});
|
|
241
|
-
});
|
|
242
196
|
//# sourceMappingURL=postcss.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postcss.test.js","sourceRoot":"","sources":["../../src/locator/postcss.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"postcss.test.js","sourceRoot":"","sources":["../../src/locator/postcss.test.ts"],"names":[],"mappings":"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"}
|
package/dist/test-util/util.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Root, type Rule, type AtRule
|
|
1
|
+
import { type Root, type Rule, type AtRule } from 'postcss';
|
|
2
2
|
import { type ClassName } from 'postcss-selector-parser';
|
|
3
3
|
import { type Token, type Location } from '../locator/index.js';
|
|
4
4
|
export declare const FIXTURE_DIR_PATH: string;
|
|
@@ -8,7 +8,6 @@ export declare function createClassSelectors(root: Root): {
|
|
|
8
8
|
rule: Rule;
|
|
9
9
|
classSelector: ClassName;
|
|
10
10
|
}[];
|
|
11
|
-
export declare function createComposesDeclarations(root: Root): Declaration[];
|
|
12
11
|
export declare function fakeToken(args: {
|
|
13
12
|
name: Token['name'];
|
|
14
13
|
originalLocations: {
|
package/dist/test-util/util.js
CHANGED
|
@@ -15,9 +15,6 @@ export function createAtImports(root) {
|
|
|
15
15
|
export function createClassSelectors(root) {
|
|
16
16
|
return collectNodes(root).classSelectors;
|
|
17
17
|
}
|
|
18
|
-
export function createComposesDeclarations(root) {
|
|
19
|
-
return collectNodes(root).composesDeclarations;
|
|
20
|
-
}
|
|
21
18
|
export function fakeToken(args) {
|
|
22
19
|
return {
|
|
23
20
|
name: args.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/test-util/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,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/test-util/util.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,6 @@ test('handles less features', async () => {
|
|
|
20
20
|
&_2 { dummy: ''; }
|
|
21
21
|
.b_1();
|
|
22
22
|
.b_2();
|
|
23
|
-
composes: a_1; // css module feature test (composes)
|
|
24
|
-
composes: c from './3.less'; // css module feature test (composes from other file)
|
|
25
23
|
}
|
|
26
24
|
`,
|
|
27
25
|
'/test/2.less': dedent `
|
|
@@ -36,7 +34,7 @@ test('handles less features', async () => {
|
|
|
36
34
|
// FIXME: The end position of 'a_2_2' is incorrect.
|
|
37
35
|
expect(result).toMatchInlineSnapshot(`
|
|
38
36
|
{
|
|
39
|
-
dependencies: ["<fixtures>/test/2.less"
|
|
37
|
+
dependencies: ["<fixtures>/test/2.less"],
|
|
40
38
|
tokens: [
|
|
41
39
|
{
|
|
42
40
|
name: "b_1",
|
|
@@ -68,12 +66,6 @@ test('handles less features', async () => {
|
|
|
68
66
|
{ filePath: "<fixtures>/test/1.less", start: { line: 7, column: 3 }, end: { line: 7, column: 8 } },
|
|
69
67
|
],
|
|
70
68
|
},
|
|
71
|
-
{
|
|
72
|
-
name: "c",
|
|
73
|
-
originalLocations: [
|
|
74
|
-
{ filePath: "<fixtures>/test/3.less", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
75
|
-
],
|
|
76
|
-
},
|
|
77
69
|
],
|
|
78
70
|
}
|
|
79
71
|
`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"less-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/less-transformer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,WAAW,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;AACtE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAE5C,SAAS,CAAC,GAAG,EAAE;IACb,OAAO,CAAC,SAAS,EAAE,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACvC,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA
|
|
1
|
+
{"version":3,"file":"less-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/less-transformer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,8 +19,6 @@ test('handles sass features', async () => {
|
|
|
19
19
|
// sass feature test (nesting)
|
|
20
20
|
.a_2_1 { dummy: ''; }
|
|
21
21
|
&_2 { dummy: ''; }
|
|
22
|
-
composes: a_1; // css module feature test (composes)
|
|
23
|
-
composes: d from './4.scss'; // css module feature test (composes from other file)
|
|
24
22
|
}
|
|
25
23
|
`,
|
|
26
24
|
'/test/2.scss': dedent `
|
|
@@ -41,7 +39,7 @@ test('handles sass features', async () => {
|
|
|
41
39
|
// FIXME: The end position of 'a_2_2' is incorrect.
|
|
42
40
|
expect(result).toMatchInlineSnapshot(`
|
|
43
41
|
{
|
|
44
|
-
dependencies: ["<fixtures>/test/2.scss", "<fixtures>/test/3.scss"
|
|
42
|
+
dependencies: ["<fixtures>/test/2.scss", "<fixtures>/test/3.scss"],
|
|
45
43
|
tokens: [
|
|
46
44
|
{
|
|
47
45
|
name: "b_1",
|
|
@@ -80,12 +78,6 @@ test('handles sass features', async () => {
|
|
|
80
78
|
{ filePath: "<fixtures>/test/1.scss", start: { line: 8, column: 3 }, end: { line: 8, column: 8 } },
|
|
81
79
|
],
|
|
82
80
|
},
|
|
83
|
-
{
|
|
84
|
-
name: "d",
|
|
85
|
-
originalLocations: [
|
|
86
|
-
{ filePath: "<fixtures>/test/4.scss", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
87
|
-
],
|
|
88
|
-
},
|
|
89
81
|
],
|
|
90
82
|
}
|
|
91
83
|
`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AACrC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,WAAW,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;AACtE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;AAE5C,SAAS,CAAC,GAAG,EAAE;IACb,OAAO,CAAC,SAAS,EAAE,CAAC;AACtB,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IACvC,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA
|
|
1
|
+
{"version":3,"file":"scss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.test.ts"],"names":[],"mappings":"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"}
|
package/dist/util.js
CHANGED
|
@@ -49,7 +49,7 @@ export async function exists(path) {
|
|
|
49
49
|
}
|
|
50
50
|
}
|
|
51
51
|
export function isMatchByGlob(filePath, pattern, options) {
|
|
52
|
-
return minimatch(filePath, join(options.cwd, pattern));
|
|
52
|
+
return minimatch(filePath, join(options.cwd, pattern), { windowsPathsNoEscape: true });
|
|
53
53
|
}
|
|
54
54
|
export function getPackageJson() {
|
|
55
55
|
return JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf-8'));
|
package/dist/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAUtC,MAAM,UAAU,aAAa,CAAC,KAAc;IAC1C,OAAO,CACL,QAAQ,CAAC,KAAK,CAAC;QACf,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC;QAC7B,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;QAC3B,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC;QAClC,KAAK,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO;QAClC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;QACtB,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAC/B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,KAAc;IACrC,OAAO,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,UAAU,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC;AACtF,CAAC;AAED,MAAM,UAAU,OAAO,CAAmB,GAAW,EAAE,IAAO;IAC5D,OAAO,IAAI,IAAI,GAAG,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,MAAM,CAAI,KAAU;IAClC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,QAAQ,CAAO,GAAQ,EAAE,EAAgB;IACvD,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,IAAI,GAAG,IAAI,GAAG,EAAK,CAAC;IAC1B,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACnB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACd,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,EAAU;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,oCAAoC;IACpC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,EAAE,EAAE,CAAC,CAAA,CAAC;AACpC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,IAAY;IACvC,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAgB,EAAE,OAAe,EAAE,OAAwB;IACvF,OAAO,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -41,10 +41,6 @@ test('basic', async () => {
|
|
|
41
41
|
.local_class_name_3 {}
|
|
42
42
|
}
|
|
43
43
|
:local(.local_class_name_4) {}
|
|
44
|
-
.composes_target {}
|
|
45
|
-
.composes {
|
|
46
|
-
composes: composes_target;
|
|
47
|
-
}
|
|
48
44
|
`,
|
|
49
45
|
});
|
|
50
46
|
await run({ ...defaultOptions });
|
|
@@ -65,8 +61,6 @@ test('basic', async () => {
|
|
|
65
61
|
'local_class_name_2',
|
|
66
62
|
'local_class_name_3',
|
|
67
63
|
'local_class_name_4',
|
|
68
|
-
'composes_target',
|
|
69
|
-
'composes',
|
|
70
64
|
]);
|
|
71
65
|
// FIXME: Fix an issue where the text at definition destination was incorrect.
|
|
72
66
|
expect(results).toMatchInlineSnapshot(`
|
|
@@ -208,23 +202,6 @@ test('basic', async () => {
|
|
|
208
202
|
],
|
|
209
203
|
"identifier": "local_class_name_4",
|
|
210
204
|
},
|
|
211
|
-
{
|
|
212
|
-
"definitions": [
|
|
213
|
-
{
|
|
214
|
-
file: "<fixtures>/test/1.css",
|
|
215
|
-
text: ".composes_target ",
|
|
216
|
-
start: { line: 21, offset: 1 },
|
|
217
|
-
end: { line: 21, offset: 18 },
|
|
218
|
-
},
|
|
219
|
-
],
|
|
220
|
-
"identifier": "composes_target",
|
|
221
|
-
},
|
|
222
|
-
{
|
|
223
|
-
"definitions": [
|
|
224
|
-
{ file: "<fixtures>/test/1.css", text: ".composes ", start: { line: 22, offset: 1 }, end: { line: 22, offset: 11 } },
|
|
225
|
-
],
|
|
226
|
-
"identifier": "composes",
|
|
227
|
-
},
|
|
228
205
|
]
|
|
229
206
|
`);
|
|
230
207
|
const moduleDefinitions = await server.getModuleDefinitions(getFixturePath('/test/1.css'));
|
|
@@ -295,8 +272,6 @@ test('with transformer', async () => {
|
|
|
295
272
|
// sass feature test (nesting)
|
|
296
273
|
.nesting_1 { dummy: ''; }
|
|
297
274
|
&_2 { dummy: ''; }
|
|
298
|
-
composes: basic; // css module feature test (composes)
|
|
299
|
-
composes: d from './4.scss'; // css module feature test (composes from other file)
|
|
300
275
|
}
|
|
301
276
|
`,
|
|
302
277
|
'/test/2.scss': dedent`
|
|
@@ -306,9 +281,6 @@ test('with transformer', async () => {
|
|
|
306
281
|
'/test/3.scss': dedent`
|
|
307
282
|
.c { dummy: ''; }
|
|
308
283
|
`,
|
|
309
|
-
'/test/4.scss': dedent`
|
|
310
|
-
.d { dummy: ''; }
|
|
311
|
-
`,
|
|
312
284
|
});
|
|
313
285
|
await run({ ...defaultOptions });
|
|
314
286
|
const results = await server.getMultipleIdentifierDefinitions(getFixturePath(`/test/1.scss`), [
|
|
@@ -319,7 +291,6 @@ test('with transformer', async () => {
|
|
|
319
291
|
'b_1',
|
|
320
292
|
'b_2',
|
|
321
293
|
'c',
|
|
322
|
-
'd',
|
|
323
294
|
]);
|
|
324
295
|
expect(results).toMatchInlineSnapshot(`
|
|
325
296
|
[
|
|
@@ -364,12 +335,6 @@ test('with transformer', async () => {
|
|
|
364
335
|
],
|
|
365
336
|
"identifier": "c",
|
|
366
337
|
},
|
|
367
|
-
{
|
|
368
|
-
"definitions": [
|
|
369
|
-
{ file: "<fixtures>/test/4.scss", text: ".d ", start: { line: 1, offset: 1 }, end: { line: 1, offset: 4 } },
|
|
370
|
-
],
|
|
371
|
-
"identifier": "d",
|
|
372
|
-
},
|
|
373
338
|
]
|
|
374
339
|
`);
|
|
375
340
|
});
|
|
@@ -1,29 +1,13 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { readFile, writeFile } from 'fs/promises';
|
|
2
2
|
import { randomUUID } from 'node:crypto';
|
|
3
3
|
import { jest } from '@jest/globals';
|
|
4
4
|
import dedent from 'dedent';
|
|
5
|
-
import { createDefaultTransformer } from '../index.js';
|
|
6
|
-
import { createFixtures,
|
|
5
|
+
import { Locator, createDefaultTransformer } from '../index.js';
|
|
6
|
+
import { createFixtures, getFixturePath } from '../test-util/util.js';
|
|
7
7
|
import { sleepSync } from '../util.js';
|
|
8
8
|
|
|
9
|
-
const readFileSpy = jest.spyOn(fs, 'readFile');
|
|
10
|
-
// In ESM, for some reason, we need to explicitly mock module
|
|
11
|
-
jest.unstable_mockModule('fs/promises', () => ({
|
|
12
|
-
...fs, // Inherit native functions (e.g., fs.stat)
|
|
13
|
-
readFile: readFileSpy,
|
|
14
|
-
}));
|
|
15
|
-
|
|
16
|
-
// After the mock of fs/promises is complete, . /index.js after the mock of fs/promises is complete.
|
|
17
|
-
// ref: https://www.coolcomputerclub.com/posts/jest-hoist-await/
|
|
18
|
-
const { Locator } = await import('./index.js');
|
|
19
|
-
// NOTE: ../test/util.js depends on . /index.js, so it must also be imported dynamically...
|
|
20
|
-
|
|
21
9
|
const locator = new Locator();
|
|
22
10
|
|
|
23
|
-
afterEach(() => {
|
|
24
|
-
readFileSpy.mockClear();
|
|
25
|
-
});
|
|
26
|
-
|
|
27
11
|
test('basic', async () => {
|
|
28
12
|
createFixtures({
|
|
29
13
|
'/test/1.css': dedent`
|
|
@@ -117,30 +101,22 @@ test('tracks other files when `@import` is present', async () => {
|
|
|
117
101
|
`);
|
|
118
102
|
});
|
|
119
103
|
|
|
120
|
-
test('
|
|
104
|
+
test('does not track other files by `composes`', async () => {
|
|
121
105
|
createFixtures({
|
|
122
106
|
'/test/1.css': dedent`
|
|
123
107
|
.a {
|
|
124
108
|
composes: b from './2.css';
|
|
125
|
-
composes: c
|
|
126
|
-
composes: e from '${getFixturePath('/test/4.css')}';
|
|
109
|
+
composes: c from './3.css'; /* non-existent file */
|
|
127
110
|
}
|
|
128
111
|
`,
|
|
129
112
|
'/test/2.css': dedent`
|
|
130
113
|
.b {}
|
|
131
114
|
`,
|
|
132
|
-
'/test/3.css': dedent`
|
|
133
|
-
.c {}
|
|
134
|
-
.d {}
|
|
135
|
-
`,
|
|
136
|
-
'/test/4.css': dedent`
|
|
137
|
-
.e {}
|
|
138
|
-
`,
|
|
139
115
|
});
|
|
140
116
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
141
117
|
expect(result).toMatchInlineSnapshot(`
|
|
142
118
|
{
|
|
143
|
-
dependencies: [
|
|
119
|
+
dependencies: [],
|
|
144
120
|
tokens: [
|
|
145
121
|
{
|
|
146
122
|
name: "a",
|
|
@@ -148,30 +124,6 @@ test('tracks other files when `composes` is present', async () => {
|
|
|
148
124
|
{ filePath: "<fixtures>/test/1.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
149
125
|
],
|
|
150
126
|
},
|
|
151
|
-
{
|
|
152
|
-
name: "b",
|
|
153
|
-
originalLocations: [
|
|
154
|
-
{ filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
155
|
-
],
|
|
156
|
-
},
|
|
157
|
-
{
|
|
158
|
-
name: "c",
|
|
159
|
-
originalLocations: [
|
|
160
|
-
{ filePath: "<fixtures>/test/3.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
161
|
-
],
|
|
162
|
-
},
|
|
163
|
-
{
|
|
164
|
-
name: "d",
|
|
165
|
-
originalLocations: [
|
|
166
|
-
{ filePath: "<fixtures>/test/3.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
|
|
167
|
-
],
|
|
168
|
-
},
|
|
169
|
-
{
|
|
170
|
-
name: "e",
|
|
171
|
-
originalLocations: [
|
|
172
|
-
{ filePath: "<fixtures>/test/4.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
173
|
-
],
|
|
174
|
-
},
|
|
175
127
|
],
|
|
176
128
|
}
|
|
177
129
|
`);
|
|
@@ -183,14 +135,7 @@ test('normalizes tokens', async () => {
|
|
|
183
135
|
/* duplicate import */
|
|
184
136
|
@import './2.css';
|
|
185
137
|
@import '2.css';
|
|
186
|
-
.a {
|
|
187
|
-
/* duplicate composes */
|
|
188
|
-
composes: c from './3.css';
|
|
189
|
-
composes: c from '3.css';
|
|
190
|
-
composes: c c from './3.css';
|
|
191
|
-
/* duplicate import and composes */
|
|
192
|
-
composes: b from './2.css';
|
|
193
|
-
}
|
|
138
|
+
.a {}
|
|
194
139
|
.a {} /* duplicate class selector */
|
|
195
140
|
`,
|
|
196
141
|
'/test/2.css': dedent`
|
|
@@ -204,14 +149,14 @@ test('normalizes tokens', async () => {
|
|
|
204
149
|
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
205
150
|
expect(result).toMatchInlineSnapshot(`
|
|
206
151
|
{
|
|
207
|
-
dependencies: ["<fixtures>/test/2.css"
|
|
152
|
+
dependencies: ["<fixtures>/test/2.css"],
|
|
208
153
|
tokens: [
|
|
209
154
|
{
|
|
210
155
|
name: "a",
|
|
211
156
|
originalLocations: [
|
|
212
157
|
{ filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
213
158
|
{ filePath: "<fixtures>/test/1.css", start: { line: 4, column: 1 }, end: { line: 4, column: 2 } },
|
|
214
|
-
{ filePath: "<fixtures>/test/1.css", start: { line:
|
|
159
|
+
{ filePath: "<fixtures>/test/1.css", start: { line: 5, column: 1 }, end: { line: 5, column: 2 } },
|
|
215
160
|
],
|
|
216
161
|
},
|
|
217
162
|
{
|
|
@@ -220,27 +165,16 @@ test('normalizes tokens', async () => {
|
|
|
220
165
|
{ filePath: "<fixtures>/test/2.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
|
|
221
166
|
],
|
|
222
167
|
},
|
|
223
|
-
{
|
|
224
|
-
name: "c",
|
|
225
|
-
originalLocations: [
|
|
226
|
-
{ filePath: "<fixtures>/test/3.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
|
|
227
|
-
],
|
|
228
|
-
},
|
|
229
168
|
],
|
|
230
169
|
}
|
|
231
170
|
`);
|
|
232
171
|
});
|
|
233
172
|
|
|
234
|
-
test
|
|
173
|
+
test('returns the result from the cache when the file has not been modified', async () => {
|
|
235
174
|
createFixtures({
|
|
236
175
|
'/test/1.css': dedent`
|
|
237
176
|
@import './2.css';
|
|
238
|
-
@import './
|
|
239
|
-
.a {
|
|
240
|
-
composes: b from './2.css';
|
|
241
|
-
composes: c from './3.css';
|
|
242
|
-
composes: d from './3.css';
|
|
243
|
-
}
|
|
177
|
+
@import './3.css';
|
|
244
178
|
`,
|
|
245
179
|
'/test/2.css': dedent`
|
|
246
180
|
.b {}
|
|
@@ -250,12 +184,14 @@ test.failing('returns the result from the cache when the file has not been modif
|
|
|
250
184
|
.d {}
|
|
251
185
|
`,
|
|
252
186
|
});
|
|
187
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
188
|
+
const readCSSSpy = jest.spyOn(locator, 'readCSS' as any);
|
|
253
189
|
await locator.load(getFixturePath('/test/1.css'));
|
|
254
|
-
expect(
|
|
255
|
-
expect(
|
|
256
|
-
expect(
|
|
257
|
-
expect(
|
|
258
|
-
|
|
190
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(3);
|
|
191
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.css'));
|
|
192
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(2, getFixturePath('/test/2.css'));
|
|
193
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(3, getFixturePath('/test/3.css'));
|
|
194
|
+
readCSSSpy.mockClear();
|
|
259
195
|
|
|
260
196
|
// update `/test/2.css`
|
|
261
197
|
sleepSync(1); // wait for the file system to update the mtime
|
|
@@ -263,54 +199,17 @@ test.failing('returns the result from the cache when the file has not been modif
|
|
|
263
199
|
|
|
264
200
|
// `3.css` is not updated, so the cache is used. Therefore, `readFile` is not called.
|
|
265
201
|
await locator.load(getFixturePath('/test/3.css'));
|
|
266
|
-
expect(
|
|
202
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(0);
|
|
267
203
|
|
|
268
204
|
// `1.css` is not updated, but dependencies are updated, so the cache is used. Therefore, `readFile` is called.
|
|
269
205
|
await locator.load(getFixturePath('/test/1.css'));
|
|
270
|
-
expect(
|
|
271
|
-
expect(
|
|
272
|
-
expect(
|
|
206
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(2);
|
|
207
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.css'));
|
|
208
|
+
expect(readCSSSpy).toHaveBeenNthCalledWith(2, getFixturePath('/test/2.css'));
|
|
273
209
|
|
|
274
210
|
// ``2.css` is updated, but the cache is already available because it was updated in the previous step. Therefore, `readFile` is not called.
|
|
275
211
|
await locator.load(getFixturePath('/test/2.css'));
|
|
276
|
-
expect(
|
|
277
|
-
});
|
|
278
|
-
|
|
279
|
-
test('ignores the composition of non-existent tokens', async () => {
|
|
280
|
-
// In css-loader and postcss-modules, compositions of non-existent tokens are simply ignored.
|
|
281
|
-
// Therefore, happy-css-modules follows suit.
|
|
282
|
-
// It may be preferable to warn rather than ignore, but for now, we will focus on compatibility.
|
|
283
|
-
// ref: https://github.com/css-modules/css-modules/issues/356
|
|
284
|
-
createFixtures({
|
|
285
|
-
'/test/1.css': dedent`
|
|
286
|
-
.a {
|
|
287
|
-
composes: b c from './2.css';
|
|
288
|
-
}
|
|
289
|
-
`,
|
|
290
|
-
'/test/2.css': dedent`
|
|
291
|
-
.b {}
|
|
292
|
-
`,
|
|
293
|
-
});
|
|
294
|
-
const result = await locator.load(getFixturePath('/test/1.css'));
|
|
295
|
-
expect(result.tokens.map((t) => t.name)).toStrictEqual(['a', 'b']);
|
|
296
|
-
});
|
|
297
|
-
|
|
298
|
-
test('throws error the composition of non-existent file', async () => {
|
|
299
|
-
// In postcss-modules, compositions of non-existent file are causes an error.
|
|
300
|
-
// Therefore, happy-css-modules follows suit.
|
|
301
|
-
createFixtures({
|
|
302
|
-
'/test/1.css': dedent`
|
|
303
|
-
.a {
|
|
304
|
-
composes: a from './2.css';
|
|
305
|
-
}
|
|
306
|
-
`,
|
|
307
|
-
});
|
|
308
|
-
await expect(async () => {
|
|
309
|
-
await locator.load(getFixturePath('/test/1.css')).catch((e) => {
|
|
310
|
-
e.message = e.message.replace(FIXTURE_DIR_PATH, '<fixtures>');
|
|
311
|
-
throw e;
|
|
312
|
-
});
|
|
313
|
-
}).rejects.toThrowError(`Could not resolve './2.css' in '<fixtures>/test/1.css'`);
|
|
212
|
+
expect(readCSSSpy).toHaveBeenCalledTimes(2);
|
|
314
213
|
});
|
|
315
214
|
|
|
316
215
|
describe('supports sourcemap', () => {
|