@data-client/rest 0.15.7 → 0.16.0

package/src/RestEndpoint.js

@@ -67,14 +67,21 @@ export default class RestEndpoint extends Endpoint {
 
   /** Get the url */
   url(urlParams = {}) {
-    const urlBase = getUrlBase(this.path)(urlParams);
     const tokens = getUrlTokens(this.path);
+    const pathParams = {};
     const searchParams = {};
     Object.keys(urlParams).forEach(k => {
-      if (!tokens.has(k)) {
+      if (tokens.has(k)) {
+        if (urlParams[k] !== undefined)
+          pathParams[k] =
+            Array.isArray(urlParams[k]) ?
+              urlParams[k].map(String)
+            : String(urlParams[k]);
+      } else {
         searchParams[k] = urlParams[k];
       }
     });
+    const urlBase = getUrlBase(this.path)(pathParams);
     if (Object.keys(searchParams).length) {
       return `${this.urlPrefix}${urlBase}?${this.searchToString(searchParams)}`;
     }
@@ -189,7 +196,7 @@ Response (first 300 characters): ${text.substring(0, 300)}`;
   }
 
   get pathRegex() {
-    return pathToRegexp(this.path);
+    return pathToRegexp(this.path).regexp;
   }
 
   testKey(key) {

package/src/RestEndpointTypes.ts

@@ -235,7 +235,7 @@ type OptionsToRestEndpoint<
   'path' extends keyof O ?
     RestType<
       'searchParams' extends keyof O ?
-        O['searchParams'] extends undefined ?
+        [O['searchParams']] extends [undefined] ?
           PathArgs<Exclude<O['path'], undefined>>
         : O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
       : PathArgs<Exclude<O['path'], undefined>>,
@@ -263,7 +263,7 @@ type OptionsToRestEndpoint<
   : 'body' extends keyof O ?
     RestType<
       'searchParams' extends keyof O ?
-        O['searchParams'] extends undefined ?
+        [O['searchParams']] extends [undefined] ?
           PathArgs<Exclude<O['path'], undefined>>
         : O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>
       : PathArgs<Exclude<E['path'], undefined>>,
@@ -290,7 +290,7 @@ type OptionsToRestEndpoint<
     >
   : 'searchParams' extends keyof O ?
     RestType<
-      O['searchParams'] extends undefined ?
+      [O['searchParams']] extends [undefined] ?
         PathArgs<Exclude<O['path'], undefined>>
       : O['searchParams'] & PathArgs<Exclude<E['path'], undefined>>,
       OptionsToBodyArgument<
@@ -468,7 +468,7 @@ export type AddEndpoint<
 > = RestInstanceBase<
   RestFetch<
     'searchParams' extends keyof O ?
-      O['searchParams'] extends undefined ?
+      [O['searchParams']] extends [undefined] ?
         PathArgs<Exclude<O['path'], undefined>>
       : O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
     : PathArgs<Exclude<O['path'], undefined>>,
@@ -490,7 +490,7 @@ export type RemoveEndpoint<
 > = RestInstanceBase<
   RestFetch<
     'searchParams' extends keyof O ?
-      O['searchParams'] extends undefined ?
+      [O['searchParams']] extends [undefined] ?
         PathArgs<Exclude<O['path'], undefined>>
       : O['searchParams'] & PathArgs<Exclude<O['path'], undefined>>
     : PathArgs<Exclude<O['path'], undefined>>,
@@ -562,7 +562,7 @@ export type RestEndpointConstructorOptions<O extends RestGenerics = any> =
   RestEndpointOptions<
     RestFetch<
       'searchParams' extends keyof O ?
-        O['searchParams'] extends undefined ?
+        [O['searchParams']] extends [undefined] ?
           PathArgs<O['path']>
         : O['searchParams'] & PathArgs<O['path']>
       : PathArgs<O['path']>,
@@ -587,7 +587,7 @@ export interface RestEndpoint<
 > extends RestInstance<
   RestFetch<
     'searchParams' extends keyof O ?
-      O['searchParams'] extends undefined ?
+      [O['searchParams']] extends [undefined] ?
         PathArgs<O['path']>
       : O['searchParams'] & PathArgs<O['path']>
     : PathArgs<O['path']>,
@@ -754,7 +754,7 @@ export type GetEndpoint<
   },
 > = RestTypeNoBody<
   'searchParams' extends keyof O ?
-    O['searchParams'] extends undefined ?
+    [O['searchParams']] extends [undefined] ?
       PathArgs<O['path']>
     : O['searchParams'] & PathArgs<O['path']>
   : PathArgs<O['path']>,
@@ -779,7 +779,7 @@ export type MutateEndpoint<
   },
 > = RestTypeWithBody<
   'searchParams' extends keyof O ?
-    O['searchParams'] extends undefined ?
+    [O['searchParams']] extends [undefined] ?
       PathArgs<O['path']>
     : O['searchParams'] & PathArgs<O['path']>
   : PathArgs<O['path']>,

package/src/RestHelpers.ts

@@ -1,32 +1,39 @@
-import { compile, PathFunction, parse } from 'path-to-regexp';
+import { compile, PathFunction, parse, Token, ParamData } from 'path-to-regexp';
 
 import { ShortenPath } from './pathTypes.js';
 
-const urlBaseCache: Map<string, PathFunction<object>> = new Map();
-export function getUrlBase(path: string): PathFunction {
-  if (!urlBaseCache.has(path)) {
-    urlBaseCache.set(
-      path,
-      compile(path, {
-        encode: encodeURIComponent,
-        validate: false,
-      }),
-    );
+const urlBaseCache: Record<string, PathFunction<object>> = Object.create(null);
+export function getUrlBase(path: string): PathFunction<ParamData> {
+  if (!(path in urlBaseCache)) {
+    urlBaseCache[path] = compile(path);
   }
-  return urlBaseCache.get(path) as PathFunction;
+  return urlBaseCache[path];
 }
 
-const urlTokensCache: Map<string, Set<string>> = new Map();
+const urlTokensCache: Record<string, Set<string>> = Object.create(null);
 export function getUrlTokens(path: string): Set<string> {
-  if (!urlTokensCache.has(path)) {
-    urlTokensCache.set(
-      path,
-      new Set(
-        parse(path).map(t => (typeof t === 'string' ? t : `${t['name']}`)),
-      ),
-    );
+  if (!(path in urlTokensCache)) {
+    urlTokensCache[path] = tokenMap(parse(path).tokens);
+  }
+  return urlTokensCache[path];
+}
+
+function tokenMap(tokens: Token[]): Set<string> {
+  const tokenNames = new Set<string>();
+  for (const token of tokens) {
+    switch (token.type) {
+      case 'param':
+      case 'wildcard':
+        tokenNames.add(token.name);
+        break;
+      case 'group':
+        for (const name of tokenMap(token.tokens)) {
+          tokenNames.add(name);
+        }
+        break;
+    }
   }
-  return urlTokensCache.get(path) as Set<string>;
+  return tokenNames;
 }
 
 const proto = Object.prototype;
@@ -40,11 +47,12 @@ export function isPojo(obj: unknown): obj is Record<string, any> {
 }
 
 export function shortenPath<S extends string>(path: S): ShortenPath<S> {
-  const lastColonIndex = path.lastIndexOf(':');
-  if (lastColonIndex === -1)
-    throw new Error('Resource path requires at least one :parameter');
-  // this is for when not specifying a specific item like create/list
-  let shortUrlRoot: ShortenPath<S> = path.substring(0, lastColonIndex) as any;
+  const lastTokenIndex = Math.max(path.lastIndexOf(':'), path.lastIndexOf('*'));
+  if (lastTokenIndex === -1)
+    throw new Error(
+      'Resource path requires at least one :parameter or *wildcard',
+    );
+  let shortUrlRoot: ShortenPath<S> = path.substring(0, lastTokenIndex) as any;
   if (shortUrlRoot[shortUrlRoot.length - 1] === '/')
     shortUrlRoot = shortUrlRoot.substring(
       0,

package/src/__tests__/Resource.test.ts

@@ -134,6 +134,18 @@ describe('resource()', () => {
     () => UserResource.get.url({ sdf: '5' });
   });
 
+  it('should omit optional path params when undefined', () => {
+    const ep = new RestEndpoint({ path: '/users{/:id}' });
+    expect(ep.url({ id: undefined })).toBe('/users');
+    expect(ep.url({ id: '5' })).toBe('/users/5');
+    expect(ep.url({})).toBe('/users');
+
+    const ep2 = new RestEndpoint({ path: '/users{/:id}{/:group}' });
+    expect(ep2.url({ id: undefined, group: undefined })).toBe('/users');
+    expect(ep2.url({ id: '5', group: undefined })).toBe('/users/5');
+    expect(ep2.url({ id: undefined })).toBe('/users');
+  });
+
   it('should handle multiarg urls', () => {
     const MyUserResource = resource({
       path: 'http\\://test.com/groups/:group/users/:id',
@@ -180,6 +192,50 @@ describe('resource()', () => {
     () => useSuspense(MyUserResource.get, { group: 'yay', id: '5' });
   });
 
+  it('should shorten wildcard (*) paths for getList', () => {
+    const FileResource = resource({
+      path: '/repos/:owner/*path',
+      schema: User,
+    });
+
+    // get uses the full path with wildcard
+    expect(
+      FileResource.get.url({ owner: 'john', path: ['src', 'index.ts'] }),
+    ).toBe('/repos/john/src/index.ts');
+    // getList strips the last *wildcard token
+    expect(FileResource.getList.url({ owner: 'john' })).toBe('/repos/john');
+    // create (push) also uses shortened path
+    expect(FileResource.create.url({ owner: 'john' }, {} as any)).toBe(
+      '/repos/john',
+    );
+
+    // type checks: get requires both owner and path (array)
+    // @ts-expect-error - missing path
+    () => FileResource.get.url({ owner: 'john' });
+    // @ts-expect-error - path must be array
+    () => FileResource.get.url({ owner: 'john', path: 'src/index.ts' });
+    // getList only requires owner (extra props become search params)
+    () => FileResource.getList({ owner: 'john' });
+    // @ts-expect-error - missing required owner param
+    () => FileResource.getList({});
+  });
+
+  it('should shorten path when wildcard comes after multiple params', () => {
+    const DeepResource = resource({
+      path: '/api/:version/files/*path',
+      schema: User,
+    });
+
+    expect(
+      DeepResource.get.url({ version: 'v2', path: ['docs', 'readme.md'] }),
+    ).toBe('/api/v2/files/docs/readme.md');
+    expect(DeepResource.getList.url({ version: 'v2' })).toBe('/api/v2/files');
+
+    // @ts-expect-error - missing version
+    () => DeepResource.getList({});
+    () => DeepResource.getList({ version: 'v2' });
+  });
+
   it('should automatically name methods', () => {
     expect(PaginatedArticleResource.get.name).toBe('PaginatedArticle.get');
     expect(PaginatedArticleResource.create.name).toBe(

package/src/__tests__/RestEndpoint.ts

@@ -237,9 +237,9 @@ describe('RestEndpoint', () => {
   });
 
   it('only optional path means the arg is not required', () => {
-    const ep = new RestEndpoint({ path: '/users/:id?/:group?' });
+    const ep = new RestEndpoint({ path: '/users{/:id}{/:group}' });
     const epbody = new RestEndpoint({
-      path: '/users/:id?/:group?',
+      path: '/users{/:id}{/:group}',
       body: { title: '' },
       method: 'POST',
     });
@@ -255,6 +255,64 @@ describe('RestEndpoint', () => {
     () => epbody({ title: 'hi' }, { title: 'hi' });
   });
 
+  it('should omit optional path params when undefined', () => {
+    const ep = new RestEndpoint({ path: '/users{/:id}' });
+    expect(ep.url({ id: undefined })).toBe('/users');
+    expect(ep.url({ id: '5' })).toBe('/users/5');
+    expect(ep.url({})).toBe('/users');
+
+    const ep2 = new RestEndpoint({ path: '/users{/:id}{/:group}' });
+    expect(ep2.url({ id: undefined, group: undefined })).toBe('/users');
+    expect(ep2.url({ id: '5', group: undefined })).toBe('/users/5');
+    expect(ep2.url({ id: undefined })).toBe('/users');
+  });
+
+  it('should handle wildcard (*) path params as arrays', () => {
+    const ep = new RestEndpoint({ path: '/files/*path' });
+    expect(ep.url({ path: ['a', 'b', 'c'] })).toBe('/files/a/b/c');
+    expect(ep.url({ path: ['single'] })).toBe('/files/single');
+
+    // @ts-expect-error - path must be an array, not a string
+    () => ep.url({ path: 'a/b/c' });
+    // @ts-expect-error - missing required wildcard param
+    () => ep.url({});
+  });
+
+  it('should handle wildcard with regular params', () => {
+    const ep = new RestEndpoint({ path: '/users/:id/*rest' });
+    expect(ep.url({ id: '5', rest: ['docs', 'file'] })).toBe(
+      '/users/5/docs/file',
+    );
+    expect(ep.url({ id: '42', rest: ['a'] })).toBe('/users/42/a');
+
+    // @ts-expect-error - missing id
+    () => ep.url({ rest: ['a'] });
+    // @ts-expect-error - missing rest
+    () => ep.url({ id: '5' });
+  });
+
+  it('should handle optional wildcard params', () => {
+    const ep = new RestEndpoint({ path: '/files{/*path}' });
+    expect(ep.url({ path: ['a', 'b'] })).toBe('/files/a/b');
+    expect(ep.url({})).toBe('/files');
+    expect(ep.url({ path: undefined })).toBe('/files');
+    () => ep();
+  });
+
+  it('should handle optional wildcard with required param', () => {
+    const ep = new RestEndpoint({ path: '/users/:id{/*rest}' });
+    expect(ep.url({ id: '5', rest: ['docs', 'file'] })).toBe(
+      '/users/5/docs/file',
+    );
+    expect(ep.url({ id: '5' })).toBe('/users/5');
+    expect(ep.url({ id: '5', rest: undefined })).toBe('/users/5');
+
+    // @ts-expect-error - missing required param id
+    () => ep.url({});
+    // @ts-expect-error - rest should be array, not string
+    () => ep.url({ id: '5', rest: 'docs/file' });
+  });
+
   it('should allow sideEffect overrides', () => {
     const weirdGetUser = new RestEndpoint({
       path: 'http\\://test.com/user/:id',

package/src/__tests__/__snapshots__/resource-construction.test.ts.snap

@@ -4,7 +4,7 @@ exports[`resource() UserResource.delete should work with  1`] = `"not found"`;
 
 exports[`resource() UserResource.delete should work with {"id": 5} 1`] = `"not found"`;
 
-exports[`resource() should not allow paths without at least one argument 1`] = `"Resource path requires at least one :parameter"`;
+exports[`resource() should not allow paths without at least one argument 1`] = `"Resource path requires at least one :parameter or *wildcard"`;
 
 exports[`resource() warnings should warn when mis-capitalizing options 1`] = `
 [

package/src/__tests__/hookifyResource.ts

@@ -63,7 +63,14 @@ describe('hookifyResource()', () => {
     };
 
     let renderDataClient: ReturnType<typeof makeRenderDataClient>;
+    let errorSpy: jest.SpyInstance;
 
+    beforeAll(() => {
+      errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+    });
+    afterAll(() => {
+      errorSpy.mockRestore();
+    });
     beforeEach(() => {
       renderDataClient = makeRenderDataClient(CacheProvider);
 

package/src/__tests__/resource-construction.test.ts

@@ -64,6 +64,13 @@ describe('resource()', () => {
     isAdmin: true,
   };
 
+  let errorSpy: jest.SpyInstance;
+  beforeAll(() => {
+    errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
+  });
+  afterAll(() => {
+    errorSpy.mockRestore();
+  });
   beforeEach(() => {
     nock(/.*/)
       .persist()

package/src/pathTypes.ts

@@ -1,8 +1,14 @@
-type OnlyOptional<S extends string> =
-  S extends `${infer K}}?` ? K
-  : S extends `${infer K}?` ? K
-  : never;
-type OnlyRequired<S extends string> = S extends `${string}?` ? never : S;
+type CleanKey<S extends string> = S extends `"${infer K}"` ? K : S;
+
+type KeyName<K extends string> = CleanKey<
+  K extends `*${infer N}}` ? N
+  : K extends `*${infer N}` ? N
+  : K extends `${infer N}}` ? N
+  : K
+>;
+
+type KeyVal<K extends string> =
+  K extends `*${string}` ? string[] : string | number;
 
 /** Parameters for a given path */
 export type PathArgs<S extends string> =
@@ -14,43 +20,49 @@ export type PathArgs<S extends string> =
 /** Computes the union of keys for a path string */
 export type PathKeys<S extends string> =
   string extends S ? string
-  : S extends `${infer A}\\${':' | '?' | '+' | '*' | '{' | '}'}${infer B}` ?
+  : S extends `${infer A}\\${':' | '*' | '}'}${infer B}` ?
     PathKeys<A> | PathKeys<B>
-  : PathSplits<S>;
+  : Splits<S, ':'> | Splits<S, '*'>;
 
-type PathSplits<S extends string> =
-  S extends (
-    `${string}:${infer K}${'/' | ',' | '%' | '&' | '+' | '*' | '{'}${infer R}`
+type Splits<S extends string, M extends ':' | '*'> =
+  S extends `${string}${M}${infer K}${M}${infer R}` ?
+    Splits<`${M}${K}`, M> | Splits<`${M}${R}`, M>
+  : S extends (
+    `${string}${M}${infer K}${'/' | '\\' | '%' | '&' | '*' | ':' | '{' | ';' | ',' | '!' | '@'}${infer R}`
   ) ?
-    PathSplits<`:${K}`> | PathSplits<R>
-  : S extends `${string}:${infer K}:${infer R}` ?
-    PathSplits<`:${K}`> | PathSplits<`:${R}`>
-  : S extends `${string}:${infer K}` ? K
+    Splits<`${M}${K}`, M> | Splits<R, M>
+  : S extends `${string}${M}${infer K}` ?
+    M extends '*' ?
+      `*${K}`
+    : K
   : never;
 
 export type KeysToArgs<Key extends string> = {
-  [K in Key as OnlyOptional<K>]?: string | number;
-} & (OnlyRequired<Key> extends never ? unknown
+  [K in Key as K extends `${string}}` ? KeyName<K> : never]?: KeyVal<K>;
+} & (Exclude<Key, `${string}}`> extends never ? unknown
 : {
-    [K in Key as OnlyRequired<K>]: string | number;
+    [K in Key as K extends `${string}}` ? never : KeyName<K>]: KeyVal<K>;
   });
 
 export type PathArgsAndSearch<S extends string> =
-  OnlyRequired<PathKeys<S>> extends never ?
+  Exclude<PathKeys<S>, `${string}}`> extends never ?
     Record<string, number | string | boolean> | undefined
   : {
-      [K in PathKeys<S> as OnlyRequired<K>]: string | number;
-    } & Record<string, number | string>;
+      [K in PathKeys<S> as K extends `${string}}` ? never
+      : KeyName<K>]: KeyVal<K>;
+    } & Record<string, number | string | string[]>;
 
-/** Removes the last :token */
+/** Removes the last :param or *wildcard token */
 export type ShortenPath<S extends string> =
   string extends S ? string
-  : S extends `${infer B}:${infer R}` ? TrimColon<`${B}:${ShortenPath<R>}`>
+  : S extends `${infer B}:${infer R}` ? TrimToken<`${B}:${ShortenPath<R>}`>
+  : S extends `${infer B}*${infer R}` ? TrimToken<`${B}*${ShortenPath<R>}`>
   : '';
 
-type TrimColon<S extends string> =
+type TrimToken<S extends string> =
   string extends S ? string
   : S extends `${infer R}:` ? R
+  : S extends `${infer R}*` ? R
   : S;
 
 export type ResourcePath = string; // `${string}:${string}`; TODO: Maybe do this in the future? Seems to hard to understand for now

package/src/resourceTypes.ts

@@ -84,7 +84,7 @@ export interface Resource<
         schema: schema.Collection<
           [O['schema']],
           ParamToArgs<
-            O['searchParams'] extends undefined ?
+            [O['searchParams']] extends [undefined] ?
               KeysToArgs<ShortenPath<O['path']>>
             : O['searchParams'] & PathArgs<ShortenPath<O['path']>>
           >

package/ts4.0/RestEndpointTypes.d.ts

@@ -134,19 +134,31 @@ export type RestEndpointExtendOptions<O extends PartialRestGenerics, E extends {
 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>>, OptionsToBodyArgument<'body' extends keyof O ? O : E, 'method' extends keyof O ? O['method'] : E['method']>, 'schema' extends keyof O ? O['schema'] : E['schema'], 'sideEffect' extends keyof O ? Extract<O['sideEffect'], boolean | undefined> : 'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect'], O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>, {
+}, 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>>, OptionsToBodyArgument<'body' extends keyof O ? O : E, 'method' extends keyof O ? O['method'] : E['method']>, 'schema' extends keyof O ? O['schema'] : E['schema'], 'sideEffect' extends keyof O ? Extract<O['sideEffect'], boolean | undefined> : 'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect'], O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>, {
     path: Exclude<O['path'], undefined>;
     body: 'body' extends keyof O ? O['body'] : E['body'];
     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'];
-}> : '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']>, 'schema' extends keyof O ? O['schema'] : E['schema'], 'sideEffect' extends keyof O ? Extract<O['sideEffect'], boolean | undefined> : 'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect'], O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>, {
+}> : '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']>, 'schema' extends keyof O ? O['schema'] : E['schema'], 'sideEffect' extends keyof O ? Extract<O['sideEffect'], boolean | undefined> : 'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect'], O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>, {
     path: E['path'];
     body: O['body'];
     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>;
-}> : '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']>, 'schema' extends keyof O ? O['schema'] : E['schema'], 'sideEffect' extends keyof O ? Extract<O['sideEffect'], boolean | undefined> : 'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect'], O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>, {
+}> : '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']>, 'schema' extends keyof O ? O['schema'] : E['schema'], 'sideEffect' extends keyof O ? Extract<O['sideEffect'], boolean | undefined> : 'method' extends keyof O ? MethodToSide<O['method']> : E['sideEffect'], O['process'] extends {} ? ReturnType<O['process']> : ResolveType<F>, {
     path: E['path'];
     body: E['body'];
     searchParams: O['searchParams'];
@@ -238,7 +250,11 @@ export type AddEndpoint<F extends FetchFunction = FetchFunction, S extends Schem
 } = {
     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>>, O['body'], ResolveType<F>>, S, true, Omit<O, 'method'> & {
+}> = 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>>, O['body'], ResolveType<F>>, S, true, Omit<O, 'method'> & {
     method: 'POST';
 }>;
 export type RemoveEndpoint<F extends FetchFunction = FetchFunction, S extends Schema | undefined = any, O extends {
@@ -248,7 +264,11 @@ export type RemoveEndpoint<F extends FetchFunction = FetchFunction, S extends Sc
 } = {
     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>>, O['body'], ResolveType<F>>, S, true, Omit<O, 'method'> & {
+}> = 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>>, O['body'], ResolveType<F>>, S, true, Omit<O, 'method'> & {
     method: 'PATCH';
 }>;
 export type MoveEndpoint<F extends FetchFunction = FetchFunction, S extends Schema | undefined = any, O extends {
@@ -293,14 +313,22 @@ export interface RestEndpointOptions<F extends FetchFunction = FetchFunction, S
     url?(...args: Parameters<F>): string;
     update?: EndpointUpdateFunction<F, S>;
 }
-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']>, OptionsToBodyArgument<O, 'method' extends keyof O ? O['method'] : O extends {
+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']>, OptionsToBodyArgument<O, 'method' extends keyof O ? O['method'] : O extends {
     sideEffect: true;
 } ? 'POST' : 'GET'>, O['process'] extends {} ? ReturnType<O['process']> : any>, O['schema']>;
 /** Simplifies endpoint definitions that follow REST patterns
  *
  * @see https://dataclient.io/rest/api/RestEndpoint
  */
-export interface RestEndpoint<O extends RestGenerics = any> extends RestInstance<RestFetch<'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 {
+export interface RestEndpoint<O extends RestGenerics = any> extends RestInstance<RestFetch<'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'>, O['process'] extends {} ? ReturnType<O['process']> : any>, 'schema' extends keyof O ? O['schema'] : undefined, 'sideEffect' extends keyof O ? Extract<O['sideEffect'], boolean | undefined> : MethodToSide<O['method']>, 'method' extends keyof O ? O : O & {
     method: O extends {
@@ -379,7 +407,11 @@ export type GetEndpoint<O extends {
 } = {
     path: string;
     schema: Schema;
-}> = RestTypeNoBody<'searchParams' extends keyof O ? O['searchParams'] extends undefined ? PathArgs<O['path']> : O['searchParams'] & PathArgs<O['path']> : PathArgs<O['path']>, O['schema'], undefined, any, O & {
+}> = RestTypeNoBody<'searchParams' extends keyof O ? [
+    O['searchParams']
+] extends [
+    undefined
+] ? PathArgs<O['path']> : O['searchParams'] & PathArgs<O['path']> : PathArgs<O['path']>, O['schema'], undefined, any, O & {
     method: 'GET';
 }>;
 export type MutateEndpoint<O extends {
@@ -393,7 +425,11 @@ export type MutateEndpoint<O extends {
     path: string;
     body: any;
     schema: Schema;
-}> = RestTypeWithBody<'searchParams' extends keyof O ? O['searchParams'] extends undefined ? PathArgs<O['path']> : O['searchParams'] & PathArgs<O['path']> : PathArgs<O['path']>, O['schema'], true, O['body'], any, O & {
+}> = RestTypeWithBody<'searchParams' extends keyof O ? [
+    O['searchParams']
+] extends [
+    undefined
+] ? PathArgs<O['path']> : O['searchParams'] & PathArgs<O['path']> : PathArgs<O['path']>, O['schema'], true, O['body'], any, O & {
     body: any;
     method: 'POST' | 'PUT' | 'PATCH' | 'DELETE';
 }>;

package/ts4.0/RestHelpers.d.ts

@@ -1,6 +1,6 @@
-import { PathFunction } from 'path-to-regexp';
+import { PathFunction, ParamData } from 'path-to-regexp';
 import { ShortenPath } from './pathTypes.js';
-export declare function getUrlBase(path: string): PathFunction;
+export declare function getUrlBase(path: string): PathFunction<ParamData>;
 export declare function getUrlTokens(path: string): Set<string>;
 export declare function isPojo(obj: unknown): obj is Record<string, any>;
 export declare function shortenPath<S extends string>(path: S): ShortenPath<S>;

package/ts4.0/pathTypes.d.ts

@@ -11,7 +11,7 @@ export declare type KeysToArgs<Key extends string> = {
 };
 export declare type PathArgsAndSearch<S extends string> =
   PathKeys<S> extends never
-    ? Record<string, number | string> | undefined
+    ? Record<string, number | string | boolean> | undefined
     : {
         [K in PathKeys<S>]: string | number;
       } & Record<string, number | string>;

package/ts4.0/resourceExtendable.d.ts

@@ -15,7 +15,7 @@ export interface Extendable<O extends ResourceGenerics = {
     }, ExtendKey extends string, ExtendOptions extends PartialRestGenerics | {}>(this: R, key: ExtendKey, options: Readonly<RestEndpointExtendOptions<ExtendOptions, R['get'], EndpointToFunction<R['get']>> & ExtendOptions>): R & {
         [key in ExtendKey]: RestExtendedEndpoint<ExtendOptions, R['get']>;
     };
-    extend<R extends ResourceInterface, Get extends PartialRestGenerics = any, GetList extends PartialRestGenerics = any, Update extends PartialRestGenerics = any, PartialUpdate extends PartialRestGenerics = any, Delete extends PartialRestGenerics = any>(this: R, options: ResourceEndpointExtensions<R, Get, GetList, Update, PartialUpdate, Delete>): CustomResource<R, O, Get, GetList, Update, PartialUpdate, Delete>;
+    extend<R extends ResourceInterface, Get extends PartialRestGenerics = {}, GetList extends PartialRestGenerics = {}, Update extends PartialRestGenerics = {}, PartialUpdate extends PartialRestGenerics = {}, Delete extends PartialRestGenerics = {}>(this: R, options: ResourceEndpointExtensions<R, Get, GetList, Update, PartialUpdate, Delete>): CustomResource<R, O, Get, GetList, Update, PartialUpdate, Delete>;
     extend<R extends ResourceInterface, T extends Record<string, EndpointInterface>>(this: R, extender: (baseResource: R) => T): ExtendedResource<R, T>;
 }
 //# sourceMappingURL=resourceExtendable.d.ts.map

package/ts4.0/resourceTypes.d.ts

@@ -71,7 +71,11 @@ export interface Resource<O extends ResourceGenerics = {
         path: ShortenPath<O['path']>;
         schema: schema.Collection<[
             O['schema']
-        ], ParamToArgs<O['searchParams'] extends undefined ? KeysToArgs<ShortenPath<O['path']>> : O['searchParams'] & PathArgs<ShortenPath<O['path']>>>>;
+        ], ParamToArgs<[
+            O['searchParams']
+        ] extends [
+            undefined
+        ] ? KeysToArgs<ShortenPath<O['path']>> : O['searchParams'] & PathArgs<ShortenPath<O['path']>>>>;
         body: 'body' extends keyof O ? O['body'] : Partial<Denormalize<O['schema']>>;
         searchParams: O['searchParams'];
         movePath: O['path'];