svelte-ag 1.2.8 → 1.3.0

package/dist/api/form.svelte.d.ts

@@ -1,6 +1,6 @@
 import { superForm } from 'sveltekit-superforms';
 import type { SuperForm } from 'sveltekit-superforms';
-import type { ApiRequestFunction, HTTPMethod, ApiEndpoints, ApiInput, ApiSuccessBody, ApiErrorBody, ApiSchema } from 'ts-ag';
+import type { ApiRequestFunction, ApiEndpoints, ApiInput, ApiSuccessBody, ApiErrorBody, ApiEndpointContract } from 'ts-ag';
 export type ValidInput<E extends ApiEndpoints, P extends E['path'], M extends E['method']> = NonNullable<ApiInput<E, P, M>>;
 type FormProps<T extends ApiEndpoints, P extends T['path'], M extends Extract<T, {
     path: P;
@@ -16,7 +16,7 @@ type FormActionArgs<T extends ApiEndpoints, P extends T['path'], M extends Extra
 /**
  * Creates a strongly-typed form factory for an API schema.
  *
- * Call the returned function with `{ path, method, ... }` to get a `SuperForm`
+ * Call the returned function with `{ endpoint, ... }` to get a `SuperForm`
  * that:
  * - Validates using the Valibot schema for the given endpoint.
  * - Submits via the provided `request` function on each valid update.
@@ -26,10 +26,8 @@ type FormActionArgs<T extends ApiEndpoints, P extends T['path'], M extends Extra
 export type ApiRequestForm<API extends ApiEndpoints> = <Path extends API['path'], Method extends Extract<API, {
     path: Path;
 }>['method']>(a: {
-    /** API path key used to select a schema and to call `request(path, method, data)` */
-    path: Path;
-    /** HTTP method used to select a schema and to call `request(path, method, data)` */
-    method: Method;
+    /** Endpoint contract used to select a schema and submit the request. */
+    endpoint: ApiEndpointContract<API, Path, Method>;
     /**
      * Optional lifecycle hooks for consumers.
      * - `beforeRequest`: called before sending the api call
@@ -89,11 +87,10 @@ export type ApiRequestForm<API extends ApiEndpoints> = <Path extends API['path']
 /**
  * Build an endpoint-specific Superforms factory.
  *
- * @param schemas A `{[path]: {[method]: schema}}` mapping used to pick the Valibot schema for each endpoint.
- * @param request An API request function that performs `(path, method, data)` and returns a fetch-like `Response`.
+ * @param request An API request function that performs `(endpoint, data)` and returns a fetch-like `Response`.
  *
- * @returns A function that creates a `SuperForm` for a particular `{path, method}` pair.
+ * @returns A function that creates a `SuperForm` for a particular endpoint contract.
  */
-export declare function createFormFunction<API extends ApiEndpoints>(schemas: Partial<Record<API['path'], Partial<Record<HTTPMethod, ApiSchema>>>>, request: ApiRequestFunction<API>): ApiRequestForm<API>;
+export declare function createFormFunction<API extends ApiEndpoints>(request: ApiRequestFunction<API>): ApiRequestForm<API>;
 export {};
 //# sourceMappingURL=form.svelte.d.ts.map

package/dist/api/form.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.svelte.d.ts","sourceRoot":"","sources":["../../src/lib/api/form.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAkC,MAAM,sBAAsB,CAAC;AACjF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,KAAK,EACV,kBAAkB,EAClB,UAAU,EACV,YAAY,EACZ,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,SAAS,EACV,MAAM,OAAO,CAAC;AAGf,MAAM,MAAM,UAAU,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,WAAW,CACtG,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAClB,CAAC;AAEF,KAAK,SAAS,CAAC,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,WAAW,CACpH,UAAU,CAAC,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrD,CAAC;AAEF,KAAK,gBAAgB,CACnB,CAAC,SAAS,YAAY,EACtB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EACnB,CAAC,SAAS,OAAO,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,IACzC,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE/D,KAAK,cAAc,CACjB,CAAC,SAAS,YAAY,EACtB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,EACnB,CAAC,SAAS,OAAO,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EAC3C,CAAC,GAAG,SAAS,IACX,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,CAAC;AAc5C;;;;;;;;;GASG;AACH,MAAM,MAAM,cAAc,CACxB,GAAG,SAAS,YAAY,IAEtB,CAAC,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;IACvF,qFAAqF;IACrF,IAAI,EAAE,IAAI,CAAC;IAEX,oFAAoF;IACpF,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE;QACR,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QAClF,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACjH,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAC7G,CAAC;IAEF;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpD;;;;;;;;;;;;;;;;;OAiBG;IACH,IAAI,CAAC,EAAE;QACL;;;;;WAKG;QACH,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAE9E;;;WAGG;QACH,GAAG,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;KACtD,CAAC;IAEF;;;OAGG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAO5E,KAAK,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAE/C;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,SAAS,YAAY,EACzD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7E,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,GAC/B,cAAc,CAAC,GAAG,CAAC,CA0GrB"}
+{"version":3,"file":"form.svelte.d.ts","sourceRoot":"","sources":["../../src/lib/api/form.svelte.ts"],"names":[],"mappings":"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"}

package/dist/api/form.svelte.js

@@ -7,16 +7,13 @@ import { safeParse, safeParseAsync } from 'valibot';
 /**
  * Build an endpoint-specific Superforms factory.
  *
- * @param schemas A `{[path]: {[method]: schema}}` mapping used to pick the Valibot schema for each endpoint.
- * @param request An API request function that performs `(path, method, data)` and returns a fetch-like `Response`.
+ * @param request An API request function that performs `(endpoint, data)` and returns a fetch-like `Response`.
  *
- * @returns A function that creates a `SuperForm` for a particular `{path, method}` pair.
+ * @returns A function that creates a `SuperForm` for a particular endpoint contract.
  */
-export function createFormFunction(schemas, request) {
-    return ({ path, method, actions, defaultValue, formProps, bind }) => {
-        const schema = schemas[path]?.[method];
-        if (schema === undefined)
-            throw new Error('Invalid schema for form');
+export function createFormFunction(request) {
+    return ({ endpoint, actions, defaultValue, formProps, bind }) => {
+        const schema = endpoint.schema;
         const defaultFormData = defaults(defaultValue, valibot(schema));
         const boundFormData = bind && schema.async === false
             ? safeParse(schema, bind.get(defaultFormData)).output
@@ -49,7 +46,7 @@ export function createFormFunction(schemas, request) {
                 if (!props.form.valid)
                     return;
                 // console.log('onUpdate: sending data', form.data);
-                const res = await request(path, method, props.form.data);
+                const res = await request(endpoint, props.form.data);
                 if (res.ok === false) {
                     const body = (await res.json());
                     // TODO set some kind of overall form error if there is no field

package/dist/api/query/entrypoint.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { ApiEndpoints, ApiRequestFunction, ApiInput, ApiResponse } from 'ts-ag';
+import type { ApiEndpointContract, ApiEndpoints, ApiRequestFunction, ApiInput, ApiResponse } from 'ts-ag';
 import { Query } from './query.svelte.js';
 export type BatchDetails<API extends ApiEndpoints, Path extends API['path'], Method extends Extract<API, {
     path: Path;
@@ -8,12 +8,20 @@ export type BatchDetails<API extends ApiEndpoints, Path extends API['path'], Met
     unBatchOutput: (inputs: ApiInput<API, Path, Method>[], output: ApiResponse<API, Path, Method>) => ApiResponse<API, Path, Method>[] | Promise<ApiResponse<API, Path, Method>[]>;
 };
 export type ApiBatchDetails<API extends ApiEndpoints> = {
-    [Path in API['path']]?: {
+    [Path in API['path']]: {
         [Method in Extract<API, {
             path: Path;
-        }>['method']]?: BatchDetails<API, Path, Method>;
-    };
-};
+        }>['method']]: {
+            endpoint: ApiEndpointContract<API, Path, Method>;
+            details: BatchDetails<API, Path, Method>;
+        };
+    }[Extract<API, {
+        path: Path;
+    }>['method']];
+}[API['path']][];
+export declare function batchEndpoint<API extends ApiEndpoints, Path extends API['path'], Method extends Extract<API, {
+    path: Path;
+}>['method']>(endpoint: ApiEndpointContract<API, Path, Method>, details: BatchDetails<API, Path, Method>): ApiBatchDetails<API>[number];
 /**
  * Helper function to use once so that creating queries is easier.
  *
@@ -23,5 +31,5 @@ export type ApiBatchDetails<API extends ApiEndpoints> = {
  */
 export declare function createQueryFunction<API extends ApiEndpoints>(request: ApiRequestFunction<API>, batchDetails: ApiBatchDetails<API>): <Path extends API["path"], Method extends Extract<API, {
     path: Path;
-}>["method"]>(path: Path, method: Method, input: ApiInput<API, Path, Method>, opts?: ConstructorParameters<typeof Query<API, Path, Method>>[0]["opts"]) => Query<API, Path, Method>;
+}>["method"]>(endpoint: ApiEndpointContract<API, Path, Method>, input: ApiInput<API, Path, Method>, opts?: ConstructorParameters<typeof Query<API, Path, Method>>[0]["opts"]) => Query<API, Path, Method>;
 //# sourceMappingURL=entrypoint.svelte.d.ts.map

package/dist/api/query/entrypoint.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/query/entrypoint.svelte.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAGrF,OAAO,EAAa,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAarD,MAAM,MAAM,YAAY,CACtB,GAAG,SAAS,YAAY,EACxB,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,IACnD;IACF,QAAQ,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,MAAM,GAAG,KAAK,CAAC;IACjE,UAAU,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACnF,aAAa,EAAE,CACb,MAAM,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,EACrC,MAAM,EAAE,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,KACnC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACnF,CAAC;AAEF,MAAM,MAAM,eAAe,CAAC,GAAG,SAAS,YAAY,IAAI;KACrD,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;SACrB,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE;YAAE,IAAI,EAAE,IAAI,CAAA;SAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC;KACrF;CACF,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,SAAS,YAAY,EAC1D,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAChC,YAAY,EAAE,eAAe,CAAC,GAAG,CAAC,IAE1B,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EACrF,MAAM,IAAI,EACV,QAAQ,MAAM,EACd,OAAO,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAClC,OAAO,qBAAqB,CAAC,OAAO,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KACvE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAe5B"}
+{"version":3,"file":"entrypoint.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/query/entrypoint.svelte.ts"],"names":[],"mappings":"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"}

package/dist/api/query/entrypoint.svelte.js

@@ -1,4 +1,5 @@
 import { SvelteMap } from 'svelte/reactivity';
+import { endpointKey } from 'ts-ag';
 import { Cache } from './cache.svelte.js';
 import { Requestor, Query } from './query.svelte.js';
 import { batchQueryKey, cacheKey } from './utils.svelte.js';
@@ -8,6 +9,9 @@ const requestors = new SvelteMap();
 // Map of path_method_input to the corresponding query instance
 const queries = new SvelteMap();
 const cache = new Cache();
+export function batchEndpoint(endpoint, details) {
+    return { endpoint, details };
+}
 /**
  * Helper function to use once so that creating queries is easier.
  *
@@ -16,15 +20,17 @@ const cache = new Cache();
  *
  */
 export function createQueryFunction(request, batchDetails) {
-    return (path, method, input, opts) => {
-        const queryKey = cacheKey(path, method, input);
+    // eslint-disable-next-line
+    const batchDetailsByEndpoint = new Map(batchDetails.map((entry) => [endpointKey(entry.endpoint), entry.details]));
+    return (endpoint, input, opts) => {
+        const queryKey = cacheKey(endpoint, input);
         if (!queries.has(queryKey)) {
-            const key = batchQueryKey(path, method);
+            const key = batchQueryKey(endpoint);
             if (!requestors.has(key)) {
-                requestors.set(key, new Requestor(path, method, request, cache, batchDetails[path]?.[method]));
+                requestors.set(key, new Requestor(endpoint, request, cache, batchDetailsByEndpoint.get(key)));
             }
             const requestor = requestors.get(key);
-            queries.set(queryKey, new Query({ path, method, input, requestor, cache, opts }));
+            queries.set(queryKey, new Query({ endpoint, input, requestor, cache, opts }));
         }
         const query = queries.get(queryKey);
         return query;

package/dist/api/query/entrypoint.unit.test.js

@@ -2,10 +2,10 @@ import { createApiRequest } from 'ts-ag';
 import * as v from 'valibot';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 const API_URL = 'https://api.example.test';
-const schemas = {
-    '/users': {
-        POST: v.union([v.object({ id: v.number(), group: v.optional(v.string()) }), v.object({ ids: v.array(v.number()) })])
-    }
+const users_POST = {
+    path: '/users',
+    method: 'POST',
+    schema: v.union([v.object({ id: v.number(), group: v.optional(v.string()) }), v.object({ ids: v.array(v.number()) })])
 };
 function getUserId(input) {
     return 'id' in input ? input.id : input.ids[0];
@@ -29,35 +29,33 @@ describe('createQueryFunction', () => {
     });
     it('returns the same query instance for the same path, method, and input', async () => {
         const { createQueryFunction } = await import('./entrypoint.svelte.js');
-        const request = createApiRequest(schemas, API_URL, 'test');
-        const createQuery = createQueryFunction(request, {});
-        const query1 = createQuery('/users', 'POST', { id: 1 });
-        const query2 = createQuery('/users', 'POST', { id: 1 });
-        const query3 = createQuery('/users', 'POST', { id: 2 });
+        const request = createApiRequest(API_URL, 'test');
+        const createQuery = createQueryFunction(request, []);
+        const query1 = createQuery(users_POST, { id: 1 });
+        const query2 = createQuery(users_POST, { id: 1 });
+        const query3 = createQuery(users_POST, { id: 2 });
         expect(query1).toBe(query2);
         expect(query3).not.toBe(query1);
     });
     it('reuses requestors so separate queries can batch together', async () => {
-        const { createQueryFunction } = await import('./entrypoint.svelte.js');
+        const { batchEndpoint, createQueryFunction } = await import('./entrypoint.svelte.js');
         const fetchMock = vi.fn(async () => jsonFetchResponse({ 1: 'one', 2: 'two' }));
         vi.stubGlobal('fetch', fetchMock);
         vi.stubGlobal('fetch', fetchMock);
-        const request = createApiRequest(schemas, API_URL, 'test');
-        const createQuery = createQueryFunction(request, {
-            '/users': {
-                POST: {
-                    canBatch: () => 'users',
-                    batchInput: (inputs) => ({ ids: inputs.map(getUserId) }),
-                    unBatchOutput: async (inputs, outputs) => {
-                        return inputs.map(() => {
-                            return outputs;
-                        });
-                    }
+        const request = createApiRequest(API_URL, 'test');
+        const createQuery = createQueryFunction(request, [
+            batchEndpoint(users_POST, {
+                canBatch: () => 'users',
+                batchInput: (inputs) => ({ ids: inputs.map(getUserId) }),
+                unBatchOutput: async (inputs, outputs) => {
+                    return inputs.map(() => {
+                        return outputs;
+                    });
                 }
-            }
-        });
-        const query1 = createQuery('/users', 'POST', { id: 1 });
-        const query2 = createQuery('/users', 'POST', { id: 2 });
+            })
+        ]);
+        const query1 = createQuery(users_POST, { id: 1 });
+        const query2 = createQuery(users_POST, { id: 2 });
         const p1 = query1.request();
         const p2 = query2.request();
         await vi.advanceTimersByTimeAsync(100);

package/dist/api/query/query.svelte.d.ts

@@ -1,4 +1,4 @@
-import type { ApiEndpoints, ApiInput, ApiRequestFunction, ApiSuccessBody, ApiErrorBody, ApiResponse } from 'ts-ag';
+import type { ApiEndpointContract, ApiEndpoints, ApiInput, ApiRequestFunction, ApiSuccessBody, ApiErrorBody, ApiResponse } from 'ts-ag';
 import type { Cache } from './cache.svelte';
 import type { BatchDetails } from './entrypoint.svelte';
 export type QueryStatus = 'idle' | 'loading' | 'success' | 'error';
@@ -6,9 +6,8 @@ export declare class Query<API extends ApiEndpoints, Path extends API['path'], M
     path: Path;
 }>['method']> {
     #private;
-    constructor({ path, method, input, requestor, cache, opts }: {
-        path: Path;
-        method: Method;
+    constructor({ endpoint, input, requestor, cache, opts }: {
+        endpoint: ApiEndpointContract<API, Path, Method>;
         input: ApiInput<API, Path, Method>;
         requestor: Requestor<API, Path, Method>;
         cache: Cache;
@@ -28,7 +27,7 @@ export declare class Requestor<API extends ApiEndpoints, Path extends API['path'
     path: Path;
 }>['method']> {
     #private;
-    constructor(path: Path, method: Method, request: ApiRequestFunction<API>, _cache: Cache, batchDetails?: BatchDetails<API, Path, Method>);
+    constructor(endpoint: ApiEndpointContract<API, Path, Method>, request: ApiRequestFunction<API>, _cache: Cache, batchDetails?: BatchDetails<API, Path, Method>);
     private fetch;
     /**
      * Empties the batch queue for the id by combining the inputs.

package/dist/api/query/query.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/query/query.svelte.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,kBAAkB,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEnH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAIxD,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;AAEnE,qBAAa,KAAK,CAChB,GAAG,SAAS,YAAY,EACxB,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC;;gBAyBzC,EACV,IAAI,EACJ,MAAM,EACN,KAAK,EACL,SAAS,EACT,KAAK,EACL,IAAI,EACL,EAAE;QACD,IAAI,EAAE,IAAI,CAAC;QACX,MAAM,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,SAAS,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,KAAK,EAAE,KAAK,CAAC;QACb,IAAI,CAAC,EAAE;YACL,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1C,CAAC;KACH;IAgBK,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAyCxD,IAAI,QAAQ,WAEX;IACD,IAAI,QAAQ,YAEX;IACD,UAAU;IAMV,IAAI,MAAM,gBAET;IACD,IAAI,IAAI,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,IAAI,CAEnD;IACD,IAAI,SAAS,IAAI,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,IAAI,CAEtD;CACF;AAED,qBAAa,SAAS,CACpB,GAAG,SAAS,YAAY,EACxB,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC;;gBA6BnD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAChC,MAAM,EAAE,KAAK,EACb,YAAY,CAAC,EAAE,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC;YAelC,KAAK;IAOnB;;;OAGG;YACW,eAAe;IA6BvB,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;CAuB3F"}
+{"version":3,"file":"query.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/query/query.svelte.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,cAAc,EACd,YAAY,EACZ,WAAW,EACZ,MAAM,OAAO,CAAC;AAEf,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAIxD,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;AAEnE,qBAAa,KAAK,CAChB,GAAG,SAAS,YAAY,EACxB,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC;;gBAwBzC,EACV,QAAQ,EACR,KAAK,EACL,SAAS,EACT,KAAK,EACL,IAAI,EACL,EAAE;QACD,QAAQ,EAAE,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACjD,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,SAAS,EAAE,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QACxC,KAAK,EAAE,KAAK,CAAC;QACb,IAAI,CAAC,EAAE;YACL,KAAK,CAAC,EAAE,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1C,CAAC;KACH;IAeK,OAAO,IAAI,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAyCxD,IAAI,QAAQ,WAEX;IACD,IAAI,QAAQ,YAEX;IACD,UAAU;IAMV,IAAI,MAAM,gBAET;IACD,IAAI,IAAI,IAAI,cAAc,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,IAAI,CAEnD;IACD,IAAI,SAAS,IAAI,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,IAAI,CAEtD;CACF;AAED,qBAAa,SAAS,CACpB,GAAG,SAAS,YAAY,EACxB,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC;;gBA4BnD,QAAQ,EAAE,mBAAmB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAChD,OAAO,EAAE,kBAAkB,CAAC,GAAG,CAAC,EAChC,MAAM,EAAE,KAAK,EACb,YAAY,CAAC,EAAE,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC;YAclC,KAAK;IAOnB;;;OAGG;YACW,eAAe;IA6BvB,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;CAuB3F"}

package/dist/api/query/query.svelte.js

@@ -5,8 +5,7 @@ export class Query {
     // -------- Constants --------
     #TIMEOUT = 1000 * 60 * 5; // 5 minutes
     // -------- Set in constructor --------
-    #path;
-    #method;
+    #endpoint;
     #input;
     #inputString;
     #cacheKey;
@@ -20,15 +19,14 @@ export class Query {
     #data = $state(null);
     #errorData = $state(null);
     // -------- Functions --------
-    constructor({ path, method, input, requestor, cache, opts }) {
+    constructor({ endpoint, input, requestor, cache, opts }) {
         this.#requestor = requestor;
         this.#cache = cache;
-        this.#path = path;
-        this.#method = method;
+        this.#endpoint = endpoint;
         // if (this.#cachekey) this.#cache.deregister(this.#cachekey);
         this.#input = input;
         this.#inputString = stringify(input);
-        this.#cacheKey = cacheKey(path, method, input);
+        this.#cacheKey = cacheKey(endpoint, input);
         this.#cache.register(this.#cacheKey, opts?.cache ?? { timeout: this.#TIMEOUT });
     }
     async request() {
@@ -93,8 +91,7 @@ export class Requestor {
     // -------- Constants --------
     #batchDelay = 100;
     // -------- Set in constructor --------
-    #path;
-    #method;
+    #endpoint;
     #request;
     #canBatch;
     #batchInput;
@@ -104,9 +101,8 @@ export class Requestor {
     // -------- State --------
     #batchQueue = {};
     #batchTimers = {};
-    constructor(path, method, request, _cache, batchDetails) {
-        this.#path = path;
-        this.#method = method;
+    constructor(endpoint, request, _cache, batchDetails) {
+        this.#endpoint = endpoint;
         this.#request = request;
         this.#limiter = new RateLimiter();
         // this.#cache = cache;
@@ -120,7 +116,7 @@ export class Requestor {
         // if ('PUBLIC_ENVIRONMENT' in env && env.PUBLIC_ENVIRONMENT === 'development') {
         //   await sleep(1000);
         // }
-        return await this.#limiter.add(() => this.#request(this.#path, this.#method, input));
+        return await this.#limiter.add(() => this.#request(this.#endpoint, input));
     }
     /**
      * Empties the batch queue for the id by combining the inputs.

package/dist/api/query/query.unit.test.js

@@ -5,15 +5,15 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { Cache } from './cache.svelte.js';
 import { Query, Requestor } from './query.svelte.js';
 const API_URL = 'https://api.example.test';
-const plainSchemas = {
-    '/users': {
-        GET: v.object({ id: v.number() })
-    }
+const plainUsers_GET = {
+    path: '/users',
+    method: 'GET',
+    schema: v.object({ id: v.number() })
 };
-const batchedSchemas = {
-    '/users': {
-        POST: v.union([v.object({ id: v.number(), group: v.optional(v.string()) }), v.object({ ids: v.array(v.number()) })])
-    }
+const batchedUsers_POST = {
+    path: '/users',
+    method: 'POST',
+    schema: v.union([v.object({ id: v.number(), group: v.optional(v.string()) }), v.object({ ids: v.array(v.number()) })])
 };
 function getSingleId(input) {
     return 'id' in input ? input.id : input.ids[0];
@@ -54,16 +54,16 @@ function deferred() {
     return { promise, resolve, reject };
 }
 function createPlainRequest() {
-    return createApiRequest(plainSchemas, API_URL, 'test');
+    return createApiRequest(API_URL, 'test');
 }
 function createBatchedRequest() {
-    return createApiRequest(batchedSchemas, API_URL, 'test');
+    return createApiRequest(API_URL, 'test');
 }
 function createPlainRequestor() {
-    return new Requestor('/users', 'GET', createPlainRequest(), new Cache());
+    return new Requestor(plainUsers_GET, createPlainRequest(), new Cache());
 }
 function createBatchedRequestor(batchDetails) {
-    return new Requestor('/users', 'POST', createBatchedRequest(), new Cache(), batchDetails);
+    return new Requestor(batchedUsers_POST, createBatchedRequest(), new Cache(), batchDetails);
 }
 describe('Requestor', () => {
     beforeEach(() => {
@@ -238,8 +238,7 @@ describe('Query', () => {
         const fetchMock = vi.fn().mockReturnValue(pending.promise);
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -256,8 +255,7 @@ describe('Query', () => {
         const fetchMock = vi.fn(async () => jsonFetchResponse({ id: 1, name: 'Ada' }));
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -273,8 +271,7 @@ describe('Query', () => {
         const fetchMock = vi.fn(async () => devalueFetchResponse({ id: 1, createdAt: new Date('2024-01-01T00:00:00.000Z') }));
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -298,8 +295,7 @@ describe('Query', () => {
         const fetchMock = vi.fn(async () => withResponseOverrides(jsonFetchResponse({ id: 1 })));
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -316,8 +312,7 @@ describe('Query', () => {
         const fetchMock = vi.fn(async () => jsonFetchResponse({ id: 1, active: true }));
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -332,8 +327,7 @@ describe('Query', () => {
         const fetchMock = vi.fn(async () => jsonFetchResponse({ message: 'missing' }, 404));
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 99 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -356,8 +350,7 @@ describe('Query', () => {
         });
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -379,8 +372,7 @@ describe('Query', () => {
         });
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache()
@@ -402,8 +394,7 @@ describe('Query', () => {
         });
         vi.stubGlobal('fetch', fetchMock);
         const query = new Query({
-            path: '/users',
-            method: 'GET',
+            endpoint: plainUsers_GET,
             input: { id: 1 },
             requestor: createPlainRequestor(),
             cache: new Cache(),

package/dist/api/query/utils.svelte.d.ts

@@ -1,3 +1,9 @@
-export declare function batchQueryKey(path: string, method: string): string;
-export declare function cacheKey(path: string, method: string, input: any): string;
+export declare function batchQueryKey(endpoint: {
+    path: string;
+    method: string;
+}): string;
+export declare function cacheKey(endpoint: {
+    path: string;
+    method: string;
+}, input: any): string;
 //# sourceMappingURL=utils.svelte.d.ts.map

package/dist/api/query/utils.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/query/utils.svelte.ts"],"names":[],"mappings":"AAEA,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAEzD;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,UAEhE"}
+{"version":3,"file":"utils.svelte.d.ts","sourceRoot":"","sources":["../../../src/lib/api/query/utils.svelte.ts"],"names":[],"mappings":"AAGA,wBAAgB,aAAa,CAAC,QAAQ,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,UAEvE;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,KAAK,EAAE,GAAG,UAE9E"}

package/dist/api/query/utils.svelte.js

@@ -1,7 +1,8 @@
 import { stringify } from 'devalue';
-export function batchQueryKey(path, method) {
-    return `${path}_${method}`;
+import { endpointKey } from 'ts-ag';
+export function batchQueryKey(endpoint) {
+    return endpointKey(endpoint);
 }
-export function cacheKey(path, method, input) {
-    return `${path}_${method}_${stringify(input)}`;
+export function cacheKey(endpoint, input) {
+    return `${endpointKey(endpoint)} ${stringify(input)}`;
 }