astronomical 1.0.0 → 1.0.1

package/lib/cjs/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[];
@@ -24,5 +24,40 @@ export declare function multiQuery<T extends Record<string, string>>(code: strin
     __AST?: ASTNode;
 };
 export declare function parseSource(source: string): 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/cjs/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/cjs/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/cjs/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,cAAe,OAAO,KAAI,SAAS,IAAI,OAEzD,CAAA;AAED,eAAO,MAAM,UAAU,cAAe,OAAO,KAAI,SAAS,IAAI,QAE7D,CAAA;AAED,eAAO,MAAM,SAAS,cAAe,OAAO,KAAI,SAAS,IAAI,MAAM,CAAC,OAEnE,CAAA;AAED,eAAO,MAAM,WAAW,UAAW,OAAO,KAAI,KAAK,IAAI,cAEtD,CAAA;AAED,eAAO,MAAM,kBAAkB,UAAW,OAAO,KAAI,KAAK,IAAI,MAAM,CAAC,gBAEpE,CAAA;AAED,eAAO,MAAM,sBAAsB,SAAU,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,oBAEzE,CAAA;AAED,eAAO,MAAM,kBAAkB,SAAU,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,gBAErE,CAAA;AAED,eAAO,MAAM,YAAY,SAAU,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,UAE/D,CAAA;AAED,eAAO,MAAM,qBAAqB,SAAU,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,mBAExE,CAAA;AACD,eAAO,MAAM,oBAAoB,SAAU,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,kBAEvE,CAAA;AAED,eAAO,MAAM,oBAAoB,SAAU,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,kBAEvE,CAAA;AACD,eAAO,MAAM,qBAAqB,SAAU,MAAM,CAAC,IAAI,KAAG,IAAI,IAAI,MAAM,CAAC,mBAExE,CAAA;AACD,eAAO,MAAM,SAAS,SAAU,MAAM,CAAC,IAAI,cAAc,MAAM,CAAC,IAAI,mBAAmB,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/cjs/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/lib/esm/index.mjs

@@ -1,19 +1,21 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSource = exports.multiQuery = exports.query = exports.isAvailableFunction = exports.functions = void 0;
-const traverse_1 = __importDefault(require("./traverse"));
+exports.functions = void 0;
+exports.isAvailableFunction = isAvailableFunction;
+exports.query = query;
+exports.multiQuery = multiQuery;
+exports.parseSource = parseSource;
+exports.default = createTraverser;
 const parseQuery_1 = require("./parseQuery");
 const meriyah_1 = require("meriyah");
 const nodeutils_1 = require("./nodeutils");
+const utils_1 = require("./utils");
 const debugLogEnabled = false;
 const log = {
-    debug: (...args) => {
+    debug: debugLogEnabled ? (...args) => {
         if (debugLogEnabled)
-            console.debug(...args.map(x => typeof (x) == "object" && x != null && "valueOf" in x ? x.valueOf() : x));
-    }
+            console.debug(...args);
+    } : () => { }
 };
 exports.functions = {
     "join": {
@@ -59,12 +61,13 @@ exports.functions = {
         }
     }
 };
-const functionNames = Object.keys(exports.functions);
+const functionNames = new Set(Object.keys(exports.functions));
 function isAvailableFunction(name) {
-    return functionNames.includes(name);
+    return functionNames.has(name);
 }
-exports.isAvailableFunction = isAvailableFunction;
 function breadCrumb(path) {
+    if (!debugLogEnabled)
+        return "";
     return {
         valueOf() {
             if (path.parentPath == undefined)
@@ -74,7 +77,7 @@ function breadCrumb(path) {
     };
 }
 function createQuerier() {
-    const traverser = (0, traverse_1.default)();
+    const traverser = createTraverser();
     const { getChildren, getPrimitiveChildren, getPrimitiveChildrenOrNodePaths, getBinding, createNodePath, traverse } = traverser;
     function createFilter(filter, filterResult) {
         if (filter.type == "and" || filter.type == "or" || filter.type == "equals") {
@@ -148,7 +151,14 @@ function createQuerier() {
         if (fnode.node.filter) {
             const filter = createFilter(fnode.node.filter, []);
             const filteredResult = [];
-            state.filters[state.depth].push({ filter: filter, qNode: fnode.node, node: path.node, result: filteredResult });
+            const f = { filter: filter, qNode: fnode.node, node: path.node, result: filteredResult };
+            state.filters[state.depth].push(f);
+            let fmap = state.filtersMap[state.depth].get(fnode.node);
+            if (!fmap) {
+                fmap = [];
+                state.filtersMap[state.depth].set(fnode.node, fmap);
+            }
+            fmap.push(f);
             addFilterChildrenToState(filter, state);
             const child = fnode.node.child;
             if (child) {
@@ -207,25 +217,31 @@ function createQuerier() {
         if ("type" in filter) {
             if (filter.type == "and") {
                 const left = evaluateFilter(filter.left, path);
-                if (left.length == 0)
+                if (left.length == 0) {
                     return [];
-                return evaluateFilter(filter.right, path);
+                }
+                const r = evaluateFilter(filter.right, path);
+                return r;
             }
             if (filter.type == "or") {
                 const left = evaluateFilter(filter.left, path);
-                if (left.length > 0)
+                if (left.length > 0) {
                     return left;
-                return evaluateFilter(filter.right, path);
+                }
+                const r = evaluateFilter(filter.right, path);
+                return r;
             }
             if (filter.type == "equals") {
                 const left = evaluateFilter(filter.left, path);
                 const right = evaluateFilter(filter.right, path);
-                return left.filter(x => right.includes(x));
+                const r = left.filter(x => right.includes(x));
+                return r;
             }
             throw new Error("Unknown filter type: " + filter.type);
         }
         if (filter.node.type == "parent") {
-            return resolveFilterWithParent(filter.node, path);
+            const r = resolveFilterWithParent(filter.node, path);
+            return r;
         }
         return filter.result;
     }
@@ -261,6 +277,7 @@ function createQuerier() {
         return value != undefined && value != null;
     }
     let subQueryCounter = 0;
+    const memo = new Map();
     function resolveDirectly(node, path) {
         let startNode = node;
         const startPath = path;
@@ -294,19 +311,47 @@ function createQuerier() {
             startNode = startNode.child;
         }
         //log.debug("DIRECT TRAV RESOLVE", startNode, paths.map(p => breadCrumb(p)));
-        const result = paths.filter(nodeutils_1.isNodePath).flatMap(path => {
-            const subQueryKey = "subquery-" + subQueryCounter++;
-            return travHandle({ [subQueryKey]: startNode }, path)[subQueryKey];
-        });
+        const result = [];
+        //console.log(paths.length, subQueryCounter);
+        for (const path of paths) {
+            if ((0, nodeutils_1.isNodePath)(path)) {
+                if (memo.has(startNode) && memo.get(startNode).has(path)) {
+                    result.push(...memo.get(startNode).get(path));
+                }
+                else {
+                    const subQueryKey = "subquery-" + subQueryCounter++;
+                    const subQueryResult = travHandle({ [subQueryKey]: startNode }, path)[subQueryKey];
+                    if (!memo.has(startNode))
+                        memo.set(startNode, new Map());
+                    memo.get(startNode)?.set(path, subQueryResult);
+                    result.push(...subQueryResult);
+                }
+            }
+        }
         log.debug("DIRECT TRAV RESOLVE RESULT", result);
         return result;
     }
     function addResultIfTokenMatch(fnode, path, state) {
-        const filters = state.filters[state.depth].filter(f => f.node == path.node && f.qNode == fnode.node);
-        const matchingFilters = filters.filter(f => evaluateFilter(f.filter, path).length > 0);
-        log.debug("RESULT MATCH", fnode.node.value, breadCrumb(path), filters.length, matchingFilters.length);
-        if (filters.length > 0 && matchingFilters.length == 0)
-            return;
+        const matchingFilters = [];
+        //console.log("FILTERS", state.filters[state.depth].length, state.filtersMap[state.depth].get(fnode.node)?.length);
+        const filters = [];
+        const nodeFilters = state.filtersMap[state.depth].get(fnode.node);
+        if (nodeFilters) {
+            for (const f of nodeFilters) {
+                if (f.qNode !== fnode.node)
+                    continue;
+                if (f.node !== path.node)
+                    continue;
+                filters.push(f);
+            }
+            for (const f of filters) {
+                if (evaluateFilter(f.filter, path).length > 0) {
+                    matchingFilters.push(f);
+                }
+            }
+            if (filters.length > 0 && matchingFilters.length == 0)
+                return;
+        }
         if (fnode.node.resolve) {
             const binding = resolveBinding(path);
             const resolved = binding ? getChildren("init", binding)[0] : undefined;
@@ -366,36 +411,51 @@ function createQuerier() {
             child: [[], []],
             descendant: [[], []],
             filters: [[], []],
+            filtersMap: [new Map(), new Map()],
             matches: [[]],
             functionCalls: [[]]
         };
-        Object.entries(queries).forEach(([name, node]) => {
+        for (const [name, node] of Object.entries(queries)) {
             createFNodeAndAddToState(node, results[name], state);
-        });
+        }
         state.child[state.depth + 1].forEach(fnode => addPrimitiveAttributeIfMatch(fnode, root));
         state.descendant.slice(0, state.depth + 1).forEach(fnodes => fnodes.forEach(fnode => addPrimitiveAttributeIfMatch(fnode, root)));
         traverse(root.node, {
             enter(path, state) {
-                log.debug("ENTER", breadCrumb(path));
+                //log.debug("ENTER", breadCrumb(path));
                 state.depth++;
                 state.child.push([]);
                 state.descendant.push([]);
                 state.filters.push([]);
+                state.filtersMap.push(new Map());
                 state.matches.push([]);
                 state.functionCalls.push([]);
-                state.child[state.depth].forEach(fnode => addIfTokenMatch(fnode, path, state));
-                state.descendant.slice(0, state.depth + 1).forEach(fnodes => fnodes.forEach(fnode => addIfTokenMatch(fnode, path, state)));
+                for (const fnode of state.child[state.depth]) {
+                    addIfTokenMatch(fnode, path, state);
+                }
+                for (const fnodes of state.descendant.slice(0, state.depth + 1)) {
+                    for (const fnode of fnodes) {
+                        addIfTokenMatch(fnode, path, state);
+                    }
+                }
             },
             exit(path, state) {
                 log.debug("EXIT", breadCrumb(path));
                 // Check for attributes as not all attributes are visited
                 state.child[state.depth + 1].forEach(fnode => addPrimitiveAttributeIfMatch(fnode, path));
-                state.descendant.forEach(fnodes => fnodes.forEach(fnode => addPrimitiveAttributeIfMatch(fnode, path)));
-                state.matches[state.depth].forEach(([fNode, path]) => addResultIfTokenMatch(fNode, path, state));
+                for (const fnodes of state.descendant) {
+                    for (const fnode of fnodes) {
+                        addPrimitiveAttributeIfMatch(fnode, path);
+                    }
+                }
+                for (const [fNode, path] of state.matches[state.depth]) {
+                    addResultIfTokenMatch(fNode, path, state);
+                }
                 state.depth--;
                 state.child.pop();
                 state.descendant.pop();
                 state.filters.pop();
+                state.filtersMap.pop();
                 state.matches.pop();
                 state.functionCalls.pop();
             }
@@ -404,7 +464,8 @@ function createQuerier() {
     }
     function beginHandle(queries, path) {
         const rootPath = createNodePath(path, undefined, undefined, undefined, undefined);
-        return travHandle(queries, rootPath);
+        const r = travHandle(queries, rootPath);
+        return r;
     }
     return {
         beginHandle
@@ -420,7 +481,6 @@ function query(code, query, returnAST) {
     }
     return result[defaultKey];
 }
-exports.query = query;
 function multiQuery(code, namedQueries, returnAST) {
     const start = Date.now();
     const ast = typeof code == "string" ? parseSource(code) : code;
@@ -435,13 +495,243 @@ function multiQuery(code, namedQueries, returnAST) {
     }
     return result;
 }
-exports.multiQuery = multiQuery;
 function parseSource(source) {
     try {
-        return (0, meriyah_1.parseScript)(source, { module: true, next: true, specDeviation: true });
+        return (0, meriyah_1.parseScript)(source, { module: true, next: true });
     }
     catch (e) {
-        return (0, meriyah_1.parseScript)(source, { module: false, next: true, specDeviation: true });
+        return (0, meriyah_1.parseScript)(source, { module: false, next: true });
     }
 }
-exports.parseSource = parseSource;
+const scopes = new Map();
+function createTraverser() {
+    let scopeIdCounter = 0;
+    let removedScopes = 0;
+    const nodePathsCreated = {};
+    function createScope(parentScopeId) {
+        const id = scopeIdCounter++;
+        if (parentScopeId != undefined) {
+            scopes.set(id, parentScopeId ?? -1);
+        }
+        return id;
+    }
+    function getBinding(scopeId, name) {
+        let currentScope = scopes.get(scopeId);
+        while (currentScope !== undefined) {
+            if (typeof currentScope !== "number") {
+                // Full scope: Check for binding
+                if (currentScope.bindings[name]) {
+                    return currentScope.bindings[name];
+                }
+                // Move to parent scope
+                if (currentScope.parentScopeId === -1)
+                    break; // No parent scope
+                currentScope = scopes.get(currentScope.parentScopeId);
+            }
+            else {
+                // Lightweight scope: Retrieve parent scope
+                if (currentScope === -1 || currentScope == undefined)
+                    break; // No parent scope
+                currentScope = scopes.get(currentScope);
+            }
+        }
+        return undefined; // Binding not found
+    }
+    function setBinding(scopeId, name, binding) {
+        let scope = scopes.get(scopeId);
+        if (typeof scope === "number" || scope === undefined) {
+            // Upgrade the lightweight scope to a full scope
+            scope = { bindings: {}, id: scopeId, parentScopeId: scope };
+            scopes.set(scopeId, scope);
+        }
+        if (scope && typeof scope !== "number") {
+            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);
+            for (const [i, child] of children.entries()) {
+                if (!(0, nodeutils_1.isNode)(child))
+                    continue;
+                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.get(childScopeId) == "number") { // Scope has not been populated
+            scopes.set(childScopeId, scopes.get(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 = [];
+            for (const [i, child] of children.entries()) {
+                if ((0, nodeutils_1.isNode)(child)) {
+                    const childPath = createNodePath(child, Array.isArray(childNodes) ? i : key, key, nodePath.scopeId, nodePath.functionScopeId, nodePath);
+                    nodePaths.push(childPath);
+                }
+            }
+            for (const childPath of nodePaths) {
+                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
+    };
+}