@storm-software/eslint 0.85.0 → 0.85.2

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.84.1-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.85.1-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.mjs

@@ -18,7 +18,7 @@ import unicorn from 'eslint-plugin-unicorn';
 import yml from 'eslint-plugin-yml';
 import globals from 'globals';
 import { writeInfo, writeDebug } from '@storm-software/config-tools';
-import { merge } from 'radash';
+import { defu } from 'defu';
 import tsEslint$1 from 'typescript-eslint';
 import require$$0 from 'eslint/use-at-your-own-risk';
 import require$$0$1 from 'eslint';
@@ -13173,12 +13173,23 @@ function getStormConfig(options = {
       }
     });
   }
+  writeInfo("\u2699\uFE0F  Merging generated Storm ESLint configuration objects", {
+    logLevel: "all"
+  });
+  writeDebug(configs, { logLevel: "all" });
   const result = formatConfig(
     "Preset",
-    configs.reduce(
-      (ret, config) => merge(ret, [config], (c) => c.files),
-      []
-    )
+    configs.reduce((ret, config) => {
+      const existingIndex = ret.findIndex(
+        (existing) => areFilesEqual(existing.files, config.files)
+      );
+      if (existingIndex >= 0) {
+        ret[existingIndex] = defu(ret[existingIndex], config);
+      } else {
+        ret.push(config);
+      }
+      return ret;
+    }, [])
   );
   writeInfo("\u2699\uFE0F  Completed generated Storm ESLint configuration objects", {
     logLevel: "all"
@@ -13186,5 +13197,19 @@ function getStormConfig(options = {
   writeDebug(result, { logLevel: "all" });
   return result;
 }
+const areFilesEqual = (files1, files2) => {
+  if (files1 === files2) {
+    return true;
+  } else if (!files1 || !files2) {
+    return false;
+  } else if (typeof files1 === "string" && typeof files2 !== "string" || typeof files1 !== "string" && typeof files2 === "string" || Array.isArray(files1) && !Array.isArray(files2) || !Array.isArray(files1) && Array.isArray(files2)) {
+    return false;
+  } else if (files1.length !== files2.length) {
+    return false;
+  }
+  return files1.every(
+    (file, index) => Array.isArray(file) && Array.isArray(files2?.[index]) ? areFilesEqual(file, files2?.[index]) : !Array.isArray(file) && !Array.isArray(files2?.[index]) ? file?.toLowerCase() === files2?.[index]?.toLowerCase() : file === files2
+  );
+};
 
 export { getStormConfig };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storm-software/eslint",
-  "version": "0.85.0",
+  "version": "0.85.2",
   "type": "module",
   "description": "⚡ A package containing the base ESLint configuration used by Storm Software across many projects.",
   "repository": {
@@ -74,6 +74,7 @@
     "@cspell/eslint-plugin": "8.13.1",
     "@graphql-eslint/eslint-plugin": "3.20.1",
     "@next/eslint-plugin-next": "14.2.4",
+    "defu": "6.1.4",
     "eslint-plugin-es-x": "7.6.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-json": "4.0.0",
@@ -95,7 +96,6 @@
     "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.10.0",
     "ws": "8.17.1",