neoorm 0.1.4 → 0.2.0

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

@@ -1,21 +1,23 @@
-import type { Manifest, ManifestTable } from "../../dialect/types.js";
+import type { ManifestTable } from "../../dialect/types.js";
 import type { Executor } from "../executor.js";
+import { type QueryRuntime } from "./execute.js";
 export type WithInput = boolean | {
     select?: readonly string[] | Record<string, boolean | undefined>;
     orderBy?: Record<string, string>;
     limit?: number;
     with?: Record<string, WithInput>;
 };
-export declare function loadRelations(executor: Executor, manifest: Manifest, table: ManifestTable, rows: Record<string, unknown>[], withSpec: Record<string, WithInput> | undefined): Promise<Record<string, unknown>[]>;
-export declare function findMany(executor: Executor, manifest: Manifest, tableAccessor: string, args?: {
+export declare function loadRelations(executor: Executor, runtime: QueryRuntime, table: ManifestTable, rows: Record<string, unknown>[], withSpec: Record<string, WithInput> | undefined): Promise<Record<string, unknown>[]>;
+export declare function findMany(executor: Executor, runtime: QueryRuntime, tableAccessor: string, args?: {
     where?: Record<string, unknown>;
     orderBy?: Record<string, string>;
     limit?: number;
     offset?: number;
+    distinct?: readonly string[] | Record<string, boolean | undefined>;
     with?: Record<string, WithInput>;
 }): Promise<Record<string, unknown>[]>;
-export declare function findFirst(executor: Executor, manifest: Manifest, tableAccessor: string, args?: Parameters<typeof findMany>[3]): Promise<Record<string, unknown> | null>;
-export declare function findById(executor: Executor, manifest: Manifest, tableAccessor: string, id: string, args?: {
+export declare function findFirst(executor: Executor, runtime: QueryRuntime, tableAccessor: string, args?: Parameters<typeof findMany>[3]): Promise<Record<string, unknown> | null>;
+export declare function findById(executor: Executor, runtime: QueryRuntime, tableAccessor: string, id: string, args?: {
     with?: Record<string, WithInput>;
 }): Promise<Record<string, unknown> | null>;
 //# sourceMappingURL=find.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAwC,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAY/C,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG;IAChC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,CAAC;AA0MF,wBAAsB,aAAa,CACjC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,GAC9C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAQpC;AAED,wBAAsB,QAAQ,CAC5B,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;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAsBpC;AAED,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,GACpC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAMzC;AAED,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAAE,GAC1C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAazC"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkD,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAiB/C,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,cAAc,CAAC;AAE3D,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG;IAChC,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IACjE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,CAAC;AAqYF,wBAAsB,aAAa,CACjC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAC/B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,GAC9C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAcpC;AAED,wBAAsB,QAAQ,CAC5B,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;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IACnE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,GACA,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CA2BpC;AAED,wBAAsB,SAAS,CAC7B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,GACpC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAMzC;AAED,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;CAAE,GAC1C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAgBzC"}

package/dist/runtime/query/find.js

@@ -1,5 +1,111 @@
 import { postgresDialect, quoteIdentifier } from "../../dialect/postgres.js";
 import { buildFindManyQuery, buildSelectColumns, compileOrderBy, compileWhere, normalizeSelectColumns, rowToTs, rowsToTs, } from "./compile.js";
+import { primaryKeyTsNames, requireScalarPrimaryKey, rowPkKey, targetRelationPkSql, } from "./primary-key.js";
+import { runQuery } from "./execute.js";
+function validateDistinctOrderBy(distinct, orderBy) {
+    if (!distinct || distinct.length === 0)
+        return;
+    const orderKeys = orderBy ? Object.keys(orderBy) : [];
+    if (orderKeys.length < distinct.length) {
+        throw new Error("distinct requires orderBy to lead with the same columns");
+    }
+    for (let i = 0; i < distinct.length; i++) {
+        if (orderKeys[i] !== distinct[i]) {
+            throw new Error(`distinct requires orderBy to start with: ${distinct.join(", ")}`);
+        }
+    }
+}
+function splitWithSpec(withSpec) {
+    const relationWith = {};
+    let countSpec;
+    for (const [key, value] of Object.entries(withSpec)) {
+        if (key === "_count") {
+            countSpec = value;
+            continue;
+        }
+        relationWith[key] = value;
+    }
+    const result = {
+        relationWith,
+    };
+    if (countSpec)
+        result.countSpec = countSpec;
+    return result;
+}
+async function loadRelationCounts(executor, runtime, parentTable, parentRows, countSpec) {
+    if (parentRows.length === 0)
+        return;
+    const { manifest } = runtime;
+    const parentIds = parentRows.map((r) => rowPkKey(r, parentTable)).filter(Boolean);
+    if (parentIds.length === 0)
+        return;
+    for (const [relationName, spec] of Object.entries(countSpec)) {
+        const whereFilter = typeof spec === "object" ? spec.where : undefined;
+        const counts = await countRelationLinks(executor, runtime, parentTable, relationName, parentIds, whereFilter);
+        for (const parent of parentRows) {
+            const parentKey = rowPkKey(parent, parentTable);
+            const bucket = parent["_count"] ?? {};
+            bucket[relationName] = counts.get(parentKey) ?? 0;
+            parent["_count"] = bucket;
+        }
+    }
+}
+async function countRelationLinks(executor, runtime, parentTable, relationName, parentIds, whereFilter) {
+    const { manifest } = runtime;
+    const m2m = findM2M(manifest, parentTable.accessor, relationName);
+    if (m2m) {
+        return countM2MLinks(executor, runtime, parentTable, m2m, parentIds, whereFilter);
+    }
+    const relation = findRelation(parentTable, relationName);
+    if (!relation || relation.cardinality !== "many") {
+        return new Map();
+    }
+    const targetTable = manifest.tables[relation.targetAccessor];
+    if (!targetTable)
+        return new Map();
+    const fkCol = quoteIdentifier(relation.fkSqlColumn);
+    const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
+    let extraWhere = "";
+    let extraParams = [];
+    if (whereFilter) {
+        const compiled = compileWhere(manifest, targetTable, whereFilter, postgresDialect);
+        if (compiled.sql) {
+            const adjusted = compiled.sql.replace(/\$(\d+)/g, (_, n) => `$${Number(n) + parentIds.length}`);
+            extraWhere = ` AND ${adjusted.replace(/^WHERE\s+/i, "")}`;
+            extraParams = compiled.params;
+        }
+    }
+    const sql = `SELECT ${fkCol} AS parent_id, COUNT(*)::int AS count FROM ${quoteIdentifier(targetTable.sqlName)} WHERE ${fkCol} IN (${placeholders})${extraWhere} GROUP BY ${fkCol}`;
+    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, [...parentIds, ...extraParams]);
+    return new Map(rows.map((row) => [String(row.parent_id), row.count]));
+}
+async function countM2MLinks(executor, runtime, parentTable, m2m, parentIds, whereFilter) {
+    const { manifest } = runtime;
+    const isLeft = m2m.leftAccessor === parentTable.accessor;
+    const targetAccessor = isLeft ? m2m.rightAccessor : m2m.leftAccessor;
+    const targetTable = manifest.tables[targetAccessor];
+    const throughTable = manifest.tables[m2m.throughAccessor];
+    if (!targetTable || !throughTable)
+        return new Map();
+    const parentFkCol = isLeft ? m2m.leftFkColumn : m2m.rightFkColumn;
+    const targetFkCol = isLeft ? m2m.rightFkColumn : m2m.leftFkColumn;
+    const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
+    let joinSql = "";
+    let extraWhere = "";
+    let extraParams = [];
+    if (whereFilter) {
+        const compiled = compileWhere(manifest, targetTable, whereFilter, postgresDialect);
+        joinSql = ` JOIN ${quoteIdentifier(targetTable.sqlName)} t ON t.${quoteIdentifier(targetRelationPkSql(targetTable))} = j.${quoteIdentifier(targetFkCol)}`;
+        if (compiled.sql) {
+            const adjusted = compiled.sql.replace(/\$(\d+)/g, (_, n) => `$${Number(n) + parentIds.length}`);
+            extraWhere = ` AND ${adjusted.replace(/^WHERE\s+/i, "")}`;
+            extraParams = compiled.params;
+        }
+    }
+    const sql = `SELECT j.${quoteIdentifier(parentFkCol)} AS parent_id, COUNT(*)::int AS count FROM ${quoteIdentifier(throughTable.sqlName)} j${joinSql} WHERE j.${quoteIdentifier(parentFkCol)} IN (${placeholders})${extraWhere} GROUP BY j.${quoteIdentifier(parentFkCol)}`;
+    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: throughTable.accessor }, sql, [...parentIds, ...extraParams]);
+    return new Map(rows.map((row) => [String(row.parent_id), row.count]));
+}
 function columnsForSelect(table, withSpec) {
     const nestedSpec = typeof withSpec === "object" ? withSpec : undefined;
     const selectKeys = normalizeSelectColumns(nestedSpec?.select);
@@ -15,12 +121,13 @@ function findRelation(table, name) {
 function isM2MRelation(manifest, tableAccessor, relationName) {
     return findM2M(manifest, tableAccessor, relationName) !== undefined;
 }
-async function loadOneRelation(executor, manifest, parentTable, parentRows, relationName, withSpec) {
+async function loadOneRelation(executor, runtime, parentTable, parentRows, relationName, withSpec) {
     if (parentRows.length === 0)
         return;
+    const { manifest } = runtime;
     const m2m = findM2M(manifest, parentTable.accessor, relationName);
     if (m2m) {
-        await loadM2MRelation(executor, manifest, parentTable, parentRows, m2m, relationName, withSpec);
+        await loadM2MRelation(executor, runtime, parentTable, parentRows, m2m, relationName, withSpec);
         return;
     }
     const relation = findRelation(parentTable, relationName);
@@ -29,7 +136,7 @@ async function loadOneRelation(executor, manifest, parentTable, parentRows, rela
     const targetTable = manifest.tables[relation.targetAccessor];
     if (!targetTable)
         return;
-    const parentIds = parentRows.map((r) => r["id"]).filter(Boolean);
+    const parentIds = parentRows.map((r) => rowPkKey(r, parentTable)).filter(Boolean);
     if (relation.cardinality === "one") {
         const fkValues = parentRows
             .map((r) => r[relation.fkColumn])
@@ -37,11 +144,12 @@ async function loadOneRelation(executor, manifest, parentTable, parentRows, rela
         if (fkValues.length === 0)
             return;
         const placeholders = fkValues.map((_, i) => `$${i + 1}`).join(", ");
-        const idCol = quoteIdentifier("id");
+        const targetPkCol = quoteIdentifier(targetRelationPkSql(targetTable, relation));
         const selectCols = columnsForSelect(targetTable, withSpec);
-        const rows = await executor.query(`SELECT ${selectCols} FROM ${quoteIdentifier(targetTable.sqlName)} WHERE ${idCol} IN (${placeholders})`, fkValues);
+        const targetPkTsName = primaryKeyTsNames(targetTable)[0];
+        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, `SELECT ${selectCols} FROM ${quoteIdentifier(targetTable.sqlName)} WHERE ${targetPkCol} IN (${placeholders})`, fkValues);
         const mapped = rowsToTs(targetTable, rows);
-        const byId = new Map(mapped.map((r) => [r["id"], r]));
+        const byId = new Map(mapped.map((r) => [String(r[targetPkTsName]), r]));
         for (const parent of parentRows) {
             const fkVal = parent[relation.fkColumn];
             parent[relationName] = fkVal != null ? byId.get(fkVal) ?? null : null;
@@ -59,7 +167,7 @@ async function loadOneRelation(executor, manifest, parentTable, parentRows, rela
         if (nestedSpec?.limit !== undefined) {
             sql += ` LIMIT ${nestedSpec.limit}`;
         }
-        const rows = await executor.query(sql, parentIds);
+        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, parentIds);
         const mapped = rowsToTs(targetTable, rows);
         const grouped = new Map();
         for (const row of mapped) {
@@ -72,13 +180,13 @@ async function loadOneRelation(executor, manifest, parentTable, parentRows, rela
             grouped.get(key).push(row);
         }
         for (const parent of parentRows) {
-            const id = String(parent["id"]);
-            parent[relationName] = grouped.get(id) ?? [];
+            const parentKey = rowPkKey(parent, parentTable);
+            parent[relationName] = grouped.get(parentKey) ?? [];
         }
         if (nestedSpec?.with) {
             for (const childRows of grouped.values()) {
                 for (const [nestedName, nestedWith] of Object.entries(nestedSpec.with)) {
-                    await loadOneRelation(executor, manifest, targetTable, childRows, nestedName, nestedWith);
+                    await loadOneRelation(executor, runtime, targetTable, childRows, nestedName, nestedWith);
                 }
             }
         }
@@ -89,11 +197,12 @@ async function loadOneRelation(executor, manifest, parentTable, parentRows, rela
             .map((p) => p[relationName])
             .filter((r) => r != null && typeof r === "object");
         for (const [nestedName, nestedWith] of Object.entries(nestedSpec.with)) {
-            await loadOneRelation(executor, manifest, targetTable, childRows, nestedName, nestedWith);
+            await loadOneRelation(executor, runtime, targetTable, childRows, nestedName, nestedWith);
         }
     }
 }
-async function loadM2MRelation(executor, manifest, parentTable, parentRows, m2m, relationName, withSpec) {
+async function loadM2MRelation(executor, runtime, parentTable, parentRows, m2m, relationName, _withSpec) {
+    const { manifest } = runtime;
     const isLeft = m2m.leftAccessor === parentTable.accessor;
     const targetAccessor = isLeft ? m2m.rightAccessor : m2m.leftAccessor;
     const targetTable = manifest.tables[targetAccessor];
@@ -102,20 +211,21 @@ async function loadM2MRelation(executor, manifest, parentTable, parentRows, m2m,
         return;
     const parentFkCol = isLeft ? m2m.leftFkColumn : m2m.rightFkColumn;
     const targetFkCol = isLeft ? m2m.rightFkColumn : m2m.leftFkColumn;
-    const parentIds = parentRows.map((r) => r["id"]).filter(Boolean);
+    const parentIds = parentRows.map((r) => rowPkKey(r, parentTable)).filter(Boolean);
     if (parentIds.length === 0)
         return;
     const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
     const selectCols = targetTable.columns
         .map((c) => quoteIdentifier(c.sqlName))
         .join(", ");
+    const targetPkCol = quoteIdentifier(targetRelationPkSql(targetTable));
     const sql = `
     SELECT t.*, j.${quoteIdentifier(parentFkCol)} AS _parent_id
     FROM ${quoteIdentifier(throughTable.sqlName)} j
-    JOIN ${quoteIdentifier(targetTable.sqlName)} t ON t.${quoteIdentifier("id")} = j.${quoteIdentifier(targetFkCol)}
+    JOIN ${quoteIdentifier(targetTable.sqlName)} t ON t.${targetPkCol} = j.${quoteIdentifier(targetFkCol)}
     WHERE j.${quoteIdentifier(parentFkCol)} IN (${placeholders})
   `.trim();
-    const rows = await executor.query(sql, parentIds);
+    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, parentIds);
     const grouped = new Map();
     for (const row of rows) {
         const parentId = String(row["_parent_id"]);
@@ -125,48 +235,57 @@ async function loadM2MRelation(executor, manifest, parentTable, parentRows, m2m,
         grouped.get(parentId).push(mapped);
     }
     for (const parent of parentRows) {
-        const id = String(parent["id"]);
-        parent[relationName] = grouped.get(id) ?? [];
+        const parentKey = rowPkKey(parent, parentTable);
+        parent[relationName] = grouped.get(parentKey) ?? [];
     }
 }
-export async function loadRelations(executor, manifest, table, rows, withSpec) {
+export async function loadRelations(executor, runtime, table, rows, withSpec) {
     if (!withSpec || rows.length === 0)
         return rows;
-    for (const [relationName, spec] of Object.entries(withSpec)) {
-        await loadOneRelation(executor, manifest, table, rows, relationName, spec);
+    const { relationWith, countSpec } = splitWithSpec(withSpec);
+    if (countSpec) {
+        await loadRelationCounts(executor, runtime, table, rows, countSpec);
+    }
+    for (const [relationName, spec] of Object.entries(relationWith)) {
+        await loadOneRelation(executor, runtime, table, rows, relationName, spec);
     }
     return rows;
 }
-export async function findMany(executor, manifest, tableAccessor, args) {
+export async function findMany(executor, runtime, tableAccessor, args) {
+    const { manifest } = runtime;
     const table = manifest.tables[tableAccessor];
     if (!table)
         throw new Error(`Unknown table: ${tableAccessor}`);
+    const distinctOn = normalizeSelectColumns(args?.distinct);
+    validateDistinctOrderBy(distinctOn, args?.orderBy);
     const { sql: whereSql, params } = compileWhere(manifest, table, args?.where, postgresDialect);
     const orderSql = compileOrderBy(table, args?.orderBy);
-    const query = buildFindManyQuery(table, whereSql, orderSql, args?.limit, args?.offset);
-    const rows = await executor.query(query, params);
+    const query = buildFindManyQuery(table, whereSql, orderSql, args?.limit, args?.offset, distinctOn);
+    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, params);
     const mapped = rowsToTs(table, rows);
-    return loadRelations(executor, manifest, table, mapped, args?.with);
+    return loadRelations(executor, runtime, table, mapped, args?.with);
 }
-export async function findFirst(executor, manifest, tableAccessor, args) {
-    const rows = await findMany(executor, manifest, tableAccessor, {
+export async function findFirst(executor, runtime, tableAccessor, args) {
+    const rows = await findMany(executor, runtime, tableAccessor, {
         ...args,
         limit: 1,
     });
     return rows[0] ?? null;
 }
-export async function findById(executor, manifest, tableAccessor, id, args) {
+export async function findById(executor, runtime, tableAccessor, id, args) {
+    const { manifest } = runtime;
     const table = manifest.tables[tableAccessor];
     if (!table)
         throw new Error(`Unknown table: ${tableAccessor}`);
+    const { tsName } = requireScalarPrimaryKey(table);
     const findArgs = {
-        where: { id },
+        where: { [tsName]: id },
         limit: 1,
     };
     if (args?.with !== undefined) {
         findArgs.with = args.with;
     }
-    const rows = await findMany(executor, manifest, tableAccessor, findArgs);
+    const rows = await findMany(executor, runtime, tableAccessor, findArgs);
     return rows[0] ?? null;
 }
 //# sourceMappingURL=find.js.map

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

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

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

@@ -0,0 +1,17 @@
+import type { Executor } from "../executor.js";
+import { type WithInput } from "./find.js";
+import { type QueryRuntime } from "./execute.js";
+export type PaginateArgs = {
+    where?: Record<string, unknown>;
+    orderBy: Record<string, string>;
+    take: number;
+    after?: Record<string, unknown>;
+    with?: Record<string, WithInput>;
+};
+export type PaginateRuntimeResult = {
+    items: Record<string, unknown>[];
+    nextCursor: Record<string, unknown> | null;
+    hasMore: boolean;
+};
+export declare function paginateRecords(executor: Executor, runtime: QueryRuntime, tableAccessor: string, args: PaginateArgs): Promise<PaginateRuntimeResult>;
+//# sourceMappingURL=paginate.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"paginate.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/paginate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAU/C,OAAO,EAAiB,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,cAAc,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAC3C,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,wBAAsB,eAAe,CACnC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,qBAAqB,CAAC,CA8ChC"}

package/dist/runtime/query/paginate.js

@@ -0,0 +1,35 @@
+import { postgresDialect } from "../../dialect/postgres.js";
+import { buildPaginateQuery, compileWhere, rowsToTs } from "./compile.js";
+import { compileCursorWhere, compileOrderByFromSpec, cursorFromRow, mergeWhereWithCursor, resolveOrderSpec, } from "./cursor.js";
+import { loadRelations } from "./find.js";
+import { runQuery } from "./execute.js";
+export async function paginateRecords(executor, runtime, tableAccessor, args) {
+    const { manifest } = runtime;
+    const table = manifest.tables[tableAccessor];
+    if (!table)
+        throw new Error(`Unknown table: ${tableAccessor}`);
+    if (!Number.isInteger(args.take) || args.take <= 0) {
+        throw new Error("paginate requires take to be a positive integer");
+    }
+    const orderSpec = resolveOrderSpec(table, args.orderBy);
+    const { sql: userWhereSql, params: userParams } = compileWhere(manifest, table, args?.where, postgresDialect);
+    let whereSql = userWhereSql;
+    let params = userParams;
+    if (args.after) {
+        const cursorWhere = compileCursorWhere(orderSpec, args.after, userParams.length + 1);
+        const merged = mergeWhereWithCursor(userWhereSql, userParams, cursorWhere);
+        whereSql = merged.sql;
+        params = merged.params;
+    }
+    const orderSql = compileOrderByFromSpec(orderSpec);
+    const query = buildPaginateQuery(table, whereSql, orderSql, args.take);
+    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, params);
+    const mapped = rowsToTs(table, rows);
+    const hasMore = mapped.length > args.take;
+    const items = hasMore ? mapped.slice(0, args.take) : mapped;
+    const loaded = await loadRelations(executor, runtime, table, items, args.with);
+    const lastItem = items[items.length - 1];
+    const nextCursor = hasMore && lastItem ? cursorFromRow(orderSpec, lastItem) : null;
+    return { items: loaded, nextCursor, hasMore };
+}
+//# sourceMappingURL=paginate.js.map

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

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

package/dist/runtime/query/primary-key.d.ts

@@ -1,4 +1,14 @@
-import type { ManifestColumn, ManifestTable } from "../../dialect/types.js";
+import type { ManifestColumn, ManifestRelation, ManifestTable } from "../../dialect/types.js";
+export declare function primaryKeyTsNames(table: ManifestTable): string[];
+export declare function primaryKeySqlName(table: ManifestTable, index?: number): string;
+export declare function requireScalarPrimaryKey(table: ManifestTable): {
+    tsName: string;
+    sqlName: string;
+};
+export declare function rowScalarPkValue(row: Record<string, unknown>, table: ManifestTable): string;
+export declare function rowPkKey(row: Record<string, unknown>, table: ManifestTable): string;
+export declare function targetRelationPkSql(targetTable: ManifestTable, relation?: ManifestRelation): string;
+export declare function resolveFkTargetSqlColumn(targetTable: ManifestTable, colRef: string | undefined): string;
 export declare function defaultPrimaryKeyValue(table: ManifestTable, col: ManifestColumn): string;
 export declare function fillMissingPrimaryKeys(table: ManifestTable, data: Record<string, unknown>): void;
 //# sourceMappingURL=primary-key.d.ts.map

package/dist/runtime/query/primary-key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"primary-key.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAQ5E,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,cAAc,GAClB,MAAM,CAKR;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAON"}
+{"version":3,"file":"primary-key.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAK9F,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE,CAIhE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,SAAI,GAAG,MAAM,CAMzE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAYjG;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,CAO3F;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,aAAa,GAAG,MAAM,CAMnF;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,aAAa,EAC1B,QAAQ,CAAC,EAAE,gBAAgB,GAC1B,MAAM,CAKR;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,aAAa,EAC1B,MAAM,EAAE,MAAM,GAAG,SAAS,GACzB,MAAM,CAQR;AAOD,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,cAAc,GAClB,MAAM,CAKR;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,IAAI,CAQN"}

package/dist/runtime/query/primary-key.js

@@ -1,5 +1,58 @@
 import { randomUUID } from "node:crypto";
 import { generateUuid, resolveUuidVersion } from "../../utils/uuid.js";
+const PK_KEY_SEP = "\0";
+export function primaryKeyTsNames(table) {
+    return table.primaryKey
+        .map((sqlName) => table.columns.find((c) => c.sqlName === sqlName)?.tsName)
+        .filter((name) => name !== undefined);
+}
+export function primaryKeySqlName(table, index = 0) {
+    const sqlName = table.primaryKey[index];
+    if (!sqlName) {
+        throw new Error(`Primary key index ${index} not found for table "${table.accessor}"`);
+    }
+    return sqlName;
+}
+export function requireScalarPrimaryKey(table) {
+    if (table.primaryKey.length !== 1) {
+        throw new Error(`Operation requires a single-column primary key on table "${table.accessor}"`);
+    }
+    const sqlName = table.primaryKey[0];
+    const col = table.columns.find((c) => c.sqlName === sqlName);
+    if (!col) {
+        throw new Error(`Primary key column not found for table "${table.accessor}"`);
+    }
+    return { tsName: col.tsName, sqlName: col.sqlName };
+}
+export function rowScalarPkValue(row, table) {
+    const { tsName } = requireScalarPrimaryKey(table);
+    const val = row[tsName];
+    if (val == null) {
+        throw new Error(`Missing primary key "${tsName}" on row`);
+    }
+    return String(val);
+}
+export function rowPkKey(row, table) {
+    const tsNames = primaryKeyTsNames(table);
+    if (tsNames.length === 0) {
+        throw new Error(`No primary key defined for table "${table.accessor}"`);
+    }
+    return tsNames.map((name) => String(row[name] ?? "")).join(PK_KEY_SEP);
+}
+export function targetRelationPkSql(targetTable, relation) {
+    if (relation?.targetColumn) {
+        return relation.targetColumn;
+    }
+    return primaryKeySqlName(targetTable);
+}
+export function resolveFkTargetSqlColumn(targetTable, colRef) {
+    if (!colRef) {
+        return primaryKeySqlName(targetTable);
+    }
+    const col = targetTable.columns.find((c) => c.tsName === colRef) ??
+        targetTable.columns.find((c) => c.sqlName === colRef);
+    return col?.sqlName ?? colRef;
+}
 function generateTextId(tableAccessor) {
     const prefix = tableAccessor.replace(/s$/, "").slice(0, 4);
     return `${prefix}_${randomUUID().slice(0, 8)}`;
@@ -14,6 +67,8 @@ export function fillMissingPrimaryKeys(table, data) {
     for (const col of table.columns) {
         if (!col.primary)
             continue;
+        if (col.kind === "serial" || col.generated)
+            continue;
         const current = data[col.tsName];
         if (current !== undefined && current !== null)
             continue;

package/dist/runtime/query/primary-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"primary-key.js","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,SAAS,cAAc,CAAC,aAAqB;IAC3C,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,OAAO,GAAG,MAAM,IAAI,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,KAAoB,EACpB,GAAmB;IAEnB,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACxB,OAAO,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,KAAoB,EACpB,IAA6B;IAE7B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,OAAO;YAAE,SAAS;QAC3B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI;YAAE,SAAS;QACxD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC;AACH,CAAC"}
+{"version":3,"file":"primary-key.js","sourceRoot":"","sources":["../../../src/runtime/query/primary-key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEvE,MAAM,UAAU,GAAG,IAAI,CAAC;AAExB,MAAM,UAAU,iBAAiB,CAAC,KAAoB;IACpD,OAAO,KAAK,CAAC,UAAU;SACpB,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,EAAE,MAAM,CAAC;SAC1E,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAoB,EAAE,KAAK,GAAG,CAAC;IAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,yBAAyB,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;IACxF,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAoB;IAC1D,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,4DAA4D,KAAK,CAAC,QAAQ,GAAG,CAC9E,CAAC;IACJ,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC;IACrC,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;IAC7D,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CAAC,2CAA2C,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAA4B,EAAE,KAAoB;IACjF,MAAM,EAAE,MAAM,EAAE,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,MAAM,UAAU,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAA4B,EAAE,KAAoB;IACzE,MAAM,OAAO,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,qCAAqC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC;IAC1E,CAAC;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,WAA0B,EAC1B,QAA2B;IAE3B,IAAI,QAAQ,EAAE,YAAY,EAAE,CAAC;QAC3B,OAAO,QAAQ,CAAC,YAAY,CAAC;IAC/B,CAAC;IACD,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,WAA0B,EAC1B,MAA0B;IAE1B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IACD,MAAM,GAAG,GACP,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC;QACpD,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC;IACxD,OAAO,GAAG,EAAE,OAAO,IAAI,MAAM,CAAC;AAChC,CAAC;AAED,SAAS,cAAc,CAAC,aAAqB;IAC3C,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3D,OAAO,GAAG,MAAM,IAAI,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,KAAoB,EACpB,GAAmB;IAEnB,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QACxB,OAAO,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,KAAoB,EACpB,IAA6B;IAE7B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,OAAO;YAAE,SAAS;QAC3B,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,SAAS;YAAE,SAAS;QACrD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjC,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI;YAAE,SAAS;QACxD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACxD,CAAC;AACH,CAAC"}

package/dist/runtime/query/relation-writes.d.ts

@@ -0,0 +1,25 @@
+import type { Manifest, ManifestTable } from "../../dialect/types.js";
+import type { Executor } from "../executor.js";
+import type { WithInput } from "./find.js";
+import { type QueryRuntime } from "./execute.js";
+export type CreateRunner = (executor: Executor, runtime: QueryRuntime, tableAccessor: string, args: {
+    data: Record<string, unknown>;
+    with?: Record<string, WithInput>;
+}) => Promise<Record<string, unknown>>;
+export type ParsedRelationWrite = {
+    relationName: string;
+    value: Record<string, unknown>;
+};
+export type SplitDataResult = {
+    scalarData: Record<string, unknown>;
+    relationWrites: ParsedRelationWrite[];
+};
+export declare function splitScalarsAndRelationWrites(manifest: Manifest, tableAccessor: string, table: ManifestTable, data: Record<string, unknown>): SplitDataResult;
+export declare function resolveConnectOrCreate(executor: Executor, runtime: QueryRuntime, targetAccessor: string, items: Array<{
+    where: Record<string, unknown>;
+    create: Record<string, unknown>;
+}>): Promise<string[]>;
+export declare function applyToOnePreWrites(executor: Executor, runtime: QueryRuntime, table: ManifestTable, scalarData: Record<string, unknown>, relationWrites: ParsedRelationWrite[], runCreate: CreateRunner): Promise<void>;
+export declare function executeRelationWrites(executor: Executor, runtime: QueryRuntime, tableAccessor: string, parentId: string, relationWrites: ParsedRelationWrite[], runCreate: CreateRunner): Promise<void>;
+export declare function hasPostRelationWrites(table: ManifestTable, manifest: Manifest, tableAccessor: string, relationWrites: ParsedRelationWrite[]): boolean;
+//# sourceMappingURL=relation-writes.d.ts.map

package/dist/runtime/query/relation-writes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"relation-writes.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/relation-writes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAwC,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5G,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,cAAc,CAAC;AAWxE,MAAM,MAAM,YAAY,GAAG,CACzB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACJ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClC,KACE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEtC,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,cAAc,EAAE,mBAAmB,EAAE,CAAC;CACvC,CAAC;AAoDF,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,eAAe,CAiBjB;AAED,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GAChF,OAAO,CAAC,MAAM,EAAE,CAAC,CA6CnB;AA2UD,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACnC,cAAc,EAAE,mBAAmB,EAAE,EACrC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,IAAI,CAAC,CAcf;AA4HD,wBAAsB,qBAAqB,CACzC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,mBAAmB,EAAE,EACrC,SAAS,EAAE,YAAY,GACtB,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,mBAAmB,EAAE,GACpC,OAAO,CAOT"}