fix(tanstack): delegate hooks typing

packages/clients/tanstack-query/src/utils/types.ts

@@ -21,8 +21,12 @@ export const ORMWriteActions = [
 
 export type ORMWriteActionType = (typeof ORMWriteActions)[number];
 
+type HooksOperationsIneligibleForDelegateModels = OperationsIneligibleForDelegateModels extends any
+    ? `use${Capitalize<OperationsIneligibleForDelegateModels>}`
+    : never;
+
 export type TrimDelegateModelOperations<
     Schema extends SchemaDef,
     Model extends GetModels<Schema>,
     T extends Record<string, unknown>,
-> = IsDelegateModel<Schema, Model> extends true ? Omit<T, OperationsIneligibleForDelegateModels> : T;
+> = IsDelegateModel<Schema, Model> extends true ? Omit<T, HooksOperationsIneligibleForDelegateModels> : T;

packages/clients/tanstack-query/test/react-typing-test.ts

@@ -101,3 +101,8 @@ client.user.useDeleteMany().mutate({ where: { email: '[email protected]' } });
 function check(_value: unknown) {
     // noop
 }
+
+// @ts-expect-error delegate model
+client.foo.useCreate();
+client.foo.useUpdate();
+client.bar.useCreate();

packages/clients/tanstack-query/test/schemas/basic/input.ts

@@ -68,3 +68,43 @@ export type CategorySelect = $SelectInput<$Schema, "Category">;
 export type CategoryInclude = $IncludeInput<$Schema, "Category">;
 export type CategoryOmit = $OmitInput<$Schema, "Category">;
 export type CategoryGetPayload<Args extends $SelectIncludeOmit<$Schema, "Category", true>> = $SimplifiedModelResult<$Schema, "Category", Args>;
+export type FooFindManyArgs = $FindManyArgs<$Schema, "Foo">;
+export type FooFindUniqueArgs = $FindUniqueArgs<$Schema, "Foo">;
+export type FooFindFirstArgs = $FindFirstArgs<$Schema, "Foo">;
+export type FooCreateArgs = $CreateArgs<$Schema, "Foo">;
+export type FooCreateManyArgs = $CreateManyArgs<$Schema, "Foo">;
+export type FooCreateManyAndReturnArgs = $CreateManyAndReturnArgs<$Schema, "Foo">;
+export type FooUpdateArgs = $UpdateArgs<$Schema, "Foo">;
+export type FooUpdateManyArgs = $UpdateManyArgs<$Schema, "Foo">;
+export type FooUpdateManyAndReturnArgs = $UpdateManyAndReturnArgs<$Schema, "Foo">;
+export type FooUpsertArgs = $UpsertArgs<$Schema, "Foo">;
+export type FooDeleteArgs = $DeleteArgs<$Schema, "Foo">;
+export type FooDeleteManyArgs = $DeleteManyArgs<$Schema, "Foo">;
+export type FooCountArgs = $CountArgs<$Schema, "Foo">;
+export type FooAggregateArgs = $AggregateArgs<$Schema, "Foo">;
+export type FooGroupByArgs = $GroupByArgs<$Schema, "Foo">;
+export type FooWhereInput = $WhereInput<$Schema, "Foo">;
+export type FooSelect = $SelectInput<$Schema, "Foo">;
+export type FooInclude = $IncludeInput<$Schema, "Foo">;
+export type FooOmit = $OmitInput<$Schema, "Foo">;
+export type FooGetPayload<Args extends $SelectIncludeOmit<$Schema, "Foo", true>> = $SimplifiedModelResult<$Schema, "Foo", Args>;
+export type BarFindManyArgs = $FindManyArgs<$Schema, "Bar">;
+export type BarFindUniqueArgs = $FindUniqueArgs<$Schema, "Bar">;
+export type BarFindFirstArgs = $FindFirstArgs<$Schema, "Bar">;
+export type BarCreateArgs = $CreateArgs<$Schema, "Bar">;
+export type BarCreateManyArgs = $CreateManyArgs<$Schema, "Bar">;
+export type BarCreateManyAndReturnArgs = $CreateManyAndReturnArgs<$Schema, "Bar">;
+export type BarUpdateArgs = $UpdateArgs<$Schema, "Bar">;
+export type BarUpdateManyArgs = $UpdateManyArgs<$Schema, "Bar">;
+export type BarUpdateManyAndReturnArgs = $UpdateManyAndReturnArgs<$Schema, "Bar">;
+export type BarUpsertArgs = $UpsertArgs<$Schema, "Bar">;
+export type BarDeleteArgs = $DeleteArgs<$Schema, "Bar">;
+export type BarDeleteManyArgs = $DeleteManyArgs<$Schema, "Bar">;
+export type BarCountArgs = $CountArgs<$Schema, "Bar">;
+export type BarAggregateArgs = $AggregateArgs<$Schema, "Bar">;
+export type BarGroupByArgs = $GroupByArgs<$Schema, "Bar">;
+export type BarWhereInput = $WhereInput<$Schema, "Bar">;
+export type BarSelect = $SelectInput<$Schema, "Bar">;
+export type BarInclude = $IncludeInput<$Schema, "Bar">;
+export type BarOmit = $OmitInput<$Schema, "Bar">;
+export type BarGetPayload<Args extends $SelectIncludeOmit<$Schema, "Bar", true>> = $SimplifiedModelResult<$Schema, "Bar", Args>;

packages/clients/tanstack-query/test/schemas/basic/models.ts

@@ -10,3 +10,5 @@ import { type ModelResult as $ModelResult } from "@zenstackhq/orm";
 export type User = $ModelResult<$Schema, "User">;
 export type Post = $ModelResult<$Schema, "Post">;
 export type Category = $ModelResult<$Schema, "Category">;
+export type Foo = $ModelResult<$Schema, "Foo">;
+export type Bar = $ModelResult<$Schema, "Bar">;

packages/clients/tanstack-query/test/schemas/basic/schema-lite.ts

@@ -116,6 +116,54 @@ export const schema = {
                 id: { type: "String" },
                 name: { type: "String" }
             }
+        },
+        Foo: {
+            name: "Foo",
+            fields: {
+                id: {
+                    name: "id",
+                    type: "String",
+                    id: true,
+                    default: ExpressionUtils.call("cuid")
+                },
+                type: {
+                    name: "type",
+                    type: "String",
+                    isDiscriminator: true
+                }
+            },
+            idFields: ["id"],
+            uniqueFields: {
+                id: { type: "String" }
+            },
+            isDelegate: true,
+            subModels: ["Bar"]
+        },
+        Bar: {
+            name: "Bar",
+            baseModel: "Foo",
+            fields: {
+                id: {
+                    name: "id",
+                    type: "String",
+                    id: true,
+                    default: ExpressionUtils.call("cuid")
+                },
+                type: {
+                    name: "type",
+                    type: "String",
+                    originModel: "Foo",
+                    isDiscriminator: true
+                },
+                title: {
+                    name: "title",
+                    type: "String"
+                }
+            },
+            idFields: ["id"],
+            uniqueFields: {
+                id: { type: "String" }
+            }
         }
     },
     authType: "User",

packages/clients/tanstack-query/test/schemas/basic/schema.zmodel

@@ -22,4 +22,14 @@ model Category {
     id    String   @id @default(cuid())
     name  String   @unique
     posts Post[]
-}
+}
+
+model Foo {
+    id String @id @default(cuid())
+    type String
+    @@delegate(type)
+}
+
+model Bar extends Foo {
+    title String
+}

packages/clients/tanstack-query/test/svelte-typing-test.ts

@@ -98,3 +98,8 @@ get(client.user.useDeleteMany()).mutate({ where: { email: '[email protected]' } }
 function check(_value: unknown) {
     // noop
 }
+
+// @ts-expect-error delegate model
+client.foo.useCreate();
+client.foo.useUpdate();
+client.bar.useCreate();

packages/clients/tanstack-query/test/vue-typing-test.ts

@@ -99,3 +99,8 @@ client.user.useDeleteMany().mutate({ where: { email: '[email protected]' } });
 function check(_value: unknown) {
     // noop
 }
+
+// @ts-expect-error delegate model
+client.foo.useCreate();
+client.foo.useUpdate();
+client.bar.useCreate();