neoorm 0.3.0 → 0.4.0

package/dist/runtime/query/delete.js

@@ -1,22 +1,31 @@
-import { postgresDialect, quoteIdentifier } from "../../dialect/postgres.js";
-import { buildDeleteManyQuery, buildDeleteQuery, compileWhere, rowToTs, } from "./compile.js";
-import { runQuery, runQueryOne } from "./execute.js";
+import { postgresDialect } from "../../dialect/postgres.js";
+import { buildDeleteManyQuery, buildDeleteQuery, compileWhere, getCachedDeleteManyQuery, getCachedWhereClause, isImpossibleWhere, mapRowToTs, } from "./compile.js";
+import { runExecute, runQueryOne } from "./execute.js";
 import { loadRelations } from "./find.js";
-import { primaryKeySqlName, requireScalarPrimaryKey } from "./primary-key.js";
+import { resolvePkWhere } from "./primary-key.js";
+import { getTableIndex } from "./table-index.js";
 export async function deleteRecord(executor, runtime, tableAccessor, args) {
+    const dialect = runtime.dialect ?? postgresDialect;
     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 { sql: whereSql, params } = compileWhere(manifest, table, args.where, dialect, 1, runtime.tableIndex);
     if (!whereSql) {
         throw new Error("Delete requires a where clause");
     }
-    const query = buildDeleteQuery(table, whereSql);
+    const needsReturning = args.returnDeleted || args.with;
+    if (!needsReturning) {
+        const query = buildDeleteManyQuery(table, whereSql);
+        const { rowCount } = await runExecute(executor, runtime, { operation: "delete", tableAccessor }, query, params);
+        return rowCount > 0 ? {} : null;
+    }
+    const returning = args.returnDeleted ? "full" : "pk";
+    const query = buildDeleteQuery(table, whereSql, returning, runtime.tableIndex);
     const row = await runQueryOne(executor, runtime, { operation: "delete", tableAccessor }, query, params);
     if (!row)
         return null;
-    const result = rowToTs(table, row);
+    const result = mapRowToTs(getTableIndex(runtime.tableIndex, tableAccessor), table, row);
     if (args.with) {
         const [withLoaded] = await loadRelations(executor, runtime, table, [result], args.with);
         return withLoaded ?? result;
@@ -24,24 +33,28 @@ export async function deleteRecord(executor, runtime, tableAccessor, args) {
     return result;
 }
 export async function deleteManyRecords(executor, runtime, tableAccessor, args) {
+    const dialect = runtime.dialect ?? postgresDialect;
     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 pkSql = quoteIdentifier(primaryKeySqlName(table));
-    const result = await runQuery(executor, runtime, { operation: "delete", tableAccessor }, `${query} RETURNING ${pkSql}`, params);
-    return result.length;
+    const { sql: whereSql, params, impossible } = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
+    if (impossible || isImpossibleWhere(whereSql)) {
+        return 0;
+    }
+    const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
+    const query = getCachedDeleteManyQuery(tableIndex, table, whereSql);
+    const { rowCount } = await runExecute(executor, runtime, { operation: "delete", tableAccessor }, query, params);
+    return rowCount;
 }
 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, "deleteById");
+    const where = resolvePkWhere(table, id);
     return deleteRecord(executor, runtime, tableAccessor, {
-        where: { [tsName]: id },
+        where,
     });
 }
 //# 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":"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"}
+{"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

@@ -1,22 +1,29 @@
-import type { Pool } from "pg";
-import type { Manifest } from "../../dialect/types.js";
+import type { Dialect, Manifest } from "../../dialect/types.js";
+import type { DatabaseClient } from "../driver.js";
 import type { QueryOperation } from "../errors.js";
 import type { Executor } from "../executor.js";
+import type { ManifestIndex } from "./table-index.js";
 export type QueryRuntime = {
     manifest: Manifest;
     schema?: string;
-    pool?: Pool;
+    driver?: DatabaseClient;
+    dialect?: Dialect;
     migrationsDir?: string;
+    tableIndex?: ManifestIndex;
 };
 export type RunQueryContext = {
     operation: QueryOperation;
     tableAccessor?: string;
 };
 type InsertUpsertContext = RunQueryContext & {
-    operation: "insert" | "upsert";
+    operation: "insert" | "upsert" | "findOrCreate";
     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 runExecute<T = Record<string, unknown>>(executor: Executor, runtime: QueryRuntime, ctx: RunQueryContext, sql: string, params?: unknown[]): Promise<{
+    rows: T[];
+    rowCount: number;
+}>;
 export declare function runQueryOne<T = Record<string, unknown>>(executor: Executor, runtime: QueryRuntime, ctx: InsertUpsertContext, 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>;
 export {};

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

@@ -1 +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;AAKvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ/C,MAAM,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,SAAS,EAAE,cAAc,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,mBAAmB,GAAG,eAAe,GAAG;IAC5C,SAAS,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;CACtB,CAAC;AAgEF,wBAAsB,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAO,EAAO,GACpB,OAAO,CAAC,CAAC,EAAE,CAAC,CAcd;AAED,wBAAsB,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,mBAAmB,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC,CAAC,CAAC,CAAC;AACd,wBAAsB,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC"}
+{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/execute.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAMhE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAQ/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,MAAM,YAAY,GAAG;IAC1B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC7B,SAAS,EAAE,cAAc,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,KAAK,mBAAmB,GAAG,eAAe,GAAG;IAC5C,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,cAAc,CAAC;IAChD,aAAa,EAAE,MAAM,CAAC;CACtB,CAAC;AAkEF,wBAAsB,QAAQ,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACzD,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,MAAM,GAAE,OAAO,EAAO,GACpB,OAAO,CAAC,CAAC,EAAE,CAAC,CAcd;AAED,wBAAsB,UAAU,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,GACpB,OAAO,CAAC;IAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAc1C;AAED,wBAAsB,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,mBAAmB,EACxB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC,CAAC,CAAC,CAAC;AACd,wBAAsB,WAAW,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5D,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,OAAO,EAAE,GAChB,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC"}

package/dist/runtime/query/execute.js

@@ -1,12 +1,13 @@
+import { postgresDialect } from "../../dialect/postgres.js";
 import { getAppliedMigrations, listPendingMigrations, } from "../../migrate/runner.js";
 import { NeoOrmQueryError } from "../errors.js";
 import { emptyReturningContext, enrichPgError, isPgError, isSchemaDriftPgCode, } from "../pg-error.js";
-async function resolveMigrationHint(pool, migrationsDir, schema, pgCode) {
-    if (!pool || !isSchemaDriftPgCode(pgCode)) {
+async function resolveMigrationHint(driver, dialect, migrationsDir, schema, pgCode) {
+    if (!driver || !isSchemaDriftPgCode(pgCode)) {
         return undefined;
     }
     try {
-        const applied = await getAppliedMigrations(pool, schema);
+        const applied = await getAppliedMigrations(driver, dialect, schema);
         const appliedList = [...applied];
         const lastApplied = appliedList.at(-1);
         const parts = [];
@@ -30,7 +31,7 @@ async function resolveMigrationHint(pool, migrationsDir, schema, pgCode) {
     }
 }
 async function throwQueryError(runtime, context, cause) {
-    const migrationHint = await resolveMigrationHint(runtime.pool, runtime.migrationsDir, runtime.schema, context.pgCode);
+    const migrationHint = await resolveMigrationHint(runtime.driver, runtime.dialect ?? postgresDialect, runtime.migrationsDir, runtime.schema, context.pgCode);
     throw new NeoOrmQueryError(migrationHint ? { ...context, migrationHint } : context, cause);
 }
 function queryBaseContext(ctx, sql) {
@@ -50,11 +51,25 @@ export async function runQuery(executor, runtime, ctx, sql, params = []) {
         throw err;
     }
 }
+export async function runExecute(executor, runtime, ctx, sql, params = []) {
+    try {
+        return await executor.execute(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.operation === "insert" ||
+                ctx.operation === "upsert" ||
+                ctx.operation === "findOrCreate") &&
             ctx.tableAccessor) {
             await throwQueryError(runtime, emptyReturningContext(ctx.operation, runtime.manifest, ctx.tableAccessor, sql));
         }

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

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

package/dist/runtime/query/find-or-create.d.ts

@@ -0,0 +1,17 @@
+import type { Executor } from "../executor.js";
+import { type QueryRuntime } from "./execute.js";
+import { type WithInput } from "./find.js";
+export type FindOrCreateResult = {
+    record: Record<string, unknown>;
+    created: boolean;
+};
+export declare function findOrCreateRecord(executor: Executor, runtime: QueryRuntime, tableAccessor: string, args: {
+    where: Record<string, unknown>;
+    create: Record<string, unknown>;
+    with?: Record<string, WithInput>;
+}): Promise<FindOrCreateResult>;
+export declare function findOrCreatePk(executor: Executor, runtime: QueryRuntime, tableAccessor: string, item: {
+    where: Record<string, unknown>;
+    create: Record<string, unknown>;
+}): Promise<string>;
+//# sourceMappingURL=find-or-create.d.ts.map

package/dist/runtime/query/find-or-create.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-or-create.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/find-or-create.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAS/C,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,cAAc,CAAC;AAE9D,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAIpE,MAAM,MAAM,kBAAkB,GAAG;IAChC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,wBAAsB,kBAAkB,CACvC,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACjC,GACC,OAAO,CAAC,kBAAkB,CAAC,CAkF7B;AA+DD,wBAAgB,cAAc,CAC7B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE;IACL,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC,GACC,OAAO,CAAC,MAAM,CAAC,CASjB"}

package/dist/runtime/query/find-or-create.js

@@ -0,0 +1,90 @@
+import { postgresDialect } from "../../dialect/postgres.js";
+import { buildFindOrCreateQuery, compileWhere, dataToSqlValues, FIND_OR_CREATE_FLAG, mapRowToTs, } from "./compile.js";
+import { runCreate } from "./create.js";
+import { runQueryOne } from "./execute.js";
+import { getTableIndex } from "./table-index.js";
+import { findMany, loadRelations } from "./find.js";
+import { fillMissingPrimaryKeys, rowScalarPkValue } from "./primary-key.js";
+import { assertUniqueWhere } from "./unique.js";
+export async function findOrCreateRecord(executor, runtime, tableAccessor, args) {
+    const dialect = runtime.dialect ?? postgresDialect;
+    const { manifest } = runtime;
+    const table = manifest.tables[tableAccessor];
+    if (!table)
+        throw new Error(`Unknown table: ${tableAccessor}`);
+    const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
+    const constraint = assertUniqueWhere(table, args.where, "findOrCreate", tableIndex);
+    const createData = { ...args.create, ...args.where };
+    fillMissingPrimaryKeys(table, createData, tableIndex);
+    if (dialect.name === "sqlite") {
+        return findOrCreateSqlite(executor, runtime, tableAccessor, args, createData);
+    }
+    const { keys: insertKeys, values: insertValues } = dataToSqlValues(table, createData, undefined, runtime.tableIndex, dialect);
+    const { sql: whereSql, params: whereParams } = compileWhere(manifest, table, args.where, dialect, insertValues.length + 1, runtime.tableIndex);
+    const fallbackWhereBody = whereSql.replace(/^WHERE\s+/i, "");
+    const findOrCreateSql = buildFindOrCreateQuery(table, insertKeys, constraint.sqlColumns, fallbackWhereBody, runtime.tableIndex);
+    const row = await runQueryOne(executor, runtime, { operation: "findOrCreate", tableAccessor }, findOrCreateSql, [...insertValues, ...whereParams]);
+    const created = row[FIND_OR_CREATE_FLAG] === true;
+    const { [FIND_OR_CREATE_FLAG]: _createdFlag, ...rawRow } = row;
+    const result = mapRowToTs(getTableIndex(runtime.tableIndex, tableAccessor), table, rawRow);
+    let record = result;
+    if (args.with) {
+        const [withLoaded] = await loadRelations(executor, runtime, table, [result], args.with);
+        record = withLoaded ?? result;
+    }
+    return { record, created };
+}
+async function findOrCreateSqlite(executor, runtime, tableAccessor, args, createData) {
+    const { manifest } = runtime;
+    const table = manifest.tables[tableAccessor];
+    if (!table)
+        throw new Error(`Unknown table: ${tableAccessor}`);
+    const loadWith = async (record) => {
+        if (!args.with)
+            return record;
+        const [withLoaded] = await loadRelations(executor, runtime, table, [record], args.with);
+        return withLoaded ?? record;
+    };
+    const existing = await findMany(executor, runtime, tableAccessor, {
+        where: args.where,
+        limit: 1,
+    });
+    if (existing.length > 0) {
+        const existingRow = existing[0];
+        if (existingRow) {
+            return { record: await loadWith(existingRow), created: false };
+        }
+    }
+    try {
+        const row = await runCreate(executor, runtime, tableAccessor, {
+            data: createData,
+            returnCreated: true,
+        });
+        return { record: await loadWith(row), created: true };
+    }
+    catch {
+        const retry = await findMany(executor, runtime, tableAccessor, {
+            where: args.where,
+            limit: 1,
+        });
+        if (retry.length > 0) {
+            const retryRow = retry[0];
+            if (retryRow) {
+                return { record: await loadWith(retryRow), created: false };
+            }
+        }
+        throw new Error("findOrCreate insert failed and record was not found");
+    }
+}
+export function findOrCreatePk(executor, runtime, tableAccessor, item) {
+    return findOrCreateRecord(executor, runtime, tableAccessor, {
+        where: item.where,
+        create: item.create,
+    }).then(({ record }) => {
+        const table = runtime.manifest.tables[tableAccessor];
+        if (!table)
+            throw new Error(`Unknown table: ${tableAccessor}`);
+        return rowScalarPkValue(record, table);
+    });
+}
+//# sourceMappingURL=find-or-create.js.map

package/dist/runtime/query/find-or-create.js.map

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

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

@@ -1,23 +1,32 @@
 import type { ManifestTable } from "../../dialect/types.js";
 import type { Executor } from "../executor.js";
+import { type OrderByInput } from "./compile.js";
 import { type QueryRuntime } from "./execute.js";
-export type WithInput = boolean | {
+import { type RelationLoadPlan } from "./relation-planner.js";
+type RelationSpec = {
     select?: readonly string[] | Record<string, boolean | undefined>;
-    orderBy?: Record<string, string>;
+    orderBy?: OrderByInput;
     limit?: number;
     with?: Record<string, WithInput>;
 };
+export type WithInput = boolean | RelationSpec | {
+    [relation: string]: true | {
+        where?: Record<string, unknown>;
+    };
+};
+export declare function hydrateAndLoadRelations(executor: Executor, runtime: QueryRuntime, table: ManifestTable, rawRows: Record<string, unknown>[], withSpec: Record<string, WithInput> | undefined, plan?: RelationLoadPlan): Promise<Record<string, unknown>[]>;
 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>;
+    orderBy?: OrderByInput;
     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, 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?: {
+export declare function findById(executor: Executor, runtime: QueryRuntime, tableAccessor: string, id: string | Record<string, unknown>, args?: {
     with?: Record<string, WithInput>;
 }): Promise<Record<string, unknown> | null>;
+export {};
 //# 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":"AAKA,OAAO,KAAK,EAGX,aAAa,EACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAU/C,OAAO,EAAE,KAAK,YAAY,EAAY,MAAM,cAAc,CAAC;AAa3D,MAAM,MAAM,SAAS,GAClB,OAAO,GACP;IACA,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;CAChC,CAAC;AAscL,wBAAsB,aAAa,CAClC,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,GAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAqBpC;AAED,wBAAsB,QAAQ,CAC7B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE;IACN,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;CACjC,GACC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAiCpC;AAED,wBAAsB,SAAS,CAC9B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,GACnC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAMzC;AAED,wBAAsB,QAAQ,CAC7B,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,GACzC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAgBzC"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/find.ts"],"names":[],"mappings":"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"}