dependency-cruiser 13.1.4 → 14.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "13.1.4",
+  "version": "14.0.0",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -158,13 +158,13 @@
     "commander": "11.0.0",
     "enhanced-resolve": "5.15.0",
     "figures": "5.0.0",
-    "glob": "10.3.3",
     "ignore": "5.2.4",
     "indent-string": "5.0.0",
     "interpret": "^3.1.1",
     "is-installed-globally": "0.4.0",
     "json5": "2.2.3",
     "lodash": "4.17.21",
+    "picomatch": "2.3.1",
     "prompts": "2.4.2",
     "rechoir": "^0.8.0",
     "safe-regex": "2.1.1",
@@ -172,23 +172,23 @@
     "semver-try-require": "6.2.3",
     "teamcity-service-messages": "0.1.14",
     "tsconfig-paths-webpack-plugin": "4.1.0",
-    "watskeburt": "0.12.1",
+    "watskeburt": "1.0.1",
     "wrap-ansi": "8.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.22.10",
-    "@babel/plugin-transform-modules-commonjs": "7.22.5",
-    "@babel/preset-typescript": "7.22.5",
-    "@swc/core": "1.3.78",
-    "@types/lodash": "4.14.197",
-    "@types/node": "20.5.1",
+    "@babel/core": "7.22.20",
+    "@babel/plugin-transform-modules-commonjs": "7.22.15",
+    "@babel/preset-typescript": "7.22.15",
+    "@swc/core": "1.3.87",
+    "@types/lodash": "4.14.199",
+    "@types/node": "20.6.3",
     "@types/prompts": "2.4.4",
-    "@typescript-eslint/eslint-plugin": "6.4.0",
-    "@typescript-eslint/parser": "6.4.0",
+    "@typescript-eslint/eslint-plugin": "6.7.2",
+    "@typescript-eslint/parser": "6.7.2",
     "@vue/compiler-sfc": "3.3.4",
     "c8": "8.0.1",
     "coffeescript": "2.7.0",
-    "eslint": "8.47.0",
+    "eslint": "8.50.0",
     "eslint-config-moving-meadow": "4.0.2",
     "eslint-config-prettier": "9.0.0",
     "eslint-plugin-budapestian": "5.0.1",
@@ -200,16 +200,16 @@
     "eslint-plugin-unicorn": "^48.0.1",
     "husky": "8.0.3",
     "intercept-stdout": "0.1.2",
-    "lint-staged": "14.0.0",
+    "lint-staged": "14.0.1",
     "mocha": "10.2.0",
     "normalize-newline": "4.1.0",
     "npm-run-all": "4.1.5",
-    "prettier": "3.0.2",
+    "prettier": "3.0.3",
     "proxyquire": "2.1.3",
     "shx": "0.3.4",
     "svelte": "3.59.1",
-    "symlink-dir": "5.1.1",
-    "typescript": "5.1.6",
+    "symlink-dir": "5.2.0",
+    "typescript": "5.2.2",
     "upem": "8.0.0",
     "vue-template-compiler": "2.7.14",
     "yarn": "1.22.19"
@@ -240,7 +240,7 @@
     ]
   },
   "engines": {
-    "node": "^16.14||>=18"
+    "node": "^18.17||>=20"
   },
   "supportedTranspilers": {
     "babel": ">=7.0.0 <8.0.0",

package/src/cli/format.mjs

@@ -1,5 +1,5 @@
 import _format from "../main/format.mjs";
-import validateFileExistence from "./utl/validate-file-existence.mjs";
+import assertFileExistence from "./utl/assert-file-existence.mjs";
 import normalizeOptions from "./normalize-cli-options.mjs";
 import { getInStream, write } from "./utl/io.mjs";
 
@@ -13,7 +13,7 @@ export default async function format(pResultFile, pOptions) {
   const lOptions = await normalizeOptions(pOptions);
 
   if (pResultFile !== "-") {
-    validateFileExistence(pResultFile);
+    assertFileExistence(pResultFile);
   }
 
   return new Promise((pResolve, pReject) => {
@@ -29,13 +29,13 @@ export default async function format(pResultFile, pOptions) {
         /* c8 ignore start */
         (pError) => {
           pReject(pError);
-        }
+        },
         /* c8 ignore stop */
       )
       .on("end", async () => {
         const lReportingResult = await _format(
           JSON.parse(lInputAsString),
-          lOptions
+          lOptions,
         );
 
         write(lOptions.outputTo, lReportingResult.output);

package/src/cli/index.mjs

@@ -1,5 +1,5 @@
 import { join } from "node:path";
-import { glob } from "glob";
+import picomatch from "picomatch";
 import cloneDeep from "lodash/cloneDeep.js";
 import set from "lodash/set.js";
 import isInstalledGlobally from "is-installed-globally";
@@ -8,7 +8,7 @@ import chalk from "chalk";
 import cruise from "../main/cruise.mjs";
 import { INFO, bus } from "../utl/bus.mjs";
 
-import validateFileExistence from "./utl/validate-file-existence.mjs";
+import assertFileExistence from "./utl/assert-file-existence.mjs";
 import normalizeCliOptions from "./normalize-cli-options.mjs";
 import { write } from "./utl/io.mjs";
 import setUpCliFeedbackListener from "./listeners/cli-feedback.mjs";
@@ -27,7 +27,7 @@ async function extractResolveOptions(pCruiseOptions) {
     lResolveOptions = await extractWebpackResolveConfig(
       lWebPackConfigFileName,
       pCruiseOptions?.ruleSet?.options?.webpackConfig?.env ?? null,
-      pCruiseOptions?.ruleSet?.options?.webpackConfig?.arguments ?? null
+      pCruiseOptions?.ruleSet?.options?.webpackConfig?.arguments ?? null,
     );
   }
   return lResolveOptions;
@@ -39,7 +39,7 @@ async function addKnownViolations(pCruiseOptions) {
       "../config-utl/extract-known-violations.mjs"
     );
     const lKnownViolations = await extractKnownViolations(
-      pCruiseOptions.knownViolationsFile
+      pCruiseOptions.knownViolationsFile,
     );
 
     // Check against json schema is already done in src/main/options/validate
@@ -95,24 +95,24 @@ function setUpListener(pCruiseOptions) {
   if (Boolean(lListenerFunction)) {
     lListenerFunction(
       bus,
-      pCruiseOptions?.ruleSet?.options?.progress?.maximumLevel ?? INFO
+      pCruiseOptions?.ruleSet?.options?.progress?.maximumLevel ?? INFO,
     );
   }
 }
 
 async function runCruise(pFileDirectoryArray, pCruiseOptions) {
   const lCruiseOptions = await addKnownViolations(
-    await normalizeCliOptions(pCruiseOptions)
+    await normalizeCliOptions(pCruiseOptions),
   );
 
   pFileDirectoryArray
-    .filter((pFileOrDirectory) => !glob.hasMagic(pFileOrDirectory))
+    .filter((pFileOrDirectory) => !picomatch.scan(pFileOrDirectory).isGlob)
     .map((pFileOrDirectory) =>
       lCruiseOptions?.ruleSet?.options?.baseDir
         ? join(lCruiseOptions.ruleSet.options.baseDir, pFileOrDirectory)
-        : pFileOrDirectory
+        : pFileOrDirectory,
     )
-    .forEach(validateFileExistence);
+    .forEach(assertFileExistence);
 
   setUpListener(lCruiseOptions);
 
@@ -126,7 +126,7 @@ async function runCruise(pFileDirectoryArray, pCruiseOptions) {
     pFileDirectoryArray,
     lCruiseOptions,
     lResolveOptions,
-    { tsConfig, babelConfig }
+    { tsConfig, babelConfig },
   );
 
   bus.progress("cli: writing results", { complete: 1 });
@@ -151,14 +151,14 @@ export default async function executeCli(pFileDirectoryArray, pCruiseOptions) {
     if (isInstalledGlobally) {
       process.stderr.write(
         `\n  ${chalk.yellow(
-          "WARNING"
+          "WARNING",
         )}: You're running a globally installed dependency-cruiser.\n\n` +
           `           We recommend to ${chalk.bold.italic.underline(
-            "install and run it as a local devDependency"
+            "install and run it as a local devDependency",
           )} in\n` +
           `           your project instead. There it has your project's environment and\n` +
           `           transpilers at its disposal. That will ensure it can find e.g.\n` +
-          `           TypeScript, Vue or Svelte modules and dependencies.\n\n`
+          `           TypeScript, Vue or Svelte modules and dependencies.\n\n`,
       );
     }
     /* c8 ignore stop */

package/src/cli/utl/{validate-file-existence.mjs → assert-file-existence.mjs}

@@ -1,11 +1,11 @@
 import { accessSync, R_OK } from "node:fs";
 
-export default function validateFileExistence(pDirectoryOrFile) {
+export default function assertFileExistence(pDirectoryOrFile) {
   try {
     accessSync(pDirectoryOrFile, R_OK);
   } catch (pError) {
     throw new Error(
-      `Can't open '${pDirectoryOrFile}' for reading. Does it exist?\n`
+      `Can't open '${pDirectoryOrFile}' for reading. Does it exist?\n`,
     );
   }
 }

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

@@ -1,6 +1,6 @@
 import { readdirSync, statSync } from "node:fs";
-import { join } from "node:path";
-import { glob } from "glob";
+import { join, normalize } from "node:path";
+import picomatch from "picomatch";
 import { filenameMatchesPattern } from "../graph-utl/match-facade.mjs";
 import getExtension from "../utl/get-extension.mjs";
 import pathToPosix from "../utl/path-to-posix.mjs";
@@ -45,7 +45,7 @@ function gatherScannableFilesFromDirectory(pDirectoryName, pOptions) {
   return readdirSync(join(pOptions.baseDir, pDirectoryName))
     .map((pFileName) => join(pDirectoryName, pFileName))
     .filter((pFullPathToFile) =>
-      shouldNotBeExcluded(pathToPosix(pFullPathToFile), pOptions)
+      shouldNotBeExcluded(pathToPosix(pFullPathToFile), pOptions),
     )
     .reduce((pSum, pFullPathToFile) => {
       let lStat = statSync(join(pOptions.baseDir, pFullPathToFile), {
@@ -55,7 +55,7 @@ function gatherScannableFilesFromDirectory(pDirectoryName, pOptions) {
       if (lStat) {
         if (lStat.isDirectory()) {
           return pSum.concat(
-            gatherScannableFilesFromDirectory(pFullPathToFile, pOptions)
+            gatherScannableFilesFromDirectory(pFullPathToFile, pOptions),
           );
         }
         if (fileIsScannable(pOptions, pFullPathToFile)) {
@@ -68,6 +68,15 @@ function gatherScannableFilesFromDirectory(pDirectoryName, pOptions) {
     .filter((pFullPathToFile) => shouldBeIncluded(pFullPathToFile, pOptions));
 }
 
+function expandGlob(pBaseDirectory, pScannedGlob) {
+  const isMatch = picomatch(pathToPosix(pScannedGlob.glob));
+  return readdirSync(join(pBaseDirectory, pScannedGlob.base), {
+    recursive: true,
+  })
+    .filter((pFile) => isMatch(pFile))
+    .map((pFile) => pathToPosix(join(pScannedGlob.base, pFile)));
+}
+
 /**
  * Returns an array of strings, representing paths to files to be gathered
  *
@@ -78,7 +87,7 @@ function gatherScannableFilesFromDirectory(pDirectoryName, pOptions) {
  * Files and directories are assumed to be either absolute, or relative to the
  * current working directory.
  *
- * @param  {string[]} pFileAndDirectoryArray globs and/ or paths to files or
+ * @param  {string[]} pFileDirectoryAndGlobArray globs and/ or paths to files or
  *                               directories to be gathered
  * @param  {import('../../types/dependency-cruiser.js').IStrictCruiseOptions} pOptions options that
  *                               influence what needs to be gathered/ scanned
@@ -87,31 +96,26 @@ function gatherScannableFilesFromDirectory(pDirectoryName, pOptions) {
  *                               - includeOnly - regexp what to include
  * @return {string[]}            paths to files to be gathered.
  */
-export default function gatherInitialSources(pFileAndDirectoryArray, pOptions) {
+export default function gatherInitialSources(
+  pFileDirectoryAndGlobArray,
+  pOptions,
+) {
   const lOptions = { baseDir: process.cwd(), ...pOptions };
 
-  // these are `.reduce`s and not `.map`s because they typically return larger
-  // arrays than the pFileAndDirectoryArray:
-  // - `glob` returns an array of strings
-  // - so does `gatherScannableFilesFromDirectory`
-  return pFileAndDirectoryArray
-    .reduce(
-      (pAll, pFileOrDirectory) =>
-        pAll.concat(
-          glob.sync(pathToPosix(pFileOrDirectory), {
-            cwd: pathToPosix(lOptions.baseDir),
-          })
-        ),
-      []
-    )
-    .reduce((pAll, pFileOrDirectory) => {
+  return pFileDirectoryAndGlobArray
+    .flatMap((pFileDirectoryOrGlob) => {
+      const lScannedGlob = picomatch.scan(pFileDirectoryOrGlob);
+      if (lScannedGlob.isGlob) {
+        return expandGlob(lOptions.baseDir, lScannedGlob);
+      }
+      return pathToPosix(normalize(pFileDirectoryOrGlob));
+    })
+    .flatMap((pFileOrDirectory) => {
       if (statSync(join(lOptions.baseDir, pFileOrDirectory)).isDirectory()) {
-        return pAll.concat(
-          gatherScannableFilesFromDirectory(pFileOrDirectory, lOptions)
-        );
-      } else {
-        return pAll.concat(pathToPosix(pFileOrDirectory));
+        return gatherScannableFilesFromDirectory(pFileOrDirectory, lOptions);
       }
-    }, [])
+      // Not a glob anymore, and not a directory => it's a file
+      return pathToPosix(pFileOrDirectory);
+    })
     .sort();
 }

package/src/meta.js

@@ -1,9 +1,9 @@
 /* generated - don't edit */
 
 module.exports = {
-  version: "13.1.4",
+  version: "14.0.0",
   engines: {
-    node: "^16.14||>=18",
+    node: "^18.17||>=20",
   },
   supportedTranspilers: {
     babel: ">=7.0.0 <8.0.0",