litedbmodel 2.2.2 → 2.2.4

package/dist/scp/leaves.js

@@ -11,10 +11,11 @@
  *
  *   - {@link executeSQL} — the SOLE SQL transport. Binds params and runs one statement through the
  *     central {@link import('./exec-context') execute/run seam} (the ONLY driver contact). Read
- *     (`write:false`) → rows; write (`write:true`) → a one-row `[{changes,lastInsertRowid}]` summary
- *     (RETURNING writes return their rows via `execute`). It owns the transport-level param shaping a
- *     relation key-set needs — the dialect array encoding + deferred PG cast resolution + `?`→`$N`
- *     render — and, when the statement is a GUARDED relation child fetch, the runaway check on its raw
+ *     (`write:null`) → rows; write (`write:{returning}`) → a one-row `[{changes,lastInsertRowid}]`
+ *     summary (a RETURNING write returns its rows via `execute` instead). It owns the transport-level
+ *     param shaping a relation key-set needs — the dialect array encoding + deferred PG cast
+ *     resolution + `?`→`$N` render — and, when the statement is a GUARDED relation child fetch, the
+ *     runaway check on its raw
  *     rows ({@link import('./limit-config').assertRelationHardLimit}): the RAW child rows exist only
  *     here, since `group` already sees a nested graph and SCP itself has no throw.
  *   - {@link pluck} — rows + the ordered key-column tuple → the deduped, non-null key array (the
@@ -27,10 +28,14 @@
  * the IR (C4): {@link leafHandlers} closes over a sync {@link LeafContext} and {@link
  * leafHandlersAsync} over an {@link AsyncLeafContext}. The same three symbols are what the native
  * codegen calls directly ({@link LEAF_TRANSPORT_SYMBOLS}).
+ *
+ * What the statement DOES carry is the NAME of its database (`opts.db`) — a static property of its
+ * model, not an environment fact: the factory owns the connection REGISTRY, the statement owns which
+ * entry of it it belongs to. The two meet on the {@link StatementIntent} ({@link prepareSql}), which is
+ * the only input `connectionFor` routes on.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LEAF_TRANSPORT_SYMBOLS = void 0;
-exports.spliceWhere = spliceWhere;
 exports.assembleDynamicWhere = assembleDynamicWhere;
 exports.prepareSql = prepareSql;
 exports.executeSQL = executeSQL;
@@ -46,48 +51,49 @@ const json_array_1 = require("./makesql/json-array");
 const compile_relation_1 = require("./makesql/compile-relation");
 const grouping_1 = require("./grouping");
 // ── the DYNAMIC (SKIP) WHERE: assembled by the transport, at execution time ────────────────────
-/**
- * The SQL keywords that may follow a WHERE clause. The WHERE must be spliced BEFORE the first of
- * them, so a dynamic WHERE lands at exactly the position a bounded one occupies.
- */
-const WHERE_TAIL_RE = /\s+(GROUP BY|ORDER BY|LIMIT|OFFSET|FOR UPDATE|RETURNING)\b/i;
-/** Splice a ` WHERE …` clause (leading space included, or `''`) into `baseSql` before its first tail keyword. */
-function spliceWhere(baseSql, whereSql) {
-    if (whereSql === '')
-        return baseSql;
-    const tail = WHERE_TAIL_RE.exec(baseSql);
-    return tail === null ? baseSql + whereSql : baseSql.slice(0, tail.index) + whereSql + baseSql.slice(tail.index);
-}
 /**
  * Assemble the effective statement from a DYNAMIC WHERE plan: drop the SKIPPED fragments (`skipped`
- * true — the per-call SKIP decision the emitter carried as DATA), join the survivors with ` WHERE ` /
- * ` AND `, splice the clause into the base `sql` before its first tail keyword ({@link spliceWhere}) —
- * the exact position a bounded WHERE occupies — and bind the surviving fragments' params BEFORE the
- * base params (the WHERE `?`s precede the tail's).
+ * true — the per-call SKIP decision the emitter carried as DATA), join the survivors with ` AND `, and
+ * CONCATENATE the three pieces the plan and the ports already hold — the statement's HEAD (`sql`, which
+ * ends at its WHERE region), the assembled clause, and the plan's `tail`. The params follow the same
+ * three-way order: the head's, the survivors', the tail's.
+ *
+ * There is nothing to LOCATE here. The emitter's SELECT builder is what puts the WHERE in the statement,
+ * so it hands the boundary over ({@link import('./makesql/compile-select').SelectBundle}) instead of
+ * leaving the transport to rediscover it: `plan.lead` says whether the head already ends in a WHERE (so
+ * the clause CONTINUES it) or not (so it OPENS one), and `plan.tailParams` are the tail's own bound
+ * values. That is what removed a lexical scan the five transports each carried a copy of — one that
+ * took a NESTED statement's tail keyword for the outer statement's (#198), counted a QUOTED `?` the
+ * placeholder render skips (#202), and derived a byte offset that is not the same number in five
+ * languages.
  *
  * A SKIP predicate's presence is per-CALL, so the FINAL statement can only be determined here, at
  * execution time — which is also why `?`→`$N` is rendered after this ({@link prepareSql}), never at
- * emit time. A statement with NO optional predicate carries no plan at all: its WHERE is spliced into
- * the static `sql` at emit time and it never reaches this function.
+ * emit time. Only the ACTUALLY-optional predicates are in the plan (CLAUDE.md §2): a read with none
+ * carries no plan at all and never reaches this function, and one whose fragments are all skipped
+ * leaves the emitted statement exactly as it was compiled (head + tail, no clause).
  */
 function assembleDynamicWhere(p) {
-    const frags = p.whereDynamic.frags.filter((f) => !f.skipped);
-    let whereSql = '';
-    const whereParams = [];
-    frags.forEach((f, i) => {
-        whereSql += (i === 0 ? ' WHERE ' : ' AND ') + f.sql;
-        whereParams.push(...f.params);
-    });
-    return { sql: spliceWhere(p.sql, whereSql), params: [...whereParams, ...p.params] };
+    const plan = dynamicWherePlan(p.whereDynamic);
+    const frags = plan.frags.filter((f) => !f.skipped);
+    const clause = frags.length === 0 ? '' : ` ${plan.lead} ${frags.map((f) => f.sql).join(' AND ')}`;
+    return {
+        sql: p.sql + clause + plan.tail,
+        params: [...p.params, ...frags.flatMap((f) => f.params), ...plan.tailParams],
+    };
 }
 /**
  * The effective `{sql, params}` a statement executes: the dynamic plan assembled when one is present,
  * the ports verbatim otherwise. The ONE place the two shapes converge — both transports consume it.
  */
 function effectiveStatement(p) {
+    // The seam's INTENT is the one boolean the statement's `write` mode reduces to (present ⇒ a write),
+    // plus the NAMED database it belongs to (absent ⇒ the default connection).
+    const write = p.write !== null;
+    const db = p.db ?? null;
     if (p.whereDynamic == null)
-        return p;
-    return { ...assembleDynamicWhere({ sql: p.sql, params: p.params, whereDynamic: p.whereDynamic }), write: p.write };
+        return { sql: p.sql, params: p.params, write, db };
+    return { ...assembleDynamicWhere({ sql: p.sql, params: p.params, whereDynamic: p.whereDynamic }), write, db };
 }
 /** Normalize a driver integer (number|bigint) to bc's `int` value model (BigInt). */
 function toBcInt(v) {
@@ -127,7 +133,14 @@ function encodeParams(params, dialect) {
 function isTupleSet(param) {
     return param.length > 0 && Array.isArray(param[0]);
 }
-/** Prepare a statement for the seam: resolve deferred PG cast(s), render `?`→`$N`, encode params. */
+/**
+ * Prepare a statement for the seam: resolve deferred PG cast(s), render `?`→`$N`, encode params, and
+ * carry the ONE {@link StatementIntent} both seams take. The intent is the statement's RUN MODE
+ * ({@link effectiveStatement} — a write mode present ⇒ a write), NOT the branch: the branch picks the
+ * SEAM (`returning` ⇒ the row seam), the intent picks the CONNECTION
+ * ({@link import('./connection-routing').resolvePool}), so a RETURNING write runs on `execute` and
+ * still routes to the WRITER. The four native transports derive it the same way (#207).
+ */
 function prepareSql(p, dialect) {
     let sql = p.sql;
     if (dialect === 'postgres') {
@@ -137,7 +150,11 @@ function prepareSql(p, dialect) {
     }
     sql = (0, handler_1.renderPlaceholders)(sql, dialect);
     const bound = encodeParams(p.params, dialect);
-    const intent = { write: p.write === true };
+    // The NAMED database rides on the SAME intent as the write mode, because it is resolved by the same
+    // function: `resolvePool` picks the named connection's reader/writer PAIR first, then applies the
+    // write/sticky split within it. Absent ⇒ the key is omitted (the default connection), which keeps a
+    // single-DB intent identical to the one this seam has always built.
+    const intent = { write: p.write, ...(p.db != null ? { db: p.db } : {}) };
     return { sql, bound, intent };
 }
 /**
@@ -161,12 +178,12 @@ function writeSummary(info) {
  * int and float as DISTINCT kinds, so a column declared `Int` cannot be satisfied by a JS number on any
  * dialect, and gating exactness per endpoint made SQLite disagree with PostgreSQL and MySQL (whose
  * integer type parsers are unconditional — `configurePgDeboxTypeParsers`, `mysqlDeboxPoolOptions`),
- * which the conformance corpus rejects as dialect-variant. `bigint` is retained as a port because the
- * generated modules declare it, but it no longer selects the seam.
+ * which the conformance corpus rejects as dialect-variant. There is therefore no exactness port at all
+ * (#193 deleted the `bigint` one, which no language read).
  */
 function executeSQL(p, ctx) {
     const prepared = prepareSql(effectiveStatement(p), ctx.dialect);
-    if (p.write === true && p.returning !== true)
+    if (p.write !== null && !p.write.returning)
         return writeSummary((0, exec_context_1.run)(ctx.exec, prepared.sql, prepared.bound, prepared.intent));
     const rows = (0, exec_context_1.executeSafe)(ctx.exec, prepared.sql, prepared.bound, prepared.intent);
     (0, limit_config_1.assertRelationHardLimit)(rows, p.guard);
@@ -175,7 +192,7 @@ function executeSQL(p, ctx) {
 /** The ASYNC (live PG / MySQL) `executeSQL` body — the twin of {@link executeSQL} over the async seam. */
 async function executeSQLAsync(p, ctx) {
     const prepared = prepareSql(effectiveStatement(p), ctx.dialect);
-    if (p.write === true && p.returning !== true)
+    if (p.write !== null && !p.write.returning)
         return writeSummary(await (0, exec_context_1.runAsync)(ctx.execAsync, prepared.sql, prepared.bound, prepared.intent));
     const rows = (await (0, exec_context_1.executeAsync)(ctx.execAsync, prepared.sql, prepared.bound, prepared.intent));
     (0, limit_config_1.assertRelationHardLimit)(rows, p.guard);
@@ -203,54 +220,196 @@ function pluck(p) {
  */
 function group(p) {
     const byKey = (0, grouping_1.groupByKey)(p.children, p.fk);
-    return p.parents.map((par) => ({ ...par, [p.into]: (0, grouping_1.attachToParent)(par, p.pk, byKey, p.single === true) }));
+    return p.parents.map((par) => ({ ...par, [p.into]: (0, grouping_1.attachToParent)(par, p.pk, byKey, p.single) }));
 }
 // ── handler maps: the boundary injection a generated module's bind()/bindAsync() consumes ──
 /**
- * Read the OPTIONAL relation `guard` port. Absent (or null) ⇒ the statement is uncapped. The cap
+ * The DECLARED type of every leaf PORT and every field of every leaf struct, exactly as the catalog
+ * spells it ({@link import('./leaf-transport')}) — the predicate {@link portTyped} confirms. A `|null`
+ * suffix marks a NULLABLE field, whose `null` is the declared absence (no write mode / plan / cap /
+ * model). `int` is bc's `int` value model, which on this plane is a BigInt and nothing else.
+ * `string[]` is the ordered key-column TUPLE (`col` / `pk` / `fk`): every element must be a column
+ * NAME, the same element check the go `portStrings` / rust `port_strings` probes make.
+ */
+const PORT_TYPES = {
+    bool: (v) => typeof v === 'boolean',
+    int: (v) => typeof v === 'bigint',
+    string: (v) => typeof v === 'string',
+    list: (v) => Array.isArray(v),
+    'string[]': (v) => Array.isArray(v) && v.every((e) => typeof e === 'string'),
+    record: (v) => typeof v === 'object' && v !== null && !Array.isArray(v),
+};
+/**
+ * Confirm ONE unboxed value against its DECLARED type — the ONE wrong-type failure on the TS plane, and
+ * the twin of the go `portErr` wrong-variant half / rust `port_mismatch`. A field of the wrong type is
+ * the same ABI break as a missing one, for the same reason: the generator emits the literal the port's
+ * type says, so nothing else can arrive from a generated module. Coercing it instead ran an INSERT on
+ * the read seam (`returning` not a bool), applied a predicate the call SKIPPED (`skipped` not a bool),
+ * erased one entirely (`sql` not a string), or FLIPPED a relation's cardinality — `single` cast to a
+ * bool turned the one nested child into a LIST, and `into` cast to a string nested it under `"42"`
+ * (#213).
+ */
+function portTyped(value, what, declared) {
+    const kind = (declared.endsWith('|null') ? declared.slice(0, -'|null'.length) : declared);
+    if (kind !== declared && value === null)
+        return null;
+    if (!PORT_TYPES[kind](value)) {
+        // bc's `int` value model is a BigInt on this plane, so the rendering has to survive one appearing
+        // where another type was declared — a bare JSON.stringify throws on it and would replace the port
+        // failure with a serializer failure.
+        const got = JSON.stringify(value, (_k, v) => (typeof v === 'bigint' ? `${v}n` : v));
+        throw new Error(`scp leaf: ${what} must be ${declared}, got ${got}`);
+    }
+    return value;
+}
+/**
+ * Read ONE DECLARED field out of a payload / struct that is PRESENT — the ONE fail-closed field read on
+ * the TS plane, for all THREE leaves, and the twin of the go `optRowField` / rust `take_opt_row`
+ * discipline. Presence and the DECLARED type are confirmed at the SAME read, exactly as go's and rust's
+ * typed probes confirm both.
+ *
+ * `null` is a VALUE (the declared absence of a write mode / a plan / a cap / a model); a MISSING KEY is
+ * an ABI BREAK. The two are not the same thing and must not collapse: bc types a port by the literal
+ * wired into it and REJECTS a partial struct (an omitted field is a different type, not a default —
+ * `bc: … the value wired into it has type obj{…}`), so a generated module ALWAYS spells every field of
+ * every struct it wires. A key that is not there did not come from one, and reading it as its default
+ * would silently downgrade a write to a read, drop a relation cap, erase a SKIP predicate (#205), or —
+ * on `group` — nest the children under `"undefined"` so the relation vanishes from the graph (#213).
+ */
+function requiredField(record, name, at, declared) {
+    if (!(name in record)) {
+        throw new Error(`scp leaf: ${at} is missing its '${name}' field — a generated module spells every ` +
+            `field of every struct it wires, so an ABSENT key is an ABI break (a null VALUE is how an ` +
+            `absent write mode / plan / cap is spelled)`);
+    }
+    return portTyped(record[name], `${at}'s '${name}'`, declared);
+}
+/**
+ * Unbox the WHOLE plan — its FRAGMENTS (every field of every one, skipped included) and the three facts
+ * that finish the statement (`lead` / `tail` / `tailParams`) — fail-closed ({@link requiredField}),
+ * before any of them is used.
+ *
+ * A fragment is a PRESENT struct like every other, and the generator spells it in full, so a missing
+ * field is an ABI break and NOT a default: without `skipped` the statement applies a predicate the call
+ * SKIPPED, without `sql` the predicate is erased entirely, and without `params` a value binds where none
+ * belongs — each of them silently returning DIFFERENT ROWS (#209). The plan's own three fields are read
+ * the same way and for the same reason: a defaulted `lead` opens a SECOND WHERE on a statement that has
+ * one (a syntax error) or continues one that does not (also a syntax error), and a defaulted `tail` /
+ * `tailParams` DROPS the statement's ORDER BY and page — returning a different, unbounded row set that
+ * still looks like a successful read.
+ */
+const PLAN_AT = `the 'whereDynamic' plan`;
+function dynamicWherePlan(port) {
+    const plan = port;
+    const at = `a 'whereDynamic' fragment`;
+    const frags = requiredField(plan, 'frags', PLAN_AT, 'list').map((frag) => {
+        const f = portTyped(frag, at, 'record');
+        return {
+            skipped: requiredField(f, 'skipped', at, 'bool'),
+            sql: requiredField(f, 'sql', at, 'string'),
+            params: requiredField(f, 'params', at, 'list'),
+        };
+    });
+    return {
+        frags,
+        lead: requiredField(plan, 'lead', PLAN_AT, 'string'),
+        tail: requiredField(plan, 'tail', PLAN_AT, 'string'),
+        tailParams: requiredField(plan, 'tailParams', PLAN_AT, 'list'),
+    };
+}
+/**
+ * Read the relation `guard` field of the control record. `null` ⇒ the statement is uncapped. The cap
  * arrives in bc's `int` value model, which on the TS plane is a BigInt, so it is normalized to the
  * `number` {@link RelationGuard} (and {@link import('./errors').LimitExceededError}) declare — the
- * SAME numeric type the rust/go/python/php transports hand their own check. A guard that is present
- * but not a `{limit, relation}` record is a LOUD port failure, never a silently dropped cap: a guard
- * that fails to unbox is a runaway that would otherwise sail through.
+ * SAME numeric type the rust/go/python/php transports hand their own check. `model` is the one NULLABLE
+ * field: its key is always spelled and "no model" rides as `null`, which the error reports as "unknown".
+ * A field that is missing or not the declared type is a LOUD port failure, never a silently dropped cap:
+ * a guard that fails to unbox is a runaway that would otherwise sail through.
  */
 function relationGuardPort(port) {
-    if (port === undefined || port === null)
+    if (port === null)
         return null;
     const g = port;
-    const limit = typeof g.limit === 'bigint' ? Number(g.limit) : g.limit;
-    if (typeof limit !== 'number' || !Number.isInteger(limit) || typeof g.relation !== 'string') {
-        throw new Error(`scp leaf executeSQL: the 'guard' port must be a {limit:int, model?:string, relation:string} ` +
-            `relation cap, got ${JSON.stringify(port)}`);
-    }
-    return { limit, ...(typeof g.model === 'string' ? { model: g.model } : {}), relation: g.relation };
+    const at = `the 'guard' cap`;
+    const raw = requiredField(g, 'limit', at, 'int');
+    const model = requiredField(g, 'model', at, 'string|null');
+    return {
+        limit: Number(raw),
+        ...(model === null ? {} : { model }),
+        relation: requiredField(g, 'relation', at, 'string'),
+    };
+}
+/**
+ * Read one STRUCT field of the control record — a CONCRETE control struct or the `null` that spells its
+ * absence. The name is `keyof ExecOptions` MINUS the fields that are not structs, so the reader is tied
+ * to the leaf declaration at compile time in BOTH directions: renaming a field there breaks HERE rather
+ * than silently reading a key the generator no longer writes, and passing `'db'` — a nullable STRING —
+ * fails to compile rather than being confirmed against the wrong declared type.
+ */
+const OPTS_AT = `the 'opts' control record`;
+function optsField(opts, name) {
+    return requiredField(opts, name, OPTS_AT, 'record|null');
+}
+/**
+ * Read the `write` field of the control record — the statement's RUN MODE. `null` ⇒ a READ; a
+ * {@link WriteMode} ⇒ a write, carrying its own `returning`. The nesting is what makes "returns rows
+ * but is not a write" unrepresentable, so this reader has three outcomes, not four.
+ */
+function writeModePort(port) {
+    if (port === null)
+        return null;
+    return { returning: requiredField(port, 'returning', `the 'write' mode`, 'bool') };
 }
 /** Read the declared `executeSQL` ports off the evaluated port record (the generated module's Values). */
 function executeSqlPorts(ports) {
+    const at = 'the executeSQL payload';
+    const sql = requiredField(ports, 'sql', at, 'string');
+    const params = requiredField(ports, 'params', at, 'list');
+    // The ONE legitimate absence: no control record at all ⇒ the plain READ a bounded statement declares
+    // by OMITTING the port, so its payload is `sql` + `params` and nothing else. Once the port IS there it
+    // is read exactly like every field below — its own `null` is the same plain read, anything that is not
+    // an {@link ExecOptions} record is an ABI break.
+    const opts = 'opts' in ports ? requiredField(ports, 'opts', at, 'record|null') : null;
+    if (opts === null)
+        return { sql, params, write: null };
     return {
-        sql: ports.sql,
-        params: ports.params,
-        write: ports.write === true,
-        returning: ports.returning === true,
-        bigint: ports.bigint === true,
-        whereDynamic: (ports.whereDynamic ?? null),
-        guard: relationGuardPort(ports.guard),
+        sql,
+        params,
+        // The NAMED database — the one control field that is a bare `string|null` rather than a struct, so
+        // it is read against its own declared type instead of through `optsField`'s `record|null`.
+        db: requiredField(opts, 'db', OPTS_AT, 'string|null'),
+        write: writeModePort(optsField(opts, 'write')),
+        whereDynamic: optsField(opts, 'whereDynamic'),
+        guard: relationGuardPort(optsField(opts, 'guard')),
     };
 }
 /**
  * The two ENVIRONMENT-FREE relation handlers. `pluck`/`group` are pure in-memory shaping, so the sync
  * and async maps share this ONE definition (never a second copy per environment).
+ *
+ * Their ports are read through the SAME fail-closed reader the SQL transport uses
+ * ({@link requiredField}) — the flat shape is not a reason to trust it. A raw index + cast turned a
+ * MISTYPED `single` into a silently flipped relation CARDINALITY (a `hasOne` nesting a LIST, a `hasMany`
+ * nesting one child), a mistyped `into` into a relation nested under `"42"`, and an absent `pk`/`col`
+ * into a bare `Cannot read properties of undefined` that names no port at all (#213).
  */
+const PLUCK_AT = 'the pluck payload';
+const GROUP_AT = 'the group payload';
 const shapingHandlers = {
-    pluck: (ports) => ({ ok: pluck({ rows: ports.rows, col: ports.col }) }),
+    pluck: (ports) => ({
+        ok: pluck({
+            rows: requiredField(ports, 'rows', PLUCK_AT, 'list'),
+            col: requiredField(ports, 'col', PLUCK_AT, 'string[]'),
+        }),
+    }),
     group: (ports) => ({
         ok: group({
-            parents: ports.parents,
-            children: ports.children,
-            pk: ports.pk,
-            fk: ports.fk,
-            into: ports.into,
-            single: ports.single === true,
+            parents: requiredField(ports, 'parents', GROUP_AT, 'list'),
+            children: requiredField(ports, 'children', GROUP_AT, 'list'),
+            pk: requiredField(ports, 'pk', GROUP_AT, 'string[]'),
+            fk: requiredField(ports, 'fk', GROUP_AT, 'string[]'),
+            into: requiredField(ports, 'into', GROUP_AT, 'string'),
+            single: requiredField(ports, 'single', GROUP_AT, 'bool'),
         }),
     }),
 };

package/dist/scp/leaves.js.map

@@ -1 +1 @@
-{"version":3,"file":"leaves.js","sourceRoot":"","sources":["../../src/scp/leaves.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"leaves.js","sourceRoot":"","sources":["../../src/scp/leaves.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;;;AAkGH,oDAQC;AA+DD,gCAaC;AA2BD,gCAMC;AAGD,0CAMC;AAWD,sBAGC;AAWD,sBAGC;AAsND,oCAKC;AAMD,8CAKC;AA/dD,iDASwB;AACxB,iDAA6E;AAE7E,+CAAqE;AACrE,qDAA4D;AAC5D,iEAAgE;AAChE,yCAAyE;AAwDzE,kGAAkG;AAElG;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,SAAgB,oBAAoB,CAAC,CAAqE;IACxG,MAAM,IAAI,GAAG,gBAAgB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;IAClG,OAAO;QACL,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,MAAM,GAAG,IAAI,CAAC,IAAI;QAC/B,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;KAC7E,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CAAC,CAAkB;IAC5C,oGAAoG;IACpG,2EAA2E;IAC3E,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC;IACxB,IAAI,CAAC,CAAC,YAAY,IAAI,IAAI;QAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC/E,OAAO,EAAE,GAAG,oBAAoB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAChH,CAAC;AAED,qFAAqF;AACrF,SAAS,OAAO,CAAC,CAAkB;IACjC,OAAO,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,kFAAkF;AAElF;;;;;;;;;;;;;;GAcG;AACH,SAAS,YAAY,CAAC,MAA0B,EAAE,OAAgB;IAChE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QAChC,IAAI,OAAO,KAAK,UAAU,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;QACvD,OAAO,IAAA,iCAAoB,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,UAAU,CAAC,KAAyB;IAC3C,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACrD,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,UAAU,CAAC,CAAyE,EAAE,OAAgB;IACpH,IAAI,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;IAChB,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;QAC3B,KAAK,MAAM,KAAK,IAAI,CAAC,CAAC,MAAM;YAAE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;gBAAE,GAAG,GAAG,IAAA,qCAAkB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC/F,CAAC;IACD,GAAG,GAAG,IAAA,4BAAkB,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9C,oGAAoG;IACpG,kGAAkG;IAClG,oGAAoG;IACpG,oEAAoE;IACpE,MAAM,MAAM,GAAoB,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC1F,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAChC,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,YAAY,CAAC,IAAa;IACjC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;AAC9F,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,UAAU,CAAC,CAAkB,EAAE,GAAgB;IAC7D,MAAM,QAAQ,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAChE,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS;QAAE,OAAO,YAAY,CAAC,IAAA,kBAAO,EAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAClI,MAAM,IAAI,GAAG,IAAA,0BAAe,EAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAmC,CAAC;IACxH,IAAA,sCAAuB,EAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,0GAA0G;AACnG,KAAK,UAAU,eAAe,CAAC,CAAkB,EAAE,GAAqB;IAC7E,MAAM,QAAQ,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IAChE,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS;QAAE,OAAO,YAAY,CAAC,MAAM,IAAA,uBAAY,EAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAClJ,MAAM,IAAI,GAAG,CAAC,MAAM,IAAA,2BAAgB,EAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAmC,CAAC;IACtI,IAAA,sCAAuB,EAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,2FAA2F;AAE3F;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,CAA0D;IAC9E,MAAM,MAAM,GAAG,IAAA,0BAAe,EAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;IAC9C,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAClF,CAAC;AAED,kFAAkF;AAElF;;;;;;GAMG;AACH,SAAgB,KAAK,CAAC,CAAmJ;IACvK,MAAM,KAAK,GAAG,IAAA,qBAAU,EAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAC3C,OAAO,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,IAAA,yBAAc,EAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;AACpG,CAAC;AAED,8FAA8F;AAE9F;;;;;;;GAOG;AACH,MAAM,UAAU,GAAG;IACjB,IAAI,EAAE,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,SAAS;IAC5C,GAAG,EAAE,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ;IAC1C,MAAM,EAAE,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ;IAC7C,IAAI,EAAE,CAAC,CAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACtC,UAAU,EAAE,CAAC,CAAU,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;IACrF,MAAM,EAAE,CAAC,CAAU,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;CACjF,CAAC;AASF;;;;;;;;;GASG;AACH,SAAS,SAAS,CAAC,KAAc,EAAE,IAAY,EAAE,QAAkB;IACjE,MAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAA4B,CAAC;IACrH,IAAI,IAAI,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACrD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,kGAAkG;QAClG,kGAAkG;QAClG,qCAAqC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAU,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7F,MAAM,IAAI,KAAK,CAAC,aAAa,IAAI,YAAY,QAAQ,SAAS,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,aAAa,CAAC,MAA+B,EAAE,IAAY,EAAE,EAAU,EAAE,QAAkB;IAClG,IAAI,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,aAAa,EAAE,oBAAoB,IAAI,4CAA4C;YACjF,2FAA2F;YAC3F,4CAA4C,CAC/C,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,IAAI,GAAG,EAAE,QAAQ,CAAC,CAAC;AAChE,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,OAAO,GAAG,yBAAyB,CAAC;AAC1C,SAAS,gBAAgB,CAAC,IAAsB;IAC9C,MAAM,IAAI,GAAG,IAA0C,CAAC;IACxD,MAAM,EAAE,GAAG,2BAA2B,CAAC;IACvC,MAAM,KAAK,GAAI,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAe,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACtF,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,CAA4B,CAAC;QACnE,OAAO;YACL,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,CAAY;YAC3D,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,CAAW;YACpD,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,CAA+B;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO;QACL,KAAK;QACL,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAW;QAC9D,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAW;QAC9D,UAAU,EAAE,aAAa,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,CAAc;KAC5E,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,iBAAiB,CAAC,IAAa;IACtC,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/B,MAAM,CAAC,GAAG,IAA+B,CAAC;IAC1C,MAAM,EAAE,GAAG,iBAAiB,CAAC;IAC7B,MAAM,GAAG,GAAG,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,CAAW,CAAC;IAC3D,MAAM,KAAK,GAAG,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,CAAkB,CAAC;IAC5E,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC;QAClB,GAAG,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;QACpC,QAAQ,EAAE,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,CAAW;KAC/D,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,OAAO,GAAG,2BAA2B,CAAC;AAE5C,SAAS,SAAS,CAAC,IAA6B,EAAE,IAAqB;IACrE,OAAO,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,SAAS,aAAa,CAAC,IAAa;IAClC,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/B,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,IAA+B,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,CAAY,EAAE,CAAC;AAC3H,CAAC;AAED,0GAA0G;AAC1G,SAAS,eAAe,CAAC,KAA4B;IACnD,MAAM,EAAE,GAAG,wBAAwB,CAAC;IACpC,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,CAAW,CAAC;IAChE,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,CAAc,CAAC;IACvE,qGAAqG;IACrG,uGAAuG;IACvG,uGAAuG;IACvG,iDAAiD;IACjD,MAAM,IAAI,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,CAAoC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1H,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;IACvD,OAAO;QACL,GAAG;QACH,MAAM;QACN,mGAAmG;QACnG,2FAA2F;QAC3F,EAAE,EAAE,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,CAAkB;QACtE,KAAK,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC9C,YAAY,EAAE,SAAS,CAAC,IAAI,EAAE,cAAc,CAA4B;QACxE,KAAK,EAAE,iBAAiB,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;KACnD,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,QAAQ,GAAG,mBAAmB,CAAC;AACrC,MAAM,QAAQ,GAAG,mBAAmB,CAAC;AACrC,MAAM,eAAe,GAAa;IAChC,KAAK,EAAE,CAAC,KAAK,EAAe,EAAE,CAAC,CAAC;QAC9B,EAAE,EAAE,KAAK,CAAC;YACR,IAAI,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAmC;YACtF,GAAG,EAAE,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAa;SACnE,CAAqB;KACvB,CAAC;IACF,KAAK,EAAE,CAAC,KAAK,EAAe,EAAE,CAAC,CAAC;QAC9B,EAAE,EAAE,KAAK,CAAC;YACR,OAAO,EAAE,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAmC;YAC5F,QAAQ,EAAE,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAmC;YAC9F,EAAE,EAAE,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAa;YAChE,EAAE,EAAE,aAAa,CAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAa;YAChE,IAAI,EAAE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAW;YAChE,MAAM,EAAE,aAAa,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAY;SACpE,CAAqB;KACvB,CAAC;CACH,CAAC;AAEF;;;;GAIG;AACH,SAAgB,YAAY,CAAC,GAAgB;IAC3C,OAAO;QACL,GAAG,eAAe;QAClB,UAAU,EAAE,CAAC,KAAK,EAAe,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,GAAG,CAAqB,EAAE,CAAC;KAC1G,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAgB,iBAAiB,CAAC,GAAqB;IACrD,OAAO;QACL,GAAG,eAAe;QAClB,UAAU,EAAE,KAAK,EAAE,KAAK,EAAwB,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,eAAe,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAqB,EAAE,CAAC;KACtI,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACU,QAAA,sBAAsB,GAAqC;IACtE,UAAU,EAAE,aAAa;IACzB,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,gBAAgB;CACxB,CAAC"}

package/dist/scp/makesql/compile-select.d.ts

@@ -79,9 +79,36 @@ export interface SelectDesc extends RowLockOptions {
     offset?: number | BoundCount;
     append?: string;
 }
+/**
+ * A compiled SELECT, SPLIT at the end of its WHERE region — a superset of the `makeSQL` bundle every
+ * caller already consumes (`sql` = `head + tail`, `params` = `headParams` then `tailParams`).
+ *
+ * The split exists because a DYNAMIC (SKIP) WHERE has to be spliced at exactly that boundary at RUN time
+ * (CLAUDE.md §2), and this function is where the boundary IS: the WHERE clause is appended here and the
+ * `GROUP BY` / `ORDER BY` / page / lock / append tail is appended right after it. Handing the two sides
+ * over as text is what lets the five leaf transports CONCATENATE instead of re-DISCOVERING the boundary
+ * by scanning the finished statement — a scan that cannot tell a nested statement's tail keyword from the
+ * outer one's (#198) and cannot count a quoted `?` the way the placeholder render does (#202).
+ */
+export interface SelectBundle extends MakeSQL {
+    /** The statement UP TO the end of its WHERE region — where a dynamic clause joins. */
+    readonly head: string;
+    /** The params bound by `head`'s placeholders (CTE → JOIN → WHERE). */
+    readonly headParams: unknown[];
+    /** The statement AFTER the WHERE region (`GROUP BY` / `ORDER BY` / page / lock / append), `''` if none. */
+    readonly tail: string;
+    /** The params bound by `tail`'s placeholders (a bound `LIMIT ?` then `OFFSET ?`). */
+    readonly tailParams: unknown[];
+    /**
+     * How a clause spliced at `head`'s end JOINS: `'AND'` when the statement already carries a static
+     * WHERE (the clause CONTINUES it), `'WHERE'` when it carries none (the clause OPENS one). Decided by
+     * the `if (whereClause)` guard below — the ONE place that knows whether this statement has a WHERE.
+     */
+    readonly lead: 'WHERE' | 'AND';
+}
 /**
  * Compile a SELECT to a `makeSQL` bundle, byte-identical to `_buildSelectSQL`.
  * Empty WHERE ⇒ no ` WHERE` (matches the original's `if (whereClause)` guard).
  */
-export declare function compileSelect(desc: SelectDesc): MakeSQL;
+export declare function compileSelect(desc: SelectDesc): SelectBundle;
 //# sourceMappingURL=compile-select.d.ts.map

package/dist/scp/makesql/compile-select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compile-select.d.ts","sourceRoot":"","sources":["../../../src/scp/makesql/compile-select.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;CACf;AAOD,yGAAyG;AACzG,MAAM,WAAW,cAAc;IAC7B,0FAA0F;IAC1F,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+FAA+F;IAC/F,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAUrD;AAED,2FAA2F;AAC3F,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,4GAA4G;IAC5G,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;IACvB,GAAG,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,CAAC;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAoCvD"}
+{"version":3,"file":"compile-select.d.ts","sourceRoot":"","sources":["../../../src/scp/makesql/compile-select.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC;;;;;;;GAOG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,OAAO,CAAC;CACf;AAOD,yGAAyG;AACzG,MAAM,WAAW,cAAc;IAC7B,0FAA0F;IAC1F,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,+FAA+F;IAC/F,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAUrD;AAED,2FAA2F;AAC3F,MAAM,WAAW,UAAW,SAAQ,cAAc;IAChD,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,4GAA4G;IAC5G,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;IACvB,GAAG,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,OAAO,EAAE,CAAA;KAAE,CAAC;IACvD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C,sFAAsF;IACtF,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,sEAAsE;IACtE,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;IAC/B,2GAA2G;IAC3G,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,qFAAqF;IACrF,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,KAAK,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,YAAY,CAuC5D"}

package/dist/scp/makesql/compile-select.js

@@ -56,43 +56,45 @@ function lockTail(opts) {
  * Empty WHERE ⇒ no ` WHERE` (matches the original's `if (whereClause)` guard).
  */
 function compileSelect(desc) {
-    const params = [];
+    const headParams = [];
     const selectCols = desc.select || (desc.selectColumn ?? '*');
     const formatter = (0, compile_1.formatterFor)(desc.dialect);
     // Param order (matches SQL order): CTE params → JOIN params → WHERE params.
     if (desc.cte?.params && desc.cte.params.length > 0)
-        params.push(...desc.cte.params);
+        headParams.push(...desc.cte.params);
     if (desc.joinParams && desc.joinParams.length > 0)
-        params.push(...desc.joinParams);
-    const whereClause = (0, json_array_1.conditionsFor)(desc.conditions ?? {}, desc.dialect).compile(params, formatter);
-    let sql = '';
+        headParams.push(...desc.joinParams);
+    const whereClause = (0, json_array_1.conditionsFor)(desc.conditions ?? {}, desc.dialect).compile(headParams, formatter);
+    let head = '';
     if (desc.cte)
-        sql = `WITH ${desc.cte.name} AS (${desc.cte.sql}) `;
-    sql += `SELECT ${selectCols} FROM ${desc.tableName}`;
+        head = `WITH ${desc.cte.name} AS (${desc.cte.sql}) `;
+    head += `SELECT ${selectCols} FROM ${desc.tableName}`;
     if (desc.join)
-        sql += ` ${desc.join}`;
+        head += ` ${desc.join}`;
     if (whereClause)
-        sql += ` WHERE ${whereClause}`;
+        head += ` WHERE ${whereClause}`;
+    let tail = '';
     if (desc.group)
-        sql += ` GROUP BY ${desc.group}`;
+        tail += ` GROUP BY ${desc.group}`;
     const orderClause = typeof desc.order === 'string' ? desc.order : (0, Column_1.orderToString)(desc.order);
     if (orderClause)
-        sql += ` ORDER BY ${orderClause}`;
+        tail += ` ORDER BY ${orderClause}`;
     // The page tail: a static count is the original's inline literal; a bound one emits `?` and joins
     // the value list HERE, after the WHERE params — the order the `?`s occupy in the finished text.
+    const tailParams = [];
     const count = (c) => {
         if (!isBoundCount(c))
             return String(c);
-        params.push(c.bind);
+        tailParams.push(c.bind);
         return '?';
     };
     if (desc.limit !== undefined)
-        sql += ` LIMIT ${count(desc.limit)}`;
+        tail += ` LIMIT ${count(desc.limit)}`;
     if (desc.offset !== undefined)
-        sql += ` OFFSET ${count(desc.offset)}`;
-    sql += lockTail(desc);
+        tail += ` OFFSET ${count(desc.offset)}`;
+    tail += lockTail(desc);
     if (desc.append)
-        sql += ` ${desc.append}`;
-    return { sql, params };
+        tail += ` ${desc.append}`;
+    return { sql: head + tail, params: [...headParams, ...tailParams], head, headParams, tail, tailParams, lead: whereClause ? 'AND' : 'WHERE' };
 }
 //# sourceMappingURL=compile-select.js.map

package/dist/scp/makesql/compile-select.js.map

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

package/dist/scp/makesql/index.d.ts

@@ -21,10 +21,10 @@ export { inferPgArrayType, resolvePgArrayCast, PG_ARRAY_CAST_TOKEN, compileSingl
 export type { RelationCompileBase } from './compile-relation';
 export { inListJson, inListPredicate, encodeJsonArrayParam, JsonArrayConditions, conditionsFor } from './json-array';
 export { mysqlInsertJson, sqliteInsertJson, mysqlUpdateManyJson, sqliteUpdateManyJson, mysqlJsonTableColumn, rowsHaveDbToken, } from './json-batch';
-export { deriveTransactionPlan, deriveBatchPlan, literalize, executeTransaction, executeTransactionAsync, countingDriver, renderTxStatement, compileWriteNode, pgTypeSpecimen, IN_SENTINEL, } from './tx';
+export { deriveBatchPlan, literalize, executeTransactionAsync, renderTxStatement, compileWriteNode, pgTypeSpecimen, ENTITY_ROOT, IN_SENTINEL, } from './tx';
 export { mysqlPkHint, stripMysqlPkHint, buildMysqlReselect, bindReselect } from './mysql-returning';
 export type { MysqlReselect, ReselectBind } from './mysql-returning';
-export type { TxExpr, TxOp, StatementRole, GateRule, TxStatement, IdempotentHitPolicy, TransactionPlan, BaseWrite, SqliteDb, ShortCircuitReason, TransactionResult, WriteExecOptions, } from './tx';
+export type { TxExpr, TxOp, StatementRole, TxStatement, TransactionPlan, WriteLifecyclePhase, TransactionResult, WriteExecOptions, } from './tx';
 export { configurePgDeboxTypeParsers, mysqlDeboxPoolOptions, pgConnectionPool, mysqlConnectionPool, pgPoolFactory, mysqlPoolFactory } from './pool-executor';
 export type { PgPoolLike, MysqlPoolLike, PgTypesLike, PgModuleLike, Mysql2ModuleLike, PgOwnedPoolLike, PgPoolClientLike, MysqlOwnedPoolLike, MysqlPoolConnLike, PgOwnedPoolWithEnd, MysqlOwnedPoolWithEnd, PgFactoryModuleLike } from './pool-executor';
 //# sourceMappingURL=index.d.ts.map

package/dist/scp/makesql/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/scp/makesql/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,2BAA2B,EAC3B,SAAS,EACT,eAAe,EACf,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGjE,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,kBAAkB,GACnB,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAGvE,OAAO,EACL,YAAY,EACZ,WAAW,EACX,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EACL,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAG7D,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,yBAAyB,EACzB,uBAAuB,EACvB,4BAA4B,EAC5B,kCAAkC,EAClC,0BAA0B,EAC1B,gCAAgC,GACjC,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrH,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,UAAU,EACV,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,WAAW,GACZ,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpG,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,YAAY,EACV,MAAM,EACN,IAAI,EACJ,aAAa,EACb,QAAQ,EACR,WAAW,EACX,mBAAmB,EACnB,eAAe,EACf,SAAS,EACT,QAAQ,EACR,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC7J,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/scp/makesql/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,2BAA2B,EAC3B,SAAS,EACT,eAAe,EACf,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGjE,OAAO,EACL,kBAAkB,EAClB,WAAW,EACX,cAAc,EACd,kBAAkB,GACnB,MAAM,WAAW,CAAC;AACnB,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAGvE,OAAO,EACL,YAAY,EACZ,WAAW,EACX,WAAW,EACX,YAAY,EACZ,eAAe,EACf,eAAe,GAChB,MAAM,WAAW,CAAC;AAGnB,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,YAAY,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAGnD,OAAO,EACL,UAAU,EACV,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACb,iBAAiB,GAClB,MAAM,gBAAgB,CAAC;AACxB,YAAY,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAG7D,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,mBAAmB,EACnB,yBAAyB,EACzB,uBAAuB,EACvB,4BAA4B,EAC5B,kCAAkC,EAClC,0BAA0B,EAC1B,gCAAgC,GACjC,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAI9D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AACrH,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,GAChB,MAAM,cAAc,CAAC;AAGtB,OAAO,EACL,eAAe,EACf,UAAU,EACV,uBAAuB,EACvB,iBAAiB,EACjB,gBAAgB,EAChB,cAAc,EACd,WAAW,EACX,WAAW,GACZ,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACpG,YAAY,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACrE,YAAY,EACV,MAAM,EACN,IAAI,EACJ,aAAa,EACb,WAAW,EACX,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,MAAM,CAAC;AAId,OAAO,EAAE,2BAA2B,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC7J,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,gBAAgB,EAAE,eAAe,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC"}