dependency-cruiser 10.3.0-beta-6 → 10.3.1-beta-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "10.3.0-beta-6",
+  "version": "10.3.1-beta-1",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -131,21 +131,21 @@
     "version": "npm-run-all build depcruise:graph:doc scm:stage"
   },
   "dependencies": {
-    "acorn": "8.4.1",
+    "acorn": "8.5.0",
     "acorn-jsx": "5.3.2",
     "acorn-jsx-walk": "2.0.0",
-    "acorn-loose": "8.1.0",
-    "acorn-walk": "8.1.1",
-    "ajv": "8.6.2",
+    "acorn-loose": "8.2.1",
+    "acorn-walk": "8.2.0",
+    "ajv": "8.6.3",
     "chalk": "4.1.2",
-    "commander": "8.1.0",
+    "commander": "8.2.0",
     "enhanced-resolve": "5.8.2",
     "figures": "^3.2.0",
     "get-stream": "^6.0.1",
     "glob": "7.1.7",
     "handlebars": "4.7.7",
     "indent-string": "^4.0.0",
-    "inquirer": "8.1.2",
+    "inquirer": "8.1.5",
     "json5": "2.2.0",
     "lodash": "4.17.21",
     "safe-regex": "2.1.1",
@@ -156,13 +156,13 @@
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.15.0",
-    "@babel/plugin-transform-modules-commonjs": "7.15.0",
+    "@babel/core": "7.15.5",
+    "@babel/plugin-transform-modules-commonjs": "7.15.4",
     "@babel/preset-typescript": "7.15.0",
-    "@swc/core": "1.2.83",
-    "@typescript-eslint/eslint-plugin": "4.29.3",
-    "@typescript-eslint/parser": "4.29.3",
-    "c8": "7.8.0",
+    "@swc/core": "1.2.88",
+    "@typescript-eslint/eslint-plugin": "4.31.1",
+    "@typescript-eslint/parser": "4.31.1",
+    "c8": "7.9.0",
     "chai": "4.3.4",
     "chai-json-schema": "1.5.1",
     "coffeescript": "2.5.1",
@@ -174,18 +174,18 @@
     "eslint-plugin-mocha": "9.0.0",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-security": "1.4.0",
-    "eslint-plugin-unicorn": "35.0.0",
+    "eslint-plugin-unicorn": "36.0.0",
     "husky": "^4.3.8",
     "intercept-stdout": "0.1.2",
     "lint-staged": "11.1.2",
     "mocha": "9.1.1",
     "normalize-newline": "4.1.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.3.2",
+    "prettier": "2.4.1",
     "shx": "0.3.3",
-    "svelte": "3.42.4",
+    "svelte": "3.42.6",
     "symlink-dir": "5.0.1",
-    "typescript": "4.4.2",
+    "typescript": "4.4.3",
     "upem": "^7.0.0",
     "vue-template-compiler": "2.6.14",
     "yarn": "1.22.11"

package/src/enrich/soften-known-violations.js

@@ -19,6 +19,25 @@ function softenModuleViolation(
   };
 }
 
+function knownErrorMatchesViolation(pKnownError, pViolationKey) {
+  if (pKnownError.rule.name === pViolationKey.rule.name) {
+    if (pViolationKey.cycle && pKnownError.cycle) {
+      return (
+        pKnownError.cycle.length === pViolationKey.cycle.length &&
+        pKnownError.cycle.every((pModule) =>
+          pViolationKey.cycle.includes(pModule)
+        )
+      );
+    } else {
+      return (
+        pKnownError.from === pViolationKey.from &&
+        pKnownError.to === pViolationKey.to
+      );
+    }
+  }
+  return false;
+}
+
 function softenDependencyViolation(
   pViolationKey,
   pKnownDependencyViolations,
@@ -26,11 +45,8 @@ function softenDependencyViolation(
 ) {
   return {
     ...pViolationKey.rule,
-    severity: pKnownDependencyViolations.some(
-      (pKnownError) =>
-        pKnownError.from === pViolationKey.from &&
-        pKnownError.to === pViolationKey.to &&
-        pKnownError.rule.name === pViolationKey.rule.name
+    severity: pKnownDependencyViolations.some((pKnownError) =>
+      knownErrorMatchesViolation(pKnownError, pViolationKey)
     )
       ? pSoftenedSeverity
       : pViolationKey.rule.severity,
@@ -48,7 +64,12 @@ function softenDependencyViolations(
       ...pDependency,
       rules: pDependency.rules.map((pRule) =>
         softenDependencyViolation(
-          { rule: pRule, from: pModuleSource, to: pDependency.resolved },
+          {
+            rule: pRule,
+            from: pModuleSource,
+            to: pDependency.resolved,
+            cycle: pDependency.cycle,
+          },
           pKnownDependencyViolations,
           pSoftenedSeverity
         )

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

@@ -129,10 +129,10 @@ function extractModuleViolations(pModules, pRuleSet) {
 
 module.exports = function summarizeModules(pModules, pRuleSet) {
   const lViolations = deDuplicateViolations(
-    extractDependencyViolations(pModules, pRuleSet).concat(
-      extractModuleViolations(pModules, pRuleSet)
-    )
-  ).sort(compare.violations);
+    extractDependencyViolations(pModules, pRuleSet)
+      .concat(extractModuleViolations(pModules, pRuleSet))
+      .sort(compare.violations)
+  );
 
   return {
     violations: lViolations,

package/src/extract/gather-initial-sources.js

@@ -113,5 +113,6 @@ module.exports = function gatherInitialSources(
       } else {
         return pAll.concat(pathToPosix(pFileOrDirectory));
       }
-    }, []);
+    }, [])
+    .sort();
 };

package/src/meta.js

@@ -1,7 +1,7 @@
 /* generated - don't edit */
 
 module.exports = {
-  version: "10.3.0-beta-6",
+  version: "10.3.1-beta-1",
   engines: {
     node: "^12.20||^14||>=16",
   },