dependency-cruiser 11.0.0 → 11.3.0

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2021 Sander Verweij
+Copyright (c) 2016-2022 Sander Verweij
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -21,7 +21,7 @@ you can stick on the wall to impress your grandma.
 ### Install it
 
 - `npm install --save-dev dependency-cruiser` to use it as a validator in your project (recommended) or...
-- `npm install --global dependency-cruiser` if you just want to to inspect multiple projects.
+- `npm install --global dependency-cruiser` if you just want to inspect multiple projects.
 
 ### Show stuff to your grandma
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "11.0.0",
+  "version": "11.3.0",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -76,7 +76,6 @@
     "depcruise:all": "node ./bin/dependency-cruise.js src bin test configs types tools --config",
     "depcruise:baseline": "node ./bin/depcruise-baseline.js src bin test configs types tools",
     "depcruise:explain": "node ./bin/dependency-cruise.js src bin test configs types tools --output-type err-long --config --progress none",
-    "depcruise:graph:dev": "node ./bin/dependency-cruise.js bin src --prefix vscode://file/$(pwd)/ --config --output-type dot --progress cli-feedback | dot -T svg | node ./bin/wrap-stream-in-html.js | browser",
     "depcruise:graph:doc": "npm-run-all depcruise:graph:doc:json --parallel depcruise:graph:doc:fmt-* depcruise:graph:doc:samples",
     "depcruise:graph:doc:json": "node ./bin/dependency-cruise.js bin src test --config --output-type json --output-to tmp_graph_deps.json --progress",
     "depcruise:graph:doc:fmt-detail": "./bin/depcruise-fmt.js -T dot -f - tmp_graph_deps.json | dot -T svg | tee doc/real-world-samples/dependency-cruiser-without-node_modules.svg | node bin/wrap-stream-in-html.js > docs/dependency-cruiser-dependency-graph.html",
@@ -88,7 +87,9 @@
     "depcruise:graph:dot": "node ./bin/dependency-cruise.js bin src --config --output-type dot | dot -T svg > tmp_deps.svg",
     "depcruise:graph:fdp": "node ./bin/dependency-cruise.js bin src --config --output-type dot | fdp -GK=0.1 -Gsplines=true -T svg > tmp_deps.svg",
     "depcruise:graph:osage": "node ./bin/dependency-cruise.js bin src --config --output-type dot | osage -Gpack=32 -GpackMode=array2 -T svg > tmp_deps.svg",
-    "depcruise:report": "node ./bin/dependency-cruise.js src bin test configs types --output-type err-html --config --output-to dependency-violations.html",
+    "depcruise:graph:view": "node ./bin/dependency-cruise.js bin src --prefix vscode://file/$(pwd)/ --config configs/.dependency-cruiser-show-metrics-config.json --output-type dot --progress cli-feedback | dot -T svg | node ./bin/wrap-stream-in-html.js | browser",
+    "depcruise:report": "node ./bin/dependency-cruise.js src bin test configs types --output-type err-html --config configs/.dependency-cruiser-show-metrics-config.json --output-to dependency-violations.html",
+    "depcruise:report:view": "node ./bin/dependency-cruise.js src bin test configs types --output-type err-html --config configs/.dependency-cruiser-show-metrics-config.json --output-to - | browser",
     "depcruise:focus": "node ./bin/dependency-cruise.js src bin test configs types --progress --config --output-type text --focus",
     "lint": "npm-run-all --parallel --aggregate-output lint:eslint lint:prettier:check lint:types",
     "lint:eslint": "eslint bin/dependency-cruise.js src test configs tools/**/*.mjs --cache --cache-location .cache/eslint/",
@@ -112,8 +113,11 @@
     "scm:push:gitlab-mirror:tags": "git push --tags gitlab-mirror",
     "scm:stage": "git add .",
     "test": "mocha --timeout 4000 \"test/**/*.spec.{js,mjs,cjs}\"",
+    "test:i": "mocha --timeout 4000 \"test/**/*.spec.{js,mjs,cjs}\" -g \"^\\[[I]\\]\"",
+    "test:u": "mocha --timeout 4000 \"test/**/*.spec.{js,mjs,cjs}\" --grep \"^\\[[U]\\]\"",
+    "test:e": "mocha --timeout 4000 \"test/**/*.spec.{js,mjs,cjs}\" --grep \"^\\[[E]\\]\"",
     "test:cover": "c8 --check-coverage --statements 99.9 --branches 99.7 --functions 100 --lines 99.9 --exclude \"{bin,configs,doc,docs,coverage,test,tools,webpack.conf.js,tmp*,src/**/*.template.js,src/cli/tools/svg-in-html-snippets/script.snippet.js,src/cli/init-config/get-user-input.js,src/cli/listeners/*/index.js}\" --reporter text-summary --reporter html --reporter json-summary npm test",
-    "test:glob": "set -f && test \"`bin/dependency-cruise.js test/extract/fixtures/gather-globbing/packages/**/src/**/*.js | grep \"no dependency violations found\"`\" = \"✔ no dependency violations found (6 modules, 0 dependencies cruised)\"",
+    "test:glob": "set -f && test \"`bin/dependency-cruise.js test/extract/__mocks__/gather-globbing/packages/**/src/**/*.js | grep \"no dependency violations found\"`\" = \"✔ no dependency violations found (6 modules, 0 dependencies cruised)\"",
     "test:yarn-pnp": "npm-run-all test:yarn-pnp:cleanup test:yarn-pnp:pack test:yarn-pnp:copy test:yarn-pnp:install test:yarn-pnp:version test:yarn-pnp:run test:yarn-pnp:test test:yarn-pnp:cleanup",
     "test:yarn-pnp:pack": "npm pack",
     "test:yarn-pnp:copy": "shx cp -r test/integration/yarn-pnp.template test/integration/yarn-pnp.testing-ground",
@@ -131,12 +135,12 @@
     "version": "npm-run-all build depcruise:graph:doc scm:stage"
   },
   "dependencies": {
-    "acorn": "8.6.0",
+    "acorn": "8.7.0",
     "acorn-jsx": "5.3.2",
     "acorn-jsx-walk": "2.0.0",
-    "acorn-loose": "8.2.1",
+    "acorn-loose": "8.3.0",
     "acorn-walk": "8.2.0",
-    "ajv": "8.8.2",
+    "ajv": "8.9.0",
     "chalk": "^4.1.2",
     "commander": "8.3.0",
     "enhanced-resolve": "5.8.3",
@@ -151,19 +155,19 @@
     "safe-regex": "2.1.1",
     "semver": "^7.3.5",
     "semver-try-require": "^5.0.1",
-    "teamcity-service-messages": "0.1.11",
+    "teamcity-service-messages": "0.1.12",
     "tsconfig-paths-webpack-plugin": "3.5.2",
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.16.0",
-    "@babel/plugin-transform-modules-commonjs": "7.16.0",
-    "@babel/preset-typescript": "7.16.0",
-    "@swc/core": "1.2.113",
-    "@typescript-eslint/eslint-plugin": "5.4.0",
-    "@typescript-eslint/parser": "5.4.0",
-    "@vue/compiler-sfc": "3.2.23",
-    "c8": "7.10.0",
+    "@babel/core": "7.16.12",
+    "@babel/plugin-transform-modules-commonjs": "7.16.8",
+    "@babel/preset-typescript": "7.16.7",
+    "@swc/core": "1.2.133",
+    "@typescript-eslint/eslint-plugin": "5.10.0",
+    "@typescript-eslint/parser": "5.10.0",
+    "@vue/compiler-sfc": "3.2.28",
+    "c8": "7.11.0",
     "chai": "4.3.4",
     "chai-json-schema": "1.5.1",
     "coffeescript": "2.6.1",
@@ -171,23 +175,23 @@
     "eslint-config-moving-meadow": "2.0.9",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-budapestian": "3.0.1",
-    "eslint-plugin-import": "2.25.3",
-    "eslint-plugin-mocha": "9.0.0",
+    "eslint-plugin-import": "2.25.4",
+    "eslint-plugin-mocha": "^9.0.0",
     "eslint-plugin-node": "11.1.0",
     "eslint-plugin-security": "1.4.0",
-    "eslint-plugin-unicorn": "39.0.0",
+    "eslint-plugin-unicorn": "40.1.0",
     "husky": "^4.3.8",
     "intercept-stdout": "0.1.2",
-    "lint-staged": "12.1.2",
-    "mocha": "9.1.3",
+    "lint-staged": "12.3.0",
+    "mocha": "9.1.4",
     "normalize-newline": "^3.0.0",
     "npm-run-all": "4.1.5",
-    "prettier": "2.5.0",
+    "prettier": "2.5.1",
     "proxyquire": "2.1.3",
-    "shx": "0.3.3",
-    "svelte": "3.44.2",
+    "shx": "0.3.4",
+    "svelte": "3.46.2",
     "symlink-dir": "5.0.1",
-    "typescript": "4.5.2",
+    "typescript": "4.5.5",
     "upem": "^7.0.0",
     "vue-template-compiler": "2.6.14",
     "yarn": "1.22.17"
@@ -219,6 +223,11 @@
         "policy": "wanted",
         "because": "version 5 only exports ejs - and we use cjs and don't transpile"
       },
+      {
+        "package": "eslint-plugin-mocha",
+        "policy": "wanted",
+        "because": "version 10 dropped support for node 12, which we still do support"
+      },
       {
         "package": "normalize-newline",
         "policy": "wanted",
@@ -241,10 +250,11 @@
     "src/**/*.template.js",
     "src/cli/tools/svg-in-html-snippets/script.snippet.js",
     "test/integration/**",
-    "test/*/fixtures/**",
-    "test/*/*/fixtures/**",
-    "test/*/mocks/**",
-    "test/*/*/mocks/**",
+    "test/*/__fixtures__/**",
+    "test/*/*/__fixtures__/**",
+    "test/*/*/*/__fixtures__/**",
+    "test/*/__mocks__/**",
+    "test/*/*/__mocks__/**",
     "types/**"
   ],
   "engines": {
@@ -277,13 +287,13 @@
       "eslint --fix",
       "prettier --write"
     ],
-    "test/**/*.{utl,spec}.{mjs,js}": [
+    "test/**/*.{utl,spec}.{mjs,cjs}": [
       "eslint --fix",
       "prettier --write"
     ],
-    "*.d.ts": [
+    "types/**/*.d.ts": [
       "eslint --config types/.eslintrc.json --fix",
-      "prettier --write --ignore-path .prettierignore"
+      "prettier --write"
     ]
   }
 }

package/src/cli/format.js

@@ -6,7 +6,6 @@ const io = require("./utl/io");
 
 const KNOWN_FMT_OPTIONS = [
   "collapse",
-  "doNotFollow",
   "exclude",
   "focus",
   "help",

package/src/enrich/clear-caches.js

@@ -1,4 +1,4 @@
-const utl = require("./derive/utl");
+const utl = require("./derive/module-utl");
 
 module.exports = function clearCaches() {
   utl.clearCache();

package/src/enrich/derive/circular/get-cycle.js

@@ -1,4 +1,4 @@
-const { findModuleByName } = require("../utl");
+const { findModuleByName } = require("../module-utl");
 /* about the absence of checks whether attributes/ objects actually
  * exist:
  * - it saves CPU cycles to the effect of being ~30% faster than with the

package/src/enrich/derive/dependents/get-dependents.js

@@ -1,4 +1,4 @@
-const { isDependent } = require("../utl");
+const { isDependent } = require("../module-utl");
 
 module.exports = function getDependents(pModule, pModules) {
   // perf between O(n) in an unconnected graph and O(n^2) in a fully connected one

package/src/enrich/derive/{metrics/get-stability-metrics.js → folders/aggregate-to-folders.js}

@@ -1,11 +1,12 @@
 /* eslint-disable security/detect-object-injection */
 const path = require("path").posix;
-const { foldersObject2folderArray, getParentFolders } = require("./utl");
+const { calculateInstability, metricsAreCalculable } = require("../module-utl");
 const {
   getAfferentCouplings,
   getEfferentCouplings,
-  metricsAreCalculable,
-} = require("./module-utl");
+  getParentFolders,
+  object2Array,
+} = require("./utl");
 
 function upsertCouplings(pAllDependents, pNewDependents) {
   pNewDependents.forEach((pNewDependent) => {
@@ -34,16 +35,14 @@ function upsertFolderAttributes(pAllMetrics, pModule, pDirname) {
     )
   );
   pAllMetrics[pDirname].moduleCount += 1;
-
   return pAllMetrics;
 }
 
-function orderFolderMetrics(pLeftMetric, pRightMetric) {
-  // return pLeft.name.localeCompare(pRight.name);
-  // For intended use in a table it's probably more useful to sort by
-  // instability. Might need to be either configurable or flexible
-  // in the output, though
-  return pRightMetric.instability - pLeftMetric.instability;
+function aggregateToFolder(pAllFolders, pModule) {
+  getParentFolders(path.dirname(pModule.source)).forEach((pParentDirectory) =>
+    upsertFolderAttributes(pAllFolders, pModule, pParentDirectory)
+  );
+  return pAllFolders;
 }
 
 function sumCounts(pAll, pCurrent) {
@@ -59,12 +58,15 @@ function getFolderLevelCouplings(pCouplingArray) {
           : path.dirname(pCoupling.name)
       )
     )
-  );
+  ).map((pCoupling) => ({ name: pCoupling }));
 }
 
 function calculateFolderMetrics(pFolder) {
-  const lModuleDependents = foldersObject2folderArray(pFolder.dependents);
-  const lModuleDependencies = foldersObject2folderArray(pFolder.dependencies);
+  const lModuleDependents = object2Array(pFolder.dependents);
+  const lModuleDependencies = object2Array(pFolder.dependencies);
+  // this calculation might look superfluous (why not just .length the dependents
+  // and dependencies?), but it isn't because there can be > 1 relation between
+  // two folders
   const lAfferentCouplings = lModuleDependents.reduce(sumCounts, 0);
   const lEfferentCouplings = lModuleDependencies.reduce(sumCounts, 0);
 
@@ -72,26 +74,33 @@ function calculateFolderMetrics(pFolder) {
     ...pFolder,
     afferentCouplings: lAfferentCouplings,
     efferentCouplings: lEfferentCouplings,
-    // when both afferentCouplings and efferentCouplings equal 0 instability will
-    // yield NaN. Judging Bob Martin's intention, a component with no outgoing
-    // dependencies is maximum stable (0)
-    instability:
-      lEfferentCouplings / (lEfferentCouplings + lAfferentCouplings) || 0,
+    instability: calculateInstability(lEfferentCouplings, lAfferentCouplings),
     dependents: getFolderLevelCouplings(lModuleDependents),
     dependencies: getFolderLevelCouplings(lModuleDependencies),
   };
 }
 
-module.exports = function getStabilityMetrics(pModules) {
-  return foldersObject2folderArray(
-    pModules.filter(metricsAreCalculable).reduce((pAllFolders, pModule) => {
-      getParentFolders(path.dirname(pModule.source)).forEach(
-        (pParentDirectory) =>
-          upsertFolderAttributes(pAllFolders, pModule, pParentDirectory)
-      );
-      return pAllFolders;
-    }, {})
-  )
-    .map(calculateFolderMetrics)
-    .sort(orderFolderMetrics);
+function findFolderByName(pAllFolders, pName) {
+  return pAllFolders.find((pFolder) => pFolder.name === pName);
+}
+
+function denormalizeInstability(pFolder, _, pAllFolders) {
+  return {
+    ...pFolder,
+    dependencies: pFolder.dependencies.map((pDependency) => {
+      const lFolder = findFolderByName(pAllFolders, pDependency.name) || {};
+      return {
+        ...pDependency,
+        instability: lFolder.instability >= 0 ? lFolder.instability : 0,
+      };
+    }),
+  };
+}
+
+module.exports = function aggregateToFolders(pModules) {
+  const lFolders = object2Array(
+    pModules.filter(metricsAreCalculable).reduce(aggregateToFolder, {})
+  ).map(calculateFolderMetrics);
+
+  return lFolders.map(denormalizeInstability);
 };

package/src/enrich/derive/folders/index.js

@@ -0,0 +1,46 @@
+const validate = require("../../../validate");
+const aggregateToFolders = require("./aggregate-to-folders");
+
+/**
+ *
+ * @param {*} pFolder
+ * @param {import('../../../../types/dependency-cruiser').IOptions} pOptions
+ * @returns
+ */
+function validateFolderDependency(pFolder, pOptions) {
+  return (pDependency) => {
+    return {
+      ...pDependency,
+      ...validate.folder(pOptions.ruleSet || {}, pFolder, pDependency),
+    };
+  };
+}
+
+function addFolderDependencyViolations(pOptions) {
+  return (pFolder) => {
+    return {
+      ...pFolder,
+      dependencies: pFolder.dependencies.map(
+        validateFolderDependency(pFolder, pOptions)
+      ),
+    };
+  };
+}
+
+/**
+ *
+ * @param {import('../../../../types/dependency-cruiser').IModule[]} pModules
+ * @param {import('../../../../types/dependency-cruiser').IOptions} pOptions
+ * @returns {any}
+ */
+module.exports = function deriveFolderMetrics(pModules, pOptions) {
+  let lReturnValue = {};
+  if (pOptions.metrics) {
+    lReturnValue = {
+      folders: aggregateToFolders(pModules).map(
+        addFolderDependencyViolations(pOptions)
+      ),
+    };
+  }
+  return lReturnValue;
+};

package/src/enrich/derive/folders/utl.js

@@ -0,0 +1,44 @@
+/* eslint-disable security/detect-object-injection */
+const path = require("path").posix;
+
+function getAfferentCouplings(pModule, pDirname) {
+  return pModule.dependents.filter(
+    (pDependent) => !pDependent.startsWith(pDirname.concat(path.sep))
+  );
+}
+
+function getEfferentCouplings(pModule, pDirname) {
+  return pModule.dependencies.filter(
+    (pDependency) => !pDependency.resolved.startsWith(pDirname.concat(path.sep))
+  );
+}
+
+/**
+ *
+ * @param {string} pPath
+ * @returns string[]
+ */
+function getParentFolders(pPath) {
+  let lFragments = pPath.split("/");
+  let lReturnValue = [];
+
+  while (lFragments.length > 0) {
+    lReturnValue.push(lFragments.join("/"));
+    lFragments.pop();
+  }
+  return lReturnValue.reverse();
+}
+
+function object2Array(pObject) {
+  return Object.keys(pObject).map((pKey) => ({
+    name: pKey,
+    ...pObject[pKey],
+  }));
+}
+
+module.exports = {
+  getAfferentCouplings,
+  getEfferentCouplings,
+  getParentFolders,
+  object2Array,
+};

package/src/enrich/derive/metrics/get-module-metrics.js

@@ -0,0 +1,39 @@
+const { findModuleByName } = require("../module-utl");
+const { calculateInstability, metricsAreCalculable } = require("../module-utl");
+
+function addInstabilityMetric(pModule) {
+  return {
+    ...pModule,
+    ...(metricsAreCalculable(pModule)
+      ? {
+          instability: calculateInstability(
+            pModule.dependencies.length,
+            pModule.dependents.length
+          ),
+        }
+      : {}),
+  };
+}
+
+function addInstabilityToDependency(pAllModules) {
+  return (pDependency) => ({
+    ...pDependency,
+    instability:
+      (findModuleByName(pAllModules, pDependency.resolved) || {}).instability ||
+      0,
+  });
+}
+
+function deNormalizeInstabilityMetricsToDependencies(pModule, _, pAllModules) {
+  return {
+    ...pModule,
+    dependencies: pModule.dependencies.map(
+      addInstabilityToDependency(pAllModules)
+    ),
+  };
+}
+
+module.exports = {
+  addInstabilityMetric,
+  deNormalizeInstabilityMetricsToDependencies,
+};

package/src/enrich/derive/metrics/index.js

@@ -0,0 +1,14 @@
+const { clearCache } = require("../module-utl");
+const {
+  addInstabilityMetric,
+  deNormalizeInstabilityMetricsToDependencies,
+} = require("./get-module-metrics");
+
+module.exports = function deriveModulesMetrics(pModules, pOptions) {
+  if (pOptions.metrics) {
+    const lModules = pModules.map(addInstabilityMetric);
+    clearCache();
+    return lModules.map(deNormalizeInstabilityMetricsToDependencies);
+  }
+  return pModules;
+};

package/src/enrich/derive/{utl.js → module-utl.js}

@@ -28,6 +28,32 @@ function isDependent(pResolvedName) {
     );
 }
 
+function metricsAreCalculable(pModule) {
+  return (
+    !pModule.coreModule &&
+    !pModule.couldNotResolve &&
+    !pModule.matchesDoNotFollow
+  );
+}
+
+/**
+ * returns the Instability of a component given the number of incoming (afferent)
+ * and outgoign (efferent) connections ('couplings')
+ *
+ * @param {number} pEfferentCouplingCount
+ * @param {number} pAfferentCouplingCount
+ * @returns number
+ */
+function calculateInstability(pEfferentCouplingCount, pAfferentCouplingCount) {
+  // when both afferentCouplings and efferentCouplings equal 0 instability will
+  // yield NaN. Judging Bob Martin's intention, a component with no outgoing
+  // dependencies is maximum stable (0)
+  return (
+    pEfferentCouplingCount /
+      (pEfferentCouplingCount + pAfferentCouplingCount) || 0
+  );
+}
+
 function clearCache() {
   gIndexedGraph = null;
 }
@@ -36,4 +62,6 @@ module.exports = {
   findModuleByName,
   clearCache,
   isDependent,
+  metricsAreCalculable,
+  calculateInstability,
 };

package/src/enrich/derive/orphan/is-orphan.js

@@ -1,4 +1,4 @@
-const { isDependent } = require("../utl");
+const { isDependent } = require("../module-utl");
 
 module.exports = (pModule, pGraph) => {
   if (pModule.dependencies.length > 0) {

package/src/enrich/derive/reachable/get-path.js

@@ -1,4 +1,4 @@
-const { findModuleByName } = require("../utl");
+const { findModuleByName } = require("../module-utl");
 
 function getPath(pGraph, pFrom, pTo, pVisited = new Set()) {
   let lReturnValue = [];

package/src/enrich/derive/reachable/index.js

@@ -4,7 +4,7 @@ const _clone = require("lodash/clone");
 const _get = require("lodash/get");
 const _has = require("lodash/has");
 const matchers = require("../../../validate/matchers");
-const { extractGroups } = require("../../../validate/utl");
+const { extractGroups } = require("../../../utl/regex-util");
 const getPath = require("./get-path");
 
 function getReachableRules(pRuleSet) {

package/src/enrich/enrich-modules.js

@@ -8,7 +8,7 @@ const addDependents = require("./derive/dependents");
 const deriveReachable = require("./derive/reachable");
 const addValidations = require("./add-validations");
 const softenKnownViolations = require("./soften-known-violations");
-const deriveModuleMetrics = require("./derive/metrics/module");
+const deriveModuleMetrics = require("./derive/metrics");
 
 module.exports = function enrichModules(pModules, pOptions) {
   bus.emit("progress", "analyzing: cycles", { level: busLogLevels.INFO });
@@ -19,7 +19,7 @@ module.exports = function enrichModules(pModules, pOptions) {
   lModules = deriveOrphans(lModules);
   bus.emit("progress", "analyzing: reachables", { level: busLogLevels.INFO });
   lModules = deriveReachable(lModules, pOptions.ruleSet);
-  bus.emit("progress", "analyzing: calculating module metrics", {
+  bus.emit("progress", "analyzing: module metrics", {
     level: busLogLevels.INFO,
   });
   lModules = deriveModuleMetrics(lModules, pOptions);

package/src/enrich/index.js

@@ -1,16 +1,24 @@
 const enrichModules = require("./enrich-modules");
-const deriveFolderMetrics = require("./derive/metrics/folder.js");
+const aggregateToFolders = require("./derive/folders");
 const summarize = require("./summarize");
 const clearCaches = require("./clear-caches");
 
 module.exports = function enrich(pModules, pOptions, pFileAndDirectoryArray) {
   clearCaches();
   const lModules = enrichModules(pModules, pOptions);
+  const lFolders = aggregateToFolders(lModules, pOptions);
 
   clearCaches();
-  return {
+  const lReturnValue = {
     modules: lModules,
-    ...deriveFolderMetrics(lModules, pOptions),
-    summary: summarize(lModules, pOptions, pFileAndDirectoryArray),
+    ...lFolders,
+    summary: summarize(
+      lModules,
+      pOptions,
+      pFileAndDirectoryArray,
+      lFolders.folders
+    ),
   };
+
+  return lReturnValue;
 };

package/src/enrich/summarize/get-stats.js

@@ -0,0 +1,31 @@
+function getViolationStats(pViolations) {
+  return pViolations.reduce(
+    (pAll, pThis) => {
+      pAll[pThis.rule.severity] += 1;
+      return pAll;
+    },
+    {
+      error: 0,
+      warn: 0,
+      info: 0,
+      ignore: 0,
+    }
+  );
+}
+
+function getModulesCruised(pModules) {
+  return pModules.length;
+}
+
+function getDependenciesCruised(pModules) {
+  return pModules.reduce(
+    (pAll, pModule) => pAll + pModule.dependencies.length,
+    0
+  );
+}
+
+module.exports = {
+  getViolationStats,
+  getModulesCruised,
+  getDependenciesCruised,
+};

package/src/enrich/summarize/index.js

@@ -1,6 +1,12 @@
 const addRuleSetUsed = require("./add-rule-set-used");
 const summarizeModules = require("./summarize-modules");
+const summarizeFolders = require("./summarize-folders");
 const summarizeOptions = require("./summarize-options");
+const {
+  getViolationStats,
+  getModulesCruised,
+  getDependenciesCruised,
+} = require("./get-stats");
 
 /**
  *
@@ -8,17 +14,30 @@ const summarizeOptions = require("./summarize-options");
  *    cruised modules that have been enriched with mandatory attributes &
  *    have been validated against rules as passed in the options
  * @param {import("../../../types/options").ICruiseOptions} pOptions -
- *
  * @param {string[]} pFileDirectoryArray -
  *    the files/ directories originally passed to be cruised
+ * @param {import("../../../types/dependency-cruiser").IFolder[]} pFolders -
+ *    the pModules collapsed to folders, with their own metrics & deps
  *
  * @returns {import("../../../types/cruise-result").ISummary} -
  *    a summary of the found modules, dependencies and any violations
  */
-module.exports = function makeSummary(pModules, pOptions, pFileDirectoryArray) {
-  return Object.assign(
-    summarizeModules(pModules, pOptions.ruleSet),
-    summarizeOptions(pFileDirectoryArray, pOptions),
-    pOptions.ruleSet ? { ruleSetUsed: addRuleSetUsed(pOptions) } : {}
+module.exports = function summarize(
+  pModules,
+  pOptions,
+  pFileDirectoryArray,
+  pFolders
+) {
+  const lViolations = summarizeModules(pModules, pOptions.ruleSet).concat(
+    summarizeFolders(pFolders || [], pOptions.ruleSet)
   );
+
+  return {
+    violations: lViolations,
+    ...getViolationStats(lViolations),
+    totalCruised: getModulesCruised(pModules),
+    totalDependenciesCruised: getDependenciesCruised(pModules),
+    ...summarizeOptions(pFileDirectoryArray, pOptions),
+    ...(pOptions.ruleSet ? { ruleSetUsed: addRuleSetUsed(pOptions) } : {}),
+  };
 };