Merge branch 'master' into migrate-ts-source-parser

Author: intincrab

.changeset/empty-dingos-yell.md

@@ -0,0 +1,5 @@
+---
+"@nodesecure/estree-ast-utils": major
+---
+
+Remove VariableTracer

.changeset/loose-mails-float.md

@@ -148,6 +148,7 @@ Click on one of the links to access the documentation of the workspace:
 | name | package and link |
 | --- | --- |
 | estree-ast-utils | [@nodesecure/estree-ast-utils](./workspaces/estree-ast-utils) |
+| tracer | [@nodesecure/tracer](./workspaces/tracer) |
 | sec-literal | [@nodesecure/sec-literal ](./workspaces/sec-literal) |
 | ts-source-parser | [@nodesecure/ts-source-parser ](./workspaces/ts-source-parser) |
 

README.md

@@ -32,7 +32,8 @@
   "workspaces": [
     "workspaces/estree-ast-utils",
     "workspaces/sec-literal",
-    "workspaces/ts-source-parser"
+    "workspaces/ts-source-parser",
+    "workspaces/tracer"
   ],
   "keywords": [
     "ast",
@@ -57,6 +58,7 @@
   "dependencies": {
     "@nodesecure/estree-ast-utils": "^1.5.0",
     "@nodesecure/sec-literal": "^1.2.0",
+    "@nodesecure/tracer": "^1.0.0",
     "digraph-js": "^2.2.3",
     "estree-walker": "^3.0.1",
     "frequency-set": "^1.0.2",
@@ -70,7 +72,7 @@
     "@changesets/cli": "^2.29.4",
     "@openally/config.eslint": "^2.0.0",
     "@openally/config.typescript": "^1.0.3",
-    "@types/node": "^22.0.0",
+    "@types/node": "^24.0.2",
     "c8": "^10.1.2",
     "glob": "^11.0.0",
     "iterator-matcher": "^2.1.0",

package.json

@@ -41,11 +41,12 @@ export class EntryFilesAnalyser {
     this.dependencies = new DiGraph();
 
     for (const entryFile of new Set(entryFiles)) {
-      const normalizedEntryFile = path.normalize(
-        fileURLToPathExtended(entryFile)
-      );
+      const normalizedEntryFile = this.#normalizeAndCleanEntryFile(entryFile);
 
-      if (this.ignoreENOENT && !await this.#fileExists(normalizedEntryFile)) {
+      if (
+        this.ignoreENOENT &&
+        !await this.#fileExists(normalizedEntryFile)
+      ) {
         return;
       }
 
@@ -57,8 +58,21 @@ export class EntryFilesAnalyser {
     }
   }
 
+  #normalizeAndCleanEntryFile(file) {
+    let normalizedEntryFile = path.normalize(
+      fileURLToPathExtended(file)
+    );
+    if (this.#rootPath !== null && !path.isAbsolute(normalizedEntryFile)) {
+      normalizedEntryFile = path.join(this.#rootPath, normalizedEntryFile);
+    }
+
+    return normalizedEntryFile;
+  }
+
   #getRelativeFilePath(file) {
-    return this.#rootPath ? path.relative(this.#rootPath, file) : file;
+    return this.#rootPath ?
+      path.relative(this.#rootPath, file) :
+      file;
   }
 
   async* #analyseFile(

src/EntryFilesAnalyser.js

@@ -1,6 +1,6 @@
 // Import Third-party Dependencies
 import { Utils, Literal } from "@nodesecure/sec-literal";
-import { VariableTracer } from "@nodesecure/estree-ast-utils";
+import { VariableTracer } from "@nodesecure/tracer";
 
 // Import Internal Dependencies
 import { rootLocation, toArrayLocation } from "./utils/index.js";

src/SourceFile.js

@@ -181,23 +181,43 @@ describe("EntryFilesAnalyser", () => {
       assert.ok(to.startsWith(kFixtureURLPath));
     }
   });
-});
 
-it("should ignore file that does not exist when option ignoreENOENT is provided", async() => {
-  const entryFilesAnalyser = new EntryFilesAnalyser({
-    ignoreENOENT: true,
-    rootPath: kFixtureURL
+  it("should automatically build absolute path for entryFiles when rootPath is provided", async() => {
+    const entryFilesAnalyser = new EntryFilesAnalyser({
+      rootPath: kFixtureURL
+    });
+
+    const generator = entryFilesAnalyser.analyse(
+      ["recursive/A.js"]
+    );
+    const reports = await fromAsync(generator);
+
+    const files = reports.map((report) => path.normalize(report.file));
+    assert.deepEqual(
+      files,
+      [
+        "recursive/A.js",
+        "recursive/B.js"
+      ].map((file) => path.normalize(file))
+    );
   });
 
-  const entryUrl = new URL("does-not-exists.js", kFixtureURL);
+  it("should ignore file that does not exist when option ignoreENOENT is provided", async() => {
+    const entryFilesAnalyser = new EntryFilesAnalyser({
+      ignoreENOENT: true,
+      rootPath: kFixtureURL
+    });
+
+    const entryUrl = new URL("does-not-exists.js", kFixtureURL);
 
-  const generator = entryFilesAnalyser.analyse(
-    [entryUrl]
-  );
+    const generator = entryFilesAnalyser.analyse(
+      [entryUrl]
+    );
 
-  const reports = await fromAsync(generator);
-  assert.strictEqual(reports.length, 0);
-  assert.strictEqual(entryFilesAnalyser.dependencies.hasVertex("does-not-exists.js"), false);
+    const reports = await fromAsync(generator);
+    assert.strictEqual(reports.length, 0);
+    assert.strictEqual(entryFilesAnalyser.dependencies.hasVertex("does-not-exists.js"), false);
+  });
 });
 
 // TODO: replace with Array.fromAsync when droping Node.js 20

test/EntryFilesAnalyser.spec.js

@@ -1,5 +1,11 @@
 # @nodesecure/estree-ast-utils
 
+## 2.0.0
+
+### Major Changes
+
+- [#342](https://github.com/NodeSecure/js-x-ray/pull/342) [`633f334`](https://github.com/NodeSecure/js-x-ray/commit/633f334e1fbceb3d7eb20a08907c56502b51d6ca) Thanks [@fraxken](https://github.com/fraxken)! - Resolve CallExpression in MemberExpression with getCallExpressionIdentifier helper
+
 ## 1.6.0
 
 ### Minor Changes

workspaces/estree-ast-utils/CHANGELOG.md

@@ -19,17 +19,6 @@ $ npm i @nodesecure/estree-ast-utils
 $ yarn add @nodesecure/estree-ast-utils
 ```
 
-## Usage example
-
-```js
-import { VariableTracer } from "@nodesecure/estree-ast-utils";
-
-const tracer = new VariableTracer().enableDefaultTracing();
-
-const data = tracer.getDataFromIdentifier("identifier...here");
-console.log(data);
-```
-
 ## API
 
 <details><summary>arrayExpressionToString(node): IterableIterator< string ></summary>

workspaces/estree-ast-utils/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@nodesecure/estree-ast-utils",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "description": "Utilities for AST (ESTree compliant)",
   "type": "module",
   "exports": "./src/index.js",
@@ -29,9 +29,6 @@
     "url": "https://github.com/NodeSecure/js-x-ray/issues"
   },
   "homepage": "https://github.com/NodeSecure/js-x-ray/tree/master/workspaces/estree-ast-utils#readme",
-  "devDependencies": {
-    "estree-walker": "^3.0.2"
-  },
   "dependencies": {
     "@nodesecure/sec-literal": "^1.1.0"
   }