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

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);

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

@@ -1,3 +1,3 @@
-import { ExportedModel } from "../types/base/ExportedModel.model";
+import { ExportedModel } from '../types/base/ExportedModel.model';
 export declare function sortModelByName(a: ExportedModel, b: ExportedModel): number;
 //# sourceMappingURL=sortModelByName.d.ts.map

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

@@ -1,3 +1,3 @@
 import { TRawOptions } from '../../common/TRawOptions';
-export declare function validateRawOptions(rawOptions: TRawOptions): void;
+export declare function validateRawOptions(rawOptions: TRawOptions): Promise<void>;
 //# sourceMappingURL=validateRawOptions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"validateRawOptions.d.ts","sourceRoot":"","sources":["../../../src/core/utils/validateRawOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,WAAW,QASzD"}
+{"version":3,"file":"validateRawOptions.d.ts","sourceRoot":"","sources":["../../../src/core/utils/validateRawOptions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAKvD,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/E"}

package/dist/core/utils/validateRawOptions.js

@@ -2,14 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateRawOptions = validateRawOptions;
 const Consts_1 = require("../../common/Consts");
-const validateZodOptions_1 = require("../../common/Validation/validateZodOptions");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
+const Validation_1 = require("../../common/Validation");
 const UnifiedVersionedSchemas_1 = require("../../common/VersionedSchema/AllVersionedSchemas/UnifiedVersionedSchemas");
 const dependentOptionsRefinement_1 = require("../../common/VersionedSchema/refinements/dependentOptionsRefinement");
-function validateRawOptions(rawOptions) {
+async function validateRawOptions(rawOptions) {
     const currentSchema = UnifiedVersionedSchemas_1.rawOptionsSchema.superRefine(dependentOptionsRefinement_1.dependentOptionsRefinement);
-    const validationResult = (0, validateZodOptions_1.validateZodOptions)(currentSchema, rawOptions);
+    const validationResult = (0, Validation_1.validateZodOptions)(currentSchema, rawOptions);
     if (!validationResult.success) {
-        Consts_1.APP_LOGGER.error(validationResult.errors.join('\n'));
+        Consts_1.APP_LOGGER.error(LoggerMessages_1.LOGGER_MESSAGES.ERROR.GENERIC(validationResult.errors.join('\n')));
+        await Consts_1.APP_LOGGER.shutdownLoggerAsync();
         process.exit(1);
     }
 }

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

@@ -1,5 +1,6 @@
 import { Templates } from '../types/base/Templates.model';
 import { HttpClient } from '../types/enums/HttpClient.enum';
+import { ModelsMode } from '../types/enums/ModelsMode.enum';
 import type { Client } from '../types/shared/Client.model';
 import { WriteClient } from '../WriteClient';
 /**
@@ -8,6 +9,7 @@ import { WriteClient } from '../WriteClient';
  * @param outputCorePath The directory for generating the kernel settings
  * @param httpClient The selected httpClient (fetch, xhr or node)
  * @param request: Path to custom request file
+ * @param customExecutorPath: Path to custom executor file
  * @param useCancelableRequest Use cancelable request type
  */
 interface IWriteClientCore {
@@ -18,6 +20,8 @@ interface IWriteClientCore {
     request?: string;
     useCancelableRequest?: boolean;
     useSeparatedIndexes?: boolean;
+    customExecutorPath?: string;
+    modelsMode?: ModelsMode;
 }
 /**
  * Generate OpenAPI core files, this includes the basic boilerplate code to handle requests.

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;GAOG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuCjG"}
+{"version":3,"file":"writeClientCore.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCore.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,UAAU,gBAAgB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B;AAED;;;;;;;;GAQG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmEjG"}

package/dist/core/utils/writeClientCore.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientCore = writeClientCore;
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
+const ModelsMode_enum_1 = require("../types/enums/ModelsMode.enum");
 /**
  * Generate OpenAPI core files, this includes the basic boilerplate code to handle requests.
  * @param client Client object, containing, models, schemas and services
@@ -13,7 +15,7 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
  * @param useCancelableRequest Use cancelable request type
  */
 async function writeClientCore(options) {
-    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest, useSeparatedIndexes } = options;
+    const { client, templates, outputCorePath, httpClient, request, useCancelableRequest, useSeparatedIndexes, customExecutorPath, modelsMode } = options;
     const context = {
         httpClient,
         server: client.server,
@@ -21,29 +23,54 @@ async function writeClientCore(options) {
         useCancelableRequest,
         useSeparatedIndexes,
     };
-    this.logger.info("The recording of the kernel files begins");
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.CORE_START);
     const hasCustomRequest = !!request;
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'OpenAPI.ts'), templates.core.settings(context));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiError.ts'), templates.core.apiError({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiRequestOptions.ts'), templates.core.apiRequestOptions({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiResult.ts'), templates.core.apiResult({}));
-    if (useCancelableRequest) {
-        await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'CancelablePromise.ts'), templates.core.cancelablePromise({}));
-    }
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'HttpStatusCode.ts'), templates.core.httpStatusCode({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request.ts'), templates.core.request(context));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/requestExecutor.ts'), templates.core.requestExecutor({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/createExecutorAdapter.ts'), templates.core.createExecutorAdapter({ useCustomRequest: hasCustomRequest }));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/interceptors.ts'), templates.core.interceptors({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/apiErrorInterceptor.ts'), templates.core.apiErrorInterceptor({}));
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/withInterceptors.ts'), templates.core.withInterceptors({}));
+    const hasCustomExecutor = !!customExecutorPath;
+    let useCustomRequestRaw = false;
     if (hasCustomRequest) {
         const requestFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), request);
         const requestFileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(requestFile);
         if (!requestFileExists) {
             throw new Error(`Custom request file "${requestFile}" does not exists`);
         }
+        const requestFileContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(requestFile, 'utf8');
+        useCustomRequestRaw = /\bexport\s+(async\s+)?function\s+requestRaw\b/.test(requestFileContent);
+    }
+    if (hasCustomExecutor) {
+        const executorFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), customExecutorPath);
+        const executorFileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(executorFile);
+        if (!executorFileExists) {
+            throw new Error(`Custom executor file "${executorFile}" does not exists`);
+        }
+    }
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'OpenAPI.ts'), templates.core.settings(context));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiError.ts'), templates.core.apiError({}));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiRequestOptions.ts'), templates.core.apiRequestOptions({}));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'ApiResult.ts'), templates.core.apiResult({}));
+    if (modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES) {
+        await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'BaseDto.ts'), templates.core.baseDto({}));
+        await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'dtoUtils.ts'), templates.core.dtoUtils({}));
+    }
+    if (useCancelableRequest) {
+        await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'CancelablePromise.ts'), templates.core.cancelablePromise({}));
+    }
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'HttpStatusCode.ts'), templates.core.httpStatusCode({}));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request.ts'), templates.core.request(context));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/requestExecutor.ts'), templates.core.requestExecutor({ useCancelableRequest }));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/createExecutorAdapter.ts'), templates.core.createExecutorAdapter({}));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/legacyRequestAdapter.ts'), templates.core.legacyRequestAdapter({ useCustomRequestRaw }));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/interceptors.ts'), templates.core.interceptors({}));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/apiErrorInterceptor.ts'), templates.core.apiErrorInterceptor({}));
+    await this.writeOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'interceptors/withInterceptors.ts'), templates.core.withInterceptors({}));
+    if (hasCustomRequest) {
+        const requestFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), request);
         await fileSystemHelpers_1.fileSystemHelpers.copyFile(requestFile, (0, pathHelpers_1.resolveHelper)(outputCorePath, 'request.ts'));
+        this.registerOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'request.ts'));
+    }
+    if (hasCustomExecutor) {
+        const executorFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), customExecutorPath);
+        await fileSystemHelpers_1.fileSystemHelpers.copyFile(executorFile, (0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/createExecutorAdapter.ts'));
+        this.registerOutputFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'executor/createExecutorAdapter.ts'));
     }
-    this.logger.info("The writing of the kernel files has been completed successfully");
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.CORE_FINISH);
 }

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

@@ -5,6 +5,7 @@ interface IOptionsProps {
     outputCorePath: string;
     useCancelableRequest?: boolean;
     useSeparatedIndexes?: boolean;
+    modelsMode?: import('../types/enums/ModelsMode.enum').ModelsMode;
 }
 export declare function writeClientCoreIndex(this: WriteClient, options: IOptionsProps): Promise<void>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientCoreIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCoreIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,UAAU,aAAa;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAcnF"}
+{"version":3,"file":"writeClientCoreIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientCoreIndex.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,aAAa;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,gCAAgC,EAAE,UAAU,CAAC;CACpE;AAED,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAuBnF"}

package/dist/core/utils/writeClientCoreIndex.js

@@ -1,16 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientCoreIndex = writeClientCoreIndex;
+const LoggerMessages_1 = require("../../common/LoggerMessages");
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
-const appendUniqueLinesToFile_1 = require("./appendUniqueLinesToFile");
 async function writeClientCoreIndex(options) {
-    const { templates, outputCorePath, useCancelableRequest, useSeparatedIndexes } = options;
+    const { templates, outputCorePath, useCancelableRequest, useSeparatedIndexes, modelsMode } = options;
     if (!useSeparatedIndexes) {
         return;
     }
     const filePath = (0, pathHelpers_1.resolveHelper)(outputCorePath, 'index.ts');
-    this.logger.info(`Data has been written to a file: ${filePath}`);
-    const content = templates.indexes.core({ useCancelableRequest });
-    await (0, appendUniqueLinesToFile_1.appendUniqueLinesToFile)(filePath, content);
-    this.logger.info(`Writing to the file is completed: ${filePath}`);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.INDEX_DATA_WRITTEN(filePath));
+    const content = templates.indexes.core({ useCancelableRequest, modelsMode });
+    let existingContent = '';
+    const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(filePath);
+    if (fileExists) {
+        existingContent = await fileSystemHelpers_1.fileSystemHelpers.readFile(filePath, 'utf8');
+    }
+    const existingLines = existingContent.split(/\r?\n/).filter(Boolean);
+    const dataLines = content.split(/\r?\n/).filter(Boolean);
+    const linesToAdd = dataLines.filter(line => !existingLines.includes(line.trim()));
+    const updatedContent = linesToAdd.length > 0 ? existingContent + linesToAdd.join('\n') + '\n' : existingContent;
+    await this.writeOutputFile(filePath, updatedContent);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.INDEX_WRITE_COMPLETED(filePath));
 }

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

@@ -5,9 +5,9 @@ interface WriteClientExecutor {
     outputPath: string;
     outputCorePath: string;
     request?: string;
-    customExecutorPath?: string;
     services: Service[];
     templates: Templates;
+    prettierConfigPath?: string;
 }
 declare function deduplicateServicesByName(services: Service[]): Service[];
 export declare function writeClientExecutor(this: WriteClient, options: WriteClientExecutor): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientExecutor.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientExecutor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,mBAAmB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,iBAAS,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CASjE;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBxG;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"writeClientExecutor.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientExecutor.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,mBAAmB;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,iBAAS,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CASjE;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAexG;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}