happy-css-modules 4.0.0 → 5.0.0

package/src/locator/index.ts

@@ -1,4 +1,4 @@
-import { readFile, stat } from 'fs/promises';
+import { readFile, stat } from 'node:fs/promises';
 import postcss from 'postcss';
 import type { Resolver } from '../resolver/index.js';
 import { createDefaultResolver } from '../resolver/index.js';
@@ -85,7 +85,7 @@ export class Locator {
     for (const dependency of dependencies) {
       const entry = this.cache.get(dependency);
       if (!entry) return true;
-      // eslint-disable-next-line no-await-in-loop
+      // oxlint-disable-next-line no-await-in-loop
       const mtime = (await stat(dependency)).mtime.getTime();
       if (entry.mtime !== mtime) return true;
     }
@@ -159,9 +159,9 @@ export class Locator {
       const importedSheetPath = parseAtImport(atImport);
       if (!importedSheetPath) continue;
       if (isIgnoredSpecifier(importedSheetPath)) continue;
-      // eslint-disable-next-line no-await-in-loop
+      // oxlint-disable-next-line no-await-in-loop
       const from = await this.resolver(importedSheetPath, { request: filePath });
-      // eslint-disable-next-line no-await-in-loop
+      // oxlint-disable-next-line no-await-in-loop
       const result = await this._load(from);
       const externalTokens = result.tokens;
       dependencies.push(from, ...result.dependencies);
@@ -192,9 +192,9 @@ export class Locator {
         });
       } else if (parsedAtValue.type === 'valueImportDeclaration') {
         if (isIgnoredSpecifier(parsedAtValue.from)) continue;
-        // eslint-disable-next-line no-await-in-loop
+        // oxlint-disable-next-line no-await-in-loop
         const from = await this.resolver(parsedAtValue.from, { request: filePath });
-        // eslint-disable-next-line no-await-in-loop
+        // oxlint-disable-next-line no-await-in-loop
         const result = await this._load(from);
         dependencies.push(from, ...result.dependencies);
         for (const token of result.tokens) {

package/src/locator/postcss.test.ts

@@ -67,7 +67,7 @@ describe('generateLocalTokenNames', () => {
   test('does not track styles imported by @import in other file because it is not a local token', async () => {
     createFixtures({
       '/test/1.css': dedent`
-      .a {}
+        .a {}
       `,
     });
     expect(
@@ -81,7 +81,7 @@ describe('generateLocalTokenNames', () => {
   test('does not track styles imported by @value in other file because it is not a local token', async () => {
     createFixtures({
       '/test/1.css': dedent`
-      .a {}
+        .a {}
       `,
     });
     expect(
@@ -95,7 +95,7 @@ describe('generateLocalTokenNames', () => {
   test('does not track styles imported by composes in other file because it is not a local token', async () => {
     createFixtures({
       '/test/1.css': dedent`
-      .b {}
+        .b {}
       `,
     });
     expect(
@@ -114,176 +114,408 @@ describe('getOriginalLocationOfClassSelector', () => {
   test('basic', () => {
     const [basic] = createClassSelectors(
       createRoot(dedent`
-      .basic {}
+        .basic {}
       `),
     );
     expect(getOriginalLocationOfClassSelector(basic!.rule, basic!.classSelector)).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 6 } }`,
+      `
+      {
+        "end": {
+          "column": 6,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 1,
+        },
+      }
+    `,
     );
   });
   test('cascading', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [cascading_1, cascading_2] = createClassSelectors(
       createRoot(dedent`
-      .cascading {}
-      .cascading {}
+        .cascading {}
+        .cascading {}
       `),
     );
     expect(getOriginalLocationOfClassSelector(cascading_1!.rule, cascading_1!.classSelector)).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 10 } }`,
+      `
+      {
+        "end": {
+          "column": 10,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 1,
+        },
+      }
+    `,
     );
     expect(getOriginalLocationOfClassSelector(cascading_2!.rule, cascading_2!.classSelector)).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 2, column: 1 }, end: { line: 2, column: 10 } }`,
+      `
+      {
+        "end": {
+          "column": 10,
+          "line": 2,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 2,
+        },
+      }
+    `,
     );
   });
   test('pseudo_class', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [pseudo_class_1, pseudo_class_2, pseudo_class_3] = createClassSelectors(
       createRoot(dedent`
-      .pseudo_class_1 {}
-      .pseudo_class_2:hover {}
-      :not(.pseudo_class_3) {}
+        .pseudo_class_1 {}
+        .pseudo_class_2:hover {}
+        :not(.pseudo_class_3) {}
       `),
     );
     expect(
       getOriginalLocationOfClassSelector(pseudo_class_1!.rule, pseudo_class_1!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 15 } }`,
+      `
+      {
+        "end": {
+          "column": 15,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 1,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(pseudo_class_2!.rule, pseudo_class_2!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 2, column: 1 }, end: { line: 2, column: 15 } }`,
+      `
+      {
+        "end": {
+          "column": 15,
+          "line": 2,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 2,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(pseudo_class_3!.rule, pseudo_class_3!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 3, column: 6 }, end: { line: 3, column: 20 } }`,
+      `
+      {
+        "end": {
+          "column": 20,
+          "line": 3,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 6,
+          "line": 3,
+        },
+      }
+    `,
     );
   });
   test('multiple_selector', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [multiple_selector_1, multiple_selector_2] = createClassSelectors(
       createRoot(dedent`
-      .multiple_selector_1.multiple_selector_2 {}
+        .multiple_selector_1.multiple_selector_2 {}
       `),
     );
     expect(
       getOriginalLocationOfClassSelector(multiple_selector_1!.rule, multiple_selector_1!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 20 } }`,
+      `
+      {
+        "end": {
+          "column": 20,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 1,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(multiple_selector_2!.rule, multiple_selector_2!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 21 }, end: { line: 1, column: 40 } }`,
+      `
+      {
+        "end": {
+          "column": 40,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 21,
+          "line": 1,
+        },
+      }
+    `,
     );
   });
 
   test('combinator', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [combinator_1, combinator_2] = createClassSelectors(
       createRoot(dedent`
-      .combinator_1 + .combinator_2 {}
+        .combinator_1 + .combinator_2 {}
       `),
     );
     expect(getOriginalLocationOfClassSelector(combinator_1!.rule, combinator_1!.classSelector)).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 13 } }`,
+      `
+      {
+        "end": {
+          "column": 13,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 1,
+        },
+      }
+    `,
     );
     expect(getOriginalLocationOfClassSelector(combinator_2!.rule, combinator_2!.classSelector)).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 17 }, end: { line: 1, column: 29 } }`,
+      `
+      {
+        "end": {
+          "column": 29,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 17,
+          "line": 1,
+        },
+      }
+    `,
     );
   });
   test('at_rule', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [at_rule] = createClassSelectors(
       createRoot(dedent`
-      @supports (display: flex) {
-        @media screen and (min-width: 900px) {
-          .at_rule {}
+        @supports (display: flex) {
+          @media screen and (min-width: 900px) {
+            .at_rule {}
+          }
         }
-      }
       `),
     );
     expect(getOriginalLocationOfClassSelector(at_rule!.rule, at_rule!.classSelector)).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 3, column: 5 }, end: { line: 3, column: 12 } }`,
+      `
+      {
+        "end": {
+          "column": 12,
+          "line": 3,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 5,
+          "line": 3,
+        },
+      }
+    `,
     );
   });
   test('selector_list', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [selector_list_1, selector_list_2] = createClassSelectors(
       createRoot(dedent`
-      .selector_list_1, .selector_list_2 {}
+        .selector_list_1, .selector_list_2 {}
       `),
     );
     expect(
       getOriginalLocationOfClassSelector(selector_list_1!.rule, selector_list_1!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 16 } }`,
+      `
+      {
+        "end": {
+          "column": 16,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 1,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(selector_list_2!.rule, selector_list_2!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 19 }, end: { line: 1, column: 34 } }`,
+      `
+      {
+        "end": {
+          "column": 34,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 19,
+          "line": 1,
+        },
+      }
+    `,
     );
   });
   test('local_class_name', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [local_class_name_1, local_class_name_2, local_class_name_3, local_class_name_4] = createClassSelectors(
       createRoot(dedent`
-      :local .local_class_name_1 {}
-      :local {
-        .local_class_name_2 {}
-        .local_class_name_3 {}
-      }
-      :local(.local_class_name_4) {}
+        :local .local_class_name_1 {}
+        :local {
+          .local_class_name_2 {}
+          .local_class_name_3 {}
+        }
+        :local(.local_class_name_4) {}
       `),
     );
     expect(
       getOriginalLocationOfClassSelector(local_class_name_1!.rule, local_class_name_1!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 8 }, end: { line: 1, column: 26 } }`,
+      `
+      {
+        "end": {
+          "column": 26,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 8,
+          "line": 1,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(local_class_name_2!.rule, local_class_name_2!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 3, column: 3 }, end: { line: 3, column: 21 } }`,
+      `
+      {
+        "end": {
+          "column": 21,
+          "line": 3,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 3,
+          "line": 3,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(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 } }`,
+      `
+      {
+        "end": {
+          "column": 21,
+          "line": 4,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 3,
+          "line": 4,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(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 } }`,
+      `
+      {
+        "end": {
+          "column": 26,
+          "line": 6,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 8,
+          "line": 6,
+        },
+      }
+    `,
     );
   });
   test('with_newline', () => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     const [with_newline_1, with_newline_2, with_newline_3] = createClassSelectors(
       createRoot(dedent`
-      .with_newline_1,
-      .with_newline_2
-        + .with_newline_3, {}
+        .with_newline_1,
+        .with_newline_2
+          + .with_newline_3, {}
       `),
     );
     expect(
       getOriginalLocationOfClassSelector(with_newline_1!.rule, with_newline_1!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 1, column: 1 }, end: { line: 1, column: 15 } }`,
+      `
+      {
+        "end": {
+          "column": 15,
+          "line": 1,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 1,
+        },
+      }
+    `,
     );
     expect(
       getOriginalLocationOfClassSelector(with_newline_2!.rule, with_newline_2!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 2, column: 1 }, end: { line: 2, column: 15 } }`,
+      `
+      {
+        "end": {
+          "column": 15,
+          "line": 2,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 1,
+          "line": 2,
+        },
+      }
+    `,
     );
 
     expect(
       getOriginalLocationOfClassSelector(with_newline_3!.rule, with_newline_3!.classSelector),
     ).toMatchInlineSnapshot(
-      `{ filePath: "/test/test.css", start: { line: 3, column: 5 }, end: { line: 3, column: 19 } }`,
+      `
+      {
+        "end": {
+          "column": 19,
+          "line": 3,
+        },
+        "filePath": "/test/test.css",
+        "start": {
+          "column": 5,
+          "line": 3,
+        },
+      }
+    `,
     );
   });
 });
@@ -299,11 +531,23 @@ test('getOriginalLocationOfAtValue', () => {
   }
   const [basic] = createAtValues(
     createRoot(dedent`
-    @value basic: #000;
+      @value basic: #000;
     `),
   );
   expect(tryGetOriginalLocationOfAtValue(basic!)).toMatchInlineSnapshot(
-    `{ filePath: "/test/test.css", start: { line: 1, column: 8 }, end: { line: 1, column: 13 } }`,
+    `
+    {
+      "end": {
+        "column": 13,
+        "line": 1,
+      },
+      "filePath": "/test/test.css",
+      "start": {
+        "column": 8,
+        "line": 1,
+      },
+    }
+  `,
   );
 });
 
@@ -314,7 +558,7 @@ test('collectNodes', () => {
     @ignored;
     .a { ignored: "ignored"; }
     .b { ignored: "ignored"; }
-    `);
+  `);
 
   const { atImports, classSelectors } = collectNodes(ast);
 
@@ -331,11 +575,11 @@ test('collectNodes', () => {
 test('parseAtImport', () => {
   const atImports = createAtImports(
     createRoot(dedent`
-    @import;
-    @import "test.css";
-    @import url("test.css");
-    @import url(test.css);
-    @import "test.css" print;
+      @import;
+      @import "test.css";
+      @import url("test.css");
+      @import url(test.css);
+      @import "test.css" print;
     `),
   );
   expect(parseAtImport(atImports[0]!)).toBe(undefined);
@@ -348,18 +592,18 @@ test('parseAtImport', () => {
 test('parseAtValue', () => {
   const atValues = createAtValues(
     createRoot(dedent`
-    @value basic: #000;
-    @value withoutColon #000;
-    @value empty:;
-    @value comment:/* comment */;
-    @value complex: (max-width: 599px);
-    @value import from "test.css";
-    @value import1, import2 from "test.css";
-    @value import as alias from "test.css";
-    /*
-     * NOTE: happy-css-modules intentionally does not support module specifier as variable.
-     * e.g. \`@value d, e from moduleName;\`
-     */
+      @value basic: #000;
+      @value withoutColon #000;
+      @value empty:;
+      @value comment:/* comment */;
+      @value complex: (max-width: 599px);
+      @value import from "test.css";
+      @value import1, import2 from "test.css";
+      @value import as alias from "test.css";
+      /*
+       * NOTE: happy-css-modules intentionally does not support module specifier as variable.
+       * e.g. \`@value d, e from moduleName;\`
+       */
     `),
   );
   expect(parseAtValue(atValues[0]!)).toStrictEqual({ type: 'valueDeclaration', tokenName: 'basic' });

package/src/locator/postcss.ts

@@ -251,7 +251,6 @@ export function parseAtValue(atValue: AtRule): ParsedAtValue {
   if (matchesForImports) {
     const [, aliases, path] = matchesForImports;
 
-    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
     if (aliases === undefined || path === undefined) throw new Error(`unreachable`);
 
     const imports = aliases
@@ -278,11 +277,11 @@ export function parseAtValue(atValue: AtRule): ParsedAtValue {
 
   const matchesForValueDefinitions = `${atValue.params}${atValue.raws.between!}`.match(matchValueDefinition);
   if (matchesForValueDefinitions) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    // oxlint-disable-next-line no-unused-vars
     const [, key, value] = matchesForValueDefinitions;
     if (key === undefined) throw new Error(`unreachable`);
     return { type: 'valueDeclaration', tokenName: key };
   }
-  // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+  // oxlint-disable-next-line typescript/restrict-template-expressions, typescript/no-base-to-string
   throw new Error(`@value statement "${atValue.source!}" is invalid!`);
 }

package/src/logger.ts

@@ -1,4 +1,4 @@
-import chalk from 'chalk';
+import { styleText } from 'node:util';
 type LogLevelLabel = 'debug' | 'info' | 'silent';
 type LogLevel = 2 | 1 | 0;
 const LOG_LEVEL: Record<LogLevelLabel, LogLevel> = {
@@ -14,18 +14,18 @@ export class Logger {
   }
   debug(message: unknown) {
     if (this.logLevel >= LOG_LEVEL['debug']) {
-      // eslint-disable-next-line no-console
+      // oxlint-disable-next-line no-console
       console.log('[debug]', message);
     }
   }
   info(message: unknown) {
     if (this.logLevel >= LOG_LEVEL['info']) {
-      // eslint-disable-next-line no-console
-      console.log(chalk.blue('[info]'), message);
+      // oxlint-disable-next-line no-console
+      console.log(styleText('blue', '[info]'), message);
     }
   }
   error(message: unknown) {
-    // eslint-disable-next-line no-console
-    console.error(chalk.red('[error]'), message);
+    // oxlint-disable-next-line no-console
+    console.error(styleText('red', '[error]'), message);
   }
 }

package/src/regression-test/issue-168.test.ts

@@ -1,4 +1,4 @@
-import { symlink } from 'fs/promises';
+import { symlink } from 'node:fs/promises';
 import type { RunnerOptions, Watcher } from '../runner.js';
 import { run } from '../runner.js';
 import { createFixtures, getFixturePath, waitForAsyncTask } from '../test-util/util.js';
@@ -10,7 +10,6 @@ const defaultOptions: RunnerOptions = {
   logLevel: 'silent',
 };
 
-// eslint-disable-next-line @typescript-eslint/no-empty-function
 const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
 
 // Exit the watcher even if the test fails
@@ -29,5 +28,5 @@ it('issue-168', async () => {
   await symlink(getFixturePath('/test/non-css-file.txt'), getFixturePath('/test/symlink.txt'));
   watcher = await run({ ...defaultOptions, watch: true });
   await waitForAsyncTask(300); // Wait for initial code generation to complete
-  expect(consoleErrorSpy).not.toBeCalled(); // If an error is output, then failed
+  expect(consoleErrorSpy).not.toHaveBeenCalled(); // If an error is output, then failed
 });