mobx-tanstack-query-api 0.22.1 → 0.23.1

package/codegen/index.cjs

@@ -118,20 +118,56 @@ const generateApi = async (params) => {
         }
         return inputData;
     };
+    const generatedExtra = params.mixinInput
+        ? await (0, swagger_typescript_api_1.generateApi)({
+            ...swaggerTypescriptApiCodegenBaseParams,
+            ...inputToCodegenInput(params.mixinInput),
+            hooks: {
+                onPrepareConfig: (config) => {
+                    config.routes.combined?.forEach((routeInfo) => {
+                        routeInfo.routes.sort((routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage));
+                    });
+                },
+                onFormatRouteName: (routeInfo, usageRouteName) => {
+                    let formattedRouteName = usageRouteName;
+                    if (params.addPathSegmentToRouteName === true ||
+                        typeof params.addPathSegmentToRouteName === 'number') {
+                        const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === 'number'
+                            ? params.addPathSegmentToRouteName
+                            : 0;
+                        const pathSegments = routeInfo.route.split('/').filter(Boolean);
+                        const { _ } = codegenProcess.getRenderTemplateData()
+                            .utils;
+                        formattedRouteName = _.camelCase(`${pathSegments[pathSegmentForSuffix] || ''}_${formattedRouteName}`);
+                    }
+                    const endpointName = formattedRouteName;
+                    return (params?.formatEndpointName?.(endpointName, routeInfo) ??
+                        swaggerTypescriptApiCodegenBaseParams?.hooks?.onFormatRouteName?.(routeInfo, endpointName) ??
+                        endpointName);
+                },
+            },
+        })
+        : null;
     const generated = await (0, swagger_typescript_api_1.generateApi)({
         ...swaggerTypescriptApiCodegenBaseParams,
         ...inputToCodegenInput(params.input),
         hooks: {
             onInit: (configuration, codeGenProcessFromInit) => {
                 codegenProcess = codeGenProcessFromInit;
-                // @ts-expect-error
-                configuration.swaggerSchema.components =
-                    // @ts-expect-error
-                    configuration.swaggerSchema.components || {};
-                // @ts-expect-error
-                configuration.swaggerSchema.components.schemas =
-                    // @ts-expect-error
-                    configuration.swaggerSchema.components.schemas || {};
+                const resultSwaggerSchema = configuration.swaggerSchema;
+                const extraSwaggerSchema = generatedExtra?.configuration?.config
+                    ?.swaggerSchema;
+                resultSwaggerSchema.components = resultSwaggerSchema.components || {};
+                resultSwaggerSchema.components.schemas =
+                    resultSwaggerSchema.components.schemas || {};
+                resultSwaggerSchema.paths = {
+                    ...resultSwaggerSchema.paths,
+                    ...extraSwaggerSchema?.paths,
+                };
+                resultSwaggerSchema.components.schemas = {
+                    ...resultSwaggerSchema.components.schemas,
+                    ...extraSwaggerSchema?.components?.schemas,
+                };
                 return swaggerTypescriptApiCodegenBaseParams?.hooks?.onInit?.(configuration, codeGenProcessFromInit);
             },
             onPrepareConfig: (config) => {
@@ -159,48 +195,9 @@ const generateApi = async (params) => {
             },
         },
     });
-    const generatedExtra = params.mixinInput
-        ? await (0, swagger_typescript_api_1.generateApi)({
-            ...swaggerTypescriptApiCodegenBaseParams,
-            ...inputToCodegenInput(params.mixinInput),
-            hooks: {
-                onPrepareConfig: (config) => {
-                    config.routes.combined?.forEach((routeInfo) => {
-                        routeInfo.routes.sort((routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage));
-                    });
-                },
-                onFormatRouteName: (routeInfo, usageRouteName) => {
-                    let formattedRouteName = usageRouteName;
-                    if (params.addPathSegmentToRouteName === true ||
-                        typeof params.addPathSegmentToRouteName === 'number') {
-                        const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === 'number'
-                            ? params.addPathSegmentToRouteName
-                            : 0;
-                        const pathSegments = routeInfo.route.split('/').filter(Boolean);
-                        const { _ } = codegenProcess.getRenderTemplateData()
-                            .utils;
-                        formattedRouteName = _.camelCase(`${pathSegments[pathSegmentForSuffix] || ''}_${formattedRouteName}`);
-                    }
-                    const endpointName = formattedRouteName;
-                    return (params?.formatEndpointName?.(endpointName, routeInfo) ??
-                        swaggerTypescriptApiCodegenBaseParams?.hooks?.onFormatRouteName?.(routeInfo, endpointName) ??
-                        endpointName);
-                },
-            },
-        })
-        : null;
     //#endregion
     const utils = codegenProcess.getRenderTemplateData()
         .utils;
-    const baseTmplParams = {
-        ...generated,
-        codegenParams: params,
-        configuration: generated.configuration,
-        formatTSContent: generated.formatTSContent,
-        codegenProcess,
-        importFileParams,
-        utils,
-    };
     const { _ } = utils;
     let namespace = null;
     if (params.namespace) {
@@ -214,39 +211,23 @@ const generateApi = async (params) => {
     const codegenFs = codegenProcess.fileSystem;
     codegenFs.cleanDir(params.output);
     codegenFs.createDir(params.output);
-    if (generatedExtra) {
-        const allExtraOperationIdsSet = new Set([
-            ...(generatedExtra.configuration.routes.outOfModule?.map((r) => r.raw.operationId) ?? []),
-            ...(generatedExtra.configuration.routes.combined?.flatMap((r) => r.routes.map((r) => r.raw.operationId)) ?? []),
-        ]);
-        const allExtraModelTypesSet = new Set([
-            ...generatedExtra.configuration.modelTypes.map((m) => m.name),
-        ]);
-        generated.configuration.routes.outOfModule =
-            generated.configuration.routes.outOfModule ?? [];
-        generated.configuration.routes.outOfModule = [
-            ...generated.configuration.routes.outOfModule.filter((route) => !allExtraOperationIdsSet.has(route.raw.operationId)),
-            ...generatedExtra.configuration.routes.outOfModule,
-        ];
-        generated.configuration.routes.combined =
-            generated.configuration.routes.combined ?? [];
-        generated.configuration.routes.combined.forEach((group) => {
-            group.routes = [
-                ...group.routes.filter((route) => !allExtraOperationIdsSet.has(route.raw.operationId)),
-                ...(generatedExtra.configuration.routes.combined?.find((g) => g.moduleName === group.moduleName)?.routes ?? []),
-            ];
-        });
-        const notExistedCombinedExtra = generatedExtra.configuration.routes.combined?.filter((group) => !generated.configuration.routes.combined?.some((g) => g.moduleName === group.moduleName));
-        generated.configuration.routes.combined.push(...(notExistedCombinedExtra ?? []));
-        generated.configuration.modelTypes = [
-            ...generated.configuration.modelTypes.filter((it) => !allExtraModelTypesSet.has(it.name)),
-            ...generatedExtra.configuration.modelTypes,
-        ];
-    }
+    const filterTypes = (0, unpack_filter_option_js_1.unpackFilterOption)(params.filterTypes, (modelType) => modelType.name);
+    generated.configuration.modelTypes =
+        generated.configuration.modelTypes.filter((modelType) => filterTypes(modelType));
     const allRoutes = Object.values(generated.configuration.routes)
         .flat()
         .flatMap((routeGroup) => 'routes' in routeGroup ? routeGroup.routes : routeGroup);
     const filterEndpoint = (0, unpack_filter_option_js_1.unpackFilterOption)(params.filterEndpoints, (route) => route.raw?.operationId || '');
+    const baseTmplParams = {
+        ...generated,
+        codegenParams: params,
+        configuration: generated.configuration,
+        formatTSContent: generated.formatTSContent,
+        codegenProcess,
+        importFileParams,
+        utils,
+        filterTypes,
+    };
     const reservedDataContractNamesMap = new Map();
     const collectedExportFilesFromIndexFile = [];
     const groupsMap = new Map();

package/codegen/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAIV,sBAAsB,EAEvB,0BAAyB;AAI1B,kCAAiC;AAOjC,eAAO,MAAM,WAAW,GACtB,QAAQ,sBAAsB,GAAG,sBAAsB,EAAE,KAExD,OAAO,CAAC,IAAI,CAstBd,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAIV,sBAAsB,EAEvB,0BAAyB;AAI1B,kCAAiC;AAOjC,eAAO,MAAM,WAAW,GACtB,QAAQ,sBAAsB,GAAG,sBAAsB,EAAE,KAExD,OAAO,CAAC,IAAI,CAkrBd,CAAC"}

package/codegen/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAIV,sBAAsB,EAEvB,yBAAyB;AAI1B,iCAAiC;AAOjC,eAAO,MAAM,WAAW,GACtB,QAAQ,sBAAsB,GAAG,sBAAsB,EAAE,KAExD,OAAO,CAAC,IAAI,CAstBd,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/codegen/index.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAIV,sBAAsB,EAEvB,yBAAyB;AAI1B,iCAAiC;AAOjC,eAAO,MAAM,WAAW,GACtB,QAAQ,sBAAsB,GAAG,sBAAsB,EAAE,KAExD,OAAO,CAAC,IAAI,CAkrBd,CAAC"}

package/codegen/index.js

@@ -98,20 +98,56 @@ export const generateApi = async (params) => {
         }
         return inputData;
     };
+    const generatedExtra = params.mixinInput
+        ? await generateApiFromSwagger({
+            ...swaggerTypescriptApiCodegenBaseParams,
+            ...inputToCodegenInput(params.mixinInput),
+            hooks: {
+                onPrepareConfig: (config) => {
+                    config.routes.combined?.forEach((routeInfo) => {
+                        routeInfo.routes.sort((routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage));
+                    });
+                },
+                onFormatRouteName: (routeInfo, usageRouteName) => {
+                    let formattedRouteName = usageRouteName;
+                    if (params.addPathSegmentToRouteName === true ||
+                        typeof params.addPathSegmentToRouteName === 'number') {
+                        const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === 'number'
+                            ? params.addPathSegmentToRouteName
+                            : 0;
+                        const pathSegments = routeInfo.route.split('/').filter(Boolean);
+                        const { _ } = codegenProcess.getRenderTemplateData()
+                            .utils;
+                        formattedRouteName = _.camelCase(`${pathSegments[pathSegmentForSuffix] || ''}_${formattedRouteName}`);
+                    }
+                    const endpointName = formattedRouteName;
+                    return (params?.formatEndpointName?.(endpointName, routeInfo) ??
+                        swaggerTypescriptApiCodegenBaseParams?.hooks?.onFormatRouteName?.(routeInfo, endpointName) ??
+                        endpointName);
+                },
+            },
+        })
+        : null;
     const generated = await generateApiFromSwagger({
         ...swaggerTypescriptApiCodegenBaseParams,
         ...inputToCodegenInput(params.input),
         hooks: {
             onInit: (configuration, codeGenProcessFromInit) => {
                 codegenProcess = codeGenProcessFromInit;
-                // @ts-expect-error
-                configuration.swaggerSchema.components =
-                    // @ts-expect-error
-                    configuration.swaggerSchema.components || {};
-                // @ts-expect-error
-                configuration.swaggerSchema.components.schemas =
-                    // @ts-expect-error
-                    configuration.swaggerSchema.components.schemas || {};
+                const resultSwaggerSchema = configuration.swaggerSchema;
+                const extraSwaggerSchema = generatedExtra?.configuration?.config
+                    ?.swaggerSchema;
+                resultSwaggerSchema.components = resultSwaggerSchema.components || {};
+                resultSwaggerSchema.components.schemas =
+                    resultSwaggerSchema.components.schemas || {};
+                resultSwaggerSchema.paths = {
+                    ...resultSwaggerSchema.paths,
+                    ...extraSwaggerSchema?.paths,
+                };
+                resultSwaggerSchema.components.schemas = {
+                    ...resultSwaggerSchema.components.schemas,
+                    ...extraSwaggerSchema?.components?.schemas,
+                };
                 return swaggerTypescriptApiCodegenBaseParams?.hooks?.onInit?.(configuration, codeGenProcessFromInit);
             },
             onPrepareConfig: (config) => {
@@ -139,48 +175,9 @@ export const generateApi = async (params) => {
             },
         },
     });
-    const generatedExtra = params.mixinInput
-        ? await generateApiFromSwagger({
-            ...swaggerTypescriptApiCodegenBaseParams,
-            ...inputToCodegenInput(params.mixinInput),
-            hooks: {
-                onPrepareConfig: (config) => {
-                    config.routes.combined?.forEach((routeInfo) => {
-                        routeInfo.routes.sort((routeA, routeB) => routeA.routeName.usage.localeCompare(routeB.routeName.usage));
-                    });
-                },
-                onFormatRouteName: (routeInfo, usageRouteName) => {
-                    let formattedRouteName = usageRouteName;
-                    if (params.addPathSegmentToRouteName === true ||
-                        typeof params.addPathSegmentToRouteName === 'number') {
-                        const pathSegmentForSuffix = typeof params.addPathSegmentToRouteName === 'number'
-                            ? params.addPathSegmentToRouteName
-                            : 0;
-                        const pathSegments = routeInfo.route.split('/').filter(Boolean);
-                        const { _ } = codegenProcess.getRenderTemplateData()
-                            .utils;
-                        formattedRouteName = _.camelCase(`${pathSegments[pathSegmentForSuffix] || ''}_${formattedRouteName}`);
-                    }
-                    const endpointName = formattedRouteName;
-                    return (params?.formatEndpointName?.(endpointName, routeInfo) ??
-                        swaggerTypescriptApiCodegenBaseParams?.hooks?.onFormatRouteName?.(routeInfo, endpointName) ??
-                        endpointName);
-                },
-            },
-        })
-        : null;
     //#endregion
     const utils = codegenProcess.getRenderTemplateData()
         .utils;
-    const baseTmplParams = {
-        ...generated,
-        codegenParams: params,
-        configuration: generated.configuration,
-        formatTSContent: generated.formatTSContent,
-        codegenProcess,
-        importFileParams,
-        utils,
-    };
     const { _ } = utils;
     let namespace = null;
     if (params.namespace) {
@@ -194,39 +191,23 @@ export const generateApi = async (params) => {
     const codegenFs = codegenProcess.fileSystem;
     codegenFs.cleanDir(params.output);
     codegenFs.createDir(params.output);
-    if (generatedExtra) {
-        const allExtraOperationIdsSet = new Set([
-            ...(generatedExtra.configuration.routes.outOfModule?.map((r) => r.raw.operationId) ?? []),
-            ...(generatedExtra.configuration.routes.combined?.flatMap((r) => r.routes.map((r) => r.raw.operationId)) ?? []),
-        ]);
-        const allExtraModelTypesSet = new Set([
-            ...generatedExtra.configuration.modelTypes.map((m) => m.name),
-        ]);
-        generated.configuration.routes.outOfModule =
-            generated.configuration.routes.outOfModule ?? [];
-        generated.configuration.routes.outOfModule = [
-            ...generated.configuration.routes.outOfModule.filter((route) => !allExtraOperationIdsSet.has(route.raw.operationId)),
-            ...generatedExtra.configuration.routes.outOfModule,
-        ];
-        generated.configuration.routes.combined =
-            generated.configuration.routes.combined ?? [];
-        generated.configuration.routes.combined.forEach((group) => {
-            group.routes = [
-                ...group.routes.filter((route) => !allExtraOperationIdsSet.has(route.raw.operationId)),
-                ...(generatedExtra.configuration.routes.combined?.find((g) => g.moduleName === group.moduleName)?.routes ?? []),
-            ];
-        });
-        const notExistedCombinedExtra = generatedExtra.configuration.routes.combined?.filter((group) => !generated.configuration.routes.combined?.some((g) => g.moduleName === group.moduleName));
-        generated.configuration.routes.combined.push(...(notExistedCombinedExtra ?? []));
-        generated.configuration.modelTypes = [
-            ...generated.configuration.modelTypes.filter((it) => !allExtraModelTypesSet.has(it.name)),
-            ...generatedExtra.configuration.modelTypes,
-        ];
-    }
+    const filterTypes = unpackFilterOption(params.filterTypes, (modelType) => modelType.name);
+    generated.configuration.modelTypes =
+        generated.configuration.modelTypes.filter((modelType) => filterTypes(modelType));
     const allRoutes = Object.values(generated.configuration.routes)
         .flat()
         .flatMap((routeGroup) => 'routes' in routeGroup ? routeGroup.routes : routeGroup);
     const filterEndpoint = unpackFilterOption(params.filterEndpoints, (route) => route.raw?.operationId || '');
+    const baseTmplParams = {
+        ...generated,
+        codegenParams: params,
+        configuration: generated.configuration,
+        formatTSContent: generated.formatTSContent,
+        codegenProcess,
+        importFileParams,
+        utils,
+        filterTypes,
+    };
     const reservedDataContractNamesMap = new Map();
     const collectedExportFilesFromIndexFile = [];
     const groupsMap = new Map();

package/codegen/templates/all-endpoints-per-file.tmpl.d.cts

@@ -1,7 +1,8 @@
-import type { AnyObject, Maybe } from 'yummies/utils/types';
+import type { ParsedRoute } from 'swagger-typescript-api';
+import type { Maybe } from 'yummies/utils/types';
 import type { BaseTmplParams, MetaInfo } from "../types/index.cjs";
 export interface AllEndpointPerFileTmplParams extends BaseTmplParams {
-    routes: AnyObject[];
+    routes: ParsedRoute[];
     groupName: Maybe<string>;
     metaInfo: Maybe<MetaInfo>;
     relativePathDataContracts: string;

package/codegen/templates/all-endpoints-per-file.tmpl.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"all-endpoints-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/all-endpoints-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,2BAA0B;AAMlE,MAAM,WAAW,4BAA6B,SAAQ,cAAc;IAClE,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1B,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB,GACjC,QAAQ,4BAA4B;;;EA8IrC,CAAC"}
+{"version":3,"file":"all-endpoints-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/all-endpoints-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,2BAA0B;AAMlE,MAAM,WAAW,4BAA6B,SAAQ,cAAc;IAClE,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1B,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB,GACjC,QAAQ,4BAA4B;;;EA8IrC,CAAC"}

package/codegen/templates/all-endpoints-per-file.tmpl.d.ts

@@ -1,7 +1,8 @@
-import type { AnyObject, Maybe } from 'yummies/utils/types';
+import type { ParsedRoute } from 'swagger-typescript-api';
+import type { Maybe } from 'yummies/utils/types';
 import type { BaseTmplParams, MetaInfo } from "../types/index.js";
 export interface AllEndpointPerFileTmplParams extends BaseTmplParams {
-    routes: AnyObject[];
+    routes: ParsedRoute[];
     groupName: Maybe<string>;
     metaInfo: Maybe<MetaInfo>;
     relativePathDataContracts: string;

package/codegen/templates/all-endpoints-per-file.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"all-endpoints-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/all-endpoints-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,0BAA0B;AAMlE,MAAM,WAAW,4BAA6B,SAAQ,cAAc;IAClE,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1B,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB,GACjC,QAAQ,4BAA4B;;;EA8IrC,CAAC"}
+{"version":3,"file":"all-endpoints-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/all-endpoints-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,0BAA0B;AAMlE,MAAM,WAAW,4BAA6B,SAAQ,cAAc;IAClE,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC1B,yBAAyB,EAAE,MAAM,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB,GACjC,QAAQ,4BAA4B;;;EA8IrC,CAAC"}

package/codegen/templates/endpoint-per-file.tmpl.d.cts

@@ -1,7 +1,8 @@
-import type { AnyObject, Maybe } from 'yummies/utils/types';
+import type { ParsedRoute } from 'swagger-typescript-api';
+import type { Maybe } from 'yummies/utils/types';
 import type { BaseTmplParams, MetaInfo } from "../types/index.cjs";
 export interface EndpointPerFileTmplParams extends BaseTmplParams {
-    route: AnyObject;
+    route: ParsedRoute;
     relativePathDataContracts: string;
     groupName: Maybe<string>;
     metaInfo: Maybe<MetaInfo>;

package/codegen/templates/endpoint-per-file.tmpl.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"endpoint-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/endpoint-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,2BAA0B;AAMlE,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,KAAK,EAAE,SAAS,CAAC;IACjB,yBAAyB,EAAE,MAAM,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,yBAAyB;;;EAgIlC,CAAC"}
+{"version":3,"file":"endpoint-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/endpoint-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,2BAA0B;AAMlE,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,KAAK,EAAE,WAAW,CAAC;IACnB,yBAAyB,EAAE,MAAM,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,yBAAyB;;;EAgIlC,CAAC"}

package/codegen/templates/endpoint-per-file.tmpl.d.ts

@@ -1,7 +1,8 @@
-import type { AnyObject, Maybe } from 'yummies/utils/types';
+import type { ParsedRoute } from 'swagger-typescript-api';
+import type { Maybe } from 'yummies/utils/types';
 import type { BaseTmplParams, MetaInfo } from "../types/index.js";
 export interface EndpointPerFileTmplParams extends BaseTmplParams {
-    route: AnyObject;
+    route: ParsedRoute;
     relativePathDataContracts: string;
     groupName: Maybe<string>;
     metaInfo: Maybe<MetaInfo>;

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

@@ -1 +1 @@
-{"version":3,"file":"endpoint-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/endpoint-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,0BAA0B;AAMlE,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,KAAK,EAAE,SAAS,CAAC;IACjB,yBAAyB,EAAE,MAAM,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,yBAAyB;;;EAgIlC,CAAC"}
+{"version":3,"file":"endpoint-per-file.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/endpoint-per-file.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,0BAA0B;AAMlE,MAAM,WAAW,yBAA0B,SAAQ,cAAc;IAC/D,KAAK,EAAE,WAAW,CAAC;IACnB,yBAAyB,EAAE,MAAM,CAAC;IAClC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,yBAAyB;;;EAgIlC,CAAC"}

package/codegen/templates/new-endpoint.tmpl.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.newEndpointTmpl = void 0;
+const create_short_model_type_js_1 = require("../utils/create-short-model-type.cjs");
 const meta_info_tmpl_js_1 = require("./meta-info.tmpl.cjs");
 // RequestParams["type"]
 const requestContentKind = {
@@ -16,9 +17,11 @@ const responseContentKind = {
     FORM_DATA: '"formData"',
     BYTES: '"bytes"',
 };
-const newEndpointTmpl = ({ route, codegenParams, importFileParams, utils, groupName, metaInfo, }) => {
+const newEndpointTmpl = ({ route, codegenParams, importFileParams, utils, groupName, metaInfo, filterTypes, configuration, }) => {
     const { _ } = utils;
-    const positiveResponseTypes = route.raw.responsesTypes?.filter((it) => +it.status >= 200 && +it.status < 300);
+    const positiveResponseTypes = route.raw.responsesTypes?.filter((it) => +it.status >= 200 &&
+        +it.status < 300 &&
+        (!it.typeData || filterTypes(it.typeData)));
     const { requestBodyInfo, responseBodyInfo } = route;
     const routeRequest = route.request;
     const routeResponse = route.response;
@@ -58,7 +61,12 @@ const newEndpointTmpl = ({ route, codegenParams, importFileParams, utils, groupN
     };
     const tags = (raw.tags || []).filter(Boolean);
     const requestOutputDataTypes = positiveResponseTypes.map((it) => it.type);
-    const requestOutputErrorType = routeResponse.errorType;
+    const foundErrorModelType = (routeResponse.errorType &&
+        configuration.modelTypes.find((it) => it.name === routeResponse.errorType)) ||
+        null;
+    const requestOutputErrorType = foundErrorModelType
+        ? routeResponse.errorType
+        : 'any';
     const pathParamsToInline = path.split('/').slice(1);
     let lastDynamicStructPos = 0;
     const queryParamStruct = query == null
@@ -81,7 +89,7 @@ const newEndpointTmpl = ({ route, codegenParams, importFileParams, utils, groupN
     const responseFormat = responseContentKind[responseBodyInfo.success?.schema?.contentKind] || null;
     const reservedDataContractNames = _.uniq([
         ...requestOutputDataTypes,
-        requestOutputErrorType,
+        requestOutputErrorType || 'any',
         ...getArgs({
             withPayload: true,
         }).map((it) => it.type),
@@ -89,14 +97,15 @@ const newEndpointTmpl = ({ route, codegenParams, importFileParams, utils, groupN
     const pathDeclaration = resultPath.replaceAll('$', '');
     const getHttpRequestGenerics = () => {
         const defaultOkResponse = positiveResponseTypes?.[0]?.type || 'unknown';
-        const defaultBadResponse = routeResponse.errorType;
-        const responses = raw.responsesTypes?.filter((it) => it.status !== 'default') ||
-            [];
+        const defaultBadResponse = requestOutputErrorType;
+        const responses = raw.responsesTypes?.filter((it) => it.status !== 'default' &&
+            (!it.typeData ||
+                filterTypes(it.typeData))) || [];
         if (!responses?.length) {
-            return `HttpResponse<unknown, ${routeResponse.errorType}>`;
+            return `HttpResponse<unknown, ${requestOutputErrorType}>`;
         }
         if (responses.length === 1 && responses[0].isSuccess) {
-            return `HttpResponse<${responses[0].type}, ${routeResponse.errorType}>`;
+            return `HttpResponse<${responses[0].type}, ${requestOutputErrorType}>`;
         }
         return `HttpMultistatusResponse<{
   ${responses
@@ -114,7 +123,7 @@ const newEndpointTmpl = ({ route, codegenParams, importFileParams, utils, groupN
   ${defaultBadResponse}
   >`;
     };
-    const requestInputTypeDc = {
+    const requestInputTypeDc = (0, create_short_model_type_js_1.createShortModelType)({
         typeIdentifier: 'type',
         name: _.upperFirst(_.camelCase(`${route.routeName.usage}Params`)),
         content: `{
@@ -125,14 +134,15 @@ const newEndpointTmpl = ({ route, codegenParams, importFileParams, utils, groupN
             .filter(Boolean)
             .join(', ')}
   }`,
-    };
+    });
+    const isAllowedInputType = filterTypes(requestInputTypeDc);
     return {
         reservedDataContractNames,
-        localModelTypes: [requestInputTypeDc],
+        localModelTypes: isAllowedInputType ? [requestInputTypeDc] : [],
         content: `
 new ${importFileParams.endpoint.exportName}<
   ${getHttpRequestGenerics()},
-  ${requestInputTypeDc.name},
+  ${isAllowedInputType ? requestInputTypeDc.name : 'any'},
   ${requestInfoMeta?.typeName ?? 'any'}
 >(
     {

package/codegen/templates/new-endpoint.tmpl.d.cts

@@ -1,18 +1,15 @@
-import type { AnyObject, Maybe } from 'yummies/utils/types';
+import type { ParsedRoute } from 'swagger-typescript-api';
+import type { Maybe } from 'yummies/utils/types';
 import type { BaseTmplParams } from "../types/base-tmpl-params.cjs";
 import type { MetaInfo } from "../types/index.cjs";
 export interface NewEndpointTmplParams extends BaseTmplParams {
-    route: AnyObject;
+    route: ParsedRoute;
     groupName: Maybe<string>;
     metaInfo: Maybe<MetaInfo>;
 }
-export declare const newEndpointTmpl: ({ route, codegenParams, importFileParams, utils, groupName, metaInfo, }: NewEndpointTmplParams) => {
+export declare const newEndpointTmpl: ({ route, codegenParams, importFileParams, utils, groupName, metaInfo, filterTypes, configuration, }: NewEndpointTmplParams) => {
     reservedDataContractNames: string[];
-    localModelTypes: {
-        typeIdentifier: string;
-        name: Capitalize<string>;
-        content: string;
-    }[];
+    localModelTypes: (Omit<import("swagger-typescript-api").ModelType, "rawContent"> & Partial<Pick<import("swagger-typescript-api").ModelType, "rawContent">> & import("swagger-typescript-api").ModelType)[];
     content: string;
 };
 //# sourceMappingURL=new-endpoint.tmpl.d.ts.map

package/codegen/templates/new-endpoint.tmpl.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"new-endpoint.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-endpoint.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,cAAc,EAAE,sCAAqC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,2BAA0B;AAMlD,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAiBD,eAAO,MAAM,eAAe,GAAI,yEAO7B,qBAAqB;;;;;;;;CA6MvB,CAAC"}
+{"version":3,"file":"new-endpoint.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-endpoint.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,sCAAqC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,2BAA0B;AAOlD,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAiBD,eAAO,MAAM,eAAe,GAAI,qGAS7B,qBAAqB;;;;CA8NvB,CAAC"}

package/codegen/templates/new-endpoint.tmpl.d.ts

@@ -1,18 +1,15 @@
-import type { AnyObject, Maybe } from 'yummies/utils/types';
+import type { ParsedRoute } from 'swagger-typescript-api';
+import type { Maybe } from 'yummies/utils/types';
 import type { BaseTmplParams } from "../types/base-tmpl-params.js";
 import type { MetaInfo } from "../types/index.js";
 export interface NewEndpointTmplParams extends BaseTmplParams {
-    route: AnyObject;
+    route: ParsedRoute;
     groupName: Maybe<string>;
     metaInfo: Maybe<MetaInfo>;
 }
-export declare const newEndpointTmpl: ({ route, codegenParams, importFileParams, utils, groupName, metaInfo, }: NewEndpointTmplParams) => {
+export declare const newEndpointTmpl: ({ route, codegenParams, importFileParams, utils, groupName, metaInfo, filterTypes, configuration, }: NewEndpointTmplParams) => {
     reservedDataContractNames: string[];
-    localModelTypes: {
-        typeIdentifier: string;
-        name: Capitalize<string>;
-        content: string;
-    }[];
+    localModelTypes: (Omit<import("swagger-typescript-api").ModelType, "rawContent"> & Partial<Pick<import("swagger-typescript-api").ModelType, "rawContent">> & import("swagger-typescript-api").ModelType)[];
     content: string;
 };
 //# sourceMappingURL=new-endpoint.tmpl.d.ts.map

package/codegen/templates/new-endpoint.tmpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-endpoint.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-endpoint.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAE5D,OAAO,KAAK,EAAE,cAAc,EAAE,qCAAqC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,0BAA0B;AAMlD,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAiBD,eAAO,MAAM,eAAe,GAAI,yEAO7B,qBAAqB;;;;;;;;CA6MvB,CAAC"}
+{"version":3,"file":"new-endpoint.tmpl.d.ts","sourceRoot":"","sources":["../../../src/codegen/templates/new-endpoint.tmpl.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,qCAAqC;AACnE,OAAO,KAAK,EAAE,QAAQ,EAAE,0BAA0B;AAOlD,MAAM,WAAW,qBAAsB,SAAQ,cAAc;IAC3D,KAAK,EAAE,WAAW,CAAC;IACnB,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;CAC3B;AAiBD,eAAO,MAAM,eAAe,GAAI,qGAS7B,qBAAqB;;;;CA8NvB,CAAC"}