@quereus/quereus 0.1.0 → 0.2.1

package/dist/src/runtime/emit/join.js

@@ -2,6 +2,7 @@ import { emitCallFromPlan, emitPlanNode } from '../emitters.js';
 import { createLogger } from '../../common/logger.js';
 import { compareSqlValues } from '../../util/comparison.js';
 import { buildRowDescriptor } from '../../util/row-descriptor.js';
+import { createRowSlot } from '../context-helpers.js';
 const log = createLogger('runtime:emit:join');
 /**
  * Emits a nested loop join instruction.
@@ -17,39 +18,37 @@ export function emitLoopJoin(plan, ctx) {
     async function* run(rctx, leftSource, rightCallback, conditionCallback) {
         const joinType = plan.joinType;
         log('Starting %s join between %d left attrs and %d right attrs', joinType.toUpperCase(), leftAttributes.length, rightAttributes.length);
-        // Process left side and join with right (pure streaming)
-        for await (const leftRow of leftSource) {
-            // Set up left context
-            rctx.context.set(leftRowDescriptor, () => leftRow);
-            try {
+        // Create row slots for efficient context management
+        const leftSlot = createRowSlot(rctx, leftRowDescriptor);
+        const rightSlot = createRowSlot(rctx, rightRowDescriptor);
+        try {
+            // Process left side and join with right (pure streaming)
+            for await (const leftRow of leftSource) {
+                // Set up left context
+                leftSlot.set(leftRow);
                 let leftMatched = false;
                 // Stream through right side for each left row
                 for await (const rightRow of rightCallback(rctx)) {
                     // Set up right context
-                    rctx.context.set(rightRowDescriptor, () => rightRow);
-                    try {
-                        // Evaluate join condition
-                        let conditionMet = true;
-                        if (conditionCallback) {
-                            // Evaluate the join condition using the callback provided by scheduler
-                            const conditionResult = await conditionCallback(rctx);
-                            conditionMet = !!conditionResult; // Convert to boolean
-                        }
-                        else if (plan.usingColumns) {
-                            // Handle USING condition: check equality of specified columns
-                            conditionMet = evaluateUsingCondition(leftRow, rightRow, plan.usingColumns, leftAttributes, rightAttributes);
-                        }
-                        else if (joinType === 'cross') {
-                            // Cross join - always true
-                            conditionMet = true;
-                        }
-                        if (conditionMet) {
-                            leftMatched = true;
-                            yield [...leftRow, ...rightRow];
-                        }
+                    rightSlot.set(rightRow);
+                    // Evaluate join condition
+                    let conditionMet = true;
+                    if (conditionCallback) {
+                        // Evaluate the join condition using the callback provided by scheduler
+                        const conditionResult = await conditionCallback(rctx);
+                        conditionMet = !!conditionResult; // Convert to boolean
                     }
-                    finally {
-                        rctx.context.delete(rightRowDescriptor);
+                    else if (plan.usingColumns) {
+                        // Handle USING condition: check equality of specified columns
+                        conditionMet = evaluateUsingCondition(leftRow, rightRow, plan.usingColumns, leftAttributes, rightAttributes);
+                    }
+                    else if (joinType === 'cross') {
+                        // Cross join - always true
+                        conditionMet = true;
+                    }
+                    if (conditionMet) {
+                        leftMatched = true;
+                        yield [...leftRow, ...rightRow];
                     }
                 }
                 // Handle outer join semantics - null padding for unmatched left rows
@@ -60,20 +59,21 @@ export function emitLoopJoin(plan, ctx) {
                     yield outputRow;
                 }
             }
-            finally {
-                rctx.context.delete(leftRowDescriptor);
+            // Handle right outer join semantics - we need to track which right rows were matched
+            // For now, we'll handle this in a simpler way by iterating again for right/full outer joins
+            if (joinType === 'right' || joinType === 'full') {
+                // For right outer joins, we need to find unmatched right rows
+                // This is more complex and less efficient - a real implementation would track matches
+                // For now, we'll implement a simplified version
+                log('Right/full outer join - checking for unmatched right rows');
+                // We'd need to track which right rows were matched during the main loop
+                // For now, we'll skip this implementation detail
+                // TODO: Implement proper right outer join semantics
             }
         }
-        // Handle right outer join semantics - we need to track which right rows were matched
-        // For now, we'll handle this in a simpler way by iterating again for right/full outer joins
-        if (joinType === 'right' || joinType === 'full') {
-            // For right outer joins, we need to find unmatched right rows
-            // This is more complex and less efficient - a real implementation would track matches
-            // For now, we'll implement a simplified version
-            log('Right/full outer join - checking for unmatched right rows');
-            // We'd need to track which right rows were matched during the main loop
-            // For now, we'll skip this implementation detail
-            // TODO: Implement proper right outer join semantics
+        finally {
+            leftSlot.close();
+            rightSlot.close();
         }
     }
     const leftInstruction = emitPlanNode(plan.left, ctx);

package/dist/src/runtime/emit/join.js.map

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

package/dist/src/runtime/emit/project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAI/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA+BhF"}
+{"version":3,"file":"project.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/project.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAI/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAoChF"}

package/dist/src/runtime/emit/project.js

@@ -1,26 +1,26 @@
 import { emitPlanNode, emitCallFromPlan } from '../emitters.js';
 import { buildRowDescriptor } from '../../util/row-descriptor.js';
+import { withAsyncRowContext, withRowContextGenerator } from '../context-helpers.js';
 export function emitProject(plan, ctx) {
     const sourceInstruction = emitPlanNode(plan.source, ctx);
     const projectionFuncs = plan.projections.map((projection) => {
         return emitCallFromPlan(projection.node, ctx);
     });
-    // Create row descriptor for source attributes
+    // Row descriptors
     const sourceRowDescriptor = buildRowDescriptor(plan.source.getAttributes());
+    const outputRowDescriptor = buildRowDescriptor(plan.getAttributes());
     async function* run(rctx, source, ...projectionFunctions) {
         for await (const sourceRow of source) {
-            // Set up context for this row using row descriptor
-            rctx.context.set(sourceRowDescriptor, () => sourceRow);
-            try {
-                const outputs = projectionFunctions.map(func => func(rctx));
-                const resolved = await Promise.all(outputs);
-                // Assume we have ensured that these are all scalar values
-                yield resolved;
-            }
-            finally {
-                // Clean up context for this row
-                rctx.context.delete(sourceRowDescriptor);
-            }
+            // Evaluate projections using the source row context
+            const outputs = await withAsyncRowContext(rctx, sourceRowDescriptor, () => sourceRow, async () => {
+                return Promise.all(projectionFunctions.map(fn => fn(rctx)));
+            });
+            // Push the output row descriptor for downstream consumers
+            yield* withRowContextGenerator(rctx, outputRowDescriptor, (async function* () {
+                yield outputs;
+            })(), async function* (row) {
+                yield row;
+            });
         }
     }
     return {

package/dist/src/runtime/emit/project.js.map

@@ -1 +1 @@
-{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../src/runtime/emit/project.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,UAAU,WAAW,CAAC,IAAiB,EAAE,GAAoB;IAClE,MAAM,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAC3D,OAAO,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,8CAA8C;IAC9C,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IAE5E,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,IAAoB,EAAE,MAA0B,EAAE,GAAG,mBAAgE;QACxI,IAAI,KAAK,EAAE,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YACtC,mDAAmD;YACnD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAEvD,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC5D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC5C,0DAA0D;gBAC1D,MAAM,QAAe,CAAC;YACvB,CAAC;oBAAS,CAAC;gBACV,gCAAgC;gBAChC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAC1C,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO;QACN,MAAM,EAAE,CAAC,iBAAiB,EAAE,GAAG,eAAe,CAAC;QAC/C,GAAG,EAAE,GAAU;QACf,IAAI,EAAE,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,QAAQ;KAChD,CAAC;AACH,CAAC"}
+{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../src/runtime/emit/project.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAErF,MAAM,UAAU,WAAW,CAAC,IAAiB,EAAE,GAAoB;IAClE,MAAM,iBAAiB,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAC3D,OAAO,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,kBAAkB;IAClB,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC;IAC5E,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IAErE,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,IAAoB,EAAE,MAA0B,EAAE,GAAG,mBAAgE;QACxI,IAAI,KAAK,EAAE,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YACtC,oDAAoD;YACpD,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,IAAI,EAAE,mBAAmB,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,KAAK,IAAI,EAAE;gBAChG,OAAO,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7D,CAAC,CAAC,CAAC;YAEH,0DAA0D;YAC1D,KAAK,CAAC,CAAC,uBAAuB,CAC7B,IAAI,EACJ,mBAAmB,EACnB,CAAC,KAAK,SAAS,CAAC;gBACf,MAAM,OAAc,CAAC;YACtB,CAAC,CAAC,EAAE,EACJ,KAAK,SAAS,CAAC,EAAE,GAAG;gBACnB,MAAM,GAAG,CAAC;YACX,CAAC,CACD,CAAC;QACH,CAAC;IACF,CAAC;IAED,OAAO;QACN,MAAM,EAAE,CAAC,iBAAiB,EAAE,GAAG,eAAe,CAAC;QAC/C,GAAG,EAAE,GAAU;QACf,IAAI,EAAE,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,QAAQ;KAChD,CAAC;AACH,CAAC"}

package/dist/src/runtime/emit/recursive-cte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recursive-cte.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/recursive-cte.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAc9D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAoG1F"}
+{"version":3,"file":"recursive-cte.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/recursive-cte.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAe9D,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA0F1F"}

package/dist/src/runtime/emit/recursive-cte.js

@@ -7,6 +7,7 @@ import { DEFAULT_TUNING } from '../../planner/optimizer-tuning.js';
 import { quereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { buildRowDescriptor } from '../../util/row-descriptor.js';
+import { withRowContext } from '../context-helpers.js';
 const log = createLogger('runtime:emit:recursive-cte');
 export function emitRecursiveCTE(plan, ctx) {
     // Create row descriptor for CTE output attributes
@@ -28,13 +29,7 @@ export function emitRecursiveCTE(plan, ctx) {
             const shouldYield = !allRowsTree || allRowsTree.insert(row).on;
             if (shouldYield) {
                 // Yield immediately (streaming)
-                rctx.context.set(rowDescriptor, () => row);
-                try {
-                    yield row;
-                }
-                finally {
-                    rctx.context.delete(rowDescriptor);
-                }
+                yield withRowContext(rctx, rowDescriptor, () => row, () => row);
                 // Add to delta for recursive processing (deep copy to avoid reference issues)
                 deltaRows.push([...row]);
             }
@@ -56,13 +51,7 @@ export function emitRecursiveCTE(plan, ctx) {
                     const shouldYield = !allRowsTree || allRowsTree.insert(row).on;
                     if (shouldYield) {
                         // Stream the row immediately
-                        rctx.context.set(rowDescriptor, () => row);
-                        try {
-                            yield row;
-                        }
-                        finally {
-                            rctx.context.delete(rowDescriptor);
-                        }
+                        yield withRowContext(rctx, rowDescriptor, () => row, () => row);
                         // Add to next iteration's delta (deep copy to avoid reference issues)
                         newDeltaRows.push([...row]);
                     }

package/dist/src/runtime/emit/recursive-cte.js.map

@@ -1 +1 @@
-{"version":3,"file":"recursive-cte.js","sourceRoot":"","sources":["../../../../src/runtime/emit/recursive-cte.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"recursive-cte.js","sourceRoot":"","sources":["../../../../src/runtime/emit/recursive-cte.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/emit/returning.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"returning.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/returning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAwCpF"}
+{"version":3,"file":"returning.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/returning.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAgCpF"}

package/dist/src/runtime/emit/returning.js

@@ -1,5 +1,6 @@
 import { emitPlanNode, emitCallFromPlan } from '../emitters.js';
 import { buildRowDescriptor } from '../../util/row-descriptor.js';
+import { withRowContextGenerator } from '../context-helpers.js';
 export function emitReturning(plan, ctx) {
     // Use the executor's attributes to build the row descriptor
     // The executor should already output the correct flat OLD/NEW format for mutation operations
@@ -8,20 +9,12 @@ export function emitReturning(plan, ctx) {
     const projectionEvaluators = plan.projections.map(proj => emitCallFromPlan(proj.node, ctx));
     async function* run(rctx, executorRows, ...projectionCallbacks) {
         // Project the results from the executor rows
-        for await (const sourceRow of executorRows) {
-            // Set up the source context - the row is already in the correct flat OLD/NEW format
-            rctx.context.set(sourceRowDescriptor, () => sourceRow);
-            try {
-                // Evaluate projection expressions in the context of this row
-                const outputs = projectionCallbacks.map(func => func(rctx));
-                const resolved = await Promise.all(outputs);
-                yield resolved;
-            }
-            finally {
-                // Clean up source context
-                rctx.context.delete(sourceRowDescriptor);
-            }
-        }
+        yield* withRowContextGenerator(rctx, sourceRowDescriptor, executorRows, async function* (_sourceRow) {
+            // Evaluate projection expressions in the context of this row
+            const outputs = projectionCallbacks.map(func => func(rctx));
+            const resolved = await Promise.all(outputs);
+            yield resolved;
+        });
     }
     // Emit the executor (now always produces rows)
     const executorInstruction = emitPlanNode(plan.executor, ctx);

package/dist/src/runtime/emit/returning.js.map

@@ -1 +1 @@
-{"version":3,"file":"returning.js","sourceRoot":"","sources":["../../../../src/runtime/emit/returning.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,UAAU,aAAa,CAAC,IAAmB,EAAE,GAAoB;IACtE,4DAA4D;IAC5D,6FAA6F;IAC7F,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAE9E,sCAAsC;IACtC,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACxD,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAChC,CAAC;IAEF,KAAK,SAAS,CAAC,CAAC,GAAG,CAClB,IAAoB,EACpB,YAAgC,EAChC,GAAG,mBAAwD;QAE3D,6CAA6C;QAC7C,IAAI,KAAK,EAAE,MAAM,SAAS,IAAI,YAAY,EAAE,CAAC;YAC5C,oFAAoF;YACpF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAEvD,IAAI,CAAC;gBACJ,6DAA6D;gBAC7D,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC5D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC5C,MAAM,QAAe,CAAC;YACvB,CAAC;oBAAS,CAAC;gBACV,0BAA0B;gBAC1B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;YAC1C,CAAC;QACF,CAAC;IACF,CAAC;IAED,+CAA+C;IAC/C,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE7D,OAAO;QACN,MAAM,EAAE,CAAC,mBAAmB,EAAE,GAAG,oBAAoB,CAAC;QACtD,GAAG;QACH,IAAI,EAAE,aAAa,IAAI,CAAC,WAAW,CAAC,MAAM,QAAQ;KAClD,CAAC;AACH,CAAC"}
+{"version":3,"file":"returning.js","sourceRoot":"","sources":["../../../../src/runtime/emit/returning.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE,MAAM,UAAU,aAAa,CAAC,IAAmB,EAAE,GAAoB;IACtE,4DAA4D;IAC5D,6FAA6F;IAC7F,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAE9E,sCAAsC;IACtC,MAAM,oBAAoB,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CACxD,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAChC,CAAC;IAEF,KAAK,SAAS,CAAC,CAAC,GAAG,CAClB,IAAoB,EACpB,YAAgC,EAChC,GAAG,mBAAwD;QAE3D,6CAA6C;QAC7C,KAAK,CAAC,CAAC,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,EAAE,YAAY,EAAE,KAAK,SAAS,CAAC,EAAE,UAAU;YAClG,6DAA6D;YAC7D,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC5C,MAAM,QAAe,CAAC;QACvB,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,+CAA+C;IAC/C,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAE7D,OAAO;QACN,MAAM,EAAE,CAAC,mBAAmB,EAAE,GAAG,oBAAoB,CAAC;QACtD,GAAG;QACH,IAAI,EAAE,aAAa,IAAI,CAAC,WAAW,CAAC,MAAM,QAAQ;KAClD,CAAC;AACH,CAAC"}

package/dist/src/runtime/emit/scan.d.ts

@@ -1,5 +1,8 @@
-import type { TableScanNode } from "../../planner/nodes/scan.js";
+import { SeqScanNode, IndexScanNode, IndexSeekNode } from "../../planner/nodes/table-access-nodes.js";
 import type { Instruction } from "../types.js";
 import type { EmissionContext } from "../emission-context.js";
-export declare function emitSeqScan(plan: TableScanNode, ctx: EmissionContext): Instruction;
+/**
+ * Emits instructions for physical table access nodes (SeqScan, IndexScan, IndexSeek)
+ */
+export declare function emitSeqScan(plan: SeqScanNode | IndexScanNode | IndexSeekNode, ctx: EmissionContext): Instruction;
 //# sourceMappingURL=scan.d.ts.map

package/dist/src/runtime/emit/scan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/scan.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAIjE,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA4ElF"}
+{"version":3,"file":"scan.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/scan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAItG,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,aAAa,GAAG,aAAa,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA0EhH"}

package/dist/src/runtime/emit/scan.js

@@ -3,61 +3,65 @@ import { QuereusError } from "../../common/errors.js";
 import { createValidatedInstruction } from "../emitters.js";
 import { disconnectVTable } from "../utils.js";
 import { buildRowDescriptor } from "../../util/row-descriptor.js";
+import { createRowSlot } from "../context-helpers.js";
+/**
+ * Emits instructions for physical table access nodes (SeqScan, IndexScan, IndexSeek)
+ */
 export function emitSeqScan(plan, ctx) {
-    const tableSchema = plan.source.tableSchema;
+    // Handle physical access nodes
+    const source = plan.source;
+    const schema = source.tableSchema;
     // Create row descriptor mapping attribute IDs to column indices
     const rowDescriptor = buildRowDescriptor(plan.getAttributes());
     // Look up the virtual table module during emission and record the dependency
-    const moduleInfo = ctx.getVtabModule(tableSchema.vtabModuleName);
+    const moduleInfo = ctx.getVtabModule(schema.vtabModuleName);
     if (!moduleInfo) {
-        throw new QuereusError(`Virtual table module '${tableSchema.vtabModuleName}' not found`, StatusCode.ERROR);
+        throw new QuereusError(`Virtual table module '${schema.vtabModuleName}' not found`, StatusCode.ERROR);
     }
     // Capture the module info key for runtime retrieval
-    const moduleKey = `vtab_module:${tableSchema.vtabModuleName}`;
+    const moduleKey = `vtab_module:${schema.vtabModuleName}`;
     async function* run(runtimeCtx) {
         // Use the captured module info instead of doing a fresh lookup
         const capturedModuleInfo = ctx.getCapturedSchemaObject(moduleKey);
         if (!capturedModuleInfo) {
-            throw new QuereusError(`Virtual table module '${tableSchema.vtabModuleName}' was not captured during emission`, StatusCode.INTERNAL);
+            throw new QuereusError(`Virtual table module '${schema.vtabModuleName}' was not captured during emission`, StatusCode.INTERNAL);
         }
         const module = capturedModuleInfo.module;
         if (typeof module.xConnect !== 'function') {
-            throw new QuereusError(`Virtual table module '${tableSchema.vtabModuleName}' does not implement xConnect`, StatusCode.MISUSE);
+            throw new QuereusError(`Virtual table module '${schema.vtabModuleName}' does not implement xConnect`, StatusCode.MISUSE);
         }
         let vtabInstance;
         try {
             const options = {}; // TODO: Populate options from plan.source.tableSchema.vtabArgs or similar if needed
-            vtabInstance = module.xConnect(runtimeCtx.db, capturedModuleInfo.auxData, tableSchema.vtabModuleName, tableSchema.schemaName, tableSchema.name, options);
+            vtabInstance = module.xConnect(runtimeCtx.db, capturedModuleInfo.auxData, schema.vtabModuleName, schema.schemaName, schema.name, options);
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);
-            throw new QuereusError(`Module '${tableSchema.vtabModuleName}' xConnect failed for table '${tableSchema.name}': ${message}`, e instanceof QuereusError ? e.code : StatusCode.ERROR, e instanceof Error ? e : undefined);
+            throw new QuereusError(`Module '${schema.vtabModuleName}' xConnect failed for table '${schema.name}': ${message}`, e instanceof QuereusError ? e.code : StatusCode.ERROR, e instanceof Error ? e : undefined);
         }
         if (typeof vtabInstance.xQuery !== 'function') {
             // Fallback or error if xQuery is not available. For now, throwing an error.
             // Later, we could implement the xOpen/xFilter/xNext loop here as a fallback.
-            throw new QuereusError(`Virtual table '${tableSchema.name}' does not support xQuery.`, StatusCode.UNSUPPORTED);
+            throw new QuereusError(`Virtual table '${schema.name}' does not support xQuery.`, StatusCode.UNSUPPORTED);
         }
+        const rowSlot = createRowSlot(runtimeCtx, rowDescriptor);
         try {
-            // Put cursor row into context using row descriptor
-            let row;
-            runtimeCtx.context.set(rowDescriptor, () => row);
             const asyncRowIterable = vtabInstance.xQuery(plan.filterInfo);
-            for await (row of asyncRowIterable) {
+            for await (const row of asyncRowIterable) {
+                rowSlot.set(row);
                 yield row;
             }
-            // Remove cursor row from context
-            runtimeCtx.context.delete(rowDescriptor);
         }
         catch (e) {
             const message = e instanceof Error ? e.message : String(e);
-            throw new QuereusError(`Error during xQuery on table '${tableSchema.name}': ${message}`, e instanceof QuereusError ? e.code : StatusCode.ERROR, e instanceof Error ? e : undefined);
+            throw new QuereusError(`Error during xQuery on table '${schema.name}': ${message}`, e instanceof QuereusError ? e.code : StatusCode.ERROR, e instanceof Error ? e : undefined);
         }
         finally {
+            rowSlot.close();
             // Properly disconnect the VirtualTable instance
             await disconnectVTable(runtimeCtx, vtabInstance);
         }
     }
-    return createValidatedInstruction([], run, ctx, `scan(${plan.source.tableSchema.name})`);
+    return createValidatedInstruction([], run, ctx, `${plan.nodeType}(${schema.name})`);
 }
 //# sourceMappingURL=scan.js.map

package/dist/src/runtime/emit/scan.js.map

@@ -1 +1 @@
-{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/runtime/emit/scan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAY,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAKtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,MAAM,UAAU,WAAW,CAAC,IAAmB,EAAE,GAAoB;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IAE5C,gEAAgE;IAChE,MAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IAE/D,6EAA6E;IAC7E,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IACjE,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,MAAM,IAAI,YAAY,CAAC,yBAAyB,WAAW,CAAC,cAAc,aAAa,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC;IAC5G,CAAC;IAED,oDAAoD;IACpD,MAAM,SAAS,GAAG,eAAe,WAAW,CAAC,cAAc,EAAE,CAAC;IAE9D,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,UAA0B;QAC7C,+DAA+D;QAC/D,MAAM,kBAAkB,GAAG,GAAG,CAAC,uBAAuB,CAAqC,SAAS,CAAC,CAAC;QACtG,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,MAAM,IAAI,YAAY,CAAC,yBAAyB,WAAW,CAAC,cAAc,oCAAoC,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;QACtI,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC;QACzC,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;YAC3C,MAAM,IAAI,YAAY,CAAC,yBAAyB,WAAW,CAAC,cAAc,+BAA+B,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/H,CAAC;QAED,IAAI,YAA0B,CAAC;QAC/B,IAAI,CAAC;YACJ,MAAM,OAAO,GAAqB,EAAE,CAAC,CAAC,oFAAoF;YAC1H,YAAY,GAAG,MAAM,CAAC,QAAQ,CAC7B,UAAU,CAAC,EAAE,EACb,kBAAkB,CAAC,OAAO,EAC1B,WAAW,CAAC,cAAc,EAC1B,WAAW,CAAC,UAAU,EACtB,WAAW,CAAC,IAAI,EAChB,OAAO,CACP,CAAC;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,IAAI,YAAY,CAAC,WAAW,WAAW,CAAC,cAAc,gCAAgC,WAAW,CAAC,IAAI,MAAM,OAAO,EAAE,EAAE,CAAC,YAAY,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACzN,CAAC;QAED,IAAI,OAAO,YAAY,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC/C,4EAA4E;YAC5E,6EAA6E;YAC7E,MAAM,IAAI,YAAY,CAAC,kBAAkB,WAAW,CAAC,IAAI,4BAA4B,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;QAChH,CAAC;QAED,IAAI,CAAC;YACJ,mDAAmD;YACnD,IAAI,GAAQ,CAAC;YACb,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YAEjD,MAAM,gBAAgB,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC9D,IAAI,KAAK,EAAE,GAAG,IAAI,gBAAgB,EAAE,CAAC;gBACpC,MAAM,GAAG,CAAC;YACX,CAAC;YAED,iCAAiC;YACjC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YACjB,MAAM,OAAO,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAC3D,MAAM,IAAI,YAAY,CAAC,iCAAiC,WAAW,CAAC,IAAI,MAAM,OAAO,EAAE,EAAE,CAAC,YAAY,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACrL,CAAC;gBAAS,CAAC;YACV,gDAAgD;YAChD,MAAM,gBAAgB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAClD,CAAC;IACF,CAAC;IAED,OAAO,0BAA0B,CAChC,EAAE,EACF,GAAG,EACH,GAAG,EACH,QAAQ,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,CACvC,CAAC;AACH,CAAC"}
+{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../../../src/runtime/emit/scan.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/emit/sort.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAG/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAqE1E"}
+{"version":3,"file":"sort.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/sort.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAG/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,wBAAgB,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAiE1E"}

package/dist/src/runtime/emit/sort.js

@@ -1,6 +1,7 @@
 import { emitPlanNode, emitCallFromPlan } from '../emitters.js';
 import { createOrderByComparatorFast, resolveCollation } from '../../util/comparison.js';
 import { buildRowDescriptor } from '../../util/row-descriptor.js';
+import { withAsyncRowContext } from '../context-helpers.js';
 export function emitSort(plan, ctx) {
     const sourceInstruction = emitPlanNode(plan.source, ctx);
     // Create row descriptor for source attributes
@@ -17,20 +18,16 @@ export function emitSort(plan, ctx) {
         // Collect all rows with their sort key values
         const rowsWithKeys = [];
         for await (const sourceRow of source) {
-            // Set up context for this row using row descriptor
-            ctx.context.set(sourceRowDescriptor, () => sourceRow);
-            try {
+            const keys = await withAsyncRowContext(ctx, sourceRowDescriptor, () => sourceRow, async () => {
                 // Evaluate sort key expressions
-                const keys = [];
+                const keyValues = [];
                 for (const keyFunc of sortKeyFunctions) {
-                    keys.push(await keyFunc(ctx));
+                    const result = keyFunc(ctx);
+                    keyValues.push(await Promise.resolve(result));
                 }
-                rowsWithKeys.push({ row: sourceRow, keys });
-            }
-            finally {
-                // Clean up context for this row
-                ctx.context.delete(sourceRowDescriptor);
-            }
+                return keyValues;
+            });
+            rowsWithKeys.push({ row: sourceRow, keys });
         }
         // Sort the collected rows using pre-created optimized comparators
         rowsWithKeys.sort((a, b) => {

package/dist/src/runtime/emit/sort.js.map

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

package/dist/src/runtime/emit/subquery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/subquery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI9F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAK9D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAwB9F;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAyFtE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAe9E"}
+{"version":3,"file":"subquery.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/subquery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAI9F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAM9D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA2B9F;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAiJtE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAe9E"}