mobx-tanstack-query-api 0.0.38 → 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;;;CA2K1B,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,11 +24,12 @@ 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 inputParams = [...pathParams, query, requestConfigParam].filter(Boolean);
     const getArgs = ({ withPayload, withRequestConfigParam, }) => {
         return _.sortBy(_.compact([
             ...(requestParams
@@ -47,15 +48,8 @@ export const newRequestInfoTmpl = ({ route, apiParams, importFileParams, utils,
         ]), [(o) => o.optional]);
     };
     const tags = (raw.tags || []).filter(Boolean);
-    const allArgs = getArgs({
-        withPayload: true,
-        withRequestConfigParam: true,
-    });
-    const requiredArgs = allArgs.filter((it) => !it.optional);
     const requestOutputDataTypes = positiveResponseTypes.map((it) => it.type);
     const requestOutputErrorType = routeResponse.errorType;
-    let requestInputCombinedType;
-    const requestInfoFnArgNames = allArgs.map(({ name }) => name);
     const pathParamsToInline = path.split('/').slice(1);
     let lastDynamicStructPos = 0;
     const queryParamStruct = query == null
@@ -69,22 +63,6 @@ export const newRequestInfoTmpl = ({ route, apiParams, importFileParams, utils,
     if (queryParamStruct && !lastDynamicStructPos) {
         lastDynamicStructPos++;
     }
-    let requestInputType = `{
-  ${allArgs
-        .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 requestInfoMeta = apiParams.getEndpointMeta?.(route, utils);
     const requestMeta = apiParams.getRequestMeta?.(route, utils);
     const resultPath = (apiParams.requestPathPrefix ?? '') +
@@ -100,17 +78,32 @@ export const newRequestInfoTmpl = ({ route, apiParams, importFileParams, utils,
         }).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},
+  ${requestInputTypeDc.name},
   ${requestInfoMeta?.typeName ?? 'any'}
 >(
     {
-        params: ({ ${requestInfoFnArgNames} }) => ({
+        params: ({
+  ${inputParams.map((it) => it.name)}
+}) => ({
             path: \`${resultPath}\`,
             method: '${_.upperCase(method)}',
             ${requestMeta?.tmplData ? `meta: ${requestMeta.tmplData},` : ''}
@@ -119,9 +112,9 @@ new ${importFileParams.endpoint.exportName}<
             ${security ? 'secure: true,' : ''}
             ${bodyContentType ? `contentType: ${bodyContentType},` : ''}
             ${responseFormat ? `format: ${responseFormat},` : ''}
-            ...${requestInfoFnArgNames.at(-1)},  
+            ...${requestConfigParam.name},
         }),
-        requiredParams: [${requiredArgs.map((it) => `"${it.name}"`)}],
+        requiredParams: [${inputParams.filter((it) => !it.optional).map((it) => `"${it.name}"`)}],
         operationId: "${raw.operationId}",
         pathDeclaration: "${pathDeclaration}",
         tags: [${tags.map((tag) => `"${tag}"`)}],

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.38",
+  "version": "0.0.39",
   "keywords": [],
   "author": "js2me",
   "license": "MIT",