@dword-design/base 15.3.1 → 15.3.3

package/dist/get-generated-files/get-lint-staged/index.js

@@ -0,0 +1,7 @@
+import mergeConfigs from "./merge-lint-staged-configs/index.js";
+const baseLintStagedConfig = {
+  "*.{json,ts,vue}": "eslint --fix --config eslint.lint-staged.config.ts"
+};
+export default function () {
+  return this.config.lintStagedConfig ? mergeConfigs(baseLintStagedConfig, this.config.lintStagedConfig) : baseLintStagedConfig;
+}

package/dist/get-generated-files/get-lint-staged/merge-lint-staged-configs/index.d.ts

@@ -0,0 +1,8 @@
+import type { Configuration } from 'lint-staged';
+/**
+ * Safely merges two lint-staged configs by expanding overlapping globs
+ * and merging commands for each normalized glob pattern.
+ * Avoids race conditions by combining commands per unique glob.
+ */
+declare const mergeConfigs: (configA: Configuration, configB: Configuration) => Configuration;
+export default mergeConfigs;

package/dist/get-generated-files/get-lint-staged/merge-lint-staged-configs/index.js

@@ -0,0 +1,74 @@
+import braces from "braces";
+import sortKeys from "sort-keys";
+const createBracePattern = expandedGlobs => {
+  if (expandedGlobs.length <= 1) return null;
+  const sortedGlobs = [...expandedGlobs].sort();
+  const globParts = sortedGlobs.map(glob => {
+    const lastDotIndex = glob.lastIndexOf(".");
+    if (lastDotIndex === -1) return null;
+    return {
+      extension: glob.slice(Math.max(0, lastDotIndex + 1)),
+      prefix: glob.slice(0, Math.max(0, lastDotIndex))
+    };
+  });
+  if (globParts.includes(null)) return null;
+  const prefix = globParts[0].prefix;
+  if (!globParts.every(part => part.prefix === prefix)) return null;
+  const extensions = globParts.map(part => part.extension);
+  return `${prefix}.{${extensions.join(",")}}`;
+};
+const mergeConfigs = (configA, configB) => {
+  const expandedMap = /* @__PURE__ */new Map();
+  const originalToExpanded = /* @__PURE__ */new Map();
+  const expandedToOriginals = /* @__PURE__ */new Map();
+  for (const config of [configA, configB]) {
+    for (const [glob, cmds] of Object.entries(config)) {
+      const commands = Array.isArray(cmds) ? cmds : [cmds];
+      const expandedGlobs = braces.expand(glob);
+      originalToExpanded.set(glob, expandedGlobs);
+      for (const expandedGlob of expandedGlobs) {
+        if (!expandedToOriginals.has(expandedGlob)) {
+          expandedToOriginals.set(expandedGlob, /* @__PURE__ */new Set());
+        }
+        expandedToOriginals.get(expandedGlob).add(glob);
+        if (!expandedMap.has(expandedGlob)) {
+          expandedMap.set(expandedGlob, /* @__PURE__ */new Set());
+        }
+        for (const cmd of commands) {
+          expandedMap.get(expandedGlob).add(cmd);
+        }
+      }
+    }
+  }
+  const result = {};
+  const processedExpanded = /* @__PURE__ */new Set();
+  const originalGlobs = [...originalToExpanded.keys()];
+  for (const originalGlob of originalGlobs) {
+    const expandedGlobs = originalToExpanded.get(originalGlob);
+    const unprocessedExpanded = expandedGlobs.filter(eg => !processedExpanded.has(eg));
+    if (unprocessedExpanded.length > 1) {
+      const firstExpanded = unprocessedExpanded[0];
+      const firstCommands = expandedMap.get(firstExpanded);
+      const sameCommandsExpanded = unprocessedExpanded.filter(eg => {
+        const commands = expandedMap.get(eg);
+        return commands.size === firstCommands.size && [...firstCommands].every(cmd => commands.has(cmd));
+      });
+      if (sameCommandsExpanded.length > 1) {
+        const pattern = createBracePattern(sameCommandsExpanded);
+        if (pattern) {
+          const commandsArray = [...firstCommands];
+          result[pattern] = commandsArray.length === 1 ? commandsArray[0] : commandsArray;
+          for (const eg of sameCommandsExpanded) processedExpanded.add(eg);
+        }
+      }
+    }
+  }
+  for (const [expandedGlob, commands] of expandedMap) {
+    if (!processedExpanded.has(expandedGlob)) {
+      const commandsArray = [...commands];
+      result[expandedGlob] = commandsArray.length === 1 ? commandsArray[0] : commandsArray;
+    }
+  }
+  return sortKeys(result);
+};
+export default mergeConfigs;

package/dist/index.js

@@ -31,7 +31,7 @@ import getGitignoreConfig from "./get-generated-files/get-gitignore/index.js";
 import getGitpodConfig from "./get-generated-files/get-gitpod/index.js";
 import getGitpodDockerfile from "./get-generated-files/get-gitpod-dockerfile.js";
 import getLicenseString from "./get-generated-files/get-license-string.js";
-import getLintStaged from "./get-generated-files/get-lint-staged.js";
+import getLintStaged from "./get-generated-files/get-lint-staged/index.js";
 import getPackageConfig from "./get-generated-files/get-package-config/index.js";
 import getReadmeString from "./get-generated-files/get-readme-string/index.js";
 import getReleaseConfig from "./get-generated-files/get-release/index.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dword-design/base",
-  "version": "15.3.1",
+  "version": "15.3.3",
   "description": "Base package for projects.",
   "repository": "dword-design/base",
   "funding": "https://github.com/sponsors/dword-design",
@@ -43,12 +43,13 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "ajv": "^8.17.1",
+    "braces": "^3.0.3",
     "c8": "^10.0.0",
     "change-case": "^5.4.4",
     "commitizen": "^4.3.1",
     "cosmiconfig": "^9.0.0",
     "cz-conventional-changelog": "^3.3.0",
-    "depcheck": "npm:@dword-design/depcheck@^0.0.7",
+    "depcheck": "npm:@dword-design/depcheck@^0.0.9",
     "depcheck-detector-bin-name": "^1.0.2",
     "depcheck-detector-execa": "^4.0.3",
     "depcheck-detector-package-name": "^3.0.4",

package/dist/get-generated-files/get-lint-staged.js

@@ -1,6 +0,0 @@
-export default function () {
-  return {
-    "*.{json,ts,vue}": "eslint --fix --config eslint.lint-staged.config.ts",
-    ...this.config.lintStaged
-  };
-}