@apisr/drizzle-model 2.0.0 → 2.0.1

package/src/core/runtime.ts

@@ -105,6 +105,16 @@ export class ModelRuntime {
 		return this.config.options.format;
 	}
 
+	/** The current where clause, exposed for relation descriptors. */
+	get $where(): unknown {
+		return this.currentWhere;
+	}
+
+	/** The table name this model is bound to, exposed for relation descriptors. */
+	get $tableName(): string {
+		return this.config.tableName;
+	}
+
 	// ---------------------------------------------------------------------------
 	// Public: filtering
 	// ---------------------------------------------------------------------------
@@ -127,16 +137,26 @@ export class ModelRuntime {
 	// ---------------------------------------------------------------------------
 
 	/**
-	 * Returns the `.with()` value as-is.
+	 * Returns a relation descriptor carrying the model's where clause
+	 * and the nested relation includes.
 	 *
-	 * This is a pass-through used at the type level to allow
-	 * `model.include({ posts: true })` syntax.
+	 * Used in `.with()` to filter a relation and load nested relations:
+	 * ```ts
+	 * userModel.findMany().with({
+	 *   posts: postModel.where({ ... }).include({ comments: true }),
+	 * });
+	 * ```
 	 *
-	 * @param value - The relation include descriptor.
-	 * @returns The same value, unchanged.
+	 * @param value - The nested relation include descriptor.
+	 * @returns A model relation descriptor consumed by the join executor.
 	 */
 	include(value: unknown): unknown {
-		return value;
+		return {
+			__modelRelation: true,
+			whereValue: this.currentWhere,
+			tableName: this.config.tableName,
+			with: value,
+		};
 	}
 
 	/**
@@ -182,7 +202,8 @@ export class ModelRuntime {
 	/**
 	 * Returns a thenable that resolves to an array of matching rows.
 	 *
-	 * Supports chaining: `.select()`, `.exclude()`, `.with()`, `.raw()`.
+	 * Supports chaining: `.select()`, `.exclude()` (SQL SELECT),
+	 * `.with()` (relations), `.raw()`, `.safe()`.
 	 *
 	 * @returns A {@link QueryResult} that can be awaited or further chained.
 	 */
@@ -202,6 +223,8 @@ export class ModelRuntime {
 					baseTable: table,
 					whereSql,
 					withValue: qState.with as AnyRecord,
+					select: qState.select,
+					exclude: qState.exclude,
 					limitOne: false,
 				});
 			} else {
@@ -234,7 +257,8 @@ export class ModelRuntime {
 	/**
 	 * Returns a thenable that resolves to the first matching row (or `undefined`).
 	 *
-	 * Supports chaining: `.select()`, `.exclude()`, `.with()`, `.raw()`.
+	 * Supports chaining: `.select()`, `.exclude()` (SQL SELECT),
+	 * `.with()` (relations), `.raw()`, `.safe()`.
 	 *
 	 * @returns A {@link QueryResult} that can be awaited or further chained.
 	 */
@@ -254,6 +278,8 @@ export class ModelRuntime {
 					baseTable: table,
 					whereSql,
 					withValue: qState.with as AnyRecord,
+					select: qState.select,
+					exclude: qState.exclude,
 					limitOne: true,
 				});
 			} else {
@@ -529,7 +555,11 @@ export class ModelRuntime {
 	}
 
 	/**
-	 * Applies select, exclude, and format transforms to the query result.
+	 * Applies post-query transforms to the query result.
+	 *
+	 * Note: `.select()` and `.exclude()` are handled at the SQL level
+	 * (via {@link ProjectionBuilder}) and are NOT applied here.
+	 * Only format transforms are applied post-query.
 	 */
 	private applyPostQueryTransforms(
 		result: unknown,
@@ -537,12 +567,6 @@ export class ModelRuntime {
 	): unknown {
 		let out = result;
 
-		if (qState.select) {
-			out = this.transformer.applySelect(out, qState.select);
-		}
-		if (qState.exclude) {
-			out = this.transformer.applyExclude(out, qState.exclude);
-		}
 		if (!qState.raw) {
 			out = this.transformer.applyFormat(
 				out,

package/src/model/result.ts

@@ -2,6 +2,7 @@ import type {
 	TableRelationalConfig,
 	TablesRelationalConfig,
 } from "drizzle-orm/relations";
+import type { SimplifyDeep } from "type-fest";
 import type {
 	ApplyArrayIfArray,
 	InferArrayItem,
@@ -49,7 +50,9 @@ export interface ModelQueryResult<
 			TWithSafe,
 			ApplyArrayIfArray<
 				TResult,
-				Simplify<ModelFormatResult<InferArrayItem<TResult>, TFormat, TTable>>
+				SimplifyDeep<
+					ModelFormatResult<InferArrayItem<TResult>, TFormat, TTable>
+				>
 			>
 		>
 	> {
@@ -148,7 +151,7 @@ export interface ModelInMutableResult<
 	// >(
 	// 	value?: TConfig["dialect"] extends ReturningIdDialects ? never : TValue
 	// ): Omit<ModelMutateResult<TResult, TConfig, TResultType>, "with">;
-	$return: MethodReturnResult<TConfig>;
+	// $return: MethodReturnResult<TConfig>;
 
 	omit<TValue extends MethodExcludeValue<TConfig["tableOutput"]>>(
 		value: TValue