From 08df50cc05835fec97f7a9aeeb76e73606637cb7 Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Sun, 13 Jul 2025 15:03:57 +0800
Subject: [PATCH 1/3] fix: nested select result typing, simplifying ORM query
 result types

---
 packages/runtime/src/client/contract.ts       | 30 +++++++-------
 packages/runtime/src/client/crud-types.ts     | 22 ++++++----
 packages/runtime/src/utils/type-utils.ts      |  4 +-
 packages/runtime/test/typing/verify-typing.ts | 41 ++++++++++++++++++-
 4 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/packages/runtime/src/client/contract.ts b/packages/runtime/src/client/contract.ts
index 531f3fa7..53c8a36f 100644
--- a/packages/runtime/src/client/contract.ts
+++ b/packages/runtime/src/client/contract.ts
@@ -1,7 +1,7 @@
 import type { Decimal } from 'decimal.js';
 import { type GetModels, type ProcedureDef, type SchemaDef } from '../schema';
 import type { AuthType } from '../schema/auth';
-import type { OrUndefinedIf, UnwrapTuplePromises } from '../utils/type-utils';
+import type { OrUndefinedIf, Simplify, UnwrapTuplePromises } from '../utils/type-utils';
 import type { TRANSACTION_UNSUPPORTED_METHODS } from './constants';
 import type {
     AggregateArgs,
@@ -299,7 +299,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     findMany<T extends FindArgs<Schema, Model, true>>(
         args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
 
     /**
      * Returns a uniquely identified entity.
@@ -309,7 +309,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     findUnique<T extends FindUniqueArgs<Schema, Model>>(
         args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T> | null>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
 
     /**
      * Returns a uniquely identified entity or throws `NotFoundError` if not found.
@@ -319,7 +319,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     findUniqueOrThrow<T extends FindUniqueArgs<Schema, Model>>(
         args?: SelectSubset<T, FindUniqueArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
 
     /**
      * Returns the first entity.
@@ -329,7 +329,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     findFirst<T extends FindArgs<Schema, Model, true>>(
         args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T> | null>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>> | null>;
 
     /**
      * Returns the first entity or throws `NotFoundError` if not found.
@@ -339,7 +339,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     findFirstOrThrow<T extends FindArgs<Schema, Model, true>>(
         args?: SelectSubset<T, FindArgs<Schema, Model, true>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
 
     /**
      * Creates a new entity.
@@ -395,7 +395,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     create<T extends CreateArgs<Schema, Model>>(
         args: SelectSubset<T, CreateArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
 
     /**
      * Creates multiple entities. Only scalar fields are allowed.
@@ -446,7 +446,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     createManyAndReturn<T extends CreateManyAndReturnArgs<Schema, Model>>(
         args?: SelectSubset<T, CreateManyAndReturnArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
 
     /**
      * Updates a uniquely identified entity.
@@ -567,7 +567,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     update<T extends UpdateArgs<Schema, Model>>(
         args: SelectSubset<T, UpdateArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
 
     /**
      * Updates multiple entities.
@@ -617,7 +617,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     updateManyAndReturn<T extends UpdateManyAndReturnArgs<Schema, Model>>(
         args: Subset<T, UpdateManyAndReturnArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>[]>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>[]>;
 
     /**
      * Creates or updates an entity.
@@ -641,7 +641,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     upsert<T extends UpsertArgs<Schema, Model>>(
         args: SelectSubset<T, UpsertArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
 
     /**
      * Deletes a uniquely identifiable entity.
@@ -664,7 +664,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     delete<T extends DeleteArgs<Schema, Model>>(
         args: SelectSubset<T, DeleteArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, ModelResult<Schema, Model>>;
+    ): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model>>>;
 
     /**
      * Deletes multiple entities.
@@ -709,7 +709,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     count<T extends CountArgs<Schema, Model>>(
         args?: Subset<T, CountArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, CountResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<CountResult<Schema, Model, T>>>;
 
     /**
      * Aggregates rows.
@@ -730,7 +730,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     aggregate<T extends AggregateArgs<Schema, Model>>(
         args: Subset<T, AggregateArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, AggregateResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<AggregateResult<Schema, Model, T>>>;
 
     /**
      * Groups rows by columns.
@@ -766,7 +766,7 @@ export interface ModelOperations<Schema extends SchemaDef, Model extends GetMode
      */
     groupBy<T extends GroupByArgs<Schema, Model>>(
         args: Subset<T, GroupByArgs<Schema, Model>>,
-    ): ZenStackPromise<Schema, GroupByResult<Schema, Model, T>>;
+    ): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
 }
 
 //#endregion
diff --git a/packages/runtime/src/client/crud-types.ts b/packages/runtime/src/client/crud-types.ts
index 4643991d..259e1023 100644
--- a/packages/runtime/src/client/crud-types.ts
+++ b/packages/runtime/src/client/crud-types.ts
@@ -77,13 +77,21 @@ type ModelSelectResult<Schema extends SchemaDef, Model extends GetModels<Schema>
                   RelationFieldType<Schema, Model, Key>,
                   FieldIsArray<Schema, Model, Key>
               >
-                ? ModelResult<
-                      Schema,
-                      RelationFieldType<Schema, Model, Key>,
-                      Select[Key],
-                      FieldIsOptional<Schema, Model, Key>,
-                      FieldIsArray<Schema, Model, Key>
-                  >
+                ? 'select' extends keyof Select[Key]
+                    ? ModelResult<
+                          Schema,
+                          RelationFieldType<Schema, Model, Key>,
+                          Pick<Select[Key], 'select'>,
+                          FieldIsOptional<Schema, Model, Key>,
+                          FieldIsArray<Schema, Model, Key>
+                      >
+                    : ModelResult<
+                          Schema,
+                          RelationFieldType<Schema, Model, Key>,
+                          Pick<Select[Key], 'include' | 'omit'>,
+                          FieldIsOptional<Schema, Model, Key>,
+                          FieldIsArray<Schema, Model, Key>
+                      >
                 : DefaultModelResult<
                       Schema,
                       RelationFieldType<Schema, Model, Key>,
diff --git a/packages/runtime/src/utils/type-utils.ts b/packages/runtime/src/utils/type-utils.ts
index abd963a5..ff9d441e 100644
--- a/packages/runtime/src/utils/type-utils.ts
+++ b/packages/runtime/src/utils/type-utils.ts
@@ -6,6 +6,8 @@ export type NullableIf<T, Condition extends boolean> = Condition extends true ?
 
 export type PartialRecord<K extends string | number | symbol, T> = Partial<Record<K, T>>;
 
+export type Simplify<T> = T extends object ? { [K in keyof T]: Simplify<T[K]> } & {} : T;
+
 export type WrapType<T, Optional = false, Array = false> = Optional extends true
     ? T | null
     : Array extends true
@@ -33,8 +35,6 @@ export type JsonValue = string | number | boolean | null | JsonObject | JsonArra
 export type JsonObject = { [key: string]: JsonValue };
 export type JsonArray = Array<JsonValue>;
 
-export type Simplify<T> = { [Key in keyof T]: T[Key] } & {};
-
 export function call(code: string) {
     return { code };
 }
diff --git a/packages/runtime/test/typing/verify-typing.ts b/packages/runtime/test/typing/verify-typing.ts
index e616140e..86389616 100644
--- a/packages/runtime/test/typing/verify-typing.ts
+++ b/packages/runtime/test/typing/verify-typing.ts
@@ -1,7 +1,7 @@
+import SQLite from 'better-sqlite3';
 import { ZenStackClient } from '../../dist';
 import { Role } from './models';
 import { schema } from './schema';
-import SQLite from 'better-sqlite3';
 
 const client = new ZenStackClient(schema, {
     dialectConfig: {
@@ -147,6 +147,45 @@ async function find() {
             },
         })
     ).profile?.region?.city;
+
+    (
+        await client.user.findFirstOrThrow({
+            select: {
+                posts: {
+                    where: { title: 'Foo' },
+                    select: {
+                        author: {
+                            select: {
+                                id: true,
+                            },
+                        },
+                    },
+                },
+            },
+        })
+    ).posts[0]?.author?.id;
+
+    const u = await client.user.findFirstOrThrow({
+        select: {
+            posts: {
+                where: { title: 'Foo' },
+                select: {
+                    author: {
+                        include: {
+                            profile: true,
+                        },
+                        omit: {
+                            email: true,
+                        },
+                    },
+                },
+            },
+        },
+    });
+    console.log(u.posts[0]?.author?.profile?.age);
+    console.log(u.posts[0]?.author?.role);
+    // @ts-expect-error
+    console.log(u.posts[0]?.author?.email);
 }
 
 async function create() {

From 1ee12096c253c6627b056e25474350ee7fc21b63 Mon Sep 17 00:00:00 2001
From: Yiming Cao <yiming@whimslab.io>
Date: Sun, 13 Jul 2025 15:07:47 +0800
Subject: [PATCH 2/3] Update packages/runtime/src/utils/type-utils.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 packages/runtime/src/utils/type-utils.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/runtime/src/utils/type-utils.ts b/packages/runtime/src/utils/type-utils.ts
index ff9d441e..26a0f2e6 100644
--- a/packages/runtime/src/utils/type-utils.ts
+++ b/packages/runtime/src/utils/type-utils.ts
@@ -6,7 +6,13 @@ export type NullableIf<T, Condition extends boolean> = Condition extends true ?
 
 export type PartialRecord<K extends string | number | symbol, T> = Partial<Record<K, T>>;
 
-export type Simplify<T> = T extends object ? { [K in keyof T]: Simplify<T[K]> } & {} : T;
+type Depth = [never, ...Depth];
+export type Simplify<T, D extends Depth = [never, never, never, never, never]> = 
+    D extends [never, ...infer Rest]
+        ? T extends object
+            ? { [K in keyof T]: Simplify<T[K], Rest> } & {}
+            : T
+        : T;
 
 export type WrapType<T, Optional = false, Array = false> = Optional extends true
     ? T | null

From d9a8c3b69e77db514715d909768c013520c642bc Mon Sep 17 00:00:00 2001
From: ymc9 <104139426+ymc9@users.noreply.github.com>
Date: Sun, 13 Jul 2025 15:20:20 +0800
Subject: [PATCH 3/3] update

---
 packages/runtime/src/utils/type-utils.ts | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/runtime/src/utils/type-utils.ts b/packages/runtime/src/utils/type-utils.ts
index 26a0f2e6..6769f177 100644
--- a/packages/runtime/src/utils/type-utils.ts
+++ b/packages/runtime/src/utils/type-utils.ts
@@ -6,13 +6,15 @@ export type NullableIf<T, Condition extends boolean> = Condition extends true ?
 
 export type PartialRecord<K extends string | number | symbol, T> = Partial<Record<K, T>>;
 
-type Depth = [never, ...Depth];
-export type Simplify<T, D extends Depth = [never, never, never, never, never]> = 
-    D extends [never, ...infer Rest]
-        ? T extends object
-            ? { [K in keyof T]: Simplify<T[K], Rest> } & {}
-            : T
-        : T;
+type _Preserve = Date | Function | Decimal | Uint8Array;
+type _Depth = [never, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
+export type Simplify<T, D extends number = 6> = D extends 0
+    ? T
+    : T extends object
+      ? T extends _Preserve
+          ? T
+          : { [K in keyof T]: Simplify<T[K], _Depth[D]> } & {}
+      : T;
 
 export type WrapType<T, Optional = false, Array = false> = Optional extends true
     ? T | null
@@ -32,9 +34,11 @@ export type MapBaseType<T> = T extends 'String'
             ? Decimal
             : T extends 'DateTime'
               ? Date
-              : T extends 'Json'
-                ? JsonValue
-                : unknown;
+              : T extends 'Bytes'
+                ? Uint8Array
+                : T extends 'Json'
+                  ? JsonValue
+                  : unknown;
 
 export type JsonValue = string | number | boolean | null | JsonObject | JsonArray;