@data-client/rest 0.9.8 → 0.10.0

package/src/OptionsToFunction.ts

@@ -7,30 +7,31 @@ export type OptionsToFunction<
   O extends PartialRestGenerics,
   E extends { body?: any; path?: string; method?: string },
   F extends FetchFunction,
-> = 'path' extends keyof O
-  ? RestFetch<
-      'searchParams' extends keyof O
-        ? O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
-        : PathArgs<Exclude<O['path'], undefined>>,
+> =
+  'path' extends keyof O ?
+    RestFetch<
+      'searchParams' extends keyof O ?
+        O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
+      : PathArgs<Exclude<O['path'], undefined>>,
       OptionsToBodyArgument<
         'body' extends keyof O ? O : E,
         'method' extends keyof O ? O['method'] : E['method']
       >,
       O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>
     >
-  : 'body' extends keyof O
-  ? RestFetch<
-      'searchParams' extends keyof O
-        ? O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>
-        : PathArgs<Exclude<E['path'], undefined>>,
+  : 'body' extends keyof O ?
+    RestFetch<
+      'searchParams' extends keyof O ?
+        O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>
+      : PathArgs<Exclude<E['path'], undefined>>,
       OptionsToBodyArgument<
         O,
         'method' extends keyof O ? O['method'] : E['method']
       >,
       O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>
     >
-  : 'searchParams' extends keyof O
-  ? RestFetch<
+  : 'searchParams' extends keyof O ?
+    RestFetch<
       O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>,
       OptionsToBodyArgument<
         E,
@@ -48,8 +49,9 @@ export type OptionsToFunction<
 export type OptionsToBodyArgument<
   O extends { body?: any },
   Method extends string | undefined,
-> = Method extends 'POST' | 'PUT' | 'PATCH' | 'DELETE'
-  ? 'body' extends keyof O
-    ? O['body']
+> =
+  Method extends 'POST' | 'PUT' | 'PATCH' | 'DELETE' ?
+    'body' extends keyof O ?
+      O['body']
     : any
   : undefined;

package/src/RestEndpoint.js

@@ -36,9 +36,9 @@ export default class RestEndpoint extends Endpoint {
       ('method' in options && !('sideEffect' in options))
     ) {
       this.sideEffect =
-        options.method === 'GET' || options.method === undefined
-          ? undefined
-          : true;
+        options.method === 'GET' || options.method === undefined ?
+          undefined
+        : true;
     }
     if (this.method === undefined) {
       this.method = this.sideEffect ? 'POST' : 'GET';
@@ -76,11 +76,16 @@ export default class RestEndpoint extends Endpoint {
       }
     });
     if (Object.keys(searchParams).length) {
-      return `${this.urlPrefix}${urlBase}?${paramsToString(searchParams)}`;
+      return `${this.urlPrefix}${urlBase}?${this.searchToString(searchParams)}`;
     }
     return `${this.urlPrefix}${urlBase}`;
   }
 
+  /** Encode the url searchParams */
+  searchToString(searchParams) {
+    return paramsToString(searchParams);
+  }
+
   getHeaders(headers) {
     return headers;
   }

package/src/RestEndpointTypeHelp.ts

@@ -15,6 +15,5 @@ export type EndpointUpdateFunction<
   [K in keyof Updaters]: (result: Updaters[K]) => Updaters[K];
 };
 export type ResultEntry<E extends FetchFunction & { schema: any }> =
-  E['schema'] extends undefined | null
-    ? ResolveType<E>
-    : Normalize<E['schema']>;
+  E['schema'] extends undefined | null ? ResolveType<E>
+  : Normalize<E['schema']>;

package/src/RestEndpointTypes.ts

@@ -29,10 +29,9 @@ export interface RestInstanceBase<
   /** @see https://dataclient.io/rest/api/RestEndpoint#body */
   readonly body?: 'body' extends keyof O ? O['body'] : any;
   /** @see https://dataclient.io/rest/api/RestEndpoint#searchParams */
-  readonly searchParams?: 'searchParams' extends keyof O
-    ? O['searchParams']
-    : // unknown is identity with '&' type operator
-      unknown;
+  readonly searchParams?: 'searchParams' extends keyof O ? O['searchParams']
+  : // unknown is identity with '&' type operator
+    unknown;
 
   /** Pattern to construct url based on Url Parameters
    * @see https://dataclient.io/rest/api/RestEndpoint#path
@@ -43,31 +42,53 @@ export interface RestInstanceBase<
    */
   readonly urlPrefix: string;
   readonly requestInit: RequestInit;
-  /** @see https://dataclient.io/rest/api/RestEndpoint#method */
+  /** HTTP request method
+   * @see https://dataclient.io/rest/api/RestEndpoint#method
+   */
   readonly method: (O & { method: string })['method'];
   readonly signal: AbortSignal | undefined;
+  /** @see https://dataclient.io/rest/api/RestEndpoint#paginationField */
   readonly paginationField?: string;
 
   /* fetch lifecycles */
   /* before-fetch */
+  /** Builds the URL to fetch
+   * @see https://dataclient.io/rest/api/RestEndpoint#url
+   */
   url(...args: Parameters<F>): string;
-  /** @see https://dataclient.io/rest/api/RestEndpoint#getRequestInit */
+  /** Encode the searchParams component of the url
+   * @see https://dataclient.io/rest/api/RestEndpoint#searchToString
+   */
+  searchToString(searchParams: Record<string, any>): string;
+  /** Prepares RequestInit used in fetch. This is sent to fetchResponse()
+   * @see https://dataclient.io/rest/api/RestEndpoint#getRequestInit
+   */
   getRequestInit(
     this: any,
     body?: RequestInit['body'] | Record<string, unknown>,
   ): Promise<RequestInit> | RequestInit;
-  /** @see https://dataclient.io/rest/api/RestEndpoint#getHeaders */
+  /** Called by getRequestInit to determine HTTP Headers
+   * @see https://dataclient.io/rest/api/RestEndpoint#getHeaders
+   */
   getHeaders(headers: HeadersInit): Promise<HeadersInit> | HeadersInit;
   /* after-fetch */
-  /** @see https://dataclient.io/rest/api/RestEndpoint#fetchResponse */
+  /** Performs the fetch call
+   * @see https://dataclient.io/rest/api/RestEndpoint#fetchResponse
+   */
   fetchResponse(input: RequestInfo, init: RequestInit): Promise<Response>;
-  /** @see https://dataclient.io/rest/api/RestEndpoint#parseResponse */
+  /** Takes the Response and parses via .text() or .json()
+   * @see https://dataclient.io/rest/api/RestEndpoint#parseResponse
+   */
   parseResponse(response: Response): Promise<any>;
-  /** @see https://dataclient.io/rest/api/RestEndpoint#process */
+  /** Perform any transforms with the parsed result.
+   * @see https://dataclient.io/rest/api/RestEndpoint#process
+   */
   process(value: any, ...args: Parameters<F>): ResolveType<F>;
 
   /* utilities */
-  /** @see https://dataclient.io/rest/api/RestEndpoint#testKey */
+  /** Returns true if the provided (fetch) key matches this endpoint.
+   * @see https://dataclient.io/rest/api/RestEndpoint#testKey
+   */
   testKey(key: string): boolean;
 
   /* extenders */
@@ -121,14 +142,14 @@ export interface RestInstance<
   /** Endpoint to append the next page extending a list for pagination
    * @see https://dataclient.io/rest/api/RestEndpoint#getPage
    */
-  getPage: 'paginationField' extends keyof O
-    ? O['paginationField'] extends string
-      ? PaginationFieldEndpoint<
-          F & { schema: S; sideEffect: M } & O,
-          O['paginationField']
-        >
-      : undefined
-    : undefined;
+  getPage: 'paginationField' extends keyof O ?
+    O['paginationField'] extends string ?
+      PaginationFieldEndpoint<
+        F & { schema: S; sideEffect: M } & O,
+        O['paginationField']
+      >
+    : undefined
+  : undefined;
   /** Endpoint that pushes (place at end) a newly created entity to this Collection
    * @see https://dataclient.io/rest/api/RestEndpoint#push
    */
@@ -173,9 +194,8 @@ export type RestEndpointExtendOptions<
   F extends FetchFunction,
 > = RestEndpointOptions<
   OptionsToFunction<O, E, F>,
-  'schema' extends keyof O
-    ? Extract<O['schema'], Schema | undefined>
-    : E['schema']
+  'schema' extends keyof O ? Extract<O['schema'], Schema | undefined>
+  : E['schema']
 > &
   Partial<
     Omit<
@@ -188,13 +208,14 @@ type OptionsToRestEndpoint<
   O extends PartialRestGenerics,
   E extends RestInstanceBase & { body?: any; paginationField?: string },
   F extends FetchFunction,
-> = 'path' extends keyof O
-  ? RestType<
-      'searchParams' extends keyof O
-        ? O['searchParams'] extends undefined
-          ? PathArgs<Exclude<O['path'], undefined>>
-          : O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
-        : PathArgs<Exclude<O['path'], undefined>>,
+> =
+  'path' extends keyof O ?
+    RestType<
+      'searchParams' extends keyof O ?
+        O['searchParams'] extends undefined ?
+          PathArgs<Exclude<O['path'], undefined>>
+        : O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
+      : PathArgs<Exclude<O['path'], undefined>>,
       OptionsToBodyArgument<
         'body' extends keyof O ? O : E,
         'method' extends keyof O ? O['method'] : E['method']
@@ -205,22 +226,21 @@ type OptionsToRestEndpoint<
       {
         path: Exclude<O['path'], undefined>;
         body: 'body' extends keyof O ? O['body'] : E['body'];
-        searchParams: 'searchParams' extends keyof O
-          ? O['searchParams']
-          : E['searchParams'];
+        searchParams: 'searchParams' extends keyof O ? O['searchParams']
+        : E['searchParams'];
         method: 'method' extends keyof O ? O['method'] : E['method'];
-        paginationField: 'paginationField' extends keyof O
-          ? O['paginationField']
-          : E['paginationField'];
+        paginationField: 'paginationField' extends keyof O ?
+          O['paginationField']
+        : E['paginationField'];
       }
     >
-  : 'body' extends keyof O
-  ? RestType<
-      'searchParams' extends keyof O
-        ? O['searchParams'] extends undefined
-          ? PathArgs<Exclude<O['path'], undefined>>
-          : O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>
-        : PathArgs<Exclude<E['path'], undefined>>,
+  : 'body' extends keyof O ?
+    RestType<
+      'searchParams' extends keyof O ?
+        O['searchParams'] extends undefined ?
+          PathArgs<Exclude<O['path'], undefined>>
+        : O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>
+      : PathArgs<Exclude<E['path'], undefined>>,
       OptionsToBodyArgument<
         O,
         'method' extends keyof O ? O['method'] : E['method']
@@ -231,20 +251,19 @@ type OptionsToRestEndpoint<
       {
         path: E['path'];
         body: O['body'];
-        searchParams: 'searchParams' extends keyof O
-          ? O['searchParams']
-          : E['searchParams'];
+        searchParams: 'searchParams' extends keyof O ? O['searchParams']
+        : E['searchParams'];
         method: 'method' extends keyof O ? O['method'] : E['method'];
-        paginationField: 'paginationField' extends keyof O
-          ? O['paginationField']
-          : Extract<E['paginationField'], string>;
+        paginationField: 'paginationField' extends keyof O ?
+          O['paginationField']
+        : Extract<E['paginationField'], string>;
       }
     >
-  : 'searchParams' extends keyof O
-  ? RestType<
-      O['searchParams'] extends undefined
-        ? PathArgs<Exclude<O['path'], undefined>>
-        : O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>,
+  : 'searchParams' extends keyof O ?
+    RestType<
+      O['searchParams'] extends undefined ?
+        PathArgs<Exclude<O['path'], undefined>>
+      : O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>,
       OptionsToBodyArgument<
         E,
         'method' extends keyof O ? O['method'] : E['method']
@@ -257,9 +276,9 @@ type OptionsToRestEndpoint<
         body: E['body'];
         searchParams: O['searchParams'];
         method: 'method' extends keyof O ? O['method'] : E['method'];
-        paginationField: 'paginationField' extends keyof O
-          ? O['paginationField']
-          : Extract<E['paginationField'], string>;
+        paginationField: 'paginationField' extends keyof O ?
+          O['paginationField']
+        : Extract<E['paginationField'], string>;
       }
     >
   : RestInstance<
@@ -267,17 +286,15 @@ type OptionsToRestEndpoint<
       'schema' extends keyof O ? O['schema'] : E['schema'],
       'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect'],
       {
-        path: 'path' extends keyof O
-          ? Exclude<O['path'], undefined>
-          : E['path'];
+        path: 'path' extends keyof O ? Exclude<O['path'], undefined>
+        : E['path'];
         body: 'body' extends keyof O ? O['body'] : E['body'];
-        searchParams: 'searchParams' extends keyof O
-          ? O['searchParams']
-          : E['searchParams'];
+        searchParams: 'searchParams' extends keyof O ? O['searchParams']
+        : E['searchParams'];
         method: 'method' extends keyof O ? O['method'] : E['method'];
-        paginationField: 'paginationField' extends keyof O
-          ? O['paginationField']
-          : E['paginationField'];
+        paginationField: 'paginationField' extends keyof O ?
+          O['paginationField']
+        : E['paginationField'];
       }
     >;
 
@@ -287,15 +304,14 @@ export type RestExtendedEndpoint<
 > = OptionsToRestEndpoint<
   O,
   E &
-    (E extends { getPage: { paginationField: string } }
-      ? { paginationField: E['getPage']['paginationField'] }
-      : unknown),
+    (E extends { getPage: { paginationField: string } } ?
+      { paginationField: E['getPage']['paginationField'] }
+    : unknown),
   RestInstance<
     (
       ...args: Parameters<E>
-    ) => O['process'] extends {}
-      ? Promise<ReturnType<O['process']>>
-      : ReturnType<E>,
+    ) => O['process'] extends {} ? Promise<ReturnType<O['process']>>
+    : ReturnType<E>,
     'schema' extends keyof O ? O['schema'] : E['schema'],
     'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect']
   >
@@ -361,11 +377,11 @@ export type AddEndpoint<
   } = { path: string; body: any },
 > = RestInstanceBase<
   RestFetch<
-    'searchParams' extends keyof O
-      ? O['searchParams'] extends undefined
-        ? PathArgs<Exclude<O['path'], undefined>>
-        : O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
-      : PathArgs<Exclude<O['path'], undefined>>,
+    'searchParams' extends keyof O ?
+      O['searchParams'] extends undefined ?
+        PathArgs<Exclude<O['path'], undefined>>
+      : O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
+    : PathArgs<Exclude<O['path'], undefined>>,
     O['body'],
     ResolveType<F>
   >,
@@ -374,10 +390,9 @@ export type AddEndpoint<
   Omit<O, 'method'> & { method: 'POST' }
 >;
 
-type OptionsBodyDefault<O extends RestGenerics> = 'body' extends keyof O
-  ? O
-  : O['method'] extends 'POST' | 'PUT' | 'PATCH'
-  ? O & { body: any }
+type OptionsBodyDefault<O extends RestGenerics> =
+  'body' extends keyof O ? O
+  : O['method'] extends 'POST' | 'PUT' | 'PATCH' ? O & { body: any }
   : O & { body: undefined };
 
 type OptionsToAdderBodyArgument<O extends { body?: any }> =
@@ -406,22 +421,19 @@ export interface RestEndpointOptions<
 export type RestEndpointConstructorOptions<O extends RestGenerics = any> =
   RestEndpointOptions<
     RestFetch<
-      'searchParams' extends keyof O
-        ? O['searchParams'] extends undefined
-          ? PathArgs<O['path']>
-          : O['searchParams'] & PathArgs<O['path']>
-        : PathArgs<O['path']>,
+      'searchParams' extends keyof O ?
+        O['searchParams'] extends undefined ?
+          PathArgs<O['path']>
+        : O['searchParams'] & PathArgs<O['path']>
+      : PathArgs<O['path']>,
       OptionsToBodyArgument<
         O,
-        'method' extends keyof O
-          ? O['method']
-          : O extends { sideEffect: true }
-          ? 'POST'
-          : 'GET'
+        'method' extends keyof O ? O['method']
+        : O extends { sideEffect: true } ? 'POST'
+        : 'GET'
       >,
-      O['process'] extends {}
-        ? ReturnType<O['process']>
-        : any /*Denormalize<O['schema']>*/
+      O['process'] extends {} ? ReturnType<O['process']>
+      : any /*Denormalize<O['schema']>*/
     >,
     O['schema']
   >;
@@ -434,39 +446,35 @@ export interface RestEndpointConstructor {
     ...options
   }: RestEndpointConstructorOptions<O> & Readonly<O>): RestInstance<
     RestFetch<
-      'searchParams' extends keyof O
-        ? O['searchParams'] extends undefined
-          ? PathArgs<O['path']>
-          : O['searchParams'] & PathArgs<O['path']>
-        : PathArgs<O['path']>,
+      'searchParams' extends keyof O ?
+        O['searchParams'] extends undefined ?
+          PathArgs<O['path']>
+        : O['searchParams'] & PathArgs<O['path']>
+      : PathArgs<O['path']>,
       OptionsToBodyArgument<
         O,
-        'method' extends keyof O
-          ? O['method']
-          : O extends { sideEffect: true }
-          ? 'POST'
-          : 'GET'
+        'method' extends keyof O ? O['method']
+        : O extends { sideEffect: true } ? 'POST'
+        : 'GET'
       >,
-      O['process'] extends {}
-        ? ReturnType<O['process']>
-        : any /*Denormalize<O['schema']>*/
+      O['process'] extends {} ? ReturnType<O['process']>
+      : any /*Denormalize<O['schema']>*/
     >,
     'schema' extends keyof O ? O['schema'] : undefined,
-    'sideEffect' extends keyof O
-      ? Extract<O['sideEffect'], undefined | true>
-      : MethodToSide<O['method']>,
-    'method' extends keyof O
-      ? O
-      : O & {
-          method: O extends { sideEffect: true } ? 'POST' : 'GET';
-        }
+    'sideEffect' extends keyof O ? Extract<O['sideEffect'], undefined | true>
+    : MethodToSide<O['method']>,
+    'method' extends keyof O ? O
+    : O & {
+        method: O extends { sideEffect: true } ? 'POST' : 'GET';
+      }
   >;
   readonly prototype: RestInstanceBase;
 }
 
-export type MethodToSide<M> = M extends string
-  ? M extends 'GET'
-    ? undefined
+export type MethodToSide<M> =
+  M extends string ?
+    M extends 'GET' ?
+      undefined
     : true
   : undefined;
 
@@ -486,29 +494,27 @@ export type RestType<
   // eslint-disable-next-line @typescript-eslint/ban-types
 > = IfTypeScriptLooseNull<
   RestInstance<
-    keyof UrlParams extends never
-      ? (this: EndpointInstanceInterface, body?: Body) => Promise<R>
-      : // even with loose null, this will only be true when all members are optional
-      {} extends UrlParams
-      ?
-          | ((this: EndpointInstanceInterface, body?: Body) => Promise<R>)
-          | ((
-              this: EndpointInstanceInterface,
-              params: UrlParams,
-              body?: Body,
-            ) => Promise<R>)
-      : (
+    keyof UrlParams extends never ?
+      (this: EndpointInstanceInterface, body?: Body) => Promise<R>
+    : // even with loose null, this will only be true when all members are optional
+    {} extends UrlParams ?
+      | ((this: EndpointInstanceInterface, body?: Body) => Promise<R>)
+      | ((
           this: EndpointInstanceInterface,
           params: UrlParams,
           body?: Body,
-        ) => Promise<R>,
+        ) => Promise<R>)
+    : (
+        this: EndpointInstanceInterface,
+        params: UrlParams,
+        body?: Body,
+      ) => Promise<R>,
     S,
     M,
     O
   >,
-  Body extends {}
-    ? RestTypeWithBody<UrlParams, S, M, Body, R, O>
-    : RestTypeNoBody<UrlParams, S, M, R, O>
+  Body extends {} ? RestTypeWithBody<UrlParams, S, M, Body, R, O>
+  : RestTypeNoBody<UrlParams, S, M, R, O>
 >;
 
 export type RestTypeWithBody<
@@ -545,50 +551,40 @@ export type RestFetch<
 > = IfTypeScriptLooseNull<
   | ParamFetchNoBody<UrlParams, Resolve>
   | ParamFetchWithBody<UrlParams, Body, Resolve>,
-  Body extends {}
-    ? ParamFetchWithBody<UrlParams, Body, Resolve>
-    : ParamFetchNoBody<UrlParams, Resolve>
+  Body extends {} ? ParamFetchWithBody<UrlParams, Body, Resolve>
+  : ParamFetchNoBody<UrlParams, Resolve>
 >;
 
 export type ParamFetchWithBody<P, B = {}, R = any> =
   // we must always allow undefined in a union and give it a type without params
-  P extends undefined
-    ? (this: EndpointInstanceInterface, body: B) => Promise<R>
-    : // even with loose null, this will only be true when all members are optional
-    {} extends P
-    ? // this safely handles PathArgs with no members that results in a simple `unknown` type
-      keyof P extends never
-      ? (this: EndpointInstanceInterface, body: B) => Promise<R>
-      :
-          | ((
-              this: EndpointInstanceInterface,
-              params: P,
-              body: B,
-            ) => Promise<R>)
-          | ((this: EndpointInstanceInterface, body: B) => Promise<R>)
-    : (this: EndpointInstanceInterface, params: P, body: B) => Promise<R>;
+  P extends undefined ? (this: EndpointInstanceInterface, body: B) => Promise<R>
+  : // even with loose null, this will only be true when all members are optional
+  {} extends P ?
+    // this safely handles PathArgs with no members that results in a simple `unknown` type
+    keyof P extends never ?
+      (this: EndpointInstanceInterface, body: B) => Promise<R>
+    : | ((this: EndpointInstanceInterface, params: P, body: B) => Promise<R>)
+      | ((this: EndpointInstanceInterface, body: B) => Promise<R>)
+  : (this: EndpointInstanceInterface, params: P, body: B) => Promise<R>;
 
 export type ParamFetchNoBody<P, R = any> =
   // we must always allow undefined in a union and give it a type without params
-  P extends undefined
-    ? (this: EndpointInstanceInterface) => Promise<R>
-    : // even with loose null, this will only be true when all members are optional
-    {} extends P
-    ? // this safely handles PathArgs with no members that results in a simple `unknown` type
-      keyof P extends never
-      ? (this: EndpointInstanceInterface) => Promise<R>
-      :
-          | ((this: EndpointInstanceInterface, params: P) => Promise<R>)
-          | ((this: EndpointInstanceInterface) => Promise<R>)
-    : (this: EndpointInstanceInterface, params: P) => Promise<R>;
+  P extends undefined ? (this: EndpointInstanceInterface) => Promise<R>
+  : // even with loose null, this will only be true when all members are optional
+  {} extends P ?
+    // this safely handles PathArgs with no members that results in a simple `unknown` type
+    keyof P extends never ?
+      (this: EndpointInstanceInterface) => Promise<R>
+    : | ((this: EndpointInstanceInterface, params: P) => Promise<R>)
+      | ((this: EndpointInstanceInterface) => Promise<R>)
+  : (this: EndpointInstanceInterface, params: P) => Promise<R>;
 
 type IfTypeScriptLooseNull<Y, N> = 1 | undefined extends 1 ? Y : N;
 
 export type KeyofRestEndpoint = keyof RestInstance;
 
-export type FromFallBack<K extends keyof E, O, E> = K extends keyof O
-  ? O[K]
-  : E[K];
+export type FromFallBack<K extends keyof E, O, E> =
+  K extends keyof O ? O[K] : E[K];
 
 export type FetchMutate<
   A extends readonly any[] =  // eslint-disable-next-line @typescript-eslint/ban-types
@@ -604,9 +600,8 @@ export type FetchGet<A extends readonly any[] = [any], R = any> = (
 ) => Promise<R>;
 
 export type Defaults<O, D> = {
-  [K in keyof O | keyof D]: K extends keyof O
-    ? Exclude<O[K], undefined>
-    : D[Extract<K, keyof D>];
+  [K in keyof O | keyof D]: K extends keyof O ? Exclude<O[K], undefined>
+  : D[Extract<K, keyof D>];
 };
 
 export type GetEndpoint<
@@ -621,11 +616,11 @@ export type GetEndpoint<
     schema: Schema;
   },
 > = RestTypeNoBody<
-  'searchParams' extends keyof O
-    ? O['searchParams'] extends undefined
-      ? PathArgs<O['path']>
-      : O['searchParams'] & PathArgs<O['path']>
-    : PathArgs<O['path']>,
+  'searchParams' extends keyof O ?
+    O['searchParams'] extends undefined ?
+      PathArgs<O['path']>
+    : O['searchParams'] & PathArgs<O['path']>
+  : PathArgs<O['path']>,
   O['schema'],
   undefined,
   any,
@@ -646,11 +641,11 @@ export type MutateEndpoint<
     schema: Schema;
   },
 > = RestTypeWithBody<
-  'searchParams' extends keyof O
-    ? O['searchParams'] extends undefined
-      ? PathArgs<O['path']>
-      : O['searchParams'] & PathArgs<O['path']>
-    : PathArgs<O['path']>,
+  'searchParams' extends keyof O ?
+    O['searchParams'] extends undefined ?
+      PathArgs<O['path']>
+    : O['searchParams'] & PathArgs<O['path']>
+  : PathArgs<O['path']>,
   O['schema'],
   true,
   O['body'],