@open-xchange/linter-presets 0.1.4 → 0.1.5

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules/typescript/lib"
+}

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.1.5] - 2024-07-23
+
+- chore: bump dependencies
+
 ## [0.1.4] - 2024-07-15
 
 - added: [ESLint] option `language.nativeDecorators` to support native ES decorators in JS files

package/dist/eslint/config/base.js

@@ -119,7 +119,7 @@ export default function base(options) {
                 "object-shorthand": "error",
                 "operator-assignment": "error",
                 "prefer-arrow-callback": "error",
-                "prefer-const": ["error", { ignoreReadBeforeAssign: true }],
+                "prefer-const": ["error", { destructuring: "all", ignoreReadBeforeAssign: true }],
                 "prefer-numeric-literals": "error",
                 "prefer-regex-literals": "error",
                 "prefer-rest-params": "error",

package/dist/eslint/config/ts.js

@@ -63,9 +63,11 @@ export default function ts() {
             "@typescript-eslint/no-shadow": ["error", { ignoreOnInitialization: true }],
             "@typescript-eslint/no-unnecessary-template-expression": "error",
             "@typescript-eslint/no-unsafe-enum-comparison": "error",
+            "@typescript-eslint/no-unsafe-function-type": "error",
             "@typescript-eslint/no-unsafe-unary-minus": "error",
             "@typescript-eslint/no-unused-vars": ["error", NO_UNUSED_VARS_OPTIONS],
             "@typescript-eslint/no-useless-constructor": "error",
+            "@typescript-eslint/no-wrapper-object-types": "error",
             "@typescript-eslint/only-throw-error": "error",
             "@typescript-eslint/prefer-find": "error",
             "@typescript-eslint/prefer-literal-enum-member": "error",

package/dist/eslint/env/browser.d.ts

@@ -1,14 +1,9 @@
 import type { TSESLint } from "@typescript-eslint/utils";
-import type { EnvBaseOptions, EnvRestrictedOptions } from "../shared/env-utils.js";
+import type { EnvRestrictedOptions } from "../shared/env-utils.js";
 /**
  * Configuration options for the environment preset "env.browser".
  */
-export interface EnvBrowserOptions extends EnvBaseOptions {
-    /**
-     * All globals, imports, properties, and syntax constructs to be banned for
-     * the files included by the environment.
-     */
-    restricted?: EnvRestrictedOptions;
+export interface EnvBrowserOptions extends EnvRestrictedOptions {
 }
 /**
  * Creates configuration objects with global symbols and linter rules for for

package/dist/eslint/env/browser.js

@@ -1,6 +1,6 @@
 import JAVASCRIPT_GLOBALS from "globals";
 import CONFUSING_BROWSER_GLOBALS from "confusing-browser-globals";
-import { generateRestrictedRules } from "../shared/env-utils.js";
+import { concatConfigs, createConfig, restrictedRules, customRules } from "../shared/env-utils.js";
 // constants ==================================================================
 /**
  * Global builtin symbols that are confusing or deprecated.
@@ -91,30 +91,19 @@ const RESTRICTED_GLOBALS = AMBIGUOUS_BROWSER_TYPES.map(name => {
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function browser(options) {
-    // configuration properties
-    const { files, ignores = [], rules } = options;
+    return concatConfigs(
+    // register global symbols used in browser scripts
+    createConfig(options, {
+        languageOptions: {
+            globals: BROWSER_GLOBALS,
+        },
+    }), 
     // generate the "no-restricted-?" rules according to passed configuration
-    const restricted = generateRestrictedRules({
+    restrictedRules(options, {
         globals: RESTRICTED_GLOBALS,
         properties: RESTRICTED_PROPERTIES,
         syntax: RESTRICTED_SYNTAX,
-    }, options?.restricted);
-    return [
-        // base configuration for the environment
-        {
-            files,
-            ignores,
-            // register global symbols used in browser scripts
-            languageOptions: {
-                globals: BROWSER_GLOBALS,
-            },
-            // configure rules
-            rules: {
-                ...restricted.rules,
-                ...rules,
-            },
-        },
-        // "no-restricted-?" rules overrides for specific files
-        ...restricted.overrides,
-    ];
+    }), 
+    // custom rules
+    customRules(options));
 }

package/dist/eslint/env/codecept.js

@@ -6,6 +6,7 @@
 */
 import codeceptPlugin from "eslint-plugin-codeceptjs";
 import chaiExpectPlugin from "eslint-plugin-chai-expect";
+import { concatConfigs, createConfig, customRules } from "../shared/env-utils.js";
 // functions ==================================================================
 /**
  * Creates configuration objects with global symbols and linter rules for E2E
@@ -22,40 +23,28 @@ import chaiExpectPlugin from "eslint-plugin-chai-expect";
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function codecept(options) {
-    // configuration properties
-    const { files, ignores = [], rules } = options;
-    return [
-        {
-            files,
-            ignores,
-            // register rule implementations of the plugins
-            plugins: {
-                codeceptjs: codeceptPlugin,
-            },
-            // register global symbols of CodeceptJS
-            languageOptions: {
-                globals: {
-                    ...codeceptPlugin.environments.codeceptjs.globals,
-                },
-            },
-            // configure plugin rules
-            rules: {
-                // recommended rules
-                ...codeceptPlugin.configs.recommended.rules,
-                // extra rules
-                "new-cap": ["error", {
-                        capIsNewExceptions: ["After", "AfterSuite", "Before", "BeforeSuite", "Feature", "Scenario"],
-                    }],
-                "no-restricted-properties": ["warn", { object: "Scenario", property: "todo", message: "Unexpected unimplemented test." }],
-                "codeceptjs/no-skipped-tests": "warn",
-                // custom rules
-                ...rules,
-            },
+    return concatConfigs(
+    // "codecept" plugin
+    createConfig(options, {
+        // register rule implementations of the plugins
+        plugins: {
+            codeceptjs: codeceptPlugin,
         },
-        {
-            files,
-            ignores,
-            ...chaiExpectPlugin.configs["recommended-flat"],
+        // register global symbols of CodeceptJS
+        languageOptions: {
+            globals: codeceptPlugin.environments.codeceptjs.globals,
         },
-    ];
+        // recommended rules
+        rules: codeceptPlugin.configs.recommended.rules,
+    }), 
+    // "chai-expect" plugin
+    createConfig(options, chaiExpectPlugin.configs["recommended-flat"]), 
+    // custom rules
+    customRules(options, {
+        "new-cap": ["error", {
+                capIsNewExceptions: ["After", "AfterSuite", "Before", "BeforeSuite", "Feature", "Scenario"],
+            }],
+        "no-restricted-properties": ["warn", { object: "Scenario", property: "todo", message: "Unexpected unimplemented test." }],
+        "codeceptjs/no-skipped-tests": "warn",
+    }));
 }

package/dist/eslint/env/eslint.js

@@ -1,4 +1,5 @@
 import eslintPlugin from "eslint-plugin-eslint-plugin";
+import { concatConfigs, createConfig, customRules } from "../shared/env-utils.js";
 // exports ====================================================================
 /**
  * Adds linter rules for ESLint plugin implementations.
@@ -13,22 +14,9 @@ import eslintPlugin from "eslint-plugin-eslint-plugin";
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function eslint(options) {
-    // configuration properties
-    const { files, ignores = [], rules = {} } = options;
-    // the plugin configuration
-    const pluginConfig = eslintPlugin.configs["flat/rules-recommended"];
-    return [
-        // register rule implementations and recommended rules
-        {
-            files,
-            ignores,
-            ...pluginConfig,
-        },
-        // reconfigure plugin rules
-        {
-            files,
-            ignores,
-            rules,
-        },
-    ];
+    return concatConfigs(
+    // register rule implementations and recommended rules
+    createConfig(options, eslintPlugin.configs["flat/rules-recommended"]), 
+    // custom rules
+    customRules(options));
 }

package/dist/eslint/env/jest.js

@@ -1,4 +1,5 @@
 import jestPlugin from "eslint-plugin-jest";
+import { concatConfigs, createConfig, customRules } from "../shared/env-utils.js";
 // functions ==================================================================
 /**
  * Creates configuration objects with global symbols and linter rules for unit
@@ -14,36 +15,29 @@ import jestPlugin from "eslint-plugin-jest";
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function jest(options) {
-    // config properties
-    const { files, ignores = [], rules } = options;
-    return [{
-            files,
-            ignores,
-            // register rule implementations, globals
-            ...jestPlugin.configs["flat/recommended"],
-            // configure plugin rules
-            rules: {
-                // recommended rules
-                ...jestPlugin.configs["flat/recommended"].rules,
-                ...jestPlugin.configs["flat/style"].rules,
-                // extra rules
-                "jest/consistent-test-it": ["error", { fn: "it" }],
-                "jest/no-commented-out-tests": "error",
-                "jest/no-conditional-expect": "off",
-                "jest/no-confusing-set-timeout": "error",
-                "jest/no-duplicate-hooks": "error",
-                "jest/no-test-return-statement": "error",
-                "jest/prefer-comparison-matcher": "error",
-                "jest/prefer-equality-matcher": "error",
-                "jest/prefer-expect-resolves": "error",
-                "jest/prefer-hooks-on-top": "error",
-                "jest/prefer-lowercase-title": "error",
-                "jest/prefer-mock-promise-shorthand": "error",
-                "jest/prefer-spy-on": "error",
-                "jest/prefer-todo": "error",
-                "jest/require-top-level-describe": "error",
-                // custom rules
-                ...rules,
-            },
-        }];
+    return concatConfigs(
+    // register rule implementations, globals, and recommended rules
+    createConfig(options, jestPlugin.configs["flat/recommended"]), 
+    // add recommended stylistic rules
+    createConfig(options, {
+        rules: jestPlugin.configs["flat/style"].rules,
+    }), 
+    // custom rules
+    customRules(options, {
+        "jest/consistent-test-it": ["error", { fn: "it" }],
+        "jest/no-commented-out-tests": "error",
+        "jest/no-conditional-expect": "off",
+        "jest/no-confusing-set-timeout": "error",
+        "jest/no-duplicate-hooks": "error",
+        "jest/no-test-return-statement": "error",
+        "jest/prefer-comparison-matcher": "error",
+        "jest/prefer-equality-matcher": "error",
+        "jest/prefer-expect-resolves": "error",
+        "jest/prefer-hooks-on-top": "error",
+        "jest/prefer-lowercase-title": "error",
+        "jest/prefer-mock-promise-shorthand": "error",
+        "jest/prefer-spy-on": "error",
+        "jest/prefer-todo": "error",
+        "jest/require-top-level-describe": "error",
+    }));
 }

package/dist/eslint/env/node.d.ts

@@ -1,18 +1,13 @@
 import type { TSESLint } from "@typescript-eslint/utils";
-import type { LanguageOptions, EnvBaseOptions, EnvRestrictedOptions } from "../shared/env-utils.js";
+import type { LanguageOptions, EnvRestrictedOptions } from "../shared/env-utils.js";
 /**
  * Configuration options for the environment preset "env.node".
  */
-export interface EnvNodeOptions extends EnvBaseOptions {
+export interface EnvNodeOptions extends EnvRestrictedOptions {
     /**
      * The module mode used by the linted files. Default value is "module".
      */
     sourceType?: LanguageOptions["sourceType"];
-    /**
-     * All globals, imports, properties, and syntax constructs to be banned for
-     * the files included by the environment.
-     */
-    restricted?: EnvRestrictedOptions;
 }
 /**
  * Creates configuration objects with global symbols and linter rules for

package/dist/eslint/env/node.js

@@ -1,5 +1,5 @@
 import nodePlugin from "eslint-plugin-n";
-import { generateRestrictedRules } from "../shared/env-utils.js";
+import { concatConfigs, createConfig, restrictedRules, customRules } from "../shared/env-utils.js";
 // functions ==================================================================
 /**
  * Creates configuration objects with global symbols and linter rules for
@@ -15,37 +15,23 @@ import { generateRestrictedRules } from "../shared/env-utils.js";
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function node(options) {
-    // configuration properties
-    const { files, ignores = [], sourceType = "module", rules } = options;
-    // the plugin configuration
-    const configKey = (sourceType === "commonjs") ? "flat/recommended-script" : "flat/recommended-module";
-    const nodeConfig = nodePlugin.configs[configKey];
-    // generate the "no-restricted-?" rules according to passed configuration
-    const restricted = generateRestrictedRules({}, options?.restricted);
-    return [
-        // register rule implementations
-        {
-            files,
-            ignores,
-            ...nodeConfig,
-            settings: {
-                node: {
-                    tryExtensions: [".js", ".ts", ".d.ts"], // automatically add missing extensions in imports
-                },
-            },
-        },
-        // reconfigure plugin rules
-        {
-            files,
-            ignores,
-            rules: {
-                "n/no-unsupported-features/node-builtins": ["error", { allowExperimental: true }],
-                "n/prefer-node-protocol": "error",
-                ...restricted.rules,
-                ...rules,
+    // the plugin configuration key, according to source module type
+    const configKey = (options.sourceType === "commonjs") ? "flat/recommended-script" : "flat/recommended-module";
+    return concatConfigs(
+    // register rule implementations
+    createConfig(options, {
+        ...nodePlugin.configs[configKey],
+        settings: {
+            node: {
+                tryExtensions: [".js", ".ts", ".d.ts"], // automatically add missing extensions in imports
             },
         },
-        // "no-restricted-?" rules overrides for specific files
-        ...restricted.overrides,
-    ];
+    }), 
+    // generate the "no-restricted-?" rules according to passed configuration
+    restrictedRules(options), 
+    // custom rules
+    customRules(options, {
+        "n/no-unsupported-features/node-builtins": ["error", { allowExperimental: true }],
+        "n/prefer-node-protocol": "error",
+    }));
 }

package/dist/eslint/env/project.js

@@ -1,3 +1,4 @@
+import { concatConfigs, createConfig, customRules } from "../shared/env-utils.js";
 import noAmdModuleDirective from "../rules/no-amd-module-directive.js";
 import noInvalidModules from "../rules/no-invalid-modules.js";
 // exports ====================================================================
@@ -11,25 +12,21 @@ import noInvalidModules from "../rules/no-invalid-modules.js";
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function project(options) {
-    // configuration properties
-    const { files, ignores = [], rules, ...rest } = options;
-    return [{
-            files,
-            ignores,
-            // register rule implementations
-            plugins: {
-                "env-project": {
-                    rules: {
-                        "no-amd-module-directive": noAmdModuleDirective,
-                        "no-invalid-modules": noInvalidModules,
-                    },
+    return concatConfigs(
+    // register rule implementations
+    createConfig(options, {
+        plugins: {
+            "env-project": {
+                rules: {
+                    "no-amd-module-directive": noAmdModuleDirective,
+                    "no-invalid-modules": noInvalidModules,
                 },
             },
-            // configure rules
-            rules: {
-                "env-project/no-amd-module-directive": "error",
-                "env-project/no-invalid-modules": ["error", rest],
-                ...rules,
-            },
-        }];
+        },
+    }), 
+    // custom rules
+    customRules(options, {
+        "env-project/no-amd-module-directive": "error",
+        "env-project/no-invalid-modules": ["error", options],
+    }));
 }

package/dist/eslint/env/react.js

@@ -5,6 +5,7 @@ import reactRefreshPlugin from "eslint-plugin-react-refresh";
 import jsxExpressionsPlugin from "eslint-plugin-jsx-expressions";
 import jsxA11yPlugin from "eslint-plugin-jsx-a11y";
 import { fixupPluginRules } from "@eslint/compat";
+import { concatConfigs, createConfig, customRules } from "../shared/env-utils.js";
 // functions ==================================================================
 /**
  * Creates configuration objects with linter rules for ReactJS.
@@ -24,68 +25,72 @@ import { fixupPluginRules } from "@eslint/compat";
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function react(options) {
-    // configuration properties
-    const { files, ignores = [], rules, staticHooks = {} } = options;
-    return [
-        // configure plugins and rules for all source files (JSX and TSX)
-        {
-            files,
-            ignores,
-            // register rule implementations of the plugins
-            plugins: {
-                react: fixupPluginRules(reactPlugin), // https://github.com/jsx-eslint/eslint-plugin-react/issues/3699
-                "react-hooks": reactHooksPlugin,
-                "react-hooks-static-deps": fixupPluginRules(reactHooksStaticDepsPlugin), // https://github.com/stoikio/eslint-plugin-react-hooks-static-deps/issues/1
-                "react-refresh": reactRefreshPlugin,
-                "jsx-expressions": fixupPluginRules(jsxExpressionsPlugin), // https://github.com/hluisson/eslint-plugin-jsx-expressions/issues/18
-                "jsx-a11y": jsxA11yPlugin,
-            },
-            settings: {
-                react: {
-                    version: "detect",
-                },
-            },
-            // enable JSX support
-            languageOptions: {
-                parserOptions: reactPlugin.configs.recommended.parserOptions,
-            },
-            // configure plugin rules
-            rules: {
-                // recommended rules
-                ...reactPlugin.configs.recommended.rules,
-                ...reactPlugin.configs["jsx-runtime"].rules,
-                ...reactHooksPlugin.configs.recommended.rules,
-                ...jsxA11yPlugin.flatConfigs.recommended.rules,
-                // "react" plugin: change or disable a few recommended rules
-                "react/hook-use-state": "error",
-                "react/iframe-missing-sandbox": "error",
-                "react/jsx-boolean-value": "error",
-                "react/jsx-no-script-url": "error",
-                "react/jsx-no-useless-fragment": "error",
-                "react/no-danger": "error",
-                "react/no-invalid-html-attribute": "error",
-                "react/no-typos": "error",
-                "react/prop-types": ["error", { skipUndeclared: true }],
-                "react/style-prop-object": "error",
-                "react/void-dom-elements-no-children": "error",
-                // replace "react-hooks/exhaustive-deps" rule with advanced alternative
-                "react-hooks/exhaustive-deps": "off",
-                "react-hooks-static-deps/exhaustive-deps": ["error", { staticHooks }],
-                // "react-refresh" plugin
-                "react-refresh/only-export-components": ["error", { allowConstantExport: true }],
-                // custom rules
-                ...rules,
+    return concatConfigs(
+    // configure "react" plugin for all source files (JSX and TSX)
+    createConfig(options, {
+        // auto-detect installed React version
+        settings: {
+            react: {
+                version: "detect",
             },
         },
-        // additional rules for TSX only
-        {
-            files,
-            ignores: [...ignores, "**/*.{js,jsx}"],
-            // configure plugin rules
-            rules: {
-                // replace "react/jsx-no-leaked-render" rule with advanced alternative
-                "jsx-expressions/strict-logical-expressions": "error",
-            },
+        // register rule implementations and language settings
+        ...reactPlugin.configs.flat.recommended,
+        rules: {
+            // recommended rules
+            ...reactPlugin.configs.flat.recommended.rules,
+            ...reactPlugin.configs.flat["jsx-runtime"].rules,
+        },
+    }), 
+    // configure other plugins and rules for all source files (JSX and TSX)
+    createConfig(options, {
+        // register rule implementations of the plugins
+        plugins: {
+            "react-hooks": reactHooksPlugin,
+            "react-refresh": reactRefreshPlugin,
+            "jsx-expressions": fixupPluginRules(jsxExpressionsPlugin), // https://github.com/hluisson/eslint-plugin-jsx-expressions/issues/18
+            "jsx-a11y": jsxA11yPlugin,
+        },
+        // recommended rules
+        rules: {
+            ...reactHooksPlugin.configs.recommended.rules,
+            ...jsxA11yPlugin.flatConfigs.recommended.rules,
+        },
+    }), 
+    // "react-hooks-static-deps" plugin
+    options.staticHooks && createConfig(options, {
+        plugins: {
+            "react-hooks-static-deps": fixupPluginRules(reactHooksStaticDepsPlugin), // https://github.com/stoikio/eslint-plugin-react-hooks-static-deps/issues/1
+        },
+        rules: {
+            "react-hooks/exhaustive-deps": "off",
+            "react-hooks-static-deps/exhaustive-deps": ["error", { staticHooks: options.staticHooks }],
+        },
+    }), 
+    // additional rules for TSX only
+    createConfig(options, {
+        ignores: ["**/*.{js,jsx}"],
+        rules: {
+            // replace "react/jsx-no-leaked-render" rule with advanced alternative
+            "jsx-expressions/strict-logical-expressions": "error",
         },
-    ];
+    }), 
+    // custom rules
+    customRules(options, {
+        // "react" plugin
+        "react/hook-use-state": "error",
+        "react/iframe-missing-sandbox": "error",
+        "react/jsx-boolean-value": "error",
+        "react/jsx-no-script-url": "error",
+        "react/jsx-no-useless-fragment": "error",
+        "react/jsx-props-no-spread-multi": "error",
+        "react/no-danger": "error",
+        "react/no-invalid-html-attribute": "error",
+        "react/no-typos": "error",
+        "react/prop-types": ["error", { skipUndeclared: true }],
+        "react/style-prop-object": "error",
+        "react/void-dom-elements-no-children": "error",
+        // "react-refresh" plugin
+        "react-refresh/only-export-components": ["error", { allowConstantExport: true }],
+    }));
 }

package/dist/eslint/env/tsconfig.js

@@ -1,3 +1,4 @@
+import { concatConfigs, createConfig, customRules } from "../shared/env-utils.js";
 // functions ==================================================================
 /**
  * Creates configuration objects for TypeScript projects.
@@ -9,21 +10,15 @@
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function tsconfig(options) {
-    // configuration properties
-    const { files, ignores = [], rules } = options;
-    return [{
-            files,
-            ignores,
-            // path to project configuration file
-            languageOptions: {
-                parserOptions: {
-                    project: options.project,
-                },
+    return concatConfigs(
+    // path to project configuration file
+    createConfig(options, {
+        languageOptions: {
+            parserOptions: {
+                project: options.project,
             },
-            // configure plugin rules
-            rules: {
-                // custom rules
-                ...rules,
-            },
-        }];
+        },
+    }), 
+    // custom rules
+    customRules(options));
 }

package/dist/eslint/env/vitest.js

@@ -2,6 +2,7 @@ import vitestPlugin from "eslint-plugin-vitest";
 import jestDomPlugin from "eslint-plugin-jest-dom";
 import testingLibraryPlugin from "eslint-plugin-testing-library";
 import { fixupPluginRules } from "@eslint/compat";
+import { concatConfigs, createConfig, customRules } from "../shared/env-utils.js";
 // functions ==================================================================
 /**
  * Creates configuration objects with global symbols and linter rules for unit
@@ -19,72 +20,56 @@ import { fixupPluginRules } from "@eslint/compat";
  *  An array of configuration objects to be added to the flat configuration.
  */
 export default function vitest(options) {
-    // configuration properties
-    const { files, ignores = [], rules } = options;
-    return [
-        // "vitest" plugin
-        {
-            files,
-            ignores,
-            // register rule implementations of the plugins
-            plugins: {
-                vitest: vitestPlugin,
-            },
-            // register global symbols of Vitest
-            languageOptions: {
-                globals: vitestPlugin.environments.env.globals,
-            },
-            // configure plugin rules
-            rules: {
-                // recommended rules
-                ...vitestPlugin.configs.recommended.rules,
-                // extra rules
-                "vitest/consistent-test-it": "error",
-                "vitest/no-alias-methods": "error",
-                "vitest/no-disabled-tests": "warn",
-                "vitest/no-duplicate-hooks": "error",
-                "vitest/no-focused-tests": "error",
-                "vitest/no-standalone-expect": "error",
-                "vitest/no-test-prefixes": "error",
-                "vitest/no-test-return-statement": "error",
-                "vitest/prefer-comparison-matcher": "error",
-                "vitest/prefer-each": "error",
-                "vitest/prefer-equality-matcher": "error",
-                "vitest/prefer-expect-resolves": "error",
-                "vitest/prefer-hooks-in-order": "error",
-                "vitest/prefer-hooks-on-top": "error",
-                "vitest/prefer-mock-promise-shorthand": "error",
-                "vitest/prefer-spy-on": "error",
-                "vitest/prefer-strict-equal": "error",
-                "vitest/prefer-to-be": "error",
-                "vitest/prefer-to-contain": "error",
-                "vitest/prefer-to-have-length": "error",
-                "vitest/require-top-level-describe": "error",
-                // custom rules
-                ...rules,
-            },
+    return concatConfigs(
+    // "vitest" plugin
+    createConfig(options, {
+        // register rule implementations of the plugins
+        plugins: {
+            vitest: vitestPlugin,
         },
-        // "jest-dom" plugin
-        {
-            files,
-            ignores,
-            ...jestDomPlugin.configs["flat/recommended"],
+        // register global symbols of Vitest
+        languageOptions: {
+            globals: vitestPlugin.environments.env.globals,
         },
-        // "testing-library" plugin
-        {
-            files,
-            ignores,
-            // register rule implementations of the plugins
-            plugins: {
-                "testing-library": fixupPluginRules(testingLibraryPlugin), // https://github.com/testing-library/eslint-plugin-testing-library/issues/899
-            },
-            // configure plugin rules
-            rules: {
-                // recommended rules
-                ...testingLibraryPlugin.configs.react.rules,
-                // extra rules
-                "testing-library/no-node-access": ["error", { allowContainerFirstChild: true }],
-            },
+        // recommended rules
+        rules: vitestPlugin.configs.recommended.rules,
+    }), 
+    // "jest-dom" plugin
+    createConfig(options, jestDomPlugin.configs["flat/recommended"]), 
+    // "testing-library" plugin
+    createConfig(options, {
+        // register rule implementations of the plugins
+        plugins: {
+            "testing-library": fixupPluginRules(testingLibraryPlugin), // https://github.com/testing-library/eslint-plugin-testing-library/issues/899
         },
-    ];
+        // recommended rules
+        rules: testingLibraryPlugin.configs.react.rules,
+    }), 
+    // custom rules
+    customRules(options, {
+        // "vitest" plugin
+        "vitest/consistent-test-it": "error",
+        "vitest/no-alias-methods": "error",
+        "vitest/no-disabled-tests": "warn",
+        "vitest/no-duplicate-hooks": "error",
+        "vitest/no-focused-tests": "error",
+        "vitest/no-standalone-expect": "error",
+        "vitest/no-test-prefixes": "error",
+        "vitest/no-test-return-statement": "error",
+        "vitest/prefer-comparison-matcher": "error",
+        "vitest/prefer-each": "error",
+        "vitest/prefer-equality-matcher": "error",
+        "vitest/prefer-expect-resolves": "error",
+        "vitest/prefer-hooks-in-order": "error",
+        "vitest/prefer-hooks-on-top": "error",
+        "vitest/prefer-mock-promise-shorthand": "error",
+        "vitest/prefer-spy-on": "error",
+        "vitest/prefer-strict-equal": "error",
+        "vitest/prefer-to-be": "error",
+        "vitest/prefer-to-contain": "error",
+        "vitest/prefer-to-have-length": "error",
+        "vitest/require-top-level-describe": "error",
+        // "testing-library" plugin
+        "testing-library/no-node-access": ["error", { allowContainerFirstChild: true }],
+    }));
 }

package/dist/eslint/shared/env-utils.d.ts

@@ -126,10 +126,10 @@ export interface EnvRestrictedItems {
 export interface EnvRestrictedOverride extends EnvFilesOptions, EnvRestrictedItems {
 }
 /**
- * Configuration options for banned globals, imports, properties, and syntax
- * constructs in the environment.
+ * Type shape of a dedicated environment option "restricted" with settings for
+ * banned globals, imports, properties, and syntax constructs.
  */
-export interface EnvRestrictedOptions extends EnvRestrictedItems {
+export interface EnvRestrictedOption extends EnvRestrictedItems {
     /**
      * Whether the environment supports native decorators. In this case, it
      * will be required to replace TypeScript decorated `private` methods with
@@ -146,9 +146,16 @@ export interface EnvRestrictedOptions extends EnvRestrictedItems {
      */
     overrides?: EnvRestrictedOverride[];
 }
-export interface EnvRestrictedRulesResult {
-    rules: TSESLint.FlatConfig.Rules;
-    overrides: TSESLint.FlatConfig.ConfigArray;
+/**
+ * Shared options for an environment preset: include and exclude files, add
+ * more linter rules, and settings for restricted items.
+ */
+export interface EnvRestrictedOptions extends EnvBaseOptions {
+    /**
+     * All globals, imports, properties, and syntax constructs to be banned for
+     * the files included by the environment.
+     */
+    restricted?: EnvRestrictedOption;
 }
 /**
  * Shared options for the core rule `no-unused-vars`, and the plugin rule
@@ -161,16 +168,61 @@ export declare const NO_UNUSED_VARS_OPTIONS: {
     caughtErrors: string;
     ignoreRestSiblings: boolean;
 };
+/**
+ * Concatenates multiple configuration objects or arrays into an array while
+ * skipping all falsy parameters.
+ *
+ * @param configs
+ *  The configuration objects to be concatenated.
+ *
+ * @returns
+ *  The concatenated configuration array.
+ */
+export declare const concatConfigs: (...entries: (TSESLint.FlatConfig.Config | TSESLint.FlatConfig.Config[] | undefined)[]) => TSESLint.FlatConfig.Config[];
+/**
+ * Creates a flat configuration object with "files" and "ignores" settings from
+ * an environment's "options" object.
+ *
+ * @param options
+ *  The environment options containing "files" and "ignores" settings.
+ *
+ * @param config
+ *  The remaining properties of the flat configuration to be built. Additional
+ *  "files" and "ignores" properties will be merged with the settings from
+ *  "options".
+ *
+ * @returns
+ *  The resulting flat configuration object.
+ */
+export declare function createConfig(options: EnvFilesOptions, config: TSESLint.FlatConfig.Config): TSESLint.FlatConfig.Config;
 /**
  * Generates various "no-restricted-?" rules from the passed configuration.
  *
+ * @param options
+ *  The environment options containing "files", "ignores", and "restricted"
+ *  settings.
+ *
  * @param fixed
  *  The fixed restricted items provided by the environment preset.
  *
+ * @returns
+ *  The flat configuration objects needed to forbid the restricted items.
+ */
+export declare function restrictedRules(options: EnvRestrictedOptions, fixed?: EnvRestrictedItems): TSESLint.FlatConfig.ConfigArray;
+/**
+ * Creates a flat configuration object with `files`, `ignores`, and `rules`
+ * settings from an environment's `options` object.
+ *
  * @param options
- *  The custom configuration passed to an environment preset.
+ *  The environment options containing `files`,`ignores`, and `rules` settings.
+ *
+ * @param rules
+ *  Hard-coded rule settings to be configured by the environment itself. These
+ *  rule settings will precede the rules contained in "options", in order to
+ *  allow to override them.
  *
  * @returns
- *  The generated linter rules to forbid the restricted items.
+ *  The resulting flat configuration object, if the environment options contain
+ *  custom rule settings, otherwise `undefined`.
  */
-export declare function generateRestrictedRules(fixed: EnvRestrictedItems, options?: EnvRestrictedOptions): EnvRestrictedRulesResult;
+export declare function customRules(options: EnvBaseOptions, rules?: TSESLint.FlatConfig.Rules): TSESLint.FlatConfig.Config | undefined;

package/dist/eslint/shared/env-utils.js

@@ -12,16 +12,17 @@ export const NO_UNUSED_VARS_OPTIONS = {
 };
 // functions ==================================================================
 /**
- * Concatenates the elements of multiple arrays. Skips `undefined` parameters.
+ * Concatenates and flattens multiple elements or arrays into a single array
+ * while skipping all falsy parameters.
  *
- * @param arrays
- *  The arrays to be concatenated.
+ * @param entries
+ *  The elements or arrays to be concatenated.
  *
  * @returns
- *  The concatenated arrays.
+ *  The concatenated and flattened array.
  */
-function concatArrays(...arrays) {
-    return arrays.flatMap(array => array || []);
+function flatten(...entries) {
+    return entries.flatMap(array => array || []);
 }
 /**
  * Creates a rules record for all restricted items.
@@ -48,45 +49,99 @@ function createRulesRecord(generator) {
     return rules;
 }
 // ----------------------------------------------------------------------------
+/**
+ * Concatenates multiple configuration objects or arrays into an array while
+ * skipping all falsy parameters.
+ *
+ * @param configs
+ *  The configuration objects to be concatenated.
+ *
+ * @returns
+ *  The concatenated configuration array.
+ */
+export const concatConfigs = (flatten);
+/**
+ * Creates a flat configuration object with "files" and "ignores" settings from
+ * an environment's "options" object.
+ *
+ * @param options
+ *  The environment options containing "files" and "ignores" settings.
+ *
+ * @param config
+ *  The remaining properties of the flat configuration to be built. Additional
+ *  "files" and "ignores" properties will be merged with the settings from
+ *  "options".
+ *
+ * @returns
+ *  The resulting flat configuration object.
+ */
+export function createConfig(options, config) {
+    return {
+        ...config,
+        files: flatten(options.files, config.files),
+        ignores: flatten(options.ignores, config.ignores),
+    };
+}
 /**
  * Generates various "no-restricted-?" rules from the passed configuration.
  *
+ * @param options
+ *  The environment options containing "files", "ignores", and "restricted"
+ *  settings.
+ *
  * @param fixed
  *  The fixed restricted items provided by the environment preset.
  *
- * @param options
- *  The custom configuration passed to an environment preset.
- *
  * @returns
- *  The generated linter rules to forbid the restricted items.
+ *  The flat configuration objects needed to forbid the restricted items.
  */
-export function generateRestrictedRules(fixed, options) {
+export function restrictedRules(options, fixed) {
+    const { restricted = {} } = options;
     const RESTRICTED_GLOBALS = [
         { name: "isFinite", message: "Use 'Number.isFinite' instead." },
         { name: "isNaN", message: "Use 'Number.isNaN' instead." },
     ];
     const RESTRICTED_SYNTAX = [
         { selector: ":matches(PropertyDefinition, MethodDefinition[kind!='constructor'])[accessibility='public']", message: "Remove 'public' keyword." },
-        { selector: ":matches(PropertyDefinition, MethodDefinition[kind!='constructor'])[accessibility='private']" + (options?.nativeDecorators ? "" : "[decorators.length=0]"), message: "Use #private syntax instead." },
+        { selector: ":matches(PropertyDefinition, MethodDefinition[kind!='constructor'])[accessibility='private']" + (restricted.nativeDecorators ? "" : "[decorators.length=0]"), message: "Use #private syntax instead." },
         { selector: "MethodDefinition[kind='constructor'] TSParameterProperty[accessibility]", message: "Use explicit class properties." },
     ];
     // restricted items for all files in the environment
     const items = {
-        globals: concatArrays(RESTRICTED_GLOBALS, fixed.globals, options?.globals),
-        imports: concatArrays(fixed.imports, options?.imports),
-        properties: concatArrays(fixed.properties, options?.properties),
-        syntax: concatArrays(RESTRICTED_SYNTAX, fixed.syntax, options?.syntax),
+        globals: flatten(RESTRICTED_GLOBALS, fixed?.globals, restricted.globals),
+        imports: flatten(fixed?.imports, restricted.imports),
+        properties: flatten(fixed?.properties, restricted.properties),
+        syntax: flatten(RESTRICTED_SYNTAX, fixed?.syntax, restricted.syntax),
     };
+    // generate the configuration objects
+    return concatConfigs(
     // base rules for all files in the environment
-    const rules = createRulesRecord(key => items[key]);
+    createConfig(options, {
+        rules: createRulesRecord(key => items[key]),
+    }), 
     // generate the override entries (join with base items)
-    const overrides = [];
-    for (const override of options?.overrides ?? []) {
-        overrides.push({
-            files: override.files,
-            ignores: override.ignores ?? [],
-            rules: createRulesRecord(key => concatArrays(items[key], override[key])),
-        });
-    }
-    return { rules, overrides };
+    restricted.overrides?.map(override => createConfig(override, {
+        rules: createRulesRecord(key => flatten(items[key], override[key])),
+    })));
+}
+/**
+ * Creates a flat configuration object with `files`, `ignores`, and `rules`
+ * settings from an environment's `options` object.
+ *
+ * @param options
+ *  The environment options containing `files`,`ignores`, and `rules` settings.
+ *
+ * @param rules
+ *  Hard-coded rule settings to be configured by the environment itself. These
+ *  rule settings will precede the rules contained in "options", in order to
+ *  allow to override them.
+ *
+ * @returns
+ *  The resulting flat configuration object, if the environment options contain
+ *  custom rule settings, otherwise `undefined`.
+ */
+export function customRules(options, rules) {
+    return (rules || options.rules) && createConfig(options, {
+        rules: { ...rules, ...options.rules },
+    });
 }

package/doc/eslint/README.md

@@ -37,6 +37,7 @@ function configure(options?: ConfigureOptions): Linter.FlatConfig[]
 | `language` | `LanguageOptions` | | Configuration options for language and project setup. |
 | `language.ecmaVersion` | `number` | `2022` | The ECMAScript version to be used in the project (version or year). |
 | `language.sourceType` | `"module"\|"commonjs"` | `"module"` | Specifies how to treat `.js`, `.jsx`, `.ts`, and `.tsx` files. |
+| `language.nativeDecorators` | `boolean` | `false` | Whether to support native ES decorators in JavaScript code (via Babel plugin). Does not affect TypeScript code which uses an own parser aware of the decorator syntax. |
 | `stylistic` | `StylisticOptions` | | Configuration options for code style. |
 | `stylistic.indent` | `number` | `2` | Default indentation size (number of space characters). Will be applied to JavaScript, TypeScript, JSON, and YAML files, as well as JSX markup. |
 | `stylistic.semi` | `boolean` | `false` | Specifies whether to require semicolons following all statements (`true`), or to force to omit semicolons if possible according to ASI rules (`false`). |

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "@open-xchange/linter-presets",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "description": "Configuration presets for ESLint and StyleLint",
     "repository": {
         "url": "https://gitlab.open-xchange.com/fspd/npm-packages/linter-presets"
@@ -23,7 +23,7 @@
         "*.{js,ts,json}": "yarn lint"
     },
     "dependencies": {
-        "@babel/core": "7.24.8",
+        "@babel/core": "7.24.9",
         "@babel/eslint-parser": "7.24.8",
         "@babel/plugin-proposal-decorators": "7.24.7",
         "@eslint-community/eslint-plugin-eslint-comments": "4.3.0",
@@ -40,17 +40,17 @@
         "eslint-plugin-import": "2.29.1",
         "eslint-plugin-jest": "28.6.0",
         "eslint-plugin-jest-dom": "5.4.0",
-        "eslint-plugin-jsdoc": "48.7.0",
+        "eslint-plugin-jsdoc": "48.8.3",
         "eslint-plugin-jsonc": "2.16.0",
         "eslint-plugin-jsx-a11y": "6.9.0",
         "eslint-plugin-jsx-expressions": "1.3.2",
         "eslint-plugin-license-header": "0.6.1",
         "eslint-plugin-n": "17.9.0",
-        "eslint-plugin-promise": "6.4.0",
-        "eslint-plugin-react": "7.34.4",
+        "eslint-plugin-promise": "6.6.0",
+        "eslint-plugin-react": "7.35.0",
         "eslint-plugin-react-hooks": "4.6.2",
         "eslint-plugin-react-hooks-static-deps": "1.0.7",
-        "eslint-plugin-react-refresh": "0.4.8",
+        "eslint-plugin-react-refresh": "0.4.9",
         "eslint-plugin-testing-library": "6.2.2",
         "eslint-plugin-vitest": "0.5.4",
         "eslint-plugin-yml": "1.14.0",
@@ -61,18 +61,18 @@
         "stylelint-config-standard-less": "3.0.1",
         "stylelint-config-standard-scss": "13.1.0",
         "stylelint-plugin-license-header": "1.0.3",
-        "typescript-eslint": "7.16.0"
+        "typescript-eslint": "7.17.0"
     },
     "devDependencies": {
         "@types/confusing-browser-globals": "1.0.3",
         "@types/eslint__js": "8.42.3",
         "@types/picomatch": "3.0.0",
-        "@typescript-eslint/utils": "7.16.0",
+        "@typescript-eslint/utils": "7.17.0",
         "eslint": "9.7.0",
-        "husky": "9.0.11",
+        "husky": "9.1.1",
         "jest": "29.7.0",
         "stylelint": "16.7.0",
-        "typescript": "5.5.3"
+        "typescript": "5.5.4"
     },
     "peerDependencies": {
         "eslint": "^9.6",