@storm-software/eslint 0.34.0 → 0.35.0

package/dist/preset.mjs

@@ -12589,23 +12589,27 @@ const plugin = {
   },
   processors: {}
 };
-plugin.configs.recommended = {
-  plugins: { banner: plugin },
-  files: [
-    "**/*.{,c,m}{j,t}s{,x}",
-    "!tools/**/*",
-    "!docs/**/*",
-    "!crates/**/*",
-    "!.*/**/*"
-  ],
-  rules: {
-    "banner/banner": [
-      "error",
-      { banner: getFileBanner(""), commentType: "block", numNewlines: 2 }
-    ]
+plugin.configs.recommended = [
+  { name: "banner/recommended/plugin", plugins: { banner: plugin } },
+  {
+    name: "banner/recommended/code-files",
+    files: [
+      "**/*.{,c,m}{j,t}s{,x}",
+      "!tools/**/*",
+      "!docs/**/*",
+      "!crates/**/*",
+      "!.*/**/*"
+    ],
+    rules: {
+      "banner/banner": [
+        "error",
+        { banner: getFileBanner(""), commentType: "block", numNewlines: 2 }
+      ]
+    }
   }
-};
+];
 
+const CODE_BLOCK = "**/*.md{,x}/*";
 const CODE_FILE = "**/*.{,c,m}{j,t}s{,x}";
 const TS_FILE = "**/*.{,c,m}ts{,x}";
 
@@ -12616,7 +12620,7 @@ const formatConfig = (name, config = []) => {
     }
     return {
       ...config2,
-      name: `Storm Software (${name}) #${index + 1}`,
+      name: `Storm Software (${config2.name ? config2.name : name}) #${index + 1}`,
       settings: {
         "import/resolver": "node",
         ...config2.settings ?? {}
@@ -12625,6 +12629,56 @@ const formatConfig = (name, config = []) => {
   });
 };
 
+const DEFAULT_TYPESCRIPT_RULES = {
+  "unicorn/number-literal-case": 0,
+  "unicorn/template-indent": 0,
+  "unicorn/prevent-abbreviations": 0,
+  "unicorn/no-await-expression-member": 0,
+  "unicorn/no-useless-undefined": 0,
+  "unicorn/no-array-push-push": 0,
+  "unicorn/no-array-reduce": 0,
+  "unicorn/no-useless-switch-case": 0,
+  "@typescript-eslint/no-explicit-any": 0,
+  "@typescript-eslint/no-empty-function": 0,
+  "@typescript-eslint/no-var-requires": 0,
+  "@typescript-eslint/ban-ts-comment": 0,
+  "@typescript-eslint/no-empty-interface": 0,
+  "@typescript-eslint/explicit-module-boundary-types": 0,
+  "@typescript-eslint/explicit-function-return-type": 0,
+  "@typescript-eslint/no-unused-vars": [
+    "warn",
+    { varsIgnorePattern: "^_", argsIgnorePattern: "^_" }
+  ],
+  "unicorn/prefer-string-replace-all": 0,
+  "unicorn/no-abusive-eslint-disable": 0,
+  "unicorn/import-style": 0,
+  "unicorn/prefer-module": 0,
+  "unicorn/consistent-function-scoping": 0,
+  "class-methods-use-this": 0,
+  "@typescript-eslint/no-restricted-imports": [
+    "error",
+    {
+      "patterns": [
+        {
+          "group": ["nx/src/plugins/js*"],
+          "message": "Imports from 'nx/src/plugins/js' are not allowed. Use '@nx/js' instead"
+        },
+        {
+          "group": ["**/native-bindings", "**/native-bindings.js"],
+          "message": "Direct imports from native-bindings.js are not allowed. Import from index.js instead."
+        },
+        {
+          "group": ["create-storm-workspace"],
+          "message": "Direct imports from `create-storm-workspace` are not allowed. Instead install this package globally (example: 'npm i create-storm-workspace -g')."
+        },
+        {
+          "group": ["create-nx-workspace"],
+          "message": "Direct imports from `create-nx-workspace` are not allowed. Instead install this package globally (example: 'npm i create-nx-workspace -g')."
+        }
+      ]
+    }
+  ]
+};
 function stormPreset(options = {
   moduleBoundaries: {
     enforceBuildableLibDependency: true,
@@ -12637,92 +12691,20 @@ function stormPreset(options = {
     ]
   }
 }, ...userConfigs) {
-  const rules = {
-    "unicorn/number-literal-case": 0,
-    "unicorn/template-indent": 0,
-    "unicorn/prevent-abbreviations": 0,
-    "unicorn/no-await-expression-member": 0,
-    "unicorn/no-useless-undefined": 0,
-    "unicorn/no-array-push-push": 0,
-    "unicorn/no-array-reduce": 0,
-    "unicorn/no-useless-switch-case": 0,
-    "@typescript-eslint/no-explicit-any": 0,
-    "@typescript-eslint/no-empty-function": 0,
-    "@typescript-eslint/no-var-requires": 0,
-    "@typescript-eslint/ban-ts-comment": 0,
-    "@typescript-eslint/no-empty-interface": 0,
-    "@typescript-eslint/explicit-module-boundary-types": 0,
-    "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/no-unused-vars": [
-      "warn",
-      { varsIgnorePattern: "^_", argsIgnorePattern: "^_" }
-    ],
-    "unicorn/prefer-string-replace-all": 0,
-    "unicorn/no-abusive-eslint-disable": 0,
-    "unicorn/import-style": 0,
-    "unicorn/prefer-module": 0,
-    "unicorn/consistent-function-scoping": 0,
-    "class-methods-use-this": 0,
-    ...options.rules
-  };
   const configs = [
     // https://eslint.org/docs/latest/rules/
     eslint.configs.recommended,
     // https://typescript-eslint.io/
-    ...tsEslint$1.configs.recommended,
+    ...tsEslint$1.configs.stylisticTypeChecked,
     // https://github.com/sindresorhus/eslint-plugin-unicorn
     eslintPluginUnicorn.configs["flat/recommended"],
     // Prettier
     prettierConfig,
-    // Preset overrides
-    { rules },
-    {
-      languageOptions: {
-        globals: Object.fromEntries(
-          Object.keys(globals).flatMap(
-            (group) => Object.keys(globals[group]).map((k) => [
-              k,
-              true
-            ])
-          )
-        )
-      }
-    },
-    { ignores: ["dist", "coverage", ...options.ignores || []] },
-    // Markdown
-    // https://www.npmjs.com/package/eslint-plugin-markdown
-    options.markdown !== false && { plugins: { markdown } },
-    options.markdown !== false && {
-      files: [CODE_FILE],
-      processor: "markdown/markdown"
-    },
-    options.markdown !== false && {
-      files: ["**/*.md/*.js", "**/*.md/*.ts"],
-      rules: {
-        "unicorn/filename-case": 0,
-        "no-undef": 0,
-        "no-unused-expressions": 0,
-        "padded-blocks": 0,
-        "no-empty-pattern": 0,
-        "no-redeclare": 0,
-        "no-import-assign": 0,
-        ...options.markdown?.rules
-      }
-    },
     // React
     // https://www.npmjs.com/package/eslint-plugin-react
     options.react !== false && {
       plugins: { react, "react-hooks": reactHooks, "jsx-a11y": jsxA11y }
     },
-    options.react !== false && {
-      files: [CODE_FILE],
-      rules: {
-        ...config$2,
-        ...config$1,
-        ...config$3,
-        ...options.react?.rules
-      }
-    },
     // Import
     // https://www.npmjs.com/package/eslint-plugin-import
     // { plugins: { import: importEslint } },
@@ -12731,7 +12713,7 @@ function stormPreset(options = {
     //   rules: importRules
     // },
     // Banner
-    plugin.configs["recommended"],
+    plugin.configs["recommended"][0],
     // TSDoc
     // https://www.npmjs.com/package/eslint-plugin-tsdoc
     { plugins: { tsdoc } },
@@ -12739,51 +12721,9 @@ function stormPreset(options = {
       files: [TS_FILE],
       rules: config
     },
-    // Nx plugin
+    // NX
     {
-      plugins: { "@nx": nxPlugin },
-      languageOptions: {
-        parser: tsEslint$1.parser,
-        globals: {
-          ...globals.node,
-          ...globals.browser,
-          "StormProvider": true
-        }
-      },
-      files: [CODE_FILE],
-      rules: {
-        "@nx/enforce-module-boundaries": [
-          "error",
-          options.moduleBoundaries ? options.moduleBoundaries : {
-            enforceBuildableLibDependency: true,
-            checkDynamicDependenciesExceptions: [".*"],
-            allow: [],
-            depConstraints: [
-              {
-                sourceTag: "*",
-                onlyDependOnLibsWithTags: ["*"]
-              }
-            ]
-          }
-        ],
-        "no-restricted-imports": ["error", "create-nx-workspace"],
-        "@typescript-eslint/no-restricted-imports": [
-          "error",
-          {
-            "patterns": [
-              {
-                "group": ["nx/src/plugins/js*"],
-                "message": "Imports from 'nx/src/plugins/js' are not allowed. Use '@nx/js' instead"
-              },
-              {
-                "group": ["**/native-bindings", "**/native-bindings.js", ""],
-                "message": "Direct imports from native-bindings.js are not allowed. Import from index.js instead."
-              }
-            ]
-          }
-        ],
-        "unicorn/prefer-logical-operator-over-ternary": "warn"
-      }
+      plugins: { "@nx": nxPlugin }
     },
     // Json
     // https://www.npmjs.com/package/eslint-plugin-json
@@ -12825,7 +12765,105 @@ function stormPreset(options = {
     // User overrides
     ...userConfigs
   ].filter(Boolean);
+  const typescriptConfig = {
+    ...tsEslint$1.configs.stylisticTypeChecked,
+    ...eslintPluginUnicorn.configs["flat/recommended"],
+    files: [CODE_FILE],
+    languageOptions: {
+      parser: tsEslint$1.parser,
+      globals: {
+        ...Object.fromEntries(
+          Object.keys(globals).flatMap(
+            (group) => Object.keys(globals[group]).map((k) => [
+              k,
+              true
+            ])
+          )
+        ),
+        "StormProvider": true
+      }
+    },
+    rules: {
+      // https://eslint.org/docs/latest/rules/
+      ...eslint.configs.recommended.rules,
+      // https://typescript-eslint.io/
+      ...tsEslint$1.configs.stylisticTypeChecked.reduce(
+        (ret, record) => ({ ...ret, ...record.rules }),
+        {}
+      ),
+      // Prettier
+      ...prettierConfig.rules,
+      // https://www.npmjs.com/package/eslint-plugin-unicorn
+      ...eslintPluginUnicorn.configs["flat/recommended"].rules,
+      // Banner
+      ...plugin.configs["recommended"][1].rules,
+      // NX
+      "@nx/enforce-module-boundaries": [
+        "error",
+        options.moduleBoundaries ? options.moduleBoundaries : {
+          enforceBuildableLibDependency: true,
+          checkDynamicDependenciesExceptions: [".*"],
+          allow: [],
+          depConstraints: [
+            {
+              sourceTag: "*",
+              onlyDependOnLibsWithTags: ["*"]
+            }
+          ]
+        }
+      ],
+      ...DEFAULT_TYPESCRIPT_RULES,
+      ...options.typescript ?? {}
+    },
+    ignores: ["dist", "coverage", "tmp", ...options.ignores || []]
+  };
+  if (options.react !== false) {
+    typescriptConfig.rules = {
+      ...typescriptConfig.rules,
+      // React
+      ...config$2,
+      ...config$1,
+      ...config$3
+    };
+    if (options.react?.rules) {
+      typescriptConfig.rules = {
+        ...typescriptConfig.rules,
+        ...options.react.rules
+      };
+    }
+  }
+  configs.push(typescriptConfig);
+  if (options.markdown !== false) {
+    configs.push(...markdown.configs.recommended);
+    configs.push({
+      files: [CODE_BLOCK],
+      processor: "markdown/markdown",
+      rules: {
+        "unicorn/filename-case": 0,
+        "no-undef": 0,
+        "no-unused-expressions": 0,
+        "padded-blocks": 0,
+        "no-empty-pattern": 0,
+        "no-redeclare": 0,
+        "no-import-assign": 0,
+        ...options.markdown?.rules
+      }
+    });
+    configs.push({
+      files: ["**/*.md/*.js", "**/*.md/*.ts"],
+      rules: {
+        "unicorn/filename-case": 0,
+        "no-undef": 0,
+        "no-unused-expressions": 0,
+        "padded-blocks": 0,
+        "no-empty-pattern": 0,
+        "no-redeclare": 0,
+        "no-import-assign": 0,
+        ...options.markdown?.rules
+      }
+    });
+  }
   return formatConfig("Preset", configs);
 }
 
-export { stormPreset as default };
+export { DEFAULT_TYPESCRIPT_RULES, stormPreset as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "type": "module",
   "description": "⚡ A package containing the base ESLint configuration used by Storm Software across many projects.",
   "repository": {