dependency-cruiser 10.5.0 → 10.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "10.5.0",
+  "version": "10.6.0",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -138,7 +138,7 @@
     "acorn-walk": "8.2.0",
     "ajv": "8.6.3",
     "chalk": "4.1.2",
-    "commander": "8.2.0",
+    "commander": "8.3.0",
     "enhanced-resolve": "5.8.3",
     "figures": "^3.2.0",
     "get-stream": "^6.0.1",
@@ -159,9 +159,10 @@
     "@babel/core": "7.15.8",
     "@babel/plugin-transform-modules-commonjs": "7.15.4",
     "@babel/preset-typescript": "7.15.0",
-    "@swc/core": "1.2.98",
-    "@typescript-eslint/eslint-plugin": "5.0.0",
-    "@typescript-eslint/parser": "5.0.0",
+    "@swc/core": "1.2.105",
+    "@typescript-eslint/eslint-plugin": "5.2.0",
+    "@typescript-eslint/parser": "5.2.0",
+    "@vue/compiler-sfc": "3.2.20",
     "c8": "7.10.0",
     "chai": "4.3.4",
     "chai-json-schema": "1.5.1",
@@ -177,13 +178,14 @@
     "eslint-plugin-unicorn": "37.0.1",
     "husky": "^4.3.8",
     "intercept-stdout": "0.1.2",
-    "lint-staged": "11.2.3",
+    "lint-staged": "11.2.6",
     "mocha": "9.1.3",
-    "normalize-newline": "4.1.0",
+    "normalize-newline": "^3.0.0",
     "npm-run-all": "4.1.5",
     "prettier": "2.4.1",
+    "proxyquire": "2.1.3",
     "shx": "0.3.3",
-    "svelte": "3.43.2",
+    "svelte": "3.44.0",
     "symlink-dir": "5.0.1",
     "typescript": "4.4.4",
     "upem": "^7.0.0",
@@ -197,6 +199,11 @@
         "policy": "wanted",
         "because": "some eslint plugins (eslint-plugin-budapestian) are not compatible with eslint 8 yet "
       },
+      {
+        "package": "eslint-plugin-budapestian",
+        "policy": "pin",
+        "because": "eslint-plugin-budapestian 3.0.0 is a bit too enthousiastic flagging things it shouldn't - keeping at 2.3.0 for the time being"
+      },
       {
         "package": "figures",
         "policy": "wanted",
@@ -212,6 +219,11 @@
         "policy": "wanted",
         "because": "version 5 only exports ejs - and we use cjs and don't transpile"
       },
+      {
+        "package": "normalize-newline",
+        "policy": "wanted",
+        "because": "version 4 only exports ejs - and we use cjs and don't transpile (this only used in unit tests - but one of'em is a cjs one ...)"
+      },
       {
         "package": "wrap-ansi",
         "policy": "wanted",
@@ -246,7 +258,8 @@
     "svelte": ">=3.0.0 <4.0.0",
     "swc": ">=1.0.0 <2.0.0",
     "typescript": ">=2.0.0 <5.0.0",
-    "vue-template-compiler": ">=2.0.0 <3.0.0"
+    "vue-template-compiler": ">=2.0.0 <3.0.0",
+    "@vue/compiler-sfc": ">=3.0.0 <4.0.0"
   },
   "husky": {
     "hooks": {

package/src/enrich/add-validations.js

@@ -20,11 +20,12 @@ function addDependencyViolations(pModule, pDependency, pRuleSet, pValidate) {
  *                  of them added whether or not it is
  *                  valid and if not which rules were violated
  */
-module.exports = (pModules, pRuleSet, pValidate) =>
-  pModules.map((pModule) => ({
+module.exports = (pModules, pRuleSet, pValidate) => {
+  return pModules.map((pModule) => ({
     ...pModule,
     ...(pValidate ? validate.module(pRuleSet, pModule) : { valid: true }),
     dependencies: pModule.dependencies.map((pDependency) =>
       addDependencyViolations(pModule, pDependency, pRuleSet, pValidate)
     ),
   }));
+};

package/src/extract/transpile/meta.js

@@ -39,6 +39,7 @@ const TRANSPILER2WRAPPER = {
   swc,
   typescript: typeScriptWrap,
   "vue-template-compiler": vueWrap,
+  "@vue/compiler-sfc": vueWrap,
 };
 
 const BABELEABLE_EXTENSIONS = [

package/src/extract/transpile/vue-template-wrap.js

@@ -1,15 +1,58 @@
+const isEmpty = require("lodash/isEmpty");
 const _get = require("lodash/get");
 const tryRequire = require("semver-try-require");
 const { supportedTranspilers } = require("../../../src/meta.js");
 
-const vueTemplateCompiler = tryRequire(
-  "vue-template-compiler",
-  supportedTranspilers["vue-template-compiler"]
-);
+/*
+ * vue-template-compiler was replaced by @vue/compiler-sfc for Vue3.
+ *
+ * if your project uses Vue3, then trying to require vue-template-compiler will
+ * cause an incompatibility error - so try @vue/compiler-sfc (which is Vue3's
+ * version of vue-template-compiler) if the first one fails
+ */
+function getVueTemplateCompiler() {
+  let lIsVue3 = false;
+
+  let lCompiler = tryRequire(
+    "vue-template-compiler",
+    supportedTranspilers["vue-template-compiler"]
+  );
+
+  if (lCompiler === false) {
+    lCompiler = tryRequire(
+      "@vue/compiler-sfc",
+      supportedTranspilers["@vue/compiler-sfc"]
+    );
+    lIsVue3 = true;
+  }
+
+  return { lCompiler, lIsVue3 };
+}
+
+const { lCompiler: vueTemplateCompiler, lIsVue3: isVue3 } =
+  getVueTemplateCompiler();
+
+function vue3Transpile(pSource) {
+  const parsedComponent = vueTemplateCompiler.parse(pSource);
+  const errors = _get(parsedComponent, "errors");
+
+  if (!isEmpty(errors)) {
+    return "";
+  }
+
+  return _get(parsedComponent, "descriptor.script.content", "");
+}
+
+function vue2Transpile(pSource) {
+  return _get(
+    vueTemplateCompiler.parseComponent(pSource),
+    "script.content",
+    ""
+  );
+}
 
 module.exports = {
   isAvailable: () => vueTemplateCompiler !== false,
-
   transpile: (pSource) =>
-    _get(vueTemplateCompiler.parseComponent(pSource), "script.content", ""),
+    isVue3 ? vue3Transpile(pSource) : vue2Transpile(pSource),
 };

package/src/meta.js

@@ -1,7 +1,7 @@
 /* generated - don't edit */
 
 module.exports = {
-  version: "10.5.0",
+  version: "10.6.0",
   engines: {
     node: "^12.20||^14||>=16",
   },
@@ -14,5 +14,6 @@ module.exports = {
     swc: ">=1.0.0 <2.0.0",
     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",
   },
 };

package/src/validate/match-dependency-rule.js

@@ -52,6 +52,7 @@ function match(pFrom, pTo) {
     );
   };
 }
+
 const isInteresting = (pRule) => !isModuleOnlyRule(pRule);
 
 module.exports = {