litedbmodel 2.1.0 → 2.2.1

package/dist/scp/makesql/mysql-returning.js

@@ -0,0 +1,215 @@
+"use strict";
+/**
+ * litedbmodel v2 SCP — **MySQL has no `RETURNING`**: the one place that knowledge lives.
+ *
+ * A write compiled for the `mysql` dialect carries the SAME ` RETURNING <cols>` tail as the PG /
+ * SQLite bundles (the compilers are dialect-neutral about it), plus a strip-before-execute
+ * `/*scp:pk=…;ai=…[;conflict=…]* /` comment naming the target's REAL primary key. MySQL parses
+ * neither, so the driver seam STRIPS both and recovers the written rows with a SELECT keyed on
+ * whatever identifies them:
+ *
+ *  | write            | the rows are recovered by                                          | when      |
+ *  |------------------|--------------------------------------------------------------------|-----------|
+ *  | create           | the AUTO_INCREMENT range `[LAST_INSERT_ID, +affected)`, or the      | after     |
+ *  |                  | client-supplied PK values pulled from the INSERT params by position |           |
+ *  | createMany       | the same AUTO_INCREMENT range (N consecutive ids)                  | after     |
+ *  | upsert / …Many   | the CONFLICT key (MySQL does not report the conflicted-row id, so   | after     |
+ *  |                  | the AUTO_INCREMENT range is wrong when a row was UPDATED)          |           |
+ *  | update           | the write's OWN WHERE predicate                                    | after     |
+ *  | updateMany       | the batch JOIN key, re-bound from the SAME JSON payload            | after     |
+ *  | delete/deleteMany| the write's OWN WHERE predicate — **before** the write, since the   | BEFORE    |
+ *  |                  | rows no longer exist once the DELETE has run                       |           |
+ *
+ * The recovering SELECT runs on the SAME connection as the write, so inside a transaction it sees
+ * the not-yet-committed rows — and a `DELETE`'s pre-image SELECT is inside the same transaction as
+ * the delete it describes.
+ *
+ * This module is the TypeScript member of a 5-language SSoT: `rust/litedbmodel_runtime/src/livedb.rs`
+ * (`build_mysql_reselect`), `go/litedbmodel_runtime/livedb.go`, `python/litedbmodel_runtime/driver.py`
+ * and `php/src/LiveDb.php` derive the identical write/select/bind triple. Both TS execution paths —
+ * the generated (codegen) leaf `executeSQL` and the mode-2 transaction plan — reach it through the
+ * ONE mysql connection adapter (`pool-executor.mysqlConnection`), so they cannot return different rows.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mysqlPkHint = mysqlPkHint;
+exports.stripMysqlPkHint = stripMysqlPkHint;
+exports.buildMysqlReselect = buildMysqlReselect;
+exports.bindReselect = bindReselect;
+/** The strip-before-execute PK-hint comment marker. */
+const MYSQL_PK_HINT_RE = /\s*\/\*scp:pk=[^*]*\*\//;
+/**
+ * Serialize a {@link TxOp.pk} descriptor into a strip-before-execute SQL comment appended to an
+ * INSERT…RETURNING op, so the MySQL driver emulation can re-select by the REAL primary key. The
+ * comment is STRIPPED (with the RETURNING clause) before the write executes, so the executed SQL
+ * stays byte-clean; it is emitted ONLY into the mysql-dialect bundle (PG/SQLite keep native
+ * RETURNING and never see it). Format: ` /*scp:pk=col1,col2;ai=<autoIncCol|>[;conflict=<cols>]* /`.
+ *
+ * `conflict` (the upsert conflict-target column list) is added when the write is an upsert — the mysql
+ * driver re-selects the upserted row(s) by that key. Its source is `op.writeMeta.onConflict` (single
+ * writes carry it); an ad-hoc TxOp built without writeMeta (the batch createMany/upsertMany path)
+ * passes the columns via `onConflict`.
+ */
+function mysqlPkHint(op, onConflict) {
+    if (op.pk === undefined)
+        return op;
+    if (!/\breturning\b/i.test(op.sql))
+        return op;
+    if (MYSQL_PK_HINT_RE.test(op.sql))
+        return op; // idempotent: never append a second hint
+    const conflict = onConflict ?? op.writeMeta?.onConflict;
+    const conflictPart = conflict !== undefined && conflict.length > 0 ? `;conflict=${conflict}` : '';
+    const hint = ` /*scp:pk=${op.pk.columns.join(',')};ai=${op.pk.autoInc ?? ''}${conflictPart}*/`;
+    return { ...op, sql: op.sql + hint };
+}
+/** Strip a trailing MySQL PK-hint comment from a rendered SQL (defensive; runtimes strip too). */
+function stripMysqlPkHint(sql) {
+    return sql.replace(MYSQL_PK_HINT_RE, '');
+}
+/** The `,`-separated INSERT column list (`INSERT [IGNORE] INTO t (a, b, c)` → `['a','b','c']`). */
+function insertCols(writeSql) {
+    const m = /\bINSERT\s+(?:IGNORE\s+)?INTO\s+[A-Za-z0-9_."`]+\s*\(([^)]*)\)/i.exec(writeSql);
+    return m === null ? [] : m[1].split(',').map((c) => c.trim());
+}
+/** The target table — the identifier after `INSERT INTO` / `UPDATE` / `DELETE FROM`. */
+function tableOf(writeSql) {
+    const m = /\b(?:INSERT\s+(?:IGNORE\s+)?INTO|UPDATE|DELETE\s+FROM)\s+([A-Za-z0-9_."`]+)/i.exec(writeSql);
+    return m === null ? null : m[1];
+}
+/** The JOIN key column of an updateMany (`ON <alias>.<col> = JSON_UNQUOTE(…)`). */
+function updateBatchKey(writeSql) {
+    const m = /\sON\s+[A-Za-z0-9_]*\.?([A-Za-z0-9_]+)\s*=/i.exec(writeSql);
+    return m === null ? null : m[1];
+}
+/** The hint's `pk=` columns + `ai=` AUTO_INCREMENT column (absent hint ⇒ `[]` / `''`). */
+function parsePkHint(hintRegion) {
+    const m = /\/\*scp:pk=([^;*]*);ai=([^;*]*)/i.exec(hintRegion);
+    if (m === null)
+        return { pk: [], autoInc: '' };
+    return { pk: m[1].split(',').map((c) => c.trim()).filter((c) => c.length > 0), autoInc: m[2].trim() };
+}
+/** The hint's `conflict=` columns (the upsert conflict target). Empty ⇒ not an upsert. */
+function parseConflictHint(hintRegion) {
+    const m = /;conflict=([^*]*)\*\//i.exec(hintRegion);
+    if (m === null)
+        return [];
+    return m[1].split(',').map((c) => c.trim()).filter((c) => c.length > 0);
+}
+/** The `?` count of a SQL fragment (the write's params are positional, so a count IS an index). */
+function placeholders(fragment) {
+    return (fragment.match(/\?/g) ?? []).length;
+}
+/**
+ * Derive the MySQL RETURNING recovery for `sql`, or `null` when the statement declares no RETURNING
+ * (a plain write / a SELECT — the caller runs it unchanged).
+ *
+ * Fail-closed: a RETURNING write whose key cannot be identified (an upsert with no `conflict=` hint,
+ * an INSERT whose declared PK column is not in its column list, an UPDATE/DELETE with no WHERE)
+ * THROWS rather than silently returning no rows — returning `[]` for a write the caller asked to
+ * describe is exactly the defect this module exists to remove.
+ */
+function buildMysqlReselect(sql) {
+    const retPos = sql.toLowerCase().lastIndexOf(' returning ');
+    if (retPos < 0)
+        return null;
+    const hintRegion = sql.slice(retPos);
+    const cols = stripMysqlPkHint(sql.slice(retPos + ' returning '.length)).trim();
+    const { pk, autoInc } = parsePkHint(hintRegion);
+    const conflict = parseConflictHint(hintRegion);
+    const writeSql = stripMysqlPkHint(sql.slice(0, retPos)).trim();
+    const lower = writeSql.toLowerCase();
+    const table = tableOf(writeSql);
+    if (table === null)
+        throw new Error(`scp write(mysql): cannot parse the target table of '${writeSql.slice(0, 60)}…'`);
+    // Order by the DECLARED pk so MySQL matches the pg/sqlite RETURNING order (§10 all-dialect parity).
+    const orderBy = pk.length > 0 ? ` ORDER BY ${pk.join(', ')}` : '';
+    const isBatch = lower.includes('json_table(');
+    const done = (selectSql, binds, before = false) => ({ writeSql, selectSql, binds, before });
+    /** Recover a BATCH write's rows by reading its key set back out of the SAME JSON payload it bound. */
+    const jsonSelect = (key) => `SELECT ${cols} FROM ${table} WHERE ${key} IN ` +
+        `(SELECT JSON_UNQUOTE(jt.${key}) FROM JSON_TABLE(?, '$[*]' COLUMNS(${key} JSON PATH '$.${key}')) jt)${orderBy}`;
+    // upsert / upsertMany — by the CONFLICT key. MySQL does not report which row an ON DUPLICATE KEY
+    // UPDATE touched, so the AUTO_INCREMENT range is wrong as soon as a row was updated, not inserted.
+    if (lower.startsWith('insert') && lower.includes('on duplicate key update')) {
+        const key = conflict[0];
+        if (key === undefined) {
+            throw new Error(`scp write(mysql): an upsert…RETURNING needs its conflict key in the pk hint ('${writeSql.slice(0, 60)}…')`);
+        }
+        if (isBatch)
+            return done(jsonSelect(key), [{ kind: 'json' }]);
+        const index = insertCols(writeSql).indexOf(key);
+        if (index < 0)
+            throw new Error(`scp write(mysql): conflict key '${key}' is not among the INSERT columns of '${writeSql.slice(0, 60)}…'`);
+        return done(`SELECT ${cols} FROM ${table} WHERE ${key} = ?${orderBy}`, [{ kind: 'param', index }]);
+    }
+    // create / createMany — by the AUTO_INCREMENT range [LAST_INSERT_ID, +affected), or by the
+    // client-supplied PK values pulled from the INSERT params by column position (UUID / composite).
+    if (lower.startsWith('insert')) {
+        if (autoInc !== '' && pk.length === 1 && pk[0] === autoInc) {
+            return done(`SELECT ${cols} FROM ${table} WHERE ${autoInc} >= ? AND ${autoInc} < ?${orderBy}`, [
+                { kind: 'lastId' },
+                { kind: 'highId' },
+            ]);
+        }
+        if (pk.length === 0) {
+            throw new Error(`scp write(mysql): an INSERT…RETURNING carries no pk hint, so its written rows cannot be identified ` +
+                `('${writeSql.slice(0, 60)}…'). The producer must pass the model's declared primary key.`);
+        }
+        if (isBatch) {
+            // createMany with a CLIENT-supplied key: the statement binds ONE JSON payload, not one param per
+            // key, so the keys are read back out of that SAME payload — as the upsertMany arm does. (An
+            // AUTO_INCREMENT batch never reaches here; its N consecutive ids are the range above.)
+            if (pk.length !== 1) {
+                throw new Error(`scp write(mysql): a batch INSERT…RETURNING on the COMPOSITE key (${pk.join(', ')}) cannot be ` +
+                    `recovered from its JSON payload ('${writeSql.slice(0, 60)}…').`);
+            }
+            return done(jsonSelect(pk[0]), [{ kind: 'json' }]);
+        }
+        const cols4 = insertCols(writeSql);
+        const binds = [];
+        const conds = [];
+        for (const c of pk) {
+            const index = cols4.indexOf(c);
+            if (index < 0)
+                throw new Error(`scp write(mysql): PK column '${c}' is not among the INSERT columns of '${writeSql.slice(0, 60)}…'`);
+            conds.push(`${c} = ?`);
+            binds.push({ kind: 'param', index });
+        }
+        return done(`SELECT ${cols} FROM ${table} WHERE ${conds.join(' AND ')}${orderBy}`, binds);
+    }
+    // updateMany — by the batch JOIN key, re-selected from the SAME JSON payload the write bound.
+    if (lower.startsWith('update') && isBatch) {
+        const key = updateBatchKey(writeSql);
+        if (key === null)
+            throw new Error(`scp write(mysql): cannot parse the batch JOIN key of '${writeSql.slice(0, 60)}…'`);
+        return done(jsonSelect(key), [{ kind: 'json' }]);
+    }
+    // update / delete — by the write's OWN WHERE predicate, bound from the write's own params. The
+    // UPDATE re-selects AFTER the write (the rows carry their new values); the DELETE re-selects
+    // BEFORE it (afterwards there is nothing left to describe).
+    const wherePos = lower.lastIndexOf(' where ');
+    if (wherePos < 0) {
+        throw new Error(`scp write(mysql): a ${lower.startsWith('delete') ? 'DELETE' : 'UPDATE'}…RETURNING needs a WHERE to recover its rows ('${writeSql.slice(0, 60)}…')`);
+    }
+    const whereSql = writeSql.slice(wherePos + ' where '.length).trim();
+    const before = placeholders(writeSql.slice(0, wherePos));
+    const binds = [];
+    for (let i = 0; i < placeholders(whereSql); i++)
+        binds.push({ kind: 'param', index: before + i });
+    return done(`SELECT ${cols} FROM ${table} WHERE ${whereSql}${orderBy}`, binds, lower.startsWith('delete'));
+}
+/** Bind {@link MysqlReselect.binds} against the write's params + the write's own result. */
+function bindReselect(binds, params, lastInsertId, affected) {
+    return binds.map((b) => {
+        switch (b.kind) {
+            case 'lastId':
+                return lastInsertId;
+            case 'highId':
+                return lastInsertId + Math.max(1, affected);
+            case 'json':
+                return params[0];
+            case 'param':
+                return params[b.index];
+        }
+    });
+}
+//# sourceMappingURL=mysql-returning.js.map

package/dist/scp/makesql/mysql-returning.js.map

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

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

@@ -1,27 +1,22 @@
 /**
- * litedbmodel v2 SCP — codegen `outType` derivation (spec §4.1; issues #58/#56).
+ * litedbmodel v2 SCP — read-row de-box type derivation (spec §4.1; issues #58/#59).
  *
- * bc's TYPED-RAW de-box emitters (`rust-typed-raw` / `go-typed-raw` / `typescript-typed`) require
- * each read node to carry an `outType` and the component an `outputType` (bc portable type
- * notation). WITHOUT them the emitter hard-fails ("nothing to de-box") — the correct fail-closed
- * behavior. This module derives those annotations for a READ component from:
+ * The read-column coverage + de-box SSoT for the op-independent leaf path. It resolves a read's
+ * projection ONCE into two projections of the SAME column-type resolution:
  *
- *   1. the per-node SELECT projection (`table` + `select` ports) → a row `obj` type, each column's
- *      bc scalar resolved from its SQL type (the schema/DDL SoT) via {@link sqlTypeToBcScalar};
- *   2. the node cardinality (a Select node returns a row LIST → `{arr:rowObj}`; a Count → `int`; a
- *      `.map` node wraps its per-element handler result → `{arr:<elem>}`);
- *   3. the component `output` Φ-expression, walked to compose the `outputType` from the node types
- *      (`{ref:[nodeId]}` → that node's outType; `{obj:{…}}`/`{arr:…}`/`{opt:…}` recurse).
+ *   - {@link deriveReadRow} — the read ROW `{arr:{obj:{outputKey: <read-de-boxed scalar>}}}` (the
+ *     bc `outType` bc's native emitter reads for the typed de-box, #154) PLUS the TS-leaf
+ *     `materializers` coercion map. Array columns read as `{arr:<element>}` (the SSoT array split
+ *     {@link import('../coltype').arrayElementType}); the element rides the SAME de-box scalar.
+ *   - {@link outputType} — composes the component `outputType` by walking the `output` Φ-expression
+ *     against a `nodeId → outType` map.
  *
- * Spec §4.1 discipline: an ambiguous/unmappable projection is a HARD ERROR (no-assume,
- * no-fallback) — a `*` projection, a computed/aliased column, or a column with no schema type
- * THROWS. It is NEVER degraded to a boxed/untyped output; that would silently defeat the de-box.
+ * Spec §4.1 discipline: an ambiguous/unmappable projection is a HARD ERROR (no-assume, no-fallback)
+ * — a `*` projection, a computed column (typed reads only), or an undeclared/unknown-type column
+ * THROWS via {@link parseProjectionColumn} + the coltype SSoT; never a boxed/untyped output.
  */
-import type { PortableType } from 'behavior-contracts';
-import type { Component, ComponentRefNode, MapNode } from '../authoring';
+import type { PortableType } from 'behavior-contracts/runtime';
 import { type MaterializeClass, type ColumnTypeResolver } from '../coltype';
-/** A body node that is a component ref or a map (a cond node has no SELECT projection). */
-type RefLike = ComponentRefNode | MapNode;
 /**
  * A parsed `select`-list entry (issue #59). Either a SCHEMA-COLUMN reference (bare / qualified /
  * aliased — resolvable to a declared column type + a driver-row output key) OR a COMPUTED expression
@@ -56,44 +51,35 @@ export type ProjectionEntry = {
  * it. This ONE parser guarantees every shape is classified identically for both paths.
  */
 export declare function parseProjectionColumn(col: string, table: string, at: string): ProjectionEntry;
-/** The outType of ONE read body node (thin wrapper over {@link nodeTypes} for external callers). */
-export declare function nodeOutType(node: RefLike, resolveColumnType: ColumnTypeResolver): PortableType;
+/** The read row TYPE (SSoT) + its TS-leaf coercion map — two projections of ONE column resolution. */
+export interface ReadRow {
+    /** The read row `{arr:{obj:{outputKey: readScalar}}}` — the SINGLE row-type representation (#141). */
+    readonly outType: PortableType;
+    /** `outputKey → MaterializeClass` (non-passthrough only) — the TS-leaf coercion derived from the SAME row. */
+    readonly materializers: Record<string, MaterializeClass>;
+}
 /**
- * PRE-COMPILE node-output type (bc 0.8.0 SA5 / #12): the determined `PortableType` a litedbmodel CRUD
- * leaf annotates its authored node with, via bc's `.as(t)` recording API, so `compileBehaviors`'
- * all-nodes-typed gate (`UNTYPED_NODE`) passes. Computed from the RAW authored ports (a plain `table`
- * string + a plain `select` / `returning` column list — the same projection SoT `deriveReadOutTypes`
- * reads post-compile, just moved to authoring time) + the model's inline `static columns` resolver.
- *
- *  - `Select` → the row LIST `{arr:{obj:{outKey:<scalar>,…}}}` from the `select` projection. This is
- *    the value `.as` takes in BOTH positions: a top-level Select node's `outType` is this list; a
- *    mapped Select's `.as` records it as the map ELEMENT type (bc convention — the per-parent row list).
- *  - `Count` → NOT handled here: its output is the static `int` catalog `elemType` (no `.as`).
- *  - `Insert`/`Update`/`Delete` → the RETURNING row list `{arr:{obj:…}}` from the `returning` port
- *    (bare-column list). No `returning` → an EMPTY row list `{arr:{obj:{}}}` (the write surfaces rows
- *    only via RETURNING; a no-RETURNING write yields empty rows — mirrors `writeouttype.ts`).
- *
- * Schema columns are parsed by the SAME {@link parseProjectionColumn} the read/codegen paths use and
- * typed via the resolver (an undeclared column fails closed here at authoring — earlier than the
- * post-compile derivation). A COMPUTED projected column (`COUNT(*) as n`, a cast, a literal) is OMITTED
- * from the typed row struct — the read path leaves a computed column RAW (#59: "the read path leaves it
- * raw; the codegen path rejects it"), so its field is absent from the de-box row type. This keeps the
- * node's outType DETERMINED (gate passes) while preserving #59's raw-computed read behavior; the typed
- * codegen path independently rejects a computed projection later (it needs every field typed). The
- * value is the OUTPUT-row type only; SQL stays opaque text on the makeSQL leaf (types the node OUTPUT,
- * never the SQL).
+ * Derive the read ROW from a projection (#141 SSoT + #59 op-builder guard). Resolves each projected
+ * column ONCE via the SHARED {@link parseProjectionColumn} + the coltype SSoT, producing BOTH:
+ *   - `outType` — `{arr:{obj:{outputKey: keyArrayElemScalar(sqlType)}}}`, the READ-DE-BOXED scalar
+ *     (int32→`float`(number) / BIGINT→`string` / BOOLEAN→`bool` / DATE→`string` / text/uuid→`string`).
+ *     This is the ONE row-type representation: bc's native emitter reads it for the typed de-box
+ *     (#154), and it is the conform target the TS leaf coercion below produces.
+ *   - `materializers` — the TS-leaf coercion map ({@link sqlTypeToMaterializeClass}); the leaf coerces
+ *     each driver cell (BIGINT→exact string / DATE→string / BOOLEAN→boolean) so the row MATCHES `outType`
+ *     before bc conforms it (bc conform VALIDATES, does not coerce). Derived from the SAME resolution as
+ *     `outType`, so the coerced JS form always equals the declared read scalar — no second row type.
+ * This IS the #59 read-column coverage guard: `*`/`t.*` throws (unknown column list), an undeclared
+ * column or unknown SQL type throws. A COMPUTED projection (`COUNT(*)`, cast, literal) is left RAW
+ * (omitted from BOTH) — #59: "the read path leaves it raw".
  */
-export declare function crudNodeAsType(component: string, ports: Record<string, unknown>, resolveColumnType: ColumnTypeResolver, at: string): PortableType;
+export declare function deriveReadRow(table: string, projection: readonly string[], resolveColumnType: ColumnTypeResolver, at: string): ReadRow;
 /**
- * Per-node `outType` (keyed by body node id) + the component `outputType`, derived for a READ
- * component (spec §4.1). `cond` nodes are skipped for the per-node map but a `cond` at the OUTPUT
- * position (a shared-branch merge) would be handled by {@link outputType} if reached — the bench's
- * read outputs are ref / obj compositions of Select nodes. Any ambiguity throws (fail-closed).
+ * Derive the component `outputType` by walking the `output` Φ-expression against a `nodeId →
+ * outType` map. `{ref:[id]}` resolves to that node's outType; `{obj:{k:expr,…}}` /
+ * `{arr:expr}` / `{opt:expr}` recurse structurally. A `ref` to an unknown id, or an operator the
+ * typed output path does not cover, is a HARD ERROR (no-assume, no-fallback) — the output must be
+ * a pure composition of typed node results, never a boxed dynamic tree.
  */
-export declare function deriveReadOutTypes(component: Component, resolveColumnType: ColumnTypeResolver): {
-    byNode: Map<string, PortableType>;
-    outputType: PortableType;
-    materializersByNode: Map<string, Record<string, MaterializeClass>>;
-};
-export {};
+export declare function outputType(output: unknown, byNode: Map<string, PortableType>, at: string): PortableType;
 //# sourceMappingURL=outtype.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"outtype.d.ts","sourceRoot":"","sources":["../../../src/scp/makesql/outtype.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAsB,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACzE,OAAO,EAA+D,KAAK,gBAAgB,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAczI,2FAA2F;AAC3F,KAAK,OAAO,GAAG,gBAAgB,GAAG,OAAO,CAAC;AAwC1C;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,8FAA8F;IAC9F,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,kFAAkF;IAClF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;gFAC4E;IAC5E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,eAAe,CA8B7F;AAuFD,oGAAoG;AACpG,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,GAAG,YAAY,CAE9F;AAwDD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,iBAAiB,EAAE,kBAAkB,EACrC,EAAE,EAAE,MAAM,GACT,YAAY,CAoCd;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,kBAAkB,GACpC;IAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAAC,UAAU,EAAE,YAAY,CAAC;IAAC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAA;CAAE,CAWrI"}
+{"version":3,"file":"outtype.d.ts","sourceRoot":"","sources":["../../../src/scp/makesql/outtype.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAqF,KAAK,gBAAgB,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAW/J;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,8FAA8F;IAC9F,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,kFAAkF;IAClF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B;gFAC4E;IAC5E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B,GACD;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,eAAe,CA8B7F;AAGD,sGAAsG;AACtG,MAAM,WAAW,OAAO;IACtB,sGAAsG;IACtG,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAC/B,8GAA8G;IAC9G,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC1D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,SAAS,MAAM,EAAE,EAC7B,iBAAiB,EAAE,kBAAkB,EACrC,EAAE,EAAE,MAAM,GACT,OAAO,CAyBT;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,YAAY,CA6CvG"}