dependency-cruiser 12.10.2 → 12.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "12.10.2",
+  "version": "12.11.0",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -166,7 +166,7 @@
     "semver-try-require": "6.1.0",
     "teamcity-service-messages": "0.1.14",
     "tsconfig-paths-webpack-plugin": "4.0.1",
-    "watskeburt": "0.10.0",
+    "watskeburt": "0.10.1",
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {

package/src/cli/tools/svg-in-html-snippets/script.snippet.js

@@ -1,7 +1,3 @@
-document.addEventListener("contextmenu", getSelectHandler(title2ElementMap));
-document.addEventListener("mouseover", getHoverHandler(title2ElementMap));
-document.addEventListener("keydown", keyboardEventHandler);
-
 var gMode = new Mode();
 
 var title2ElementMap = (function makeElementMap() {
@@ -12,7 +8,7 @@ var title2ElementMap = (function makeElementMap() {
   return new Title2ElementMap(edges, nodes);
 })();
 
-function getHoverHandler() {
+function getHoverHandler(pTitle2ElementMap) {
   /** @type {string} */
   var currentHighlightedTitle;
 
@@ -27,13 +23,13 @@ function getHoverHandler() {
     ) {
       resetNodesAndEdges();
       addHighlight(closestNodeOrEdge);
-      title2ElementMap.get(closestTitleText).forEach(addHighlight);
+      pTitle2ElementMap.get(closestTitleText).forEach(addHighlight);
       currentHighlightedTitle = closestTitleText;
     }
   };
 }
 
-function getSelectHandler() {
+function getSelectHandler(pTitle2ElementMap) {
   /** @type {string} */
   var currentHighlightedTitle;
 
@@ -52,7 +48,7 @@ function getSelectHandler() {
     if (!(currentHighlightedTitle === closestTitleText)) {
       resetNodesAndEdges();
       addHighlight(closestNodeOrEdge);
-      title2ElementMap.get(closestTitleText).forEach(addHighlight);
+      pTitle2ElementMap.get(closestTitleText).forEach(addHighlight);
       currentHighlightedTitle = closestTitleText;
     }
   };
@@ -247,5 +243,9 @@ function keyboardEventHandler(pKeyboardEvent) {
     hints.toggle();
   }
 }
+
+document.addEventListener("contextmenu", getSelectHandler(title2ElementMap));
+document.addEventListener("mouseover", getHoverHandler(title2ElementMap));
+document.addEventListener("keydown", keyboardEventHandler);
 document.getElementById("close-hints").addEventListener("click", hints.hide);
 document.getElementById("button_help").addEventListener("click", hints.toggle);

package/src/extract/ast-extractors/extract-typescript-deps.js

@@ -4,6 +4,19 @@ const { supportedTranspilers } = require("../../../src/meta.js");
 
 const typescript = tryRequire("typescript", supportedTranspilers.typescript);
 
+function isTypeOnly(pStatement) {
+  return (
+    (pStatement.importClause && pStatement.importClause.isTypeOnly) ||
+    // for some weird reason the isTypeOnly indicator is on _statement_ level
+    // and not in exportClause as it is in the importClause ¯\_ (ツ)_/¯.
+    // Also in the case of the omission of an alias the exportClause
+    // is not there entirely. So regardless whether there is a
+    // pStatement.exportClause or not, we can directly test for the
+    // isTypeOnly attribute.
+    pStatement.isTypeOnly
+  );
+}
+
 /*
  * Both extractImport* assume the imports/ exports can only occur at
  * top level. AFAIK this the only place they're allowed, so we should
@@ -30,9 +43,7 @@ function extractImportsAndExports(pAST) {
       module: pStatement.moduleSpecifier.text,
       moduleSystem: "es6",
       exoticallyRequired: false,
-      ...(pStatement.importClause && pStatement.importClause.isTypeOnly
-        ? { dependencyTypes: ["type-only"] }
-        : {}),
+      ...(isTypeOnly(pStatement) ? { dependencyTypes: ["type-only"] } : {}),
     }));
 }
 

package/src/meta.js

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