@quereus/quereus 4.8.0 → 4.10.0

package/dist/src/runtime/emit/assertion-rename-helpers.js

@@ -2,21 +2,18 @@ import { buildAssertionViolationSql } from '../../schema/assertion.js';
 import { renameTableInAst, renameColumnInAst } from '../../schema/rename-rewriter.js';
 import { createLogger } from '../../common/logger.js';
 const log = createLogger('runtime:emit:assertion-rename');
-// NOTE: both passes walk only the renamed object's OWN schema — the same scope the
-// plain-view and materialized-view loops in `alter-table.ts` use. An assertion's
-// stored body resolves unqualified table names against the assertion's own schema
-// first (`Database._homeSchemaPath`), so an unqualified `t` inside an assertion
-// living in some other schema does not necessarily mean the renamed table, and
-// rewriting it would be a false positive. The converse gap — an assertion that names
-// the renamed table with an explicit `<other schema>.<table>` qualifier is NOT
-// rewritten — is real, and shared verbatim with views and materialized views; it is
-// tracked by `bug-rename-not-propagated-across-schemas`, which fixes all three object
-// kinds with one "explicitly-qualified references only" rewriter mode.
+// NOTE: both passes are called once per schema in the catalog — the same scope the
+// plain-view and materialized-view loops in `alter-table.ts` use — and the caller
+// passes the target/resolver built for THAT schema's home path (over the statement's
+// pre-mutation snapshot), so an unqualified `t` in a body matches only when it
+// actually RESOLVES to the renamed table. An assertion in `temp` naming `main.t`
+// therefore follows a rename of `main.t`, while one whose bare `t` means `temp.t`
+// is left alone.
 /**
  * Rewrites every assertion in `schema` after a source TABLE RENAME — the assertion
- * mirror of the plain-view loop in `propagateTableRenameInSchema` (same same-schema
- * gate at the caller, same in-place `renameTableInAst` walk over a body that owns its
- * own FROM scopes).
+ * mirror of the plain-view loop in `propagateTableRenameInSchema` (called once per
+ * schema by the caller with that schema's resolver, same in-place `renameTableInAst`
+ * walk over a body that owns its own FROM scopes).
  *
  * On a changed body the derived `violationSql` is regenerated from the rewritten
  * expression (the commit-time evaluator re-parses that text, so it is the field that
@@ -25,15 +22,15 @@ const log = createLogger('runtime:emit:assertion-rename');
  * {@link Database.schemaManager} so `assertion_modified` fires — which is what
  * invalidates the optimizer's assertion-hoist cache.
  */
-export function propagateTableRenameToAssertions(db, schema, renamedSchemaName, oldName, newName) {
-    const schemaLower = renamedSchemaName.toLowerCase();
-    const oldBase = `${schemaLower}.${oldName.toLowerCase()}`;
-    const newBase = `${schemaLower}.${newName.toLowerCase()}`;
+export function propagateTableRenameToAssertions(db, schema, target) {
+    const schemaLower = target.schemaName.toLowerCase();
+    const oldBase = `${schemaLower}.${target.oldName.toLowerCase()}`;
+    const newBase = `${schemaLower}.${target.newName.toLowerCase()}`;
     for (const assertion of Array.from(schema.getAllAssertions())) {
         const check = assertion.checkExpression;
         if (!check)
             continue;
-        if (!renameTableInAst(check, oldName, newName, renamedSchemaName))
+        if (!renameTableInAst(check, target))
             continue;
         reregisterRewrittenAssertion(db, schema, assertion, check, remapDependentTables(assertion.dependentTables, oldBase, newBase));
     }
@@ -52,12 +49,13 @@ export function propagateTableRenameToAssertions(db, schema, renamedSchemaName,
  *
  * `dependentTables` is keyed by base table, so a column rename leaves it untouched.
  */
-export function propagateColumnRenameToAssertions(db, schema, renamedSchemaName, tableName, oldCol, newCol, resolveColumnInSource) {
+export function propagateColumnRenameToAssertions(db, schema, tableName, oldCol, newCol, resolve, targetKey, resolveColumnInSource) {
     for (const assertion of Array.from(schema.getAllAssertions())) {
         const check = assertion.checkExpression;
         if (!check)
             continue;
-        if (!renameColumnInAst(check, tableName, oldCol, newCol, renamedSchemaName, resolveColumnInSource))
+        // Row-image mode 'none': an assertion body owns no `new.` / `old.` namespace.
+        if (!renameColumnInAst(check, tableName, oldCol, newCol, resolve, targetKey, 'none', resolveColumnInSource))
             continue;
         reregisterRewrittenAssertion(db, schema, assertion, check, assertion.dependentTables);
     }

package/dist/src/runtime/emit/assertion-rename-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"assertion-rename-helpers.js","sourceRoot":"","sources":["../../../../src/runtime/emit/assertion-rename-helpers.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assertion-rename-helpers.js","sourceRoot":"","sources":["../../../../src/runtime/emit/assertion-rename-helpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEtF,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,GAAG,GAAG,YAAY,CAAC,+BAA+B,CAAC,CAAC;AAE1D,mFAAmF;AACnF,kFAAkF;AAClF,qFAAqF;AACrF,+EAA+E;AAC/E,iFAAiF;AACjF,kFAAkF;AAClF,iBAAiB;AAEjB;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gCAAgC,CAC/C,EAAY,EACZ,MAAc,EACd,MAAyB;IAEzB,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC;IACpD,MAAM,OAAO,GAAG,GAAG,WAAW,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;IACjE,MAAM,OAAO,GAAG,GAAG,WAAW,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;IACjE,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC;QAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,eAAe,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC;YAAE,SAAS;QAC/C,4BAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EACxD,oBAAoB,CAAC,SAAS,CAAC,eAAe,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC;AACF,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,iCAAiC,CAChD,EAAY,EACZ,MAAc,EACd,SAAiB,EACjB,MAAc,EACd,MAAc,EACd,OAAyB,EACzB,SAAiB,EACjB,qBAA4C;IAE5C,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC;QAC/D,MAAM,KAAK,GAAG,SAAS,CAAC,eAAe,CAAC;QACxC,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,8EAA8E;QAC9E,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,qBAAqB,CAAC;YAAE,SAAS;QACtH,4BAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,CAAC,eAAe,CAAC,CAAC;IACvF,CAAC;AACF,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,SAAS,4BAA4B,CACpC,EAAY,EACZ,MAAc,EACd,SAAmC,EACnC,KAAqB,EACrB,eAAsD;IAEtD,MAAM,OAAO,GAA6B;QACzC,GAAG,SAAS;QACZ,YAAY,EAAE,0BAA0B,CAAC,KAAK,CAAC;QAC/C,eAAe;KACf,CAAC;IACF,EAAE,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpD,GAAG,CAAC,wCAAwC,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;AAClG,CAAC;AAED;;;;;;GAMG;AACH,SAAS,oBAAoB,CAC5B,IAA2C,EAC3C,OAAe,EACf,OAAe;IAEf,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAC7B,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,GAAG,CAAC;QACrC,OAAO,GAAG,IAAI,CAAC;QACf,+DAA+D;QAC/D,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1C,OAAO;YACN,WAAW,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO;YAC7E,IAAI,EAAE,OAAO;SACb,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAChC,CAAC"}

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

@@ -1,5 +1,7 @@
 import type { Instruction } from "../types.js";
 import type { BetweenNode } from "../../planner/nodes/scalar.js";
 import type { EmissionContext } from "../emission-context.js";
+import { type ScalarOpSpec } from "./scalar-op.js";
+export declare function buildBetweenSpec(plan: BetweenNode, ctx: EmissionContext): ScalarOpSpec;
 export declare function emitBetween(plan: BetweenNode, ctx: EmissionContext): Instruction;
 //# sourceMappingURL=between.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"between.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/between.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA0ChF"}
+{"version":3,"file":"between.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/between.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEjE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,YAAY,CAsCtF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAEhF"}

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

@@ -1,8 +1,7 @@
-import { asRun } from "../types.js";
-import { emitPlanNode } from "../emitters.js";
 import { effectiveBetweenBoundCollation } from "../../planner/analysis/comparison-collation.js";
 import { formatOperandCollationNote, makeOperandComparator } from "./operand-comparator.js";
-export function emitBetween(plan, ctx) {
+import { emitScalarOp } from "./scalar-op.js";
+export function buildBetweenSpec(plan, ctx) {
     // BETWEEN desugars to `expr >= lower AND expr <= upper`; each comparison
     // resolves its collation independently through the shared provenance lattice
     // (explicit COLLATE > declared column collation > defaults — see
@@ -28,14 +27,14 @@ export function emitBetween(plan, ctx) {
         const betweenResult = (lowerResult >= 0 && upperResult <= 0);
         return plan.expression.not ? !betweenResult : betweenResult;
     }
-    const valueExpr = emitPlanNode(plan.expr, ctx);
-    const lowerExpr = emitPlanNode(plan.lower, ctx);
-    const upperExpr = emitPlanNode(plan.upper, ctx);
     const notPrefix = plan.expression.not ? 'NOT ' : '';
     return {
-        params: [valueExpr, lowerExpr, upperExpr],
-        run: asRun(run),
+        operands: [plan.expr, plan.lower, plan.upper],
+        run,
         note: `${notPrefix}BETWEEN${formatOperandCollationNote([lowerCollationName, upperCollationName])}`
     };
 }
+export function emitBetween(plan, ctx) {
+    return emitScalarOp(buildBetweenSpec(plan, ctx), ctx);
+}
 //# sourceMappingURL=between.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"between.js","sourceRoot":"","sources":["../../../../src/runtime/emit/between.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAE5F,MAAM,UAAU,WAAW,CAAC,IAAiB,EAAE,GAAoB;IAClE,yEAAyE;IACzE,6EAA6E;IAC7E,iEAAiE;IACjE,4EAA4E;IAC5E,+DAA+D;IAC/D,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjF,0EAA0E;IAC1E,MAAM,kBAAkB,GAAG,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACpE,MAAM,kBAAkB,GAAG,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IAEpE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IACpD,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAC9G,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAE9G,0EAA0E;IAC1E,yCAAyC;IACzC,SAAS,GAAG,CAAC,GAAmB,EAAE,KAAe,EAAE,UAAoB,EAAE,UAAoB;QAC5F,IAAI,KAAK,KAAK,IAAI,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAE9E,wFAAwF;QACxF,gDAAgD;QAChD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,CAAC,WAAW,IAAI,CAAC,IAAI,WAAW,IAAI,CAAC,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;IAC7D,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEhD,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAEpD,OAAO;QACN,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC;QACzC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;QACf,IAAI,EAAE,GAAG,SAAS,UAAU,0BAA0B,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,EAAE;KAClG,CAAC;AACH,CAAC"}
+{"version":3,"file":"between.js","sourceRoot":"","sources":["../../../../src/runtime/emit/between.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,8BAA8B,EAAE,MAAM,gDAAgD,CAAC;AAChG,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAqB,MAAM,gBAAgB,CAAC;AAEjE,MAAM,UAAU,gBAAgB,CAAC,IAAiB,EAAE,GAAoB;IACvE,yEAAyE;IACzE,6EAA6E;IAC7E,iEAAiE;IACjE,4EAA4E;IAC5E,+DAA+D;IAC/D,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACjF,MAAM,kBAAkB,GAAG,8BAA8B,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAEjF,0EAA0E;IAC1E,MAAM,kBAAkB,GAAG,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACpE,MAAM,kBAAkB,GAAG,GAAG,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IAEpE,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC;IACpD,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAC9G,MAAM,YAAY,GAAG,qBAAqB,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAAC;IAE9G,0EAA0E;IAC1E,yCAAyC;IACzC,SAAS,GAAG,CAAC,GAAmB,EAAE,KAAe,EAAE,UAAoB,EAAE,UAAoB;QAC5F,IAAI,KAAK,KAAK,IAAI,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAE9E,wFAAwF;QACxF,gDAAgD;QAChD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACpD,MAAM,aAAa,GAAG,CAAC,WAAW,IAAI,CAAC,IAAI,WAAW,IAAI,CAAC,CAAC,CAAC;QAE7D,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;IAC7D,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IAEpD,OAAO;QACN,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC;QAC7C,GAAG;QACH,IAAI,EAAE,GAAG,SAAS,UAAU,0BAA0B,CAAC,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC,EAAE;KAClG,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAiB,EAAE,GAAoB;IAClE,OAAO,YAAY,CAAC,gBAAgB,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;AACvD,CAAC"}

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

@@ -1,10 +1,32 @@
 import type { Instruction } from "../types.js";
 import type { BinaryOpNode } from "../../planner/nodes/scalar.js";
 import type { EmissionContext } from "../emission-context.js";
+import { type ScalarOpSpec } from "./scalar-op.js";
+/**
+ * Operator dispatch for a binary node — the single entry point both consumers share, so
+ * neither has to restate which operator routes to which body. `undefined` means the node
+ * has no {@link ScalarOpSpec}: today that is exactly the AND/OR short-circuit form, whose
+ * right operand is a deferred sub-program rather than a value (see
+ * {@link buildLogicalOpSpec}). A fusion consumer treats `undefined` as "do not fuse";
+ * {@link emitBinaryOp} falls back to {@link emitShortCircuitLogicalOp}.
+ *
+ * An unsupported operator throws here rather than returning `undefined` — that is an
+ * unimplemented operator, not a node that declines to fuse.
+ */
+export declare function buildBinaryOpSpec(plan: BinaryOpNode, ctx: EmissionContext): ScalarOpSpec | undefined;
 export declare function emitBinaryOp(plan: BinaryOpNode, ctx: EmissionContext): Instruction;
-export declare function emitNumericOp(plan: BinaryOpNode, ctx: EmissionContext): Instruction;
-export declare function emitComparisonOp(plan: BinaryOpNode, ctx: EmissionContext): Instruction;
-export declare function emitConcatOp(plan: BinaryOpNode, ctx: EmissionContext): Instruction;
-export declare function emitLogicalOp(plan: BinaryOpNode, ctx: EmissionContext): Instruction;
-export declare function emitLikeOp(plan: BinaryOpNode, ctx: EmissionContext): Instruction;
+export declare function buildNumericOpSpec(plan: BinaryOpNode): ScalarOpSpec;
+export declare function buildComparisonOpSpec(plan: BinaryOpNode, ctx: EmissionContext): ScalarOpSpec;
+export declare function buildConcatOpSpec(plan: BinaryOpNode): ScalarOpSpec;
+/**
+ * Eager two-operand combine. Used for XOR (both operands always required) and for
+ * AND/OR whose right operand is cheap (no subquery) — the zero-overhead path.
+ *
+ * `undefined` for the short-circuit form, whose right operand is a `SubProgram` param
+ * rather than a value and whose body returns `MaybePromise` — not a {@link ScalarOpSpec}
+ * body. Consumers fall back: the emitter below builds that Instruction itself, and a
+ * fusion consumer must decline to fuse.
+ */
+export declare function buildLogicalOpSpec(plan: BinaryOpNode): ScalarOpSpec | undefined;
+export declare function buildLikeOpSpec(plan: BinaryOpNode): ScalarOpSpec;
 //# sourceMappingURL=binary.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/binary.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAUlE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAgClF;AA4CD,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAqHnF;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAmEtF;AA2CD,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAmBlF;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAsGnF;AAiBD,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA2ChF"}
+{"version":3,"file":"binary.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/binary.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAYlE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEjE;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,YAAY,GAAG,SAAS,CAgCpG;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAGlF;AAwFD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAyHnE;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,GAAG,YAAY,CAqE5F;AA2CD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAelE;AA2ED;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,CAgB/E;AAyDD,wBAAgB,eAAe,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CA0ChE"}