happy-css-modules 2.1.2 → 3.0.1

package/dist/transformer/scss-transformer.test.js

@@ -19,8 +19,6 @@ test('handles sass features', async () => {
         // sass feature test (nesting)
         .a_2_1 { dummy: ''; }
         &_2 { dummy: ''; }
-        composes: a_1; // css module feature test (composes)
-        composes: d from './4.scss'; // css module feature test (composes from other file)
       }
       `,
         '/test/2.scss': dedent `
@@ -41,7 +39,7 @@ test('handles sass features', async () => {
     // FIXME: The end position of 'a_2_2' is incorrect.
     expect(result).toMatchInlineSnapshot(`
     {
-      dependencies: ["<fixtures>/test/2.scss", "<fixtures>/test/3.scss", "<fixtures>/test/4.scss"],
+      dependencies: ["<fixtures>/test/2.scss", "<fixtures>/test/3.scss"],
       tokens: [
         {
           name: "b_1",
@@ -80,12 +78,6 @@ test('handles sass features', async () => {
             { filePath: "<fixtures>/test/1.scss", start: { line: 8, column: 3 }, end: { line: 8, column: 8 } },
           ],
         },
-        {
-          name: "d",
-          originalLocations: [
-            { filePath: "<fixtures>/test/4.scss", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
-          ],
-        },
       ],
     }
   `);

package/dist/transformer/scss-transformer.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"scss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scss-transformer.test.js","sourceRoot":"","sources":["../../src/transformer/scss-transformer.test.ts"],"names":[],"mappings":"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"}

package/dist/util.d.ts

@@ -18,4 +18,4 @@ export declare function isMatchByGlob(filePath: string, pattern: string, options
     cwd: string;
 }): boolean;
 export declare function getPackageJson(): any;
-export declare function getInstalledPeerDependencies(): Promise<string[]>;
+export declare function getInstalledPeerDependencies(): string[];

package/dist/util.js

@@ -3,7 +3,7 @@ import { access } from 'fs/promises';
 import { join, dirname, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { resolve as importMetaResolve } from 'import-meta-resolve';
-import minimatch from 'minimatch';
+import { minimatch } from 'minimatch';
 export function isSystemError(value) {
     return (isObject(value) &&
         hasProp(value, 'constructor') &&
@@ -49,20 +49,23 @@ export async function exists(path) {
     }
 }
 export function isMatchByGlob(filePath, pattern, options) {
-    return minimatch(filePath, join(options.cwd, pattern));
+    return minimatch(filePath, join(options.cwd, pattern), { windowsPathsNoEscape: true });
 }
 export function getPackageJson() {
     return JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf-8'));
 }
-export async function getInstalledPeerDependencies() {
+export function getInstalledPeerDependencies() {
     const pkgJson = getPackageJson();
     const result = [];
     for (const deps of Object.keys(pkgJson.peerDependencies)) {
-        const isInstalled = await importMetaResolve(deps, import.meta.url)
-            .then(() => true)
-            .catch(() => false);
-        if (isInstalled)
+        try {
+            importMetaResolve(deps, import.meta.url);
+            // If the package is installed, push it to the result array.
             result.push(deps);
+        }
+        catch {
+            // If the package is not installed, do nothing.
+        }
     }
     return result;
 }

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "happy-css-modules",
-  "version": "2.1.2",
+  "version": "3.0.1",
   "description": "Creates .d.ts files from CSS Modules .css files",
   "type": "module",
   "main": "dist/index.js",
@@ -28,31 +28,31 @@
   "author": "mizdra",
   "license": "MIT",
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "dependencies": {
-    "@file-cache/core": "^1.1.3",
-    "@file-cache/npm": "^1.1.3",
+    "@file-cache/core": "^2.0.0",
+    "@file-cache/npm": "^2.0.0",
     "await-lock": "^2.2.2",
-    "camelcase": "^7.0.1",
-    "chalk": "^5.0.1",
-    "chokidar": "^3.5.3",
-    "enhanced-resolve": "^5.10.0",
-    "glob": "^8.0.3",
-    "import-meta-resolve": "^2.1.0",
-    "minimatch": "^5.1.6",
-    "postcss": "^8.4.23",
-    "postcss-load-config": "^4.0.1",
-    "postcss-modules": "^4.3.1",
-    "postcss-selector-parser": "^6.0.12",
+    "camelcase": "^8.0.0",
+    "chalk": "^5.3.0",
+    "chokidar": "^3.6.0",
+    "enhanced-resolve": "^5.16.1",
+    "glob": "^10.3.15",
+    "import-meta-resolve": "^4.1.0",
+    "minimatch": "^9.0.4",
+    "postcss": "^8.4.38",
+    "postcss-load-config": "^5.1.0",
+    "postcss-modules": "^6.0.0",
+    "postcss-selector-parser": "^6.0.16",
     "postcss-value-parser": "^4.2.0",
     "source-map": "^0.7.4",
-    "yargs": "^17.5.1"
+    "yargs": "^17.7.2"
   },
   "peerDependencies": {
     "less": "^3.0.0 || ^4.0.0",
     "postcss": "^8.0.0",
-    "sass": "^1.0.0"
+    "sass": "^1.63.3"
   },
   "peerDependenciesMeta": {
     "sass": {

package/src/emitter/dts.test.ts

@@ -92,7 +92,7 @@ describe('generateDtsContentWithSourceMap', () => {
         .foo_bar {}
         `,
       });
-      return await locator.load(filePath);
+      return locator.load(filePath);
     }
     test('undefined', async () => {
       const result = await getResult(filePath);

package/src/emitter/dts.ts

@@ -15,14 +15,14 @@ import { getRelativePath, type DtsFormatOptions } from './index.js';
 export function getDtsFilePath(filePath: string, arbitraryExtensions: boolean): string {
   if (arbitraryExtensions) {
     const { dir, name, ext } = parse(filePath);
-    return join(dir, name + '.d' + ext + '.ts');
+    return join(dir, `${name}.d${ext}.ts`);
   } else {
-    return filePath + '.d.ts';
+    return `${filePath}.d.ts`;
   }
 }
 
 function dashesCamelCase(str: string): string {
-  return str.replace(/-+(\w)/g, function (match, firstLetter) {
+  return str.replace(/-+(\w)/gu, (match, firstLetter) => {
     return firstLetter.toUpperCase();
   });
 }
@@ -53,9 +53,9 @@ function generateTokenDeclarations(
   tokens: Token[],
   dtsFormatOptions: DtsFormatOptions | undefined,
   isExternalFile: (filePath: string) => boolean,
-): typeof SourceNode[] {
+): (typeof SourceNode)[] {
   const formattedTokens = formatTokens(tokens, dtsFormatOptions?.localsConvention);
-  const result: typeof SourceNode[] = [];
+  const result: (typeof SourceNode)[] = [];
 
   for (const token of formattedTokens) {
     // Only one original position can be associated with one generated position.
@@ -66,7 +66,7 @@ function generateTokenDeclarations(
       if (originalLocation.filePath === undefined) {
         // If the original location is not specified, fallback to the source file.
         originalLocation = {
-          filePath: filePath,
+          filePath,
           start: { line: 1, column: 1 },
           end: { line: 1, column: 1 },
         };
@@ -101,6 +101,7 @@ function generateTokenDeclarations(
   return result;
 }
 
+// eslint-disable-next-line max-params
 export function generateDtsContentWithSourceMap(
   filePath: string,
   dtsFilePath: string,
@@ -122,10 +123,10 @@ export function generateDtsContentWithSourceMap(
     sourceNode = new SourceNode(null, null, null, '');
   } else {
     sourceNode = new SourceNode(1, 0, getRelativePath(sourceMapFilePath, filePath), [
-      'declare const styles:' + EOL,
+      `declare const styles:${EOL}`,
       ...tokenDeclarations.map((tokenDeclaration) => ['  ', tokenDeclaration, EOL]),
-      ';' + EOL,
-      'export default styles;' + EOL,
+      `;${EOL}`,
+      `export default styles;${EOL}`,
     ]);
   }
   const codeWithSourceMap = sourceNode.toStringWithSourceMap({

package/src/emitter/index.ts

@@ -12,7 +12,7 @@ export function getRelativePath(fromFilePath: string, toFilePath: string): strin
   if (resolved.startsWith('..')) {
     return resolved;
   } else {
-    return './' + resolved;
+    return `./${resolved}`;
   }
 }
 

package/src/emitter/source-map.test.ts

@@ -10,9 +10,9 @@ test('getSourceMapFilePath', () => {
 
 test('generateSourceMappingURLComment', () => {
   expect(generateSourceMappingURLComment('/app/src/dir/1.css.d.ts', '/app/src/dir/1.css.d.ts.map')).toBe(
-    '//# sourceMappingURL=./1.css.d.ts.map' + EOL,
+    `//# sourceMappingURL=./1.css.d.ts.map${EOL}`,
   );
   expect(generateSourceMappingURLComment('/app/src/dir1/1.css.d.ts', '/app/src/dir2/1.css.d.ts.map')).toBe(
-    '//# sourceMappingURL=../dir2/1.css.d.ts.map' + EOL,
+    `//# sourceMappingURL=../dir2/1.css.d.ts.map${EOL}`,
   );
 });

package/src/emitter/source-map.ts

@@ -9,9 +9,9 @@ import { getRelativePath } from './index.js';
  * @returns The path to the .d.ts.map file. It is absolute.
  */
 export function getSourceMapFilePath(filePath: string, arbitraryExtensions: boolean): string {
-  return getDtsFilePath(filePath, arbitraryExtensions) + '.map';
+  return `${getDtsFilePath(filePath, arbitraryExtensions)}.map`;
 }
 
 export function generateSourceMappingURLComment(dtsFilePath: string, sourceMapFilePath: string): string {
-  return `//# sourceMappingURL=${getRelativePath(dtsFilePath, sourceMapFilePath)}` + EOL;
+  return `//# sourceMappingURL=${getRelativePath(dtsFilePath, sourceMapFilePath)}${EOL}`;
 }

package/src/integration-test/go-to-definition.test.ts

@@ -4,7 +4,7 @@ import { run } from '../runner.js';
 import { createTSServer } from '../test-util/tsserver.js';
 import { createFixtures, getFixturePath } from '../test-util/util.js';
 
-const server = await createTSServer();
+const server = createTSServer();
 
 const defaultOptions: RunnerOptions = {
   pattern: 'test/**/*.{css,scss}',
@@ -41,10 +41,6 @@ test('basic', async () => {
       .local_class_name_3 {}
     }
     :local(.local_class_name_4) {}
-    .composes_target {}
-    .composes {
-      composes: composes_target;
-    }
     `,
   });
   await run({ ...defaultOptions });
@@ -65,8 +61,6 @@ test('basic', async () => {
     'local_class_name_2',
     'local_class_name_3',
     'local_class_name_4',
-    'composes_target',
-    'composes',
   ]);
   // FIXME: Fix an issue where the text at definition destination was incorrect.
   expect(results).toMatchInlineSnapshot(`
@@ -208,23 +202,6 @@ test('basic', async () => {
         ],
         "identifier": "local_class_name_4",
       },
-      {
-        "definitions": [
-          {
-      file: "<fixtures>/test/1.css",
-      text: ".composes_target ",
-      start: { line: 21, offset: 1 },
-      end: { line: 21, offset: 18 },
-    },
-        ],
-        "identifier": "composes_target",
-      },
-      {
-        "definitions": [
-          { file: "<fixtures>/test/1.css", text: ".composes ", start: { line: 22, offset: 1 }, end: { line: 22, offset: 11 } },
-        ],
-        "identifier": "composes",
-      },
     ]
   `);
   const moduleDefinitions = await server.getModuleDefinitions(getFixturePath('/test/1.css'));
@@ -295,8 +272,6 @@ test('with transformer', async () => {
       // sass feature test (nesting)
       .nesting_1 { dummy: ''; }
       &_2 { dummy: ''; }
-      composes: basic; // css module feature test (composes)
-      composes: d from './4.scss'; // css module feature test (composes from other file)
     }
     `,
     '/test/2.scss': dedent`
@@ -306,9 +281,6 @@ test('with transformer', async () => {
     '/test/3.scss': dedent`
     .c { dummy: ''; }
     `,
-    '/test/4.scss': dedent`
-    .d { dummy: ''; }
-    `,
   });
   await run({ ...defaultOptions });
   const results = await server.getMultipleIdentifierDefinitions(getFixturePath(`/test/1.scss`), [
@@ -319,7 +291,6 @@ test('with transformer', async () => {
     'b_1',
     'b_2',
     'c',
-    'd',
   ]);
   expect(results).toMatchInlineSnapshot(`
     [
@@ -364,12 +335,6 @@ test('with transformer', async () => {
         ],
         "identifier": "c",
       },
-      {
-        "definitions": [
-          { file: "<fixtures>/test/4.scss", text: ".d ", start: { line: 1, offset: 1 }, end: { line: 1, offset: 4 } },
-        ],
-        "identifier": "d",
-      },
     ]
   `);
 });

package/src/locator/index.test.ts

@@ -1,29 +1,13 @@
-import fs, { readFile, writeFile } from 'fs/promises';
+import { readFile, writeFile } from 'fs/promises';
 import { randomUUID } from 'node:crypto';
 import { jest } from '@jest/globals';
 import dedent from 'dedent';
-import { createDefaultTransformer } from '../index.js';
-import { createFixtures, FIXTURE_DIR_PATH, getFixturePath } from '../test-util/util.js';
+import { Locator, createDefaultTransformer } from '../index.js';
+import { createFixtures, getFixturePath } from '../test-util/util.js';
 import { sleepSync } from '../util.js';
 
-const readFileSpy = jest.spyOn(fs, 'readFile');
-// In ESM, for some reason, we need to explicitly mock module
-jest.unstable_mockModule('fs/promises', () => ({
-  ...fs, // Inherit native functions (e.g., fs.stat)
-  readFile: readFileSpy,
-}));
-
-// After the mock of fs/promises is complete, . /index.js after the mock of fs/promises is complete.
-// ref: https://www.coolcomputerclub.com/posts/jest-hoist-await/
-const { Locator } = await import('./index.js');
-// NOTE: ../test/util.js depends on . /index.js, so it must also be imported dynamically...
-
 const locator = new Locator();
 
-afterEach(() => {
-  readFileSpy.mockClear();
-});
-
 test('basic', async () => {
   createFixtures({
     '/test/1.css': dedent`
@@ -117,30 +101,22 @@ test('tracks other files when `@import` is present', async () => {
   `);
 });
 
-test('tracks other files when `composes` is present', async () => {
+test('does not track other files by `composes`', async () => {
   createFixtures({
     '/test/1.css': dedent`
     .a {
       composes: b from './2.css';
-      composes: c d from './3.css';
-      composes: e from '${getFixturePath('/test/4.css')}';
+      composes: c from './3.css'; /* non-existent file */
     }
     `,
     '/test/2.css': dedent`
     .b {}
     `,
-    '/test/3.css': dedent`
-    .c {}
-    .d {}
-    `,
-    '/test/4.css': dedent`
-    .e {}
-    `,
   });
   const result = await locator.load(getFixturePath('/test/1.css'));
   expect(result).toMatchInlineSnapshot(`
     {
-      dependencies: ["<fixtures>/test/2.css", "<fixtures>/test/3.css", "<fixtures>/test/4.css"],
+      dependencies: [],
       tokens: [
         {
           name: "a",
@@ -148,30 +124,6 @@ test('tracks other files when `composes` is present', async () => {
             { filePath: "<fixtures>/test/1.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
           ],
         },
-        {
-          name: "b",
-          originalLocations: [
-            { filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
-          ],
-        },
-        {
-          name: "c",
-          originalLocations: [
-            { filePath: "<fixtures>/test/3.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
-          ],
-        },
-        {
-          name: "d",
-          originalLocations: [
-            { filePath: "<fixtures>/test/3.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
-          ],
-        },
-        {
-          name: "e",
-          originalLocations: [
-            { filePath: "<fixtures>/test/4.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
-          ],
-        },
       ],
     }
   `);
@@ -183,14 +135,7 @@ test('normalizes tokens', async () => {
     /* duplicate import */
     @import './2.css';
     @import '2.css';
-    .a {
-      /* duplicate composes */
-      composes: c from './3.css';
-      composes: c from '3.css';
-      composes: c c from './3.css';
-      /* duplicate import and composes */
-      composes: b from './2.css';
-    }
+    .a {}
     .a {} /* duplicate class selector */
     `,
     '/test/2.css': dedent`
@@ -204,14 +149,14 @@ test('normalizes tokens', async () => {
   const result = await locator.load(getFixturePath('/test/1.css'));
   expect(result).toMatchInlineSnapshot(`
     {
-      dependencies: ["<fixtures>/test/2.css", "<fixtures>/test/3.css"],
+      dependencies: ["<fixtures>/test/2.css"],
       tokens: [
         {
           name: "a",
           originalLocations: [
             { filePath: "<fixtures>/test/2.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
             { filePath: "<fixtures>/test/1.css", start: { line: 4, column: 1 }, end: { line: 4, column: 2 } },
-            { filePath: "<fixtures>/test/1.css", start: { line: 12, column: 1 }, end: { line: 12, column: 2 } },
+            { filePath: "<fixtures>/test/1.css", start: { line: 5, column: 1 }, end: { line: 5, column: 2 } },
           ],
         },
         {
@@ -220,27 +165,16 @@ test('normalizes tokens', async () => {
             { filePath: "<fixtures>/test/2.css", start: { line: 2, column: 1 }, end: { line: 2, column: 2 } },
           ],
         },
-        {
-          name: "c",
-          originalLocations: [
-            { filePath: "<fixtures>/test/3.css", start: { line: 1, column: 1 }, end: { line: 1, column: 2 } },
-          ],
-        },
       ],
     }
   `);
 });
 
-test.failing('returns the result from the cache when the file has not been modified', async () => {
+test('returns the result from the cache when the file has not been modified', async () => {
   createFixtures({
     '/test/1.css': dedent`
     @import './2.css';
-    @import './2.css';
-    .a {
-      composes: b from './2.css';
-      composes: c from './3.css';
-      composes: d from './3.css';
-    }
+    @import './3.css';
     `,
     '/test/2.css': dedent`
     .b {}
@@ -250,12 +184,14 @@ test.failing('returns the result from the cache when the file has not been modif
     .d {}
     `,
   });
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const readCSSSpy = jest.spyOn(locator, 'readCSS' as any);
   await locator.load(getFixturePath('/test/1.css'));
-  expect(readFileSpy).toHaveBeenCalledTimes(3);
-  expect(readFileSpy).toHaveBeenNthCalledWith(1, '/test/1.css', 'utf-8');
-  expect(readFileSpy).toHaveBeenNthCalledWith(2, '/test/2.css', 'utf-8');
-  expect(readFileSpy).toHaveBeenNthCalledWith(3, '/test/3.css', 'utf-8');
-  readFileSpy.mockClear();
+  expect(readCSSSpy).toHaveBeenCalledTimes(3);
+  expect(readCSSSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.css'));
+  expect(readCSSSpy).toHaveBeenNthCalledWith(2, getFixturePath('/test/2.css'));
+  expect(readCSSSpy).toHaveBeenNthCalledWith(3, getFixturePath('/test/3.css'));
+  readCSSSpy.mockClear();
 
   // update `/test/2.css`
   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
 
   // `3.css` is not updated, so the cache is used. Therefore, `readFile` is not called.
   await locator.load(getFixturePath('/test/3.css'));
-  expect(readFileSpy).toHaveBeenCalledTimes(0);
+  expect(readCSSSpy).toHaveBeenCalledTimes(0);
 
   // `1.css` is not updated, but dependencies are updated, so the cache is used. Therefore, `readFile` is called.
   await locator.load(getFixturePath('/test/1.css'));
-  expect(readFileSpy).toHaveBeenCalledTimes(2);
-  expect(readFileSpy).toHaveBeenNthCalledWith(1, '/test/1.css', 'utf-8');
-  expect(readFileSpy).toHaveBeenNthCalledWith(2, '/test/2.css', 'utf-8');
+  expect(readCSSSpy).toHaveBeenCalledTimes(2);
+  expect(readCSSSpy).toHaveBeenNthCalledWith(1, getFixturePath('/test/1.css'));
+  expect(readCSSSpy).toHaveBeenNthCalledWith(2, getFixturePath('/test/2.css'));
 
   // ``2.css` is updated, but the cache is already available because it was updated in the previous step. Therefore, `readFile` is not called.
   await locator.load(getFixturePath('/test/2.css'));
-  expect(readFileSpy).toHaveBeenCalledTimes(2);
-});
-
-test('ignores the composition of non-existent tokens', async () => {
-  // In css-loader and postcss-modules, compositions of non-existent tokens are simply ignored.
-  // Therefore, happy-css-modules follows suit.
-  // It may be preferable to warn rather than ignore, but for now, we will focus on compatibility.
-  // ref: https://github.com/css-modules/css-modules/issues/356
-  createFixtures({
-    '/test/1.css': dedent`
-    .a {
-      composes: b c from './2.css';
-    }
-    `,
-    '/test/2.css': dedent`
-    .b {}
-    `,
-  });
-  const result = await locator.load(getFixturePath('/test/1.css'));
-  expect(result.tokens.map((t) => t.name)).toStrictEqual(['a', 'b']);
-});
-
-test('throws error the composition of non-existent file', async () => {
-  // In postcss-modules, compositions of non-existent file are causes an error.
-  // Therefore, happy-css-modules follows suit.
-  createFixtures({
-    '/test/1.css': dedent`
-    .a {
-      composes: a from './2.css';
-    }
-    `,
-  });
-  await expect(async () => {
-    await locator.load(getFixturePath('/test/1.css')).catch((e) => {
-      e.message = e.message.replace(FIXTURE_DIR_PATH, '<fixtures>');
-      throw e;
-    });
-  }).rejects.toThrowError(`Could not resolve './2.css' in '<fixtures>/test/1.css'`);
+  expect(readCSSSpy).toHaveBeenCalledTimes(2);
 });
 
 describe('supports sourcemap', () => {