dependency-cruiser 12.7.0 → 12.7.1-beta-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "12.7.0",
+  "version": "12.7.1-beta-1",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -85,11 +85,8 @@
     "depcruise:graph:doc:fmt-schema": "cd tools/schema && node ../../bin/dependency-cruise.js . --config --output-type dot | dot -T svg | tee ../overview.svg | node ../../bin/wrap-stream-in-html.js > ../../docs/schema-overview.html && cd -",
     "depcruise:graph:doc:fmt-types": "cd types && node ../bin/dependency-cruise.js . --ts-pre-compilation-deps --config --output-type dot | dot -T svg > overview.svg && cd -",
     "depcruise:graph:doc:samples": "sh tools/generate-samples.sh",
-    "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:mermaid": "node ./bin/dependency-cruise.js bin src --include-only ^src/ --config --collapse 2 --output-type mermaid",
     "depcruise:graph:mermaid:diff": "node ./bin/dependency-cruise.js bin src test types tools --config configs/.dependency-cruiser-unlimited.json --output-type mermaid --reaches \"$(watskeburt $SHA)\"",
-    "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: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 --highlight \"$(watskeburt develop)\" | dot -T svg | node ./bin/wrap-stream-in-html.js | browser",
     "depcruise:graph:view:diff": "node ./bin/dependency-cruise.js bin src test --prefix vscode://file/$(pwd)/ --config configs/.dependency-cruiser-unlimited.json --output-type dot --progress cli-feedback --reaches \"$(watskeburt develop)\" | 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",
@@ -100,7 +97,7 @@
     "format:check": "prettier --loglevel warn --check \"src/**/*.js\" \"configs/**/*.js\" \"tools/**/*.mjs\" \"bin/*\" \"types/*.d.ts\" \"test/**/*.spec.{cjs,js}\" \"test/**/*.{spec,utl}.mjs\"",
     "lint": "npm-run-all --parallel --aggregate-output lint:eslint format:check lint:types",
     "lint:eslint": "eslint bin/dependency-cruise.js bin src test configs tools/**/*.mjs --cache --cache-location node_modules/.cache/eslint/",
-    "lint:eslint:fix": "eslint --fix bin src test configs  tools/**/*.mjs --cache --cache-location node_modules/.cache/eslint/",
+    "lint:eslint:fix": "eslint --fix bin src test configs tools/**/*.mjs --cache --cache-location node_modules/.cache/eslint/",
     "lint:fix": "npm-run-all lint:eslint:fix format lint:types:fix",
     "lint:types": "npm-run-all lint:types:tsc lint:types:lint",
     "lint:types:tsc": "tsc --project types/tsconfig.json",
@@ -122,7 +119,7 @@
     "test:i": "LANG=en_US.UTF-8 mocha --grep \"^\\[[I]\\]\"",
     "test:u": "LANG=en_US.UTF-8 mocha --grep \"^\\[[U]\\]\"",
     "test:e": "LANG=en_US.UTF-8 mocha --grep \"^\\[[E]\\]\"",
-    "test:cover": "LANG=en_US.UTF-8 c8 --check-coverage --statements 99.9 --branches 99.7 --functions 100 --lines 99.9 --exclude \"{bin,configs/*.js,configs/rules,configs/plugins/3d-*.js,configs/plugins/stats-*.js,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,src/cli/listeners/{cli-feedback,ndjson}.js}\" --reporter text-summary --reporter html --reporter json-summary mocha",
+    "test:cover": "LANG=en_US.UTF-8 c8 mocha",
     "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",
@@ -256,23 +253,6 @@
       }
     ]
   },
-  "eslintIgnore": [
-    ".pnp.cjs",
-    ".yarn",
-    "node_modules",
-    "coverage",
-    "tmp",
-    "src/**/*.schema.js",
-    "src/**/*.template.js",
-    "src/cli/tools/svg-in-html-snippets/script.snippet.js",
-    "test/integration/**",
-    "test/*/__fixtures__/**",
-    "test/*/*/__fixtures__/**",
-    "test/*/*/*/__fixtures__/**",
-    "test/*/__mocks__/**",
-    "test/*/*/__mocks__/**",
-    "types/**"
-  ],
   "engines": {
     "node": "^14||^16||>=18"
   },
@@ -286,25 +266,5 @@
     "typescript": ">=2.0.0 <5.0.0",
     "vue-template-compiler": ">=2.0.0 <3.0.0",
     "@vue/compiler-sfc": ">=3.0.0 <4.0.0"
-  },
-  "lint-staged": {
-    "{src,config}/**/*.js": [
-      "eslint --fix"
-    ],
-    "{tools,src,config}/**/*.{mjs,js,json}": [
-      "prettier --write"
-    ],
-    "bin/*": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "test/**/*.{utl,spec}.{mjs,cjs}": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "types/**/*.d.ts": [
-      "eslint --config types/.eslintrc.json --fix",
-      "prettier --write"
-    ]
   }
 }

package/src/extract/resolve/index.js

@@ -47,7 +47,7 @@ function resolveModule(
 }
 
 function canBeResolvedToTsVariant(pModuleName) {
-  return [".js", ".jsx"].includes(path.extname(pModuleName));
+  return [".js", ".jsx", ".mjs", ".cjs"].includes(path.extname(pModuleName));
 }
 
 function isTypeScriptIshExtension(pModuleName) {
@@ -68,6 +68,23 @@ function resolveYarnVirtual(pPath) {
   return pPath;
 }
 
+/**
+ *
+ * @param {string} pJavaScriptExtension
+ * @returns {string}
+ */
+function getTypeScriptExtensionsToTry(pJavaScriptExtension) {
+  const lJS2TSMap = {
+    ".js": [".ts", ".tsx", ".d.ts"],
+    ".jsx": [".ts", ".tsx", ".d.ts"],
+    ".cjs": [".cts", ".d.cts"],
+    ".mjs": [".mts", ".d.mts"],
+  };
+  // eslint-disable-next-line security/detect-object-injection
+  return lJS2TSMap[pJavaScriptExtension] ?? [];
+}
+
+// eslint-disable-next-line max-lines-per-function
 function resolveWithRetry(
   pModule,
   pBaseDirectory,
@@ -90,7 +107,11 @@ function resolveWithRetry(
   // This behavior is very specific:
   // - tsc only (doesn't work in ts-node for instance)
   // - until TypeScript 4.6 only for the .js and .jsx extensions
-  // - since TypeScript 4.7 also for .cjs and .mjs (=> .cts, .mts) extensions
+  // - since TypeScript 4.7 also for .cjs and .mjs (=> .cts, .mts) extensions,
+  //   which work subtly different;
+  //   .cjs resolves to .cts or .d.cts (in that order)
+  //   .mjs resolves to .mts or .d.mts (in that order)
+  // ref: https://www.typescriptlang.org/docs/handbook/esm-node.html#new-file-extensions
   //
   // Hence also this oddly specific looking check & retry.
   //
@@ -100,16 +121,19 @@ function resolveWithRetry(
     lReturnValue.couldNotResolve &&
     canBeResolvedToTsVariant(lStrippedModuleName)
   ) {
-    const lModuleWithOutExtension = lStrippedModuleName.replace(
-      /\.(js|jsx|mjs|cjs)$/g,
+    const lModuleWithoutExtension = lStrippedModuleName.replace(
+      /\.(js|jsx|cjs|mjs)$/g,
       ""
     );
+    const lExtensionsToTry = getTypeScriptExtensionsToTry(
+      path.extname(lStrippedModuleName)
+    );
 
     const lReturnValueCandidate = resolveModule(
-      { ...pModule, module: lModuleWithOutExtension },
+      { ...pModule, module: lModuleWithoutExtension },
       pBaseDirectory,
       pFileDirectory,
-      pResolveOptions
+      { ...pResolveOptions, extensions: lExtensionsToTry }
     );
 
     if (isTypeScriptIshExtension(lReturnValueCandidate.resolved)) {

package/src/meta.js

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