minor fix to optional var types

Author: KurtGokhan

examples/vite/src/App.tsx

@@ -21,7 +21,7 @@ const baseMutation = baseQuery.asMutationBuilder();
 
 const resetMutation = baseMutation.withPath('/reset').withUpdates('*');
 
-const postsQuery = baseQuery.withTags('refreshable', 'posts').withPath('/posts').withData<PostData[]>();
+const postsQuery = baseQuery.withTags('refreshable', 'posts').withPath('/posts').withData<PostData[]>().withSearch<{ page?: number }>();
 
 const postQuery = baseQuery
   .withTags('refreshable')
@@ -62,7 +62,7 @@ const editPostMutation = baseMutation
       ...ctx,
       vars: {
         ...ctx.vars,
-        body: { ...ctx.vars.body, body: `${ctx.vars.body.body} \n Last updated ${new Date().toISOString()}` },
+        body: { ...ctx.vars.body, body: `${ctx.vars.body?.body} \n Last updated ${new Date().toISOString()}` },
       },
     });
     return res;

examples/vite/src/mocks/mocks.ts

@@ -68,9 +68,11 @@ const handlers = [
     await delay();
     return HttpResponse.json(users);
   }),
-  http.get(`${baseUrl}/posts`, async () => {
+  http.get(`${baseUrl}/posts`, async (req) => {
     await delay();
-    return HttpResponse.json(posts);
+    const page = Number(new URL(req.request.url).searchParams.get('page')) || 0;
+    const pageSize = 5;
+    return HttpResponse.json(posts.slice(page * pageSize, (page + 1) * pageSize));
   }),
   http.get(`${baseUrl}/posts/:id`, async (req) => {
     await delay();

src/builder/types.ts

@@ -24,7 +24,9 @@ type WhenRequired<T, TReq> = T extends undefined
     ? Partial<TReq>
     : T extends null
       ? Partial<TReq>
-      : TReq;
+      : Partial<T> extends T
+        ? Partial<TReq>
+        : TReq;
 
 export type HttpBuilderVars<TParam = unknown, TSearch = unknown, TBody = unknown, THeaders = unknown, TMeta = unknown> = Prettify<
   HttpBuilderBaseVars &

src/tags/types.ts

@@ -44,7 +44,7 @@ export type PredefinedUpdater<TVars = unknown, TData = unknown, TErr = unknown,
   | `replace-${UpdaterSelector<TVars>}`
   | `${'create' | 'update' | 'upsert' | 'delete' | 'switch'}-${UpdaterSelector<TVars>}-by-${KeyOfTarget<TTarget>}`;
 
-type UpdaterSelector<TVars> = 'data' | 'vars' | Extract<KeysOfValue<TVars, Record<string, unknown>>, string>;
+type UpdaterSelector<TVars> = 'data' | 'vars' | Extract<KeysOfValue<TVars, Record<string, unknown> | undefined>, string>;
 type KeyOfTarget<TTarget> = KeyOfItem<TTarget> & string & {};
 type KeyOfItem<TTarget> = TTarget extends readonly (infer TItem)[]
   ? keyof TItem

src/types/utils.ts

@@ -16,5 +16,5 @@ export type FunctionType = (...args: any[]) => any;
 
 /** Extracts the keys of a type that have a value of a specific type. */
 export type KeysOfValue<T, TCondition> = {
-  [K in keyof T]?: T[K] extends TCondition ? K : never;
+  [K in keyof T]: T[K] extends TCondition ? K : never;
 }[keyof T];