Merge branch 'main' into dependabot/npm_and_yarn/eslint/js-9.34.0

Author: kmruiz

.github/workflows/code_health.yaml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: GitHubSecurityLab/actions-permissions/monitor@v1
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:

.github/workflows/code_health_fork.yaml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: GitHubSecurityLab/actions-permissions/monitor@v1
-        if: matrix.os != 'windows-latest'
+        if: matrix.os == 'ubuntu-latest'
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v4
         with:

eslint-rules/no-config-imports.js

@@ -0,0 +1,71 @@
+"use strict";
+import path from "path";
+
+// The file from which we wish to discourage importing values
+const configFilePath = path.resolve(import.meta.dirname, "../src/common/config.js");
+
+// Files that are allowed to import value exports from config.ts
+const allowedConfigValueImportFiles = [
+    // Main entry point that injects the config
+    "src/index.ts",
+    // Config resource definition that works with the some config values
+    "src/resources/common/config.ts",
+];
+
+// Ref: https://eslint.org/docs/latest/extend/custom-rules
+export default {
+    meta: {
+        type: "problem",
+        docs: {
+            description:
+                "Disallows value imports from config.ts, with a few exceptions, to enforce dependency injection of the config.",
+            recommended: true,
+        },
+        fixable: null,
+        messages: {
+            noConfigImports:
+                "Value imports from config.ts are not allowed. Use dependency injection instead. Only type imports are permitted.",
+        },
+    },
+    create(context) {
+        const currentFilePath = path.resolve(context.getFilename());
+
+        const isCurrentFileAllowedToImport = allowedConfigValueImportFiles.some((allowedFile) => {
+            const resolvedAllowedFile = path.resolve(allowedFile);
+            return currentFilePath === resolvedAllowedFile;
+        });
+
+        if (isCurrentFileAllowedToImport) {
+            return {};
+        }
+
+        return {
+            ImportDeclaration(node) {
+                const importPath = node.source.value;
+
+                // If the path is not relative, very likely its targeting a
+                // node_module so we skip it. And also if the entire import is
+                // marked with a type keyword.
+                if (typeof importPath !== "string" || !importPath.startsWith(".") || node.importKind === "type") {
+                    return;
+                }
+
+                const currentDir = path.dirname(currentFilePath);
+                const resolvedImportPath = path.resolve(currentDir, importPath);
+
+                if (resolvedImportPath === configFilePath) {
+                    const hasValueImportFromConfig = node.specifiers.some((specifier) => {
+                        return specifier.importKind !== "type";
+                    });
+
+                    if (hasValueImportFromConfig) {
+                        context.report({
+                            node,
+                            messageId: "noConfigImports",
+                        });
+                    }
+                }
+            },
+        };
+    },
+};

eslint-rules/no-config-imports.test.js

@@ -0,0 +1,69 @@
+import path from "path";
+import { RuleTester } from "eslint";
+import { describe, it } from "vitest";
+import tsParser from "@typescript-eslint/parser";
+import rule from "./no-config-imports.js";
+
+const ROOT = process.cwd();
+const resolve = (p) => path.resolve(ROOT, p);
+
+const ruleTester = new RuleTester({
+    languageOptions: {
+        parser: tsParser,
+        parserOptions: { ecmaVersion: 2022, sourceType: "module" },
+    },
+});
+
+describe("no-config-imports", () => {
+    it("should not report any violations", () => {
+        ruleTester.run("no-config-imports", rule, {
+            valid: [
+                {
+                    filename: resolve("src/some/module.ts"),
+                    code: 'import type { UserConfig } from "../common/config.js";\n',
+                },
+                {
+                    filename: resolve("src/some/module.ts"),
+                    code: 'import { something } from "../common/logger.js";\n',
+                },
+                {
+                    filename: resolve("src/some/module.ts"),
+                    code: 'import type * as Cfg from "../common/config.js";\n',
+                },
+                {
+                    filename: resolve("src/index.ts"),
+                    code: 'import { driverOptions } from "../common/config.js";\n',
+                },
+            ],
+            invalid: [],
+        });
+    });
+
+    it("should report rule violations", () => {
+        ruleTester.run("no-config-imports", rule, {
+            valid: [],
+            invalid: [
+                {
+                    filename: resolve("src/another/module.ts"),
+                    code: 'import { driverOptions } from "../common/config.js";\n',
+                    errors: [{ messageId: "noConfigImports" }],
+                },
+                {
+                    filename: resolve("src/another/module.ts"),
+                    code: 'import configDefault from "../common/config.js";\n',
+                    errors: [{ messageId: "noConfigImports" }],
+                },
+                {
+                    filename: resolve("src/another/module.ts"),
+                    code: 'import * as cfg from "../common/config.js";\n',
+                    errors: [{ messageId: "noConfigImports" }],
+                },
+                {
+                    filename: resolve("src/another/module.ts"),
+                    code: 'import { type UserConfig, driverOptions } from "../common/config.js";\n',
+                    errors: [{ messageId: "noConfigImports" }],
+                },
+            ],
+        });
+    });
+});

eslint.config.js

@@ -1,9 +1,11 @@
+import path from "path";
 import { defineConfig, globalIgnores } from "eslint/config";
 import js from "@eslint/js";
 import globals from "globals";
 import tseslint from "typescript-eslint";
 import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
 import vitestPlugin from "@vitest/eslint-plugin";
+import noConfigImports from "./eslint-rules/no-config-imports.js";
 
 const testFiles = ["tests/**/*.test.ts", "tests/**/*.ts"];
 
@@ -62,6 +64,19 @@ export default defineConfig([
             "@typescript-eslint/explicit-function-return-type": "error",
         },
     },
+    {
+        files: ["src/**/*.ts"],
+        plugins: {
+            "no-config-imports": {
+                rules: {
+                    "no-config-imports": noConfigImports,
+                },
+            },
+        },
+        rules: {
+            "no-config-imports/no-config-imports": "error",
+        },
+    },
     globalIgnores([
         "node_modules",
         "dist",
@@ -72,6 +87,7 @@ export default defineConfig([
         "vitest.config.ts",
         "src/types/*.d.ts",
         "tests/integration/fixtures/",
+        "eslint-rules",
     ]),
     eslintPluginPrettierRecommended,
 ]);