zenstack-trpc 0.1.6 → 0.1.9

package/README.md

@@ -146,89 +146,146 @@ const usersWithPosts = await caller.user.findMany({ include: { posts: true } });
 // Type: (User & { posts: Post[] })[]
 ```
 
-### `withZenStackTypes<SchemaType>()`
+### `ZenStackRouter<Schema>` and `ZenStackRouterRecord<Schema>`
 
-Utility function that adds full `include`/`select` type inference to any tRPC client. This solves tRPC's limitation where generic type information is lost during type inference.
+Type helpers for the generated router structure:
 
-Works with both vanilla tRPC clients and React hooks:
+- **`ZenStackRouter<Schema>`** - The full router type including `_def` and `createCaller`
+- **`ZenStackRouterRecord<Schema>`** - Just the procedure map (useful for type composition)
+
+```typescript
+import type { ZenStackRouter, ZenStackRouterRecord } from "zenstack-trpc";
+import type { SchemaType } from "./zenstack/schema.js";
+
+// The full router type
+type MyRouter = ZenStackRouter<SchemaType>;
+
+// Just the procedures (for advanced type manipulation)
+type Procedures = ZenStackRouterRecord<SchemaType>;
+// { user: { findMany: ..., create: ..., ... }, post: { ... }, ... }
+```
+
+### Composable Type System
+
+The library provides a composable type system for adding full `include`/`select` type inference to tRPC clients. This solves tRPC's limitation where generic type information is lost during type inference.
+
+The system uses three composable parts:
+1. **`WithZenStack<Schema, Path?>`** - Base type container with your schema and optional nesting path
+2. **`WithReact<...>` / `WithClient<...>`** - Adapter that transforms to React hooks or vanilla client types
+3. **`typedClient<Typed>()`** - Applies the composed types to your client
 
 ```typescript
-import { createTRPCClient, httpBatchLink } from "@trpc/client";
 import { createTRPCReact } from "@trpc/react-query";
-import { withZenStackTypes } from "zenstack-trpc";
+import { typedClient, type WithZenStack, type WithReact } from "zenstack-trpc";
 import type { AppRouter } from "./server/trpc.js";
 import type { SchemaType } from "./zenstack/schema.js";
 
-// For vanilla tRPC client:
-const client = withZenStackTypes<SchemaType>()(
-  createTRPCClient<AppRouter>({
-    links: [httpBatchLink({ url: "http://localhost:3000/trpc" })],
-  })
-);
-
-// Now includes are fully typed!
-const usersWithPosts = await client.user.findMany.query({
-  include: { posts: true }
-});
-// Type: (User & { posts: Post[] })[]
+// Compose your types
+type Typed = WithReact<WithZenStack<SchemaType>>;
 
-// For tRPC React hooks:
-const trpc = withZenStackTypes<SchemaType>()(
-  createTRPCReact<AppRouter>()
-);
+// Apply to client
+const _trpc = createTRPCReact<AppRouter>();
+export const trpc = typedClient<Typed>()(_trpc);
 
-// In your component:
+// Now includes are fully typed!
 const { data } = trpc.user.findMany.useQuery({
   include: { posts: true }
 });
 // data is typed as (User & { posts: Post[] })[] | undefined
 ```
 
-You can also use the type helpers directly if you prefer manual casting:
+For vanilla tRPC clients, use `WithClient`:
 
 ```typescript
-import type { TypedTRPCClient, TypedTRPCReact } from "zenstack-trpc";
+import { createTRPCClient, httpBatchLink } from "@trpc/client";
+import { typedClient, type WithZenStack, type WithClient } from "zenstack-trpc";
 
-const client = _client as unknown as TypedTRPCClient<SchemaType>;
-const trpc = _trpc as unknown as TypedTRPCReact<SchemaType>;
+type Typed = WithClient<WithZenStack<SchemaType>>;
+
+const _client = createTRPCClient<AppRouter>({
+  links: [httpBatchLink({ url: "http://localhost:3000/trpc" })],
+});
+export const client = typedClient<Typed>()(_client);
+
+const usersWithPosts = await client.user.findMany.query({
+  include: { posts: true }
+});
+// Type: (User & { posts: Post[] })[]
 ```
 
 ### Nested Namespaces (Merged Routers)
 
-When your ZenStack router is merged under a namespace in your main router, use `WithZenStackTypes` or `withNestedZenStackTypes()`:
+When merging the ZenStack router with other routers, you need to cast it to `AnyRouter` for tRPC compatibility:
 
 ```typescript
-// If your router structure is:
-// appRouter = t.router({
-//   db: zenStackRouter,  // ZenStack models under 'db' namespace
-//   auth: authRouter,
-// })
+import { initTRPC } from "@trpc/server";
+import type { AnyRouter } from "@trpc/server";
+import { createZenStackRouter } from "zenstack-trpc";
+import { schema } from "./zenstack/schema.js";
+
+const t = initTRPC.context<{ db: any }>().create();
+
+// Create the ZenStack router and cast for tRPC compatibility
+const generatedRouter = createZenStackRouter(schema, t) as unknown as AnyRouter;
 
+// Merge with other routers
+export const appRouter = t.router({
+  admin: adminRouter,
+  auth: authRouter,
+  generated: generatedRouter,
+});
+```
+
+On the client side, include the path in `WithZenStack` to get full type inference:
+
+```typescript
 import { createTRPCReact } from "@trpc/react-query";
+import { typedClient, type WithZenStack, type WithReact } from "zenstack-trpc";
 import type { AppRouter } from "./server/trpc.js";
 import type { SchemaType } from "./zenstack/schema.js";
-import type { WithZenStackTypes } from "zenstack-trpc";
 
+// Single level nesting:
+type Typed = WithReact<WithZenStack<SchemaType, "generated">>;
 const _trpc = createTRPCReact<AppRouter>();
+export const trpc = typedClient<Typed>()(_trpc);
 
-// Option 1: Type helper for manual casting
-type TypedTRPC = Omit<typeof _trpc, 'db'> & {
-  db: WithZenStackTypes<SchemaType, 'react'>
-};
-export const trpc = _trpc as unknown as TypedTRPC;
+// Multi-level nesting (dot notation):
+type Typed = WithReact<WithZenStack<SchemaType, "api.db">>;
+export const trpc = typedClient<Typed>()(_trpc);
 
-// Option 2: Use the helper functions
-import { withNestedZenStackReact, withNestedZenStackClient } from "zenstack-trpc";
+// Now you can use:
+// trpc.generated.user.findMany.useQuery({ include: { posts: true } }) // fully typed
+// trpc.auth.login.useMutation() // other routers unaffected
+```
 
-// For React hooks:
-export const trpc = withNestedZenStackReact<SchemaType, typeof _trpc, 'db'>('db')(_trpc);
+### Custom Adapters
 
-// For vanilla tRPC client:
-// export const client = withNestedZenStackClient<SchemaType, typeof _client, 'db'>('db')(_client);
+The composable architecture allows third parties to create custom adapters. An adapter transforms `WithZenStack` into framework-specific types:
 
-// Now you can use:
-// trpc.db.user.findMany.useQuery({ include: { posts: true } }) // fully typed
-// trpc.auth.login.useMutation() // other routers unaffected
+```typescript
+import type { WithZenStack, TypedTRPCReact } from "zenstack-trpc";
+
+// Example: Custom adapter for a hypothetical framework
+type WithMyFramework<T extends WithZenStack<any, any>> =
+  T extends WithZenStack<infer S, infer P>
+    ? { readonly __types: MyFrameworkTypes<S>; readonly __path: P }
+    : never;
+
+// Usage:
+type Typed = WithMyFramework<WithZenStack<SchemaType, "db">>;
+const client = typedClient<Typed>()(myFrameworkClient);
+```
+
+### Direct Type Access
+
+For advanced use cases, you can access the underlying types directly:
+
+```typescript
+import type { TypedTRPCClient, TypedTRPCReact } from "zenstack-trpc";
+
+// Manual casting
+const client = _client as unknown as TypedTRPCClient<SchemaType>;
+const trpc = _trpc as unknown as TypedTRPCReact<SchemaType>;
 ```
 
 ### Zod Schema Access
@@ -248,6 +305,11 @@ const userSchemas = createModelSchemas(schema, "User");
 - tRPC >= 11.0.0
 - Zod >= 3.0.0
 
+### Optional (for React hooks)
+
+- `@trpc/react-query` >= 11.0.0
+- `@tanstack/react-query` >= 5.0.0
+
 ## License
 
 MIT

package/dist/index.d.ts

@@ -26,7 +26,7 @@
  *
  * @packageDocumentation
  */
-export { createZenStackRouter, type ZenStackRouter, type ZenStackRouterRecord, type TRPCModelProcedures, type TypedRouterCaller, type TypedModelProcedures, type TRPCInstance, } from "./router-generator.js";
-export { withZenStackTypes, withNestedZenStackReact, withNestedZenStackClient, type WithZenStackTypes, type TypedTRPCClient, type TypedClientModelProcedures, type TypedTRPCReact, type TypedReactModelHooks, } from "./typed-client.js";
+export { createZenStackRouter, type ZenStackRouter, type ZenStackRouterRecord, type TypedRouterCaller, type TRPCInstance, } from "./router-generator.js";
+export { type WithZenStack, type WithReact, type WithClient, typedClient, type TypedTRPCClient, type TypedTRPCReact, } from "./typed-client.js";
 export { createModelSchemas, createWhereSchema, createCreateDataSchema, createUpdateDataSchema, createUniqueWhereSchema, createSelectSchema, createIncludeSchema, createOrderBySchema, } from "./zod-schemas.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAGH,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,oBAAoB,EACzB,KAAK,YAAY,GAClB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAEL,iBAAiB,EACjB,uBAAuB,EACvB,wBAAwB,EAExB,KAAK,iBAAiB,EAEtB,KAAK,eAAe,EACpB,KAAK,0BAA0B,EAE/B,KAAK,cAAc,EACnB,KAAK,oBAAoB,GAC1B,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAGH,OAAO,EACL,oBAAoB,EACpB,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,KAAK,YAAY,GAClB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAEL,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,UAAU,EACf,WAAW,EAEX,KAAK,eAAe,EACpB,KAAK,cAAc,GACpB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,kBAAkB,CAAC"}

package/dist/index.js

@@ -29,8 +29,6 @@
 // Router generator and types
 export { createZenStackRouter, } from "./router-generator.js";
 // Typed client helpers for full include/select inference
-export { 
-// Converter utilities
-withZenStackTypes, withNestedZenStackReact, withNestedZenStackClient, } from "./typed-client.js";
+export { typedClient, } from "./typed-client.js";
 // Zod schema generators (for advanced usage)
 export { createModelSchemas, createWhereSchema, createCreateDataSchema, createUpdateDataSchema, createUniqueWhereSchema, createSelectSchema, createIncludeSchema, createOrderBySchema, } from "./zod-schemas.js";

package/dist/router-generator.d.ts

@@ -1,10 +1,7 @@
 import type { SchemaDef, GetModels } from "@zenstackhq/orm/schema";
 import type { FindManyArgs, FindUniqueArgs, FindFirstArgs, CreateArgs, CreateManyArgs, UpdateArgs, UpdateManyArgs, UpsertArgs, DeleteArgs, DeleteManyArgs, CountArgs, AggregateArgs, GroupByArgs, SimplifiedPlainResult } from "@zenstackhq/orm";
 import { z } from "zod";
-/**
- * Type helper to convert model names to lowercase
- */
-type Uncapitalize<S extends string> = S extends `${infer First}${infer Rest}` ? `${Lowercase<First>}${Rest}` : S;
+import type { Uncapitalize } from "./typed-client.js";
 /**
  * Type for a single model's procedures - provides FULL dynamic input AND output typing
  *
@@ -146,9 +143,9 @@ export declare function createZenStackRouter<Schema extends SchemaDef, TContext
 }>(schema: Schema, t: TRPCInstance): ZenStackRouter<Schema, TContext>;
 /**
  * Type for a query procedure with proper input/output typing
- * Matches tRPC's internal Procedure interface for type inference
+ * Matches tRPC's internal Procedure interface for type inference and AnyProcedure compatibility
  */
-type TypedQueryProcedure<TInput, TOutput> = {
+interface TypedQueryProcedure<TInput, TOutput> {
     _def: {
         $types: {
             input: TInput;
@@ -158,16 +155,16 @@ type TypedQueryProcedure<TInput, TOutput> = {
         type: 'query';
         meta: unknown;
         experimental_caller: boolean;
-        inputs: any[];
+        inputs: unknown[];
     };
     meta: unknown;
     (opts: unknown): Promise<TOutput>;
-};
+}
 /**
  * Type for a mutation procedure with proper input/output typing
- * Matches tRPC's internal Procedure interface for type inference
+ * Matches tRPC's internal Procedure interface for type inference and AnyProcedure compatibility
  */
-type TypedMutationProcedure<TInput, TOutput> = {
+interface TypedMutationProcedure<TInput, TOutput> {
     _def: {
         $types: {
             input: TInput;
@@ -177,16 +174,17 @@ type TypedMutationProcedure<TInput, TOutput> = {
         type: 'mutation';
         meta: unknown;
         experimental_caller: boolean;
-        inputs: any[];
+        inputs: unknown[];
     };
     meta: unknown;
     (opts: unknown): Promise<TOutput>;
-};
+}
 /**
  * Type for a single model's tRPC procedures (for client inference)
  * This maps each operation to its tRPC procedure type with proper input/output
+ * @internal
  */
-export type TRPCModelProcedures<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
+type TRPCModelProcedures<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     findMany: TypedQueryProcedure<FindManyArgs<Schema, Model> | undefined, SimplifiedPlainResult<Schema, Model, {}>[]>;
     findUnique: TypedQueryProcedure<FindUniqueArgs<Schema, Model>, SimplifiedPlainResult<Schema, Model, {}> | null>;
     findFirst: TypedQueryProcedure<FindFirstArgs<Schema, Model> | undefined, SimplifiedPlainResult<Schema, Model, {}> | null>;
@@ -208,13 +206,15 @@ export type TRPCModelProcedures<Schema extends SchemaDef, Model extends GetModel
     groupBy: TypedQueryProcedure<GroupByArgs<Schema, Model>, any[]>;
 };
 /**
- * Type for the full router record that tRPC uses for inference
+ * Type for the full router record that tRPC uses for inference.
+ * Use this type when nesting the ZenStack router within another router.
  */
 export type ZenStackRouterRecord<Schema extends SchemaDef> = {
     [K in GetModels<Schema> as Uncapitalize<K>]: TRPCModelProcedures<Schema, K>;
 };
 /**
- * The typed router type that clients can use for proper inference
+ * The typed router type that clients can use for proper inference.
+ * Compatible with tRPC's AnyRouter for use in merged routers.
  */
 export type ZenStackRouter<Schema extends SchemaDef, TContext = any> = {
     _def: {
@@ -234,7 +234,7 @@ export type ZenStackRouter<Schema extends SchemaDef, TContext = any> = {
         record: ZenStackRouterRecord<Schema>;
         router: true;
         procedures: ZenStackRouterRecord<Schema>;
-        lazy: {};
+        lazy: Record<string, unknown>;
     };
     createCaller: (ctx: TContext) => TypedRouterCaller<Schema>;
 } & ZenStackRouterRecord<Schema>;

package/dist/router-generator.d.ts.map

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

package/dist/router-generator.js

@@ -17,7 +17,8 @@ function createModelProcedures(schema, modelName, t) {
                     message: `Operation ${op} not found on model ${modelName}`,
                 });
             }
-            return model[op](input);
+            const result = await model[op](input);
+            return result;
         };
         if (isQuery) {
             return t.procedure.input(inputSchema).query(handler);

package/dist/typed-client.d.ts

@@ -2,32 +2,32 @@
  * Typed tRPC client helpers for full include/select type inference.
  *
  * tRPC's standard type inference loses generic type information for procedure
- * input/output types. This module provides type utilities that restore full
- * dynamic typing based on include/select options.
+ * input/output types. This module provides a composable type system that
+ * restores full dynamic typing based on include/select options.
  *
  * @example
  * ```typescript
- * import { createTRPCClient } from "@trpc/client";
  * import { createTRPCReact } from "@trpc/react-query";
- * import { withZenStackTypes } from "zenstack-trpc";
+ * import { typedClient, type WithZenStack, type WithReact } from "zenstack-trpc";
  * import type { AppRouter } from "./server/trpc.js";
  * import type { SchemaType } from "./zenstack/schema.js";
  *
- * // Vanilla client
- * const client = withZenStackTypes<SchemaType>()(
- *   createTRPCClient<AppRouter>({ links: [...] })
- * );
+ * // Compose types and apply to client
+ * type Typed = WithReact<WithZenStack<SchemaType>>;
+ * const _trpc = createTRPCReact<AppRouter>();
+ * export const trpc = typedClient<Typed>()(_trpc);
  *
- * // React hooks
- * const trpc = withZenStackTypes<SchemaType>()(
- *   createTRPCReact<AppRouter>()
- * );
+ * // With nested namespace
+ * type Typed = WithReact<WithZenStack<SchemaType, "db">>;
+ * export const trpc = typedClient<Typed>()(_trpc);
  * ```
  */
 import type { SchemaDef, GetModels } from "@zenstackhq/orm/schema";
 import type { FindManyArgs, FindUniqueArgs, FindFirstArgs, CreateArgs, CreateManyArgs, UpdateArgs, UpdateManyArgs, UpsertArgs, DeleteArgs, DeleteManyArgs, CountArgs, AggregateArgs, GroupByArgs, SimplifiedPlainResult } from "@zenstackhq/orm";
-/** Convert model names to lowercase */
-type Uncapitalize<S extends string> = S extends `${infer F}${infer R}` ? `${Lowercase<F>}${R}` : S;
+import type { UseQueryResult, UseMutationResult, UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
+import type { TRPCClientErrorLike } from "@trpc/client";
+/** Convert model names to lowercase (internal utility, also used by router-generator) */
+export type Uncapitalize<S extends string> = S extends `${infer F}${infer R}` ? `${Lowercase<F>}${R}` : S;
 /** Infer result type with optional array wrapping */
 type Result<S extends SchemaDef, M extends GetModels<S>, T, D, Arr extends boolean = false> = Arr extends true ? (SimplifiedPlainResult<S, M, T> extends never ? D : SimplifiedPlainResult<S, M, T>[]) : (SimplifiedPlainResult<S, M, T> extends never ? D : SimplifiedPlainResult<S, M, T>);
 /** Default result type for a model */
@@ -81,101 +81,47 @@ interface SimpleMutation<Args, R> {
 type ClientProcedure<S extends SchemaDef, M extends GetModels<S>, Op extends keyof OperationArgs<S, M>> = Op extends MutationOps ? Op extends CountResultOps ? SimpleMutation<OperationArgs<S, M>[Op], {
     count: number;
 }> : DynamicMutation<S, M, OperationArgs<S, M>[Op], DefaultResult<S, M>> : Op extends NumberResultOps ? SimpleQuery<OperationArgs<S, M>[Op], number> : Op extends AnyResultOps ? SimpleQuery<OperationArgs<S, M>[Op], any> : Op extends 'groupBy' ? SimpleQuery<OperationArgs<S, M>[Op], any[]> : DynamicQuery<S, M, OperationArgs<S, M>[Op], Op extends NullableOps ? DefaultResult<S, M> | null : Op extends ArrayOps ? DefaultResult<S, M>[] : DefaultResult<S, M>, Op extends ArrayOps ? true : false>;
-/** All client procedures for a model */
-export type TypedClientModelProcedures<S extends SchemaDef, M extends GetModels<S>> = {
+/** All client procedures for a model (internal) */
+type TypedClientModelProcedures<S extends SchemaDef, M extends GetModels<S>> = {
     [Op in keyof OperationArgs<S, M>]: ClientProcedure<S, M, Op>;
 };
-/** Base query result shape */
-type QueryResult<T> = {
-    data: T | undefined;
-    error: Error | null;
-    isLoading: boolean;
-    isPending: boolean;
-    isError: boolean;
-    isSuccess: boolean;
-    refetch: () => Promise<unknown>;
-    [k: string]: unknown;
-};
-/** Base mutation result shape */
-type MutationResult<T, V> = {
-    data: T | undefined;
-    error: Error | null;
-    isLoading: boolean;
-    isPending: boolean;
-    isError: boolean;
-    isSuccess: boolean;
-    mutate: (v: V, o?: {
-        onSuccess?: (d: T) => void;
-        onError?: (e: Error) => void;
-        onSettled?: () => void;
-    }) => void;
-    mutateAsync: (v: V, o?: {
-        onSuccess?: (d: T) => void;
-        onError?: (e: Error) => void;
-        onSettled?: () => void;
-    }) => Promise<T>;
-    [k: string]: unknown;
+/** tRPC hook result extension */
+type TRPCHookResult = {
+    trpc: {
+        path: string;
+    };
 };
+/** Query result with tRPC extension */
+type TRPCQueryResult<TData, TError = TRPCClientErrorLike<any>> = UseQueryResult<TData, TError> & TRPCHookResult;
+/** Mutation result with tRPC extension */
+type TRPCMutationResult<TData, TError, TVariables, TContext = unknown> = UseMutationResult<TData, TError, TVariables, TContext> & TRPCHookResult;
+/** Query options type */
+type QueryOpts<TData, TError = TRPCClientErrorLike<any>> = Omit<UseQueryOptions<TData, TError, TData, any>, 'queryKey' | 'queryFn'>;
+/** Mutation options type */
+type MutationOpts<TData, TError, TVariables, TContext = unknown> = Omit<UseMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey' | 'mutationFn'>;
 /** Query hook - infers result from input */
 interface DynamicQueryHook<S extends SchemaDef, M extends GetModels<S>, Args, Default, Arr extends boolean> {
-    useQuery<T extends Args>(input: T, opts?: {
-        enabled?: boolean;
-        [k: string]: unknown;
-    }): QueryResult<Result<S, M, T, Default, Arr>>;
-    useQuery(input?: undefined, opts?: {
-        enabled?: boolean;
-        [k: string]: unknown;
-    }): QueryResult<Default>;
+    useQuery<T extends Args>(input: T, opts?: QueryOpts<Result<S, M, T, Default, Arr>>): TRPCQueryResult<Result<S, M, T, Default, Arr>>;
+    useQuery(input?: undefined, opts?: QueryOpts<Default>): TRPCQueryResult<Default>;
 }
 /** Simple query hook - fixed result type */
 interface SimpleQueryHook<Args, R> {
-    useQuery(input?: Args, opts?: {
-        enabled?: boolean;
-        [k: string]: unknown;
-    }): QueryResult<R>;
+    useQuery(input?: Args, opts?: QueryOpts<R>): TRPCQueryResult<R>;
 }
 /** Mutation hook - infers result from input */
 interface DynamicMutationHook<S extends SchemaDef, M extends GetModels<S>, Args, Default> {
-    useMutation(opts?: {
-        onSuccess?: (d: any) => void;
-        onError?: (e: Error) => void;
-        onSettled?: () => void;
-        [k: string]: unknown;
-    }): {
-        mutate: <T extends Args>(input: T, o?: {
-            onSuccess?: (d: Result<S, M, T, Default>) => void;
-            onError?: (e: Error) => void;
-            onSettled?: () => void;
-        }) => void;
-        mutateAsync: <T extends Args>(input: T, o?: {
-            onSuccess?: (d: Result<S, M, T, Default>) => void;
-            onError?: (e: Error) => void;
-            onSettled?: () => void;
-        }) => Promise<Result<S, M, T, Default>>;
-        data: Default | undefined;
-        error: Error | null;
-        isLoading: boolean;
-        isPending: boolean;
-        isError: boolean;
-        isSuccess: boolean;
-        [k: string]: unknown;
-    };
+    useMutation<TContext = unknown>(opts?: MutationOpts<Default, TRPCClientErrorLike<any>, Args, TContext>): TRPCMutationResult<Default, TRPCClientErrorLike<any>, Args, TContext>;
 }
 /** Simple mutation hook - fixed result type */
 interface SimpleMutationHook<Args, R> {
-    useMutation(opts?: {
-        onSuccess?: (d: R) => void;
-        onError?: (e: Error) => void;
-        onSettled?: () => void;
-        [k: string]: unknown;
-    }): MutationResult<R, Args>;
+    useMutation<TContext = unknown>(opts?: MutationOpts<R, TRPCClientErrorLike<any>, Args, TContext>): TRPCMutationResult<R, TRPCClientErrorLike<any>, Args, TContext>;
 }
 /** Build React hook type for an operation */
 type ReactHook<S extends SchemaDef, M extends GetModels<S>, Op extends keyof OperationArgs<S, M>> = Op extends MutationOps ? Op extends CountResultOps ? SimpleMutationHook<OperationArgs<S, M>[Op], {
     count: number;
 }> : DynamicMutationHook<S, M, OperationArgs<S, M>[Op], DefaultResult<S, M>> : Op extends NumberResultOps ? SimpleQueryHook<OperationArgs<S, M>[Op], number> : Op extends AnyResultOps ? SimpleQueryHook<OperationArgs<S, M>[Op], any> : Op extends 'groupBy' ? SimpleQueryHook<OperationArgs<S, M>[Op], any[]> : DynamicQueryHook<S, M, OperationArgs<S, M>[Op], Op extends NullableOps ? DefaultResult<S, M> | null : Op extends ArrayOps ? DefaultResult<S, M>[] : DefaultResult<S, M>, Op extends ArrayOps ? true : false>;
-/** All React hooks for a model */
-export type TypedReactModelHooks<S extends SchemaDef, M extends GetModels<S>> = {
+/** All React hooks for a model (internal) */
+type TypedReactModelHooks<S extends SchemaDef, M extends GetModels<S>> = {
     [Op in keyof OperationArgs<S, M>]: ReactHook<S, M, Op>;
 };
 /** Typed vanilla tRPC client with full include/select type inference */
@@ -187,54 +133,82 @@ export type TypedTRPCReact<S extends SchemaDef> = {
     [K in GetModels<S> as Uncapitalize<K>]: TypedReactModelHooks<S, K>;
 };
 /**
- * Converts a tRPC client or React hooks instance to a fully typed version
- * with include/select inference. This is a type-only transformation.
+ * Base ZenStack type container. Use with adapter types like WithReact or WithClient.
  *
  * @example
  * ```typescript
- * // For vanilla tRPC client:
- * const client = withZenStackTypes<SchemaType>()(createTRPCClient<AppRouter>({ links: [...] }));
+ * // With React adapter:
+ * type Typed = WithReact<WithZenStack<SchemaType, "generated">>;
+ *
+ * // With vanilla client adapter:
+ * type Typed = WithClient<WithZenStack<SchemaType, "db">>;
  *
- * // For tRPC React hooks:
- * const trpc = withZenStackTypes<SchemaType>()(createTRPCReact<AppRouter>());
+ * // At root level (no nesting):
+ * type Typed = WithReact<WithZenStack<SchemaType>>;
  * ```
  */
-export declare function withZenStackTypes<S extends SchemaDef>(): <T>(client: T) => T extends {
-    useQuery: any;
-} | {
-    useMutation: any;
-} ? TypedTRPCReact<S> : T extends {
-    query: any;
-} | {
-    mutate: any;
-} ? TypedTRPCClient<S> : TypedTRPCClient<S> & TypedTRPCReact<S>;
+export type WithZenStack<S extends SchemaDef, TPath extends string | undefined = undefined> = {
+    readonly __schema: S;
+    readonly __path: TPath;
+};
 /**
- * Type utility to add ZenStack types to a nested namespace within a tRPC client.
+ * React Query adapter - transforms WithZenStack into tRPC React hook types.
  *
  * @example
  * ```typescript
- * type TypedTRPC = Omit<typeof _trpc, 'db'> & { db: WithZenStackTypes<SchemaType, 'react'> };
- * export const trpc = _trpc as unknown as TypedTRPC;
+ * type Typed = WithReact<WithZenStack<SchemaType, "generated">>;
+ * const trpc = typedClient<Typed>()(_trpc);
  * ```
  */
-export type WithZenStackTypes<S extends SchemaDef, Mode extends 'client' | 'react' = 'react'> = Mode extends 'react' ? TypedTRPCReact<S> : TypedTRPCClient<S>;
+export type WithReact<T extends WithZenStack<any, any>> = T extends WithZenStack<infer S, infer P> ? {
+    readonly __types: TypedTRPCReact<S>;
+    readonly __path: P;
+} : never;
 /**
- * Helper function to type a nested namespace within your tRPC React hooks.
+ * Vanilla tRPC client adapter - transforms WithZenStack into vanilla client types.
  *
  * @example
  * ```typescript
- * export const trpc = withNestedZenStackReact<SchemaType, typeof _trpc, 'db'>('db')(_trpc);
+ * type Typed = WithClient<WithZenStack<SchemaType, "db">>;
+ * const client = typedClient<Typed>()(rawClient);
  * ```
  */
-export declare function withNestedZenStackReact<S extends SchemaDef, TClient, TKey extends string>(_namespace: TKey): (client: TClient) => Omit<TClient, TKey> & { [K in TKey]: TypedTRPCReact<S>; };
+export type WithClient<T extends WithZenStack<any, any>> = T extends WithZenStack<infer S, infer P> ? {
+    readonly __types: TypedTRPCClient<S>;
+    readonly __path: P;
+} : never;
+/** Extract the final types from an adapter */
+type ExtractTypes<T> = T extends {
+    readonly __types: infer Types;
+} ? Types : never;
+/** Extract the path from an adapter */
+type ExtractPath<T> = T extends {
+    readonly __path: infer P;
+} ? P : undefined;
+/** Apply the typed transformation to a client */
+type ApplyTyped<TClient, T> = ExtractPath<T> extends string ? ApplyAtPath<TClient, ExtractPath<T>, ExtractTypes<T>> : ExtractTypes<T>;
 /**
- * Helper function to type a nested namespace within your vanilla tRPC client.
+ * Apply composed types to a tRPC client.
  *
  * @example
  * ```typescript
- * export const client = withNestedZenStackClient<SchemaType, typeof _client, 'db'>('db')(_client);
+ * // Define composed types
+ * type Typed = WithReact<WithZenStack<SchemaType, "generated">>;
+ *
+ * // Apply to client
+ * const _trpc = createTRPCReact<AppRouter>();
+ * export const trpc = typedClient<Typed>()(_trpc);
  * ```
  */
-export declare function withNestedZenStackClient<S extends SchemaDef, TClient, TKey extends string>(_namespace: TKey): (client: TClient) => Omit<TClient, TKey> & { [K in TKey]: TypedTRPCClient<S>; };
+export declare function typedClient<T extends {
+    readonly __types: any;
+    readonly __path: any;
+}>(): <TClient>(client: TClient) => ApplyTyped<TClient, T>;
+/** Recursively apply types at a nested path */
+type ApplyAtPath<TClient, Path extends string, TTypes> = Path extends `${infer Head}.${infer Tail}` ? Omit<TClient, Head> & {
+    [K in Head]: Head extends keyof TClient ? ApplyAtPath<TClient[Head], Tail, TTypes> : TTypes;
+} : Omit<TClient, Path> & {
+    [K in Path]: TTypes;
+};
 export {};
 //# sourceMappingURL=typed-client.d.ts.map

package/dist/typed-client.d.ts.map

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

package/dist/typed-client.js

@@ -2,68 +2,39 @@
  * Typed tRPC client helpers for full include/select type inference.
  *
  * tRPC's standard type inference loses generic type information for procedure
- * input/output types. This module provides type utilities that restore full
- * dynamic typing based on include/select options.
+ * input/output types. This module provides a composable type system that
+ * restores full dynamic typing based on include/select options.
  *
  * @example
  * ```typescript
- * import { createTRPCClient } from "@trpc/client";
  * import { createTRPCReact } from "@trpc/react-query";
- * import { withZenStackTypes } from "zenstack-trpc";
+ * import { typedClient, type WithZenStack, type WithReact } from "zenstack-trpc";
  * import type { AppRouter } from "./server/trpc.js";
  * import type { SchemaType } from "./zenstack/schema.js";
  *
- * // Vanilla client
- * const client = withZenStackTypes<SchemaType>()(
- *   createTRPCClient<AppRouter>({ links: [...] })
- * );
+ * // Compose types and apply to client
+ * type Typed = WithReact<WithZenStack<SchemaType>>;
+ * const _trpc = createTRPCReact<AppRouter>();
+ * export const trpc = typedClient<Typed>()(_trpc);
  *
- * // React hooks
- * const trpc = withZenStackTypes<SchemaType>()(
- *   createTRPCReact<AppRouter>()
- * );
+ * // With nested namespace
+ * type Typed = WithReact<WithZenStack<SchemaType, "db">>;
+ * export const trpc = typedClient<Typed>()(_trpc);
  * ```
  */
-// =============================================================================
-// Type Converter Utilities
-// =============================================================================
 /**
- * Converts a tRPC client or React hooks instance to a fully typed version
- * with include/select inference. This is a type-only transformation.
+ * Apply composed types to a tRPC client.
  *
  * @example
  * ```typescript
- * // For vanilla tRPC client:
- * const client = withZenStackTypes<SchemaType>()(createTRPCClient<AppRouter>({ links: [...] }));
+ * // Define composed types
+ * type Typed = WithReact<WithZenStack<SchemaType, "generated">>;
  *
- * // For tRPC React hooks:
- * const trpc = withZenStackTypes<SchemaType>()(createTRPCReact<AppRouter>());
+ * // Apply to client
+ * const _trpc = createTRPCReact<AppRouter>();
+ * export const trpc = typedClient<Typed>()(_trpc);
  * ```
  */
-export function withZenStackTypes() {
-    return (client) => {
-        return client;
-    };
-}
-/**
- * Helper function to type a nested namespace within your tRPC React hooks.
- *
- * @example
- * ```typescript
- * export const trpc = withNestedZenStackReact<SchemaType, typeof _trpc, 'db'>('db')(_trpc);
- * ```
- */
-export function withNestedZenStackReact(_namespace) {
-    return (client) => client;
-}
-/**
- * Helper function to type a nested namespace within your vanilla tRPC client.
- *
- * @example
- * ```typescript
- * export const client = withNestedZenStackClient<SchemaType, typeof _client, 'db'>('db')(_client);
- * ```
- */
-export function withNestedZenStackClient(_namespace) {
+export function typedClient() {
     return (client) => client;
 }

package/dist/zod-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zod-schemas.d.ts","sourceRoot":"","sources":["../src/zod-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsDxD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,SAAS,SAAS,EACxD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAmDd;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAyCd;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAuCd;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,SAAS,SAAS,EAC9D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAed;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,SAAS,SAAS,EACzD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAcd;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,SAAS,EAC1D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAiBd;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,SAAS,EAC1D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAkBd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,SAAS,SAAS,EACzD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmIlC"}
+{"version":3,"file":"zod-schemas.d.ts","sourceRoot":"","sources":["../src/zod-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAsDxD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,SAAS,SAAS,EACxD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAqDd;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAyCd;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,SAAS,SAAS,EAC7D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAuCd;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,SAAS,SAAS,EAC9D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAed;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,SAAS,SAAS,EACzD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAcd;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,SAAS,EAC1D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAiBd;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,SAAS,SAAS,EAC1D,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,GAChC,CAAC,CAAC,UAAU,CAkBd;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,SAAS,SAAS,EACzD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmIlC"}

package/dist/zod-schemas.js

@@ -59,15 +59,17 @@ export function createWhereSchema(schema, modelName) {
             shape[fieldName] = z.any().optional();
         }
         else {
-            // For scalar fields, allow direct value or filter object
+            // For scalar fields, allow direct value, null, or filter object
             const fieldType = fieldDef.type;
             const baseType = getZodTypeForField(fieldType, false, false);
+            const nullableBaseType = baseType.nullable();
             shape[fieldName] = z
                 .union([
                 baseType,
+                z.null(),
                 z.object({
-                    equals: baseType.optional(),
-                    not: baseType.optional(),
+                    equals: nullableBaseType.optional(),
+                    not: nullableBaseType.optional(),
                     in: z.array(baseType).optional(),
                     notIn: z.array(baseType).optional(),
                     lt: baseType.optional(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenstack-trpc",
-  "version": "0.1.6",
+  "version": "0.1.9",
   "description": "Auto-generate type-safe tRPC routers from ZenStack V3 schemas",
   "type": "module",
   "main": "./dist/index.js",
@@ -46,11 +46,23 @@
   },
   "peerDependencies": {
     "@trpc/server": ">=11.0.0",
+    "@trpc/react-query": ">=11.0.0",
+    "@tanstack/react-query": ">=5.0.0",
     "@zenstackhq/orm": ">=3.0.0",
     "zod": ">=3.0.0 || >=4.0.0"
   },
+  "peerDependenciesMeta": {
+    "@trpc/react-query": {
+      "optional": true
+    },
+    "@tanstack/react-query": {
+      "optional": true
+    }
+  },
   "devDependencies": {
+    "@tanstack/react-query": "^5.90.16",
     "@trpc/client": "^11.8.1",
+    "@trpc/react-query": "^11.8.1",
     "@trpc/server": "^11.8.1",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^25.0.3",