flowquery 1.0.63 → 1.0.65

package/dist/parsing/parser_state.js

@@ -4,9 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const context_1 = __importDefault(require("./context"));
+const expression_1 = __importDefault(require("./expressions/expression"));
+/**
+ * Mutable parser state shared across operation parsers.
+ *
+ * Two scope concepts are tracked:
+ *
+ * - `variables` is the *current* scope.  It is updated in place as the
+ *   parser walks forward (MATCH binds nodes/relationships, UNWIND binds
+ *   its alias, RETURN/WITH register projection aliases, etc.).
+ * - `inputScope` is an optional snapshot of `variables` taken at the
+ *   start of a RETURN/WITH clause, *before* its projection aliases are
+ *   registered.  It is consulted by `resolve` so that trailing modifiers
+ *   attached to that clause (ORDER BY / WHERE / LIMIT) can still see the
+ *   pre-projection bindings — making references such as
+ *   `ORDER BY peer.name` after `RETURN peer.name AS peer` resolve to the
+ *   matched node rather than the projected scalar.
+ */
 class ParserState {
     constructor() {
         this._variables = new Map();
+        this._variableStack = [];
+        this._inputScope = null;
         this._context = new context_1.default();
         this._returns = 0;
         this._inVirtualDefinition = false;
@@ -14,6 +33,89 @@ class ParserState {
     get variables() {
         return this._variables;
     }
+    /**
+     * Save the current variable scope onto a stack and start a child
+     * scope that inherits the outer bindings.  Mutations made in the
+     * child scope (typically registering a single block-local name) do
+     * not leak back to the outer scope when `popVariableScope` is
+     * called.  Used for syntactic blocks that introduce their own
+     * binding — list comprehensions, predicate-function bodies, etc.
+     */
+    pushVariableScope() {
+        this._variableStack.push(this._variables);
+        this._variables = new Map(this._variables);
+    }
+    /**
+     * Restore the variable scope previously pushed by
+     * `pushVariableScope`.
+     */
+    popVariableScope() {
+        const previous = this._variableStack.pop();
+        if (previous === undefined) {
+            throw new Error("popVariableScope without matching pushVariableScope");
+        }
+        this._variables = previous;
+    }
+    /**
+     * Seed the current variable scope with the bindings of another
+     * parser state.  Used when entering a subquery expression: the
+     * subquery gets its own fresh state (with independent returns
+     * counter, aggregate context, input-scope snapshot, etc.) but
+     * still needs to see the outer query's variable bindings.
+     */
+    inheritVariablesFrom(other) {
+        for (const [k, v] of other._variables) {
+            this._variables.set(k, v);
+        }
+    }
+    get inputScope() {
+        return this._inputScope;
+    }
+    /**
+     * Capture the current variable scope as the clause input scope.
+     *
+     * Called by RETURN/WITH parsers immediately before their projection
+     * expressions are registered, so that `inputScope` reflects what
+     * was visible *before* the projections introduced any aliases.
+     */
+    takeInputScopeSnapshot() {
+        this._inputScope = new Map(this._variables);
+    }
+    /**
+     * Drop the clause input snapshot.  Called once a clause's trailing
+     * modifiers (ORDER BY / WHERE / LIMIT) have been parsed.
+     */
+    clearInputScope() {
+        this._inputScope = null;
+    }
+    /**
+     * Resolve an identifier reference during expression parsing.
+     *
+     * The current (output) scope wins by default — this is what makes
+     * post-aggregation references such as `WHERE i = 1` after
+     * `RETURN i, sum(j) AS sum` see the grouped value through the
+     * projection's override mechanism.
+     *
+     * When the reference is followed by a property or index access
+     * (`propertyAccess` is true) and an input-scope snapshot is active,
+     * the input binding is preferred whenever the current binding is a
+     * projection alias (Expression) while the input bound the same name
+     * to a graph entity (Node / Relationship / Pattern / Unwind / Load —
+     * anything that is not itself an Expression).  This makes
+     * `ORDER BY peer.name` after `RETURN peer.name AS peer` reach the
+     * matched node rather than crashing on subscripting the projected
+     * string.
+     */
+    resolve(identifier, propertyAccess = false) {
+        const current = this._variables.get(identifier);
+        if (propertyAccess && this._inputScope !== null && current instanceof expression_1.default) {
+            const inherited = this._inputScope.get(identifier);
+            if (inherited !== undefined && !(inherited instanceof expression_1.default)) {
+                return inherited;
+            }
+        }
+        return current;
+    }
     get context() {
         return this._context;
     }

package/dist/parsing/parser_state.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser_state.js","sourceRoot":"","sources":["../../src/parsing/parser_state.ts"],"names":[],"mappings":";;;;;AACA,wDAAgC;AAEhC,MAAM,WAAW;IAAjB;QACY,eAAU,GAAyB,IAAI,GAAG,EAAE,CAAC;QAC7C,aAAQ,GAAY,IAAI,iBAAO,EAAE,CAAC;QAClC,aAAQ,GAAW,CAAC,CAAC;QACrB,yBAAoB,GAAY,KAAK,CAAC;IAsBlD,CAAC;IApBG,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACM,gBAAgB;QACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC;IACD,IAAW,mBAAmB;QAC1B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;IACD,IAAW,mBAAmB,CAAC,KAAc;QACzC,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;IACtC,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC"}
+{"version":3,"file":"parser_state.js","sourceRoot":"","sources":["../../src/parsing/parser_state.ts"],"names":[],"mappings":";;;;;AACA,wDAAgC;AAChC,0EAAkD;AAElD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,WAAW;IAAjB;QACY,eAAU,GAAyB,IAAI,GAAG,EAAE,CAAC;QAC7C,mBAAc,GAA2B,EAAE,CAAC;QAC5C,gBAAW,GAAgC,IAAI,CAAC;QAChD,aAAQ,GAAY,IAAI,iBAAO,EAAE,CAAC;QAClC,aAAQ,GAAW,CAAC,CAAC;QACrB,yBAAoB,GAAY,KAAK,CAAC;IAgHlD,CAAC;IA9GG,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED;;;;;;;OAOG;IACI,iBAAiB;QACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACI,gBAAgB;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC;QAC3C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;IAC/B,CAAC;IAED;;;;;;OAMG;IACI,oBAAoB,CAAC,KAAkB;QAC1C,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9B,CAAC;IACL,CAAC;IAED,IAAW,UAAU;QACjB,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED;;;;;;OAMG;IACI,sBAAsB;QACzB,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IACI,eAAe;QAClB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;;;;;;OAiBG;IACI,OAAO,CAAC,UAAkB,EAAE,iBAA0B,KAAK;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,cAAc,IAAI,IAAI,CAAC,WAAW,KAAK,IAAI,IAAI,OAAO,YAAY,oBAAU,EAAE,CAAC;YAC/E,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACnD,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,YAAY,oBAAU,CAAC,EAAE,CAAC;gBAChE,OAAO,SAAS,CAAC;YACrB,CAAC;QACL,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IACM,gBAAgB;QACnB,IAAI,CAAC,QAAQ,EAAE,CAAC;IACpB,CAAC;IACD,IAAW,mBAAmB;QAC1B,OAAO,IAAI,CAAC,oBAAoB,CAAC;IACrC,CAAC;IACD,IAAW,mBAAmB,CAAC,KAAc;QACzC,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;IACtC,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flowquery",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "description": "A declarative query language for data processing pipelines.",
   "main": "dist/index.node.js",
   "types": "dist/index.node.d.ts",