neoorm 0.4.7 → 0.5.0

package/dist/runtime/query/delete.js

@@ -1,6 +1,6 @@
 import { postgresDialect } from "../../dialect/postgres.js";
-import { buildDeleteManyQuery, buildDeleteQuery, compileWhere, getCachedDeleteManyQuery, getCachedWhereClause, isImpossibleWhere, mapRowToTs, } from "./compile.js";
-import { runExecute, runQueryOne } from "./execute.js";
+import { buildDeleteManyQuery, buildDeleteQuery, buildSelectColumns, compileWhere, getCachedDeleteManyQuery, getCachedWhereClause, isImpossibleWhere, mapRowToTs, mapRowsToTs, } from "./compile.js";
+import { runExecute, runQuery, runQueryOne, } from "./execute.js";
 import { loadRelations } from "./find.js";
 import { resolvePkWhere } from "./primary-key.js";
 import { getTableIndex } from "./table-index.js";
@@ -38,7 +38,7 @@ export async function deleteManyRecords(executor, runtime, tableAccessor, args)
     const table = manifest.tables[tableAccessor];
     if (!table)
         throw new Error(`Unknown table: ${tableAccessor}`);
-    const { sql: whereSql, params, impossible } = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
+    const { sql: whereSql, params, impossible, } = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
     if (impossible || isImpossibleWhere(whereSql)) {
         return 0;
     }
@@ -47,6 +47,21 @@ export async function deleteManyRecords(executor, runtime, tableAccessor, args)
     const { rowCount } = await runExecute(executor, runtime, { operation: "delete", tableAccessor }, query, params);
     return rowCount;
 }
+export async function deleteManyAndReturnRecords(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, impossible, } = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
+    if (impossible || isImpossibleWhere(whereSql)) {
+        return [];
+    }
+    const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
+    const query = getCachedDeleteManyQuery(tableIndex, table, whereSql);
+    const rows = await runQuery(executor, runtime, { operation: "delete", tableAccessor }, `${query} RETURNING ${buildSelectColumns(table, undefined, runtime.tableIndex)}`, params);
+    return mapRowsToTs(tableIndex, table, rows);
+}
 export async function deleteById(executor, runtime, tableAccessor, id) {
     const { manifest } = runtime;
     const table = manifest.tables[tableAccessor];

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/find-or-create.d.ts.map

@@ -1 +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"}
+{"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;AAC9D,OAAO,EAA2B,KAAK,SAAS,EAAE,MAAM,WAAW,CAAC;AAKpE,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

@@ -2,9 +2,9 @@ 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 { getTableIndex } from "./table-index.js";
 import { assertUniqueWhere } from "./unique.js";
 export async function findOrCreateRecord(executor, runtime, tableAccessor, args) {
     const dialect = runtime.dialect ?? postgresDialect;
@@ -47,7 +47,7 @@ async function findOrCreateSqlite(executor, runtime, tableAccessor, args, create
     };
     const existing = await findMany(executor, runtime, tableAccessor, {
         where: args.where,
-        limit: 1,
+        take: 1,
     });
     if (existing.length > 0) {
         const existingRow = existing[0];
@@ -65,7 +65,7 @@ async function findOrCreateSqlite(executor, runtime, tableAccessor, args, create
     catch {
         const retry = await findMany(executor, runtime, tableAccessor, {
             where: args.where,
-            limit: 1,
+            take: 1,
         });
         if (retry.length > 0) {
             const retryRow = retry[0];

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

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

@@ -5,8 +5,10 @@ import { type QueryRuntime } from "./execute.js";
 import { type RelationLoadPlan } from "./relation-planner.js";
 type RelationSpec = {
     select?: readonly string[] | Record<string, boolean | undefined>;
+    where?: Record<string, unknown>;
     orderBy?: OrderByInput;
-    limit?: number;
+    take?: number;
+    skip?: number;
     with?: Record<string, WithInput>;
 };
 export type WithInput = boolean | RelationSpec | {
@@ -15,18 +17,24 @@ export type WithInput = boolean | RelationSpec | {
     };
 };
 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?: {
+type FindManyArgs = {
     where?: Record<string, unknown>;
     orderBy?: OrderByInput;
-    limit?: number;
-    offset?: number;
+    take?: number;
+    skip?: number;
     distinct?: readonly string[] | Record<string, boolean | undefined>;
+    select?: readonly string[] | Record<string, boolean | undefined>;
+    omit?: 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 | Record<string, unknown>, args?: {
+};
+type FindByIdArgs = {
+    select?: readonly string[] | Record<string, boolean | undefined>;
+    omit?: readonly string[] | Record<string, boolean | undefined>;
     with?: Record<string, WithInput>;
-}): Promise<Record<string, unknown> | null>;
+};
+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?: FindManyArgs): 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 | Record<string, unknown>, args?: FindByIdArgs): 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;AAC/C,OAAO,EAcN,KAAK,YAAY,EAEjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,KAAK,YAAY,EAAyB,MAAM,cAAc,CAAC;AAcxE,OAAO,EAON,KAAK,gBAAgB,EAIrB,MAAM,uBAAuB,CAAC;AAE/B,KAAK,YAAY,GAAG;IACnB,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,CAAC,CAAC;IACjE,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,SAAS,GAClB,OAAO,GACP,YAAY,GACZ;IAAE,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAA;CAAE,CAAC;AA+dtE,wBAAsB,uBAAuB,CAC5C,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,EAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,EAC/C,IAAI,CAAC,EAAE,gBAAgB,GACrB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CA2BpC;AAmID,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,CAuBpC;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,YAAY,CAAC;IACvB,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,CAoGpC;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,CA+FzC;AAWD,wBAAsB,QAAQ,CAC7B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,YAAY,EACrB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpC,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,CAqGzC"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/find.ts"],"names":[],"mappings":"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"}

package/dist/runtime/query/find.js

@@ -1,17 +1,20 @@
 import { postgresDialect, quoteIdentifier, tableRef, } from "../../dialect/postgres.js";
-import { buildFindByIdQuery, buildFindManyQuery, buildSelectColumns, compileOrderBy, compileWhere, getCachedFindManyQuery, getCachedOrderByClause, getCachedWhereClause, isImpossibleWhere, mapRowToTs, mapRowsToTs, normalizeLimitOffset, normalizeSelectColumns, } from "./compile.js";
 import { rebaseParamRefs } from "../../sql/template.js";
+import { buildFindByIdQuery, buildFindManyQuery, buildSelectColumns, compileOrderBy, compileWhere, getCachedFindManyQuery, getCachedOrderByClause, getCachedWhereClause, isImpossibleWhere, mapRowsToTs, mapRowToTs, normalizeLimitOffset, normalizeSelectColumns, } from "./compile.js";
 import { runQuery, runQueryOne } from "./execute.js";
-import { findM2M, findRelation, tableOwnsFkColumn, } from "./manifest-lookup.js";
+import { findM2M, findRelation, tableOwnsFkColumn } from "./manifest-lookup.js";
 import { primaryKeyTsNames, requireScalarPrimaryKey, resolvePkWhere, rowPkKey, targetRelationPkSql, } from "./primary-key.js";
-import { getTableIndex, columnBySqlName } from "./table-index.js";
+import { projectFindRow, projectFindRows, projectionSignature, resolveParentProjection, } from "./projection.js";
 import { buildCountAggregateGroupBy, buildPlanExtraSelectCols, compileCountOrderBy, getCachedFindByIdWithQuery, getCachedRelationPlan, hydrateRowsWithPlan, planRelationLoad, withShapeSignature, } from "./relation-planner.js";
+import { columnBySqlName, getTableIndex } from "./table-index.js";
 function isRelationSpec(withSpec) {
     if (typeof withSpec !== "object" || withSpec === null)
         return false;
     return ("select" in withSpec ||
+        "where" in withSpec ||
         "orderBy" in withSpec ||
-        "limit" in withSpec ||
+        "take" in withSpec ||
+        "skip" in withSpec ||
         "with" in withSpec);
 }
 function validateDistinctOrderBy(distinct, orderBy) {
@@ -44,6 +47,20 @@ function splitWithSpec(withSpec) {
         result.countSpec = countSpec;
     return result;
 }
+function compileBatchedRelationWhere(runtime, targetTable, whereFilter, parentIdCount, tableAlias) {
+    if (!whereFilter || Object.keys(whereFilter).length === 0) {
+        return { extraWhere: "", extraParams: [] };
+    }
+    const dialect = runtime.dialect ?? postgresDialect;
+    const compiled = compileWhere(runtime.manifest, targetTable, whereFilter, dialect, 1, runtime.tableIndex, false, tableAlias);
+    if (!compiled.sql)
+        return { extraWhere: "", extraParams: [] };
+    const adjusted = rebaseParamRefs(compiled.sql, parentIdCount);
+    return {
+        extraWhere: ` AND ${adjusted.replace(/^WHERE\s+/i, "")}`,
+        extraParams: compiled.params,
+    };
+}
 async function loadRelationCounts(executor, runtime, parentTable, parentRows, countSpec) {
     if (parentRows.length === 0)
         return;
@@ -57,7 +74,8 @@ async function loadRelationCounts(executor, runtime, parentTable, parentRows, co
         const counts = await countRelationLinks(executor, runtime, parentTable, relationName, parentIds, whereFilter);
         for (const parent of parentRows) {
             const parentKey = rowPkKey(parent, parentTable);
-            const bucket = parent["_count"] ?? {};
+            const bucket = parent["_count"] ??
+                {};
             bucket[relationName] = counts.get(parentKey) ?? 0;
             parent["_count"] = bucket;
         }
@@ -164,7 +182,8 @@ async function loadOneRelation(executor, runtime, parentTable, parentRows, relat
         if (!targetPkTsName) {
             throw new Error(`No primary key defined for table "${targetTable.accessor}"`);
         }
-        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, `SELECT ${selectCols} FROM ${tableRef(targetTable)} WHERE ${targetPkCol} IN (${placeholders})`, fkValues);
+        const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, fkValues.length);
+        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, `SELECT ${selectCols} FROM ${tableRef(targetTable)} WHERE ${targetPkCol} IN (${placeholders})${extraWhere}`, [...fkValues, ...extraParams]);
         const targetTableIndex = getTableIndex(runtime.tableIndex, targetTable.accessor);
         const mapped = mapRowsToTs(targetTableIndex, targetTable, rows);
         const byId = new Map(mapped.map((r) => [String(r[targetPkTsName]), r]));
@@ -179,13 +198,18 @@ async function loadOneRelation(executor, runtime, parentTable, parentRows, relat
         const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
         const selectCols = columnsForSelect(targetTable, withSpec);
         let sql = `SELECT ${selectCols} FROM ${tableRef(targetTable)} WHERE ${fkCol} IN (${placeholders})`;
+        const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, parentIds.length);
+        sql += extraWhere;
         if (nestedSpec?.orderBy) {
             sql += ` ${compileOrderBy(targetTable, nestedSpec.orderBy, undefined, runtime.tableIndex)}`;
         }
-        if (nestedSpec?.limit !== undefined) {
-            sql += ` LIMIT ${normalizeLimitOffset(nestedSpec.limit, "limit")}`;
+        if (nestedSpec?.take !== undefined) {
+            sql += ` LIMIT ${normalizeLimitOffset(nestedSpec.take, "take")}`;
+        }
+        if (nestedSpec?.skip !== undefined) {
+            sql += ` OFFSET ${normalizeLimitOffset(nestedSpec.skip, "skip")}`;
         }
-        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, parentIds);
+        const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, [...parentIds, ...extraParams]);
         const targetTableIndex = getTableIndex(runtime.tableIndex, targetTable.accessor);
         const mapped = mapRowsToTs(targetTableIndex, targetTable, rows);
         const fkTargetCol = columnBySqlName(targetTableIndex, targetTable, relation.fkSqlColumn);
@@ -221,7 +245,7 @@ async function loadOneRelation(executor, runtime, parentTable, parentRows, relat
         await loadNestedRelations(executor, runtime, targetTable, childRows, nestedSpec.with);
     }
 }
-async function loadM2MRelation(executor, runtime, 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;
@@ -237,17 +261,28 @@ async function loadM2MRelation(executor, runtime, parentTable, parentRows, m2m,
     if (parentIds.length === 0)
         return;
     const placeholders = parentIds.map((_, i) => `$${i + 1}`).join(", ");
+    const nestedSpec = isRelationSpec(withSpec) ? withSpec : undefined;
     const selectCols = targetTable.columns
-        .map((c) => quoteIdentifier(c.sqlName))
+        .map((c) => `t.${quoteIdentifier(c.sqlName)}`)
         .join(", ");
     const targetPkCol = quoteIdentifier(targetRelationPkSql(targetTable));
-    const sql = `
-    SELECT t.*, j.${quoteIdentifier(parentFkCol)} AS _parent_id
+    const { extraWhere, extraParams } = compileBatchedRelationWhere(runtime, targetTable, nestedSpec?.where, parentIds.length, "t");
+    let sql = `
+    SELECT ${selectCols}, j.${quoteIdentifier(parentFkCol)} AS _parent_id
     FROM ${tableRef(throughTable)} j
     JOIN ${tableRef(targetTable)} t ON t.${targetPkCol} = j.${quoteIdentifier(targetFkCol)}
-    WHERE j.${quoteIdentifier(parentFkCol)} IN (${placeholders})
+    WHERE j.${quoteIdentifier(parentFkCol)} IN (${placeholders})${extraWhere}
   `.trim();
-    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, parentIds);
+    if (nestedSpec?.orderBy) {
+        sql += ` ${compileOrderBy(targetTable, nestedSpec.orderBy, "t", runtime.tableIndex)}`;
+    }
+    if (nestedSpec?.take !== undefined) {
+        sql += ` LIMIT ${normalizeLimitOffset(nestedSpec.take, "take")}`;
+    }
+    if (nestedSpec?.skip !== undefined) {
+        sql += ` OFFSET ${normalizeLimitOffset(nestedSpec.skip, "skip")}`;
+    }
+    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor: targetTable.accessor }, sql, [...parentIds, ...extraParams]);
     const targetTableIndex = getTableIndex(runtime.tableIndex, targetTable.accessor);
     const grouped = new Map();
     for (const row of rows) {
@@ -285,7 +320,7 @@ export async function hydrateAndLoadRelations(executor, runtime, table, rawRows,
     }
     return resultRows;
 }
-async function executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, args, whereSql, params, planOptions) {
+async function executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, args, whereSql, params, planOptions, projection) {
     const dialect = runtime.dialect ?? postgresDialect;
     const { manifest } = runtime;
     const plan = getCachedRelationPlan(manifest, table, args.with, dialect, runtime.tableIndex, planOptions);
@@ -298,7 +333,8 @@ async function executeFindManyWithRelations(executor, runtime, tableAccessor, ta
         whereSql = qualifiedWhere.sql;
         params = qualifiedWhere.params;
     }
-    const extraSelectCols = buildPlanExtraSelectCols(manifest, table, plan, dialect, runtime.tableIndex);
+    const extraSelect = buildPlanExtraSelectCols(manifest, table, plan, dialect, runtime.tableIndex, params.length + 1);
+    const extraSelectCols = extraSelect.cols;
     const countOrderSql = compileCountOrderBy(manifest, table, args.orderBy, plan, runtime.tableIndex);
     const orderSqlForWith = countOrderSql ||
         getCachedOrderByClause(table, args.orderBy, needsQualifiedRefs ? table.sqlName : undefined, runtime.tableIndex);
@@ -316,10 +352,12 @@ async function executeFindManyWithRelations(executor, runtime, tableAccessor, ta
     }
     const withSignature = withShapeSignature(args.with);
     const planMode = planOptions?.useHasManyAggregate === false ? "corr" : "agg";
-    const signature = `${whereSql}|${orderSqlForWith}|${args.limit ?? ""}|${args.offset ?? ""}|${distinctOn?.join(",") ?? ""}|${withSignature}|${planMode}|${groupBySql}`;
-    const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSqlForWith, args.limit, args.offset, distinctOn, extraSelectCols.length > 0 ? extraSelectCols : undefined, joinClauses, runtime.tableIndex, groupBySql || undefined));
-    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, params);
-    return await hydrateAndLoadRelations(executor, runtime, table, rows, args.with, plan);
+    const projSig = projectionSignature(projection?.sqlColumns);
+    const signature = `${whereSql}|${orderSqlForWith}|${args.take ?? ""}|${args.skip ?? ""}|${distinctOn?.join(",") ?? ""}|${withSignature}|${planMode}|${groupBySql}|${projSig}`;
+    const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSqlForWith, args.take, args.skip, distinctOn, extraSelectCols.length > 0 ? extraSelectCols : undefined, joinClauses, runtime.tableIndex, groupBySql || undefined, projection?.sqlColumns));
+    const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, [...params, ...extraSelect.params]);
+    const hydrated = await hydrateAndLoadRelations(executor, runtime, table, rows, args.with, plan);
+    return projectFindRows(hydrated, projection, args.with);
 }
 export async function loadRelations(executor, runtime, table, rows, withSpec) {
     if (!withSpec || rows.length === 0)
@@ -339,12 +377,14 @@ export async function findMany(executor, runtime, tableAccessor, args) {
         throw new Error(`Unknown table: ${tableAccessor}`);
     const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
     const queryCtx = { operation: "select", tableAccessor };
+    const projection = resolveParentProjection(table, args, tableIndex);
     const isSimpleFind = !args?.where &&
         !args?.orderBy &&
         !args?.with &&
         !args?.distinct &&
-        args?.limit === undefined &&
-        args?.offset === undefined;
+        !projection.hasProjection &&
+        args?.take === undefined &&
+        args?.skip === undefined;
     if (isSimpleFind && tableIndex) {
         const rows = await runQuery(executor, runtime, queryCtx, tableIndex.findAllSql, []);
         return mapRowsToTs(tableIndex, table, rows);
@@ -358,53 +398,51 @@ export async function findMany(executor, runtime, tableAccessor, args) {
     if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
         return [];
     }
-    let whereSql = compiledWhere.sql;
-    let params = compiledWhere.params;
+    const whereSql = compiledWhere.sql;
+    const params = compiledWhere.params;
     const hasWith = Boolean(args?.with && Object.keys(args.with).length > 0);
     if (!hasWith) {
         const orderSql = getCachedOrderByClause(table, args?.orderBy, undefined, runtime.tableIndex);
-        const signature = `${whereSql}|${orderSql}|${args?.limit ?? ""}|${args?.offset ?? ""}|${distinctOn?.join(",") ?? ""}`;
-        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, args?.limit, args?.offset, distinctOn, undefined, undefined, runtime.tableIndex));
+        const projSig = projectionSignature(projection.sqlColumns);
+        const signature = `${whereSql}|${orderSql}|${args?.take ?? ""}|${args?.skip ?? ""}|${distinctOn?.join(",") ?? ""}|${projSig}`;
+        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, args?.take, args?.skip, distinctOn, undefined, undefined, runtime.tableIndex, undefined, projection.sqlColumns));
         const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, params);
-        return mapRowsToTs(tableIndex, table, rows);
+        return projectFindRows(mapRowsToTs(tableIndex, table, rows), projection);
     }
-    return executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...(args ?? {}), with: args.with }, whereSql, params, { useHasManyAggregate: true });
+    return executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...(args ?? {}), with: args.with }, whereSql, params, { useHasManyAggregate: true }, projection);
 }
 export async function findFirst(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 projection = resolveParentProjection(table, args, tableIndex);
     const hasWith = Boolean(args?.with && Object.keys(args.with).length > 0);
-    const canFastPath = !hasWith && !args?.distinct && args?.offset === undefined;
+    const canFastPath = !hasWith && !args?.distinct && args?.skip === undefined;
     if (canFastPath) {
-        const { manifest } = runtime;
-        const table = manifest.tables[tableAccessor];
-        if (!table)
-            throw new Error(`Unknown table: ${tableAccessor}`);
-        const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
         const compiledWhere = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
         if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
             return null;
         }
         const { sql: whereSql, params } = compiledWhere;
         const orderSql = getCachedOrderByClause(table, args?.orderBy, undefined, runtime.tableIndex);
-        const signature = `${whereSql}|${orderSql}|1||`;
-        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, 1, undefined, undefined, undefined, undefined, runtime.tableIndex));
+        const projSig = projectionSignature(projection.sqlColumns);
+        const signature = `${whereSql}|${orderSql}|1|||${projSig}`;
+        const query = getCachedFindManyQuery(tableIndex, signature, () => buildFindManyQuery(table, whereSql, orderSql, 1, undefined, undefined, undefined, undefined, runtime.tableIndex, undefined, projection.sqlColumns));
         const rows = await runQuery(executor, runtime, { operation: "select", tableAccessor }, query, params);
         if (rows.length === 0)
             return null;
-        return mapRowToTs(tableIndex, table, rows[0]);
+        return projectFindRow(mapRowToTs(tableIndex, table, rows[0]), projection);
     }
-    const { manifest } = runtime;
-    const table = manifest.tables[tableAccessor];
-    if (!table)
-        throw new Error(`Unknown table: ${tableAccessor}`);
-    const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
     const compiledWhere = getCachedWhereClause(manifest, table, args?.where, dialect, 1, runtime.tableIndex);
     if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
         return null;
     }
     const distinctOn = normalizeSelectColumns(args?.distinct);
     validateDistinctOrderBy(distinctOn, args?.orderBy);
-    const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...args, with: args.with, limit: 1 }, compiledWhere.sql, compiledWhere.params, { useHasManyAggregate: false });
+    const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { ...args, with: args.with, take: 1 }, compiledWhere.sql, compiledWhere.params, { useHasManyAggregate: false }, projection);
     return rows[0] ?? null;
 }
 function extractScalarPkValue(table, id) {
@@ -419,43 +457,70 @@ export async function findById(executor, runtime, tableAccessor, id, args) {
     if (!table)
         throw new Error(`Unknown table: ${tableAccessor}`);
     const tableIndex = getTableIndex(runtime.tableIndex, tableAccessor);
+    const projection = resolveParentProjection(table, args, tableIndex);
     if (table.primaryKey.length !== 1) {
         const where = resolvePkWhere(table, id);
         if (args?.with) {
             const compiledWhere = getCachedWhereClause(manifest, table, where, dialect, 1, runtime.tableIndex);
-            if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
+            if (compiledWhere.impossible ||
+                isImpossibleWhere(compiledWhere.sql)) {
                 return null;
             }
-            const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { where, limit: 1, with: args.with }, compiledWhere.sql, compiledWhere.params, { useHasManyAggregate: false });
+            const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, {
+                where,
+                take: 1,
+                with: args.with,
+                ...(args.select !== undefined
+                    ? { select: args.select }
+                    : {}),
+                ...(args.omit !== undefined ? { omit: args.omit } : {}),
+            }, compiledWhere.sql, compiledWhere.params, { useHasManyAggregate: false }, projection);
             return rows[0] ?? null;
         }
         const rows = await findMany(executor, runtime, tableAccessor, {
             where,
-            limit: 1,
+            take: 1,
+            ...(args?.select !== undefined ? { select: args.select } : {}),
+            ...(args?.omit !== undefined ? { omit: args.omit } : {}),
         });
         return rows[0] ?? null;
     }
     const pkValue = extractScalarPkValue(table, id);
     const ctx = { operation: "select", tableAccessor };
     if (!args?.with) {
-        const query = tableIndex?.findByIdSql || buildFindByIdQuery(table);
+        const query = projection.hasProjection
+            ? getCachedFindManyQuery(tableIndex, `byId|${projectionSignature(projection.sqlColumns)}`, () => buildFindByIdQuery(table, projection.sqlColumns, runtime.tableIndex))
+            : tableIndex?.findByIdSql || buildFindByIdQuery(table);
         const row = await runQueryOne(executor, runtime, ctx, query, [pkValue]);
-        return row ? mapRowToTs(tableIndex, table, row) : null;
+        return row
+            ? projectFindRow(mapRowToTs(tableIndex, table, row), projection)
+            : null;
     }
-    const cached = getCachedFindByIdWithQuery(manifest, table, args.with, dialect, runtime.tableIndex);
+    const cached = getCachedFindByIdWithQuery(manifest, table, args.with, dialect, runtime.tableIndex, projection.sqlColumns);
     if (cached) {
-        const rows = await runQuery(executor, runtime, ctx, cached.sql, [pkValue]);
+        const extra = buildPlanExtraSelectCols(manifest, table, cached.plan, dialect, runtime.tableIndex, 2);
+        const rows = await runQuery(executor, runtime, ctx, cached.sql, [
+            pkValue,
+            ...extra.params,
+        ]);
         if (rows.length === 0)
             return null;
         const hydrated = hydrateRowsWithPlan(runtime, table, rows, cached.plan);
-        return hydrated[0] ?? null;
+        const projected = projectFindRows(hydrated, projection, args.with);
+        return projected[0] ?? null;
     }
     const where = resolvePkWhere(table, id);
     const compiledWhere = getCachedWhereClause(manifest, table, where, dialect, 1, runtime.tableIndex);
     if (compiledWhere.impossible || isImpossibleWhere(compiledWhere.sql)) {
         return null;
     }
-    const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, { where, limit: 1, with: args.with }, compiledWhere.sql, compiledWhere.params, { useHasManyAggregate: false });
+    const rows = await executeFindManyWithRelations(executor, runtime, tableAccessor, table, tableIndex, {
+        where,
+        take: 1,
+        with: args.with,
+        ...(args.select !== undefined ? { select: args.select } : {}),
+        ...(args.omit !== undefined ? { omit: args.omit } : {}),
+    }, compiledWhere.sql, compiledWhere.params, { useHasManyAggregate: false }, projection);
     return rows[0] ?? null;
 }
 //# sourceMappingURL=find.js.map