dependency-cruiser 13.0.2 → 13.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dependency-cruiser",
-  "version": "13.0.2",
+  "version": "13.0.3",
   "description": "Validate and visualize dependencies. With your rules. JavaScript, TypeScript, CoffeeScript. ES6, CommonJS, AMD.",
   "keywords": [
     "static analysis",
@@ -156,9 +156,8 @@
     "ajv": "8.12.0",
     "chalk": "5.2.0",
     "commander": "10.0.1",
-    "enhanced-resolve": "5.14.0",
+    "enhanced-resolve": "5.14.1",
     "figures": "5.0.0",
-    "get-stream": "^6.0.1",
     "glob": "10.2.6",
     "handlebars": "4.7.7",
     "ignore": "5.2.4",
@@ -174,25 +173,25 @@
     "semver-try-require": "6.2.2",
     "teamcity-service-messages": "0.1.14",
     "tsconfig-paths-webpack-plugin": "4.0.1",
-    "watskeburt": "0.11.2",
+    "watskeburt": "0.11.3",
     "wrap-ansi": "8.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.21.8",
+    "@babel/core": "7.22.1",
     "@babel/plugin-transform-modules-commonjs": "7.21.5",
     "@babel/preset-typescript": "7.21.5",
-    "@swc/core": "1.3.59",
-    "@types/lodash": "4.14.194",
-    "@types/node": "20.2.1",
+    "@swc/core": "1.3.62",
+    "@types/lodash": "4.14.195",
+    "@types/node": "20.2.5",
     "@types/prompts": "2.4.4",
-    "@typescript-eslint/eslint-plugin": "5.59.6",
-    "@typescript-eslint/parser": "5.59.6",
+    "@typescript-eslint/eslint-plugin": "5.59.8",
+    "@typescript-eslint/parser": "5.59.8",
     "@vue/compiler-sfc": "3.3.4",
-    "c8": "7.13.0",
+    "c8": "7.14.0",
     "chai": "4.3.7",
     "chai-json-schema": "1.5.1",
     "coffeescript": "2.7.0",
-    "eslint": "8.41.0",
+    "eslint": "8.42.0",
     "eslint-config-moving-meadow": "4.0.2",
     "eslint-config-prettier": "8.8.0",
     "eslint-plugin-budapestian": "5.0.1",
@@ -213,7 +212,7 @@
     "shx": "0.3.4",
     "svelte": "3.59.1",
     "symlink-dir": "5.1.1",
-    "typescript": "5.0.4",
+    "typescript": "5.1.3",
     "upem": "7.3.2",
     "vue-template-compiler": "2.7.14",
     "yarn": "1.22.19"

package/src/cli/format.mjs

@@ -1,4 +1,3 @@
-import getStream from "get-stream";
 import _format from "../main/format.mjs";
 import validateFileExistence from "./utl/validate-file-existence.mjs";
 import normalizeOptions from "./normalize-cli-options.mjs";
@@ -8,7 +7,7 @@ import { getInStream, write } from "./utl/io.mjs";
  *
  * @param {string} pResultFile the name of the file with cruise results
  * @param {import("../../types/dependency-cruiser").IFormatOptions} pOptions
- * @returns {Number} an exitCode
+ * @returns {Promise<Number>} an exitCode
  */
 export default async function format(pResultFile, pOptions) {
   const lOptions = await normalizeOptions(pOptions);
@@ -17,10 +16,30 @@ export default async function format(pResultFile, pOptions) {
     validateFileExistence(pResultFile);
   }
 
-  const lResult = await getStream(getInStream(pResultFile));
+  return new Promise((pResolve, pReject) => {
+    let lInputAsString = "";
+    const lInStream = getInStream(pResultFile);
 
-  const lReportingResult = await _format(JSON.parse(lResult), lOptions);
+    lInStream
+      .on("data", (pChunk) => {
+        lInputAsString += pChunk;
+      })
+      .on(
+        "error",
+        /* c8 ignore start */
+        (pError) => {
+          pReject(pError);
+        }
+        /* c8 ignore stop */
+      )
+      .on("end", async () => {
+        const lReportingResult = await _format(
+          JSON.parse(lInputAsString),
+          lOptions
+        );
 
-  write(lOptions.outputTo, lReportingResult.output);
-  return lReportingResult.exitCode;
+        write(lOptions.outputTo, lReportingResult.output);
+        pResolve(lReportingResult.exitCode);
+      });
+  });
 }

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

@@ -2,6 +2,7 @@
 import tryImport from "semver-try-require";
 import meta from "../../meta.js";
 
+/** @type {import("typescript")} */
 const typescript = await tryImport(
   "typescript",
   meta.supportedTranspilers.typescript
@@ -120,13 +121,26 @@ function firstArgumentIsAString(pASTNode) {
 }
 
 function isRequireCallExpression(pASTNode) {
-  return (
+  if (
     typescript.SyntaxKind[pASTNode.kind] === "CallExpression" &&
-    pASTNode.expression &&
-    typescript.SyntaxKind[pASTNode.expression.originalKeywordKind] ===
-      "RequireKeyword" &&
-    firstArgumentIsAString(pASTNode)
-  );
+    pASTNode.expression
+  ) {
+    /*
+     * from typescript 5.0.0 the `originalKeywordKind` attribute is deprecated
+     * and from 5.2.0 it will be gone. However, in typescript < 5.0.0 (still used
+     * heavily IRL) it's the only way to get it - hence this test for the
+     * existence of the * identifierToKeywordKind function to remain backwards
+     * compatible
+     */
+    const lSyntaxKind = typescript.identifierToKeywordKind
+      ? typescript.SyntaxKind[
+          typescript.identifierToKeywordKind(pASTNode.expression)
+        ]
+      : /* c8 ignore next 1 */
+        typescript.SyntaxKind[pASTNode.expression.originalKeywordKind];
+    return lSyntaxKind === "RequireKeyword" && firstArgumentIsAString(pASTNode);
+  }
+  return false;
 }
 
 function isSingleExoticRequire(pASTNode, pString) {

package/src/meta.js

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