dependency-cruiser 12.5.0-beta-2 → 12.5.0-beta-3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "12.5.0-beta-2",
+  "version": "12.5.0-beta-3",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",

package/src/cache/content-strategy.js

@@ -6,8 +6,8 @@ const {
   getFileHash,
   excludeFilter,
   includeOnlyFilter,
-  isInterestingChangeType,
   hasInterestingExtension,
+  isInterestingChangeType,
   addCheckSumToChange,
 } = require("./utl");
 
@@ -73,9 +73,9 @@ function findChanges(pDirectory, pCachedCruiseResult, pOptions) {
   const lFileSet = new Set(
     findAllFiles(pDirectory, {
       baseDir: pOptions.baseDir,
-    })
-      .filter(excludeFilter(pOptions.exclude))
-      .filter(includeOnlyFilter(pOptions.includeOnly))
+      excludeFilterFn: excludeFilter(pOptions.exclude),
+      includeOnlyFilterFn: includeOnlyFilter(pOptions.includeOnly),
+    }).filter(hasInterestingExtension(pOptions.extensions))
   );
 
   bus.emit("progress", "cache: - determining cached vs new", { level: DEBUG });
@@ -96,9 +96,7 @@ function findChanges(pDirectory, pCachedCruiseResult, pOptions) {
   }
 
   bus.emit("progress", "cache: - returning revision data", { level: DEBUG });
-  return lDiffCachedVsNew
-    .concat(lDiffNewVsCached)
-    .filter(hasInterestingExtension(pOptions.extensions));
+  return lDiffCachedVsNew.concat(lDiffNewVsCached);
 }
 
 /**

package/src/cache/metadata-strategy.js

@@ -5,7 +5,7 @@ const {
   addCheckSumToChange,
   excludeFilter,
   includeOnlyFilter,
-  hasInterestingExtension,
+  changeHasInterestingExtension,
 } = require("./utl");
 
 /**
@@ -42,7 +42,7 @@ function getRevisionData(
         .filter(({ name }) =>
           includeOnlyFilter(pCruiseOptions.includeOnly)(name)
         )
-        .filter(hasInterestingExtension(lOptions.extensions))
+        .filter(changeHasInterestingExtension(lOptions.extensions))
         .filter(isInterestingChangeType(lOptions.interestingChangeTypes))
         .map(lOptions.checksumFn),
     };

package/src/cache/utl.js

@@ -63,15 +63,22 @@ function includeOnlyFilter(pIncludeOnlyFilter) {
     return true;
   };
 }
+/**
+ * @param {Set<string>} pExtensions
+ * @returns {(pFileName: string) => boolean}
+ */
+function hasInterestingExtension(pExtensions) {
+  return (pFileName) => pExtensions.has(path.extname(pFileName));
+}
 
 /**
  * @param {Set<string>} pExtensions
  * @returns {(pChange: import("watskeburt").IChange) => boolean}
  */
-function hasInterestingExtension(pExtensions) {
+function changeHasInterestingExtension(pExtensions) {
   return (pChange) =>
-    pExtensions.has(path.extname(pChange.name)) ||
-    (pChange.oldName && pExtensions.has(path.extname(pChange.oldName)));
+    hasInterestingExtension(pExtensions)(pChange.name) ||
+    (pChange.oldName && hasInterestingExtension(pExtensions)(pChange.oldName));
 }
 
 // skipping: "pairing broken", "unmodified", "unmerged", "type changed"
@@ -102,6 +109,7 @@ module.exports = {
   excludeFilter,
   includeOnlyFilter,
   hasInterestingExtension,
+  changeHasInterestingExtension,
   isInterestingChangeType,
   addCheckSumToChange,
 };

package/src/main/index.js

@@ -63,9 +63,13 @@ function futureCruise(
   let lCache = null;
 
   if (lCruiseOptions.cache) {
-    bus.emit("progress", "cache: checking freshness", c(2));
+    bus.emit(
+      "progress",
+      `cache: check freshness based on ${lCruiseOptions.cache.strategy}`,
+      c(2)
+    );
 
-    lCache = new Cache(lCruiseOptions?.cache.strategy);
+    lCache = new Cache(lCruiseOptions.cache.strategy);
     const lCachedResults = lCache.read(lCruiseOptions.cache.folder);
 
     if (lCache.canServeFromCache(lCruiseOptions, lCachedResults)) {

package/src/meta.js

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

package/src/utl/find-all-files.js

@@ -3,6 +3,10 @@ const { join } = require("path");
 const ignore = require("ignore");
 const pathToPosix = require("./path-to-posix");
 
+/**
+ * @typedef {(pString:string, pIndex: number, pArray: string[]) => boolean} FilterFunctionType
+ */
+
 /**
  * @param {string} pFullPathToFile
  * @param {string} pBaseDirectory
@@ -19,13 +23,18 @@ function fileIsDirectory(pFullPathToFile, pBaseDirectory) {
 
 /**
  * @param {string} pDirectoryName
- * @param {{baseDir: string; ignoreFilterFn: (pString:string, pIndex: number, pArray: string[]) => boolean)}} pOptions
+ * @param {{baseDir: string; ignoreFilterFn: FilterFunctionType; excludeFilterFn: FilterFunctionType; includeOnlyFilterFn: FilterFunctionType}} pOptions
  * @returns {string[]}
  */
-function walk(pDirectoryName, { baseDir, ignoreFilterFn }) {
+function walk(
+  pDirectoryName,
+  { baseDir, ignoreFilterFn, excludeFilterFn, includeOnlyFilterFn }
+) {
   return readdirSync(join(baseDir, pDirectoryName))
     .map((pFileName) => join(pDirectoryName, pFileName))
     .filter(ignoreFilterFn)
+    .filter(excludeFilterFn)
+    .filter(includeOnlyFilterFn)
     .map((pFullPathToFile) => ({
       fullPathToFile: pFullPathToFile,
       isDirectory: fileIsDirectory(pFullPathToFile, baseDir),
@@ -38,7 +47,14 @@ function walk(pDirectoryName, { baseDir, ignoreFilterFn }) {
        */
       (pSum, { fullPathToFile, isDirectory }) => {
         if (isDirectory) {
-          return pSum.concat(walk(fullPathToFile, { baseDir, ignoreFilterFn }));
+          return pSum.concat(
+            walk(fullPathToFile, {
+              baseDir,
+              ignoreFilterFn,
+              excludeFilterFn,
+              includeOnlyFilterFn,
+            })
+          );
         }
         return pSum.concat(fullPathToFile);
       },
@@ -55,14 +71,28 @@ function readIgnoreFile(pFileName) {
   }
 }
 
+/**
+ * @type FilterFunctionType
+ */
+// eslint-disable-next-line no-unused-vars
+function identityFilter(_pString, _pIndex, _pArray) {
+  return true;
+}
+
 /**
  * @param {string} pDirectoryName
- * @param {{baseDir: string; ignoreFileContents?: string; additionalIgnorePatterns?: string[]}} pOptions
+ * @param {{baseDir: string; ignoreFileContents?: string; additionalIgnorePatterns?: string[]; excludeFilterFn: FilterFunctionType; includeOnlyFilterFn: FilterFunctionType}} pOptions
  * @returns {string[]}
  */
 module.exports = function findAllFiles(
   pDirectoryName,
-  { baseDir, ignoreFileContents, additionalIgnorePatterns }
+  {
+    baseDir,
+    ignoreFileContents,
+    additionalIgnorePatterns,
+    excludeFilterFn,
+    includeOnlyFilterFn,
+  }
 ) {
   const lIgnoreFileContents =
     ignoreFileContents ?? readIgnoreFile(join(baseDir, ".gitignore"));
@@ -75,5 +105,7 @@ module.exports = function findAllFiles(
   return walk(pDirectoryName, {
     baseDir,
     ignoreFilterFn: lIgnoreFilterFunction,
+    excludeFilterFn: excludeFilterFn ?? identityFilter,
+    includeOnlyFilterFn: includeOnlyFilterFn ?? identityFilter,
   });
 };