mobx-tanstack-query-api 0.0.37 → 0.0.39

package/codegen/index.d.ts

@@ -61,6 +61,7 @@ export interface GenerateQueryApiParams {
     };
     requestOptions?: AnyObject;
     otherCodegenParams?: AnyObject;
+    filterRoutes?: (route: AnyObject) => boolean;
     libImports?: {
         'mobx-tanstack-query-api'?: string;
     };

package/codegen/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAc9D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,EAAE,YAAY,CAAC;IAChB,qBAAqB,EAAE,CAAC,aAAa,EAAE,SAAS,KAAK,MAAM,CAAC;IAC5D,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,SAAS,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,gBAAgB,KACpB,MAAM,CAAC;IAEZ;;OAEG;IACH,OAAO,CAAC,EACJ,CAAC,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM,CAAC,GAC9B,cAAc,GACd,gBAAgB,MAAM,EAAE,GACxB,KAAK,GACL,OAAO,MAAM,EAAE,CAAC;IAEpB;;;;;;;;;;;;;;;OAeG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM,CAAC,CAAC;IAEpD;;;;;;;;OAQG;IACH,yBAAyB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE7C,WAAW,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAC3C,QAAQ,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACxC,UAAU,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAE1C,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,KACb;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,KACb;QACH,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IAEF,cAAc,CAAC,EAAE,SAAS,CAAC;IAE3B,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAE/B,UAAU,CAAC,EAAE;QACX,yBAAyB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;CACH;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,CACtC,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC,EAC5E,gBAAgB,CACjB,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,QAAQ,sBAAsB,GAAG,sBAAsB,EAAE,KACxD,OAAO,CAAC,IAAI,CAkXd,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAc9D,MAAM,MAAM,gBAAgB,GAAG;IAC7B,CAAC,EAAE,YAAY,CAAC;IAChB,qBAAqB,EAAE,CAAC,aAAa,EAAE,SAAS,KAAK,MAAM,CAAC;IAC5D,eAAe,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,SAAS,CAAC;AAEvC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,gBAAgB,KACpB,MAAM,CAAC;IAEZ;;OAEG;IACH,OAAO,CAAC,EACJ,CAAC,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM,CAAC,GAC9B,cAAc,GACd,gBAAgB,MAAM,EAAE,GACxB,KAAK,GACL,OAAO,MAAM,EAAE,CAAC;IAEpB;;;;;;;;;;;;;;;OAeG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,SAAS,KAAK,MAAM,CAAC,CAAC;IAEpD;;;;;;;;OAQG;IACH,yBAAyB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE7C,WAAW,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAC3C,QAAQ,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IACxC,UAAU,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAE1C,eAAe,CAAC,EAAE,CAChB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,KACb;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,cAAc,CAAC,EAAE,CACf,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,KACb;QACH,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IAEF,cAAc,CAAC,EAAE,SAAS,CAAC;IAE3B,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAE/B,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC;IAE7C,UAAU,CAAC,EAAE;QACX,yBAAyB,CAAC,EAAE,MAAM,CAAC;KACpC,CAAC;CACH;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,CACtC,YAAY,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAAE,SAAS,GAAG,gBAAgB,CAAC,EAC5E,gBAAgB,CACjB,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,QAAQ,sBAAsB,GAAG,sBAAsB,EAAE,KACxD,OAAO,CAAC,IAAI,CAsXd,CAAC"}

package/codegen/index.js

@@ -48,7 +48,7 @@ export const generateApi = async (params) => {
         disableStrictSSL: false,
         singleHttpClient: true,
         extractRequestBody: true,
-        extractRequestParams: true,
+        extractRequestParams: false,
         extractResponseBody: true,
         extractResponseError: true,
         generateResponses: true,
@@ -113,9 +113,12 @@ export const generateApi = async (params) => {
     const codegenFs = codegenProcess.fileSystem;
     codegenFs.cleanDir(params.output);
     codegenFs.createDir(params.output);
-    const allRoutes = Object.values(generated.configuration.routes)
+    let allRoutes = Object.values(generated.configuration.routes)
         .flat()
         .flatMap((routeGroup) => 'routes' in routeGroup ? routeGroup.routes : routeGroup);
+    allRoutes = params.filterRoutes
+        ? allRoutes.filter(params.filterRoutes)
+        : allRoutes;
     const reservedDataContractNamesMap = new Map();
     const collectedExportFiles = [];
     if (params.groupBy == null) {

package/codegen/templates/new-request-info.tmpl.d.ts

@@ -9,6 +9,11 @@ export interface NewRequestInfoTmplParams {
 }
 export declare const newRequestInfoTmpl: ({ route, apiParams, importFileParams, utils, }: NewRequestInfoTmplParams) => {
     reservedDataContractNames: string[];
+    localModelTypes: {
+        typeIdentifier: string;
+        name: Capitalize<string>;
+        content: string;
+    }[];
     content: string;
 };
 //# sourceMappingURL=new-request-info.tmpl.d.ts.map

package/codegen/templates/new-request-info.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-request-info.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-request-info.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAiBD,eAAO,MAAM,kBAAkB,GAAI,gDAKhC,wBAAwB;;;CAuO1B,CAAC"}
+{"version":3,"file":"new-request-info.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-request-info.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,wBAAwB;IACvC,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;CACzB;AAiBD,eAAO,MAAM,kBAAkB,GAAI,gDAKhC,wBAAwB;;;;;;;;CAiK1B,CAAC"}

package/codegen/templates/new-request-info.tmpl.js

@@ -24,14 +24,15 @@ export const newRequestInfoTmpl = ({ route, apiParams, importFileParams, utils,
     const pathParams = _.values(parameters);
     const pathParamsNames = _.map(pathParams, 'name');
     const requestConfigParam = {
-        name: 'request',
+        name: 'requestParams',
         optional: true,
         type: 'RequestParams',
         defaultValue: '{}',
     };
-    const getArgs = ({ withPayload, withRequestConfigParam, withRequestParams, }) => {
+    const inputParams = [...pathParams, query, requestConfigParam].filter(Boolean);
+    const getArgs = ({ withPayload, withRequestConfigParam, }) => {
         return _.sortBy(_.compact([
-            ...(withRequestParams && requestParams
+            ...(requestParams
                 ? [
                     {
                         name: pathParams.length > 0
@@ -46,38 +47,11 @@ export const newRequestInfoTmpl = ({ route, apiParams, importFileParams, utils,
             withRequestConfigParam && requestConfigParam,
         ]), [(o) => o.optional]);
     };
+    const tags = (raw.tags || []).filter(Boolean);
     const requestOutputDataTypes = positiveResponseTypes.map((it) => it.type);
     const requestOutputErrorType = routeResponse.errorType;
-    let requestInputCombinedType;
-    const requestInfoFnArgNames = getArgs({
-        withRequestParams: true,
-        withRequestConfigParam: true,
-        withPayload: true,
-    }).map(({ name }) => name);
     const pathParamsToInline = path.split('/').slice(1);
     let lastDynamicStructPos = 0;
-    const pathParamsStructs = pathParamsToInline.map((param, i) => {
-        if (param.includes('${')) {
-            const paramName = param.replace('${', '').replace('}', '');
-            return {
-                type: 'dynamic',
-                key: paramName,
-                i,
-                param: lastDynamicStructPos++,
-            };
-        }
-        return {
-            type: 'static',
-            value: param,
-        };
-    });
-    const dataParamStruct = payload == null
-        ? null
-        : {
-            type: 'dynamic',
-            key: payload.name,
-            param: lastDynamicStructPos++,
-        };
     const queryParamStruct = query == null
         ? null
         : {
@@ -89,37 +63,6 @@ export const newRequestInfoTmpl = ({ route, apiParams, importFileParams, utils,
     if (queryParamStruct && !lastDynamicStructPos) {
         lastDynamicStructPos++;
     }
-    let requestInputType = `{
-  ${getArgs({
-        withRequestParams: true,
-        withRequestConfigParam: true,
-        withPayload: true,
-    })
-        .map(({ name, optional, type, defaultValue }) => {
-        const isCombinedType = name.includes('...') || name === 'query';
-        if (isCombinedType) {
-            requestInputCombinedType = { name, optional, type, defaultValue };
-            return;
-        }
-        return `${name}${optional ? '?' : ''}:${type}`;
-    })
-        .filter(Boolean)
-        .join(', ')}
-}`;
-    if (requestInputCombinedType) {
-        requestInputType = `${requestInputCombinedType.type} & ${requestInputType}`;
-    }
-    const requestKeyType = `[
-  ${getArgs({
-        withRequestParams: true,
-        withRequestConfigParam: true,
-        withPayload: true,
-    })
-        .map(({ name, optional, type }) => {
-        return `${name.includes('...') || name === 'query' ? 'params' : name}${optional ? '?' : ''}:${type}`;
-    })
-        .join(', ')}
-]`;
     const requestInfoMeta = apiParams.getEndpointMeta?.(route, utils);
     const requestMeta = apiParams.getRequestMeta?.(route, utils);
     const resultPath = (apiParams.requestPathPrefix ?? '') +
@@ -131,22 +74,36 @@ export const newRequestInfoTmpl = ({ route, apiParams, importFileParams, utils,
         ...requestOutputDataTypes,
         requestOutputErrorType,
         ...getArgs({
-            withRequestParams: true,
             withPayload: true,
         }).map((it) => it.type),
     ]);
+    const pathDeclaration = resultPath.replaceAll('$', '');
+    const requestInputTypeDc = {
+        typeIdentifier: 'type',
+        name: _.upperFirst(_.camelCase(`${route.routeName.usage}Input`)),
+        content: `{
+    ${inputParams
+            .map(({ name, optional, type }) => {
+            return `${name}${optional ? '?' : ''}:${type}`;
+        })
+            .filter(Boolean)
+            .join(', ')}
+  }`,
+    };
     return {
         reservedDataContractNames,
+        localModelTypes: [requestInputTypeDc],
         content: `
 new ${importFileParams.endpoint.exportName}<
   ${requestOutputDataTypes.join('|') || 'any'},
   ${requestOutputErrorType},
-  ${requestInputType},
-  ${requestKeyType},
+  ${requestInputTypeDc.name},
   ${requestInfoMeta?.typeName ?? 'any'}
 >(
     {
-        params: (${requestInfoFnArgNames.join(', ')}) => ({
+        params: ({
+  ${inputParams.map((it) => it.name)}
+}) => ({
             path: \`${resultPath}\`,
             method: '${_.upperCase(method)}',
             ${requestMeta?.tmplData ? `meta: ${requestMeta.tmplData},` : ''}
@@ -155,31 +112,13 @@ new ${importFileParams.endpoint.exportName}<
             ${security ? 'secure: true,' : ''}
             ${bodyContentType ? `contentType: ${bodyContentType},` : ''}
             ${responseFormat ? `format: ${responseFormat},` : ''}
-            ...${requestInfoFnArgNames.at(-1)},  
+            ...${requestConfigParam.name},
         }),
+        requiredParams: [${inputParams.filter((it) => !it.optional).map((it) => `"${it.name}"`)}],
         operationId: "${raw.operationId}",
-        tags: [
-          ${raw.tags?.map((tag) => `"${tag}"`).join(',')}
-        ],
+        pathDeclaration: "${pathDeclaration}",
+        tags: [${tags.map((tag) => `"${tag}"`)}],
         meta: ${requestInfoMeta?.tmplData ?? '{} as any'},
-        keys: [
-            ${_.compact([
-            ...pathParamsStructs.map((struct) => {
-                if (struct.type === 'dynamic') {
-                    return `{ name: '${struct.key}', param: ${struct.param} }`;
-                }
-                return `"${struct.value}"`;
-            }),
-            dataParamStruct &&
-                `
-                { name: "${dataParamStruct.key}", param: ${dataParamStruct.param} }
-              `,
-            queryParamStruct &&
-                `{ name: "${queryParamStruct.key}", rest: true }`,
-            requestConfigParam &&
-                `{ name: "${requestConfigParam.name}", param: ${lastDynamicStructPos} }`,
-        ]).join(',')}
-        ],
     },
     ${importFileParams.queryClient.exportName},
     ${importFileParams.httpClient.exportName},

package/codegen/templates/request-info-per-file.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-info-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/request-info-per-file.tmpl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,4BAA6B,SAAQ,SAAS;IAC7D,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB,GAAU,2GAQ1C,4BAA4B;;;EA6E9B,CAAC"}
+{"version":3,"file":"request-info-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/request-info-per-file.tmpl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACvB,MAAM,aAAa,CAAC;AAOrB,MAAM,WAAW,4BAA6B,SAAQ,SAAS;IAC7D,KAAK,EAAE,SAAS,CAAC;IACjB,aAAa,EAAE,SAAS,CAAC;IACzB,SAAS,EAAE,sBAAsB,CAAC;IAClC,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,KAAK,EAAE,gBAAgB,CAAC;IACxB,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB,GAAU,2GAQ1C,4BAA4B;;;EAgG9B,CAAC"}

package/codegen/templates/request-info-per-file.tmpl.js

@@ -4,7 +4,7 @@ import { newRequestInfoTmpl } from './new-request-info.tmpl.js';
 import { requestInfoJSDocTmpl } from './request-info-jsdoc.tmpl.js';
 export const requestInfoPerFileTmpl = async ({ route, configuration, apiParams, formatTSContent, importFileParams, utils, relativePathDataContracts, }) => {
     const { _ } = utils;
-    const { content: requestInfoInstanceContent, reservedDataContractNames } = newRequestInfoTmpl({
+    const { content: requestInfoInstanceContent, reservedDataContractNames, localModelTypes, } = newRequestInfoTmpl({
         route,
         configuration,
         apiParams,
@@ -48,6 +48,17 @@ export const requestInfoPerFileTmpl = async ({ route, configuration, apiParams,
         })))
             .filter(Boolean)
             .join('\n\n')}
+
+      ${(await Promise.all(localModelTypes.map(async (modelType) => {
+            const contractType = await dataContractTmpl({
+                configuration,
+                contract: modelType,
+                addExportKeyword: true,
+            });
+            return contractType;
+        })))
+            .filter(Boolean)
+            .join('\n\n')}
       
       ${requestInfoJSDocTmpl({
             route,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobx-tanstack-query-api",
-  "version": "0.0.37",
+  "version": "0.0.39",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",
@@ -34,7 +34,7 @@
     "jsdom": "^26.0.0",
     "nodemon": "^3.1.9",
     "rimraf": "^6.0.1",
-    "typescript": "^5.7.2",
+    "typescript": "^5.8.3",
     "unplugin-swc": "^1.5.1",
     "vitest": "^3.0.5"
   },
@@ -156,7 +156,7 @@
     "test": "vitest run",
     "test:watch": "vitest watch",
     "test:coverage": "vitest run --coverage",
-    "dev": "pnpm test:watch",
+    "dev": "pnpm build && nodemon --delay 0.5 --watch src --ext ts,tsx --exec \"pnpm build && pnpm playground\"",
     "playground": "node ./playground/index.mjs"
   }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"endpoint-mutation.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,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,mBAAmB,EAChC,OAAO,EAAE,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC;CAe7D"}
+{"version":3,"file":"endpoint-mutation.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-mutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EACL,qBAAqB,EACrB,SAAS,EACT,SAAS,EACV,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,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,mBAAmB,EAChC,OAAO,EAAE,uBAAuB,CAAC,SAAS,EAAE,aAAa,CAAC;CAa7D"}

package/runtime/endpoint-mutation.js

@@ -8,7 +8,7 @@ export class EndpointMutation extends MobxMutation {
             ...options,
             queryClient,
             mutationFn: async (input) => {
-                const response = await endpoint.request(...endpoint.getParamsFromInput(input));
+                const response = await endpoint.request(input);
                 return response;
             },
         });

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

@@ -2,6 +2,7 @@ import { InvalidateOptions, InvalidateQueryFilters } from '@tanstack/query-core'
 import { MobxQueryClient } from 'mobx-tanstack-query';
 export declare class EndpointQueryClient extends MobxQueryClient {
     invalidateByOperationId(operationId: string | RegExp, filters?: Omit<InvalidateQueryFilters<any[]>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
+    invalidateByPath(path: string | RegExp, filters?: Omit<InvalidateQueryFilters<any[]>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
     invalidateByTags(tags: any[], filters?: Omit<InvalidateQueryFilters<any[]>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
 }
 //# sourceMappingURL=endpoint-query-client.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"endpoint-query-client.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,uBAAuB,CACrB,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC,EACvE,OAAO,CAAC,EAAE,iBAAiB;IAoB7B,gBAAgB,CACd,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC,EACvE,OAAO,CAAC,EAAE,iBAAiB;CAgB9B"}
+{"version":3,"file":"endpoint-query-client.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query-client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,uBAAuB,CACrB,WAAW,EAAE,MAAM,GAAG,MAAM,EAC5B,OAAO,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC,EACvE,OAAO,CAAC,EAAE,iBAAiB;IAoB7B,gBAAgB,CACd,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,OAAO,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC,EACvE,OAAO,CAAC,EAAE,iBAAiB;IAoB7B,gBAAgB,CACd,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,CAAC,EAAE,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC,EAAE,UAAU,GAAG,WAAW,CAAC,EACvE,OAAO,CAAC,EAAE,iBAAiB;CAgB9B"}

package/runtime/endpoint-query-client.js

@@ -14,6 +14,20 @@ export class EndpointQueryClient extends MobxQueryClient {
             },
         }, options);
     }
+    invalidateByPath(path, filters, options) {
+        return this.invalidateQueries({
+            ...filters,
+            predicate: (query) => {
+                if (query.meta?.pathDeclaration) {
+                    if (typeof path === 'string') {
+                        return String(query.meta.pathDeclaration).startsWith(path);
+                    }
+                    return path.test(String(query.meta.pathDeclaration));
+                }
+                return false;
+            },
+        }, options);
+    }
     invalidateByTags(tags, filters, options) {
         return this.invalidateQueries({
             ...filters,

package/runtime/endpoint-query.d.ts

@@ -1,10 +1,10 @@
 import { QueryFunctionContext } from '@tanstack/query-core';
-import { MobxQuery, MobxQueryConfig, MobxQueryDynamicOptions } from 'mobx-tanstack-query';
+import { MobxQuery, MobxQueryConfig } from 'mobx-tanstack-query';
 import { MaybeFalsy, Unpromise } from 'yummies/utils/types';
 import { EndpointQueryClient } from './endpoint-query-client.js';
 import { AnyEndpoint, InferEndpointError, InferEndpointInput, InferEndpointResponse } from './endpoint.types.js';
 export type EndpointQueryOptions<TOutput, TEndpoint extends AnyEndpoint> = {
-    input: () => MaybeFalsy<InferEndpointInput<TEndpoint>>;
+    input?: () => MaybeFalsy<InferEndpointInput<TEndpoint>>;
     transform?: (response: Unpromise<InferEndpointResponse<TEndpoint>>) => TOutput;
 } & Omit<MobxQueryConfig<TOutput, InferEndpointError<TEndpoint>>, 'options' | 'queryFn' | 'queryClient'>;
 export declare class EndpointQuery<TOutput, TEndpoint extends AnyEndpoint> extends MobxQuery<TOutput, InferEndpointError<TEndpoint>> {
@@ -12,11 +12,10 @@ export declare class EndpointQuery<TOutput, TEndpoint extends AnyEndpoint> exten
     response: Unpromise<InferEndpointResponse<TEndpoint>> | null;
     constructor(endpoint: TEndpoint, queryClient: EndpointQueryClient, { input: getInput, ...queryOptions }: EndpointQueryOptions<TOutput, TEndpoint>);
     setInput(input: MaybeFalsy<InferEndpointInput<TEndpoint>>): Promise<Unpromise<InferEndpointResponse<TEndpoint>>>;
-    static buildOptionsFromInput(endpoint: AnyEndpoint, input: any): {
+    buildOptionsFromInput(input: MaybeFalsy<Partial<InferEndpointInput<TEndpoint>>>): {
         enabled: boolean;
-        queryKey: any;
+        queryKey: any[];
     };
-    protected buildOptionsFromInput(input: MaybeFalsy<InferEndpointInput<TEndpoint>>): MobxQueryDynamicOptions<Unpromise<InferEndpointResponse<TEndpoint>>, InferEndpointError<TEndpoint>>;
-    protected buildParamsFromContext(ctx: QueryFunctionContext<any, any>): any;
+    protected getInputFromContext(ctx: QueryFunctionContext<any, any>): InferEndpointInput<TEndpoint>;
 }
 //# sourceMappingURL=endpoint-query.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"endpoint-query.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EACL,SAAS,EACT,eAAe,EACf,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,oBAAoB,CAAC,OAAO,EAAE,SAAS,SAAS,WAAW,IAAI;IACzE,KAAK,EAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;IACvD,SAAS,CAAC,EAAE,CACV,QAAQ,EAAE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,KAClD,OAAO,CAAC;CACd,GAAG,IAAI,CACN,eAAe,CAAC,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,EACvD,SAAS,GAAG,SAAS,GAAG,aAAa,CACtC,CAAC;AAEF,qBAAa,aAAa,CACxB,OAAO,EACP,SAAS,SAAS,WAAW,CAC7B,SAAQ,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAIvD,OAAO,CAAC,QAAQ;IAHlB,QAAQ,EAAE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAQ;gBAG1D,QAAQ,EAAE,SAAS,EAC3B,WAAW,EAAE,mBAAmB,EAChC,EACE,KAAK,EAAE,QAAQ,EACf,GAAG,YAAY,EAChB,EAAE,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC;IAoDvC,QAAQ,CACZ,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;IAQvD,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG;;;;IAO9D,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;IAID,SAAS,CAAC,sBAAsB,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC;CAIrE"}
+{"version":3,"file":"endpoint-query.d.ts","sourceRoot":"","sources":["../../src/runtime/endpoint-query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAS,UAAU,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EACL,WAAW,EACX,kBAAkB,EAClB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAG7B,MAAM,MAAM,oBAAoB,CAAC,OAAO,EAAE,SAAS,SAAS,WAAW,IAAI;IACzE,KAAK,CAAC,EAAE,MAAM,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;IACxD,SAAS,CAAC,EAAE,CACV,QAAQ,EAAE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,KAClD,OAAO,CAAC;CACd,GAAG,IAAI,CACN,eAAe,CAAC,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,EACvD,SAAS,GAAG,SAAS,GAAG,aAAa,CACtC,CAAC;AAEF,qBAAa,aAAa,CACxB,OAAO,EACP,SAAS,SAAS,WAAW,CAC7B,SAAQ,SAAS,CAAC,OAAO,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAIvD,OAAO,CAAC,QAAQ;IAHlB,QAAQ,EAAE,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAQ;gBAG1D,QAAQ,EAAE,SAAS,EAC3B,WAAW,EAAE,mBAAmB,EAChC,EACE,KAAK,EAAE,QAAQ,EACf,GAAG,YAAY,EAChB,EAAE,oBAAoB,CAAC,OAAO,EAAE,SAAS,CAAC;IA+DvC,QAAQ,CACZ,KAAK,EAAE,UAAU,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,GAC/C,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;IAOvD,qBAAqB,CACnB,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;;;;IAkB3D,SAAS,CAAC,mBAAmB,CAAC,GAAG,EAAE,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,GAC7B,kBAAkB,CAAC,SAAS,CAAC;CAElE"}

package/runtime/endpoint-query.js

@@ -1,5 +1,5 @@
 import { makeObservable, observable, runInAction, when } from 'mobx';
-import { MobxQuery, } from 'mobx-tanstack-query';
+import { MobxQuery } from 'mobx-tanstack-query';
 export class EndpointQuery extends MobxQuery {
     endpoint;
     response = null;
@@ -14,25 +14,33 @@ export class EndpointQuery extends MobxQuery {
             },
             options: ({ options }) => {
                 const willEnableManually = options?.enabled === false;
-                const input = getInput();
-                return EndpointQuery.buildOptionsFromInput(endpoint, willEnableManually && input);
+                const input = (getInput?.() || {});
+                const builtOptions = this.buildOptionsFromInput(input);
+                return {
+                    ...options,
+                    ...builtOptions,
+                    enabled: willEnableManually ? false : builtOptions.enabled,
+                };
             },
             queryFn: async (ctx) => {
                 runInAction(() => {
                     this.response = null;
                 });
-                const args = this.buildParamsFromContext(ctx);
-                const requestParamsIndex = args.length - 1;
-                if (args[requestParamsIndex]) {
-                    if (!args[requestParamsIndex].signal) {
-                        args[requestParamsIndex].signal = ctx.signal;
+                const input = this.getInputFromContext(ctx);
+                let requestParams = input.request;
+                if (requestParams) {
+                    if (!requestParams.signal) {
+                        requestParams.signal = ctx.signal;
                     }
                 }
                 else {
-                    args[requestParamsIndex] = { signal: ctx.signal };
+                    requestParams = { signal: ctx.signal };
                 }
-                // @ts-ignore
-                const response = await endpoint.request(...args);
+                const fixedInput = {
+                    ...input,
+                    request: requestParams,
+                };
+                const response = await endpoint.request(fixedInput);
                 runInAction(() => {
                     this.response = response;
                 });
@@ -44,23 +52,27 @@ export class EndpointQuery extends MobxQuery {
         makeObservable(this);
     }
     async setInput(input) {
-        // @ts-ignore
         this.update(this.buildOptionsFromInput(input));
         await when(() => !this.result.isFetching);
         // @ts-ignore
         return this.result.data;
     }
-    static buildOptionsFromInput(endpoint, input) {
+    buildOptionsFromInput(input) {
+        const { requiredParams } = this.endpoint.configuration;
+        let hasRequiredParams = false;
+        if (requiredParams.length > 0) {
+            hasRequiredParams =
+                !!input && requiredParams.every((param) => param in input);
+        }
+        else {
+            hasRequiredParams = true;
+        }
         return {
-            enabled: !!input,
-            queryKey: input ? endpoint.getQueryKey(input) : ['__SKIP__'],
+            enabled: hasRequiredParams,
+            queryKey: this.endpoint.getQueryKey(input || {}),
         };
     }
-    buildOptionsFromInput(input) {
-        return EndpointQuery.buildOptionsFromInput(this.endpoint, input);
-    }
-    buildParamsFromContext(ctx) {
-        const input = this.endpoint.getQueryKey(ctx.queryKey);
-        return this.endpoint.getParamsFromInput(input);
+    getInputFromContext(ctx) {
+        return (ctx.queryKey[2] || {});
     }
 }

package/runtime/endpoint.d.ts

@@ -1,40 +1,27 @@
 import { InvalidateOptions, InvalidateQueryFilters } from '@tanstack/query-core';
-import { AnyObject } from 'yummies/utils/types';
+import { AllPropertiesOptional, AnyObject } from 'yummies/utils/types';
 import { EndpointMutation, EndpointMutationOptions } from './endpoint-mutation.js';
 import { EndpointQueryClient } from './endpoint-query-client.js';
 import { EndpointQuery, EndpointQueryOptions } from './endpoint-query.js';
-import type { FullRequestParams, HttpClient } from './http-client.js';
-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[];
+import { EndpointConfiguration } from './endpoint.types.js';
+import type { HttpClient } from './http-client.js';
+export interface Endpoint<TData, TError, TInput extends AnyObject, TMetaData extends AnyObject = AnyObject> {
+    (...args: AllPropertiesOptional<TInput> extends true ? [input?: TInput] : [input: TInput]): ReturnType<Endpoint<TData, TError, TInput, TMetaData>['request']>;
 }
-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> {
-    configuration: EndpointConfiguration<TParams, TMetaData>;
+export declare class Endpoint<TData, TError, TInput extends AnyObject, TMetaData extends AnyObject = AnyObject> {
+    configuration: EndpointConfiguration<NoInfer<TInput>, TMetaData>;
     protected queryClient: EndpointQueryClient;
     protected http: HttpClient;
     meta: TMetaData;
-    constructor(configuration: EndpointConfiguration<TParams, TMetaData>, queryClient: EndpointQueryClient, http: HttpClient);
-    private _hasRestParam?;
-    private get hasRestParam();
-    getParamsFromInput(input: TInput): TParams;
-    getFullUrl(input: TInput): string;
-    getPath(input: TInput): string;
+    constructor(configuration: EndpointConfiguration<NoInfer<TInput>, TMetaData>, queryClient: EndpointQueryClient, http: HttpClient);
+    getFullUrl(...args: AllPropertiesOptional<TInput> extends true ? [input?: TInput] : [input: TInput]): string;
+    getPath(...args: AllPropertiesOptional<TInput> extends true ? [input?: TInput] : [input: TInput]): string;
     get tags(): string[];
+    get pathDeclaration(): string;
     get operationId(): string;
-    request(...params: TParams): Promise<import("./http-client.js").HttpResponse<TData, TError>>;
-    getQueryKey(input: TInput): any[];
+    request(...args: AllPropertiesOptional<TInput> extends true ? [input?: TInput] : [input: TInput]): Promise<import("./http-client.js").HttpResponse<TData, TError>>;
+    getQueryKey(...args: AllPropertiesOptional<TInput> extends true ? [input?: TInput] : [input: TInput]): any[];
+    invalidateByPath(filters?: Omit<InvalidateQueryFilters<any[]>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
     invalidateByOperationId(filters?: Omit<InvalidateQueryFilters<any[]>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
     invalidateByTags(filters?: Omit<InvalidateQueryFilters<any[]>, 'queryKey' | 'predicate'>, options?: InvalidateOptions): Promise<void>;
     invalidate(input: TInput, filters?: Omit<InvalidateQueryFilters<any[]>, 'queryKey' | 'predicate'> & {

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

@@ -13,8 +13,8 @@ export class Endpoint {
         // Сохраняем оригинальный инстанс
         const instance = this;
         // Создаем функцию-обертку
-        const callable = function (...params) {
-            return instance.request.apply(instance, params);
+        const callable = function (...args) {
+            return instance.request.apply(instance, args);
         };
         // Копируем прототип
         Object.setPrototypeOf(callable, new.target.prototype);
@@ -31,76 +31,36 @@ export class Endpoint {
         });
         return callable;
     }
-    _hasRestParam;
-    get hasRestParam() {
-        if (this._hasRestParam === undefined) {
-            this._hasRestParam = this.configuration.keys.some((key) => {
-                if (typeof key !== 'string' && 'rest' in key) {
-                    return true;
-                }
-            });
-        }
-        return this._hasRestParam;
-    }
-    getParamsFromInput(input) {
-        const args = [];
-        const restParams = {};
-        if (this.hasRestParam) {
-            args[0] = restParams;
-        }
-        this.configuration.keys.forEach((key) => {
-            if (typeof key === 'object') {
-                if (key.name === 'request') {
-                    args.push(input[key.name]);
-                }
-                else if (this.hasRestParam) {
-                    if ('rest' in key) {
-                        Object.assign(restParams, input);
-                    }
-                }
-                else if ('param' in key) {
-                    args[key.param] = input[key.name];
-                }
-            }
-        });
-        return args;
-    }
-    getFullUrl(input) {
-        const params = this.configuration.params(...this.getParamsFromInput(input));
+    getFullUrl(...args) {
+        const params = this.configuration.params(args[0] ?? {});
         return this.http.buildUrl(params);
     }
-    getPath(input) {
-        return this.configuration.params(...this.getParamsFromInput(input)).path;
+    getPath(...args) {
+        const params = this.configuration.params(args[0] ?? {});
+        return params.path;
     }
     get tags() {
         return this.configuration.tags;
     }
+    get pathDeclaration() {
+        return this.configuration.pathDeclaration;
+    }
     get operationId() {
         return this.configuration.operationId;
     }
-    request(...params) {
-        return this.http.request(this.configuration.params(...params));
+    request(...args) {
+        return this.http.request(this.configuration.params(args[0] ?? {}));
     }
-    getQueryKey(input) {
-        const restParams = this.hasRestParam ? { ...input } : {};
-        return this.configuration.keys.map((key) => {
-            if (typeof key === 'string') {
-                return key;
-            }
-            if (this.hasRestParam) {
-                if ('rest' in key) {
-                    return restParams;
-                }
-                else {
-                    const param = restParams[key.name];
-                    delete restParams[key.name];
-                    return param;
-                }
-            }
-            else {
-                return input[key.name];
-            }
-        });
+    getQueryKey(...args) {
+        const input = args[0] ?? {};
+        return [
+            this.configuration.operationId,
+            this.configuration.pathDeclaration,
+            input,
+        ];
+    }
+    invalidateByPath(filters, options) {
+        return this.queryClient.invalidateByPath(this.configuration.pathDeclaration, filters, options);
     }
     invalidateByOperationId(filters, options) {
         return this.queryClient.invalidateByOperationId(this.operationId, filters, options);
@@ -115,9 +75,12 @@ export class Endpoint {
             exact: filters?.exact ?? false,
         }, options);
     }
-    toMutation(options) {
+    toMutation(
+    // @ts-expect-error
+    options) {
         return new EndpointMutation(this, this.queryClient, options);
     }
+    // @ts-expect-error
     toQuery(options) {
         return new EndpointQuery(this, this.queryClient, options);
     }

package/runtime/endpoint.types.d.ts

@@ -1,15 +1,23 @@
 import { AllPropertiesOptional, AnyObject } from 'yummies/utils/types';
 import type { Endpoint } from './endpoint.js';
+import { FullRequestParams } from './http-client.js';
+export interface EndpointConfiguration<TInput extends AnyObject, TMetaData extends AnyObject = AnyObject> {
+    operationId: string;
+    pathDeclaration: string;
+    meta?: TMetaData;
+    requiredParams: string[];
+    params: (...args: AllPropertiesOptional<TInput> extends true ? [input: Partial<TInput>] : [input: TInput]) => FullRequestParams;
+    tags: string[];
+}
 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 AnyEndpoint = Endpoint<any, any, any, any>;
+export type InferEndpointData<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<infer T, 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;
+export type InferEndpointError<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<any, infer T, any, any> ? T : never;
+export type InferEndpointInput<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<any, any, infer T, any> ? T : never;
+export type InferEndpointMetaData<TEndpoint extends AnyEndpoint> = TEndpoint extends Endpoint<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,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"}
+{"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;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,WAAW,qBAAqB,CACpC,MAAM,SAAS,SAAS,EACxB,SAAS,SAAS,SAAS,GAAG,SAAS;IAEvC,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,MAAM,EAAE,CACN,GAAG,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC,SAAS,IAAI,GAC/C,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,GACxB,CAAC,KAAK,EAAE,MAAM,CAAC,KAChB,iBAAiB,CAAC;IACvB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,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,CAAC,CAAC;AAEvD,MAAM,MAAM,iBAAiB,CAAC,SAAS,SAAS,WAAW,IACzD,SAAS,SAAS,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEjE,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,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEjE,MAAM,MAAM,kBAAkB,CAAC,SAAS,SAAS,WAAW,IAC1D,SAAS,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEjE,MAAM,MAAM,qBAAqB,CAAC,SAAS,SAAS,WAAW,IAC7D,SAAS,SAAS,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC"}