@storm-software/eslint 0.83.3 → 0.84.1

package/README.md

@@ -21,7 +21,7 @@ This package is part of the <b>⚡Storm-Ops</b> monorepo. The Storm-Ops packages
 
 <h3 align="center">💻 Visit <a href="https://stormsoftware.com" target="_blank">stormsoftware.com</a> to stay up to date with this developer</h3><br />
 
-[![Version](https://img.shields.io/badge/version-0.83.2-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
+[![Version](https://img.shields.io/badge/version-0.84.0-1fb2a6.svg?style=for-the-badge&color=1fb2a6)](https://prettier.io/)&nbsp;[![Nx](https://img.shields.io/badge/Nx-17.0.2-lightgrey?style=for-the-badge&logo=nx&logoWidth=20&&color=1fb2a6)](http://nx.dev/)&nbsp;[![NextJs](https://img.shields.io/badge/Next.js-14.0.2-lightgrey?style=for-the-badge&logo=nextdotjs&logoWidth=20&color=1fb2a6)](https://nextjs.org/)&nbsp;[![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg?style=for-the-badge&logo=commitlint&color=1fb2a6)](http://commitizen.github.io/cz-cli/)&nbsp;![Semantic-Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=for-the-badge&color=1fb2a6)&nbsp;[![documented with Fumadocs](https://img.shields.io/badge/documented_with-fumadocs-success.svg?style=for-the-badge&logo=readthedocs&color=1fb2a6)](https://fumadocs.vercel.app/)&nbsp;![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/storm-software/storm-ops/cr.yml?style=for-the-badge&logo=github-actions&color=1fb2a6)
 
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->

package/dist/preset.d.mts

@@ -7008,7 +7008,7 @@ type YmlSpacedComment =
 
 type TypeScriptEslintConfigType = "none" | "all" | "base" | "disable-type-checked" | "eslint-recommended" | "recommended-type-checked-only" | "recommended-type-checked" | "recommended" | "strict-type-checked" | "strict" | "stylistic-type-checked-only" | "stylistic-type-checked" | "stylistic";
 interface GetStormRulesConfigOptions {
-    tsConfigType?: TypeScriptEslintConfigType;
+    typescriptEslintConfigType?: TypeScriptEslintConfigType;
     useUnicorn?: boolean;
 }
 
@@ -7036,6 +7036,7 @@ type PresetOptions = GetStormRulesConfigOptions & {
     rules?: RuleOptions;
     ignores?: string[];
     tsconfig?: string;
+    typescriptEslintConfigType?: TypeScriptEslintConfigType;
     parserOptions?: Linter.ParserOptions;
     markdown?: false | Linter.RulesRecord;
     react?: false | Linter.RulesRecord;

package/dist/preset.d.ts

@@ -7008,7 +7008,7 @@ type YmlSpacedComment =
 
 type TypeScriptEslintConfigType = "none" | "all" | "base" | "disable-type-checked" | "eslint-recommended" | "recommended-type-checked-only" | "recommended-type-checked" | "recommended" | "strict-type-checked" | "strict" | "stylistic-type-checked-only" | "stylistic-type-checked" | "stylistic";
 interface GetStormRulesConfigOptions {
-    tsConfigType?: TypeScriptEslintConfigType;
+    typescriptEslintConfigType?: TypeScriptEslintConfigType;
     useUnicorn?: boolean;
 }
 
@@ -7036,6 +7036,7 @@ type PresetOptions = GetStormRulesConfigOptions & {
     rules?: RuleOptions;
     ignores?: string[];
     tsconfig?: string;
+    typescriptEslintConfigType?: TypeScriptEslintConfigType;
     parserOptions?: Linter.ParserOptions;
     markdown?: false | Linter.RulesRecord;
     react?: false | Linter.RulesRecord;

package/dist/preset.mjs

@@ -17,6 +17,7 @@ import tsdoc from 'eslint-plugin-tsdoc';
 import unicorn from 'eslint-plugin-unicorn';
 import yml from 'eslint-plugin-yml';
 import globals from 'globals';
+import { merge } from 'radash';
 import tsEslint$1 from 'typescript-eslint';
 import require$$0 from 'eslint/use-at-your-own-risk';
 import require$$0$1 from 'eslint';
@@ -1298,7 +1299,7 @@ const getStormRulesConfig = (options) => {
       }
     ]
   };
-  if (options.tsConfigType !== "none") {
+  if (options.typescriptEslintConfigType !== "none") {
     rules = {
       ...rules,
       /*************************************************************
@@ -12887,19 +12888,20 @@ function getStormConfig(options = {
   ignores: [],
   tsconfig: "./tsconfig.base.json",
   parserOptions: {},
-  tsConfigType: "eslint-recommended",
+  typescriptEslintConfigType: "eslint-recommended",
   useUnicorn: true,
   markdown: {},
   react: {},
   useReactCompiler: false
 }, ...userConfigs) {
   const tsconfig = options.tsconfig ?? "./tsconfig.base.json";
-  const tsConfigType = options.tsConfigType || "eslint-recommended";
+  const typescriptEslintConfigType = options.typescriptEslintConfigType || "eslint-recommended";
   const useUnicorn = options.useUnicorn ?? true;
   const react = options.react ?? {};
   const useReactCompiler = options.useReactCompiler ?? false;
   const bannerConfig = {
     ...plugin.configs["recommended"],
+    files: [TS_FILE],
     rules: {
       "banner/banner": [
         "error",
@@ -12981,92 +12983,34 @@ function getStormConfig(options = {
     // User overrides
     ...userConfigs
   ].filter(Boolean);
-  const typescriptConfigs = [
-    eslint.configs.recommended
-  ];
-  if (tsConfigType !== "none") {
-    if (!(tsConfigType in tsEslint$1.configs)) {
+  configs.push(eslint.configs.recommended);
+  if (typescriptEslintConfigType !== "none") {
+    if (!(typescriptEslintConfigType in tsEslint$1.configs)) {
       console.warn(
         "Invalid TypeScript ESLint configuration type:",
-        tsConfigType
+        typescriptEslintConfigType
       );
     } else {
-      typescriptConfigs.push(
-        ...tsEslint$1.configs[tsConfigType]?.map((config) => ({
-          ...config,
-          files: [TS_FILE]
-        })) ?? []
+      configs.push(
+        ...Array.isArray(tsEslint$1.configs[typescriptEslintConfigType]) ? tsEslint$1.configs[typescriptEslintConfigType] : [tsEslint$1.configs[typescriptEslintConfigType]]
       );
     }
   }
   if (useUnicorn) {
-    typescriptConfigs.push({
+    configs.push({
+      files: [TS_FILE],
       plugins: { unicorn },
       rules: {
         ...unicorn.configs["flat/recommended"].rules
       }
     });
   }
-  typescriptConfigs.push({
+  configs.push({
     files: [TS_FILE],
     plugins: { tsdoc },
     rules: config
   });
-  typescriptConfigs.push(bannerConfig);
-  configs.push(
-    ...tsEslint$1.config({
-      files: [TS_FILE],
-      extends: typescriptConfigs,
-      languageOptions: {
-        globals: {
-          ...Object.fromEntries(
-            Object.keys(globals).flatMap(
-              (group) => Object.keys(globals[group]).map((key) => [
-                key,
-                "readonly"
-              ])
-            )
-          ),
-          ...globals.browser,
-          ...globals.node,
-          "window": "readonly",
-          "Storm": "readonly"
-        },
-        parserOptions: {
-          emitDecoratorMetadata: true,
-          experimentalDecorators: true,
-          project: tsconfig,
-          projectService: true,
-          sourceType: "module",
-          projectFolderIgnoreList: [
-            "**/node_modules/**",
-            "**/dist/**",
-            "**/coverage/**",
-            "**/tmp/**",
-            "**/.nx/**",
-            "**/.tamagui/**",
-            "**/.next/**",
-            ...options.ignores || []
-          ],
-          ...options.parserOptions
-        }
-      },
-      rules: {
-        ...getStormRulesConfig({ ...options, tsConfigType, useUnicorn }),
-        ...options.rules ?? {}
-      },
-      ignores: [
-        "**/node_modules/**",
-        "**/dist/**",
-        "**/coverage/**",
-        "**/tmp/**",
-        "**/.nx/**",
-        "**/.tamagui/**",
-        "**/.next/**",
-        ...options.ignores || []
-      ]
-    })
-  );
+  configs.push(bannerConfig);
   if (react) {
     const reactConfigs = [
       {
@@ -13086,7 +13030,7 @@ function getStormConfig(options = {
       },
       {
         ...reactHooks.configs?.recommended,
-        files: ["**/*.tsx"],
+        files: [TS_FILE],
         ignores: [
           "**/node_modules/**",
           "**/dist/**",
@@ -13142,6 +13086,61 @@ function getStormConfig(options = {
       files: options.nextFiles
     });
   }
+  configs.push({
+    files: [TS_FILE],
+    languageOptions: {
+      globals: {
+        ...Object.fromEntries(
+          Object.keys(globals).flatMap(
+            (group) => Object.keys(globals[group]).map((key) => [
+              key,
+              "readonly"
+            ])
+          )
+        ),
+        ...globals.browser,
+        ...globals.node,
+        "window": "readonly",
+        "Storm": "readonly"
+      },
+      parserOptions: {
+        emitDecoratorMetadata: true,
+        experimentalDecorators: true,
+        project: tsconfig,
+        projectService: true,
+        sourceType: "module",
+        projectFolderIgnoreList: [
+          "**/node_modules/**",
+          "**/dist/**",
+          "**/coverage/**",
+          "**/tmp/**",
+          "**/.nx/**",
+          "**/.tamagui/**",
+          "**/.next/**",
+          ...options.ignores || []
+        ],
+        ...options.parserOptions
+      }
+    },
+    rules: {
+      ...getStormRulesConfig({
+        ...options,
+        typescriptEslintConfigType,
+        useUnicorn
+      }),
+      ...options.rules ?? {}
+    },
+    ignores: [
+      "**/node_modules/**",
+      "**/dist/**",
+      "**/coverage/**",
+      "**/tmp/**",
+      "**/.nx/**",
+      "**/.tamagui/**",
+      "**/.next/**",
+      ...options.ignores || []
+    ]
+  });
   if (options.markdown) {
     configs.push(...markdown.configs.recommended);
     configs.push({
@@ -13172,7 +13171,13 @@ function getStormConfig(options = {
       }
     });
   }
-  return formatConfig("Preset", configs);
+  return formatConfig(
+    "Preset",
+    configs.reduce(
+      (ret, config) => merge(ret, [config], (c) => c.files),
+      []
+    )
+  );
 }
 
 export { getStormConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.83.3",
+  "version": "0.84.1",
   "type": "module",
   "description": "⚡ A package containing the base ESLint configuration used by Storm Software across many projects.",
   "repository": {
@@ -95,8 +95,9 @@
     "eslint-plugin-yml": "1.14.0",
     "globals": "^15.8.0",
     "jsonc-eslint-parser": "2.4.0",
+    "radash": "12.1.0",
     "synckit": "0.9.0",
-    "typescript-eslint": "8.6.0",
+    "typescript-eslint": "8.10.0",
     "ws": "8.17.1",
     "yaml-eslint-parser": "1.2.3"
   },
@@ -110,6 +111,7 @@
     "eslint": "9.5.0",
     "eslint-typegen": "^0.2.4",
     "graphql": ">=16.9.0",
+    "typescript": ">=5.5.3",
     "unbuild": "^2.0.0"
   },
   "publishConfig": {