Fix client support for zod

Author: oliverbutler

.changeset/eighty-schools-fix.md

@@ -0,0 +1,9 @@
+---
+'@ts-rest/core': patch
+'@ts-rest/express': patch
+'@ts-rest/nest': patch
+'@ts-rest/open-api': patch
+'@ts-rest/react-query': patch
+---
+
+Update client to have zod response type

libs/ts-rest/core/src/lib/client.ts

@@ -1,6 +1,6 @@
 import { z, ZodTypeAny } from 'zod';
 import { AppRoute, AppRouteMutation, AppRouter, isAppRoute } from './dsl';
-import { Without } from './type-utils';
+import { Without, ZodInferOrType } from './type-utils';
 
 type RecursiveProxyObj<T extends AppRouter> = {
   [TKey in keyof T]: T[TKey] extends AppRouter
@@ -30,7 +30,7 @@ type DataReturnArgs<TRoute extends AppRoute> = {
 export type DataReturn<TRoute extends AppRoute> = (
   args: Without<DataReturnArgs<TRoute>, never>
 ) => Promise<
-  | { data: TRoute['response']; error: null; status: number }
+  | { data: ZodInferOrType<TRoute['response']>; error: null; status: number }
   | { data: null; error: string; status: number }
 >;
 

libs/ts-rest/express/src/lib/ts-rest-express.ts

@@ -9,6 +9,7 @@ import {
   getAppRoutePathRoute,
   getValue,
   Without,
+  ZodInferOrType,
 } from '@ts-rest/core';
 
 type AppRouteQueryImplementation<T extends AppRouteQuery> = (
@@ -21,7 +22,7 @@ type AppRouteQueryImplementation<T extends AppRouteQuery> = (
     },
     never
   >
-) => Promise<T['response']>;
+) => Promise<ZodInferOrType<T['response']>>;
 
 type AppRouteMutationImplementation<T extends AppRouteMutation> = (
   input: Without<
@@ -32,7 +33,7 @@ type AppRouteMutationImplementation<T extends AppRouteMutation> = (
     },
     never
   >
-) => Promise<T['response']>;
+) => Promise<ZodInferOrType<T['response']>>;
 
 type AppRouteImplementation<T extends AppRoute> = T extends AppRouteMutation
   ? AppRouteMutationImplementation<T>

libs/ts-rest/react-query/src/lib/ts-rest-client.ts

@@ -11,6 +11,7 @@ import {
   getRouteQuery,
   isAppRoute,
   Without,
+  ZodInferOrType,
 } from '@ts-rest/core';
 import {
   QueryKey,
@@ -63,19 +64,19 @@ type DataReturnArgs<TRoute extends AppRoute> = {
 type DataReturnQuery<TAppRoute extends AppRoute> = (
   queryKey: QueryKey,
   args: Without<DataReturnArgs<TAppRoute>, never>,
-  options?: UseQueryOptions<TAppRoute['response']>
-) => UseQueryResult<TAppRoute['response']>;
+  options?: UseQueryOptions<ZodInferOrType<TAppRoute['response']>>
+) => UseQueryResult<ZodInferOrType<TAppRoute['response']>>;
 
 // Used pn X.useMutation
 type DataReturnMutation<TAppRoute extends AppRoute> = (
   options?: UseMutationOptions<
-    TAppRoute['response'],
+    ZodInferOrType<TAppRoute['response']>,
     unknown,
     Without<DataReturnArgs<TAppRoute>, never>,
     unknown
   >
 ) => UseMutationResult<
-  TAppRoute['response'],
+  ZodInferOrType<TAppRoute['response']>,
   unknown,
   Without<DataReturnArgs<TAppRoute>, never>,
   unknown
@@ -156,7 +157,7 @@ const getRouteUseMutation = <TAppRoute extends AppRoute>(
     };
 
     return useMutation(
-      mutationFunction as () => Promise<TAppRoute['response']>,
+      mutationFunction as () => Promise<ZodInferOrType<TAppRoute['response']>>,
       options
     );
   };