dependency-cruiser 16.3.6 → 16.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "16.3.6",
+  "version": "16.3.7",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -143,7 +143,7 @@
     "acorn-jsx-walk": "2.0.0",
     "acorn-loose": "8.4.0",
     "acorn-walk": "8.3.3",
-    "ajv": "8.16.0",
+    "ajv": "8.17.1",
     "commander": "12.1.0",
     "enhanced-resolve": "5.17.0",
     "ignore": "5.3.1",
@@ -160,8 +160,7 @@
     "semver": "^7.6.2",
     "teamcity-service-messages": "0.1.14",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "watskeburt": "4.1.0",
-    "wrap-ansi": "9.0.0"
+    "watskeburt": "4.1.0"
   },
   "overrides": {
     "semver": "^7.6.2",

package/src/meta.cjs

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

package/src/report/error.mjs

@@ -44,11 +44,11 @@ function formatReachabilityViolation(pViolation) {
 }
 
 function formatInstabilityViolation(pViolation) {
-  return `${formatDependencyViolation(pViolation)}${EOL}${wrapAndIndent(
-    pc.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,
   )}`;
 }
 
@@ -72,7 +72,7 @@ function formatViolation(pViolation) {
     )} ${pViolation.rule.name}: ${lFormattedViolators}` +
     `${
       pViolation.comment
-        ? `${EOL}${wrapAndIndent(pc.dim(pViolation.comment))}${EOL}`
+        ? `${EOL}${pc.dim(wrapAndIndent(pViolation.comment))}${EOL}`
         : ""
     }`
   );

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);
 }