neoorm 0.1.4 → 0.2.0

package/dist/runtime/query/create.js

@@ -1,128 +1,91 @@
-import { quoteIdentifier } from "../../dialect/postgres.js";
-import { buildInsertQuery, dataToSqlValues, rowToTs, } from "./compile.js";
+import { buildInsertManyQuery, buildInsertManyValueRows, buildInsertQuery, dataToSqlValues, rowToTs, } from "./compile.js";
 import { loadRelations } from "./find.js";
-import { fillMissingPrimaryKeys } from "./primary-key.js";
-async function resolveConnectOrCreate(executor, manifest, targetAccessor, items) {
-    const ids = [];
-    const targetTable = manifest.tables[targetAccessor];
-    if (!targetTable)
-        throw new Error(`Unknown table: ${targetAccessor}`);
-    for (const item of items) {
-        const whereKey = Object.keys(item.where)[0];
-        const whereVal = item.where[whereKey];
-        if (whereKey && whereVal !== undefined) {
-            const col = targetTable.columns.find((c) => c.tsName === whereKey);
-            const sqlCol = col ? quoteIdentifier(col.sqlName) : quoteIdentifier(whereKey);
-            const existing = await executor.queryOne(`SELECT id FROM ${quoteIdentifier(targetTable.sqlName)} WHERE ${sqlCol} = $1 LIMIT 1`, [whereVal]);
-            if (existing) {
-                ids.push(String(existing["id"]));
-                continue;
-            }
-        }
-        const createData = { ...item.create };
-        fillMissingPrimaryKeys(targetTable, createData);
-        const { keys, values } = dataToSqlValues(targetTable, createData);
-        const sql = buildInsertQuery(targetTable, keys);
-        const row = await executor.queryOne(sql, values);
-        if (row)
-            ids.push(String(row["id"]));
-    }
-    return ids;
-}
-async function insertJunctionRows(executor, manifest, throughAccessor, leftFkCol, rightFkCol, leftId, rightIds, extraData) {
-    const throughTable = manifest.tables[throughAccessor];
-    if (!throughTable)
-        return;
-    const leftCol = throughTable.columns.find((c) => c.sqlName === leftFkCol);
-    const rightCol = throughTable.columns.find((c) => c.sqlName === rightFkCol);
-    if (!leftCol || !rightCol)
-        return;
-    for (const rightId of rightIds) {
-        const data = {
-            [leftCol.tsName]: leftId,
-            [rightCol.tsName]: rightId,
-            ...extraData,
-        };
-        for (const col of throughTable.columns) {
-            if (col.tsName in data)
-                continue;
-            if (col.defaultNow) {
-                data[col.tsName] = new Date();
-            }
-        }
-        fillMissingPrimaryKeys(throughTable, data);
-        const { keys, values } = dataToSqlValues(throughTable, data);
-        const sql = buildInsertQuery(throughTable, keys);
-        await executor.query(sql, values);
-    }
-}
-async function runCreate(executor, manifest, tableAccessor, args) {
+import { fillMissingPrimaryKeys, rowScalarPkValue } from "./primary-key.js";
+import { applyToOnePreWrites, executeRelationWrites, splitScalarsAndRelationWrites, } from "./relation-writes.js";
+import { runQuery, runQueryOne } from "./execute.js";
+export async function runCreate(executor, runtime, tableAccessor, args) {
+    const { manifest } = runtime;
     const table = manifest.tables[tableAccessor];
     if (!table)
         throw new Error(`Unknown table: ${tableAccessor}`);
-    const scalarData = {};
-    const relationWrites = [];
-    for (const [key, value] of Object.entries(args.data)) {
-        const col = table.columns.find((c) => c.tsName === key);
-        if (col) {
-            scalarData[key] = value;
-            continue;
-        }
-        const rel = table.relations.find((r) => r.name === key);
-        if (rel && value && typeof value === "object") {
-            const relValue = value;
-            if ("connect" in relValue) {
-                relationWrites.push({ relationName: key, type: "connect", value: relValue["connect"] });
-            }
-            else if ("connectOrCreate" in relValue) {
-                relationWrites.push({
-                    relationName: key,
-                    type: "connectOrCreate",
-                    value: relValue["connectOrCreate"],
-                });
-            }
-        }
-    }
+    const { scalarData, relationWrites } = splitScalarsAndRelationWrites(manifest, tableAccessor, table, args.data);
+    await applyToOnePreWrites(executor, runtime, table, scalarData, relationWrites, runCreate);
     fillMissingPrimaryKeys(table, scalarData);
-    for (const write of relationWrites) {
-        if (write.type === "connect") {
-            const connect = write.value;
-            const rel = table.relations.find((r) => r.name === write.relationName);
-            if (rel && rel.cardinality === "one") {
-                scalarData[rel.fkColumn] = connect.id;
-            }
-        }
-    }
     const { keys, values } = dataToSqlValues(table, scalarData);
     const insertSql = buildInsertQuery(table, keys);
-    const row = await executor.queryOne(insertSql, values);
-    if (!row)
-        throw new Error("Insert failed");
+    const row = await runQueryOne(executor, runtime, { operation: "insert", tableAccessor }, insertSql, values);
     const result = rowToTs(table, row);
-    const recordId = String(result["id"]);
-    for (const write of relationWrites) {
-        if (write.type === "connectOrCreate") {
-            const m2m = manifest.manyToMany.find((m) => (m.leftAccessor === tableAccessor && m.as === write.relationName) ||
-                (m.rightAccessor === tableAccessor && m.inverse === write.relationName));
-            if (m2m) {
-                const isLeft = m2m.leftAccessor === tableAccessor;
-                const targetAccessor = isLeft ? m2m.rightAccessor : m2m.leftAccessor;
-                const items = write.value;
-                const ids = await resolveConnectOrCreate(executor, manifest, targetAccessor, items);
-                await insertJunctionRows(executor, manifest, m2m.throughAccessor, m2m.leftFkColumn, m2m.rightFkColumn, recordId, ids);
-            }
-        }
-    }
+    const recordId = rowScalarPkValue(result, table);
+    await executeRelationWrites(executor, runtime, tableAccessor, recordId, relationWrites, runCreate);
     if (args.with) {
-        const [withLoaded] = await loadRelations(executor, manifest, table, [result], args.with);
+        const [withLoaded] = await loadRelations(executor, runtime, table, [result], args.with);
         return withLoaded ?? result;
     }
     return result;
 }
-export async function createRecord(executor, manifest, tableAccessor, args) {
+export async function createRecord(executor, runtime, tableAccessor, args) {
     if (executor.inTransaction) {
-        return runCreate(executor, manifest, tableAccessor, args);
+        return runCreate(executor, runtime, tableAccessor, args);
+    }
+    return executor.transaction((tx) => runCreate(tx, runtime, tableAccessor, args));
+}
+export async function createManyRecords(executor, runtime, tableAccessor, args) {
+    const prepared = prepareCreateManyRows(runtime, tableAccessor, args.data);
+    if (!prepared)
+        return 0;
+    const { table, dataKeys, valueRows, values } = prepared;
+    const sql = buildInsertManyQuery(table, dataKeys, valueRows);
+    const result = await runQuery(executor, runtime, { operation: "insert", tableAccessor }, sql, values);
+    return result.length;
+}
+export async function createManyAndReturnRecords(executor, runtime, tableAccessor, args) {
+    const prepared = prepareCreateManyRows(runtime, tableAccessor, args.data);
+    if (!prepared)
+        return [];
+    const { table, dataKeys, valueRows, values } = prepared;
+    const sql = buildInsertManyQuery(table, dataKeys, valueRows);
+    const rows = await runQuery(executor, runtime, { operation: "insert", tableAccessor }, sql, values);
+    return rows.map((row) => rowToTs(table, row));
+}
+function prepareCreateManyRows(runtime, tableAccessor, data) {
+    if (data.length === 0)
+        return null;
+    const { manifest } = runtime;
+    const table = manifest.tables[tableAccessor];
+    if (!table)
+        throw new Error(`Unknown table: ${tableAccessor}`);
+    const scalarRows = [];
+    for (const item of data) {
+        const scalarData = {};
+        for (const [key, value] of Object.entries(item)) {
+            const col = table.columns.find((c) => c.tsName === key);
+            if (col) {
+                scalarData[key] = value;
+                continue;
+            }
+            const rel = table.relations.find((r) => r.name === key);
+            if (rel) {
+                throw new Error(`createMany does not support nested relation writes (field: ${key})`);
+            }
+        }
+        fillMissingPrimaryKeys(table, scalarData);
+        scalarRows.push(scalarData);
+    }
+    const keySet = new Set();
+    for (const row of scalarRows) {
+        const { keys } = dataToSqlValues(table, row);
+        for (const k of keys)
+            keySet.add(k);
     }
-    return executor.transaction((tx) => runCreate(tx, manifest, tableAccessor, args));
+    const dataKeys = table.columns
+        .filter((c) => keySet.has(c.tsName))
+        .map((c) => c.tsName);
+    const rowValues = scalarRows.map((row) => {
+        const { keys, values } = dataToSqlValues(table, row);
+        const valueByKey = new Map(keys.map((k, i) => [k, values[i]]));
+        return dataKeys.map((k) => valueByKey.get(k));
+    });
+    const { valueRows, values } = buildInsertManyValueRows(table, dataKeys, rowValues);
+    return { table, dataKeys, valueRows, values };
 }
 //# sourceMappingURL=create.js.map

package/dist/runtime/query/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/runtime/query/create.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,OAAO,GACR,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAkB,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE1D,KAAK,UAAU,sBAAsB,CACnC,QAAkB,EAClB,QAAkB,EAClB,cAAsB,EACtB,KAAiF;IAEjF,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACpD,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,cAAc,EAAE,CAAC,CAAC;IAEtE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAS,CAAC,CAAC;QAEvC,IAAI,QAAQ,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACvC,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;YACnE,MAAM,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC9E,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,QAAQ,CACtC,kBAAkB,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,UAAU,MAAM,eAAe,EACrF,CAAC,QAAQ,CAAC,CACX,CAAC;YAEF,IAAI,QAAQ,EAAE,CAAC;gBACb,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjC,SAAS;YACX,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QACtC,sBAAsB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAEhD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QAElE,MAAM,GAAG,GAAG,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACjD,IAAI,GAAG;YAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,QAAkB,EAClB,QAAkB,EAClB,eAAuB,EACvB,SAAiB,EACjB,UAAkB,EAClB,MAAc,EACd,QAAkB,EAClB,SAAmC;IAEnC,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IACtD,IAAI,CAAC,YAAY;QAAE,OAAO;IAE1B,MAAM,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC;IAC1E,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC;IAC5E,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;QAAE,OAAO;IAElC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,IAAI,GAA4B;YACpC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM;YACxB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO;YAC1B,GAAG,SAAS;SACb,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YACvC,IAAI,GAAG,CAAC,MAAM,IAAI,IAAI;gBAAE,SAAS;YACjC,IAAI,GAAG,CAAC,UAAU,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;YAChC,CAAC;QACH,CAAC;QAED,sBAAsB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAE3C,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,GAAG,GAAG,gBAAgB,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;QACjD,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,QAAkB,EAClB,QAAkB,EAClB,aAAqB,EACrB,IAGC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,aAAa,EAAE,CAAC,CAAC;IAE/D,MAAM,UAAU,GAA4B,EAAE,CAAC;IAC/C,MAAM,cAAc,GAIf,EAAE,CAAC;IAER,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACrD,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,CAAC;QACxD,IAAI,GAAG,EAAE,CAAC;YACR,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACxB,SAAS;QACX,CAAC;QAED,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QACxD,IAAI,GAAG,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9C,MAAM,QAAQ,GAAG,KAAgC,CAAC;YAClD,IAAI,SAAS,IAAI,QAAQ,EAAE,CAAC;gBAC1B,cAAc,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC1F,CAAC;iBAAM,IAAI,iBAAiB,IAAI,QAAQ,EAAE,CAAC;gBACzC,cAAc,CAAC,IAAI,CAAC;oBAClB,YAAY,EAAE,GAAG;oBACjB,IAAI,EAAE,iBAAiB;oBACvB,KAAK,EAAE,QAAQ,CAAC,iBAAiB,CAAC;iBACnC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IAED,sBAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAE1C,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,KAAuB,CAAC;YAC9C,MAAM,GAAG,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,YAAY,CAAC,CAAC;YACvE,IAAI,GAAG,IAAI,GAAG,CAAC,WAAW,KAAK,KAAK,EAAE,CAAC;gBACrC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IAE5D,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACvD,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAEtC,KAAK,MAAM,KAAK,IAAI,cAAc,EAAE,CAAC;QACnC,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,UAAU,CAAC,IAAI,CAClC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,CAAC,YAAY,KAAK,aAAa,IAAI,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,YAAY,CAAC;gBACjE,CAAC,CAAC,CAAC,aAAa,KAAK,aAAa,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,YAAY,CAAC,CAC1E,CAAC;YAEF,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,MAAM,GAAG,GAAG,CAAC,YAAY,KAAK,aAAa,CAAC;gBAClD,MAAM,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC;gBACrE,MAAM,KAAK,GAAG,KAAK,CAAC,KAGlB,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,CAAC,CAAC;gBAEpF,MAAM,kBAAkB,CACtB,QAAQ,EACR,QAAQ,EACR,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,YAAY,EAChB,GAAG,CAAC,aAAa,EACjB,QAAQ,EACR,GAAG,CACJ,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACzF,OAAO,UAAU,IAAI,MAAM,CAAC;IAC9B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAkB,EAClB,QAAkB,EAClB,aAAqB,EACrB,IAGC;IAED,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC3B,OAAO,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,QAAQ,CAAC,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;AACpF,CAAC"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/runtime/query/create.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/cursor-codec.d.ts

@@ -0,0 +1,3 @@
+export declare function encodeCursor(cursor: Record<string, unknown>): string;
+export declare function decodeCursor<T extends Record<string, unknown> = Record<string, unknown>>(encoded: string): T;
+//# sourceMappingURL=cursor-codec.d.ts.map

package/dist/runtime/query/cursor-codec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor-codec.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/cursor-codec.ts"],"names":[],"mappings":"AAOA,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAGpE;AAED,wBAAgB,YAAY,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtF,OAAO,EAAE,MAAM,GACd,CAAC,CAuBH"}

package/dist/runtime/query/cursor-codec.js

@@ -0,0 +1,27 @@
+const CURSOR_CODEC_VERSION = 1;
+export function encodeCursor(cursor) {
+    const payload = { v: CURSOR_CODEC_VERSION, c: cursor };
+    return Buffer.from(JSON.stringify(payload), "utf-8").toString("base64url");
+}
+export function decodeCursor(encoded) {
+    let parsed;
+    try {
+        const json = Buffer.from(encoded, "base64url").toString("utf-8");
+        parsed = JSON.parse(json);
+    }
+    catch {
+        throw new Error("Invalid cursor encoding");
+    }
+    if (typeof parsed !== "object" ||
+        parsed === null ||
+        !("v" in parsed) ||
+        !("c" in parsed) ||
+        parsed.v !== CURSOR_CODEC_VERSION ||
+        typeof parsed.c !== "object" ||
+        parsed.c === null ||
+        Array.isArray(parsed.c)) {
+        throw new Error("Invalid cursor payload");
+    }
+    return parsed.c;
+}
+//# sourceMappingURL=cursor-codec.js.map

package/dist/runtime/query/cursor-codec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor-codec.js","sourceRoot":"","sources":["../../../src/runtime/query/cursor-codec.ts"],"names":[],"mappings":"AAAA,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAO/B,MAAM,UAAU,YAAY,CAAC,MAA+B;IAC1D,MAAM,OAAO,GAAyB,EAAE,CAAC,EAAE,oBAAoB,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7E,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,OAAe;IAEf,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACjE,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,IACE,OAAO,MAAM,KAAK,QAAQ;QAC1B,MAAM,KAAK,IAAI;QACf,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC;QAChB,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC;QACf,MAA+B,CAAC,CAAC,KAAK,oBAAoB;QAC3D,OAAQ,MAA+B,CAAC,CAAC,KAAK,QAAQ;QACrD,MAA+B,CAAC,CAAC,KAAK,IAAI;QAC3C,KAAK,CAAC,OAAO,CAAE,MAA+B,CAAC,CAAC,CAAC,EACjD,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAQ,MAA+B,CAAC,CAAM,CAAC;AACjD,CAAC"}

package/dist/runtime/query/cursor.d.ts

@@ -0,0 +1,22 @@
+import type { ManifestColumn, ManifestTable } from "../../dialect/types.js";
+export type OrderKeySpec = {
+    tsName: string;
+    sqlName: string;
+    direction: "asc" | "desc";
+    column: ManifestColumn;
+};
+export declare function resolveOrderSpec(table: ManifestTable, orderBy: Record<string, string> | undefined): OrderKeySpec[];
+export declare function compileOrderByFromSpec(orderSpec: OrderKeySpec[]): string;
+export declare function compileCursorWhere(orderSpec: OrderKeySpec[], cursor: Record<string, unknown>, startParamIndex?: number): {
+    sql: string;
+    params: unknown[];
+};
+export declare function mergeWhereWithCursor(userWhereSql: string, userParams: unknown[], cursorWhere: {
+    sql: string;
+    params: unknown[];
+}): {
+    sql: string;
+    params: unknown[];
+};
+export declare function cursorFromRow(orderSpec: OrderKeySpec[], row: Record<string, unknown>): Record<string, unknown>;
+//# sourceMappingURL=cursor.d.ts.map

package/dist/runtime/query/cursor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cursor.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/cursor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAK5E,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC;CACxB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,GAC1C,YAAY,EAAE,CAwChB;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,CAKxE;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,YAAY,EAAE,EACzB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,eAAe,SAAI,GAClB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAsBpC;AAED,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO,EAAE,EACrB,WAAW,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,GAC9C;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,CAcpC;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,YAAY,EAAE,EACzB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMzB"}

package/dist/runtime/query/cursor.js

@@ -0,0 +1,84 @@
+import { quoteIdentifier } from "../../dialect/postgres.js";
+import { requireScalarPrimaryKey } from "./primary-key.js";
+import { serializeColumnValue } from "./compile.js";
+export function resolveOrderSpec(table, orderBy) {
+    if (!orderBy || Object.keys(orderBy).length === 0) {
+        throw new Error("paginate requires orderBy");
+    }
+    requireScalarPrimaryKey(table);
+    const specs = [];
+    const directions = new Set();
+    for (const [tsKey, direction] of Object.entries(orderBy)) {
+        const col = table.columns.find((c) => c.tsName === tsKey);
+        if (!col) {
+            throw new Error(`Unknown orderBy column "${tsKey}" on table "${table.accessor}"`);
+        }
+        const dir = direction.toLowerCase() === "desc" ? "desc" : "asc";
+        directions.add(dir);
+        specs.push({ tsName: tsKey, sqlName: col.sqlName, direction: dir, column: col });
+    }
+    if (directions.size > 1) {
+        throw new Error("paginate orderBy columns must share the same direction");
+    }
+    const { tsName: pkTsName, sqlName: pkSqlName } = requireScalarPrimaryKey(table);
+    if (!specs.some((spec) => spec.tsName === pkTsName)) {
+        const pkCol = table.columns.find((c) => c.tsName === pkTsName);
+        if (!pkCol) {
+            throw new Error(`Primary key column not found for table "${table.accessor}"`);
+        }
+        const tieDirection = specs[specs.length - 1].direction;
+        specs.push({
+            tsName: pkTsName,
+            sqlName: pkSqlName,
+            direction: tieDirection,
+            column: pkCol,
+        });
+    }
+    return specs;
+}
+export function compileOrderByFromSpec(orderSpec) {
+    const parts = orderSpec.map((key) => `${quoteIdentifier(key.sqlName)} ${key.direction.toUpperCase()}`);
+    return parts.length > 0 ? `ORDER BY ${parts.join(", ")}` : "";
+}
+export function compileCursorWhere(orderSpec, cursor, startParamIndex = 1) {
+    for (const key of orderSpec) {
+        if (!(key.tsName in cursor)) {
+            throw new Error(`Cursor missing required field "${key.tsName}"`);
+        }
+        if (cursor[key.tsName] === undefined) {
+            throw new Error(`Cursor field "${key.tsName}" cannot be undefined`);
+        }
+    }
+    const direction = orderSpec[0].direction;
+    const operator = direction === "desc" ? "<" : ">";
+    const colRefs = orderSpec.map((key) => quoteIdentifier(key.sqlName)).join(", ");
+    const placeholders = orderSpec
+        .map((_, index) => `$${startParamIndex + index}`)
+        .join(", ");
+    const params = orderSpec.map((key) => serializeColumnValue(key.column, cursor[key.tsName]));
+    return {
+        sql: `(${colRefs}) ${operator} (${placeholders})`,
+        params,
+    };
+}
+export function mergeWhereWithCursor(userWhereSql, userParams, cursorWhere) {
+    if (!cursorWhere.sql) {
+        return { sql: userWhereSql, params: userParams };
+    }
+    if (!userWhereSql) {
+        return { sql: `WHERE ${cursorWhere.sql}`, params: cursorWhere.params };
+    }
+    const userBody = userWhereSql.replace(/^WHERE\s+/i, "");
+    return {
+        sql: `WHERE ${userBody} AND ${cursorWhere.sql}`,
+        params: [...userParams, ...cursorWhere.params],
+    };
+}
+export function cursorFromRow(orderSpec, row) {
+    const cursor = {};
+    for (const key of orderSpec) {
+        cursor[key.tsName] = row[key.tsName];
+    }
+    return cursor;
+}
+//# sourceMappingURL=cursor.js.map

package/dist/runtime/query/cursor.js.map

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

package/dist/runtime/query/delete.d.ts

@@ -1,12 +1,12 @@
-import type { Manifest } from "../../dialect/types.js";
 import type { Executor } from "../executor.js";
 import { type WithInput } from "./find.js";
-export declare function deleteRecord(executor: Executor, manifest: Manifest, tableAccessor: string, args: {
+import { type QueryRuntime } from "./execute.js";
+export declare function deleteRecord(executor: Executor, runtime: QueryRuntime, tableAccessor: string, args: {
     where: Record<string, unknown>;
     with?: Record<string, WithInput>;
 }): Promise<Record<string, unknown> | null>;
-export declare function deleteManyRecords(executor: Executor, manifest: Manifest, tableAccessor: string, args?: {
+export declare function deleteManyRecords(executor: Executor, runtime: QueryRuntime, tableAccessor: string, args?: {
     where?: Record<string, unknown>;
 }): Promise<number>;
-export declare function deleteById(executor: Executor, manifest: Manifest, tableAccessor: string, id: string): Promise<Record<string, unknown> | null>;
+export declare function deleteById(executor: Executor, runtime: QueryRuntime, tableAccessor: string, id: string): Promise<Record<string, unknown> | null>;
 //# sourceMappingURL=delete.d.ts.map

package/dist/runtime/query/delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/delete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ/C,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAE1D,wBAAsB,YAAY,CAChC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACJ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CA2BzC;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,GACA,OAAO,CAAC,MAAM,CAAC,CAcjB;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAEzC"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/delete.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ/C,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAE1D,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,cAAc,CAAC;AAExE,wBAAsB,YAAY,CAChC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACJ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CA4BzC;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE;IACL,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC,GACA,OAAO,CAAC,MAAM,CAAC,CAsBjB;AAED,wBAAsB,UAAU,CAC9B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAOzC"}

package/dist/runtime/query/delete.js

@@ -1,7 +1,10 @@
-import { postgresDialect } from "../../dialect/postgres.js";
+import { postgresDialect, quoteIdentifier } from "../../dialect/postgres.js";
 import { buildDeleteQuery, buildDeleteManyQuery, compileWhere, rowToTs, } from "./compile.js";
 import { loadRelations } from "./find.js";
-export async function deleteRecord(executor, manifest, tableAccessor, args) {
+import { primaryKeySqlName, requireScalarPrimaryKey } from "./primary-key.js";
+import { runQuery, runQueryOne } from "./execute.js";
+export async function deleteRecord(executor, runtime, tableAccessor, args) {
+    const { manifest } = runtime;
     const table = manifest.tables[tableAccessor];
     if (!table)
         throw new Error(`Unknown table: ${tableAccessor}`);
@@ -10,26 +13,33 @@ export async function deleteRecord(executor, manifest, tableAccessor, args) {
         throw new Error("Delete requires a where clause");
     }
     const query = buildDeleteQuery(table, whereSql);
-    const row = await executor.queryOne(query, params);
+    const row = await runQueryOne(executor, runtime, { operation: "delete", tableAccessor }, query, params);
     if (!row)
         return null;
     const result = rowToTs(table, row);
     if (args.with) {
-        const [withLoaded] = await loadRelations(executor, manifest, table, [result], args.with);
+        const [withLoaded] = await loadRelations(executor, runtime, table, [result], args.with);
         return withLoaded ?? result;
     }
     return result;
 }
-export async function deleteManyRecords(executor, manifest, tableAccessor, args) {
+export async function deleteManyRecords(executor, runtime, tableAccessor, args) {
+    const { manifest } = runtime;
     const table = manifest.tables[tableAccessor];
     if (!table)
         throw new Error(`Unknown table: ${tableAccessor}`);
     const { sql: whereSql, params } = compileWhere(manifest, table, args?.where, postgresDialect);
     const query = buildDeleteManyQuery(table, whereSql);
-    const result = await executor.query(`${query} RETURNING id`, params);
+    const pkSql = quoteIdentifier(primaryKeySqlName(table));
+    const result = await runQuery(executor, runtime, { operation: "delete", tableAccessor }, `${query} RETURNING ${pkSql}`, params);
     return result.length;
 }
-export async function deleteById(executor, manifest, tableAccessor, id) {
-    return deleteRecord(executor, manifest, tableAccessor, { where: { id } });
+export async function deleteById(executor, runtime, tableAccessor, id) {
+    const { manifest } = runtime;
+    const table = manifest.tables[tableAccessor];
+    if (!table)
+        throw new Error(`Unknown table: ${tableAccessor}`);
+    const { tsName } = requireScalarPrimaryKey(table);
+    return deleteRecord(executor, runtime, tableAccessor, { where: { [tsName]: id } });
 }
 //# sourceMappingURL=delete.js.map

package/dist/runtime/query/delete.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/runtime/query/delete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EACZ,OAAO,GACR,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAkB,MAAM,WAAW,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAkB,EAClB,QAAkB,EAClB,aAAqB,EACrB,IAGC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,aAAa,EAAE,CAAC,CAAC;IAE/D,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,YAAY,CAC5C,QAAQ,EACR,KAAK,EACL,IAAI,CAAC,KAAK,EACV,eAAe,CAChB,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IACnD,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAEtB,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAEnC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACzF,OAAO,UAAU,IAAI,MAAM,CAAC;IAC9B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAkB,EAClB,QAAkB,EAClB,aAAqB,EACrB,IAEC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,aAAa,EAAE,CAAC,CAAC;IAE/D,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,YAAY,CAC5C,QAAQ,EACR,KAAK,EACL,IAAI,EAAE,KAAK,EACX,eAAe,CAChB,CAAC;IAEF,MAAM,KAAK,GAAG,oBAAoB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,eAAe,EAAE,MAAM,CAAC,CAAC;IACrE,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,QAAkB,EAClB,QAAkB,EAClB,aAAqB,EACrB,EAAU;IAEV,OAAO,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AAC5E,CAAC"}
+{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/runtime/query/delete.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/execute.d.ts

@@ -0,0 +1,16 @@
+import type { Pool } from "pg";
+import type { Manifest } from "../../dialect/types.js";
+import type { Executor } from "../executor.js";
+import type { QueryOperation } from "../errors.js";
+export type QueryRuntime = {
+    manifest: Manifest;
+    pool?: Pool;
+    migrationsDir?: string;
+};
+export type RunQueryContext = {
+    operation: QueryOperation;
+    tableAccessor?: string;
+};
+export declare function runQuery<T = Record<string, unknown>>(executor: Executor, runtime: QueryRuntime, ctx: RunQueryContext, sql: string, params?: unknown[]): Promise<T[]>;
+export declare function runQueryOne<T = Record<string, unknown>>(executor: Executor, runtime: QueryRuntime, ctx: RunQueryContext, sql: string, params?: unknown[]): Promise<T | null>;
+//# sourceMappingURL=execute.d.ts.map

package/dist/runtime/query/execute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,SAAS,EAAE,cAAc,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AA8DF,wBAAsB,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACxD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAO,EAAO,GACrB,OAAO,CAAC,CAAC,EAAE,CAAC,CAUd;AAED,wBAAsB,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC3D,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAO,EAAO,GACrB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAwBnB"}

package/dist/runtime/query/execute.js

@@ -0,0 +1,74 @@
+import { NeoOrmQueryError } from "../errors.js";
+import { emptyReturningContext, enrichPgError, isPgError, isSchemaDriftPgCode, } from "../pg-error.js";
+import { getAppliedMigrations, listPendingMigrations } from "../../migrate/runner.js";
+async function resolveMigrationHint(pool, migrationsDir, pgCode) {
+    if (!pool || !isSchemaDriftPgCode(pgCode)) {
+        return undefined;
+    }
+    try {
+        const applied = await getAppliedMigrations(pool);
+        const appliedList = [...applied];
+        const lastApplied = appliedList.at(-1);
+        const parts = [];
+        if (lastApplied) {
+            parts.push(`last applied: ${lastApplied}`);
+        }
+        if (migrationsDir) {
+            const pending = await listPendingMigrations(migrationsDir, applied);
+            if (pending.length > 0) {
+                parts.push(`${pending.length} pending (next: ${pending[0]})`);
+                parts.push("run `neoorm migrate deploy`");
+            }
+        }
+        else if (!lastApplied) {
+            parts.push("no migrations applied — run `neoorm migrate deploy`");
+        }
+        return parts.length > 0 ? parts.join("; ") : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+async function throwQueryError(runtime, context, cause) {
+    const migrationHint = await resolveMigrationHint(runtime.pool, runtime.migrationsDir, context.pgCode);
+    throw new NeoOrmQueryError(migrationHint ? { ...context, migrationHint } : context, cause);
+}
+function queryBaseContext(ctx, sql) {
+    return ctx.tableAccessor !== undefined
+        ? { operation: ctx.operation, tableAccessor: ctx.tableAccessor, sql }
+        : { operation: ctx.operation, sql };
+}
+export async function runQuery(executor, runtime, ctx, sql, params = []) {
+    try {
+        return await executor.query(sql, params);
+    }
+    catch (err) {
+        if (isPgError(err)) {
+            const enriched = enrichPgError(err, runtime.manifest, queryBaseContext(ctx, sql));
+            await throwQueryError(runtime, enriched, err);
+        }
+        throw err;
+    }
+}
+export async function runQueryOne(executor, runtime, ctx, sql, params = []) {
+    try {
+        const row = await executor.queryOne(sql, params);
+        if (row === null &&
+            (ctx.operation === "insert" || ctx.operation === "upsert") &&
+            ctx.tableAccessor) {
+            await throwQueryError(runtime, emptyReturningContext(ctx.operation, runtime.manifest, ctx.tableAccessor, sql));
+        }
+        return row;
+    }
+    catch (err) {
+        if (err instanceof NeoOrmQueryError) {
+            throw err;
+        }
+        if (isPgError(err)) {
+            const enriched = enrichPgError(err, runtime.manifest, queryBaseContext(ctx, sql));
+            await throwQueryError(runtime, enriched, err);
+        }
+        throw err;
+    }
+}
+//# sourceMappingURL=execute.js.map

package/dist/runtime/query/execute.js.map

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