happy-css-modules 3.0.1 → 3.1.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.
Files changed (37) hide show
  1. package/dist/emitter/dts.js +34 -17
  2. package/dist/emitter/dts.js.map +1 -1
  3. package/dist/emitter/dts.test.js +3 -3
  4. package/dist/emitter/dts.test.js.map +1 -1
  5. package/dist/emitter/index.test.js +3 -3
  6. package/dist/emitter/index.test.js.map +1 -1
  7. package/dist/locator/index.d.ts +4 -2
  8. package/dist/locator/index.js +41 -15
  9. package/dist/locator/index.js.map +1 -1
  10. package/dist/locator/index.test.js +142 -48
  11. package/dist/locator/index.test.js.map +1 -1
  12. package/dist/locator/postcss.d.ts +41 -3
  13. package/dist/locator/postcss.js +104 -32
  14. package/dist/locator/postcss.js.map +1 -1
  15. package/dist/locator/postcss.test.js +86 -26
  16. package/dist/locator/postcss.test.js.map +1 -1
  17. package/dist/test-util/util.d.ts +3 -2
  18. package/dist/test-util/util.js +22 -18
  19. package/dist/test-util/util.js.map +1 -1
  20. package/dist/transformer/less-transformer.test.js +25 -15
  21. package/dist/transformer/less-transformer.test.js.map +1 -1
  22. package/dist/transformer/postcss-transformer.test.js +5 -3
  23. package/dist/transformer/postcss-transformer.test.js.map +1 -1
  24. package/dist/transformer/scss-transformer.test.js +38 -19
  25. package/dist/transformer/scss-transformer.test.js.map +1 -1
  26. package/package.json +1 -1
  27. package/src/emitter/dts.test.ts +3 -3
  28. package/src/emitter/dts.ts +59 -37
  29. package/src/emitter/index.test.ts +3 -3
  30. package/src/locator/index.test.ts +143 -48
  31. package/src/locator/index.ts +51 -23
  32. package/src/locator/postcss.test.ts +135 -26
  33. package/src/locator/postcss.ts +120 -36
  34. package/src/test-util/util.ts +23 -18
  35. package/src/transformer/less-transformer.test.ts +25 -15
  36. package/src/transformer/postcss-transformer.test.ts +5 -3
  37. package/src/transformer/scss-transformer.test.ts +38 -19
package/dist/transformer/less-transformer.test.js CHANGED
@@ -38,33 +38,43 @@ test('handles less features', async () => {
38
38
  tokens: [
39
39
  {
40
40
  name: "b_1",
41
- originalLocations: [
42
- { filePath: "<fixtures>/test/2.less", start: { line: 1, column: 1 }, end: { line: 1, column: 4 } },
43
- ],
41
+ originalLocation: {
42
+ filePath: "<fixtures>/test/2.less",
43
+ start: { line: 1, column: 1 },
44
+ end: { line: 1, column: 4 },
45
+ },
44
46
  },
45
47
  {
46
48
  name: "a_1",
47
- originalLocations: [
48
- { filePath: "<fixtures>/test/1.less", start: { line: 2, column: 1 }, end: { line: 2, column: 4 } },
49
- ],
49
+ originalLocation: {
50
+ filePath: "<fixtures>/test/1.less",
51
+ start: { line: 2, column: 1 },
52
+ end: { line: 2, column: 4 },
53
+ },
50
54
  },
51
55
  {
52
56
  name: "a_2",
53
- originalLocations: [
54
- { filePath: "<fixtures>/test/1.less", start: { line: 3, column: 1 }, end: { line: 3, column: 4 } },
55
- ],
57
+ originalLocation: {
58
+ filePath: "<fixtures>/test/1.less",
59
+ start: { line: 3, column: 1 },
60
+ end: { line: 3, column: 4 },
61
+ },
56
62
  },
57
63
  {
58
64
  name: "a_2_1",
59
- originalLocations: [
60
- { filePath: "<fixtures>/test/1.less", start: { line: 6, column: 3 }, end: { line: 6, column: 8 } },
61
- ],
65
+ originalLocation: {
66
+ filePath: "<fixtures>/test/1.less",
67
+ start: { line: 6, column: 3 },
68
+ end: { line: 6, column: 8 },
69
+ },
62
70
  },
63
71
  {
64
72
  name: "a_2_2",
65
- originalLocations: [
66
- { filePath: "<fixtures>/test/1.less", start: { line: 7, column: 3 }, end: { line: 7, column: 8 } },
67
- ],
73
+ originalLocation: {
74
+ filePath: "<fixtures>/test/1.less",
75
+ start: { line: 7, column: 3 },
76
+ end: { line: 7, column: 8 },
77
+ },
68
78
  },
69
79
  ],
70
80
  }
package/dist/transformer/less-transformer.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"less-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/less-transformer.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"less-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/less-transformer.test.ts"],"names":[],"mappings":"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"}
package/dist/transformer/postcss-transformer.test.js CHANGED
@@ -37,9 +37,11 @@ test('handles postcss features', async () => {
37
37
  tokens: [
38
38
  {
39
39
  name: "foo_bar",
40
- originalLocations: [
41
- { filePath: "<fixtures>/test/1.css", start: { line: 2, column: 1 }, end: { line: 2, column: 8 } },
42
- ],
40
+ originalLocation: {
41
+ filePath: "<fixtures>/test/1.css",
42
+ start: { line: 2, column: 1 },
43
+ end: { line: 2, column: 8 },
44
+ },
43
45
  },
44
46
  ],
45
47
  }
package/dist/transformer/postcss-transformer.test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"postcss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/postcss-transformer.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"postcss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/postcss-transformer.test.ts"],"names":[],"mappings":"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"}
package/dist/transformer/scss-transformer.test.js CHANGED
@@ -43,40 +43,59 @@ test('handles sass features', async () => {
43
43
  tokens: [
44
44
  {
45
45
  name: "b_1",
46
- originalLocations: [
47
- { filePath: "<fixtures>/test/2.scss", start: { line: 1, column: 1 }, end: { line: 1, column: 4 } },
48
- ],
46
+ originalLocation: {
47
+ filePath: "<fixtures>/test/2.scss",
48
+ start: { line: 1, column: 1 },
49
+ end: { line: 1, column: 4 },
50
+ },
49
51
  },
50
52
  {
51
53
  name: "c",
52
- originalLocations: [
53
- { filePath: "<fixtures>/test/3.scss", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
54
- ],
54
+ originalLocation: {
55
+ filePath: "<fixtures>/test/3.scss",
56
+ start: { line: 1, column: 1 },
57
+ end: { line: 1, column: 2 },
58
+ },
55
59
  },
56
60
  {
57
61
  name: "a_1",
58
- originalLocations: [
59
- { filePath: "<fixtures>/test/1.scss", start: { line: 3, column: 1 }, end: { line: 3, column: 4 } },
60
- ],
62
+ originalLocation: {
63
+ filePath: "<fixtures>/test/1.scss",
64
+ start: { line: 3, column: 1 },
65
+ end: { line: 3, column: 4 },
66
+ },
61
67
  },
62
68
  {
63
69
  name: "a_2",
64
- originalLocations: [
65
- { filePath: "<fixtures>/test/1.scss", start: { line: 4, column: 1 }, end: { line: 4, column: 4 } },
66
- { filePath: "<fixtures>/test/1.scss", start: { line: 7, column: 3 }, end: { line: 7, column: 6 } },
67
- ],
70
+ originalLocation: {
71
+ filePath: "<fixtures>/test/1.scss",
72
+ start: { line: 4, column: 1 },
73
+ end: { line: 4, column: 4 },
74
+ },
75
+ },
76
+ {
77
+ name: "a_2",
78
+ originalLocation: {
79
+ filePath: "<fixtures>/test/1.scss",
80
+ start: { line: 7, column: 3 },
81
+ end: { line: 7, column: 6 },
82
+ },
68
83
  },
69
84
  {
70
85
  name: "a_2_1",
71
- originalLocations: [
72
- { filePath: "<fixtures>/test/1.scss", start: { line: 7, column: 3 }, end: { line: 7, column: 8 } },
73
- ],
86
+ originalLocation: {
87
+ filePath: "<fixtures>/test/1.scss",
88
+ start: { line: 7, column: 3 },
89
+ end: { line: 7, column: 8 },
90
+ },
74
91
  },
75
92
  {
76
93
  name: "a_2_2",
77
- originalLocations: [
78
- { filePath: "<fixtures>/test/1.scss", start: { line: 8, column: 3 }, end: { line: 8, column: 8 } },
79
- ],
94
+ originalLocation: {
95
+ filePath: "<fixtures>/test/1.scss",
96
+ start: { line: 8, column: 3 },
97
+ end: { line: 8, column: 8 },
98
+ },
80
99
  },
81
100
  ],
82
101
  }
package/dist/transformer/scss-transformer.test.js.map CHANGED
@@ -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;;;;;;;;;;OAUnB;QACH,cAAc,EAAE,MAAM,CAAA;;;OAGnB;QACH,cAAc,EAAE,MAAM,CAAA;;OAEnB;QACH,cAAc,EAAE,MAAM,CAAA;;OAEnB;KACJ,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAElE,sFAAsF;IACtF,8EAA8E;IAC9E,uEAAuE;IAEvE,mDAAmD;IACnD,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CpC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;IACjF,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA;;;KAGrB;QACD,cAAc,EAAE,MAAM,CAAA;KACrB;QACD,cAAc,EAAE,MAAM,CAAA;;KAErB;QACD,cAAc,EAAE,MAAM,CAAA;KACrB;KACF,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAElE,oEAAoE;IACpE,kEAAkE;IAClE,MAAM,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAE3E,mFAAmF;IACnF,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;AAClH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;IACnD,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA;;;KAGrB;QACD,mCAAmC,EAAE,OAAO;QAC5C,oCAAoC,EAAE,OAAO;KAC9C,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CACvC,CAAC,mCAAmC,EAAE,oCAAoC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAChG,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAC/C,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA;;;;KAIrB;KACF,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC"}
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;;;;;;;;;;OAUnB;QACH,cAAc,EAAE,MAAM,CAAA;;;OAGnB;QACH,cAAc,EAAE,MAAM,CAAA;;OAEnB;QACH,cAAc,EAAE,MAAM,CAAA;;OAEnB;KACJ,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAElE,sFAAsF;IACtF,8EAA8E;IAC9E,uEAAuE;IAEvE,mDAAmD;IACnD,MAAM,CAAC,MAAM,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DpC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;IACjF,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA;;;KAGrB;QACD,cAAc,EAAE,MAAM,CAAA;KACrB;QACD,cAAc,EAAE,MAAM,CAAA;;KAErB;QACD,cAAc,EAAE,MAAM,CAAA;KACrB;KACF,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAElE,oEAAoE;IACpE,kEAAkE;IAClE,MAAM,CAAC,OAAO,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,CAAC,OAAO,CAAC,CAAC,uBAAuB,CAAC,CAAC,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAE3E,mFAAmF;IACnF,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC;AAClH,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;IACnD,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA;;;KAGrB;QACD,mCAAmC,EAAE,OAAO;QAC5C,oCAAoC,EAAE,OAAO;KAC9C,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CACvC,CAAC,mCAAmC,EAAE,oCAAoC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAChG,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IAC/C,cAAc,CAAC;QACb,cAAc,EAAE,MAAM,CAAA;;;;KAIrB;KACF,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC,CAAC;IAClE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "happy-css-modules",
3
- "version": "3.0.1",
3
+ "version": "3.1.1",
4
4
  "description": "Creates .d.ts files from CSS Modules .css files",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/src/emitter/dts.test.ts CHANGED
@@ -211,9 +211,9 @@ describe('generateDtsContentWithSourceMap', () => {
211
211
  });
212
212
  test('emit other directory', async () => {
213
213
  createFixtures({
214
- '/test/1.css': `.a {}`,
214
+ '/test/src/1.css': `.a {}`,
215
215
  });
216
- const result = await locator.load(filePath);
216
+ const result = await locator.load(getFixturePath('/test/src/1.css'));
217
217
  const { dtsContent, sourceMap } = generateDtsContentWithSourceMap(
218
218
  getFixturePath('/test/src/1.css'),
219
219
  getFixturePath('/test/dist/1.css.d.ts'),
@@ -224,7 +224,7 @@ describe('generateDtsContentWithSourceMap', () => {
224
224
  );
225
225
  expect(dtsContent).toMatchInlineSnapshot(`
226
226
  "declare const styles:
227
- & Readonly<Pick<(typeof import("../1.css"))["default"], "a">>
227
+ & Readonly<{ "a": string }>
228
228
  ;
229
229
  export default styles;
230
230
  "
package/src/emitter/dts.ts CHANGED
@@ -28,18 +28,26 @@ function dashesCamelCase(str: string): string {
28
28
  }
29
29
 
30
30
  function formatTokens(tokens: Token[], localsConvention: LocalsConvention): Token[] {
31
+ function formatToken(token: Token, formatter: (str: string) => string): Token {
32
+ if ('importedName' in token && typeof token.importedName === 'string') {
33
+ return { ...token, name: formatter(token.name), importedName: formatter(token.importedName) };
34
+ } else {
35
+ return { ...token, name: formatter(token.name) };
36
+ }
37
+ }
38
+
31
39
  const result: Token[] = [];
32
40
  for (const token of tokens) {
33
41
  if (localsConvention === 'camelCaseOnly') {
34
- result.push({ ...token, name: camelcase(token.name) });
42
+ result.push(formatToken(token, camelcase));
35
43
  } else if (localsConvention === 'camelCase') {
36
44
  result.push(token);
37
- result.push({ ...token, name: camelcase(token.name) });
45
+ result.push(formatToken(token, camelcase));
38
46
  } else if (localsConvention === 'dashesOnly') {
39
- result.push({ ...token, name: dashesCamelCase(token.name) });
47
+ result.push(formatToken(token, dashesCamelCase));
40
48
  } else if (localsConvention === 'dashes') {
41
49
  result.push(token);
42
- result.push({ ...token, name: dashesCamelCase(token.name) });
50
+ result.push(formatToken(token, dashesCamelCase));
43
51
  } else {
44
52
  result.push(token); // asIs
45
53
  }
@@ -62,41 +70,55 @@ function generateTokenDeclarations(
62
70
  // This is due to the sourcemap specification. Therefore, we output multiple type definitions
63
71
  // with the same name and assign a separate original position to each.
64
72
 
65
- for (let originalLocation of token.originalLocations) {
66
- if (originalLocation.filePath === undefined) {
67
- // If the original location is not specified, fallback to the source file.
68
- originalLocation = {
69
- filePath,
70
- start: { line: 1, column: 1 },
71
- end: { line: 1, column: 1 },
72
- };
73
- }
73
+ let originalLocation = token.originalLocation;
74
+ if (originalLocation.filePath === undefined) {
75
+ // If the original location is not specified, fallback to the source file.
76
+ originalLocation = {
77
+ filePath,
78
+ start: { line: 1, column: 1 },
79
+ end: { line: 1, column: 1 },
80
+ };
81
+ }
74
82
 
75
- result.push(
76
- originalLocation.filePath === filePath || isExternalFile(originalLocation.filePath)
77
- ? new SourceNode(null, null, null, [
78
- '& Readonly<{ ',
79
- new SourceNode(
80
- originalLocation.start.line ?? null,
81
- // The SourceNode's column is 0-based, but the originalLocation's column is 1-based.
82
- originalLocation.start.column - 1 ?? null,
83
- getRelativePath(sourceMapFilePath, originalLocation.filePath),
84
- `"${token.name}"`,
85
- token.name,
86
- ),
87
- ': string }>',
88
- ])
89
- : // Imported tokens in non-external files are typed by dynamic import.
90
- // See https://github.com/mizdra/happy-css-modules/issues/106.
91
- new SourceNode(null, null, null, [
92
- '& Readonly<Pick<(typeof import(',
93
- `"${getRelativePath(filePath, originalLocation.filePath)}"`,
94
- '))["default"], ',
83
+ result.push(
84
+ originalLocation.filePath === filePath || isExternalFile(originalLocation.filePath)
85
+ ? new SourceNode(null, null, null, [
86
+ '& Readonly<{ ',
87
+ new SourceNode(
88
+ originalLocation.start.line ?? null,
89
+ // The SourceNode's column is 0-based, but the originalLocation's column is 1-based.
90
+ originalLocation.start.column - 1 ?? null,
91
+ getRelativePath(sourceMapFilePath, originalLocation.filePath),
95
92
  `"${token.name}"`,
96
- '>>',
97
- ]),
98
- );
99
- }
93
+ token.name,
94
+ ),
95
+ ': string }>',
96
+ ])
97
+ : typeof token.importedName === 'string'
98
+ ? new SourceNode(null, null, null, [
99
+ `& Readonly<{ `,
100
+ new SourceNode(
101
+ originalLocation.start.line ?? null,
102
+ // The SourceNode's column is 0-based, but the originalLocation's column is 1-based.
103
+ originalLocation.start.column - 1 ?? null,
104
+ getRelativePath(sourceMapFilePath, originalLocation.filePath),
105
+ `"${token.name}"`,
106
+ token.name,
107
+ ),
108
+ `: (typeof import(`,
109
+ `"${getRelativePath(filePath, originalLocation.filePath)}"`,
110
+ `))["default"]["${token.importedName}"] }>`,
111
+ ])
112
+ : // Imported tokens in non-external files are typed by dynamic import.
113
+ // See https://github.com/mizdra/happy-css-modules/issues/106.
114
+ new SourceNode(null, null, null, [
115
+ '& Readonly<Pick<(typeof import(',
116
+ `"${getRelativePath(filePath, originalLocation.filePath)}"`,
117
+ '))["default"], ',
118
+ `"${token.name}"`,
119
+ '>>',
120
+ ]),
121
+ );
100
122
  }
101
123
  return result;
102
124
  }
package/src/emitter/index.test.ts CHANGED
@@ -25,7 +25,7 @@ test('isSubDirectoryFile', () => {
25
25
  describe('emitGeneratedFiles', () => {
26
26
  const defaultArgs = {
27
27
  filePath: getFixturePath('/test/1.css'),
28
- tokens: [fakeToken({ name: 'foo', originalLocations: [{ start: { line: 1, column: 1 } }] })],
28
+ tokens: [fakeToken({ name: 'foo', originalLocation: { start: { line: 1, column: 1 } } })],
29
29
  emitDeclarationMap: true,
30
30
  dtsFormatOptions: undefined,
31
31
  cwd: getFixturePath('/test'),
@@ -55,7 +55,7 @@ describe('emitGeneratedFiles', () => {
55
55
  expect(await exists(getFixturePath('/test/1.css.d.ts.map'))).toBeFalsy();
56
56
  });
57
57
  test('skips writing to disk if the generated files are the same', async () => {
58
- const tokens1 = [fakeToken({ name: 'foo', originalLocations: [{ start: { line: 1, column: 1 } }] })];
58
+ const tokens1 = [fakeToken({ name: 'foo', originalLocation: { start: { line: 1, column: 1 } } })];
59
59
  await emitGeneratedFiles({ ...defaultArgs, tokens: tokens1 });
60
60
  const mtimeForDts1 = (await stat(getFixturePath('/test/1.css.d.ts'))).mtime;
61
61
  const mtimeForSourceMap1 = (await stat(getFixturePath('/test/1.css.d.ts.map'))).mtime;
@@ -68,7 +68,7 @@ describe('emitGeneratedFiles', () => {
68
68
  expect(mtimeForSourceMap1).toEqual(mtimeForSourceMap2); // skipped
69
69
 
70
70
  await waitForAsyncTask(1); // so that mtime changes.
71
- const tokens2 = [fakeToken({ name: 'bar', originalLocations: [{ start: { line: 1, column: 1 } }] })];
71
+ const tokens2 = [fakeToken({ name: 'bar', originalLocation: { start: { line: 1, column: 1 } } })];
72
72
  await emitGeneratedFiles({ ...defaultArgs, tokens: tokens2 });
73
73
  const mtimeForDts3 = (await stat(getFixturePath('/test/1.css.d.ts'))).mtime;
74
74
  const mtimeForSourceMap3 = (await stat(getFixturePath('/test/1.css.d.ts.map'))).mtime;
package/src/locator/index.test.ts CHANGED
@@ -22,15 +22,19 @@ test('basic', async () => {
22
22
  tokens: [
23
23
  {
24
24
  name: "a",
25
- originalLocations: [
26
- { filePath: "<fixtures>/test/1.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
27
- ],
25
+ originalLocation: {
26
+ filePath: "<fixtures>/test/1.css",
27
+ start: { line: 1, column: 1 },
28
+ end: { line: 1, column: 2 },
29
+ },
28
30
  },
29
31
  {
30
32
  name: "b",
31
- originalLocations: [
32
- { filePath: "<fixtures>/test/1.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
33
- ],
33
+ originalLocation: {
34
+ filePath: "<fixtures>/test/1.css",
35
+ start: { line: 2, column: 1 },
36
+ end: { line: 2, column: 2 },
37
+ },
34
38
  },
35
39
  ],
36
40
  }
@@ -74,27 +78,35 @@ test('tracks other files when `@import` is present', async () => {
74
78
  tokens: [
75
79
  {
76
80
  name: "a",
77
- originalLocations: [
78
- { filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
79
- ],
81
+ originalLocation: {
82
+ filePath: "<fixtures>/test/2.css",
83
+ start: { line: 1, column: 1 },
84
+ end: { line: 1, column: 2 },
85
+ },
80
86
  },
81
87
  {
82
88
  name: "b",
83
- originalLocations: [
84
- { filePath: "<fixtures>/test/3.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
85
- ],
89
+ originalLocation: {
90
+ filePath: "<fixtures>/test/3.css",
91
+ start: { line: 1, column: 1 },
92
+ end: { line: 1, column: 2 },
93
+ },
86
94
  },
87
95
  {
88
96
  name: "c",
89
- originalLocations: [
90
- { filePath: "<fixtures>/test/4.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
91
- ],
97
+ originalLocation: {
98
+ filePath: "<fixtures>/test/4.css",
99
+ start: { line: 1, column: 1 },
100
+ end: { line: 1, column: 2 },
101
+ },
92
102
  },
93
103
  {
94
104
  name: "d",
95
- originalLocations: [
96
- { filePath: "<fixtures>/test/5-recursive.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
97
- ],
105
+ originalLocation: {
106
+ filePath: "<fixtures>/test/5-recursive.css",
107
+ start: { line: 1, column: 1 },
108
+ end: { line: 1, column: 2 },
109
+ },
98
110
  },
99
111
  ],
100
112
  }
@@ -120,16 +132,69 @@ test('does not track other files by `composes`', async () => {
120
132
  tokens: [
121
133
  {
122
134
  name: "a",
123
- originalLocations: [
124
- { filePath: "<fixtures>/test/1.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
125
- ],
135
+ originalLocation: {
136
+ filePath: "<fixtures>/test/1.css",
137
+ start: { line: 1, column: 1 },
138
+ end: { line: 1, column: 2 },
139
+ },
140
+ },
141
+ ],
142
+ }
143
+ `);
144
+ });
145
+
146
+ test('tracks other files when `@value` is present', async () => {
147
+ createFixtures({
148
+ '/test/1.css': dedent`
149
+ @value a from './2.css';
150
+ @value b from '3.css';
151
+ @value c from '${getFixturePath('/test/4.css')}';
152
+ `,
153
+ '/test/2.css': dedent`
154
+ @value a: 1;
155
+ `,
156
+ '/test/3.css': dedent`
157
+ @value b: 2;
158
+ `,
159
+ '/test/4.css': dedent`
160
+ @value c: 3;
161
+ `,
162
+ });
163
+ const result = await locator.load(getFixturePath('/test/1.css'));
164
+ expect(result).toMatchInlineSnapshot(`
165
+ {
166
+ dependencies: ["<fixtures>/test/2.css", "<fixtures>/test/3.css", "<fixtures>/test/4.css"],
167
+ tokens: [
168
+ {
169
+ name: "a",
170
+ originalLocation: {
171
+ filePath: "<fixtures>/test/2.css",
172
+ start: { line: 1, column: 8 },
173
+ end: { line: 1, column: 9 },
174
+ },
175
+ },
176
+ {
177
+ name: "b",
178
+ originalLocation: {
179
+ filePath: "<fixtures>/test/3.css",
180
+ start: { line: 1, column: 8 },
181
+ end: { line: 1, column: 9 },
182
+ },
183
+ },
184
+ {
185
+ name: "c",
186
+ originalLocation: {
187
+ filePath: "<fixtures>/test/4.css",
188
+ start: { line: 1, column: 8 },
189
+ end: { line: 1, column: 9 },
190
+ },
126
191
  },
127
192
  ],
128
193
  }
129
194
  `);
130
195
  });
131
196
 
132
- test('normalizes tokens', async () => {
197
+ test('unique tokens', async () => {
133
198
  createFixtures({
134
199
  '/test/1.css': dedent`
135
200
  /* duplicate import */
@@ -142,9 +207,6 @@ test('normalizes tokens', async () => {
142
207
  .a {} /* class selector that duplicates the import source */
143
208
  .b {}
144
209
  `,
145
- '/test/3.css': dedent`
146
- .c {}
147
- `,
148
210
  });
149
211
  const result = await locator.load(getFixturePath('/test/1.css'));
150
212
  expect(result).toMatchInlineSnapshot(`
@@ -153,17 +215,35 @@ test('normalizes tokens', async () => {
153
215
  tokens: [
154
216
  {
155
217
  name: "a",
156
- originalLocations: [
157
- { filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
158
- { filePath: "<fixtures>/test/1.css", start: { line: 4, column: 1 }, end: { line: 4, column: 2 } },
159
- { filePath: "<fixtures>/test/1.css", start: { line: 5, column: 1 }, end: { line: 5, column: 2 } },
160
- ],
218
+ originalLocation: {
219
+ filePath: "<fixtures>/test/2.css",
220
+ start: { line: 1, column: 1 },
221
+ end: { line: 1, column: 2 },
222
+ },
161
223
  },
162
224
  {
163
225
  name: "b",
164
- originalLocations: [
165
- { filePath: "<fixtures>/test/2.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
166
- ],
226
+ originalLocation: {
227
+ filePath: "<fixtures>/test/2.css",
228
+ start: { line: 2, column: 1 },
229
+ end: { line: 2, column: 2 },
230
+ },
231
+ },
232
+ {
233
+ name: "a",
234
+ originalLocation: {
235
+ filePath: "<fixtures>/test/1.css",
236
+ start: { line: 4, column: 1 },
237
+ end: { line: 4, column: 2 },
238
+ },
239
+ },
240
+ {
241
+ name: "a",
242
+ originalLocation: {
243
+ filePath: "<fixtures>/test/1.css",
244
+ start: { line: 5, column: 1 },
245
+ end: { line: 5, column: 2 },
246
+ },
167
247
  },
168
248
  ],
169
249
  }
@@ -233,16 +313,27 @@ describe('supports sourcemap', () => {
233
313
  tokens: [
234
314
  {
235
315
  name: "nesting",
236
- originalLocations: [
237
- { filePath: "<fixtures>/test/1.scss", start: { line: 1, column: 1 }, end: { line: 1, column: 8 } },
238
- { filePath: "<fixtures>/test/1.scss", start: { line: 3, column: 3 }, end: { line: 3, column: 10 } },
239
- ],
316
+ originalLocation: {
317
+ filePath: "<fixtures>/test/1.scss",
318
+ start: { line: 1, column: 1 },
319
+ end: { line: 1, column: 8 },
320
+ },
321
+ },
322
+ {
323
+ name: "nesting",
324
+ originalLocation: {
325
+ filePath: "<fixtures>/test/1.scss",
326
+ start: { line: 3, column: 3 },
327
+ end: { line: 3, column: 10 },
328
+ },
240
329
  },
241
330
  {
242
331
  name: "nesting_child",
243
- originalLocations: [
244
- { filePath: "<fixtures>/test/1.scss", start: { line: 3, column: 3 }, end: { line: 3, column: 16 } },
245
- ],
332
+ originalLocation: {
333
+ filePath: "<fixtures>/test/1.scss",
334
+ start: { line: 3, column: 3 },
335
+ end: { line: 3, column: 16 },
336
+ },
246
337
  },
247
338
  ],
248
339
  }
@@ -272,18 +363,22 @@ describe('supports sourcemap', () => {
272
363
  tokens: [
273
364
  {
274
365
  name: "selector_list_a_1",
275
- originalLocations: [
276
- { filePath: "<fixtures>/test/1.css", start: { line: 1, column: 1 }, end: { line: 1, column: 18 } },
277
- ],
366
+ originalLocation: {
367
+ filePath: "<fixtures>/test/1.css",
368
+ start: { line: 1, column: 1 },
369
+ end: { line: 1, column: 18 },
370
+ },
278
371
  },
279
372
  {
280
373
  name: "selector_list_a_2",
281
- originalLocations: [
282
- { filePath: "<fixtures>/test/1.css", start: { line: 1, column: 1 }, end: { line: 1, column: 18 } },
283
- ],
374
+ originalLocation: {
375
+ filePath: "<fixtures>/test/1.css",
376
+ start: { line: 1, column: 1 },
377
+ end: { line: 1, column: 18 },
378
+ },
284
379
  },
285
- { name: "selector_list_b_1", originalLocations: [{}] },
286
- { name: "selector_list_b_2", originalLocations: [{}] },
380
+ { name: "selector_list_b_1", originalLocation: {} },
381
+ { name: "selector_list_b_2", originalLocation: {} },
287
382
  ],
288
383
  }
289
384
  `);