dependency-cruiser 16.3.5 → 16.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "16.3.5",
+  "version": "16.3.7",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -138,13 +138,12 @@
     "README.md"
   ],
   "dependencies": {
-    "acorn": "8.12.0",
+    "acorn": "8.12.1",
     "acorn-jsx": "5.3.2",
     "acorn-jsx-walk": "2.0.0",
     "acorn-loose": "8.4.0",
     "acorn-walk": "8.3.3",
-    "ajv": "8.16.0",
-    "chalk": "5.3.0",
+    "ajv": "8.17.1",
     "commander": "12.1.0",
     "enhanced-resolve": "5.17.0",
     "ignore": "5.3.1",
@@ -153,6 +152,7 @@
     "json5": "2.2.3",
     "lodash": "4.17.21",
     "memoize": "10.0.0",
+    "picocolors": "1.0.1",
     "picomatch": "4.0.2",
     "prompts": "2.4.2",
     "rechoir": "^0.8.0",
@@ -160,8 +160,7 @@
     "semver": "^7.6.2",
     "teamcity-service-messages": "0.1.14",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "watskeburt": "4.0.2",
-    "wrap-ansi": "9.0.0"
+    "watskeburt": "4.1.0"
   },
   "overrides": {
     "semver": "^7.6.2",

package/src/cli/format-meta-info.mjs

@@ -1,9 +1,9 @@
-import chalk from "chalk";
+import pc from "picocolors";
 
 import { getAvailableTranspilers, allExtensions } from "#main/index.mjs";
 
 function bool2Symbol(pBool) {
-  return pBool ? chalk.green("✔") : chalk.red("x");
+  return pBool ? pc.green("✔") : pc.red("x");
 }
 
 function formatTranspilers() {
@@ -28,7 +28,7 @@ export default function formatMetaInfo() {
   return `
   Supported:
 
-    If you need a supported, but not enabled transpiler ('${chalk.red(
+    If you need a supported, but not enabled transpiler ('${pc.red(
       "x",
     )}' below), just install
     it in the same folder dependency-cruiser is installed. E.g. 'npm i livescript'

package/src/cli/index.mjs

@@ -2,7 +2,7 @@ import { join } from "node:path";
 import picomatch from "picomatch";
 import set from "lodash/set.js";
 import isInstalledGlobally from "is-installed-globally";
-import chalk from "chalk";
+import pc from "picocolors";
 
 import assertFileExistence from "./utl/assert-file-existence.mjs";
 import normalizeCliOptions from "./normalize-cli-options.mjs";
@@ -159,11 +159,13 @@ export default async function executeCli(
     /* c8 ignore start */
     if (isInstalledGlobally) {
       lStreams.stderr.write(
-        `\n  ${chalk.yellow(
+        `\n  ${pc.yellow(
           "WARNING",
         )}: You're running a globally installed dependency-cruiser.\n\n` +
-          `           We recommend to ${chalk.bold.italic.underline(
-            "install and run it as a local devDependency",
+          `           We recommend to ${pc.bold(
+            pc.italic(
+              pc.underline("install and run it as a local devDependency"),
+            ),
           )} in\n` +
           `           your project instead. There it has your project's environment and\n` +
           `           transpilers at its disposal. That will ensure it can find e.g.\n` +
@@ -183,7 +185,7 @@ export default async function executeCli(
       lExitCode = await runCruise(pFileDirectoryArray, lCruiseOptions);
     }
   } catch (pError) {
-    lStreams.stderr.write(`\n  ${chalk.red("ERROR")}: ${pError.message}\n`);
+    lStreams.stderr.write(`\n  ${pc.red("ERROR")}: ${pError.message}\n`);
     bus.emit("end");
     lExitCode = 1;
   }

package/src/cli/init-config/write-config.mjs

@@ -1,5 +1,5 @@
 import { writeFileSync } from "node:fs";
-import chalk from "chalk";
+import pc from "picocolors";
 import {
   fileExists,
   getDefaultConfigFileName,
@@ -29,7 +29,7 @@ export default function writeConfig(
     try {
       writeFileSync(pFileName, pConfig);
       pOutStream.write(
-        `\n  ${chalk.green("✔")} Successfully created '${pFileName}'\n\n`,
+        `\n  ${pc.green("✔")} Successfully created '${pFileName}'\n\n`,
       );
       /* c8 ignore start */
     } catch (pError) {

package/src/cli/init-config/write-run-scripts-to-manifest.mjs

@@ -2,7 +2,7 @@
 /* eslint-disable security/detect-object-injection */
 import { writeFileSync } from "node:fs";
 import { EOL } from "node:os";
-import chalk from "chalk";
+import pc from "picocolors";
 import { PACKAGE_MANIFEST as _PACKAGE_MANIFEST } from "../defaults.mjs";
 import { readManifest } from "./environment-helpers.mjs";
 import { folderNameArrayToRE } from "./utl.mjs";
@@ -126,16 +126,14 @@ export function addRunScriptsToManifest(pManifest, pAdditionalRunScripts) {
 }
 
 function getSuccessMessage(pDestinationManifestFileName) {
-  const lExplanationIndent = 6;
-
   return EXPERIMENTAL_SCRIPT_DOC.reduce(
     (pAll, pScript) => {
       return `${pAll}${
-        `\n    ${chalk.green("►")} ${pScript.headline}` +
+        `\n    ${pc.green("►")} ${pScript.headline}` +
         `\n${pScript.description}\n\n`
       }`;
     },
-    `  ${chalk.green("✔")} Run scripts added to '${pDestinationManifestFileName}':\n`,
+    `  ${pc.green("✔")} Run scripts added to '${pDestinationManifestFileName}':\n`,
   );
 }
 

package/src/cli/listeners/cli-feedback.mjs

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import pc from "picocolors";
 import { SUMMARY } from "#utl/bus.mjs";
 
 const FULL_ON = 100;
@@ -17,7 +17,7 @@ function getPercentageBar(pPercentage, pParameters) {
   const lBlocks = Math.floor(lParameters.barSize * lPercentage);
   const lBlanks = lParameters.barSize - lBlocks;
 
-  return `${chalk.green(lParameters.block.repeat(lBlocks))}${chalk.green(
+  return `${pc.green(lParameters.block.repeat(lBlocks))}${pc.green(
     lParameters.blank.repeat(lBlanks),
   )} ${Math.round(FULL_ON * lPercentage)}%`;
 }

package/src/cli/listeners/performance-log/format-helpers.mjs

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import pc from "picocolors";
 import { INFO } from "#utl/bus.mjs";
 
 const MS_PER_SECOND = 1000;
@@ -43,7 +43,7 @@ export function formatDividerLine() {
 }
 
 export function formatHeader() {
-  return chalk
+  return pc
     .bold(
       `${
         pad("∆ rss") +
@@ -59,7 +59,7 @@ export function formatHeader() {
 }
 
 function formatMessage(pMessage, pLevel) {
-  return pLevel >= INFO ? chalk.dim(pMessage) : pMessage;
+  return pLevel >= INFO ? pc.dim(pMessage) : pMessage;
 }
 
 export function formatTime(
@@ -81,7 +81,7 @@ export function formatMemory(pBytes, pLevel) {
   );
 
   return formatMessage(
-    (pBytes < 0 ? chalk.blue(lReturnValue) : lReturnValue).concat(" "),
+    (pBytes < 0 ? pc.blue(lReturnValue) : lReturnValue).concat(" "),
     pLevel,
   );
 }

package/src/enrich/summarize/summarize-modules.mjs

@@ -1,4 +1,3 @@
-import flattenDeep from "lodash/flattenDeep.js";
 import uniqWith from "lodash/uniqWith.js";
 import isSameViolation from "./is-same-violation.mjs";
 import { findRuleByName } from "#graph-utl/rule-set.mjs";
@@ -72,18 +71,17 @@ function toDependencyViolationSummary(pRule, pModule, pDependency, pRuleSet) {
  * @return {any} an array of violations
  */
 function extractDependencyViolations(pModules, pRuleSet) {
-  return flattenDeep(
-    pModules
-      .map(cutNonTransgressions)
-      .filter((pModule) => pModule.dependencies.length > 0)
-      .map((pModule) =>
-        pModule.dependencies.map((pDependency) =>
-          pDependency.rules.map((pRule) =>
-            toDependencyViolationSummary(pRule, pModule, pDependency, pRuleSet),
-          ),
+  return pModules
+    .map(cutNonTransgressions)
+    .filter((pModule) => pModule.dependencies.length > 0)
+    .map((pModule) =>
+      pModule.dependencies.map((pDependency) =>
+        pDependency.rules.map((pRule) =>
+          toDependencyViolationSummary(pRule, pModule, pDependency, pRuleSet),
         ),
       ),
-  );
+    )
+    .flat(Infinity);
 }
 
 function toModuleViolationSummary(pRule, pModule, pRuleSet) {

package/src/extract/transpile/vue-template-wrap.cjs

@@ -1,5 +1,4 @@
 const { EOL } = require("node:os");
-const isEmpty = require("lodash/isEmpty");
 const tryRequire = require("#utl/try-require.cjs");
 const meta = require("#meta.cjs");
 
@@ -29,6 +28,12 @@ function getVueTemplateCompiler() {
   return { lCompiler, lIsVue3 };
 }
 
+function isEmpty(pObject) {
+  return (
+    Object.entries(pObject).length === 0 && !pObject?.length && !pObject?.size
+  );
+}
+
 const { lCompiler: vueTemplateCompiler, lIsVue3: isVue3 } =
   getVueTemplateCompiler();
 

package/src/graph-utl/consolidate-module-dependencies.mjs

@@ -1,4 +1,3 @@
-import reject from "lodash/reject.js";
 import compare from "./compare.mjs";
 import { uniq } from "#utl/array-util.mjs";
 
@@ -42,9 +41,10 @@ function consolidateDependencies(pDependencies) {
     lReturnValue.push(
       mergeDependencies(lDependencies[0].resolved, lDependencies),
     );
-    lDependencies = reject(lDependencies, {
-      resolved: lDependencies[0].resolved,
-    });
+    lDependencies = lDependencies.filter(
+      // eslint-disable-next-line no-loop-func
+      (pDependency) => pDependency.resolved !== lDependencies[0].resolved,
+    );
   }
 
   return lReturnValue;

package/src/graph-utl/consolidate-modules.mjs

@@ -1,4 +1,3 @@
-import _reject from "lodash/reject.js";
 import uniqBy from "lodash/uniqBy.js";
 import compare from "./compare.mjs";
 
@@ -39,7 +38,10 @@ export default function consolidateModules(pModules) {
 
   while (lModules.length > 0) {
     lReturnValue.push(mergeModules(lModules[0].source, lModules));
-    lModules = _reject(lModules, { source: lModules[0].source });
+    lModules = lModules.filter(
+      // eslint-disable-next-line no-loop-func
+      (pModule) => pModule.source !== lModules[0].source,
+    );
   }
   return lReturnValue;
 }

package/src/main/options/assert-validity.mjs

@@ -1,10 +1,33 @@
-import merge from "lodash/merge.js";
+/* eslint-disable security/detect-object-injection */
 import safeRegex from "safe-regex";
 import report from "#report/index.mjs";
 
 const MODULE_SYSTEM_LIST_RE = /^(?:(?:cjs|amd|es6|tsd)(?:,|$)){1,4}/gi;
 const VALID_DEPTH_RE = /^\d{1,2}$/g;
 
+function isObject(pObject) {
+  return (
+    typeof pObject === "object" && !Array.isArray(pObject) && pObject !== null
+  );
+}
+function deepMerge(pTarget, pSource) {
+  const lOutput = structuredClone(pTarget);
+
+  for (const lKey in pSource) {
+    if (isObject(pSource[lKey])) {
+      if (lKey in pTarget) {
+        lOutput[lKey] = deepMerge(pTarget[lKey], pSource[lKey]);
+      } else {
+        Object.assign(lOutput, { [lKey]: pSource[lKey] });
+      }
+    } else {
+      Object.assign(lOutput, { [lKey]: pSource[lKey] });
+    }
+  }
+
+  return lOutput;
+}
+
 function assertModuleSystemsValid(pModuleSystems) {
   if (
     Boolean(pModuleSystems) &&
@@ -102,7 +125,7 @@ export function assertCruiseOptionsValid(pOptions) {
     if (pOptions?.ruleSet?.options) {
       lReturnValue = assertCruiseOptionsValid(pOptions.ruleSet.options);
     }
-    return merge({}, lReturnValue, pOptions);
+    return deepMerge(lReturnValue, pOptions);
   }
   return lReturnValue;
 }

package/src/main/resolve-options/normalize.mjs

@@ -1,6 +1,5 @@
 import fs from "node:fs";
 import enhancedResolve from "enhanced-resolve";
-import omit from "lodash/omit.js";
 import { scannableExtensions } from "#extract/transpile/meta.mjs";
 import {
   ruleSetHasDeprecationRule,
@@ -32,6 +31,13 @@ const DEFAULT_RESOLVE_OPTIONS = {
   exportsFields: [],
 };
 
+function omit(pObject, pProperty) {
+  const lObject = structuredClone(pObject);
+  // eslint-disable-next-line security/detect-object-injection
+  delete lObject[pProperty];
+  return lObject;
+}
+
 /**
  *
  * @param {Number} pCacheDuration

package/src/meta.cjs

@@ -1,7 +1,7 @@
 /* generated - don't edit */
 
 module.exports = {
-  version: "16.3.5",
+  version: "16.3.7",
   engines: {
     node: "^18.17||>=20",
   },

package/src/report/error.mjs

@@ -1,5 +1,5 @@
 import { EOL } from "node:os";
-import chalk from "chalk";
+import pc from "picocolors";
 import {
   formatPercentage,
   formatViolation as _formatViolation,
@@ -7,11 +7,11 @@ import {
 import { findRuleByName } from "#graph-utl/rule-set.mjs";
 import wrapAndIndent from "#utl/wrap-and-indent.mjs";
 
-const SEVERITY2CHALK = new Map([
-  ["error", chalk.red],
-  ["warn", chalk.yellow],
-  ["info", chalk.cyan],
-  ["ignore", chalk.gray],
+const SEVERITY2COLOR_FN = new Map([
+  ["error", pc.red],
+  ["warn", pc.yellow],
+  ["info", pc.cyan],
+  ["ignore", pc.gray],
 ]);
 
 const EXTRA_PATH_INFORMATION_INDENT = 6;
@@ -26,29 +26,29 @@ function formatMiniDependency(pMiniDependency) {
 }
 
 function formatModuleViolation(pViolation) {
-  return chalk.bold(pViolation.from);
+  return pc.bold(pViolation.from);
 }
 
 function formatDependencyViolation(pViolation) {
-  return `${chalk.bold(pViolation.from)} → ${chalk.bold(pViolation.to)}`;
+  return `${pc.bold(pViolation.from)} → ${pc.bold(pViolation.to)}`;
 }
 
 function formatCycleViolation(pViolation) {
-  return `${chalk.bold(pViolation.from)} → ${formatMiniDependency(pViolation.cycle)}`;
+  return `${pc.bold(pViolation.from)} → ${formatMiniDependency(pViolation.cycle)}`;
 }
 
 function formatReachabilityViolation(pViolation) {
-  return `${chalk.bold(pViolation.from)} → ${chalk.bold(
+  return `${pc.bold(pViolation.from)} → ${pc.bold(
     pViolation.to,
   )}${formatMiniDependency(pViolation.via)}`;
 }
 
 function formatInstabilityViolation(pViolation) {
-  return `${formatDependencyViolation(pViolation)}${EOL}${wrapAndIndent(
-    chalk.dim(
+  return `${formatDependencyViolation(pViolation)}${EOL}${pc.dim(
+    wrapAndIndent(
       `instability: ${formatPercentage(pViolation.metrics.from.instability)} → ${formatPercentage(pViolation.metrics.to.instability)}`,
+      EXTRA_PATH_INFORMATION_INDENT,
     ),
-    EXTRA_PATH_INFORMATION_INDENT,
   )}`;
 }
 
@@ -67,12 +67,12 @@ function formatViolation(pViolation) {
   );
 
   return (
-    `${SEVERITY2CHALK.get(pViolation.rule.severity)(
+    `${SEVERITY2COLOR_FN.get(pViolation.rule.severity)(
       pViolation.rule.severity,
     )} ${pViolation.rule.name}: ${lFormattedViolators}` +
     `${
       pViolation.comment
-        ? `${EOL}${wrapAndIndent(chalk.dim(pViolation.comment))}${EOL}`
+        ? `${EOL}${pc.dim(wrapAndIndent(pViolation.comment))}${EOL}`
         : ""
     }`
   );
@@ -93,7 +93,7 @@ function formatSummary(pSummary) {
     pSummary.totalCruised
   } modules, ${pSummary.totalDependenciesCruised} dependencies cruised.${EOL}`;
 
-  return pSummary.error > 0 ? chalk.red(lMessage) : lMessage;
+  return pSummary.error > 0 ? pc.red(lMessage) : lMessage;
 }
 
 function addExplanation(pRuleSet, pLong) {
@@ -107,7 +107,7 @@ function addExplanation(pRuleSet, pLong) {
 
 function formatIgnoreWarning(pNumberOfIgnoredViolations) {
   if (pNumberOfIgnoredViolations > 0) {
-    return chalk.yellow(
+    return pc.yellow(
       `‼ ${pNumberOfIgnoredViolations} known violations ignored. Run with --no-ignore-known to see them.${EOL}`,
     );
   }
@@ -120,7 +120,7 @@ function report(pResults, pLong) {
   );
 
   if (lNonIgnorableViolations.length === 0) {
-    return `${EOL}${chalk.green("✔")} no dependency violations found (${
+    return `${EOL}${pc.green("✔")} no dependency violations found (${
       pResults.summary.totalCruised
     } modules, ${
       pResults.summary.totalDependenciesCruised

package/src/report/metrics.mjs

@@ -1,5 +1,5 @@
 import { EOL } from "node:os";
-import chalk from "chalk";
+import pc from "picocolors";
 import { formatNumber, formatPercentage } from "./utl/index.mjs";
 
 /**
@@ -224,7 +224,7 @@ function formatToTextData(pData, pMetaData) {
  * @returns {string}
  */
 function formatToTextTable(pData, pMetaData) {
-  return [chalk.bold(formatToTextHeader(pMetaData))]
+  return [pc.bold(formatToTextHeader(pMetaData))]
     .concat(formatToTextDemarcationLine(pMetaData))
     .concat(formatToTextData(pData, pMetaData))
     .join(EOL)

package/src/report/text.mjs

@@ -1,4 +1,4 @@
-import chalk from "chalk";
+import pc from "picocolors";
 
 const DEFAULT_OPTIONS = {
   highlightFocused: false,
@@ -36,7 +36,7 @@ function toFlatDependencies(pModules, pModulesInFocus, pHighlightFocused) {
 }
 
 function stringifyModule(pModule) {
-  return pModule.highlight ? chalk.underline(pModule.name) : pModule.name;
+  return pModule.highlight ? pc.underline(pModule.name) : pModule.name;
 }
 
 function stringify(pFlatDependency) {

package/src/utl/wrap-and-indent.mjs

@@ -1,5 +1,3 @@
-import wrapAnsi from "wrap-ansi";
-
 const DEFAULT_INDENT = 4;
 
 function indentString(pString, pCount) {
@@ -8,9 +6,51 @@ function indentString(pString, pCount) {
   return pString.replace(lRegex, " ".repeat(pCount));
 }
 
-export default function wrapAndIndent(pString, pCount = DEFAULT_INDENT) {
-  const lDogmaticMaxConsoleWidth = 78;
-  const lMaxWidth = lDogmaticMaxConsoleWidth - pCount;
+/**
+ * @param {string} pLine
+ * @param {number} pMaxWidth
+ */
+function splitLine(pLine, pMaxWidth) {
+  const lWords = pLine.split(" ");
+  const lWrappedLines = [];
+  let lCurrentLine = "";
+  let lCurrentWidth = 0;
+
+  for (const lWord of lWords) {
+    if (lCurrentWidth + lWord.length > pMaxWidth) {
+      lWrappedLines.push(lCurrentLine.trimEnd());
+      lCurrentLine = "";
+      lCurrentWidth = 0;
+    }
+
+    if (lCurrentLine) {
+      lCurrentLine += " ";
+      lCurrentWidth += 1;
+    }
+
+    lCurrentLine += lWord;
+    lCurrentWidth += lWord.length;
+  }
+
+  lWrappedLines.push(lCurrentLine.trimEnd());
+
+  return lWrappedLines.join("\n");
+}
+
+/**
+ * @param {string} pString - the string to wrap
+ * @param {number} pMaxWidth - the maximum width of the wrapped string
+ */
+function wrapString(pString, pMaxWidth) {
+  return pString
+    .split(/\r?\n/)
+    .map((pLine) => splitLine(pLine, pMaxWidth))
+    .join("\n");
+}
+
+export default function wrapAndIndent(pString, pIndent = DEFAULT_INDENT) {
+  const lMaxConsoleWidth = 78;
+  const lMaxWidth = lMaxConsoleWidth - pIndent;
 
-  return indentString(wrapAnsi(pString, lMaxWidth), pCount);
+  return indentString(wrapString(pString, lMaxWidth), pIndent);
 }