@data-client/rest 0.18.1 → 0.18.2

package/ts4.0/RestEndpointTypes.d.ts

@@ -17,6 +17,21 @@ type ContentSchemaGuard<O> = O extends {
 } ? {
     schema?: undefined;
 } : {};
+interface RestInstanceExtenders {
+    /** Creates a child endpoint that inherits from this while overriding provided `options`.
+     * @see https://dataclient.io/rest/api/RestEndpoint#extend
+     */
+    extend<E extends RestInstanceBase, ExtendOptions extends ExtendableRestGenerics | {}>(this: E, options: Readonly<RestEndpointExtendOptions<ExtendOptions, E, E['fetch']> & ExtendOptions> & ExtendOptions & ContentSchemaGuard<ExtendOptions>): RestExtendedEndpoint<ExtendOptions, E>;
+}
+interface RestInstancePaginators {
+    /** Creates an Endpoint to append the next page extending a list for pagination
+     * @see https://dataclient.io/rest/api/RestEndpoint#paginated
+     */
+    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, A extends any[]>(this: E, removeCursor: (...args: A) => readonly [
+        ...Parameters<E>
+    ]): PaginationEndpoint<E, A>;
+    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, C extends string>(this: E, cursorField: C): PaginationFieldEndpoint<E, C>;
+}
 export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S extends Schema | undefined = any, M extends boolean | undefined = boolean | undefined, O extends {
     path: string;
     body?: any;
@@ -24,7 +39,7 @@ export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S ext
     method?: string;
 } = {
     path: string;
-}> extends EndpointInstanceInterface<F, S, M> {
+}> extends EndpointInstanceInterface<F, S, M>, RestInstanceExtenders {
     /** @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 */
@@ -60,7 +75,7 @@ export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S ext
     /** 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;
+    getRequestInit(this: any, body?: RequestInit['body'] | Record<string, unknown> | readonly unknown[]): Promise<RequestInit> | RequestInit;
     /** Called by getRequestInit to determine HTTP Headers
      * @see https://dataclient.io/rest/api/RestEndpoint#getHeaders
      */
@@ -81,10 +96,6 @@ export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S ext
      * @see https://dataclient.io/rest/api/RestEndpoint#testKey
      */
     testKey(key: string): boolean;
-    /** Creates a child endpoint that inherits from this while overriding provided `options`.
-     * @see https://dataclient.io/rest/api/RestEndpoint#extend
-     */
-    extend<E extends RestInstanceBase, ExtendOptions extends PartialRestGenerics | {}>(this: E, options: Readonly<RestEndpointExtendOptions<ExtendOptions, E, F> & ExtendOptions> & ContentSchemaGuard<ExtendOptions>): RestExtendedEndpoint<ExtendOptions, E>;
 }
 export interface RestInstance<F extends FetchFunction = FetchFunction, S extends Schema | undefined = any, M extends boolean | undefined = boolean | undefined, O extends {
     path: string;
@@ -94,21 +105,18 @@ export interface RestInstance<F extends FetchFunction = FetchFunction, S extends
     paginationField?: string;
 } = {
     path: string;
-}> extends RestInstanceBase<F, S, M, O> {
-    /** Creates an Endpoint to append the next page extending a list for pagination
-     * @see https://dataclient.io/rest/api/RestEndpoint#paginated
-     */
-    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, A extends any[]>(this: E, removeCursor: (...args: A) => readonly [
-        ...Parameters<E>
-    ]): PaginationEndpoint<E, A>;
-    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, C extends string>(this: E, cursorField: C): PaginationFieldEndpoint<E, C>;
+}> extends RestInstanceBase<F, S, M, O>, RestInstancePaginators {
     /** Concatinate the next page of results (GET)
      * @see https://dataclient.io/rest/api/RestEndpoint#getPage
      */
-    getPage: 'paginationField' extends keyof O ? O['paginationField'] extends string ? PaginationFieldEndpoint<F & {
+    getPage: 'paginationField' extends keyof O ? O['paginationField'] extends string ? PaginationFieldEndpoint<([
+        keyof F
+    ] extends [
+        never
+    ] ? (...args: any) => ReturnType<F> : F) & {
         schema: S;
         sideEffect: M;
-    } & O, O['paginationField']> : undefined : undefined;
+    } & O, Extract<O['paginationField'], string>> : undefined : undefined;
     /** Create a new item (POST) and `push` to the end
      * @see https://dataclient.io/rest/api/RestEndpoint#push
      */
@@ -146,7 +154,22 @@ export type RestEndpointExtendOptions<O extends PartialRestGenerics, E extends {
     path?: string;
     schema?: Schema;
     method?: string;
-}, F extends FetchFunction> = RestEndpointOptions<OptionsToFunction<O, E, F>, 'schema' extends keyof O ? Extract<O['schema'], Schema | undefined> : E['schema']> & Partial<Omit<E, KeyofRestEndpoint | keyof PartialRestGenerics | keyof RestEndpointOptions>>;
+}, F extends FetchFunction> = RestEndpointOptions<OptionsToFunction<O, E, F>, 'schema' extends keyof O ? Extract<O['schema'], Schema | undefined> : E['schema']> & PartialPick<E, keyof E extends ExtendOmitKeys ? never : Exclude<keyof E, ExtendOmitKeys>>;
+/** Argument I passed to process(), from Parameters<F>.
+ * Indexing a union like `[params] | []` or `[params, body] | [body]` (see ParamFetchNoBody/ParamFetchWithBody)
+ * merges position-wise, giving `undefined` where some call omits the argument.
+ * Endpoints that take no args keep `any`, so process(value, params: any) and similar still compile.
+ */
+type ProcessArg<A extends readonly any[], I extends 0 | 1> = [
+    A['length']
+] extends [
+    0
+] ? any : A[I];
+type ExtendOmitKeys = KeyofRestEndpoint | keyof PartialRestGenerics | keyof RestEndpointOptions;
+/** Partial<Pick<T, K>> as a single homomorphic mapped type */
+type PartialPick<T, K extends keyof T> = {
+    [P in K]?: T[P];
+};
 type OptionsToRestEndpoint<O extends PartialRestGenerics, E extends RestInstanceBase & {
     body?: any;
     paginationField?: string;
@@ -195,8 +218,12 @@ export type RestExtendedEndpoint<O extends PartialRestGenerics, E extends RestIn
     };
 } ? {
     paginationField: E['getPage']['paginationField'];
-} : unknown), RestInstance<(...args: Parameters<E>) => O['process'] extends {} ? Promise<ReturnType<O['process']>> : 'content' extends keyof O ? Promise<ContentReturnType<O['content'] & ContentType>> : ReturnType<E>, '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']>> & Omit<O, KeyofRestEndpoint> & Omit<E, KeyofRestEndpoint | keyof O>;
-export interface PartialRestGenerics {
+} : unknown), RestInstance<(...args: Parameters<E>) => O['process'] extends {} ? Promise<ReturnType<O['process']>> : 'content' extends keyof O ? Promise<ContentReturnType<O['content'] & ContentType>> : ReturnType<E>, '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']>> & (keyof O extends KeyofRestEndpoint ? unknown : Omit<O, KeyofRestEndpoint>) & (keyof E extends KeyofRestEndpoint ? unknown : Omit<E, KeyofRestEndpoint | keyof O>);
+/** PartialRestGenerics without `process`. Options passed to the constructor, extend() and
+ * resource().extend() are constrained by this, so RestEndpointOptions' typed `process` member is
+ * the only contextual type for process() params.
+ */
+export interface ExtendableRestGenerics {
     /** @see https://dataclient.io/rest/api/RestEndpoint#path */
     readonly path?: string;
     /** @see https://dataclient.io/rest/api/RestEndpoint#schema */
@@ -211,11 +238,13 @@ export interface PartialRestGenerics {
     searchParams?: any;
     /** @see https://dataclient.io/rest/api/RestEndpoint#paginationfield */
     readonly paginationField?: string;
-    /** @see https://dataclient.io/rest/api/RestEndpoint#process */
-    process?(value: any, ...args: any): any;
     /** @see https://dataclient.io/rest/api/RestEndpoint#content */
     readonly content?: ContentType;
 }
+export interface PartialRestGenerics extends ExtendableRestGenerics {
+    /** @see https://dataclient.io/rest/api/RestEndpoint#process */
+    process?(value: any, ...args: any): any;
+}
 /** Generic types when constructing a RestEndpoint
  *
  * @see https://dataclient.io/rest/api/RestEndpoint#inheritance
@@ -223,6 +252,10 @@ export interface PartialRestGenerics {
 export interface RestGenerics extends PartialRestGenerics {
     readonly path: string;
 }
+/** RestGenerics without `process`; see ExtendableRestGenerics */
+interface ConstructorRestGenerics extends ExtendableRestGenerics {
+    readonly path: string;
+}
 export type PaginationEndpoint<E extends FetchFunction & RestGenerics & {
     sideEffect?: boolean | undefined;
 }, A extends any[]> = RestInstanceBase<ParamFetchNoBody<A[0], ResolveType<E>>, E['schema'], E['sideEffect'], Pick<E, 'path' | 'searchParams' | 'body'> & {
@@ -340,6 +373,8 @@ export interface RestEndpointOptions<F extends FetchFunction = FetchFunction, S
     fetch?: F;
     key?(...args: Parameters<F>): string;
     url?(...args: Parameters<F>): string;
+    /** @see https://dataclient.io/rest/api/RestEndpoint#process */
+    process?(value: any, params: ProcessArg<Parameters<F>, 0>, body: ProcessArg<Parameters<F>, 1>, ...rest: any[]): any;
     update?: EndpointUpdateFunction<F, S>;
 }
 export type RestEndpointConstructorOptions<O extends RestGenerics = any> = RestEndpointOptions<RestFetch<unknown extends O ? any : 'searchParams' extends keyof O ? [
@@ -364,7 +399,7 @@ export interface RestEndpointConstructor {
      *
      * @see https://dataclient.io/rest/api/RestEndpoint
      */
-    new <O extends RestGenerics = any>({ method, sideEffect, name, ...options }: RestEndpointConstructorOptions<O> & Readonly<O> & ContentSchemaGuard<O>): RestEndpoint<O>;
+    new <O extends ConstructorRestGenerics = any>({ method, sideEffect, name, ...options }: RestEndpointConstructorOptions<O> & Readonly<O> & O & ContentSchemaGuard<O>): RestEndpoint<O>;
     readonly prototype: RestInstanceBase;
 }
 export type MethodToSide<M> = M extends string ? M extends 'GET' ? undefined : true : undefined;

package/ts4.0/extractCollection.d.ts

@@ -1,13 +1,20 @@
 import { Schema, schema } from '@data-client/endpoint';
 import { ExtractObject } from './extractObject.js';
 export default function extractCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined>(s: S, mapper: M): ExtractCollection<S> | undefined;
+/** Searches wrappers like Query and Lazy through their `schema` (Entity classes have a `prototype`) */
 export type ExtractCollection<S extends Schema | undefined> = S extends ({
     push: any;
     unshift: any;
     assign: any;
     remove: any;
     schema: Schema;
-}) ? S : S extends schema.Object<infer T> ? ExtractObject<T> : S extends Exclude<Schema, {
+}) ? S : S extends schema.Object<infer T> ? ExtractObject<T> : S extends {
+    schema: infer Q;
+    denormalize: any;
+    prototype?: undefined;
+} ? ExtractObject<{
+    schema: Q;
+}> : S extends Exclude<Schema, {
     [K: string]: any;
 }> ? never : S extends {
     [K: string]: Schema;

package/ts4.0/mapCollection.d.ts

@@ -1,16 +1,11 @@
-import { Schema, schema } from '@data-client/endpoint';
-export default function mapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined>(s: S, mapper: M): S extends schema.Collection ? ReturnType<typeof mapper<S>> : S extends schema.Object<infer T> ? {
-    [K in keyof T]: T[K] extends Schema ? typeof mapCollection<M, T[K]> : T[K];
-} : S extends {
-    [K: string]: any;
-} ? {
-    [K in keyof S]: S[K] extends Schema ? typeof mapCollection<M, S[K]> : S[K];
-} : S;
-type MapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined> = S extends schema.Collection ? ReturnType<M> : S extends schema.Object<infer T> ? MapCollection<M, T> : S extends {
-    [K: string]: any;
-} ? MapObject<M, S> : never;
-export type MapObject<M extends (collection: schema.Collection) => any, S extends Record<string, any>> = {
-    [K in keyof S]: S[K] extends Schema ? MapCollection<M, S[K]> : S[K];
-};
-export {};
-//# sourceMappingURL=mapCollection.d.ts.map
+import { Schema, schema } from '@data-client/endpoint';
+export default function mapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined>(s: S, mapper: M): S extends schema.Collection | schema.Object<any> | {
+    [K: string]: any;
+} ? MapCollection<M, S> : S;
+type MapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined> = S extends schema.Collection ? ReturnType<M> : S extends schema.Object<infer T> ? MapObject<M, T> : S extends {
+    [K: string]: any;
+} ? MapObject<M, S> : never;
+export type MapObject<M extends (collection: schema.Collection) => any, S extends Record<string, any>> = {
+    [K in keyof S]: S[K] extends Schema ? MapCollection<M, S[K]> : S[K];
+};
+export {};

package/ts4.0/resource.d.ts

@@ -3,5 +3,5 @@ import { ResourceGenerics, ResourceOptions, Resource } from './resourceTypes.js'
  *
  * @see https://dataclient.io/rest/api/resource
  */
-export default function resource<O extends ResourceGenerics>({ path, schema, Endpoint, Collection, nonFilterArgumentKeys, optimistic, paginationField, ...extraOptions }: Readonly<O> & ResourceOptions): Resource<O>;
+export default function resource<O extends ResourceGenerics>({ path, schema, Endpoint, Collection, nonFilterArgumentKeys, optimistic, paginationField, ...extraOptions }: Readonly<O> & O & ResourceOptions): Resource<O>;
 //# sourceMappingURL=resource.d.ts.map

package/ts4.0/resourceExtendable.d.ts

@@ -2,20 +2,20 @@ import type { EndpointInterface, EndpointToFunction } from '@data-client/endpoin
 import type { ResourcePath } from './pathTypes.js';
 import type { ResourceExtension, ResourceEndpointExtensions, CustomResource, ExtendedResource } from './resourceExtensionTypes.js';
 import type { ResourceGenerics, ResourceInterface } from './resourceTypes.js';
-import type { PartialRestGenerics, RestEndpointExtendOptions, RestExtendedEndpoint, RestInstanceBase } from './RestEndpoint.js';
+import type { ExtendableRestGenerics, RestEndpointExtendOptions, RestExtendedEndpoint, RestInstanceBase } from './RestEndpoint.js';
 export interface Extendable<O extends ResourceGenerics = {
     path: ResourcePath;
     schema: any;
 }> {
     extend<R extends {
         [K in ExtendKey]: RestInstanceBase;
-    }, ExtendKey extends Exclude<Extract<keyof R, string>, 'extend'>, ExtendOptions extends PartialRestGenerics | {}>(this: R, key: ExtendKey, options: Readonly<RestEndpointExtendOptions<ExtendOptions, R[ExtendKey], EndpointToFunction<R[ExtendKey]>> & ExtendOptions>): ResourceExtension<R, ExtendKey, ExtendOptions>;
+    }, ExtendKey extends Exclude<Extract<keyof R, string>, 'extend'>, ExtendOptions extends ExtendableRestGenerics | {}>(this: R, key: ExtendKey, options: Readonly<RestEndpointExtendOptions<ExtendOptions, R[ExtendKey], EndpointToFunction<R[ExtendKey]>> & ExtendOptions> & ExtendOptions): ResourceExtension<R, ExtendKey, ExtendOptions>;
     extend<R extends {
         get: RestInstanceBase;
-    }, ExtendKey extends string, ExtendOptions extends PartialRestGenerics | {}>(this: R, key: ExtendKey, options: Readonly<RestEndpointExtendOptions<ExtendOptions, R['get'], EndpointToFunction<R['get']>> & ExtendOptions>): R & {
+    }, ExtendKey extends string, ExtendOptions extends ExtendableRestGenerics | {}>(this: R, key: ExtendKey, options: Readonly<RestEndpointExtendOptions<ExtendOptions, R['get'], EndpointToFunction<R['get']>> & ExtendOptions> & ExtendOptions): R & {
         [key in ExtendKey]: RestExtendedEndpoint<ExtendOptions, R['get']>;
     };
-    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, Get extends ExtendableRestGenerics = {}, GetList extends ExtendableRestGenerics = {}, Update extends ExtendableRestGenerics = {}, PartialUpdate extends ExtendableRestGenerics = {}, Delete extends ExtendableRestGenerics = {}>(this: R, options: ResourceEndpointExtensions<R, Get, GetList, Update, PartialUpdate, Delete>): CustomResource<R, O, Get, GetList, Update, PartialUpdate, Delete> & Omit<R, keyof ResourceInterface | 'extend'>;
     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/resourceExtensionTypes.d.ts

@@ -3,7 +3,7 @@ import { OptionsToFunction } from './OptionsToFunction.js';
 import type { ResourcePath } from './pathTypes.js';
 import { Extendable } from './resourceExtendable.js';
 import { ResourceGenerics, ResourceInterface } from './resourceTypes.js';
-import type { PartialRestGenerics, RestExtendedEndpoint, RestInstanceBase, RestEndpointOptions } from './RestEndpoint.js';
+import type { ExtendableRestGenerics, PartialRestGenerics, RestExtendedEndpoint, RestInstanceBase, RestEndpointOptions } from './RestEndpoint.js';
 export type ResourceExtension<R extends {
     [K in ExtendKey]: RestInstanceBase;
 }, ExtendKey extends Exclude<Extract<keyof R, string>, 'extend'>, O extends PartialRestGenerics | {}> = {
@@ -23,11 +23,11 @@ export interface CustomResource<R extends ResourceInterface, O extends ResourceG
     delete: unknown extends Delete ? R['delete'] : PartialRestGenerics extends Delete ? R['delete'] : RestExtendedEndpoint<Delete, R['delete']>;
 }
 export type ExtendedResource<R extends ResourceInterface, T extends Record<string, EndpointInterface>> = Omit<R, keyof T> & T;
-export interface ResourceEndpointExtensions<R extends ResourceInterface, Get extends PartialRestGenerics = {}, GetList extends PartialRestGenerics = {}, Update extends PartialRestGenerics = {}, PartialUpdate extends PartialRestGenerics = {}, Delete extends PartialRestGenerics = {}> {
-    readonly get?: RestEndpointOptions<unknown extends Get ? EndpointToFunction<R['get']> : OptionsToFunction<Get, R['get'], EndpointToFunction<R['get']>>, R['get']['schema']> & Readonly<Get>;
-    readonly getList?: RestEndpointOptions<unknown extends GetList ? EndpointToFunction<R['getList']> : OptionsToFunction<GetList, R['getList'], EndpointToFunction<R['getList']>>, R['getList']['schema']> & Readonly<GetList>;
-    readonly update?: RestEndpointOptions<unknown extends Update ? EndpointToFunction<R['update']> : OptionsToFunction<Update, R['update'], EndpointToFunction<R['update']>>, R['update']['schema']> & Readonly<Update>;
-    readonly partialUpdate?: RestEndpointOptions<unknown extends PartialUpdate ? EndpointToFunction<R['partialUpdate']> : OptionsToFunction<PartialUpdate, R['partialUpdate'], EndpointToFunction<R['partialUpdate']>>, R['partialUpdate']['schema']> & Readonly<PartialUpdate>;
-    readonly delete?: RestEndpointOptions<unknown extends Delete ? EndpointToFunction<R['delete']> : OptionsToFunction<Delete, R['delete'], EndpointToFunction<R['delete']>>, R['delete']['schema']> & Readonly<Delete>;
+export interface ResourceEndpointExtensions<R extends ResourceInterface, Get extends ExtendableRestGenerics = {}, GetList extends ExtendableRestGenerics = {}, Update extends ExtendableRestGenerics = {}, PartialUpdate extends ExtendableRestGenerics = {}, Delete extends ExtendableRestGenerics = {}> {
+    readonly get?: RestEndpointOptions<unknown extends Get ? EndpointToFunction<R['get']> : OptionsToFunction<Get, R['get'], EndpointToFunction<R['get']>>, R['get']['schema']> & Readonly<Get> & Get;
+    readonly getList?: RestEndpointOptions<unknown extends GetList ? EndpointToFunction<R['getList']> : OptionsToFunction<GetList, R['getList'], EndpointToFunction<R['getList']>>, R['getList']['schema']> & Readonly<GetList> & GetList;
+    readonly update?: RestEndpointOptions<unknown extends Update ? EndpointToFunction<R['update']> : OptionsToFunction<Update, R['update'], EndpointToFunction<R['update']>>, R['update']['schema']> & Readonly<Update> & Update;
+    readonly partialUpdate?: RestEndpointOptions<unknown extends PartialUpdate ? EndpointToFunction<R['partialUpdate']> : OptionsToFunction<PartialUpdate, R['partialUpdate'], EndpointToFunction<R['partialUpdate']>>, R['partialUpdate']['schema']> & Readonly<PartialUpdate> & PartialUpdate;
+    readonly delete?: RestEndpointOptions<unknown extends Delete ? EndpointToFunction<R['delete']> : OptionsToFunction<Delete, R['delete'], EndpointToFunction<R['delete']>>, R['delete']['schema']> & Readonly<Delete> & Delete;
 }
 //# sourceMappingURL=resourceExtensionTypes.d.ts.map

package/ts4.0/resourceTypes.d.ts

@@ -99,14 +99,14 @@ export interface Resource<O extends ResourceGenerics = {
         schema: schema.Collection<[
             O['schema']
         ]>['push'];
-        body: 'body' extends keyof O ? O['body'] : Partial<Denormalize<O['schema']>>;
+        body: CreateBody<O> | CreateBody<O>[] | FormData;
         searchParams: O['searchParams'];
     }> : MutateEndpoint<{
         path: ShortenPath<O['path']>;
         schema: schema.Collection<[
             O['schema']
         ]>['push'];
-        body: 'body' extends keyof O ? O['body'] : Partial<Denormalize<O['schema']>>;
+        body: CreateBody<O> | CreateBody<O>[] | FormData;
     }>;
     /** Update an item (PUT)
      *
@@ -151,4 +151,10 @@ export interface ResourceInterface {
     partialUpdate: RestInstanceBase;
     delete: RestInstanceBase;
 }
+/** Matches getList.push's body, since create is getList.push at runtime */
+type CreateBody<O extends {
+    body?: any;
+    schema: Schema;
+}> = 'body' extends keyof O ? O['body'] : Partial<Denormalize<O['schema']>>;
+export {};
 //# sourceMappingURL=resourceTypes.d.ts.map

package/ts4.0/test-fixtures.d.ts

@@ -19,10 +19,10 @@ export declare const articlesPages: {
         content: string;
         tags: string[];
     } | {
+        tags?: undefined;
         id: number;
         title: string;
         content: string;
-        tags?: undefined;
     })[];
 };
 export declare const users: {
@@ -42,6 +42,7 @@ export declare const nested: ({
         email?: undefined;
     };
 } | {
+    tags?: undefined;
     id: number;
     title: string;
     content: string;
@@ -50,7 +51,6 @@ export declare const nested: ({
         username: string;
         email: string;
     };
-    tags?: undefined;
 })[];
 export declare const moreNested: ({
     id: number;
@@ -58,11 +58,12 @@ export declare const moreNested: ({
     content: string;
     tags: string[];
     author: {
+        email?: undefined;
         id: number;
         username: string;
-        email?: undefined;
     };
 } | {
+    tags?: undefined;
     id: number;
     title: string;
     content: string;
@@ -71,7 +72,6 @@ export declare const moreNested: ({
         username: string;
         email: string;
     };
-    tags?: undefined;
 })[];
 export declare const valuesFixture: {
     first: {
@@ -101,6 +101,7 @@ export declare const paginatedFirstPage: {
                 email?: undefined;
             };
         } | {
+            tags?: undefined;
             id: number;
             title: string;
             content: string;
@@ -109,7 +110,6 @@ export declare const paginatedFirstPage: {
                 username: string;
                 email: string;
             };
-            tags?: undefined;
         })[];
     };
 };
@@ -121,11 +121,12 @@ export declare const paginatedSecondPage: {
             content: string;
             tags: string[];
             author: {
+                email?: undefined;
                 id: number;
                 username: string;
-                email?: undefined;
             };
         } | {
+            tags?: undefined;
             id: number;
             title: string;
             content: string;
@@ -134,7 +135,6 @@ export declare const paginatedSecondPage: {
                 username: string;
                 email: string;
             };
-            tags?: undefined;
         })[];
     };
 };

package/ts4.1/RestEndpointTypes.d.ts

@@ -17,6 +17,21 @@ type ContentSchemaGuard<O> = O extends {
 } ? {
     schema?: undefined;
 } : {};
+interface RestInstanceExtenders {
+    /** Creates a child endpoint that inherits from this while overriding provided `options`.
+     * @see https://dataclient.io/rest/api/RestEndpoint#extend
+     */
+    extend<E extends RestInstanceBase, ExtendOptions extends ExtendableRestGenerics | {}>(this: E, options: Readonly<RestEndpointExtendOptions<ExtendOptions, E, E['fetch']> & ExtendOptions> & ExtendOptions & ContentSchemaGuard<ExtendOptions>): RestExtendedEndpoint<ExtendOptions, E>;
+}
+interface RestInstancePaginators {
+    /** Creates an Endpoint to append the next page extending a list for pagination
+     * @see https://dataclient.io/rest/api/RestEndpoint#paginated
+     */
+    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, A extends any[]>(this: E, removeCursor: (...args: A) => readonly [
+        ...Parameters<E>
+    ]): PaginationEndpoint<E, A>;
+    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, C extends string>(this: E, cursorField: C): PaginationFieldEndpoint<E, C>;
+}
 export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S extends Schema | undefined = any, M extends boolean | undefined = boolean | undefined, O extends {
     path: string;
     body?: any;
@@ -24,7 +39,7 @@ export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S ext
     method?: string;
 } = {
     path: string;
-}> extends EndpointInstanceInterface<F, S, M> {
+}> extends EndpointInstanceInterface<F, S, M>, RestInstanceExtenders {
     /** @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 */
@@ -60,7 +75,7 @@ export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S ext
     /** 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;
+    getRequestInit(this: any, body?: RequestInit['body'] | Record<string, unknown> | readonly unknown[]): Promise<RequestInit> | RequestInit;
     /** Called by getRequestInit to determine HTTP Headers
      * @see https://dataclient.io/rest/api/RestEndpoint#getHeaders
      */
@@ -81,10 +96,6 @@ export interface RestInstanceBase<F extends FetchFunction = FetchFunction, S ext
      * @see https://dataclient.io/rest/api/RestEndpoint#testKey
      */
     testKey(key: string): boolean;
-    /** Creates a child endpoint that inherits from this while overriding provided `options`.
-     * @see https://dataclient.io/rest/api/RestEndpoint#extend
-     */
-    extend<E extends RestInstanceBase, ExtendOptions extends PartialRestGenerics | {}>(this: E, options: Readonly<RestEndpointExtendOptions<ExtendOptions, E, F> & ExtendOptions> & ContentSchemaGuard<ExtendOptions>): RestExtendedEndpoint<ExtendOptions, E>;
 }
 export interface RestInstance<F extends FetchFunction = FetchFunction, S extends Schema | undefined = any, M extends boolean | undefined = boolean | undefined, O extends {
     path: string;
@@ -94,21 +105,18 @@ export interface RestInstance<F extends FetchFunction = FetchFunction, S extends
     paginationField?: string;
 } = {
     path: string;
-}> extends RestInstanceBase<F, S, M, O> {
-    /** Creates an Endpoint to append the next page extending a list for pagination
-     * @see https://dataclient.io/rest/api/RestEndpoint#paginated
-     */
-    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, A extends any[]>(this: E, removeCursor: (...args: A) => readonly [
-        ...Parameters<E>
-    ]): PaginationEndpoint<E, A>;
-    paginated<E extends RestInstanceBase<FetchFunction, any, undefined>, C extends string>(this: E, cursorField: C): PaginationFieldEndpoint<E, C>;
+}> extends RestInstanceBase<F, S, M, O>, RestInstancePaginators {
     /** Concatinate the next page of results (GET)
      * @see https://dataclient.io/rest/api/RestEndpoint#getPage
      */
-    getPage: 'paginationField' extends keyof O ? O['paginationField'] extends string ? PaginationFieldEndpoint<F & {
+    getPage: 'paginationField' extends keyof O ? O['paginationField'] extends string ? PaginationFieldEndpoint<([
+        keyof F
+    ] extends [
+        never
+    ] ? (...args: any) => ReturnType<F> : F) & {
         schema: S;
         sideEffect: M;
-    } & O, O['paginationField']> : undefined : undefined;
+    } & O, Extract<O['paginationField'], string>> : undefined : undefined;
     /** Create a new item (POST) and `push` to the end
      * @see https://dataclient.io/rest/api/RestEndpoint#push
      */
@@ -146,7 +154,22 @@ export type RestEndpointExtendOptions<O extends PartialRestGenerics, E extends {
     path?: string;
     schema?: Schema;
     method?: string;
-}, F extends FetchFunction> = RestEndpointOptions<OptionsToFunction<O, E, F>, 'schema' extends keyof O ? Extract<O['schema'], Schema | undefined> : E['schema']> & Partial<Omit<E, KeyofRestEndpoint | keyof PartialRestGenerics | keyof RestEndpointOptions>>;
+}, F extends FetchFunction> = RestEndpointOptions<OptionsToFunction<O, E, F>, 'schema' extends keyof O ? Extract<O['schema'], Schema | undefined> : E['schema']> & PartialPick<E, keyof E extends ExtendOmitKeys ? never : Exclude<keyof E, ExtendOmitKeys>>;
+/** Argument I passed to process(), from Parameters<F>.
+ * Indexing a union like `[params] | []` or `[params, body] | [body]` (see ParamFetchNoBody/ParamFetchWithBody)
+ * merges position-wise, giving `undefined` where some call omits the argument.
+ * Endpoints that take no args keep `any`, so process(value, params: any) and similar still compile.
+ */
+type ProcessArg<A extends readonly any[], I extends 0 | 1> = [
+    A['length']
+] extends [
+    0
+] ? any : A[I];
+type ExtendOmitKeys = KeyofRestEndpoint | keyof PartialRestGenerics | keyof RestEndpointOptions;
+/** Partial<Pick<T, K>> as a single homomorphic mapped type */
+type PartialPick<T, K extends keyof T> = {
+    [P in K]?: T[P];
+};
 type OptionsToRestEndpoint<O extends PartialRestGenerics, E extends RestInstanceBase & {
     body?: any;
     paginationField?: string;
@@ -195,8 +218,12 @@ export type RestExtendedEndpoint<O extends PartialRestGenerics, E extends RestIn
     };
 } ? {
     paginationField: E['getPage']['paginationField'];
-} : unknown), RestInstance<(...args: Parameters<E>) => O['process'] extends {} ? Promise<ReturnType<O['process']>> : 'content' extends keyof O ? Promise<ContentReturnType<O['content'] & ContentType>> : ReturnType<E>, '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']>> & Omit<O, KeyofRestEndpoint> & Omit<E, KeyofRestEndpoint | keyof O>;
-export interface PartialRestGenerics {
+} : unknown), RestInstance<(...args: Parameters<E>) => O['process'] extends {} ? Promise<ReturnType<O['process']>> : 'content' extends keyof O ? Promise<ContentReturnType<O['content'] & ContentType>> : ReturnType<E>, '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']>> & (keyof O extends KeyofRestEndpoint ? unknown : Omit<O, KeyofRestEndpoint>) & (keyof E extends KeyofRestEndpoint ? unknown : Omit<E, KeyofRestEndpoint | keyof O>);
+/** PartialRestGenerics without `process`. Options passed to the constructor, extend() and
+ * resource().extend() are constrained by this, so RestEndpointOptions' typed `process` member is
+ * the only contextual type for process() params.
+ */
+export interface ExtendableRestGenerics {
     /** @see https://dataclient.io/rest/api/RestEndpoint#path */
     readonly path?: string;
     /** @see https://dataclient.io/rest/api/RestEndpoint#schema */
@@ -211,11 +238,13 @@ export interface PartialRestGenerics {
     searchParams?: any;
     /** @see https://dataclient.io/rest/api/RestEndpoint#paginationfield */
     readonly paginationField?: string;
-    /** @see https://dataclient.io/rest/api/RestEndpoint#process */
-    process?(value: any, ...args: any): any;
     /** @see https://dataclient.io/rest/api/RestEndpoint#content */
     readonly content?: ContentType;
 }
+export interface PartialRestGenerics extends ExtendableRestGenerics {
+    /** @see https://dataclient.io/rest/api/RestEndpoint#process */
+    process?(value: any, ...args: any): any;
+}
 /** Generic types when constructing a RestEndpoint
  *
  * @see https://dataclient.io/rest/api/RestEndpoint#inheritance
@@ -223,6 +252,10 @@ export interface PartialRestGenerics {
 export interface RestGenerics extends PartialRestGenerics {
     readonly path: string;
 }
+/** RestGenerics without `process`; see ExtendableRestGenerics */
+interface ConstructorRestGenerics extends ExtendableRestGenerics {
+    readonly path: string;
+}
 export type PaginationEndpoint<E extends FetchFunction & RestGenerics & {
     sideEffect?: boolean | undefined;
 }, A extends any[]> = RestInstanceBase<ParamFetchNoBody<A[0], ResolveType<E>>, E['schema'], E['sideEffect'], Pick<E, 'path' | 'searchParams' | 'body'> & {
@@ -340,6 +373,8 @@ export interface RestEndpointOptions<F extends FetchFunction = FetchFunction, S
     fetch?: F;
     key?(...args: Parameters<F>): string;
     url?(...args: Parameters<F>): string;
+    /** @see https://dataclient.io/rest/api/RestEndpoint#process */
+    process?(value: any, params: ProcessArg<Parameters<F>, 0>, body: ProcessArg<Parameters<F>, 1>, ...rest: any[]): any;
     update?: EndpointUpdateFunction<F, S>;
 }
 export type RestEndpointConstructorOptions<O extends RestGenerics = any> = RestEndpointOptions<RestFetch<unknown extends O ? any : 'searchParams' extends keyof O ? [
@@ -364,7 +399,7 @@ export interface RestEndpointConstructor {
      *
      * @see https://dataclient.io/rest/api/RestEndpoint
      */
-    new <O extends RestGenerics = any>({ method, sideEffect, name, ...options }: RestEndpointConstructorOptions<O> & Readonly<O> & ContentSchemaGuard<O>): RestEndpoint<O>;
+    new <O extends ConstructorRestGenerics = any>({ method, sideEffect, name, ...options }: RestEndpointConstructorOptions<O> & Readonly<O> & O & ContentSchemaGuard<O>): RestEndpoint<O>;
     readonly prototype: RestInstanceBase;
 }
 export type MethodToSide<M> = M extends string ? M extends 'GET' ? undefined : true : undefined;

package/ts4.1/extractCollection.d.ts

@@ -1,13 +1,20 @@
 import { Schema, schema } from '@data-client/endpoint';
 import { ExtractObject } from './extractObject.js';
 export default function extractCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined>(s: S, mapper: M): ExtractCollection<S> | undefined;
+/** Searches wrappers like Query and Lazy through their `schema` (Entity classes have a `prototype`) */
 export type ExtractCollection<S extends Schema | undefined> = S extends ({
     push: any;
     unshift: any;
     assign: any;
     remove: any;
     schema: Schema;
-}) ? S : S extends schema.Object<infer T> ? ExtractObject<T> : S extends Exclude<Schema, {
+}) ? S : S extends schema.Object<infer T> ? ExtractObject<T> : S extends {
+    schema: infer Q;
+    denormalize: any;
+    prototype?: undefined;
+} ? ExtractObject<{
+    schema: Q;
+}> : S extends Exclude<Schema, {
     [K: string]: any;
 }> ? never : S extends {
     [K: string]: Schema;

package/ts4.1/mapCollection.d.ts

@@ -1,16 +1,11 @@
-import { Schema, schema } from '@data-client/endpoint';
-export default function mapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined>(s: S, mapper: M): S extends schema.Collection ? ReturnType<typeof mapper<S>> : S extends schema.Object<infer T> ? {
-    [K in keyof T]: T[K] extends Schema ? typeof mapCollection<M, T[K]> : T[K];
-} : S extends {
-    [K: string]: any;
-} ? {
-    [K in keyof S]: S[K] extends Schema ? typeof mapCollection<M, S[K]> : S[K];
-} : S;
-type MapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined> = S extends schema.Collection ? ReturnType<M> : S extends schema.Object<infer T> ? MapCollection<M, T> : S extends {
-    [K: string]: any;
-} ? MapObject<M, S> : never;
-export type MapObject<M extends (collection: schema.Collection) => any, S extends Record<string, any>> = {
-    [K in keyof S]: S[K] extends Schema ? MapCollection<M, S[K]> : S[K];
-};
-export {};
-//# sourceMappingURL=mapCollection.d.ts.map
+import { Schema, schema } from '@data-client/endpoint';
+export default function mapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined>(s: S, mapper: M): S extends schema.Collection | schema.Object<any> | {
+    [K: string]: any;
+} ? MapCollection<M, S> : S;
+type MapCollection<M extends <C extends schema.Collection>(collection: C) => any, S extends Schema | undefined> = S extends schema.Collection ? ReturnType<M> : S extends schema.Object<infer T> ? MapObject<M, T> : S extends {
+    [K: string]: any;
+} ? MapObject<M, S> : never;
+export type MapObject<M extends (collection: schema.Collection) => any, S extends Record<string, any>> = {
+    [K in keyof S]: S[K] extends Schema ? MapCollection<M, S[K]> : S[K];
+};
+export {};