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

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

@@ -1,3 +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

@@ -1 +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;AAyL3D,eAAO,MAAM,gBAAgB,GAAI,QAAQ,MAAM,KAAG,MAqCjD,CAAC"}
+{"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

@@ -1,14 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareDtoModels = void 0;
-const unique_1 = require("./unique");
 const escapeName_1 = require("./escapeName");
-const stripQuotes = (name) => {
-    if (name.startsWith("'") && name.endsWith("'")) {
-        return name.slice(1, -1);
-    }
-    return name;
-};
+const unique_1 = require("./unique");
+const getBaseName = (model) => model.alias || model.name;
 const buildPropertyTarget = (name, prefix) => {
     if (name.startsWith("'") && name.endsWith("'")) {
         return `${prefix}[${name}]`;
@@ -58,7 +53,7 @@ const resolveTypeFactory = (nameMap, kind) => {
             return types.length > 1 ? `(${intersection})` : intersection || 'any';
         }
         if (model.export === 'enum' && model.enum?.length) {
-            return joinUnique(model.enum.map(en => en.value), ' | ') || model.type;
+            return (joinUnique(model.enum.map(en => en.value), ' | ') || model.type);
         }
         if (model.export === 'interface') {
             return buildInlineInterfaceType(model, resolveType);
@@ -67,16 +62,49 @@ const resolveTypeFactory = (nameMap, kind) => {
     };
     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 defaultSuffix = property.default ? ` ?? ${property.default}` : '';
+    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 `new ${dtoName}(${accessor})`;
+            return applyCoercion(`new ${dtoName}(${accessor})`, property, accessor);
         }
-        return `${accessor} ? new ${dtoName}(${accessor}) : undefined`;
+        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 };
@@ -84,13 +112,14 @@ const buildDtoInit = (property, nameMap) => {
         if (itemIsRef) {
             const dtoName = nameMap.get(itemModel.type).dtoName;
             if (property.isRequired) {
-                return `fromArray(${dtoName}, ${accessor})`;
+                return applyCoercion(`fromArray(${dtoName}, ${accessor})`, property, accessor);
             }
-            return `${accessor} ? fromArray(${dtoName}, ${accessor}) : undefined`;
+            const expr = `${accessor} ? fromArray(${dtoName}, ${accessor}) : undefined`;
+            return applyCoercion(expr, property, accessor);
         }
-        return `${accessor}${defaultSuffix}`;
+        return applyCoercion(`${accessor}${defaultSuffix}`, property, accessor);
     }
-    return `${accessor}${defaultSuffix}`;
+    return applyCoercion(`${accessor}${defaultSuffix}`, property, accessor);
 };
 const buildDtoToJson = (property, nameMap) => {
     const accessor = buildPropertyTarget(property.name, 'this');
@@ -128,7 +157,8 @@ const attachDtoGetters = (client) => {
     client.models.forEach(model => {
         if (!model.isDefinition || model.export !== 'interface')
             return;
-        const entries = miraclesByModel.get(model.name);
+        const modelKey = getBaseName(model);
+        const entries = miraclesByModel.get(modelKey) ?? miraclesByModel.get(model.name);
         if (!entries || entries.length === 0)
             return;
         const getters = entries
@@ -154,15 +184,22 @@ const attachDtoGetters = (client) => {
         }
     });
 };
+/**
+ * Подготавливает raw/DTO-модели и геттеры для режима classes.
+ * @param client сгенерированный клиент
+ * @returns клиент с заполненными DTO-полями моделей
+ */
 const prepareDtoModels = (client) => {
     const nameMap = new Map();
     client.models.forEach(model => {
-        const rawName = `${model.name}Raw`;
-        const dtoName = `${model.name}Dto`;
+        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(model.name, { rawName, dtoName });
+        nameMap.set(baseName, { rawName, dtoName });
     });
     const resolveRaw = resolveTypeFactory(nameMap, 'raw');
     const resolveDto = resolveTypeFactory(nameMap, 'dto');
@@ -177,7 +214,7 @@ const prepareDtoModels = (client) => {
         }
         model.properties.forEach(property => {
             property.rawType = resolveRaw(property);
-            property.dtoType = resolveDto(property);
+            property.dtoType = finalizeDtoType(property, resolveDto(property));
             property.dtoInit = buildDtoInit(property, nameMap);
             property.dtoToJSON = buildDtoToJson(property, nameMap);
             property.dtoTarget = buildPropertyTarget(property.name, '');

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,CAmM5H"}
+{"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

@@ -217,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":"AAiGA,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,CAwK1K"}
+{"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

@@ -81,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"));
@@ -205,6 +206,7 @@ function registerHandlebarTemplates(root) {
             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"}

package/dist/core/utils/resolveClassesModeTypes.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveClassesModeTypes = void 0;
+const normalizeImportPath = (value) => (value.startsWith('./') ? value.slice(2) : value);
+const resolveExportName = (model, pathToExportName) => {
+    const modelPath = normalizeImportPath(model.path);
+    if (modelPath) {
+        const exportName = pathToExportName.get(modelPath);
+        if (exportName) {
+            return exportName;
+        }
+    }
+    for (const imprt of model.imports ?? []) {
+        const importPath = normalizeImportPath(imprt.path);
+        const exportName = pathToExportName.get(importPath);
+        if (exportName && (imprt.name === model.base || imprt.name === model.type)) {
+            return exportName;
+        }
+    }
+    return undefined;
+};
+const applyExportNameToModel = (model, pathToExportName) => {
+    const exportName = resolveExportName(model, pathToExportName);
+    if (exportName) {
+        model.base = exportName;
+        model.type = exportName;
+    }
+    if (model.link) {
+        applyExportNameToModel(model.link, pathToExportName);
+    }
+    model.properties?.forEach(child => applyExportNameToModel(child, pathToExportName));
+};
+const resolveImportForClassesMode = (imprt, pathToExportName) => {
+    const importPath = normalizeImportPath(imprt.path);
+    const exportName = pathToExportName.get(importPath);
+    if (!exportName || exportName === imprt.name) {
+        return imprt;
+    }
+    return {
+        ...imprt,
+        name: exportName,
+        alias: '',
+    };
+};
+/**
+ * Заменяет импорты и типы моделей на exportName в режиме classes.
+ * @param client сгенерированный клиент
+ * @returns клиент с обновлёнными импортами и типами
+ */
+const resolveClassesModeTypes = (client) => {
+    const pathToExportName = new Map();
+    client.models.forEach(model => {
+        if (!model.isDefinition) {
+            return;
+        }
+        const exportName = model.exportName || model.alias || model.name;
+        pathToExportName.set(normalizeImportPath(model.path), exportName);
+    });
+    client.services.forEach(service => {
+        service.imports = service.imports.map(imprt => resolveImportForClassesMode(imprt, pathToExportName));
+        service.operations.forEach(operation => {
+            operation.imports = operation.imports.map(imprt => resolveImportForClassesMode(imprt, pathToExportName));
+            operation.results.forEach(result => applyExportNameToModel(result, pathToExportName));
+            operation.parameters.forEach(parameter => applyExportNameToModel(parameter, pathToExportName));
+            operation.parametersPath.forEach(parameter => applyExportNameToModel(parameter, pathToExportName));
+            operation.parametersQuery.forEach(parameter => applyExportNameToModel(parameter, pathToExportName));
+            operation.parametersForm.forEach(parameter => applyExportNameToModel(parameter, pathToExportName));
+            operation.parametersHeader.forEach(parameter => applyExportNameToModel(parameter, pathToExportName));
+            operation.parametersCookie.forEach(parameter => applyExportNameToModel(parameter, pathToExportName));
+            if (operation.parametersBody) {
+                applyExportNameToModel(operation.parametersBody, pathToExportName);
+            }
+        });
+    });
+    return client;
+};
+exports.resolveClassesModeTypes = resolveClassesModeTypes;

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

@@ -0,0 +1,28 @@
+import type { SemanticDiffChange } from '../semanticDiff/analyzeOpenApiDiff';
+import type { DiffReportEntry } from '../types/DiffReport.model';
+import type { DiffAction, DiffSeverity } from '../types/shared/DiffInfo.model';
+/**
+ * Преобразует тип семантического изменения в legacy diff action.
+ * @param changeType тип семантического изменения
+ * @returns действие legacy diff
+ */
+export declare function semanticChangeTypeToAction(changeType: string): DiffAction;
+/**
+ * Преобразует серьёзность семантического изменения в legacy diff severity.
+ * @param severity серьёзность семантического изменения
+ * @returns уровень серьёзности legacy diff
+ */
+export declare function semanticSeverityToDiffSeverity(severity: SemanticDiffChange['severity']): DiffSeverity;
+/**
+ * Строит legacy JSONPath для семантического изменения, включая суффикс `.type`.
+ * @param change семантическое изменение
+ * @returns JSONPath для legacy diff
+ */
+export declare function semanticChangeToJsonPath(change: SemanticDiffChange): string;
+/**
+ * Преобразует семантические изменения в legacy DiffReportEntry.
+ * @param changes список семантических изменений
+ * @returns список legacy diff-записей
+ */
+export declare function semanticChangesToDiffEntries(changes: SemanticDiffChange[]): DiffReportEntry[];
+//# sourceMappingURL=semanticChangesToDiffEntries.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"semanticChangesToDiffEntries.d.ts","sourceRoot":"","sources":["../../../src/core/utils/semanticChangesToDiffEntries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAgB/E;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAczE;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,kBAAkB,CAAC,UAAU,CAAC,GAAG,YAAY,CAUrG;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAQ3E;AAyBD;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,eAAe,EAAE,CAa7F"}

package/dist/core/utils/semanticChangesToDiffEntries.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.semanticChangeTypeToAction = semanticChangeTypeToAction;
+exports.semanticSeverityToDiffSeverity = semanticSeverityToDiffSeverity;
+exports.semanticChangeToJsonPath = semanticChangeToJsonPath;
+exports.semanticChangesToDiffEntries = semanticChangesToDiffEntries;
+const semanticPointerToJsonPath_1 = require("./semanticPointerToJsonPath");
+const REMOVED_CHANGE_TYPES = new Set(['model.removed', 'model.property.removed', 'model.enum.value.removed', 'operation.removed', 'operation.parameter.removed', 'operation.response.success.removed']);
+const ADDED_CHANGE_TYPES = new Set(['model.added', 'model.property.added', 'model.enum.value.added', 'operation.added', 'operation.parameter.added', 'operation.response.success.added']);
+const CHANGED_CHANGE_TYPES = new Set([
+    'model.property.type.changed',
+    'model.property.required.changed',
+    'operation.parameter.required.changed',
+    'operation.parameter.type.changed',
+    'operation.requestBody.required.changed',
+    'operation.response.success.type.changed',
+]);
+/**
+ * Преобразует тип семантического изменения в legacy diff action.
+ * @param changeType тип семантического изменения
+ * @returns действие legacy diff
+ */
+function semanticChangeTypeToAction(changeType) {
+    if (REMOVED_CHANGE_TYPES.has(changeType) || changeType.endsWith('.removed')) {
+        return 'removed';
+    }
+    if (ADDED_CHANGE_TYPES.has(changeType) || changeType.endsWith('.added')) {
+        return 'added';
+    }
+    if (CHANGED_CHANGE_TYPES.has(changeType) || changeType.endsWith('.changed')) {
+        return 'changed';
+    }
+    return 'changed';
+}
+/**
+ * Преобразует серьёзность семантического изменения в legacy diff severity.
+ * @param severity серьёзность семантического изменения
+ * @returns уровень серьёзности legacy diff
+ */
+function semanticSeverityToDiffSeverity(severity) {
+    if (severity === 'breaking') {
+        return 'breaking';
+    }
+    if (severity === 'non-breaking') {
+        return 'warning';
+    }
+    return 'info';
+}
+/**
+ * Строит legacy JSONPath для семантического изменения, включая суффикс `.type`.
+ * @param change семантическое изменение
+ * @returns JSONPath для legacy diff
+ */
+function semanticChangeToJsonPath(change) {
+    const basePath = (0, semanticPointerToJsonPath_1.semanticPointerToJsonPath)(change.path);
+    if (change.type === 'model.property.type.changed' || change.type === 'operation.parameter.type.changed') {
+        return `${basePath}.type`;
+    }
+    return basePath;
+}
+/**
+ * Извлекает значения from/to для legacy diff-записи.
+ * @param change семантическое изменение
+ * @returns значения до и после изменения
+ */
+function resolveSemanticChangeValues(change) {
+    if (change.type === 'model.property.required.changed' || change.type === 'operation.parameter.required.changed') {
+        return {
+            from: change.fromRequired,
+            to: change.toRequired,
+        };
+    }
+    if (change.from !== undefined || change.to !== undefined) {
+        return {
+            from: change.from,
+            to: change.to,
+        };
+    }
+    return {};
+}
+/**
+ * Преобразует семантические изменения в legacy DiffReportEntry.
+ * @param changes список семантических изменений
+ * @returns список legacy diff-записей
+ */
+function semanticChangesToDiffEntries(changes) {
+    return changes.map(change => {
+        const { from, to } = resolveSemanticChangeValues(change);
+        return {
+            action: semanticChangeTypeToAction(change.type),
+            path: semanticChangeToJsonPath(change),
+            severity: semanticSeverityToDiffSeverity(change.severity),
+            from,
+            to,
+            note: change.message,
+        };
+    });
+}

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

@@ -0,0 +1,7 @@
+/**
+ * Преобразует семантический JSON Pointer в legacy JSONPath, используемый генератором.
+ * @param pointer JSON Pointer или уже готовый JSONPath
+ * @returns legacy JSONPath
+ */
+export declare function semanticPointerToJsonPath(pointer: string): string;
+//# sourceMappingURL=semanticPointerToJsonPath.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"semanticPointerToJsonPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/semanticPointerToJsonPath.ts"],"names":[],"mappings":"AAgDA;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAuBjE"}

package/dist/core/utils/semanticPointerToJsonPath.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.semanticPointerToJsonPath = semanticPointerToJsonPath;
+const jsonPath_1 = require("../../common/utils/jsonPath");
+const HTTP_METHODS = new Set(['GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD', 'PATCH', 'TRACE']);
+const OPERATION_SUFFIX_MARKERS = ['parameters', 'requestBody', 'responses'];
+/**
+ * Splits semantic operation pointer tail into operation key and nested suffix segments.
+ */
+function splitOperationPointerTail(tail) {
+    for (const marker of OPERATION_SUFFIX_MARKERS) {
+        const markerIndex = tail.indexOf(`/${marker}`);
+        if (markerIndex > 0) {
+            return {
+                operationKey: tail.slice(0, markerIndex),
+                suffix: [
+                    marker,
+                    ...tail
+                        .slice(markerIndex + marker.length + 1)
+                        .split('/')
+                        .filter(Boolean),
+                ],
+            };
+        }
+    }
+    return { operationKey: tail, suffix: [] };
+}
+/**
+ * Parses semantic operation key "GET /pets" into HTTP method and route path.
+ */
+function parseOperationKey(operationKey) {
+    const match = operationKey.match(/^(GET|PUT|POST|DELETE|OPTIONS|HEAD|PATCH|TRACE)\s+(\S+)$/i);
+    if (!match) {
+        return null;
+    }
+    const method = match[1].toLowerCase();
+    const routePath = match[2];
+    if (!HTTP_METHODS.has(match[1].toUpperCase())) {
+        return null;
+    }
+    return { method, routePath };
+}
+const decodePointerSegment = (segment) => segment.replace(/~1/g, '/').replace(/~0/g, '~');
+/**
+ * Преобразует семантический JSON Pointer в legacy JSONPath, используемый генератором.
+ * @param pointer JSON Pointer или уже готовый JSONPath
+ * @returns legacy JSONPath
+ */
+function semanticPointerToJsonPath(pointer) {
+    if (pointer.startsWith('$')) {
+        return pointer;
+    }
+    if (!pointer.startsWith('#/')) {
+        return pointer;
+    }
+    const body = pointer.slice(2);
+    if (body.startsWith('paths/')) {
+        const tail = body.slice('paths/'.length);
+        const { operationKey, suffix } = splitOperationPointerTail(tail);
+        const parsedOperation = parseOperationKey(operationKey);
+        if (parsedOperation) {
+            return (0, jsonPath_1.toJsonPath)(['paths', parsedOperation.routePath, parsedOperation.method, ...suffix]);
+        }
+    }
+    const rawSegments = body.split('/').map(decodePointerSegment);
+    return (0, jsonPath_1.toJsonPath)(rawSegments);
+}

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

@@ -7,12 +7,11 @@ import type { Service } from '../types/shared/Service.model';
  */
 export declare function forEachOperationInPath(pathObj: Record<string, any>, cb: (method: string, op: any) => void): void;
 /**
- * Ensure service exists in the services map or create a new one.
- *
- * @param services - Map of services
- * @param name - service name
- * @param originName - originName (optional) used when creating a new service
- * @returns existing or newly created Service
+ * Возвращает существующий сервис из map или создаёт новый.
+ * @param services map сервисов
+ * @param name имя сервиса
+ * @param [originName] исходное имя сервиса при создании
+ * @returns существующий или новый сервис
  */
 export declare function ensureService(services: Map<string, Service>, name: string, originName?: string): Service;
 /**
@@ -29,7 +28,7 @@ export declare function mergeOperationImportsIntoService(service: Service, opera
 /**
  * Finalize imports for a service:
  * - Deduplicate and sort imports
- * - Assign aliases for duplicate import names (name, name$1, name$2, ...)
+ * - Assign aliases for duplicate import names (first keeps plain name, then name$2, name$3, ...)
  * - Propagate assigned aliases to models referenced in operations (results, parameters)
  *
  * Modifies service in-place and returns it.

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

@@ -1 +1 @@
-{"version":3,"file":"serviceHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/serviceHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAK7D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAOhH;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAWxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAMvF;AA+CD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAiChE"}
+{"version":3,"file":"serviceHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/serviceHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAM7D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAOhH;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAWxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAMvF;AA+CD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAiBhE"}

package/dist/core/utils/serviceHelpers.js

@@ -5,6 +5,7 @@ exports.ensureService = ensureService;
 exports.mergeOperationImportsIntoService = mergeOperationImportsIntoService;
 exports.finalizeServiceImports = finalizeServiceImports;
 const safeHasOwn_1 = require("../../common/utils/safeHasOwn");
+const modelHelpers_1 = require("./modelHelpers");
 const unique_1 = require("./unique");
 const SUPPORTED_METHODS = ['get', 'put', 'post', 'delete', 'options', 'head', 'patch'];
 /**
@@ -23,12 +24,11 @@ function forEachOperationInPath(pathObj, cb) {
     }
 }
 /**
- * Ensure service exists in the services map or create a new one.
- *
- * @param services - Map of services
- * @param name - service name
- * @param originName - originName (optional) used when creating a new service
- * @returns existing or newly created Service
+ * Возвращает существующий сервис из map или создаёт новый.
+ * @param services map сервисов
+ * @param name имя сервиса
+ * @param [originName] исходное имя сервиса при создании
+ * @returns существующий или новый сервис
  */
 function ensureService(services, name, originName) {
     const existing = services.get(name);
@@ -100,7 +100,7 @@ function fillModelsByAlias(items = [], value) {
 /**
  * Finalize imports for a service:
  * - Deduplicate and sort imports
- * - Assign aliases for duplicate import names (name, name$1, name$2, ...)
+ * - Assign aliases for duplicate import names (first keeps plain name, then name$2, name$3, ...)
  * - Propagate assigned aliases to models referenced in operations (results, parameters)
  *
  * Modifies service in-place and returns it.
@@ -114,24 +114,7 @@ function finalizeServiceImports(service) {
         const nameB = b.name.toLowerCase();
         return nameA.localeCompare(nameB, 'en');
     });
-    let previous;
-    let index = 1;
-    service.imports = service.imports.map(value => {
-        if (previous && previous.name === value.name) {
-            if (index === 1) {
-                previous.alias = `${value.name}$${index}`;
-                index++;
-            }
-            value.alias = `${value.name}$${index}`;
-            index++;
-        }
-        else {
-            value.alias = '';
-            index = 1;
-        }
-        previous = value;
-        return value;
-    });
+    (0, modelHelpers_1.assignDuplicateAliases)(service.imports);
     for (const item of service.imports) {
         for (const operation of service.operations) {
             fillModelsByAlias(operation.results, item);