@quereus/quereus 3.1.2 → 3.2.1

package/dist/src/planner/analysis/attribute-provenance.js

@@ -0,0 +1,81 @@
+/**
+ * Attribute provenance: a derived map from attribute id to the relational node
+ * that *originated* (minted) it.
+ *
+ * Attribute ids have two distinct lifecycle operations that `getAttributes()`
+ * smears together:
+ *
+ *  - **Origination** — a node mints a fresh id via `PlanNode.nextAttrId()`
+ *    (scans, computed projections, aggregate outputs, VALUES rows).
+ *  - **Forwarding** — a node re-publishes an id one of its children already
+ *    produced (SetOperation, Join concatenation, EagerPrefetch, AsyncGather,
+ *    simple column-ref projections, ...).
+ *
+ * The real invariant of the attribute model is "each id is *originated* exactly
+ * once", NOT "each id appears at most once in the tree" — forwarding the same id
+ * up through N ancestors is the whole point of stable ids.
+ *
+ * Origination is derivable structurally with no per-node declaration: an id is
+ * originated at the deepest relational node that outputs it and whose direct
+ * relational children do **not**. A single post-order walk over the existing
+ * `getAttributes()` surface yields the complete provenance map.
+ */
+import { isRelationalNode } from '../nodes/plan-node.js';
+import { QuereusError } from '../../common/errors.js';
+import { StatusCode } from '../../common/types.js';
+/**
+ * Compute the attribute-provenance surface for a plan tree in one post-order
+ * walk. An attribute id is *originated* at the deepest relational node that
+ * outputs it and whose direct relational children do not; ancestors that
+ * re-publish the id are forwards, not new origins.
+ *
+ * The returned map contains an entry for every id that appears anywhere in the
+ * tree (forwarded ids resolve to their origin), so membership answers "is this
+ * id in scope?" exactly as the old global-set check did.
+ *
+ * @throws QuereusError(INTERNAL) when two distinct relational nodes originate
+ *   the same id (the genuine-bug case the old validator caught) or when a single
+ *   node lists the same id more than once. Forwarding never throws.
+ */
+export function computeAttributeProvenance(root) {
+    const provenance = new Map();
+    const visited = new Set();
+    const walk = (node, path) => {
+        // Dedupe by node identity: plan trees are DAGs (shared CTE/common
+        // subexpression instances). Visiting a shared instance once keeps the
+        // walk linear and avoids treating its single origin as a collision.
+        if (visited.has(node))
+            return;
+        visited.add(node);
+        const nodeChain = [...path, node.nodeType];
+        // Post-order: process children before deciding what this node originates.
+        for (const child of node.getChildren()) {
+            walk(child, nodeChain);
+        }
+        if (!isRelationalNode(node))
+            return;
+        // Ids output by direct relational children are forwarded, not originated here.
+        const childIds = new Set();
+        for (const rel of node.getRelations()) {
+            for (const attr of rel.getAttributes()) {
+                childIds.add(attr.id);
+            }
+        }
+        const nodePath = nodeChain.join(' > ');
+        for (const attr of node.getAttributes()) {
+            if (childIds.has(attr.id))
+                continue; // forwarded — not an origin
+            const existing = provenance.get(attr.id);
+            if (existing) {
+                if (existing.originNode === node) {
+                    throw new QuereusError(`Duplicate attribute ID ${attr.id} within the output of ${nodePath}`, StatusCode.INTERNAL);
+                }
+                throw new QuereusError(`Attribute ID ${attr.id} originated at two distinct nodes (${existing.path} and ${nodePath})`, StatusCode.INTERNAL);
+            }
+            provenance.set(attr.id, { originNode: node, path: nodePath });
+        }
+    };
+    walk(root, []);
+    return provenance;
+}
+//# sourceMappingURL=attribute-provenance.js.map

package/dist/src/planner/analysis/attribute-provenance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"attribute-provenance.js","sourceRoot":"","sources":["../../../../src/planner/analysis/attribute-provenance.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,gBAAgB,EAA0C,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,0BAA0B,CAAC,IAAc;IACxD,MAAM,UAAU,GAAG,IAAI,GAAG,EAA2B,CAAC;IACtD,MAAM,OAAO,GAAG,IAAI,GAAG,EAAY,CAAC;IAEpC,MAAM,IAAI,GAAG,CAAC,IAAc,EAAE,IAAuB,EAAQ,EAAE;QAC9D,kEAAkE;QAClE,sEAAsE;QACtE,oEAAoE;QACpE,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO;QAC9B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAElB,MAAM,SAAS,GAAG,CAAC,GAAG,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE3C,0EAA0E;QAC1E,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxC,IAAI,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAAE,OAAO;QAEpC,+EAA+E;QAC/E,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QACnC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YACvC,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC;gBACxC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;QACF,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzC,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAAE,SAAS,CAAC,4BAA4B;YAEjE,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACzC,IAAI,QAAQ,EAAE,CAAC;gBACd,IAAI,QAAQ,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;oBAClC,MAAM,IAAI,YAAY,CACrB,0BAA0B,IAAI,CAAC,EAAE,yBAAyB,QAAQ,EAAE,EACpE,UAAU,CAAC,QAAQ,CACnB,CAAC;gBACH,CAAC;gBACD,MAAM,IAAI,YAAY,CACrB,gBAAgB,IAAI,CAAC,EAAE,sCAAsC,QAAQ,CAAC,IAAI,QAAQ,QAAQ,GAAG,EAC7F,UAAU,CAAC,QAAQ,CACnB,CAAC;YACH,CAAC;YAED,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC/D,CAAC;IACF,CAAC,CAAC;IAEF,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACf,OAAO,UAAU,CAAC;AACnB,CAAC"}

package/dist/src/planner/analysis/const-evaluator.js

@@ -9,7 +9,7 @@ import { StatusCode } from '../../common/types.js';
 import { emitPlanNode } from '../../runtime/emitters.js';
 import { EmissionContext } from '../../runtime/emission-context.js';
 import { Scheduler } from '../../runtime/scheduler.js';
-import { RowContextMap } from '../../runtime/context-helpers.js';
+import { createStrictRowContextMap, wrapTableContextsStrict } from '../../runtime/strict-fork.js';
 import { isAsyncIterable } from '../../runtime/utils.js';
 import { createLogger } from '../../common/logger.js';
 import { TableLiteralNode } from '../nodes/values-node.js';
@@ -33,8 +33,8 @@ export function createRuntimeExpressionEvaluator(db) {
                 db,
                 stmt: undefined,
                 params: {}, // No parameters needed for constants
-                context: new RowContextMap(), // No row context needed
-                tableContexts: new Map(), // No table contexts needed for constants
+                context: createStrictRowContextMap(), // No row context needed
+                tableContexts: wrapTableContextsStrict(new Map()), // No table contexts needed for constants
                 enableMetrics: false
             };
             // Execute and get the result
@@ -136,8 +136,8 @@ export function createRuntimeRelationalEvaluator(db) {
                     db,
                     stmt: undefined,
                     params: {},
-                    context: new RowContextMap(),
-                    tableContexts: new Map(),
+                    context: createStrictRowContextMap(),
+                    tableContexts: wrapTableContextsStrict(new Map()),
                     enableMetrics: false
                 };
                 return scheduler.run(runtimeCtx);

package/dist/src/planner/analysis/const-evaluator.js.map

@@ -1 +1 @@
-{"version":3,"file":"const-evaluator.js","sourceRoot":"","sources":["../../../../src/planner/analysis/const-evaluator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,MAAM,GAAG,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,UAAU,gCAAgC,CAAC,EAAY;IAC5D,OAAO,SAAS,kBAAkB,CAAC,IAAc;QAChD,GAAG,CAAC,oCAAoC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzD,IAAI,CAAC;YACJ,oCAAoC;YACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;YAE5C,wCAAwC;YACxC,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEpD,gDAAgD;YAChD,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;YAE7C,gDAAgD;YAChD,uEAAuE;YACvE,MAAM,UAAU,GAAmB;gBAClC,EAAE;gBACF,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,EAAE,EAAE,qCAAqC;gBACjD,OAAO,EAAE,IAAI,aAAa,EAAE,EAAE,wBAAwB;gBACtD,aAAa,EAAE,IAAI,GAAG,EAAE,EAAE,yCAAyC;gBACnE,aAAa,EAAE,KAAK;aACpB,CAAC;YAEF,6BAA6B;YAC7B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEzC,uCAAuC;YACvC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,IAAI,YAAY,CAAC,0CAA0C,CAAC,CAAC;YACpE,CAAC;YAED,GAAG,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;YAC3C,OAAO,MAAmC,CAAC;QAE5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,GAAG,CAAC,sCAAsC,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAClE,MAAM,IAAI,YAAY,CAAC,8BAA8B,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACtH,CAAC;IACF,CAAC,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,0BAA0B;IAIF;IAHrB,MAAM,GAAiB,IAAI,CAAC;IAC5B,aAAa,GAA0B,IAAI,CAAC;IAEpD,YAA6B,YAA+B;QAA/B,iBAAY,GAAZ,YAAY,CAAmB;IAAG,CAAC;IAEhE,CAAC,MAAM,CAAC,aAAa,CAAC;QACrB,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;IACnC,CAAC;IAEO,mBAAmB;QAC1B,8DAA8D;QAC9D,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3C,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC;QACnC,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,OAAO;YACN,IAAI,EAAE,KAAK,IAAI,EAAE;gBAChB,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC;gBAC3B,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;oBACzB,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;gBAC9C,CAAC;gBACD,OAAO,EAAE,KAAK,EAAE,SAA2B,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAC3D,CAAC;SACD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,aAAa;QAC1B,MAAM,IAAI,GAAU,EAAE,CAAC;QACvB,IAAI,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAEjC,qBAAqB;QACrB,IAAI,MAAM,YAAY,OAAO,EAAE,CAAC;YAC/B,MAAM,GAAG,MAAM,MAAM,CAAC;QACvB,CAAC;QAED,yCAAyC;QACzC,IAAI,eAAe,CAAM,MAAM,CAAC,EAAE,CAAC;YAClC,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;gBAChC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAChB,CAAC;QACF,CAAC;aAAM,CAAC;YACP,MAAM,IAAI,YAAY,CAAC,yDAAyD,CAAC,CAAC;QACnF,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,OAAO,IAAI,CAAC;IACb,CAAC;CACD;AAED,SAAS,oBAAoB,CAAC,IAAW;IACxC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO;QACN,IAAI,EAAE,KAAK,IAAI,EAAE;YAChB,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;gBACzB,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YAC9C,CAAC;YACD,OAAO,EAAE,KAAK,EAAE,SAA2B,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAC3D,CAAC;KACD,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gCAAgC,CAAC,EAAY;IAC5D,OAAO,SAAS,gBAAgB,CAAC,IAAc;QAC9C,GAAG,CAAC,oCAAoC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzD,IAAI,CAAC;YACJ,qDAAqD;YACrD,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YACpD,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;YAE7C,6CAA6C;YAC7C,MAAM,QAAQ,GAAG,IAAI,0BAA0B,CAAC,GAAG,EAAE;gBACpD,MAAM,UAAU,GAAmB;oBAClC,EAAE;oBACF,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,IAAI,aAAa,EAAE;oBAC5B,aAAa,EAAE,IAAI,GAAG,EAAE;oBACxB,aAAa,EAAE,KAAK;iBACpB,CAAC;gBACF,OAAO,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAClC,CAAC,CAAC,CAAC;YAEH,mDAAmD;YACnD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAkB,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAoF,CAAC;YACrG,MAAM,aAAa,GAAgB,CAAC,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;YAEhE,MAAM,WAAW,GAAG,IAAI,gBAAgB,CACvC,IAAI,CAAC,KAAK,EACV,QAAQ,EACR,OAAO,CAAC,aAAa,EACrB,OAAO,EACP,aAAa,CACb,CAAC;YAEF,GAAG,CAAC,mDAAmD,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAClE,OAAO,WAAW,CAAC;QAEpB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,GAAG,CAAC,2CAA2C,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACvE,MAAM,IAAI,YAAY,CAAC,8BAA8B,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACtH,CAAC;IACF,CAAC,CAAC;AACH,CAAC"}
+{"version":3,"file":"const-evaluator.js","sourceRoot":"","sources":["../../../../src/planner/analysis/const-evaluator.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/building/select-window.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select-window.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAkB,MAAM,uBAAuB,CAAC;AAChF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAMrE,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAGhD;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,eAAe,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACnE,aAAa,EAAE,eAAe,EAC9B,IAAI,EAAE,GAAG,CAAC,UAAU,GAClB,kBAAkB,CAqEpB"}
+{"version":3,"file":"select-window.d.ts","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAY,kBAAkB,EAAkB,MAAM,uBAAuB,CAAC;AAC1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAMrE,OAAO,KAAK,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAGhD;;GAEG;AACH,wBAAgB,gBAAgB,CAC/B,KAAK,EAAE,kBAAkB,EACzB,eAAe,EAAE;IAAE,IAAI,EAAE,sBAAsB,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACnE,aAAa,EAAE,eAAe,EAC9B,IAAI,EAAE,GAAG,CAAC,UAAU,GAClB,kBAAkB,CAqEpB"}

package/dist/src/planner/building/select-window.js

@@ -105,16 +105,17 @@ function buildWindowProjections(stmt, windowNode, selectContext, windowFunctions
             // Build each column expression once and reuse for both classification and projection
             const builtExpr = buildExpression(selectContext, column.expr, true);
             if (isWindowExpression(builtExpr)) {
-                // For window functions, use ArrayIndexNode to access the value by direct index
-                const windowColumnIndex = findWindowFunctionIndex(builtExpr, windowFunctions, sourceColumnCount);
-                if (windowColumnIndex >= 0) {
-                    const windowColumnType = windowType.columns[windowColumnIndex].type;
-                    const arrayIndexNode = new ArrayIndexNode(selectContext.scope, windowColumnIndex, windowColumnType);
-                    windowProjections.push({
-                        node: arrayIndexNode,
-                        alias: column.alias
-                    });
-                }
+                // Rewrite each window-function descendant into an ArrayIndexNode pointing
+                // at its computed window-output column, preserving any surrounding
+                // arithmetic / scalar wrapper (e.g. `1000 - row_number() over (...)`).
+                // The top-level case (`row_number() over (...) as rn`) falls out naturally:
+                // the whole tree is the window node, so the rewrite returns a bare
+                // ArrayIndexNode, matching the prior behavior.
+                const rewritten = rewriteWindowFunctions(builtExpr, windowFunctions, sourceColumnCount, windowType, selectContext.scope);
+                windowProjections.push({
+                    node: rewritten,
+                    alias: column.alias
+                });
             }
             else {
                 // For regular columns, use the already-built expression
@@ -128,21 +129,53 @@ function buildWindowProjections(stmt, windowNode, selectContext, windowFunctions
     return windowProjections;
 }
 /**
- * Finds the index of a window function in the window output
+ * Recursively rewrites every WindowFunctionCallNode descendant of a scalar
+ * expression into an ArrayIndexNode referencing that function's window-output
+ * column, leaving the surrounding expression structure intact.
+ *
+ * Mirrors the aggregate path (collectInnerAggregates): the whole outer
+ * expression is preserved and the inner window results are substituted back in.
+ * Does NOT recurse into a window function's own arguments — its result is a
+ * single output column already materialized by the WindowNode.
+ */
+function rewriteWindowFunctions(node, windowFunctions, sourceColumnCount, windowType, scope) {
+    if (CapabilityDetectors.isWindowFunction(node)) {
+        const index = findWindowColumnIndex(node, windowFunctions, sourceColumnCount);
+        if (index >= 0) {
+            return new ArrayIndexNode(scope, index, windowType.columns[index].type);
+        }
+        // No match (shouldn't happen for a window node we collected) — leave as-is.
+        return node;
+    }
+    const children = node.getChildren();
+    const newChildren = [];
+    let changed = false;
+    for (const child of children) {
+        // Only scalar children participate in window rewriting; pass others through.
+        if ('expression' in child) {
+            const rewrittenChild = rewriteWindowFunctions(child, windowFunctions, sourceColumnCount, windowType, scope);
+            if (rewrittenChild !== child) {
+                changed = true;
+            }
+            newChildren.push(rewrittenChild);
+        }
+        else {
+            newChildren.push(child);
+        }
+    }
+    return changed ? node.withChildren(newChildren) : node;
+}
+/**
+ * Finds the window-output column index for a single window-function node by
+ * matching it (name + window spec) against the collected window functions.
  */
-function findWindowFunctionIndex(originalExpr, windowFunctions, sourceColumnCount) {
+function findWindowColumnIndex(windowNode, windowFunctions, sourceColumnCount) {
     const matchingWindowFuncIndex = windowFunctions.findIndex(({ func }) => {
-        // Match based on function name, parameters, and window specification
-        if (!CapabilityDetectors.isWindowFunction(originalExpr) ||
-            func.functionName.toLowerCase() !== originalExpr.functionName.toLowerCase()) {
+        // Match based on function name and window specification
+        if (func.functionName.toLowerCase() !== windowNode.functionName.toLowerCase()) {
             return false;
         }
-        // Cast to WindowFunctionCallNode to access expression property
-        const windowFunc = originalExpr;
-        // Also compare window specifications to distinguish between functions with same name
-        const originalWindow = windowFunc.expression.window;
-        const funcWindow = func.expression.window;
-        return compareWindowSpecs(originalWindow, funcWindow);
+        return compareWindowSpecs(windowNode.expression.window, func.expression.window);
     });
     return matchingWindowFuncIndex >= 0 ? sourceColumnCount + matchingWindowFuncIndex : -1;
 }

package/dist/src/planner/building/select-window.js.map

@@ -1 +1 @@
-{"version":3,"file":"select-window.js","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"select-window.js","sourceRoot":"","sources":["../../../../src/planner/building/select-window.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/cache/correlation-detector.d.ts

@@ -8,4 +8,11 @@ import { type RelationalPlanNode } from '../nodes/plan-node.js';
  * that are not defined within its own scope.
  */
 export declare function isCorrelatedSubquery(subqueryNode: RelationalPlanNode): boolean;
+/**
+ * Collect the attribute IDs the subquery references from *outer* scopes (i.e.
+ * not defined within its own subtree). An empty set means the subquery is not
+ * correlated. Used by rules that need to know *which* outer attributes a
+ * correlation depends on, not merely that it is correlated.
+ */
+export declare function collectExternalReferences(subqueryNode: RelationalPlanNode): Set<number>;
 //# sourceMappingURL=correlation-detector.d.ts.map

package/dist/src/planner/cache/correlation-detector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"correlation-detector.d.ts","sourceRoot":"","sources":["../../../../src/planner/cache/correlation-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmC,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIjG;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,kBAAkB,GAAG,OAAO,CAO9E"}
+{"version":3,"file":"correlation-detector.d.ts","sourceRoot":"","sources":["../../../../src/planner/cache/correlation-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAmC,KAAK,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAIjG;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,kBAAkB,GAAG,OAAO,CAK9E;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC,CAMvF"}

package/dist/src/planner/cache/correlation-detector.js

@@ -9,12 +9,24 @@ import { PlanNodeType } from '../nodes/plan-node-type.js';
  * that are not defined within its own scope.
  */
 export function isCorrelatedSubquery(subqueryNode) {
-    // Collect all attributes defined within the subquery
+    // Short-circuit: stop at the first external reference rather than collecting all.
     const definedAttributes = new Set();
     collectDefinedAttributes(subqueryNode, definedAttributes);
-    // Check if any column references use attributes not defined within the subquery
     return hasExternalReferences(subqueryNode, definedAttributes);
 }
+/**
+ * Collect the attribute IDs the subquery references from *outer* scopes (i.e.
+ * not defined within its own subtree). An empty set means the subquery is not
+ * correlated. Used by rules that need to know *which* outer attributes a
+ * correlation depends on, not merely that it is correlated.
+ */
+export function collectExternalReferences(subqueryNode) {
+    const definedAttributes = new Set();
+    collectDefinedAttributes(subqueryNode, definedAttributes);
+    const external = new Set();
+    collectExternalAttributeIds(subqueryNode, definedAttributes, external);
+    return external;
+}
 /**
  * Recursively collect all attributes defined by relational nodes within a subtree
  */
@@ -70,4 +82,24 @@ function hasExternalReferences(node, definedAttributes) {
     }
     return false;
 }
+/**
+ * Like {@link hasExternalReferences}, but accumulates every external attribute
+ * ID into `external` instead of short-circuiting at the first one.
+ */
+function collectExternalAttributeIds(node, definedAttributes, external) {
+    if (node.nodeType === PlanNodeType.ColumnReference) {
+        const colRef = node;
+        if (!definedAttributes.has(colRef.attributeId)) {
+            external.add(colRef.attributeId);
+        }
+    }
+    for (const child of node.getChildren()) {
+        collectExternalAttributeIds(child, definedAttributes, external);
+    }
+    if (isRelationalNode(node)) {
+        for (const relation of node.getRelations()) {
+            collectExternalAttributeIds(relation, definedAttributes, external);
+        }
+    }
+}
 //# sourceMappingURL=correlation-detector.js.map

package/dist/src/planner/cache/correlation-detector.js.map

@@ -1 +1 @@
-{"version":3,"file":"correlation-detector.js","sourceRoot":"","sources":["../../../../src/planner/cache/correlation-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAA0C,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,YAAgC;IACpE,qDAAqD;IACrD,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,wBAAwB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAE1D,gFAAgF;IAChF,OAAO,qBAAqB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/D,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAAC,IAAc,EAAE,iBAA8B;IAC/E,mDAAmD;IACnD,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,YAAY,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC/B,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;IACF,CAAC;IAED,mCAAmC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC9B,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,0CAA0C;IAC1C,IAAI,YAAY,EAAE,CAAC;QAClB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,wBAAwB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;AACF,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,IAAc,EAAE,iBAA8B;IAC5E,sCAAsC;IACtC,IAAI,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,IAA2B,CAAC;QAC3C,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC,CAAC,+BAA+B;QAC7C,CAAC;IACF,CAAC;IAED,qBAAqB;IACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,wCAAwC;IACxC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE,CAAC;gBACxD,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC"}
+{"version":3,"file":"correlation-detector.js","sourceRoot":"","sources":["../../../../src/planner/cache/correlation-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,gBAAgB,EAA0C,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,YAAgC;IACpE,kFAAkF;IAClF,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,wBAAwB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAC1D,OAAO,qBAAqB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;AAC/D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CAAC,YAAgC;IACzE,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC5C,wBAAwB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IACnC,2BAA2B,CAAC,YAAY,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IACvE,OAAO,QAAQ,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB,CAAC,IAAc,EAAE,iBAA8B;IAC/E,mDAAmD;IACnD,MAAM,YAAY,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC5C,IAAI,YAAY,EAAE,CAAC;QAClB,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;YAC/B,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChC,CAAC;IACF,CAAC;IAED,mCAAmC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC9B,wBAAwB,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;IACpD,CAAC;IAED,0CAA0C;IAC1C,IAAI,YAAY,EAAE,CAAC;QAClB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,wBAAwB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;AACF,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,IAAc,EAAE,iBAA8B;IAC5E,sCAAsC;IACtC,IAAI,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,IAA2B,CAAC;QAC3C,6FAA6F;QAC7F,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAChD,OAAO,IAAI,CAAC,CAAC,+BAA+B;QAC7C,CAAC;IACF,CAAC;IAED,qBAAqB;IACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACpC,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE,CAAC;QAC9B,IAAI,qBAAqB,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC;YACrD,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAED,wCAAwC;IACxC,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAClC,IAAI,qBAAqB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,EAAE,CAAC;gBACxD,OAAO,IAAI,CAAC;YACb,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAS,2BAA2B,CACnC,IAAc,EACd,iBAA8B,EAC9B,QAAqB;IAErB,IAAI,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,IAA2B,CAAC;QAC3C,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAChD,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAClC,CAAC;IACF,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACxC,2BAA2B,CAAC,KAAK,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE,CAAC;YAC5C,2BAA2B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,CAAC,CAAC;QACpE,CAAC;IACF,CAAC;AACF,CAAC"}

package/dist/src/planner/nodes/async-gather-node.d.ts

@@ -0,0 +1,169 @@
+import { PlanNode } from './plan-node.js';
+import type { RelationalPlanNode, Attribute, PhysicalProperties } from './plan-node.js';
+import type { RelationType } from '../../common/datatype.js';
+import { PlanNodeType } from './plan-node-type.js';
+import type { Scope } from '../scopes/scope.js';
+/**
+ * How {@link AsyncGatherNode} combines rows from its N independent child relations.
+ *
+ * - `unionAll`: yield every row from every branch in arrival order — multiset
+ *   union (no dedup). All children must have matching column counts.
+ *
+ * - `crossProduct`: drain every branch fully, then yield the full Cartesian
+ *   product. The output attributes are the concatenation of all children's
+ *   attributes. **Materialises every branch in memory before yielding the
+ *   first row** — see emitter docs in `runtime/emit/async-gather.ts`.
+ *
+ * - `zipByKey`: full N-way outer join on the key columns named **per branch** by
+ *   `branchKeyAttrs`. For each distinct key value present in any branch, emit
+ *   exactly one composed row: the K merged key columns once (carrying the
+ *   gather-minted `outputKeyAttrs` ids), then each branch's non-key columns
+ *   (NULL when that branch has no row for that key). Implemented as an **eager
+ *   hash-merge** over a `BTree` keyed by the key tuple — **drains every branch
+ *   in memory before yielding the first row** (see emitter docs). It is *not*
+ *   a chained binary full-outer-join lowering.
+ *
+ *   The gather genuinely **originates** the K merged key columns (their ids,
+ *   `outputKeyAttrs`, appear in no child — "branch0's key, or branch1's key, …,
+ *   whichever row is present") and **forwards** each branch's non-key ids (each
+ *   appears in exactly one child). This is provenance-clean by construction:
+ *   no id is output by two branches, so `validatePhysicalTree` passes.
+ *
+ * The discriminated-union shape is deliberate: future variants (e.g.
+ * `mergeOrdered`) will attach per-combinator config without breaking the
+ * constructor.
+ */
+export type AsyncGatherCombinator = {
+    readonly kind: 'unionAll';
+} | {
+    readonly kind: 'crossProduct';
+} | {
+    readonly kind: 'zipByKey';
+    /**
+     * Per branch b, the attribute IDs of that branch's K key columns, in
+     * key-position order. Distinct per branch (provenance-clean — each branch
+     * originates its own key id). `length === children.length`; every inner
+     * list has the same length K.
+     */
+    readonly branchKeyAttrs: readonly (readonly number[])[];
+    /**
+     * The K output key attribute IDs the gather mints (originates). One per
+     * key position. Pairwise distinct and disjoint from every child's
+     * attribute IDs. Output key columns sit at index 0..K-1, in this order.
+     */
+    readonly outputKeyAttrs: readonly number[];
+};
+/**
+ * Per-branch column-index mapping for a `zipByKey` gather, resolved from the
+ * per-branch {@link AsyncGatherCombinator.branchKeyAttrs} lists against each
+ * child's attribute layout. Consumed by the node's type inference and by the
+ * runtime emitter (via {@link AsyncGatherNode.getZipByKeyIndices}).
+ */
+export interface ZipByKeyIndices {
+    /** Per branch, the column index of each key attribute, in `branchKeyAttrs[b]` order. */
+    readonly branchKeyIndices: readonly (readonly number[])[];
+    /** Per branch, the column indices of non-key columns, in declared order. */
+    readonly branchNonKeyIndices: readonly (readonly number[])[];
+}
+/**
+ * Physical N-ary relational node that drives ≥ 2 independent (uncorrelated)
+ * child relations concurrently via {@link ParallelDriver.drive} and combines
+ * their outputs with the configured {@link AsyncGatherCombinator}.
+ *
+ * Properties:
+ *
+ * - `unionAll`: ordering is dropped (arrival-order interleave is
+ *   non-deterministic); FDs / ECs / constant bindings / domain constraints
+ *   are dropped (same conservatism `SetOperationNode.computePhysical` already
+ *   applies); attribute IDs mirror `children[0]` to preserve downstream
+ *   `ORDER BY` references; `isSet` is `false` (duplicates allowed); per-column
+ *   nullability is the OR across children.
+ *
+ * - `crossProduct`: ordering is dropped; FDs / ECs / bindings / domain
+ *   constraints are the pairwise N-ary fold of the children (the same fold
+ *   `JoinNode(cross)` does, repeated); attribute IDs are the verbatim
+ *   concatenation of children; per-column nullability flows through
+ *   unchanged. Cartesian product order is deterministic-but-unspecified
+ *   (a function of the per-branch arrival order). **Buffers all branches
+ *   before yielding** — not suitable for large branches.
+ *
+ * `concurrencySafe` and `expectedLatencyMs` are NOT propagated by this node:
+ * those fields are not yet defined on {@link PhysicalProperties} (the parallel
+ * track has not landed them). Once a successor ticket (5.5 or later) adds
+ * them, the intended merge is `AND` across children for `concurrencySafe` and
+ * `max` across children for `expectedLatencyMs`; update this node's
+ * `computePhysical` at that time. The fields currently inherited from
+ * `PlanNode.physical`'s default child-merge are `deterministic`,
+ * `idempotent`, and `readonly` (AND across children).
+ */
+export declare class AsyncGatherNode extends PlanNode implements RelationalPlanNode {
+    readonly children: readonly RelationalPlanNode[];
+    readonly combinator: AsyncGatherCombinator;
+    readonly concurrencyCap: number;
+    readonly preserveAttributeIds?: readonly Attribute[] | undefined;
+    readonly nodeType = PlanNodeType.AsyncGather;
+    private attributesCache;
+    private zipIndicesCache;
+    constructor(scope: Scope, children: readonly RelationalPlanNode[], combinator: AsyncGatherCombinator, concurrencyCap: number, preserveAttributeIds?: readonly Attribute[] | undefined);
+    private static validateConstruction;
+    /**
+     * Validate a `zipByKey` combinator under the per-branch-refs representation:
+     *
+     * - `branchKeyAttrs` has one list per branch, all of the same non-empty
+     *   length K.
+     * - `outputKeyAttrs` has length K, its ids are pairwise distinct AND disjoint
+     *   from every child attribute id (load-bearing: a collision would let the
+     *   provenance walk treat an output key id as forwarded, breaking the
+     *   origination contract this design relies on).
+     * - each `branchKeyAttrs[b][k]` resolves in branch b.
+     * - per key position, affinity (physical storage class) agrees across all
+     *   branches (the codebase has no distinct affinity field). Nullability may
+     *   differ between branches; it gets OR'd in {@link getType}.
+     * - per key position, the declared collation agrees across all branches. The
+     *   runtime key comparator derives solely from branch 0's key-column
+     *   collations, so a disagreement would let branch 0 win silently and merge
+     *   (or fail to merge) rows under the wrong collation. Guarding it here means
+     *   both the recognition rule and manual construction are protected. An
+     *   absent `collationName` normalizes to the binary collation.
+     */
+    private static validateZipByKey;
+    /**
+     * Resolve each branch's own `branchKeyAttrs[b]` list against that branch's
+     * attribute layout, yielding per-branch key/non-key column indices. Memoised;
+     * only valid for a `zipByKey` combinator.
+     */
+    private computeZipByKeyIndices;
+    /** Public accessor for the resolved zipByKey index mapping (used by the emitter). */
+    getZipByKeyIndices(): ZipByKeyIndices;
+    private buildAttributes;
+    /**
+     * Build the `zipByKey` output attribute layout: the K merged key attributes
+     * first (type/nullability/collation derived from branch 0's key column at
+     * position k, nullability OR'd across branches because a NULL-keyed row can
+     * surface — but **carrying the gather-minted `outputKeyAttrs[k]` id**, since
+     * the gather originates these merged columns), then each branch's non-key
+     * attributes in declared order, each forced nullable (NULL when the branch is
+     * absent for a key). Non-key attribute IDs are unique across branches and the
+     * minted key ids are disjoint from all of them, so there is no ID collision.
+     */
+    private buildZipByKeyAttributes;
+    getAttributes(): readonly Attribute[];
+    getType(): RelationType;
+    /**
+     * Build the `zipByKey` output relation type. Column layout mirrors
+     * {@link buildZipByKeyAttributes}: deduped key columns (nullability OR'd),
+     * then each branch's non-key columns forced nullable. The key columns
+     * `[0..K-1]` form the output's unique key — multiple NULL-keyed rows do not
+     * violate this (SQL UNIQUE permits multiple NULLs). `isSet` is false because
+     * NULL-keyed standalone rows can repeat.
+     */
+    private getZipByKeyType;
+    computePhysical(childrenPhysical: PhysicalProperties[]): Partial<PhysicalProperties>;
+    getChildren(): readonly PlanNode[];
+    getRelations(): readonly RelationalPlanNode[];
+    withChildren(newChildren: readonly PlanNode[]): PlanNode;
+    get estimatedRows(): number | undefined;
+    toString(): string;
+    getLogicalAttributes(): Record<string, unknown>;
+}
+//# sourceMappingURL=async-gather-node.d.ts.map

package/dist/src/planner/nodes/async-gather-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"async-gather-node.d.ts","sourceRoot":"","sources":["../../../../src/planner/nodes/async-gather-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,KAAK,EACX,kBAAkB,EAClB,SAAS,EACT,kBAAkB,EAIlB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAU,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAgBhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAM,MAAM,qBAAqB,GAC9B;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;CAAE,GACjC;IACD,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAC1B;;;;;OAKG;IACH,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;IACxD;;;;OAIG;IACH,QAAQ,CAAC,cAAc,EAAE,SAAS,MAAM,EAAE,CAAC;CAC3C,CAAC;AAEH;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC/B,wFAAwF;IACxF,QAAQ,CAAC,gBAAgB,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;IAC1D,4EAA4E;IAC5E,QAAQ,CAAC,mBAAmB,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;CAC7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,qBAAa,eAAgB,SAAQ,QAAS,YAAW,kBAAkB;aAOzD,QAAQ,EAAE,SAAS,kBAAkB,EAAE;aACvC,UAAU,EAAE,qBAAqB;aACjC,cAAc,EAAE,MAAM;aACtB,oBAAoB,CAAC,EAAE,SAAS,SAAS,EAAE;IAT5D,SAAkB,QAAQ,4BAA4B;IACtD,OAAO,CAAC,eAAe,CAA+B;IACtD,OAAO,CAAC,eAAe,CAA0B;gBAGhD,KAAK,EAAE,KAAK,EACI,QAAQ,EAAE,SAAS,kBAAkB,EAAE,EACvC,UAAU,EAAE,qBAAqB,EACjC,cAAc,EAAE,MAAM,EACtB,oBAAoB,CAAC,EAAE,SAAS,SAAS,EAAE,YAAA;IAQ5D,OAAO,CAAC,MAAM,CAAC,oBAAoB;IAiCnC;;;;;;;;;;;;;;;;;;;OAmBG;IACH,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAsG/B;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAuB9B,qFAAqF;IACrF,kBAAkB,IAAI,eAAe;IAIrC,OAAO,CAAC,eAAe;IAsBvB;;;;;;;;;OASG;IACH,OAAO,CAAC,uBAAuB;IA6B/B,aAAa,IAAI,SAAS,SAAS,EAAE;IAIrC,OAAO,IAAI,YAAY;IA4EvB;;;;;;;OAOG;IACH,OAAO,CAAC,eAAe;IAmCvB,eAAe,CAAC,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAwDpF,WAAW,IAAI,SAAS,QAAQ,EAAE;IAIlC,YAAY,IAAI,SAAS,kBAAkB,EAAE;IAI7C,YAAY,CAAC,WAAW,EAAE,SAAS,QAAQ,EAAE,GAAG,QAAQ;IAiCxD,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CA2BtC;IAEQ,QAAQ,IAAI,MAAM;IAIlB,oBAAoB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAUxD"}