dependency-cruiser 17.3.3 → 17.3.4

package/package.json

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

package/src/cli/init-config/environment-helpers.mjs

@@ -11,10 +11,10 @@ import { DEFAULT_CONFIG_FILE_NAME } from "../defaults.mjs";
 const LIKELY_SOURCE_FOLDERS = ["src", "lib", "app", "bin", "sources"];
 const LIKELY_TEST_FOLDERS = ["test", "spec", "tests", "specs", "bdd"];
 const LIKELY_PACKAGES_FOLDERS = ["packages"];
-const TSCONFIG_CANDIDATE_PATTERN = /.*tsconfig.*\.json$/gi;
-const JSCONFIG_CANDIDATE_PATTERN = /.*jsconfig.*\.json$/gi;
-const WEBPACK_CANDIDATE_PATTERN = /.*webpack.*\.(c?js|json5?|ts|ya?ml)$/gi;
-const BABEL_CONFIG_CANDIDATE_PATTERN = /^\.babelrc$|.*babel.*\.json/gi;
+const TSCONFIG_CANDIDATE_PATTERN = /.*tsconfig.*\.json$/i;
+const JSCONFIG_CANDIDATE_PATTERN = /.*jsconfig.*\.json$/i;
+const WEBPACK_CANDIDATE_PATTERN = /.*webpack.*\.(c?js|json5?|ts|ya?ml)$/i;
+const BABEL_CONFIG_CANDIDATE_PATTERN = /^\.babelrc$|.*babel.*\.json/i;
 
 /**
  * Read the package manifest ('package.json') and return it as a javascript object
@@ -93,7 +93,7 @@ function getMatchingFileNames(pPattern, pFolderName = process.cwd()) {
 	return readdirSync(pFolderName, "utf8").filter(
 		(pFileName) =>
 			statSync(join(pFolderName, pFileName)).isFile() &&
-			pFileName.match(pPattern),
+			pPattern.test(pFileName),
 	);
 }
 

package/src/extract/extract-dependencies.mjs

@@ -14,6 +14,7 @@ import {
 	extractModuleAttributes,
 } from "./helpers.mjs";
 import { uniqBy, intersects } from "#utl/array-util.mjs";
+import { getCachedRegExp } from "#utl/regex-util.mjs";
 
 /**
  * @import { IDependency } from "../../types/cruise-result.mjs";
@@ -79,7 +80,7 @@ function extractDependencies(pCruiseOptions, pFileName, pTranspileOptions) {
 
 function matchesDoNotFollow({ resolved, dependencyTypes }, pDoNotFollow) {
 	const lMatchesPath = pDoNotFollow.path
-		? RegExp(pDoNotFollow.path, "g").test(resolved)
+		? getCachedRegExp(pDoNotFollow.path).test(resolved)
 		: false;
 	const lMatchesDependencyTypes = pDoNotFollow.dependencyTypes
 		? intersects(dependencyTypes, pDoNotFollow.dependencyTypes)
@@ -114,7 +115,7 @@ function addResolutionAttributes(
 }
 
 function matchesPattern(pFullPathToFile, pPattern) {
-	return RegExp(pPattern, "g").test(pFullPathToFile);
+	return getCachedRegExp(pPattern).test(pFullPathToFile);
 }
 
 /**
@@ -166,7 +167,6 @@ export default function getDependencies(
 			extractDependencies(pCruiseOptions, pFileName, pTranspileOptions),
 			getDependencyUniqueKey,
 		)
-			.sort(compareDeps)
 			.map(
 				addResolutionAttributes(
 					pCruiseOptions,
@@ -181,7 +181,8 @@ export default function getDependencies(
 						!matchesPattern(resolved, pCruiseOptions.exclude.path)) &&
 					(!pCruiseOptions?.includeOnly?.path ||
 						matchesPattern(resolved, pCruiseOptions.includeOnly.path)),
-			);
+			)
+			.sort(compareDeps);
 	} catch (pError) {
 		throw new Error(
 			`Extracting dependencies ran afoul of...\n\n  ${pError.message}\n... in ${pFileName}\n\n`,

package/src/extract/index.mjs

@@ -80,7 +80,6 @@ function extractFileDirectoryArray(
 	const lResult = [];
 	for (const lFilename of lInitialSources) {
 		if (!lVisited.has(lFilename)) {
-			lVisited.add(lFilename);
 			lResult.push(
 				...extractRecursive(
 					lFilename,
@@ -96,15 +95,7 @@ function extractFileDirectoryArray(
 	return lResult;
 }
 
-function isNotFollowable({ followable }) {
-	return !followable;
-}
-
-function notInFromListAlready(pFromList) {
-	return ({ resolved }) => !pFromList.some(({ source }) => source === resolved);
-}
-
-function toDependencyToSource(pToListItem) {
+function toDependencyAsModule(pToListItem) {
 	return {
 		source: pToListItem.resolved,
 		followable: pToListItem.followable,
@@ -116,18 +107,20 @@ function toDependencyToSource(pToListItem) {
 	};
 }
 
-function complete(pAll, pFromListItem) {
-	return pAll
-		.concat(pFromListItem)
+function complete(pModules, pModule) {
+	return pModules
+		.concat(pModule)
 		.concat(
-			pFromListItem.dependencies
-				.filter(isNotFollowable)
-				.filter(notInFromListAlready(pAll))
-				.map(toDependencyToSource),
+			pModule.dependencies
+				.filter(
+					({ followable, resolved }) =>
+						!followable && !pModules.some(({ source }) => source === resolved),
+				)
+				.map(toDependencyAsModule),
 		);
 }
 
-function filterExcludedDynamicDependencies(pModule, pExclude) {
+function removeExcludedDynamicDependencies(pModule, pExclude) {
 	// no need to do the 'path' thing as that was addressed in extractFileDirectoryArray already
 	return {
 		...pModule,
@@ -164,7 +157,7 @@ export default function extract(
 	)
 		.reduce(complete, [])
 		.map((pModule) =>
-			filterExcludedDynamicDependencies(pModule, pCruiseOptions.exclude),
+			removeExcludedDynamicDependencies(pModule, pCruiseOptions.exclude),
 		);
 	pResolveOptions.fileSystem.purge();
 	clearCaches();

package/src/extract/tsc/extract-typescript-deps.mjs

@@ -15,13 +15,16 @@ const typescript = await tryImport(
 	meta.supportedTranspilers.typescript,
 );
 
-const INTERESTING_NODE_KINDS = new Set([
-	typescript.SyntaxKind.CallExpression,
-	typescript.SyntaxKind.ExportDeclaration,
-	typescript.SyntaxKind.ImportDeclaration,
-	typescript.SyntaxKind.ImportEqualsDeclaration,
-	typescript.SyntaxKind.LastTypeNode,
-]);
+const INTERESTING_NODE_KINDS = typescript
+	? new Set([
+			typescript.SyntaxKind.CallExpression,
+			typescript.SyntaxKind.ExportDeclaration,
+			typescript.SyntaxKind.ImportDeclaration,
+			typescript.SyntaxKind.ImportEqualsDeclaration,
+			typescript.SyntaxKind.LastTypeNode,
+		])
+	: /* c8 ignore next 1 */
+		new Set();
 
 function isTypeOnlyImport(pStatement) {
 	return (

package/src/main/options/assert-validity.mjs

@@ -6,8 +6,8 @@ import { getAvailableReporters } from "#report/index.mjs";
  * @import { ICruiseOptions, IFormatOptions } from "../../../types/options.mjs";
  */
 
-const MODULE_SYSTEM_LIST_RE = /^(?:(?:cjs|amd|es6|tsd)(?:,|$)){1,4}/gi;
-const VALID_DEPTH_RE = /^\d{1,2}$/g;
+const MODULE_SYSTEM_LIST_RE = /^(?:(?:cjs|amd|es6|tsd)(?:,|$)){1,4}/i;
+const VALID_DEPTH_RE = /^\d{1,2}$/;
 
 function isObject(pObject) {
 	return (
@@ -37,7 +37,7 @@ function assertModuleSystemsValid(pModuleSystems) {
 		pModuleSystems &&
 		Array.isArray(pModuleSystems) &&
 		!pModuleSystems.every((pModuleSystem) =>
-			pModuleSystem.match(MODULE_SYSTEM_LIST_RE),
+			MODULE_SYSTEM_LIST_RE.test(pModuleSystem),
 		)
 	) {
 		throw new Error(
@@ -65,7 +65,7 @@ function assertOutputTypeValid(pOutputType) {
 }
 
 function assertMaxDepthValid(pDepth) {
-	if (pDepth && !pDepth.toString().match(VALID_DEPTH_RE)) {
+	if (pDepth && !VALID_DEPTH_RE.test(pDepth.toString())) {
 		throw new Error(
 			`'${pDepth}' is not a valid depth - use an integer between 0 and 99`,
 		);

package/src/meta.cjs

@@ -1,6 +1,6 @@
 /* generated - don't edit */
 module.exports = {
-	version: "17.3.3",
+	version: "17.3.4",
 	engines: {
 		node: "^20.12||^22||>=24",
 	},

package/src/report/anon/anonymize-path-element.mjs

@@ -34,7 +34,7 @@ function replaceFromWordList(pPathElement, pWordList, pCached) {
 export function anonymizePathElement(
 	pPathElement,
 	pWordList = [],
-	pWhiteListRE = /^$/g,
+	pWhiteListRE = /^$/,
 	pCached = true,
 ) {
 	return pWhiteListRE.test(pPathElement)

package/src/report/anon/index.mjs

@@ -151,8 +151,7 @@ function sanitizeWordList(pWordList) {
 	return pWordList
 		.map((pString) => pString.replaceAll(/[^a-zA-Z-]/g, "_"))
 		.filter(
-			(pString) =>
-				/^[a-zA-Z-_]+$/g.test(pString) && !WHITELIST_RE.test(pString),
+			(pString) => /^[a-zA-Z-_]+$/.test(pString) && !WHITELIST_RE.test(pString),
 		);
 }
 

package/src/report/dot/theming.mjs

@@ -1,15 +1,12 @@
 import DEFAULT_THEME from "./default-theme.mjs";
 import { attributizeObject } from "./module-utl.mjs";
 import { has, get } from "#utl/object-util.mjs";
-
-function matchesRE(pValue, pRE) {
-	const lMatchResult = pValue.match && pValue.match(pRE);
-
-	return lMatchResult && lMatchResult.length > 0;
-}
+import { getCachedRegExp } from "#utl/regex-util.mjs";
 
 function matchesCriterion(pModuleKey, pCriterion) {
-	return pModuleKey === pCriterion || matchesRE(pModuleKey, pCriterion);
+	return (
+		pModuleKey === pCriterion || getCachedRegExp(pCriterion).test(pModuleKey)
+	);
 }
 
 function moduleOrDependencyMatchesCriteria(pSchemeEntry, pModule) {

package/src/utl/extract-root-module-name.cjs

@@ -1,5 +1,5 @@
-const LOCAL_MODULE_RE = /^[.]{1,2}($|\/.*)/g;
-const ABSOLUTE_MODULE_RE = /^\/.*/g;
+const LOCAL_MODULE_RE = /^[.]{1,2}($|\/.*)/;
+const ABSOLUTE_MODULE_RE = /^\/.*/;
 
 const PACKAGE_RE = "[^/]+";
 const SCOPED_PACKAGE_RE = "@[^/]+(/[^/]+)";
@@ -13,8 +13,8 @@ const ROOT_MODULE_RE = new RegExp(`^(${SCOPED_PACKAGE_RE}|${PACKAGE_RE})`, "g");
  */
 module.exports = function extractRootModuleName(pModuleName) {
 	if (
-		pModuleName.match(LOCAL_MODULE_RE) ||
-		pModuleName.match(ABSOLUTE_MODULE_RE)
+		LOCAL_MODULE_RE.test(pModuleName) ||
+		ABSOLUTE_MODULE_RE.test(pModuleName)
 	) {
 		return pModuleName;
 	} else {