ts-openapi-codegen 2.0.0 → 2.1.0-beta.10

package/dist/core/utils/loadSemanticOpenApiSpec.d.ts

@@ -0,0 +1,15 @@
+import { CommonOpenApi } from '../types/shared/CommonOpenApi.model';
+/**
+ * Загружает OpenAPI-файл для семантического diff без полного dereference.
+ * @param input путь к файлу спецификации
+ * @returns спецификация с развёрнутыми refs для семантического сравнения
+ */
+export declare function loadSemanticOpenApiSpec(input: string): Promise<CommonOpenApi>;
+/**
+ * Разворачивает уже загруженный OpenAPI-объект для семантического diff.
+ * @param spec загруженная спецификация
+ * @param [sourceFile] исходный путь к файлу для резолва внешних refs
+ * @returns спецификация с развёрнутыми refs для семантического сравнения
+ */
+export declare function loadSemanticOpenApiObject(spec: unknown, sourceFile?: string): Promise<CommonOpenApi>;
+//# sourceMappingURL=loadSemanticOpenApiSpec.d.ts.map

package/dist/core/utils/loadSemanticOpenApiSpec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadSemanticOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/loadSemanticOpenApiSpec.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAqBpE;;;;GAIG;AACH,wBAAsB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAqBnF;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAW1G"}

package/dist/core/utils/loadSemanticOpenApiSpec.js

@@ -0,0 +1,61 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadSemanticOpenApiSpec = loadSemanticOpenApiSpec;
+exports.loadSemanticOpenApiObject = loadSemanticOpenApiObject;
+const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const expandOpenApiRefsForSemanticDiff_1 = require("./expandOpenApiRefsForSemanticDiff");
+function createSwaggerRefsResolver(refs) {
+    return {
+        exists: ref => refs.exists(ref),
+        get: ref => refs.get(ref),
+    };
+}
+function assertOpenApiObject(spec, source) {
+    if (!spec || typeof spec !== 'object' || Array.isArray(spec)) {
+        throw new Error(`Invalid OpenAPI schema at ${source}`);
+    }
+}
+/**
+ * Загружает OpenAPI-файл для семантического diff без полного dereference.
+ * @param input путь к файлу спецификации
+ * @returns спецификация с развёрнутыми refs для семантического сравнения
+ */
+async function loadSemanticOpenApiSpec(input) {
+    const absoluteInput = (0, pathHelpers_1.resolveHelper)(process.cwd(), input);
+    if (!input) {
+        throw new Error(`OpenAPI spec path is empty`);
+    }
+    const exists = await fileSystemHelpers_1.fileSystemHelpers.exists(absoluteInput);
+    if (!exists) {
+        throw new Error(`OpenAPI spec not found: ${absoluteInput}`);
+    }
+    const parser = new swagger_parser_1.default();
+    const resolved = (await parser.resolve(absoluteInput));
+    const raw = resolved.get(absoluteInput);
+    assertOpenApiObject(raw, absoluteInput);
+    return (0, expandOpenApiRefsForSemanticDiff_1.expandOpenApiRefsForSemanticDiff)(raw, {
+        refs: createSwaggerRefsResolver(resolved),
+        sourceFile: absoluteInput,
+    });
+}
+/**
+ * Разворачивает уже загруженный OpenAPI-объект для семантического diff.
+ * @param spec загруженная спецификация
+ * @param [sourceFile] исходный путь к файлу для резолва внешних refs
+ * @returns спецификация с развёрнутыми refs для семантического сравнения
+ */
+async function loadSemanticOpenApiObject(spec, sourceFile) {
+    assertOpenApiObject(spec, sourceFile ?? 'in-memory OpenAPI object');
+    const parser = new swagger_parser_1.default();
+    const resolved = (await parser.resolve(spec));
+    const absoluteSourceFile = sourceFile ? (0, pathHelpers_1.resolveHelper)(process.cwd(), sourceFile) : undefined;
+    return (0, expandOpenApiRefsForSemanticDiff_1.expandOpenApiRefsForSemanticDiff)(spec, {
+        refs: createSwaggerRefsResolver(resolved),
+        sourceFile: absoluteSourceFile,
+    });
+}

package/dist/core/utils/modelHelpers.d.ts

@@ -1,11 +1,18 @@
 import type { Model } from '../types/shared/Model.model';
+type AliasAssignable = {
+    name: string;
+    alias: string;
+};
+/**
+ * Назначает различающие алиасы, когда несколько элементов имеют одно имя.
+ * Первое вхождение сохраняет имя без алиаса; следующие получают $2, $3 и т.д.
+ * @param items массив элементов с полями name и alias
+ * @returns тот же массив с обновлёнными алиасами
+ */
+export declare const assignDuplicateAliases: <T extends AliasAssignable>(items: T[]) => T[];
 /**
  * Assigns alias to models with the same name.
- * Modifies objects of in-place models and returns an array.
- *
- * Example: if there are two models with name="Pet", the following will be assigned:
- * - first: alias="Pet$1"
- * - second: alias="Pet$2"
+ * Modifies objects in-place and returns the same array.
  *
  * @param models - an array of models sorted by name
  * @returns the same array of models (modified)
@@ -25,4 +32,5 @@ export declare function setDuplicateModelAliases(models: Model[]): Model[];
  * @returns the same array of models (modified)
  */
 export declare function resolveModelImports(models: Model[], outputModelsDir: string): Model[];
+export {};
 //# sourceMappingURL=modelHelpers.d.ts.map

package/dist/core/utils/modelHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA4ErF"}
+{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,KAAK,eAAe,GAAG;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,eAAe,EAAE,OAAO,CAAC,EAAE,KAAG,CAAC,EAoB/E,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAEjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CAyErF"}

package/dist/core/utils/modelHelpers.js

@@ -3,40 +3,45 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.assignDuplicateAliases = void 0;
 exports.setDuplicateModelAliases = setDuplicateModelAliases;
 exports.resolveModelImports = resolveModelImports;
 const path_1 = __importDefault(require("path"));
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
+/**
+ * Назначает различающие алиасы, когда несколько элементов имеют одно имя.
+ * Первое вхождение сохраняет имя без алиаса; следующие получают $2, $3 и т.д.
+ * @param items массив элементов с полями name и alias
+ * @returns тот же массив с обновлёнными алиасами
+ */
+const assignDuplicateAliases = (items) => {
+    const nameCounts = new Map();
+    items.forEach(item => {
+        nameCounts.set(item.name, (nameCounts.get(item.name) ?? 0) + 1);
+    });
+    const nameIndex = new Map();
+    items.forEach(item => {
+        const count = nameCounts.get(item.name) ?? 1;
+        if (count <= 1) {
+            item.alias = '';
+            return;
+        }
+        const index = (nameIndex.get(item.name) ?? 0) + 1;
+        nameIndex.set(item.name, index);
+        item.alias = index === 1 ? '' : `${item.name}$${index}`;
+    });
+    return items;
+};
+exports.assignDuplicateAliases = assignDuplicateAliases;
 /**
  * Assigns alias to models with the same name.
- * Modifies objects of in-place models and returns an array.
- *
- * Example: if there are two models with name="Pet", the following will be assigned:
- * - first: alias="Pet$1"
- * - second: alias="Pet$2"
+ * Modifies objects in-place and returns the same array.
  *
  * @param models - an array of models sorted by name
  * @returns the same array of models (modified)
  */
 function setDuplicateModelAliases(models) {
-    let previous;
-    let index = 1;
-    models.forEach(model => {
-        if (previous && previous.name === model.name) {
-            if (index === 1) {
-                previous.alias = `${model.name}$${index}`;
-                index++;
-            }
-            model.alias = `${model.name}$${index}`;
-            index++;
-        }
-        else {
-            model.alias = '';
-            index = 1;
-        }
-        previous = model;
-    });
-    return models;
+    return (0, exports.assignDuplicateAliases)(models);
 }
 /**
  * Adjusts the imports fields of the models to relative paths and correct aliases,

package/dist/core/utils/normalizeString.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalizeString.d.ts","sourceRoot":"","sources":["../../../src/core/utils/normalizeString.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAUzE"}
+{"version":3,"file":"normalizeString.d.ts","sourceRoot":"","sources":["../../../src/core/utils/normalizeString.ts"],"names":[],"mappings":"AAEA,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAMzE"}

package/dist/core/utils/normalizeString.js

@@ -6,9 +6,5 @@ function normalizeString(value) {
     if (!value) {
         return value;
     }
-    return value
-        .replace(Consts_1.REGEX_BACKSLASH, '/')
-        .replace(Consts_1.REGEX_MULTIPLE_SLASHES, '/')
-        .replace(Consts_1.REGEX_DOT_SLASH, '/')
-        .replace(Consts_1.REGEX_LEADING_DOT_SLASH, './');
+    return value.replace(Consts_1.REGEX_BACKSLASH, '/').replace(Consts_1.REGEX_MULTIPLE_SLASHES, '/').replace(Consts_1.REGEX_DOT_SLASH, '/').replace(Consts_1.REGEX_LEADING_DOT_SLASH, './');
 }

package/dist/core/utils/postProcessServiceImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAIpE"}
+{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAEpE"}

package/dist/core/utils/postProcessServiceImports.js

@@ -8,7 +8,5 @@ const unique_1 = require("./unique");
  * @param service
  */
 function postProcessServiceImports(service) {
-    return service.imports
-        .filter(unique_1.unique)
-        .sort(sort_1.sort);
+    return service.imports.filter(unique_1.unique).sort(sort_1.sort);
 }

package/dist/core/utils/precompileTemplates.js

@@ -8,6 +8,7 @@ const handlebars_1 = __importDefault(require("handlebars"));
 const path_1 = require("path");
 const Enums_1 = require("../../common/Enums");
 const Logger_1 = require("../../common/Logger");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const Consts_1 = require("../../core/types/Consts");
 const templatesDir = (0, pathHelpers_1.resolveHelper)(__dirname, '../../templates');
@@ -70,6 +71,7 @@ const precompileTemplates = () => {
                             getRequiredFields: true,
                             getEnumType: true,
                             camelCase: true,
+                            useBatchEslintFix: true,
                         },
                     });
                     const tsContent = header + precompiled;
@@ -83,10 +85,10 @@ const precompileTemplates = () => {
             });
         };
         walk(templatesDir);
-        logger.info('The templates have been successfully precompiled and saved!');
+        logger.info(LoggerMessages_1.LOGGER_MESSAGES.TEMPLATES.PRECOMPILE_SUCCESS);
     }
     catch (error) {
-        logger.error(`Error during pre-compilation of templates: ${error.message}`);
+        logger.error(LoggerMessages_1.LOGGER_MESSAGES.TEMPLATES.PRECOMPILE_ERROR(error.message));
     }
 };
 precompileTemplates();

package/dist/core/utils/prepareAlias.d.ts

@@ -1,3 +1,3 @@
-import { ExportedModel } from "../types/base/ExportedModel.model";
+import { ExportedModel } from '../types/base/ExportedModel.model';
 export declare function prepareAlias(models: ExportedModel[]): void;
 //# sourceMappingURL=prepareAlias.d.ts.map

package/dist/core/utils/prepareDtoModels.d.ts

@@ -0,0 +1,8 @@
+import type { Client } from '../types/shared/Client.model';
+/**
+ * Подготавливает raw/DTO-модели и геттеры для режима classes.
+ * @param client сгенерированный клиент
+ * @returns клиент с заполненными DTO-полями моделей
+ */
+export declare const prepareDtoModels: (client: Client) => Client;
+//# sourceMappingURL=prepareDtoModels.d.ts.map

package/dist/core/utils/prepareDtoModels.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepareDtoModels.d.ts","sourceRoot":"","sources":["../../../src/core/utils/prepareDtoModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAgO3D;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,KAAG,MAuCjD,CAAC"}

package/dist/core/utils/prepareDtoModels.js

@@ -0,0 +1,226 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareDtoModels = void 0;
+const escapeName_1 = require("./escapeName");
+const unique_1 = require("./unique");
+const getBaseName = (model) => model.alias || model.name;
+const buildPropertyTarget = (name, prefix) => {
+    if (name.startsWith("'") && name.endsWith("'")) {
+        return `${prefix}[${name}]`;
+    }
+    return `${prefix}.${name}`;
+};
+const joinUnique = (items, separator) => items.filter(unique_1.unique).join(separator);
+const buildInlineInterfaceType = (model, resolveType) => {
+    if (!model.properties || model.properties.length === 0) {
+        return '{ [key: string]: any }';
+    }
+    const props = model.properties
+        .map(prop => {
+        const name = prop.name.startsWith("'") ? prop.name : `'${prop.name}'`;
+        const optional = prop.isRequired ? '' : '?';
+        const type = resolveType(prop);
+        const nullable = prop.isNullable ? ' | null' : '';
+        return `${name}${optional}: ${type}${nullable}`;
+    })
+        .join('; ');
+    return `{ ${props} }`;
+};
+const resolveTypeFactory = (nameMap, kind) => {
+    const resolveType = (model) => {
+        if (model.export === 'reference') {
+            const mapped = nameMap.get(model.type);
+            return mapped ? (kind === 'raw' ? mapped.rawName : mapped.dtoName) : model.type;
+        }
+        if (model.export === 'array') {
+            const itemModel = model.link ?? { ...model, export: 'reference', link: null };
+            const itemType = model.link ? resolveType(itemModel) : resolveType(itemModel);
+            return `${itemType}[]`;
+        }
+        if (model.export === 'dictionary') {
+            const itemModel = model.link ?? { ...model, export: 'reference', link: null };
+            const itemType = model.link ? resolveType(itemModel) : resolveType(itemModel);
+            return `Record<string, ${itemType}>`;
+        }
+        if (model.export === 'one-of' || model.export === 'any-of') {
+            const types = model.properties.map(prop => resolveType(prop));
+            const union = joinUnique(types, ' | ');
+            return types.length > 1 ? `(${union})` : union || 'any';
+        }
+        if (model.export === 'all-of') {
+            const types = model.properties.map(prop => resolveType(prop));
+            const intersection = joinUnique(types, ' & ');
+            return types.length > 1 ? `(${intersection})` : intersection || 'any';
+        }
+        if (model.export === 'enum' && model.enum?.length) {
+            return (joinUnique(model.enum.map(en => en.value), ' | ') || model.type);
+        }
+        if (model.export === 'interface') {
+            return buildInlineInterfaceType(model, resolveType);
+        }
+        return model.type || 'any';
+    };
+    return resolveType;
+};
+const finalizeDtoType = (property, dtoType) => {
+    if (!property.isRequired && !property.default && !property.isNullable) {
+        return `${dtoType} | undefined`;
+    }
+    return dtoType;
+};
+const applyCoercion = (expr, property, accessor) => {
+    if (!property.needsCoercion || !property.coercionTo) {
+        return expr;
+    }
+    switch (property.coercionTo) {
+        case 'number':
+            return `typeof ${accessor} === 'string' ? Number(${accessor}) : (${expr})`;
+        case 'boolean':
+            return `typeof ${accessor} === 'string' ? ${accessor} === 'true' : (${expr})`;
+        default:
+            return expr;
+    }
+};
+const buildOptionalSuffix = (property) => {
+    if (property.default) {
+        return '';
+    }
+    if (!property.isRequired) {
+        return property.isNullable ? ' ?? null' : ' ?? undefined';
+    }
+    if (property.isNullable) {
+        return ' ?? null';
+    }
+    return '';
+};
+const buildDtoInit = (property, nameMap) => {
+    const accessor = buildPropertyTarget(property.name, 'data');
+    const optionalSuffix = buildOptionalSuffix(property);
+    const defaultSuffix = property.default ? ` ?? ${property.default}` : optionalSuffix;
+    const isReference = property.export === 'reference' && nameMap.has(property.type);
+    if (isReference) {
+        const dtoName = nameMap.get(property.type).dtoName;
+        if (property.isRequired) {
+            return applyCoercion(`new ${dtoName}(${accessor})`, property, accessor);
+        }
+        const expr = `${accessor} ? new ${dtoName}(${accessor}) : undefined`;
+        return applyCoercion(expr, property, accessor);
+    }
+    if (property.export === 'array') {
+        const itemModel = property.link ?? { ...property, export: 'reference', link: null };
+        const itemIsRef = itemModel.export === 'reference' && nameMap.has(itemModel.type);
+        if (itemIsRef) {
+            const dtoName = nameMap.get(itemModel.type).dtoName;
+            if (property.isRequired) {
+                return applyCoercion(`fromArray(${dtoName}, ${accessor})`, property, accessor);
+            }
+            const expr = `${accessor} ? fromArray(${dtoName}, ${accessor}) : undefined`;
+            return applyCoercion(expr, property, accessor);
+        }
+        return applyCoercion(`${accessor}${defaultSuffix}`, property, accessor);
+    }
+    return applyCoercion(`${accessor}${defaultSuffix}`, property, accessor);
+};
+const buildDtoToJson = (property, nameMap) => {
+    const accessor = buildPropertyTarget(property.name, 'this');
+    const isReference = property.export === 'reference' && nameMap.has(property.type);
+    if (isReference) {
+        if (property.isRequired) {
+            return `${accessor}.toJSON()`;
+        }
+        return `${accessor} ? ${accessor}.toJSON() : undefined`;
+    }
+    if (property.export === 'array') {
+        const itemModel = property.link ?? { ...property, export: 'reference', link: null };
+        const itemIsRef = itemModel.export === 'reference' && nameMap.has(itemModel.type);
+        if (itemIsRef) {
+            if (property.isRequired) {
+                return `${accessor}.map(item => item.toJSON())`;
+            }
+            return `${accessor} ? ${accessor}.map(item => item.toJSON()) : undefined`;
+        }
+    }
+    return undefined;
+};
+const attachDtoGetters = (client) => {
+    const miracles = (client.miracles ?? []).filter(miracle => miracle.type === 'RENAME');
+    if (miracles.length === 0)
+        return;
+    const miraclesByModel = new Map();
+    for (const miracle of miracles) {
+        if (!miracle.modelName || !miracle.oldProperty || !miracle.newProperty)
+            continue;
+        const list = miraclesByModel.get(miracle.modelName) ?? [];
+        list.push(miracle);
+        miraclesByModel.set(miracle.modelName, list);
+    }
+    client.models.forEach(model => {
+        if (!model.isDefinition || model.export !== 'interface')
+            return;
+        const modelKey = getBaseName(model);
+        const entries = miraclesByModel.get(modelKey) ?? miraclesByModel.get(model.name);
+        if (!entries || entries.length === 0)
+            return;
+        const getters = entries
+            .map(entry => {
+            const oldName = (0, escapeName_1.escapeName)(entry.oldProperty ?? '');
+            const newName = (0, escapeName_1.escapeName)(entry.newProperty ?? '');
+            if (!oldName || !newName)
+                return null;
+            const hasNewProperty = model.properties.some(prop => prop.name === newName);
+            if (!hasNewProperty)
+                return null;
+            const target = buildPropertyTarget(newName, 'this');
+            return {
+                oldName,
+                newName,
+                target,
+                confidence: entry.confidence,
+            };
+        })
+            .filter((item) => !!item);
+        if (getters.length > 0) {
+            model.dtoGetters = getters;
+        }
+    });
+};
+/**
+ * Подготавливает raw/DTO-модели и геттеры для режима classes.
+ * @param client сгенерированный клиент
+ * @returns клиент с заполненными DTO-полями моделей
+ */
+const prepareDtoModels = (client) => {
+    const nameMap = new Map();
+    client.models.forEach(model => {
+        const baseName = getBaseName(model);
+        const rawName = `${baseName}Raw`;
+        const dtoName = `${baseName}Dto`;
+        model.rawName = rawName;
+        model.dtoName = dtoName;
+        model.exportName = baseName;
+        model.dtoKind = model.export === 'interface' ? 'class' : 'alias';
+        nameMap.set(baseName, { rawName, dtoName });
+    });
+    const resolveRaw = resolveTypeFactory(nameMap, 'raw');
+    const resolveDto = resolveTypeFactory(nameMap, 'dto');
+    client.models.forEach(model => {
+        if (!model.isDefinition) {
+            return;
+        }
+        if (model.export !== 'interface') {
+            model.rawType = resolveRaw(model);
+            model.dtoType = resolveDto(model);
+            return;
+        }
+        model.properties.forEach(property => {
+            property.rawType = resolveRaw(property);
+            property.dtoType = finalizeDtoType(property, resolveDto(property));
+            property.dtoInit = buildDtoInit(property, nameMap);
+            property.dtoToJSON = buildDtoToJson(property, nameMap);
+            property.dtoTarget = buildPropertyTarget(property.name, '');
+        });
+    });
+    attachDtoGetters(client);
+    return client;
+};
+exports.prepareDtoModels = prepareDtoModels;

package/dist/core/utils/registerHandlebarHelpers.d.ts

@@ -3,5 +3,6 @@ export declare function registerHandlebarHelpers(root: {
     httpClient: HttpClient;
     useOptions: boolean;
     useUnionTypes: boolean;
+    useBatchEslintFix?: boolean;
 }): void;
 //# sourceMappingURL=registerHandlebarHelpers.d.ts.map

package/dist/core/utils/registerHandlebarHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAgM5H"}
+{"version":3,"file":"registerHandlebarHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAuMzJ"}

package/dist/core/utils/registerHandlebarHelpers.js

@@ -125,7 +125,7 @@ function registerHandlebarHelpers(root) {
         if (link.path && link.path !== link.base?.toLowerCase())
             return false;
         // Проверяем, является ли base базовым типом
-        const basicTypes = ['string', 'number', 'integer', 'int', 'boolean', 'file', 'File', 'any', 'null'];
+        const basicTypes = ['string', 'number', 'integer', 'int', 'boolean', 'file', 'File', 'blob', 'Blob', 'any', 'null'];
         return basicTypes.includes(link.base);
     });
     Handlebars.registerHelper('yupBaseSchema', function (base) {
@@ -143,6 +143,7 @@ function registerHandlebarHelpers(root) {
             case 'boolean':
                 return 'yup.boolean()';
             case 'file':
+            case 'blob':
                 return 'yup.mixed()';
             default:
                 return 'yup.mixed()';
@@ -163,6 +164,7 @@ function registerHandlebarHelpers(root) {
             case 'boolean':
                 return 'Joi.boolean()';
             case 'file':
+            case 'blob':
                 return 'Joi.any()';
             default:
                 return 'Joi.any()';
@@ -187,6 +189,7 @@ function registerHandlebarHelpers(root) {
             case 'uuid':
                 return 'z.uuid()';
             case 'file':
+            case 'blob':
             case 'any':
                 return 'z.any()';
             default:
@@ -214,4 +217,7 @@ function registerHandlebarHelpers(root) {
         }
         return name;
     });
+    Handlebars.registerHelper('useBatchEslintFix', function () {
+        return Boolean(root.useBatchEslintFix);
+    });
 }

package/dist/core/utils/registerHandlebarTemplates.d.ts

@@ -10,5 +10,6 @@ export declare function registerHandlebarTemplates(root: {
     useOptions: boolean;
     useUnionTypes: boolean;
     validationLibrary?: ValidationLibrary;
+    useBatchEslintFix?: boolean;
 }): Templates;
 //# sourceMappingURL=registerHandlebarTemplates.d.ts.map

package/dist/core/utils/registerHandlebarTemplates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AA8FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAqK1K"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AAkGA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA0C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAC7C,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC/B,GAAG,SAAS,CAyKZ"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -42,6 +42,8 @@ const Handlebars = __importStar(require("handlebars/runtime"));
 const ApiError_1 = __importDefault(require("../../templatesCompiled/client/core/ApiError"));
 const ApiRequestOptions_1 = __importDefault(require("../../templatesCompiled/client/core/ApiRequestOptions"));
 const ApiResult_1 = __importDefault(require("../../templatesCompiled/client/core/ApiResult"));
+const BaseDto_1 = __importDefault(require("../../templatesCompiled/client/core/BaseDto"));
+const dtoUtils_1 = __importDefault(require("../../templatesCompiled/client/core/dtoUtils"));
 const HttpStatusCode_1 = __importDefault(require("../../templatesCompiled/client/core/HttpStatusCode"));
 // axios START
 const getHeaders_1 = __importDefault(require("../../templatesCompiled/client/core/axios/getHeaders"));
@@ -79,6 +81,7 @@ const CancelablePromise_1 = __importDefault(require("../../templatesCompiled/cli
 const request_4 = __importDefault(require("../../templatesCompiled/client/core/request"));
 const requestExecutor_1 = __importDefault(require("../../templatesCompiled/client/core/executor/requestExecutor"));
 const createExecutorAdapter_1 = __importDefault(require("../../templatesCompiled/client/core/executor/createExecutorAdapter"));
+const legacyRequestAdapter_1 = __importDefault(require("../../templatesCompiled/client/core/executor/legacyRequestAdapter"));
 const interceptors_1 = __importDefault(require("../../templatesCompiled/client/core/interceptors/interceptors"));
 const apiErrorInterceptor_1 = __importDefault(require("../../templatesCompiled/client/core/interceptors/apiErrorInterceptor"));
 const withInterceptors_1 = __importDefault(require("../../templatesCompiled/client/core/interceptors/withInterceptors"));
@@ -91,6 +94,7 @@ const sendRequest_4 = __importDefault(require("../../templatesCompiled/client/co
 const exportClient_1 = __importDefault(require("../../templatesCompiled/client/exportClient"));
 const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/exportSchema"));
 const exportModel_1 = __importDefault(require("../../templatesCompiled/client/exportModel"));
+const exportModels_1 = __importDefault(require("../../templatesCompiled/client/exportModels"));
 const exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
 const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
 const indexSimple_1 = __importDefault(require("../../templatesCompiled/client/indexSimple"));
@@ -186,6 +190,7 @@ function registerHandlebarTemplates(root) {
         exports: {
             client: Handlebars.template(exportClient_1.default),
             model: Handlebars.template(exportModel_1.default),
+            models: Handlebars.template(exportModels_1.default),
             schema: Handlebars.template(exportSchema_1.default),
             service: Handlebars.template(exportService_1.default),
         },
@@ -194,11 +199,14 @@ function registerHandlebarTemplates(root) {
             apiError: Handlebars.template(ApiError_1.default),
             apiRequestOptions: Handlebars.template(ApiRequestOptions_1.default),
             apiResult: Handlebars.template(ApiResult_1.default),
+            baseDto: Handlebars.template(BaseDto_1.default),
+            dtoUtils: Handlebars.template(dtoUtils_1.default),
             request: Handlebars.template(request_4.default),
             cancelablePromise: Handlebars.template(CancelablePromise_1.default),
             httpStatusCode: Handlebars.template(HttpStatusCode_1.default),
             requestExecutor: Handlebars.template(requestExecutor_1.default),
             createExecutorAdapter: Handlebars.template(createExecutorAdapter_1.default),
+            legacyRequestAdapter: Handlebars.template(legacyRequestAdapter_1.default),
             interceptors: Handlebars.template(interceptors_1.default),
             apiErrorInterceptor: Handlebars.template(apiErrorInterceptor_1.default),
             withInterceptors: Handlebars.template(withInterceptors_1.default),

package/dist/core/utils/resolveClassesModeTypes.d.ts

@@ -0,0 +1,8 @@
+import type { Client } from '../types/shared/Client.model';
+/**
+ * Заменяет импорты и типы моделей на exportName в режиме classes.
+ * @param client сгенерированный клиент
+ * @returns клиент с обновлёнными импортами и типами
+ */
+export declare const resolveClassesModeTypes: (client: Client) => Client;
+//# sourceMappingURL=resolveClassesModeTypes.d.ts.map

package/dist/core/utils/resolveClassesModeTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveClassesModeTypes.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveClassesModeTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAsD3D;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,GAAI,QAAQ,MAAM,KAAG,MA8BxD,CAAC"}