dependency-cruiser 12.5.0-beta-4 → 12.5.1-beta-1

package/bin/dependency-cruise.js

@@ -102,9 +102,14 @@ try {
       "prefix to use for links in the dot and err-html reporters"
     )
     .option(
-      "-C, --cache [cache-location]",
+      "-C, --cache [cache-directory]",
       "(experimental) use a cache to speed up execution. " +
-        "Location defaults to node_modules/.cache/dependency-cruiser"
+        "The directory defaults to node_modules/.cache/dependency-cruiser"
+    )
+    .option(
+      "--cache-strategy <strategy>",
+      "(experimental) strategy to use for detecting changed files in the cache. " +
+        "Possible values: metadata (= use git, the default), content"
     )
     .option("--preserve-symlinks", `leave symlinks unchanged (off by default)`)
     .option("-v, --validate [file]", `alias for --config`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "12.5.0-beta-4",
+  "version": "12.5.1-beta-1",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -149,7 +149,7 @@
     "acorn-walk": "8.2.0",
     "ajv": "8.12.0",
     "chalk": "^4.1.2",
-    "commander": "9.5.0",
+    "commander": "10.0.0",
     "enhanced-resolve": "5.12.0",
     "figures": "^3.2.0",
     "get-stream": "^6.0.1",
@@ -175,26 +175,26 @@
     "@babel/core": "7.20.12",
     "@babel/plugin-transform-modules-commonjs": "7.20.11",
     "@babel/preset-typescript": "7.18.6",
-    "@swc/core": "1.3.25",
+    "@swc/core": "1.3.26",
     "@types/lodash": "4.14.191",
     "@types/node": "18.11.18",
     "@types/prompts": "2.4.2",
-    "@typescript-eslint/eslint-plugin": "5.48.0",
-    "@typescript-eslint/parser": "5.48.0",
+    "@typescript-eslint/eslint-plugin": "5.48.1",
+    "@typescript-eslint/parser": "5.48.1",
     "@vue/compiler-sfc": "3.2.45",
     "c8": "7.12.0",
     "chai": "4.3.7",
     "chai-json-schema": "1.5.1",
     "coffeescript": "2.7.0",
-    "eslint": "8.31.0",
+    "eslint": "8.32.0",
     "eslint-config-moving-meadow": "4.0.2",
     "eslint-config-prettier": "8.6.0",
     "eslint-plugin-budapestian": "5.0.1",
     "eslint-plugin-eslint-comments": "3.2.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-import": "2.27.4",
     "eslint-plugin-mocha": "10.1.0",
     "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-security": "1.5.0",
+    "eslint-plugin-security": "1.6.0",
     "eslint-plugin-unicorn": "^45.0.0",
     "husky": "8.0.3",
     "intercept-stdout": "0.1.2",
@@ -202,10 +202,10 @@
     "mocha": "10.2.0",
     "normalize-newline": "^3.0.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.8.2",
+    "prettier": "2.8.3",
     "proxyquire": "2.1.3",
     "shx": "0.3.4",
-    "svelte": "3.55.0",
+    "svelte": "3.55.1",
     "symlink-dir": "5.1.0",
     "typescript": "4.9.4",
     "upem": "7.3.1",

package/src/cache/utl.js

@@ -111,7 +111,10 @@ function moduleIsInterestingForDiff(pModule) {
     !pModule.consolidated &&
     !pModule.coreModule &&
     !pModule.couldNotResolve &&
-    !pModule.matchesDoNotFollow
+    !pModule.matchesDoNotFollow &&
+    // as followable is optional, !exists when the module _is_ followable
+    // explicit comparison with false
+    pModule.followable !== false
   );
 }
 

package/src/cli/normalize-cli-options.js

@@ -8,14 +8,7 @@ const loadConfig = require("../config-utl/extract-depcruise-config");
 const defaults = require("./defaults");
 
 function getOptionValue(pDefault) {
-  return (pValue) => {
-    let lReturnValue = pDefault;
-
-    if (typeof pValue === "string") {
-      lReturnValue = pValue;
-    }
-    return lReturnValue;
-  };
+  return (pValue) => (typeof pValue === "string" ? pValue : pDefault);
 }
 
 function normalizeConfigFileName(pCliOptions, pConfigWrapperName, pDefault) {
@@ -104,44 +97,84 @@ function validateAndGetKnownViolationsFileName(pKnownViolations) {
 }
 
 function normalizeKnownViolationsOption(pCliOptions) {
-  if (has(pCliOptions, "ignoreKnown")) {
-    const lReturnValue = {
-      knownViolationsFile: validateAndGetKnownViolationsFileName(
-        pCliOptions.ignoreKnown
-      ),
-    };
-    return lReturnValue;
+  if (!has(pCliOptions, "ignoreKnown")) {
+    return {};
   }
-  return {};
+  return {
+    knownViolationsFile: validateAndGetKnownViolationsFileName(
+      pCliOptions.ignoreKnown
+    ),
+  };
 }
 
 function normalizeValidationOption(pCliOptions) {
-  if (has(pCliOptions, "validate")) {
-    const rulesFile = validateAndNormalizeRulesFileName(pCliOptions.validate);
-    return {
-      rulesFile,
-      ruleSet: loadConfig(
-        path.isAbsolute(rulesFile) ? rulesFile : `./${rulesFile}`
-      ),
-      validate: true,
-    };
-  } else {
+  if (!has(pCliOptions, "validate")) {
     return {
       validate: false,
     };
   }
+  const rulesFile = validateAndNormalizeRulesFileName(pCliOptions.validate);
+  return {
+    rulesFile,
+    ruleSet: loadConfig(
+      path.isAbsolute(rulesFile) ? rulesFile : `./${rulesFile}`
+    ),
+    validate: true,
+  };
 }
 
 function normalizeProgress(pCliOptions) {
-  let lProgress = null;
+  if (!has(pCliOptions, "progress")) {
+    return {};
+  }
+
+  let lProgress = pCliOptions.progress;
+  if (lProgress === true) {
+    lProgress = "cli-feedback";
+  }
+  return { progress: lProgress };
+}
+
+function normalizeCacheStrategy(pCliOptions) {
+  if (!has(pCliOptions, "cacheStrategy")) {
+    return {};
+  }
+  const lStrategy =
+    pCliOptions.cacheStrategy === "content" ? "content" : "metadata";
 
-  if (has(pCliOptions, "progress")) {
-    lProgress = get(pCliOptions, "progress");
-    if (lProgress === true) {
-      lProgress = "cli-feedback";
-    }
+  let lReturnValue = {};
+
+  if (pCliOptions.cache && typeof pCliOptions.cache === "object") {
+    lReturnValue.cache = clone(pCliOptions.cache);
+    lReturnValue.cache.strategy = lStrategy;
+  } else {
+    lReturnValue = {
+      cache: {
+        strategy: lStrategy,
+      },
+    };
+  }
+  return lReturnValue;
+}
+
+function normalizeCache(pCliOptions) {
+  if (!has(pCliOptions, "cache")) {
+    return {};
   }
-  return lProgress ? { progress: lProgress } : {};
+
+  if (pCliOptions.cache === true) {
+    return { cache: {} };
+  }
+
+  if (typeof pCliOptions.cache === "string") {
+    return {
+      cache: {
+        folder: pCliOptions.cache,
+      },
+    };
+  }
+
+  return { cache: false };
 }
 
 /**
@@ -171,6 +204,8 @@ module.exports = function normalizeOptions(pOptionsAsPassedFromCommander) {
 
   lOptions = { ...lOptions, ...normalizeValidationOption(lOptions) };
   lOptions = { ...lOptions, ...normalizeProgress(lOptions) };
+  lOptions = { ...lOptions, ...normalizeCache(lOptions) };
+  lOptions = { ...lOptions, ...normalizeCacheStrategy(lOptions) };
   lOptions = { ...lOptions, ...normalizeKnownViolationsOption(lOptions) };
   lOptions = normalizeConfigFileName(
     lOptions,

package/src/main/options/validate.js

@@ -1,4 +1,5 @@
 const has = require("lodash/has");
+const merge = require("lodash/merge");
 const safeRegex = require("safe-regex");
 const report = require("../../report");
 
@@ -103,7 +104,7 @@ function validateCruiseOptions(pOptions) {
     if (has(pOptions, "ruleSet.options")) {
       lReturnValue = validateCruiseOptions(pOptions.ruleSet.options);
     }
-    return { ...lReturnValue, ...pOptions };
+    return merge({}, lReturnValue, pOptions);
   }
   return lReturnValue;
 }

package/src/meta.js

@@ -1,7 +1,7 @@
 /* generated - don't edit */
 
 module.exports = {
-  version: "12.5.0-beta-4",
+  version: "12.5.1-beta-1",
   engines: {
     node: "^14||^16||>=18",
   },

package/types/README.md

@@ -1 +0,0 @@
-![overview](overview.svg)