ts-openapi-codegen 2.1.0-beta.7 → 2.1.0-beta.9

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/writeClientExecutor.d.ts

@@ -8,8 +8,7 @@ interface WriteClientExecutor {
     customExecutorPath?: string;
     services: Service[];
     templates: Templates;
-    useProjectPrettier?: boolean;
-    useEslintFix?: boolean;
+    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":"AAKA,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;IACrB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;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,CAmBxG;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,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,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,CAgBxG;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/core/utils/writeClientExecutor.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientExecutor = writeClientExecutor;
 exports.deduplicateServicesByName = deduplicateServicesByName;
 const LoggerMessages_1 = require("../../common/LoggerMessages");
-const eslintFix_1 = require("../../common/utils/eslintFix");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 function deduplicateServicesByName(services) {
@@ -17,7 +16,7 @@ function deduplicateServicesByName(services) {
     });
 }
 async function writeClientExecutor(options) {
-    const { outputPath, outputCorePath, templates, services, request, customExecutorPath, useProjectPrettier, useEslintFix } = options;
+    const { outputPath, outputCorePath, templates, services, request, customExecutorPath, prettierConfigPath } = options;
     const file = (0, pathHelpers_1.resolveHelper)(outputPath, 'createClient.ts');
     const uniqueServices = deduplicateServicesByName(services);
     const hasCustomRequest = !!request;
@@ -28,10 +27,7 @@ async function writeClientExecutor(options) {
         customExecutorPath,
         services: uniqueServices,
     });
-    const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
+    const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
     await this.writeOutputFile(file, formattedValue);
-    if (useEslintFix) {
-        await (0, eslintFix_1.eslintFix)(file);
-    }
     this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
 }

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

@@ -19,8 +19,7 @@ interface IWriteClientModels {
     useOptions?: boolean;
     modelsMode?: ModelsMode;
     outputCorePath?: string;
-    useProjectPrettier?: boolean;
-    useEslintFix?: boolean;
+    prettierConfigPath?: string;
 }
 /**
  * Generate Models using the Handlebar template and write to disk.

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientModels.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientModels.ts"],"names":[],"mappings":"AAOA,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,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,kBAAkB;IACxB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDrG"}
+{"version":3,"file":"writeClientModels.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientModels.ts"],"names":[],"mappings":"AAKA,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,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,kBAAkB;IACxB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;;GAOG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDrG"}

package/dist/core/utils/writeClientModels.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientModels = writeClientModels;
 const fs_1 = require("fs");
 const LoggerMessages_1 = require("../../common/LoggerMessages");
-const eslintFix_1 = require("../../common/utils/eslintFix");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const ModelsMode_enum_1 = require("../types/enums/ModelsMode.enum");
@@ -16,7 +15,7 @@ const ModelsMode_enum_1 = require("../types/enums/ModelsMode.enum");
  * @param useUnionTypes Use union types instead of enums
  */
 async function writeClientModels(options) {
-    const { models, templates, outputModelsPath, httpClient, useUnionTypes, modelsMode, outputCorePath, useOptions, useProjectPrettier, useEslintFix } = options;
+    const { models, templates, outputModelsPath, httpClient, useUnionTypes, modelsMode, outputCorePath, useOptions, prettierConfigPath } = options;
     this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.MODELS_START);
     if (modelsMode === ModelsMode_enum_1.ModelsMode.CLASSES) {
         const file = (0, pathHelpers_1.resolveHelper)(outputModelsPath, 'models.ts');
@@ -30,6 +29,7 @@ async function writeClientModels(options) {
         });
         const formattedValue = await (0, format_1.format)(templateResult);
         await this.writeOutputFile(file, formattedValue);
+        this.registerLintTarget(file, outputModelsPath);
         this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
         this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.MODELS_FINISH);
         return;
@@ -52,11 +52,9 @@ async function writeClientModels(options) {
             httpClient,
             useUnionTypes,
         });
-        const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
+        const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
         await this.writeOutputFile(file, formattedValue);
-        if (useEslintFix) {
-            await (0, eslintFix_1.eslintFix)(file);
-        }
+        this.registerLintTarget(file, outputModelsPath);
         this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
     }
     this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.MODELS_FINISH);

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

@@ -19,10 +19,8 @@ interface IWriteClientSchemas {
     useUnionTypes: boolean;
     validationLibrary?: ValidationLibrary;
     emptySchemaStrategy: EmptySchemaStrategy;
-    useProjectPrettier?: boolean;
-    useEslintFix?: boolean;
+    prettierConfigPath?: string;
 }
-export declare function isEmptySchemaModel(model: Model): boolean;
 /**
  * Generate Schemas using the Handlebar template and write to disk.
  * @param models Array of Models to write

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO,CAExD;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CA2C1G"}
+{"version":3,"file":"writeClientSchemas.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemas.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C;;;;;;GAMG;AACH,UAAU,mBAAmB;IACzB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAMD;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAwC1G"}

package/dist/core/utils/writeClientSchemas.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmptySchemaModel = isEmptySchemaModel;
 exports.writeClientSchemas = writeClientSchemas;
 const fs_1 = require("fs");
 const LoggerMessages_1 = require("../../common/LoggerMessages");
-const eslintFix_1 = require("../../common/utils/eslintFix");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const EmptySchemaStrategy_enum_1 = require("../types/enums/EmptySchemaStrategy.enum");
@@ -20,7 +18,7 @@ function isEmptySchemaModel(model) {
  * @param useUnionTypes Use union types instead of enums
  */
 async function writeClientSchemas(options) {
-    const { models, templates, outputSchemasPath, httpClient, useUnionTypes, validationLibrary, emptySchemaStrategy, useProjectPrettier, useEslintFix } = options;
+    const { models, templates, outputSchemasPath, httpClient, useUnionTypes, validationLibrary, emptySchemaStrategy, prettierConfigPath } = options;
     if (templates.exports.schema) {
         this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SCHEMAS_START);
         const modelsToWrite = emptySchemaStrategy === EmptySchemaStrategy_enum_1.EmptySchemaStrategy.SKIP ? models.filter(model => !isEmptySchemaModel(model)) : models;
@@ -41,11 +39,8 @@ async function writeClientSchemas(options) {
                 validationLibrary,
                 emptySchemaStrategy,
             });
-            const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
+            const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
             await this.writeOutputFile(file, formattedValue);
-            if (useEslintFix) {
-                await (0, eslintFix_1.eslintFix)(file);
-            }
             this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
         }
         this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SCHEMAS_FINISH);

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

@@ -1,17 +1,21 @@
 import { OutputPaths } from '../types/base/OutputPaths.model';
 import { Templates } from '../types/base/Templates.model';
 import { HttpClient } from '../types/enums/HttpClient.enum';
+import { ModelsMode } from '../types/enums/ModelsMode.enum';
 import type { Service } from '../types/shared/Service.model';
 import { WriteClient } from '../WriteClient';
 type TServeceOutputsPath = Omit<OutputPaths, 'output' | 'outputSchemas'>;
 /**
- * @param services Array of Services to write
- * @param templates The loaded handlebar templates
- * @param outputServicePath Folder options for generating the core, models, and service part
- * @param httpClient The selected httpClient (fetch, xhr or node)
- * @param useUnionTypes Use union types instead of enums
- * @param useOptions Use options or arguments functions
- * @param useCancelableRequest Use cancelable request type
+ * Параметры записи сервисов клиента.
+ * @property services список сервисов для записи
+ * @property templates загруженные Handlebars-шаблоны
+ * @property outputPaths пути выходных директорий сервисов
+ * @property httpClient выбранный HTTP-клиент
+ * @property useUnionTypes использовать union types вместо enum
+ * @property useOptions использовать options-функции вместо аргументов
+ * @property useCancelableRequest использовать cancelable request type
+ * @property [modelsMode] режим генерации моделей
+ * @property [prettierConfigPath] путь к конфигу Prettier
  */
 interface IWriteClientServices {
     services: Service[];
@@ -21,17 +25,12 @@ interface IWriteClientServices {
     useUnionTypes: boolean;
     useOptions: boolean;
     useCancelableRequest: boolean;
-    useProjectPrettier?: boolean;
-    useEslintFix?: boolean;
+    modelsMode?: ModelsMode;
+    prettierConfigPath?: string;
 }
 /**
- * Generate Services using the Handlebar template and write to disk.
- * @param services Array of Services to write
- * @param templates The loaded handlebar templates
- * @param outputServicePath Folder options for generating the core, models, and service part
- * @param httpClient The selected httpClient (fetch, xhr or node)
- * @param useUnionTypes Use union types instead of enums
- * @param useOptions Use options or arguments functions
+ * Генерирует сервисы по Handlebars-шаблону и записывает их на диск.
+ * @param options параметры записи сервисов
  */
 export declare function writeClientServices(this: WriteClient, options: IWriteClientServices): Promise<void>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientServices.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServices.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,KAAK,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,eAAe,CAAC,CAAC;AAEzE;;;;;;;;GAQG;AACH,UAAU,oBAAoB;IAC1B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,mBAAmB,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BzG"}
+{"version":3,"file":"writeClientServices.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServices.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,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,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,KAAK,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,eAAe,CAAC,CAAC;AAEzE;;;;;;;;;;;GAWG;AACH,UAAU,oBAAoB;IAC1B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,mBAAmB,CAAC;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4BzG"}

package/dist/core/utils/writeClientServices.js

@@ -2,20 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientServices = writeClientServices;
 const LoggerMessages_1 = require("../../common/LoggerMessages");
-const eslintFix_1 = require("../../common/utils/eslintFix");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
- * Generate Services using the Handlebar template and write to disk.
- * @param services Array of Services to write
- * @param templates The loaded handlebar templates
- * @param outputServicePath Folder options for generating the core, models, and service part
- * @param httpClient The selected httpClient (fetch, xhr or node)
- * @param useUnionTypes Use union types instead of enums
- * @param useOptions Use options or arguments functions
+ * Генерирует сервисы по Handlebars-шаблону и записывает их на диск.
+ * @param options параметры записи сервисов
  */
 async function writeClientServices(options) {
-    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, useProjectPrettier, useEslintFix } = options;
+    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, modelsMode, prettierConfigPath } = options;
     this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SERVICES_START);
     for (const service of services) {
         const file = (0, pathHelpers_1.resolveHelper)(outputPaths.outputServices, `${service.name}.ts`);
@@ -28,12 +22,11 @@ async function writeClientServices(options) {
             outputCore: outputPaths.outputCore,
             outputModels: outputPaths.outputModels,
             useCancelableRequest,
+            modelsMode,
         });
-        const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
+        const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
         await this.writeOutputFile(file, formattedValue);
-        if (useEslintFix) {
-            await (0, eslintFix_1.eslintFix)(file);
-        }
+        this.registerLintTarget(file, outputPaths.outputServices);
         this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
     }
     this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SERVICES_FINISH);

package/dist/templatesCompiled/client/exportModels.d.ts

@@ -11,20 +11,26 @@ declare const _default: {
     "12": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
     "13": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
     "14": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "16": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "18": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "19": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "20": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "21": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "22": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "24": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "16": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "17": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "19": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "21": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "22": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "23": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "24": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "25": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "26": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "27": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
     "28": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "30": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "29": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "31": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "33": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "35": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "33": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "34": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "36": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "38": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "40": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "41": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "42": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
+    "43": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     compiler: (string | number)[];
     main: (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     usePartial: boolean;

package/dist/templatesCompiled/client/exportModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"exportModels.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/client/exportModels.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,wBA0SmC"}
+{"version":3,"file":"exportModels.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/client/exportModels.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,wBA+VmC"}