mobx-tanstack-query-api 0.0.18 → 0.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-tanstack-query-api",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -80,6 +80,16 @@
       "default": "./index.js",
       "types": "./index.d.ts"
     },
+    "./runtime/endpoint-mutation": {
+      "import": "./runtime/endpoint-mutation.js",
+      "default": "./runtime/endpoint-mutation.js",
+      "types": "./runtime/endpoint-mutation.d.ts"
+    },
+    "./runtime/endpoint-query": {
+      "import": "./runtime/endpoint-query.js",
+      "default": "./runtime/endpoint-query.js",
+      "types": "./runtime/endpoint-query.d.ts"
+    },
     "./runtime/endpoint": {
       "import": "./runtime/endpoint.js",
       "default": "./runtime/endpoint.js",

package/runtime/endpoint-mutation.d.ts

@@ -0,0 +1,16 @@
+import { QueryClient } from '@tanstack/query-core';
+import { MobxMutation, MobxMutationConfig } from 'mobx-tanstack-query';
+import { AllPropertiesOptional, AnyObject, Unpromise } from 'yummies/utils/types';
+import { AnyEndpoint, InferEndpointError, InferEndpointInput, InferEndpointResponse } from './endpoint.types.js';
+export type EndpointMutationInput<TBaseInput extends AnyObject, TMutationMeta extends AnyObject | void = void> = TBaseInput & (TMutationMeta extends void ? {} : AllPropertiesOptional<TMutationMeta> extends true ? {
+    meta?: TMutationMeta;
+} : {
+    meta: TMutationMeta;
+});
+export interface EndpointMutationOptions<TEndpoint extends AnyEndpoint, TMutationMeta extends AnyObject | void = void> extends Omit<MobxMutationConfig<Unpromise<InferEndpointResponse<TEndpoint>>, EndpointMutationInput<InferEndpointInput<TEndpoint>, TMutationMeta>, InferEndpointError<TEndpoint>>, 'queryClient' | 'mutationFn'> {
+}
+export declare class EndpointMutation<TEndpoint extends AnyEndpoint, TMutationMeta extends AnyObject | void = void> extends MobxMutation<Unpromise<InferEndpointResponse<TEndpoint>>, EndpointMutationInput<InferEndpointInput<TEndpoint>, TMutationMeta>> {
+    private endpoint;
+    constructor(endpoint: TEndpoint, queryClient: QueryClient, options: EndpointMutationOptions<TEndpoint, TMutationMeta>);
+}
+//# sourceMappingURL=endpoint-mutation.d.ts.map

package/runtime/endpoint-mutation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"endpoint-mutation.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,qBAAqB,CAC/B,UAAU,SAAS,SAAS,EAC5B,aAAa,SAAS,SAAS,GAAG,IAAI,GAAG,IAAI,IAC3C,UAAU,GACZ,CAAC,aAAa,SAAS,IAAI,GAEvB,EAAE,GACF,qBAAqB,CAAC,aAAa,CAAC,SAAS,IAAI,GAC/C;IAAE,IAAI,CAAC,EAAE,aAAa,CAAA;CAAE,GACxB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,CAAC;AAEjC,MAAM,WAAW,uBAAuB,CACtC,SAAS,SAAS,WAAW,EAC7B,aAAa,SAAS,SAAS,GAAG,IAAI,GAAG,IAAI,CAC7C,SAAQ,IAAI,CACV,kBAAkB,CAChB,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,qBAAqB,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,EACnE,kBAAkB,CAAC,SAAS,CAAC,CAC9B,EACD,aAAa,GAAG,YAAY,CAC7B;CAAG;AAEN,qBAAa,gBAAgB,CAC3B,SAAS,SAAS,WAAW,EAC7B,aAAa,SAAS,SAAS,GAAG,IAAI,GAAG,IAAI,CAC7C,SAAQ,YAAY,CACpB,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,qBAAqB,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,CACpE;IAEG,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,SAAS,EAC3B,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC;CAe7D"}

package/runtime/endpoint-mutation.js

@@ -0,0 +1,17 @@
+import { MobxMutation } from 'mobx-tanstack-query';
+export class EndpointMutation extends MobxMutation {
+    endpoint;
+    constructor(endpoint, queryClient, options) {
+        super({
+            ...options,
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            queryClient,
+            mutationFn: async (input) => {
+                const response = (await endpoint.request(...endpoint.getParamsFromInput(input)));
+                return response;
+            },
+        });
+        this.endpoint = endpoint;
+    }
+}

package/runtime/endpoint-query.d.ts

@@ -0,0 +1,15 @@
+import { QueryClient, QueryFunctionContext } from '@tanstack/query-core';
+import { MobxQuery, MobxQueryConfig, MobxQueryDynamicOptions } from 'mobx-tanstack-query';
+import { MaybeFalsy, Unpromise } from 'yummies/utils/types';
+import { AnyEndpoint, InferEndpointError, InferEndpointInput, InferEndpointResponse } from './endpoint.types.js';
+export interface EndpointQueryOptions<TEndpoint extends AnyEndpoint> extends Omit<MobxQueryConfig<Unpromise<InferEndpointResponse<TEndpoint>>, InferEndpointError<TEndpoint>>, 'options' | 'queryFn' | 'queryClient'> {
+    input: () => MaybeFalsy<InferEndpointInput<TEndpoint>>;
+}
+export declare class EndpointQuery<TEndpoint extends AnyEndpoint> extends MobxQuery<Unpromise<InferEndpointResponse<TEndpoint>>, InferEndpointError<TEndpoint>> {
+    private endpoint;
+    constructor(endpoint: TEndpoint, queryClient: QueryClient, { input: getInput, ...queryOptions }: EndpointQueryOptions<TEndpoint>);
+    setInput(input: MaybeFalsy<InferEndpointInput<TEndpoint>>): Promise<Unpromise<InferEndpointResponse<TEndpoint>>>;
+    protected buildOptionsFromInput(input: MaybeFalsy<InferEndpointInput<TEndpoint>>): MobxQueryDynamicOptions<Unpromise<InferEndpointResponse<TEndpoint>>, InferEndpointError<TEndpoint>>;
+    protected buildParamsFromContext(ctx: QueryFunctionContext<any, any>): any;
+}
+//# sourceMappingURL=endpoint-query.d.ts.map

package/runtime/endpoint-query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"endpoint-query.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EACL,SAAS,EACT,eAAe,EACf,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,oBAAoB,CAAC,SAAS,SAAS,WAAW,CACjE,SAAQ,IAAI,CACV,eAAe,CACb,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,kBAAkB,CAAC,SAAS,CAAC,CAC9B,EACD,SAAS,GAAG,SAAS,GAAG,aAAa,CACtC;IACD,KAAK,EAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;CACxD;AAED,qBAAa,aAAa,CAAC,SAAS,SAAS,WAAW,CAAE,SAAQ,SAAS,CACzE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,kBAAkB,CAAC,SAAS,CAAC,CAC9B;IAEG,OAAO,CAAC,QAAQ;gBAAR,QAAQ,EAAE,SAAS,EAC3B,WAAW,EAAE,WAAW,EACxB,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,YAAY,EAAE,EAAE,oBAAoB,CAAC,SAAS,CAAC;IAoCjE,QAAQ,CACZ,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;IAMvD,SAAS,CAAC,qBAAqB,CAC7B,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,uBAAuB,CACxB,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,EAC3C,kBAAkB,CAAC,SAAS,CAAC,CAC9B;IAOD,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC;CAIrE"}

package/runtime/endpoint-query.js

@@ -0,0 +1,54 @@
+import { when } from 'mobx';
+import { MobxQuery, } from 'mobx-tanstack-query';
+export class EndpointQuery extends MobxQuery {
+    endpoint;
+    constructor(endpoint, queryClient, { input: getInput, ...queryOptions }) {
+        super({
+            ...queryOptions,
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            queryClient,
+            meta: {
+                tags: endpoint.tags,
+                operationId: endpoint.operationId,
+                ...queryOptions.meta,
+            },
+            options: ({ options }) => {
+                const willEnableManually = options.enabled === false;
+                const input = getInput();
+                return this.buildOptionsFromInput(willEnableManually && input);
+            },
+            queryFn: async (ctx) => {
+                const args = this.buildParamsFromContext(ctx);
+                const requestParamsIndex = args.length - 1;
+                if (args[requestParamsIndex]) {
+                    if (!args[requestParamsIndex].signal) {
+                        args[requestParamsIndex].signal = ctx.signal;
+                    }
+                }
+                else {
+                    args[requestParamsIndex] = { signal: ctx.signal };
+                }
+                // @ts-ignore
+                const response = await endpoint.request(...args);
+                return response;
+            },
+        });
+        this.endpoint = endpoint;
+    }
+    async setInput(input) {
+        this.update(this.buildOptionsFromInput(input));
+        await when(() => !this.result.isFetching);
+        return this.result.data;
+    }
+    buildOptionsFromInput(input) {
+        return {
+            enabled: !!input,
+            queryKey: input ? this.endpoint.getQueryKey(input) : '__SKIP__',
+        };
+    }
+    buildParamsFromContext(ctx) {
+        const input = this.endpoint.getQueryKey(ctx.queryKey);
+        return this.endpoint.getParamsFromInput(input);
+    }
+}

package/runtime/endpoint.d.ts

@@ -1,59 +1,45 @@
-import { InvalidateOptions, InvalidateQueryFilters, QueryClient, QueryFunctionContext } from '@tanstack/query-core';
-import { MobxMutation, MobxMutationConfig, MobxQuery, MobxQueryConfig } from 'mobx-tanstack-query';
-import { AnyObject, MaybeFalsy } from 'yummies/utils/types';
-import { EndpointMutationInput } from './endpoint.types.js';
+import { InvalidateOptions, InvalidateQueryFilters, QueryClient } from '@tanstack/query-core';
+import { AnyObject } from 'yummies/utils/types';
+import { EndpointMutation, EndpointMutationOptions } from './endpoint-mutation.js';
+import { EndpointQuery, EndpointQueryOptions } from './endpoint-query.js';
 import type { FullRequestParams, HttpClient, HttpResponse } from './http-client.js';
-export interface Endpoint<TData, TError, TInput extends AnyObject, TParams extends any[] = any[]> {
-    (...params: TParams): ReturnType<Endpoint<TData, TError, TInput, TParams>['request']>;
+export interface EndpointConfiguration<TParams extends any[] = any[], TMetaData extends AnyObject = AnyObject> {
+    operationId: string;
+    meta?: TMetaData;
+    params: (...params: TParams) => FullRequestParams;
+    keys: (string | {
+        name: string;
+        param: number;
+    } | {
+        name: string;
+        rest: true;
+    })[];
+    tags: string[];
+}
+export interface Endpoint<TData, TError, TInput extends AnyObject, TParams extends any[] = any[], TMetaData extends AnyObject = AnyObject> {
+    (...params: TParams): ReturnType<Endpoint<TData, TError, TInput, TParams, TMetaData>['request']>;
 }
 export declare class Endpoint<TData, TError, TInput extends AnyObject, TParams extends any[] = any[], TMetaData extends AnyObject = AnyObject> {
-    protected cfg: {
-        operationId: string;
-        meta?: TMetaData;
-        params: (...params: TParams) => FullRequestParams;
-        keys: (string | {
-            name: string;
-            param: number;
-        } | {
-            name: string;
-            rest: true;
-        })[];
-        tags: string[];
-    };
+    configuration: EndpointConfiguration<TParams, TMetaData>;
     protected queryClient: QueryClient;
     protected http: HttpClient;
     meta: TMetaData;
-    constructor(cfg: {
-        operationId: string;
-        meta?: TMetaData;
-        params: (...params: TParams) => FullRequestParams;
-        keys: (string | {
-            name: string;
-            param: number;
-        } | {
-            name: string;
-            rest: true;
-        })[];
-        tags: string[];
-    }, queryClient: QueryClient, http: HttpClient);
+    constructor(configuration: EndpointConfiguration<TParams, TMetaData>, queryClient: QueryClient, http: HttpClient);
+    private _hasRestParam?;
     private get hasRestParam();
-    protected buildParamsFromContext(ctx: QueryFunctionContext<any, any>): TParams;
-    protected buildParamsFromInput(input: TInput): TParams;
-    protected buildQueryKeyFromInput(input: TInput): any[];
-    protected buildInputFromQueryKey(queryKey: any[]): TInput;
+    getParamsFromInput(input: TInput): TParams;
     getFullUrl(input: TInput): string;
     getPath(input: TInput): string;
-    getTags(): string[];
+    get tags(): string[];
+    get operationId(): string;
     request(...params: TParams): Promise<HttpResponse<TData, TError>>;
-    toQueryKey(input: TInput): any[];
+    getQueryKey(input: TInput): any[];
     invalidateByOperationId(filters?: Omit<InvalidateQueryFilters<HttpResponse<TData, TError>>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
     invalidateByTags(filters?: Omit<InvalidateQueryFilters<HttpResponse<TData, TError>>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
     invalidate(input: TInput, filters?: Omit<InvalidateQueryFilters<HttpResponse<TData, TError>>, 'queryKey' | 'predicate'> & {
         queryKeyIndex?: number;
     }, options?: InvalidateOptions): Promise<void>;
-    toMutation<TMutationMeta extends AnyObject | void = void>(options: Omit<MobxMutationConfig<HttpResponse<TData, TError>, EndpointMutationInput<TInput, TMutationMeta>, TError>, 'queryClient' | 'mutationFn'>): MobxMutation<HttpResponse<TData, TError>, EndpointMutationInput<TInput, TMutationMeta>, TError, unknown>;
-    toQuery({ input: getInput, ...options }: Omit<MobxQueryConfig<HttpResponse<TData, TError>, TError>, 'options' | 'queryFn' | 'queryClient'> & {
-        input: () => MaybeFalsy<TInput>;
-    }): MobxQuery<HttpResponse<TData, TError>, TError, any>;
+    toMutation<TMutationMeta extends AnyObject | void = void>(options: EndpointMutationOptions<typeof this, TMutationMeta>): EndpointMutation<this, TMutationMeta>;
+    toQuery(options: EndpointQueryOptions<typeof this>): EndpointQuery<this>;
 }
 //# sourceMappingURL=endpoint.d.ts.map

package/runtime/endpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"endpoint.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint.ts"],"names":[],"mappings":"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"}

package/runtime/endpoint.js

@@ -1,14 +1,15 @@
-import { MobxMutation, MobxQuery, } from 'mobx-tanstack-query';
+import { EndpointMutation, } from './endpoint-mutation.js';
+import { EndpointQuery } from './endpoint-query.js';
 export class Endpoint {
-    cfg;
+    configuration;
     queryClient;
     http;
     meta;
-    constructor(cfg, queryClient, http) {
-        this.cfg = cfg;
+    constructor(configuration, queryClient, http) {
+        this.configuration = configuration;
         this.queryClient = queryClient;
         this.http = http;
-        this.meta = cfg.meta ?? {};
+        this.meta = configuration.meta ?? {};
         // Сохраняем оригинальный инстанс
         const instance = this;
         // Создаем функцию-обертку
@@ -30,24 +31,24 @@ export class Endpoint {
         });
         return callable;
     }
+    _hasRestParam;
     get hasRestParam() {
-        return this.cfg.keys.some((key) => {
-            if (typeof key !== 'string' && 'rest' in key) {
-                return true;
-            }
-        });
-    }
-    buildParamsFromContext(ctx) {
-        const input = this.buildInputFromQueryKey(ctx.queryKey);
-        return this.buildParamsFromInput(input);
+        if (this._hasRestParam === undefined) {
+            this._hasRestParam = this.configuration.keys.some((key) => {
+                if (typeof key !== 'string' && 'rest' in key) {
+                    return true;
+                }
+            });
+        }
+        return this._hasRestParam;
     }
-    buildParamsFromInput(input) {
+    getParamsFromInput(input) {
         const args = [];
         const restParams = {};
         if (this.hasRestParam) {
             args[0] = restParams;
         }
-        this.cfg.keys.forEach((key) => {
+        this.configuration.keys.forEach((key) => {
             if (typeof key === 'object') {
                 if (key.name === 'request') {
                     args.push(input[key.name]);
@@ -64,9 +65,25 @@ export class Endpoint {
         });
         return args;
     }
-    buildQueryKeyFromInput(input) {
+    getFullUrl(input) {
+        const params = this.configuration.params(...this.getParamsFromInput(input));
+        return this.http.buildUrl(params);
+    }
+    getPath(input) {
+        return this.configuration.params(...this.getParamsFromInput(input)).path;
+    }
+    get tags() {
+        return this.configuration.tags;
+    }
+    get operationId() {
+        return this.configuration.operationId;
+    }
+    request(...params) {
+        return this.http.request(this.configuration.params(...params));
+    }
+    getQueryKey(input) {
         const restParams = this.hasRestParam ? { ...input } : {};
-        return this.cfg.keys.map((key) => {
+        return this.configuration.keys.map((key) => {
             if (typeof key === 'string') {
                 return key;
             }
@@ -85,61 +102,23 @@ export class Endpoint {
             }
         });
     }
-    buildInputFromQueryKey(queryKey) {
-        const input = {};
-        this.cfg.keys.forEach((key, index) => {
-            const keyPart = queryKey[index];
-            if (typeof key === 'string') {
-                return;
-            }
-            if (key.name === 'request') {
-                input[key.name] = keyPart;
-                return;
-            }
-            if ('rest' in key) {
-                Object.assign(input, keyPart);
-                return;
-            }
-            if ('param' in key) {
-                input[key.name] = keyPart;
-            }
-        });
-        return input;
-    }
-    getFullUrl(input) {
-        const params = this.cfg.params(...this.buildParamsFromInput(input));
-        return this.http.buildUrl(params);
-    }
-    getPath(input) {
-        return this.cfg.params(...this.buildParamsFromInput(input)).path;
-    }
-    getTags() {
-        return this.cfg.tags;
-    }
-    request(...params) {
-        return this.http.request(this.cfg.params(...params));
-    }
-    toQueryKey(input) {
-        return this.buildQueryKeyFromInput(input);
-    }
     invalidateByOperationId(filters, options) {
         return this.queryClient.invalidateQueries({
             ...filters,
             predicate: (query) => {
                 if (query.meta?.operationId) {
-                    return query.meta?.operationId === this.cfg.operationId;
+                    return query.meta?.operationId === this.configuration.operationId;
                 }
                 return false;
             },
         }, options);
     }
     invalidateByTags(filters, options) {
-        const tags = this.getTags();
         return this.queryClient.invalidateQueries({
             ...filters,
             predicate: (query) => {
                 if (Array.isArray(query.meta?.tags)) {
-                    return query.meta.tags.some((tag) => tags.includes(tag));
+                    return query.meta.tags.some((tag) => this.tags.includes(tag));
                 }
                 return false;
             },
@@ -148,51 +127,14 @@ export class Endpoint {
     invalidate(input, filters, options) {
         return this.queryClient.invalidateQueries({
             ...filters,
-            queryKey: this.toQueryKey(input).slice(0, filters?.queryKeyIndex),
+            queryKey: this.getQueryKey(input).slice(0, filters?.queryKeyIndex),
             exact: filters?.exact ?? false,
         }, options);
     }
     toMutation(options) {
-        return new MobxMutation({
-            ...options,
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-expect-error
-            queryClient: this.queryClient,
-            mutationFn: (input) => this.request(...this.buildParamsFromInput(input)),
-        });
+        return new EndpointMutation(this, this.queryClient, options);
     }
-    toQuery({ input: getInput, ...options }) {
-        return new MobxQuery({
-            ...options,
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-expect-error
-            queryClient: this.queryClient,
-            options: () => {
-                const input = getInput();
-                return {
-                    meta: {
-                        tags: this.getTags(),
-                        operationId: this.cfg.operationId,
-                        ...options.meta,
-                    },
-                    enabled: !!input,
-                    queryKey: input ? this.toQueryKey(input) : '__SKIP__',
-                };
-            },
-            queryFn: async (ctx) => {
-                const args = this.buildParamsFromContext(ctx);
-                const requestParamsIndex = args.length - 1;
-                if (args[requestParamsIndex]) {
-                    if (!args[requestParamsIndex].signal) {
-                        args[requestParamsIndex].signal = ctx.signal;
-                    }
-                }
-                else {
-                    args[requestParamsIndex] = { signal: ctx.signal };
-                }
-                const response = await this.request(...args);
-                return response;
-            },
-        });
+    toQuery(options) {
+        return new EndpointQuery(this, this.queryClient, options);
     }
 }

package/runtime/endpoint.types.d.ts

@@ -1,7 +1,15 @@
 import { AllPropertiesOptional, AnyObject } from 'yummies/utils/types';
+import type { Endpoint } from './endpoint.js';
 export type EndpointMutationInput<TBaseInput extends AnyObject, TMutationMeta extends AnyObject | void = void> = TBaseInput & (TMutationMeta extends void ? {} : AllPropertiesOptional<TMutationMeta> extends true ? {
     meta?: TMutationMeta;
 } : {
     meta: TMutationMeta;
 });
+export type AnyEndpoint = Endpoint<any, any, any, any, any>;
+export type InferEndpointData<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<infer T, any, any, any, any> ? T : never;
+export type InferEndpointResponse<TEndpoint extends AnyEndpoint> = ReturnType<TEndpoint['request']>;
+export type InferEndpointError<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<any, infer T, any, any, any> ? T : never;
+export type InferEndpointInput<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<any, any, infer T, any, any> ? T : never;
+export type InferEndpointParams<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<any, any, any, infer T, any> ? T : never;
+export type InferEndpointMetaData<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<any, any, any, any, infer T> ? T : never;
 //# sourceMappingURL=endpoint.types.d.ts.map

package/runtime/endpoint.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint.types.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEvE,MAAM,MAAM,qBAAqB,CAC/B,UAAU,SAAS,SAAS,EAC5B,aAAa,SAAS,SAAS,GAAG,IAAI,GAAG,IAAI,IAC3C,UAAU,GACZ,CAAC,aAAa,SAAS,IAAI,GAEvB,EAAE,GACF,qBAAqB,CAAC,aAAa,CAAC,SAAS,IAAI,GAC/C;IAAE,IAAI,CAAC,EAAE,aAAa,CAAA;CAAE,GACxB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,CAAC"}
+{"version":3,"file":"endpoint.types.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,MAAM,MAAM,qBAAqB,CAC/B,UAAU,SAAS,SAAS,EAC5B,aAAa,SAAS,SAAS,GAAG,IAAI,GAAG,IAAI,IAC3C,UAAU,GACZ,CAAC,aAAa,SAAS,IAAI,GAEvB,EAAE,GACF,qBAAqB,CAAC,aAAa,CAAC,SAAS,IAAI,GAC/C;IAAE,IAAI,CAAC,EAAE,aAAa,CAAA;CAAE,GACxB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC,CAAC;AAEjC,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE5D,MAAM,MAAM,iBAAiB,CAAC,SAAS,SAAS,WAAW,IACzD,SAAS,SAAS,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEtE,MAAM,MAAM,qBAAqB,CAAC,SAAS,SAAS,WAAW,IAAI,UAAU,CAC3E,SAAS,CAAC,SAAS,CAAC,CACrB,CAAC;AAEF,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,WAAW,IAC1D,SAAS,SAAS,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEtE,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,WAAW,IAC1D,SAAS,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEtE,MAAM,MAAM,mBAAmB,CAAC,SAAS,SAAS,WAAW,IAC3D,SAAS,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEtE,MAAM,MAAM,qBAAqB,CAAC,SAAS,SAAS,WAAW,IAC7D,SAAS,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}