ts-openapi-codegen 2.1.0-beta.6 → 2.1.0-beta.8

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":"AAMA,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

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientModels = writeClientModels;
 const fs_1 = require("fs");
-const eslintFix_1 = require("../../common/utils/eslintFix");
-const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const ModelsMode_enum_1 = require("../types/enums/ModelsMode.enum");
@@ -16,8 +15,8 @@ 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;
-    this.logger.info('Recording of model files begins');
+    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');
         const templateResult = templates.exports.models({
@@ -29,9 +28,10 @@ async function writeClientModels(options) {
             modelsMode,
         });
         const formattedValue = await (0, format_1.format)(templateResult);
-        await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
-        this.logger.info(`File recording completed: ${file}`);
-        this.logger.info('Model file recording completed successfully');
+        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;
     }
     for (const model of models) {
@@ -42,22 +42,20 @@ async function writeClientModels(options) {
         const dir = (0, pathHelpers_1.dirNameHelper)(modelFolderPath);
         if (dir) {
             const directory = (0, pathHelpers_1.resolveHelper)(outputModelsPath, dir);
-            this.logger.info(`A directory is being created: ${directory}`);
+            this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DIRECTORY_CREATING(directory));
             (0, fs_1.mkdirSync)(directory, { recursive: true });
         }
         const file = (0, pathHelpers_1.resolveHelper)(outputModelsPath, `${modelFolderPath}.ts`);
-        this.logger.info(`The recording of the file data begins: ${file}`);
+        this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DATA_WRITE_START(file));
         const templateResult = templates.exports.model({
             ...model,
             httpClient,
             useUnionTypes,
         });
-        const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
-        await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
-        if (useEslintFix) {
-            await (0, eslintFix_1.eslintFix)(file);
-        }
-        this.logger.info(`File recording completed: ${file}`);
+        const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
+        await this.writeOutputFile(file, formattedValue);
+        this.registerLintTarget(file, outputModelsPath);
+        this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
     }
-    this.logger.info('Model file recording completed successfully');
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.MODELS_FINISH);
 }

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

@@ -1,7 +1,7 @@
 import { Templates } from '../types/base/Templates.model';
+import { ModelsMode } from '../types/enums/ModelsMode.enum';
 import { Model } from '../types/shared/Model.model';
 import { WriteClient } from '../WriteClient';
-import { ModelsMode } from '../types/enums/ModelsMode.enum';
 interface IOptionsProps {
     models: Model[];
     templates: Templates;

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientModelsIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientModelsIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAE5D,UAAU,aAAa;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAcrF"}
+{"version":3,"file":"writeClientModelsIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientModelsIndex.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,aAAa;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CAC3B;AAED,wBAAsB,sBAAsB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAuBrF"}

package/dist/core/utils/writeClientModelsIndex.js

@@ -1,16 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientModelsIndex = writeClientModelsIndex;
+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 writeClientModelsIndex(options) {
     const { models, templates, outputModelsPath, useSeparatedIndexes, modelsMode } = options;
     if (!useSeparatedIndexes) {
         return;
     }
     const filePath = (0, pathHelpers_1.resolveHelper)(outputModelsPath, 'index.ts');
-    this.logger.info(`Data has been written to a file: ${filePath}`);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.INDEX_DATA_WRITTEN(filePath));
     const content = templates.indexes.models({ models, modelsMode });
-    await (0, appendUniqueLinesToFile_1.appendUniqueLinesToFile)(filePath, content);
-    this.logger.info(`Writing to the file is completed: ${filePath}`);
+    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/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":"AAMA,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 eslintFix_1 = require("../../common/utils/eslintFix");
-const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 const EmptySchemaStrategy_enum_1 = require("../types/enums/EmptySchemaStrategy.enum");
@@ -20,20 +18,20 @@ 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('The recording of model validation schema files begins.');
+        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;
         for (const model of modelsToWrite) {
             const modelFolderPath = model?.path;
             const dir = (0, pathHelpers_1.dirNameHelper)(modelFolderPath);
             if (dir) {
                 const directory = (0, pathHelpers_1.resolveHelper)(outputSchemasPath, dir);
-                this.logger.info(`A directory is being created: ${directory}`);
+                this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DIRECTORY_CREATING(directory));
                 (0, fs_1.mkdirSync)(directory, { recursive: true });
             }
             const file = (0, pathHelpers_1.resolveHelper)(outputSchemasPath, `${modelFolderPath}Schema.ts`);
-            this.logger.info(`The recording of the file data begins: ${file}`);
+            this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DATA_WRITE_START(file));
             const templateResult = templates.exports.schema({
                 ...model,
                 httpClient,
@@ -41,14 +39,11 @@ async function writeClientSchemas(options) {
                 validationLibrary,
                 emptySchemaStrategy,
             });
-            const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
-            await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
-            if (useEslintFix) {
-                await (0, eslintFix_1.eslintFix)(file);
-            }
-            this.logger.info(`File recording completed: ${file}`);
+            const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
+            await this.writeOutputFile(file, formattedValue);
+            this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
         }
-        this.logger.info('The recording of model validation schema files has been completed successfully');
+        this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SCHEMAS_FINISH);
         return modelsToWrite;
     }
     return [];

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientSchemasIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemasIndex.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,UAAU,aAAa;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBActF"}
+{"version":3,"file":"writeClientSchemasIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientSchemasIndex.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,UAAU,aAAa;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAuBtF"}

package/dist/core/utils/writeClientSchemasIndex.js

@@ -1,16 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientSchemasIndex = writeClientSchemasIndex;
+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 writeClientSchemasIndex(options) {
     const { models, templates, outputSchemasPath, useSeparatedIndexes } = options;
     if (!useSeparatedIndexes) {
         return;
     }
     const filePath = (0, pathHelpers_1.resolveHelper)(outputSchemasPath, 'index.ts');
-    this.logger.info(`Data has been written to a file: ${filePath}`);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.INDEX_DATA_WRITTEN(filePath));
     const content = templates.indexes.schemas({ schemas: models });
-    await (0, appendUniqueLinesToFile_1.appendUniqueLinesToFile)(filePath, content);
-    this.logger.info(`Writing to the file is completed: ${filePath}`);
+    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/writeClientServices.d.ts

@@ -12,7 +12,6 @@ type TServeceOutputsPath = Omit<OutputPaths, 'output' | 'outputSchemas'>;
  * @param useUnionTypes Use union types instead of enums
  * @param useOptions Use options or arguments functions
  * @param useCancelableRequest Use cancelable request type
- * @param useRequestRaw Generate *Raw service methods
  */
 interface IWriteClientServices {
     services: Service[];
@@ -22,9 +21,7 @@ interface IWriteClientServices {
     useUnionTypes: boolean;
     useOptions: boolean;
     useCancelableRequest: boolean;
-    useRequestRaw: boolean;
-    useProjectPrettier?: boolean;
-    useEslintFix?: boolean;
+    prettierConfigPath?: string;
 }
 /**
  * Generate Services using the Handlebar template and write to disk.

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":"AAIA,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;;;;;;;;;GASG;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,aAAa,EAAE,OAAO,CAAC;IACvB,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,CA8BzG"}
+{"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,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,MAAM,CAAC;CAC/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BzG"}

package/dist/core/utils/writeClientServices.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientServices = writeClientServices;
-const eslintFix_1 = require("../../common/utils/eslintFix");
-const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const format_1 = require("../../common/utils/format");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
@@ -15,11 +14,11 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
  * @param useOptions Use options or arguments functions
  */
 async function writeClientServices(options) {
-    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, useRequestRaw, useProjectPrettier, useEslintFix } = options;
-    this.logger.info('Recording of service files begins');
+    const { services, templates, outputPaths, httpClient, useUnionTypes, useOptions, useCancelableRequest, 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`);
-        this.logger.info(`The recording of the file data begins: ${file}`);
+        this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DATA_WRITE_START(file));
         const templateResult = templates.exports.service({
             ...service,
             httpClient,
@@ -28,14 +27,11 @@ async function writeClientServices(options) {
             outputCore: outputPaths.outputCore,
             outputModels: outputPaths.outputModels,
             useCancelableRequest,
-            useRequestRaw,
         });
-        const formattedValue = await (0, format_1.format)(templateResult, undefined, useProjectPrettier);
-        await fileSystemHelpers_1.fileSystemHelpers.writeFile(file, formattedValue);
-        if (useEslintFix) {
-            await (0, eslintFix_1.eslintFix)(file);
-        }
-        this.logger.info(`File recording completed: ${file}`);
+        const formattedValue = await (0, format_1.format)(templateResult, undefined, prettierConfigPath);
+        await this.writeOutputFile(file, formattedValue);
+        this.registerLintTarget(file, outputPaths.outputServices);
+        this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(file));
     }
-    this.logger.info('Service file recording completed successfully');
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.SERVICES_FINISH);
 }

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

@@ -1 +1 @@
-{"version":3,"file":"writeClientServicesIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServicesIndex.ts"],"names":[],"mappings":"AACA,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;AAG7C,UAAU,aAAa;IACnB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAcvF"}
+{"version":3,"file":"writeClientServicesIndex.d.ts","sourceRoot":"","sources":["../../../src/core/utils/writeClientServicesIndex.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,aAAa;IACnB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,aAAa,iBAuBvF"}

package/dist/core/utils/writeClientServicesIndex.js

@@ -1,16 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientServicesIndex = writeClientServicesIndex;
+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 writeClientServicesIndex(options) {
     const { services, templates, outputServices, useSeparatedIndexes } = options;
     if (!useSeparatedIndexes) {
         return;
     }
     const filePath = (0, pathHelpers_1.resolveHelper)(outputServices, 'index.ts');
-    this.logger.info(`Data has been written to a file: ${filePath}`);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.INDEX_DATA_WRITTEN(filePath));
     const content = templates.indexes.services({ services });
-    await (0, appendUniqueLinesToFile_1.appendUniqueLinesToFile)(filePath, content);
-    this.logger.info(`Writing to the file is completed: ${filePath}`);
+    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/writeClientSimpleIndex.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeClientSimpleIndex = writeClientSimpleIndex;
-const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
+const LoggerMessages_1 = require("../../common/LoggerMessages");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
 /**
  * Generate the OpenAPI client index file using the Handlebar template and write it to disk.
@@ -11,12 +11,12 @@ const pathHelpers_1 = require("../../common/utils/pathHelpers");
 async function writeClientSimpleIndex(options) {
     const { templates, outputPath, core, models, schemas, services } = options;
     const resolvePathIndex = (0, pathHelpers_1.resolveHelper)(outputPath, 'index.ts');
-    this.logger.info(`The recording of the file data begins: ${resolvePathIndex}`);
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile(resolvePathIndex, templates.indexes.simple({
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.DATA_WRITE_START(resolvePathIndex));
+    await this.writeOutputFile(resolvePathIndex, templates.indexes.simple({
         core,
         models,
         schemas,
         services,
     }));
-    this.logger.info(`File recording completed: ${resolvePathIndex}`);
+    this.logger.info(LoggerMessages_1.LOGGER_MESSAGES.WRITE_CLIENT.FILE_RECORDED(resolvePathIndex));
 }

package/dist/templatesCompiled/cli/customRequest.d.ts

@@ -1,11 +1,7 @@
 declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "4": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "5": (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/cli/customRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customRequest.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBAyCmC"}
+{"version":3,"file":"customRequest.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequest.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAmBmC"}

package/dist/templatesCompiled/cli/customRequest.js

@@ -7,31 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import { CancelablePromise } from './CancelablePromise';\n";
+        return "import type { CancelablePromise } from './CancelablePromise';\n";
     }, "3": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(4, data, 0), "inverse": container.program(6, data, 0), "data": data, "loc": { "start": { "line": 15, "column": 0 }, "end": { "line": 77, "column": 7 } } })) != null ? stack1 : "");
-    }, "4": function (container, depth0, helpers, partials, data) {
-        return "export function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<ApiResult<T>> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            if (onCancel.isCancelled) {\n                return;\n            }\n\n            const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as Record<string, string> | undefined,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n            });\n\n            const body = (await response.json()) as T;\n            resolve({\n                url,\n                ok: response.ok,\n                status: response.status,\n                statusText: response.statusText,\n                body,\n            });\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n\nexport function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            const result = await requestRaw<T>(options, config);\n            if (!onCancel.isCancelled) {\n                resolve(result.body);\n            }\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "6": function (container, depth0, helpers, partials, data) {
-        return "export function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            if (onCancel.isCancelled) {\n                return;\n            }\n\n            const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n            const response = await fetch(url, {\n                method: options.method,\n                headers: options.headers as Record<string, string> | undefined,\n                body: options.body ? JSON.stringify(options.body) : undefined,\n            });\n\n            resolve((await response.json()) as T);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
-    }, "8": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.program(11, data, 0), "data": data, "loc": { "start": { "line": 79, "column": 0 }, "end": { "line": 113, "column": 7 } } })) != null ? stack1 : "");
-    }, "9": function (container, depth0, helpers, partials, data) {
-        return "export async function requestRaw<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<ApiResult<T>> {\n    const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n    const response = await fetch(url, {\n        method: options.method,\n        headers: options.headers as Record<string, string> | undefined,\n        body: options.body ? JSON.stringify(options.body) : undefined,\n    });\n\n    const body = (await response.json()) as T;\n    return {\n        url,\n        ok: response.ok,\n        status: response.status,\n        statusText: response.statusText,\n        body,\n    };\n}\n\nexport async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const result = await requestRaw<T>(options, config);\n    return result.body;\n}\n";
-    }, "11": function (container, depth0, helpers, partials, data) {
-        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    const url = `${config.BASE}${options.path}`.replace('{api-version}', config.VERSION);\n    const response = await fetch(url, {\n        method: options.method,\n        headers: options.headers as Record<string, string> | undefined,\n        body: options.body ? JSON.stringify(options.body) : undefined,\n    });\n\n    return (await response.json()) as T;\n}\n";
+        return "export function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): CancelablePromise<T> {\n    return new CancelablePromise(async (resolve, reject, onCancel) => {\n        try {\n            const abortController = new AbortController();\n            \n            if (options?.timeout) {\n                const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                onCancel(() => clearTimeout(timeoutId));\n            }\n            \n            onCancel(() => abortController.abort());\n            \n            if (onCancel.isCancelled) {\n                return;\n            }\n            \n            // Ваша пользовательская логика запросов здесь\n            const response = await fetch(config.url, {\n                method: config.method,\n                headers: config.headers,\n                body: config.body ? JSON.stringify(config.body) : undefined,\n                signal: abortController.signal,\n            });\n            \n            if (!response.ok) {\n                throw new Error(`Request failed: ${response.statusText}`);\n            }\n            \n            const data = await response.json();\n            resolve(data);\n        } catch (error) {\n            reject(error);\n        }\n    });\n};\n";
+    }, "5": function (container, depth0, helpers, partials, data) {
+        return "export async function request<T>(options: ApiRequestOptions, config: TOpenAPIConfig): Promise<T> {\n    return new Promise(async (resolve, reject) => {\n        try {\n            const url = getUrl(options, config);\n            const response = await sendRequest(options, url, config);\n            const responseBody = getResponseBody(response);\n            const responseHeader = getResponseHeader(response, options.responseHeader);\n\n            const result: ApiResult = {\n                url,\n                ok: isSuccess(response.status),\n                status: response.status,\n                statusText: response.statusText,\n                body: responseHeader || responseBody,\n            };\n\n            catchErrors(options, result);\n            resolve(result.body);\n        } catch (error) {\n            reject(error);\n        }\n    });\n}\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -40,8 +20,8 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
             return undefined;
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
-            + "\nimport type { ApiRequestOptions } from './ApiRequestOptions';\nimport type { ApiResult } from './ApiResult';\nimport type { TOpenAPIConfig } from './OpenAPI';\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 6, "column": 0 }, "end": { "line": 8, "column": 7 } } })) != null ? stack1 : "")
-            + "\n/**\n * Custom request implementation.\n * Wire this file via `request` in openapi.config.json.\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 14, "column": 0 }, "end": { "line": 114, "column": 7 } } })) != null ? stack1 : "");
+            + "\nimport type { RequestExecutor, RequestConfig } from './request-executor';\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
+            + "\n/**\n * Определите свой тип опций (опционально)\n * Измените этот интерфейс в соответствии с вашими потребностями\n */\ninterface MyCustomOptions {\n    timeout?: number;\n    retries?: number;\n}\n\n/**\n * Создайте пользовательский executor\n * Реализуйте свою логику запросов здесь\n *\n * @example Пример использования:\n * \n * import { createLegacyExecutor } from './generated/core/legacy-request-adapter';\n * import { SimpleService } from './generated/services/SimpleService';\n *\n * const executorWithOptions = createLegacyExecutor<MyCustomOptions>(OpenAPI, (options) => {\n *  // Мапьте ваши пользовательские опции в ApiRequestOptions при необходимости\n *  return {\n *      // Добавьте любые поля ApiRequestOptions на основе options\n *  };\n * });\n * \n * const simpleService = new SimpleService(executorWithOptions);\n * await simpleService.getCallWithoutParametersAndResponse();\n */\n"
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 36, "column": 0 }, "end": { "line": 96, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/cli/customRequestExecutor.d.ts

@@ -2,9 +2,6 @@ declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
     "5": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "9": (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/cli/customRequestExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"customRequestExecutor.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequestExecutor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,wBA4CmC"}
+{"version":3,"file":"customRequestExecutor.d.ts","sourceRoot":"","sources":["../../../src/templatesCompiled/cli/customRequestExecutor.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAmBmC"}

package/dist/templatesCompiled/cli/customRequestExecutor.js

@@ -7,33 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint: disable */
 // @ts-nocheck
 exports.default = { "1": function (container, depth0, helpers, partials, data) {
-        return "import type { ApiResult } from './ApiResult';\n";
-    }, "3": function (container, depth0, helpers, partials, data) {
         return "import type { CancelablePromise } from './CancelablePromise';\n";
+    }, "3": function (container, depth0, helpers, partials, data) {
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<TResponse> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n                \n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n                \n                onCancel(() => abortController.abort());\n                \n                if (onCancel.isCancelled) {\n                    return;\n                }\n                \n                // Ваша пользовательская логика запросов здесь\n                const response = await fetch(config.url, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n                \n                if (!response.ok) {\n                    throw new Error(`Request failed: ${response.statusText}`);\n                }\n                \n                const data = await response.json();\n                resolve(data);\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n};\n";
     }, "5": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(6, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 33, "column": 4 }, "end": { "line": 70, "column": 11 } } })) != null ? stack1 : "")
-            + "    request<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<TResponse> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n\n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n\n                onCancel(() => abortController.abort());\n\n                if (onCancel.isCancelled) {\n                    return;\n                }\n\n                const response = await fetch(`${config.path}`, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n\n                if (!response.ok) {\n                    throw new Error(`Request failed: ${response.statusText}`);\n                }\n\n                resolve((await response.json()) as TResponse);\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n};\n";
-    }, "6": function (container, depth0, helpers, partials, data) {
-        return "    requestRaw<TResponse>(config: RequestConfig, options?: MyCustomOptions): CancelablePromise<ApiResult<TResponse>> {\n        return new CancelablePromise(async (resolve, reject, onCancel) => {\n            try {\n                const abortController = new AbortController();\n\n                if (options?.timeout) {\n                    const timeoutId = setTimeout(() => abortController.abort(), options.timeout);\n                    onCancel(() => clearTimeout(timeoutId));\n                }\n\n                onCancel(() => abortController.abort());\n\n                if (onCancel.isCancelled) {\n                    return;\n                }\n\n                const response = await fetch(`${config.path}`, {\n                    method: config.method,\n                    headers: config.headers,\n                    body: config.body ? JSON.stringify(config.body) : undefined,\n                    signal: abortController.signal,\n                });\n\n                const body = (await response.json()) as TResponse;\n                resolve({\n                    url: response.url,\n                    ok: response.ok,\n                    status: response.status,\n                    statusText: response.statusText,\n                    body,\n                });\n            } catch (error) {\n                reject(error);\n            }\n        });\n    },\n";
-    }, "8": function (container, depth0, helpers, partials, data) {
-        var stack1, lookupProperty = container.lookupProperty || function (parent, propertyName) {
-            if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
-                return parent[propertyName];
-            }
-            return undefined;
-        };
-        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(9, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 107, "column": 4 }, "end": { "line": 125, "column": 11 } } })) != null ? stack1 : "")
-            + "    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {\n        const response = await fetch(`${config.path}`, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n\n        if (!response.ok) {\n            throw new Error(`Request failed: ${response.statusText}`);\n        }\n\n        return response.json();\n    },\n};\n";
-    }, "9": function (container, depth0, helpers, partials, data) {
-        return "    async requestRaw<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<ApiResult<TResponse>> {\n        const response = await fetch(`${config.path}`, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n\n        const body = (await response.json()) as TResponse;\n        return {\n            url: response.url,\n            ok: response.ok,\n            status: response.status,\n            statusText: response.statusText,\n            body,\n        };\n    },\n";
+        return "export const customExecutor: RequestExecutor<MyCustomOptions> = {\n    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {\n        // Ваша пользовательская логика запросов здесь\n        const response = await fetch(config.url, {\n            method: config.method,\n            headers: config.headers,\n            body: config.body ? JSON.stringify(config.body) : undefined,\n            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,\n        });\n        \n        if (!response.ok) {\n            throw new Error(`Request failed: ${response.statusText}`);\n        }\n        \n        return response.json();\n    },\n};\n";
     }, "compiler": [8, ">= 4.3.0"], "main": function (container, depth0, helpers, partials, data) {
         var stack1, alias1 = depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function (parent, propertyName) {
             if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -43,8 +21,7 @@ exports.default = { "1": function (container, depth0, helpers, partials, data) {
         };
         return ((stack1 = container.invokePartial(lookupProperty(partials, "header"), depth0, { "name": "header", "data": data, "helpers": helpers, "partials": partials, "decorators": container.decorators })) != null ? stack1 : "")
             + "\nimport type { RequestExecutor, RequestConfig } from './request-executor';\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useRequestRaw"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 7, "column": 0 }, "end": { "line": 9, "column": 7 } } })) != null ? stack1 : "")
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(1, data, 0), "inverse": container.noop, "data": data, "loc": { "start": { "line": 4, "column": 0 }, "end": { "line": 6, "column": 7 } } })) != null ? stack1 : "")
             + "\n/**\n * Определите свой тип опций (опционально)\n * Измените этот интерфейс в соответствии с вашими потребностями\n */\ninterface MyCustomOptions {\n    timeout?: number;\n    retries?: number;\n}\n\n/**\n * Создайте пользовательский executor\n * Реализуйте свою логику запросов здесь\n *\n * @example Пример использования:\n * \n * import { SimpleService } from './generated/services/SimpleService';\n * \n * const simpleService = new SimpleService<MyCustomOptions>(customExecutor);\n * await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });\n */\n"
-            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(5, data, 0), "inverse": container.program(8, data, 0), "data": data, "loc": { "start": { "line": 31, "column": 0 }, "end": { "line": 141, "column": 7 } } })) != null ? stack1 : "");
+            + ((stack1 = lookupProperty(helpers, "if").call(alias1, lookupProperty(depth0, "useCancelableRequest"), { "name": "if", "hash": {}, "fn": container.program(3, data, 0), "inverse": container.program(5, data, 0), "data": data, "loc": { "start": { "line": 28, "column": 0 }, "end": { "line": 84, "column": 7 } } })) != null ? stack1 : "");
     }, "usePartial": true, "useData": true };

package/dist/templatesCompiled/client/core/axios/request.d.ts

@@ -1,11 +1,7 @@
 declare const _default: {
     "1": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "4": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "6": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "8": (container: any, depth0: any, helpers: any, partials: any, data: any) => any;
-    "9": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
-    "11": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "3": (container: any, depth0: any, helpers: any, partials: any, data: any) => string;
+    "5": (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/core/axios/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/axios/request.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAMA,wBAuEmC"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../../../src/templatesCompiled/client/core/axios/request.ts"],"names":[],"mappings":";;;;;;;;;AAMA,wBAiDmC"}