astronomical 1.0.0 → 2.0.0

package/lib/esm/nodeutils.js

@@ -1,55 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isExportSpecifier = exports.isScopable = exports.isScope = exports.VISITOR_KEYS = exports.isBinding = exports.isVariableDeclaration = exports.isVariableDeclarator = exports.isFunctionExpression = exports.isFunctionDeclaration = exports.isIdentifier = exports.isMemberExpression = exports.isAssignmentExpression = exports.isUpdateExpression = exports.isPrimitive = exports.isLiteral = exports.isNodePath = exports.isNode = void 0;
-function isNode(candidate) {
+exports.VISITOR_KEYS = exports.isBinding = exports.isVariableDeclaration = exports.isVariableDeclarator = exports.isFunctionExpression = exports.isFunctionDeclaration = exports.isIdentifier = exports.isMemberExpression = exports.isAssignmentExpression = exports.isUpdateExpression = exports.isPrimitive = exports.isLiteral = exports.isNodePath = exports.isNode = void 0;
+exports.isScope = isScope;
+exports.isScopable = isScopable;
+exports.isExportSpecifier = isExportSpecifier;
+const isNode = (candidate) => {
     return typeof candidate === "object" && candidate != null && "type" in candidate;
-}
+};
 exports.isNode = isNode;
-function isNodePath(candidate) {
+const isNodePath = (candidate) => {
     return typeof candidate === "object" && candidate != null && "node" in candidate;
-}
+};
 exports.isNodePath = isNodePath;
-function isLiteral(candidate) {
-    return isNode(candidate) && candidate.type === "Literal";
-}
+const isLiteral = (candidate) => {
+    return (0, exports.isNode)(candidate) && candidate.type === "Literal";
+};
 exports.isLiteral = isLiteral;
-function isPrimitive(value) {
+const isPrimitive = (value) => {
     return typeof value == "string" || typeof value == "number" || typeof value == "boolean";
-}
+};
 exports.isPrimitive = isPrimitive;
-function isUpdateExpression(value) {
-    return isNode(value) && value.type === "UpdateExpression";
-}
+const isUpdateExpression = (value) => {
+    return (0, exports.isNode)(value) && value.type === "UpdateExpression";
+};
 exports.isUpdateExpression = isUpdateExpression;
-function isAssignmentExpression(node) {
+const isAssignmentExpression = (node) => {
     return node.type === "AssignmentExpression";
-}
+};
 exports.isAssignmentExpression = isAssignmentExpression;
-function isMemberExpression(node) {
+const isMemberExpression = (node) => {
     return node.type === "MemberExpression";
-}
+};
 exports.isMemberExpression = isMemberExpression;
-function isIdentifier(node) {
+const isIdentifier = (node) => {
     return node.type === "Identifier";
-}
+};
 exports.isIdentifier = isIdentifier;
-function isFunctionDeclaration(node) {
+const isFunctionDeclaration = (node) => {
     return node.type === "FunctionDeclaration";
-}
+};
 exports.isFunctionDeclaration = isFunctionDeclaration;
-function isFunctionExpression(node) {
+const isFunctionExpression = (node) => {
     return node.type === "FunctionExpression";
-}
+};
 exports.isFunctionExpression = isFunctionExpression;
-function isVariableDeclarator(node) {
+const isVariableDeclarator = (node) => {
     return node.type === "VariableDeclarator";
-}
+};
 exports.isVariableDeclarator = isVariableDeclarator;
-function isVariableDeclaration(node) {
+const isVariableDeclaration = (node) => {
     return node.type === "VariableDeclaration";
-}
+};
 exports.isVariableDeclaration = isVariableDeclaration;
-function isBinding(node, parentNode, grandParentNode) {
+const isBinding = (node, parentNode, grandParentNode) => {
     if (grandParentNode &&
         node.type === "Identifier" &&
         parentNode.type === "Property" &&
@@ -72,7 +75,7 @@ function isBinding(node, parentNode, grandParentNode) {
         }
     }
     return false;
-}
+};
 exports.isBinding = isBinding;
 const bindingIdentifiersKeys = {
     DeclareClass: ["id"],
@@ -148,6 +151,7 @@ exports.VISITOR_KEYS = {
     FunctionExpression: ["id", "params", "body"],
     Identifier: [],
     IfStatement: ["test", "consequent", "alternate"],
+    ImportAttribute: ["key", "value"],
     ImportDeclaration: ["specifiers", "source"],
     ImportDefaultSpecifier: ["local"],
     ImportNamespaceSpecifier: ["local"],
@@ -227,9 +231,8 @@ function isScope(node, parentNode) {
     if (isPattern(node) && (isFunction(parentNode) || isCatchClause(parentNode))) {
         return true;
     }
-    return isFunctionDeclaration(parentNode) || isFunctionExpression(parentNode) || isScopable(node);
+    return (0, exports.isFunctionDeclaration)(parentNode) || (0, exports.isFunctionExpression)(parentNode) || isScopable(node);
 }
-exports.isScope = isScope;
 function isScopable(node) {
     switch (node.type) {
         case "BlockStatement":
@@ -252,8 +255,6 @@ function isScopable(node) {
     }
     return false;
 }
-exports.isScopable = isScopable;
 function isExportSpecifier(node) {
     return node.type === "ExportSpecifier";
 }
-exports.isExportSpecifier = isExportSpecifier;

package/lib/esm/parseQuery.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parse = exports.tokenize = void 0;
+exports.tokenize = tokenize;
+exports.parse = parse;
 const _1 = require(".");
 const nodeutils_1 = require("./nodeutils");
 const debugLogEnabled = false;
-const log = {
+const log = debugLogEnabled ? {
     debug: (...args) => {
-        if (debugLogEnabled)
-            console.debug(...args);
+        console.debug(...args);
     }
-};
+} : undefined;
 const supportedIdentifiers = Object.fromEntries(Object.keys(nodeutils_1.VISITOR_KEYS).map(k => [k, k]));
 function isIdentifierToken(token) {
     if (token == undefined)
@@ -149,9 +149,8 @@ function tokenize(input) {
     }
     return result;
 }
-exports.tokenize = tokenize;
 function buildFilter(tokens) {
-    log.debug("BUILD FILTER", tokens);
+    log?.debug("BUILD FILTER", tokens);
     tokens.shift();
     const p = buildTree(tokens);
     const next = tokens[0];
@@ -198,7 +197,7 @@ function buildFilter(tokens) {
 }
 const subNodes = ["child", "descendant"];
 function buildTree(tokens) {
-    log.debug("BUILD TREE", tokens);
+    log?.debug("BUILD TREE", tokens);
     if (tokens.length == 0)
         throw new Error("Unexpected end of input");
     const token = tokens.shift();
@@ -241,7 +240,7 @@ function buildTree(tokens) {
         let filter = undefined;
         if (tokens.length > 0 && tokens[0].type == "filterBegin") {
             filter = buildFilter(tokens);
-            log.debug("FILTER", filter, tokens);
+            log?.debug("FILTER", filter, tokens);
         }
         let child = undefined;
         if (tokens.length > 0 && subNodes.includes(tokens[0].type)) {
@@ -268,7 +267,7 @@ function buildTree(tokens) {
     throw new Error("Unexpected token: " + token.type);
 }
 function buildFunctionCall(name, tokens) {
-    log.debug("BUILD FUNCTION", name, tokens);
+    log?.debug("BUILD FUNCTION", name, tokens);
     const parameters = [];
     const next = tokens.shift();
     if (next?.type != "parametersBegin")
@@ -290,9 +289,8 @@ function buildFunctionCall(name, tokens) {
 function parse(input) {
     const tokens = tokenize(input);
     const result = buildTree(tokens);
-    log.debug("RESULT", result);
+    log?.debug("RESULT", result);
     if (!result)
         throw new Error("No root element found");
     return result;
 }
-exports.parse = parse;

package/lib/esm/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ASTNode } from "./traverse";
+import { ESTree } from "meriyah";
 export declare const functions: {
     join: {
         fn: (result: Result[][]) => Result[];
@@ -23,6 +23,41 @@ export declare function query(code: string | ASTNode, query: string, returnAST?:
 export declare function multiQuery<T extends Record<string, string>>(code: string | ASTNode, namedQueries: T, returnAST?: boolean): Record<keyof T, Result[]> & {
     __AST?: ASTNode;
 };
-export declare function parseSource(source: string): ASTNode;
+export declare function parseSource(source: string, optimize?: boolean): ASTNode;
+export type Binding = {
+    path: NodePath;
+};
+export type Scope = {
+    bindings: Record<string, Binding>;
+    parentScopeId?: number;
+    id: number;
+};
+export type ASTNode = ESTree.Node & {
+    extra?: {
+        scopeId?: number;
+        functionScopeId?: number;
+        nodePath?: NodePath;
+    };
+};
+export type NodePath = {
+    node: ASTNode;
+    key?: string;
+    parentPath?: NodePath;
+    parentKey?: string;
+    scopeId: number;
+    functionScopeId: number;
+};
+type Visitor<T> = {
+    enter: (path: NodePath, state: T) => void;
+    exit: (path: NodePath, state: T) => void;
+};
+export default function createTraverser(): {
+    traverse: <T>(node: ASTNode, visitor: Visitor<T>, scopeId: number | undefined, state: T, path?: NodePath) => void;
+    createNodePath: (node: ASTNode, key: string | undefined | number, parentKey: string | undefined, scopeId: number | undefined, functionScopeId: number | undefined, nodePath?: NodePath) => NodePath;
+    getChildren: (key: string, path: NodePath) => NodePath[];
+    getPrimitiveChildren: (key: string, path: NodePath) => PrimitiveValue[];
+    getPrimitiveChildrenOrNodePaths: (key: string, path: NodePath) => Array<PrimitiveValue | NodePath>;
+    getBinding: (scopeId: number, name: string) => Binding | undefined;
+};
 export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/esm/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAwB,EAAG,OAAO,EAAY,MAAM,YAAY,CAAC;AAajE,eAAO,MAAM,SAAS;;qBAEL,MAAM,EAAE,EAAE,KAAG,MAAM,EAAE;;;qBAWrB,MAAM,EAAE,EAAE,KAAG,MAAM,EAAE;;;qBAMrB,MAAM,EAAE,EAAE,KAAG,MAAM,EAAE;;;qBAOrB,MAAM,EAAE,EAAE,KAAG,MAAM,EAAE;;CASrC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,MAAM,OAAO,SAAS,CAAC;AACvD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAI,IAAI,IAAI,iBAAiB,CAE5E;AAGD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEvD,KAAK,MAAM,GAAG,OAAO,GAAG,cAAc,CAAC;AA4XvC,wBAAgB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,OAAO,GAAI,MAAM,EAAE,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAQjH;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,CAAC,EAAE,OAAO,GAAI,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAY3K;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAI,OAAO,CAMpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"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"}

package/lib/esm/types/nodeutils.d.ts

@@ -1,19 +1,19 @@
 import { ESTree } from "meriyah";
-import { ASTNode, NodePath } from "./traverse";
+import { ASTNode, NodePath } from ".";
 import { PrimitiveValue } from ".";
-export declare function isNode(candidate: unknown): candidate is ASTNode;
-export declare function isNodePath(candidate: unknown): candidate is NodePath;
-export declare function isLiteral(candidate: unknown): candidate is ESTree.Literal;
-export declare function isPrimitive(value: unknown): value is PrimitiveValue;
-export declare function isUpdateExpression(value: unknown): value is ESTree.UpdateExpression;
-export declare function isAssignmentExpression(node: ESTree.Node): node is ESTree.AssignmentExpression;
-export declare function isMemberExpression(node: ESTree.Node): node is ESTree.MemberExpression;
-export declare function isIdentifier(node: ESTree.Node): node is ESTree.Identifier;
-export declare function isFunctionDeclaration(node: ESTree.Node): node is ESTree.FunctionDeclaration;
-export declare function isFunctionExpression(node: ESTree.Node): node is ESTree.FunctionExpression;
-export declare function isVariableDeclarator(node: ESTree.Node): node is ESTree.VariableDeclarator;
-export declare function isVariableDeclaration(node: ESTree.Node): node is ESTree.VariableDeclaration;
-export declare function isBinding(node: ESTree.Node, parentNode: ESTree.Node, grandParentNode: ESTree.Node | undefined): boolean;
+export declare const isNode: (candidate: unknown) => candidate is ASTNode;
+export declare const isNodePath: (candidate: unknown) => candidate is NodePath;
+export declare const isLiteral: (candidate: unknown) => candidate is ESTree.Literal;
+export declare const isPrimitive: (value: unknown) => value is PrimitiveValue;
+export declare const isUpdateExpression: (value: unknown) => value is ESTree.UpdateExpression;
+export declare const isAssignmentExpression: (node: ESTree.Node) => node is ESTree.AssignmentExpression;
+export declare const isMemberExpression: (node: ESTree.Node) => node is ESTree.MemberExpression;
+export declare const isIdentifier: (node: ESTree.Node) => node is ESTree.Identifier;
+export declare const isFunctionDeclaration: (node: ESTree.Node) => node is ESTree.FunctionDeclaration;
+export declare const isFunctionExpression: (node: ESTree.Node) => node is ESTree.FunctionExpression;
+export declare const isVariableDeclarator: (node: ESTree.Node) => node is ESTree.VariableDeclarator;
+export declare const isVariableDeclaration: (node: ESTree.Node) => node is ESTree.VariableDeclaration;
+export declare const isBinding: (node: ESTree.Node, parentNode: ESTree.Node, grandParentNode: ESTree.Node | undefined) => boolean;
 export declare const VISITOR_KEYS: Record<ESTree.Node["type"], string[]>;
 export declare function isScope(node: ESTree.Node, parentNode: ESTree.Node): boolean;
 export declare function isScopable(node: ESTree.Node): boolean;

package/lib/esm/types/nodeutils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodeutils.d.ts","sourceRoot":"","sources":["../../../src/nodeutils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AAEnC,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,GAAI,SAAS,IAAI,OAAO,CAEhE;AAED,wBAAgB,UAAU,CAAC,SAAS,EAAE,OAAO,GAAI,SAAS,IAAI,QAAQ,CAErE;AAED,wBAAgB,SAAS,CAAC,SAAS,EAAE,OAAO,GAAI,SAAS,IAAI,MAAM,CAAC,OAAO,CAE1E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAI,KAAK,IAAI,cAAc,CAEpE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAI,KAAK,IAAI,MAAM,CAAC,gBAAgB,CAEpF;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,oBAAoB,CAE7F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,gBAAgB,CAErF;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,UAAU,CAEzE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,mBAAmB,CAE3F;AACD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,kBAAkB,CAEzF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,kBAAkB,CAEzF;AACD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,mBAAmB,CAE3F;AACD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,eAAe,EAAE,MAAM,CAAC,IAAI,GAAG,SAAS,GAAG,OAAO,CAwBvH;AAuDD,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CA0F9D,CAAC;AAqBF,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAS3E;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAqBrD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,eAAe,CAEnF"}
+{"version":3,"file":"nodeutils.d.ts","sourceRoot":"","sources":["../../../src/nodeutils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AAEnC,eAAO,MAAM,MAAM,GAAI,WAAW,OAAO,KAAI,SAAS,IAAI,OAEzD,CAAA;AAED,eAAO,MAAM,UAAU,GAAI,WAAW,OAAO,KAAI,SAAS,IAAI,QAE7D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,WAAW,OAAO,KAAI,SAAS,IAAI,MAAM,CAAC,OAEnE,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,OAAO,OAAO,KAAI,KAAK,IAAI,cAEtD,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,OAAO,OAAO,KAAI,KAAK,IAAI,MAAM,CAAC,gBAEpE,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,MAAM,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,oBAEzE,CAAA;AAED,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,gBAErE,CAAA;AAED,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,UAE/D,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,MAAM,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,mBAExE,CAAA;AACD,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,kBAEvE,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,MAAM,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,kBAEvE,CAAA;AACD,eAAO,MAAM,qBAAqB,GAAI,MAAM,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,mBAExE,CAAA;AACD,eAAO,MAAM,SAAS,GAAI,MAAM,MAAM,CAAC,IAAI,EAAE,YAAY,MAAM,CAAC,IAAI,EAAE,iBAAiB,MAAM,CAAC,IAAI,GAAG,SAAS,KAAG,OAwBhH,CAAA;AAuDD,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CA2F9D,CAAC;AAqBF,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAS3E;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,OAAO,CAqBrD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,MAAM,CAAC,eAAe,CAEnF"}

package/lib/esm/utils.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDefined = exports.toArray = void 0;
+exports.toArray = toArray;
+exports.isDefined = isDefined;
 function toArray(value) {
     return Array.isArray(value) ? value : [value];
 }
-exports.toArray = toArray;
 function isDefined(value) {
     return value != undefined && value != null;
 }
-exports.isDefined = isDefined;

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "astronomical",
-  "version": "1.0.0",
+  "version": "2.0.0",
+  "type": "commonjs",
   "description": "offers a way to query a Javascript AST to find specific patterns using a syntax somewhat similar to XPath.",
   "scripts": {
     "lint": "eslint . --ext .ts --fix --ignore-path .gitignore",
@@ -33,7 +34,7 @@
     "typescript": "^5.3.3"
   },
   "dependencies": {
-    "meriyah": "^4.3.9"
+    "meriyah": "^6.0.3"
   },
   "files": [
     "lib/**/*"

package/lib/cjs/traverse.js

@@ -1,239 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const nodeutils_1 = require("./nodeutils");
-const utils_1 = require("./utils");
-const debugLogEnabled = false;
-const log = {
-    debug: (...args) => {
-        if (debugLogEnabled)
-            console.debug(...args);
-    }
-};
-const scopes = new Array(100000);
-function createTraverser() {
-    let scopeIdCounter = 0;
-    let removedScopes = 0;
-    const nodePathsCreated = {};
-    function createScope(parentScopeId) {
-        const id = scopeIdCounter++;
-        scopes[id] = parentScopeId ?? -1;
-        return id;
-    }
-    function getBinding(scopeId, name) {
-        const scope = scopes[scopeId];
-        if (typeof scope == "number") {
-            if (scope == -1)
-                return undefined;
-            return getBinding(scope, name);
-        }
-        const s = scope.bindings[name];
-        if (s != undefined)
-            return s;
-        if (scope.parentScopeId != undefined && scope.parentScopeId >= 0) {
-            return getBinding(scope.parentScopeId, name);
-        }
-        return undefined;
-    }
-    function setBinding(scopeId, name, binding) {
-        let scope;
-        const s = scopes[scopeId];
-        if (typeof s == "number") {
-            scope = {
-                bindings: {},
-                id: scopeId,
-                parentScopeId: s == -1 ? undefined : s,
-            };
-            scopes[scopeId] = scope;
-        }
-        else {
-            scope = s;
-        }
-        scope.bindings[name] = binding;
-    }
-    let pathsCreated = 0;
-    function getChildren(key, path) {
-        if (key in path.node) {
-            const r = path.node[key];
-            if (Array.isArray(r)) {
-                return r.map((n, i) => createNodePath(n, i, key, path.scopeId, path.functionScopeId, path));
-            }
-            else if (r != undefined) {
-                return [createNodePath(r, key, key, path.scopeId, path.functionScopeId, path)];
-            }
-        }
-        return [];
-    }
-    function getPrimitiveChildren(key, path) {
-        if (key in path.node) {
-            const r = path.node[key];
-            return (0, utils_1.toArray)(r).filter(utils_1.isDefined).filter(nodeutils_1.isPrimitive);
-        }
-        return [];
-    }
-    function getPrimitiveChildrenOrNodePaths(key, path) {
-        if (key in path.node) {
-            const r = path.node[key];
-            if (Array.isArray(r)) {
-                return r.map((n, i) => (0, nodeutils_1.isPrimitive)(n) ? n :
-                    // isLiteral(n) ? n.value as PrimitiveValue :
-                    createNodePath(n, i, key, path.scopeId, path.functionScopeId, path));
-            }
-            else if (r != undefined) {
-                return [
-                    (0, nodeutils_1.isPrimitive)(r) ? r :
-                        // isLiteral(r) ? r.value as PrimitiveValue :
-                        createNodePath(r, key, key, path.scopeId, path.functionScopeId, path)
-                ];
-            }
-        }
-        return [];
-    }
-    function createNodePath(node, key, parentKey, scopeId, functionScopeId, nodePath) {
-        if (node.extra?.nodePath) {
-            const path = node.extra.nodePath;
-            if (nodePath && (0, nodeutils_1.isExportSpecifier)(nodePath.node) && key == "exported" && path.key == "local") {
-                //Special handling for "export { someName }" as id is both local and exported
-                path.key = "exported";
-                path.parentPath = nodePath;
-                return path;
-            }
-            if (key != undefined)
-                path.key = typeof (key) == "number" ? key.toString() : key;
-            if (parentKey != undefined)
-                path.parentKey = parentKey;
-            if (nodePath != undefined)
-                path.parentPath = nodePath;
-            return path;
-        }
-        const finalScope = ((node.extra && node.extra.scopeId != undefined) ? node.extra.scopeId : scopeId) ?? createScope();
-        const finalFScope = ((node.extra && node.extra.functionScopeId != undefined) ? node.extra.functionScopeId : functionScopeId) ?? finalScope;
-        const path = {
-            node,
-            scopeId: finalScope,
-            functionScopeId: finalFScope,
-            parentPath: nodePath,
-            key: typeof (key) == "number" ? key.toString() : key,
-            parentKey
-        };
-        if ((0, nodeutils_1.isNode)(node)) {
-            node.extra = node.extra ?? {};
-            node.extra.nodePath = path;
-            Object.defineProperty(node.extra, "nodePath", { enumerable: false });
-        }
-        nodePathsCreated[node.type] = (nodePathsCreated[node.type] ?? 0) + 1;
-        pathsCreated++;
-        return path;
-    }
-    function registerBinding(stack, scopeId, functionScopeId, key, parentKey) {
-        //console.log("x registerBinding?", isIdentifier(node) ? node.name : node.type, parentNode.type, grandParentNode?.type, scopeId, isBinding(node, parentNode, grandParentNode));
-        const node = stack[stack.length - 1];
-        if (!(0, nodeutils_1.isIdentifier)(node))
-            return;
-        const parentNode = stack[stack.length - 2];
-        if ((0, nodeutils_1.isAssignmentExpression)(parentNode) || (0, nodeutils_1.isMemberExpression)(parentNode) || (0, nodeutils_1.isUpdateExpression)(parentNode) || (0, nodeutils_1.isExportSpecifier)(parentNode))
-            return;
-        const grandParentNode = stack[stack.length - 3];
-        if (!(0, nodeutils_1.isBinding)(node, parentNode, grandParentNode))
-            return;
-        if (key == "id" && !(0, nodeutils_1.isVariableDeclarator)(parentNode)) {
-            setBinding(functionScopeId, node.name, { path: createNodePath(node, undefined, undefined, scopeId, functionScopeId) });
-            return;
-        }
-        if ((0, nodeutils_1.isVariableDeclarator)(parentNode) && (0, nodeutils_1.isVariableDeclaration)(grandParentNode)) {
-            if (grandParentNode.kind == "var") {
-                setBinding(functionScopeId, node.name, { path: createNodePath(parentNode, undefined, undefined, scopeId, functionScopeId) });
-                return;
-            }
-            else {
-                setBinding(scopeId, node.name, { path: createNodePath(parentNode, undefined, undefined, scopeId, functionScopeId) });
-                return;
-            }
-        }
-        if ((0, nodeutils_1.isScope)(node, parentNode)) {
-            setBinding(scopeId, node.name, { path: createNodePath(node, key, parentKey, scopeId, functionScopeId) });
-        } /*else {
-          console.log(node.type, parentNode.type, grandParentNode?.type);
-        }*/
-    }
-    let bindingNodesVisited = 0;
-    function registerBindings(stack, scopeId, functionScopeId) {
-        const node = stack[stack.length - 1];
-        if (!(0, nodeutils_1.isNode)(node))
-            return;
-        if (node.extra?.scopeId != undefined)
-            return;
-        node.extra = node.extra ?? {};
-        node.extra.scopeId = scopeId;
-        bindingNodesVisited++;
-        const keys = nodeutils_1.VISITOR_KEYS[node.type];
-        if (keys.length == 0)
-            return;
-        let childScopeId = scopeId;
-        if ((0, nodeutils_1.isScopable)(node)) {
-            childScopeId = createScope(scopeId);
-        }
-        for (const key of keys) {
-            const childNodes = node[key];
-            const children = (0, utils_1.toArray)(childNodes).filter(utils_1.isDefined);
-            children.forEach((child, i) => {
-                if (!(0, nodeutils_1.isNode)(child))
-                    return;
-                const f = key == "body" && ((0, nodeutils_1.isFunctionDeclaration)(node) || (0, nodeutils_1.isFunctionExpression)(node)) ? childScopeId : functionScopeId;
-                stack.push(child);
-                if ((0, nodeutils_1.isIdentifier)(child)) {
-                    const k = Array.isArray(childNodes) ? i : key;
-                    registerBinding(stack, childScopeId, f, k, key);
-                }
-                else {
-                    registerBindings(stack, childScopeId, f);
-                }
-                stack.pop();
-            });
-        }
-        if (childScopeId != scopeId && typeof scopes[childScopeId] == "number") { // Scope has not been populated
-            scopes[childScopeId] = scopes[scopeId];
-            removedScopes++;
-        }
-    }
-    function traverseInner(node, visitor, scopeId, functionScopeId, state, path) {
-        const nodePath = path ?? createNodePath(node, undefined, undefined, scopeId, functionScopeId);
-        const keys = nodeutils_1.VISITOR_KEYS[node.type] ?? [];
-        if (nodePath.parentPath)
-            registerBindings([nodePath.parentPath.parentPath?.node, nodePath.parentPath.node, nodePath.node].filter(utils_1.isDefined), nodePath.scopeId, nodePath.functionScopeId);
-        for (const key of keys) {
-            const childNodes = node[key];
-            const children = Array.isArray(childNodes) ? childNodes : childNodes ? [childNodes] : [];
-            const nodePaths = children.map((child, i) => {
-                if ((0, nodeutils_1.isNode)(child)) {
-                    return createNodePath(child, Array.isArray(childNodes) ? i : key, key, nodePath.scopeId, nodePath.functionScopeId, nodePath);
-                }
-                return undefined;
-            }).filter(x => x != undefined);
-            nodePaths.forEach((childPath) => {
-                visitor.enter(childPath, state);
-                traverseInner(childPath.node, visitor, nodePath.scopeId, nodePath.functionScopeId, state, childPath);
-                visitor.exit(childPath, state);
-            });
-        }
-    }
-    const sOut = [];
-    function traverse(node, visitor, scopeId, state, path) {
-        const fscope = path?.functionScopeId ?? node.extra?.functionScopeId ?? scopeId;
-        traverseInner(node, visitor, scopeId, fscope, state, path);
-        if (!sOut.includes(scopeIdCounter)) {
-            log.debug("Scopes created", scopeIdCounter, " Scopes removed", removedScopes, "Paths created", pathsCreated, bindingNodesVisited);
-            sOut.push(scopeIdCounter);
-            const k = Object.fromEntries(Object.entries(nodePathsCreated).sort((a, b) => a[1] - b[1]));
-            log.debug("Node paths created", k);
-        }
-    }
-    return {
-        traverse,
-        createNodePath,
-        getChildren,
-        getPrimitiveChildren,
-        getPrimitiveChildrenOrNodePaths,
-        getBinding
-    };
-}
-exports.default = createTraverser;

package/lib/cjs/types/traverse.d.ts

@@ -1,39 +0,0 @@
-import { ESTree } from "meriyah";
-import { PrimitiveValue } from ".";
-export type Binding = {
-    path: NodePath;
-};
-export type Scope = {
-    bindings: Record<string, Binding>;
-    parentScopeId?: number;
-    id: number;
-};
-export type ASTNode = ESTree.Node & {
-    extra?: {
-        scopeId?: number;
-        functionScopeId?: number;
-        nodePath?: NodePath;
-    };
-};
-export type NodePath = {
-    node: ASTNode;
-    key?: string;
-    parentPath?: NodePath;
-    parentKey?: string;
-    scopeId: number;
-    functionScopeId: number;
-};
-type Visitor<T> = {
-    enter: (path: NodePath, state: T) => void;
-    exit: (path: NodePath, state: T) => void;
-};
-export default function createTraverser(): {
-    traverse: <T>(node: ASTNode, visitor: Visitor<T>, scopeId: number | undefined, state: T, path?: NodePath) => void;
-    createNodePath: (node: ASTNode, key: string | undefined | number, parentKey: string | undefined, scopeId: number | undefined, functionScopeId: number | undefined, nodePath?: NodePath) => NodePath;
-    getChildren: (key: string, path: NodePath) => NodePath[];
-    getPrimitiveChildren: (key: string, path: NodePath) => PrimitiveValue[];
-    getPrimitiveChildrenOrNodePaths: (key: string, path: NodePath) => Array<PrimitiveValue | NodePath>;
-    getBinding: (scopeId: number, name: string) => Binding | undefined;
-};
-export {};
-//# sourceMappingURL=traverse.d.ts.map

package/lib/cjs/types/traverse.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../../src/traverse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,GAAG,CAAC;AASnC,MAAM,MAAM,OAAO,GAAG;IACpB,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAIF,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,GAAG;IAClC,KAAK,CAAC,EAAE;QACN,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;KACrB,CAAA;CACF,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,KAAK,OAAO,CAAC,CAAC,IAAI;IAChB,KAAK,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;IAC1C,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;CAC1C,CAAA;AAED,MAAM,CAAC,OAAO,UAAU,eAAe;wBA4NR,OAAO,WACzB,QAAQ,CAAC,CAAC,WACV,MAAM,GAAG,SAAS,SACpB,CAAC,SACD,QAAQ;2BAhJa,OAAO,OAAO,MAAM,GAAG,SAAS,GAAG,MAAM,aAAa,MAAM,GAAG,SAAS,WAAW,MAAM,GAAG,SAAS,mBAAmB,MAAM,GAAG,SAAS,aAAa,QAAQ,KAAI,QAAQ;uBAtC/K,MAAM,QAAQ,QAAQ,KAAI,QAAQ,EAAE;gCAW3B,MAAM,QAAQ,QAAQ,KAAI,cAAc,EAAE;2CAO/B,MAAM,QAAQ,QAAQ,KAAI,MAAM,cAAc,GAAG,QAAQ,CAAC;0BAjD3E,MAAM,QAAQ,MAAM;EAyOlD"}