ts-openapi-codegen 2.0.0-beta.4 → 2.0.0-beta.6

package/dist/cli/initOpenApiConfig/utils/writeConfigFile.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeConfigFile = writeConfigFile;
+const path_1 = __importDefault(require("path"));
+const Consts_1 = require("../../../common/Consts");
+const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
+const format_1 = require("../../../common/utils/format");
+const pathHelpers_1 = require("../../../common/utils/pathHelpers");
+/**
+ * Записывает конфигурацию в файл
+ * @param configPath - Путь к файлу конфигурации
+ * @param config - Объект конфигурации для записи
+ * @param templates
+ * @throws {Error} Если не удалось записать файл
+ */
+async function writeConfigFile(configPath, config, templates) {
+    const resolvedPath = (0, pathHelpers_1.resolveHelper)(process.cwd(), configPath);
+    const configDir = path_1.default.dirname(resolvedPath);
+    // Создаем директорию, если она не существует
+    const dirExists = await fileSystemHelpers_1.fileSystemHelpers.exists(configDir);
+    if (!dirExists) {
+        await fileSystemHelpers_1.fileSystemHelpers.mkdir(configDir);
+    }
+    const templateResult = templates.config(config);
+    const formattedValue = await (0, format_1.format)(templateResult, 'json');
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile(resolvedPath, formattedValue);
+    Consts_1.APP_LOGGER.info(`Configuration file created: ${resolvedPath}`);
+}

package/dist/cli/schemas/init.d.ts

@@ -1,8 +1,10 @@
 import { z } from 'zod';
-import { EOptionType } from '../initOpenApiConfig/Enums';
 export declare const initOptionsSchema: z.ZodObject<{
     openapiConfig: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    type: z.ZodDefault<z.ZodOptional<z.ZodEnum<typeof EOptionType>>>;
+    specsDir: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    request: z.ZodDefault<z.ZodOptional<z.ZodString>>;
+    useCancelableRequest: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
+    useInteractiveMode: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, z.core.$strip>;
 export type InitOptions = z.infer<typeof initOptionsSchema>;
 //# sourceMappingURL=init.d.ts.map

package/dist/cli/schemas/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,eAAO,MAAM,iBAAiB;;;iBAE5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/cli/schemas/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAKxB,eAAO,MAAM,iBAAiB;;;;;;iBAK5B,CAAC;AAEH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}

package/dist/cli/schemas/init.js

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initOptionsSchema = void 0;
 const zod_1 = require("zod");
-const Enums_1 = require("../initOpenApiConfig/Enums");
+const Consts_1 = require("../../common/Consts");
 const base_1 = require("./base");
 exports.initOptionsSchema = base_1.baseCLIOptionsSchema.extend({
-    type: zod_1.z.nativeEnum(Enums_1.EOptionType).optional().default(Enums_1.EOptionType.OPTION),
+    specsDir: zod_1.z.string().min(1).optional().default(Consts_1.DEFAULT_SPECS_DIR),
+    request: zod_1.z.string().min(1).optional().default(Consts_1.DEFAULT_CUSTOM_REQUEST_PATH),
+    useCancelableRequest: zod_1.z.boolean().optional().default(false),
+    useInteractiveMode: zod_1.z.boolean().optional().default(false),
 });

package/dist/common/Consts.d.ts

@@ -3,4 +3,7 @@ import { TStrictFlatOptions } from './TRawOptions';
 export declare const DEFAULT_OPENAPI_CONFIG_FILENAME = "openapi.config.json";
 export declare const COMMON_DEFAULT_OPTIONS_VALUES: TStrictFlatOptions;
 export declare const APP_LOGGER: Logger;
+export declare const DEFAULT_SPECS_DIR = "openapi/";
+export declare const DEFAULT_CUSTOM_REQUEST_PATH = "./src/custom/request.ts";
+export declare const DEFAULT_OUTPUT_API_DIR = "./generated";
 //# sourceMappingURL=Consts.d.ts.map

package/dist/common/Consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../src/common/Consts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,eAAO,MAAM,+BAA+B,wBAAwB,CAAC;AAErE,eAAO,MAAM,6BAA6B,EAAE,kBAqB3C,CAAC;AAEF,eAAO,MAAM,UAAU,QAIrB,CAAC"}
+{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../src/common/Consts.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,eAAO,MAAM,+BAA+B,wBAAwB,CAAC;AAErE,eAAO,MAAM,6BAA6B,EAAE,kBAqB3C,CAAC;AAEF,eAAO,MAAM,UAAU,QAIrB,CAAC;AAEH,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAE5C,eAAO,MAAM,2BAA2B,4BAA4B,CAAA;AAEpE,eAAO,MAAM,sBAAsB,gBAAgB,CAAC"}

package/dist/common/Consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.APP_LOGGER = exports.COMMON_DEFAULT_OPTIONS_VALUES = exports.DEFAULT_OPENAPI_CONFIG_FILENAME = void 0;
+exports.DEFAULT_OUTPUT_API_DIR = exports.DEFAULT_CUSTOM_REQUEST_PATH = exports.DEFAULT_SPECS_DIR = exports.APP_LOGGER = exports.COMMON_DEFAULT_OPTIONS_VALUES = exports.DEFAULT_OPENAPI_CONFIG_FILENAME = void 0;
 const HttpClient_enum_1 = require("../core/types/enums/HttpClient.enum");
 const ValidationLibrary_enum_1 = require("../core/types/enums/ValidationLibrary.enum");
 const Enums_1 = require("./Enums");
@@ -33,3 +33,6 @@ exports.APP_LOGGER = new Logger_1.Logger({
     instanceId: 'cli',
     logOutput: Enums_1.ELogOutput.CONSOLE,
 });
+exports.DEFAULT_SPECS_DIR = 'openapi/';
+exports.DEFAULT_CUSTOM_REQUEST_PATH = './src/custom/request.ts';
+exports.DEFAULT_OUTPUT_API_DIR = './generated';

package/dist/common/utils/fileSystemHelpers.d.ts

@@ -1,6 +1,7 @@
 import { copyFile as __copyFile, exists as __exists, readdir as __readdir, readFile as __readFile, writeFile as __writeFile } from 'fs';
 declare function isDirectory(path: string): boolean;
 declare function isPathToFile(path: string): boolean;
+declare function isSameFilePath(a: string, b: string): boolean;
 declare const fileSystemHelpers: {
     readFile: typeof __readFile.__promisify__;
     writeFile: typeof __writeFile.__promisify__;
@@ -12,6 +13,7 @@ declare const fileSystemHelpers: {
     isDirectory: typeof isDirectory;
     isPathToFile: typeof isPathToFile;
     readdir: typeof __readdir.__promisify__;
+    isSameFilePath: typeof isSameFilePath;
 };
 export { fileSystemHelpers };
 //# sourceMappingURL=fileSystemHelpers.d.ts.map

package/dist/common/utils/fileSystemHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileSystemHelpers.d.ts","sourceRoot":"","sources":["../../../src/common/utils/fileSystemHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,IAAI,UAAU,EAEtB,MAAM,IAAI,QAAQ,EAElB,OAAO,IAAI,SAAS,EACpB,QAAQ,IAAI,UAAU,EAKtB,SAAS,IAAI,WAAW,EAC3B,MAAM,IAAI,CAAC;AA0DZ,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1C;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM3C;AAED,QAAA,MAAM,iBAAiB;;;;;;kBArDI,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAgBtB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;;;;CAgDhD,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}
+{"version":3,"file":"fileSystemHelpers.d.ts","sourceRoot":"","sources":["../../../src/common/utils/fileSystemHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,QAAQ,IAAI,UAAU,EAEtB,MAAM,IAAI,QAAQ,EAElB,OAAO,IAAI,SAAS,EACpB,QAAQ,IAAI,UAAU,EAMtB,SAAS,IAAI,WAAW,EAC3B,MAAM,IAAI,CAAC;AA0DZ,iBAAS,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM1C;AAED,iBAAS,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM3C;AAED,iBAAS,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAMrD;AAED,QAAA,MAAM,iBAAiB;;;;;;kBA7DI,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;kBAgBtB,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;;;;;CAyDhD,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC"}

package/dist/common/utils/fileSystemHelpers.js

@@ -73,6 +73,14 @@ function isPathToFile(path) {
         return false;
     }
 }
+function isSameFilePath(a, b) {
+    try {
+        return (0, fs_1.realpathSync)(a) === (0, fs_1.realpathSync)(b);
+    }
+    catch {
+        return false;
+    }
+}
 const fileSystemHelpers = {
     readFile,
     writeFile,
@@ -84,5 +92,6 @@ const fileSystemHelpers = {
     isDirectory,
     isPathToFile,
     readdir,
+    isSameFilePath,
 };
 exports.fileSystemHelpers = fileSystemHelpers;

package/dist/core/WriteClient.d.ts

@@ -1,11 +1,12 @@
 import { Logger } from '../common/Logger';
 import { OutputPaths } from './types/base/OutputPaths.model';
+import { Templates } from './types/base/Templates.model';
 import { HttpClient } from './types/enums/HttpClient.enum';
 import { ValidationLibrary } from './types/enums/ValidationLibrary.enum';
 import type { Client } from './types/shared/Client.model';
-import { Templates } from './utils/registerHandlebarTemplates';
 import { writeClientCore } from './utils/writeClientCore';
 import { writeClientCoreIndex } from './utils/writeClientCoreIndex';
+import { writeClientExecutor } from './utils/writeClientExecutor';
 import { writeClientFullIndex } from './utils/writeClientFullIndex';
 import { writeClientModels } from './utils/writeClientModels';
 import { writeClientModelsIndex } from './utils/writeClientModelsIndex';
@@ -80,6 +81,7 @@ export declare class WriteClient {
     writeClientServices: typeof writeClientServices;
     writeClientServicesIndex: typeof writeClientServicesIndex;
     writeClientSimpleIndex: typeof writeClientSimpleIndex;
+    writeClientExecutor: typeof writeClientExecutor;
 }
 export {};
 //# sourceMappingURL=WriteClient.d.ts.map

package/dist/core/WriteClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAG/D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,sBAAsB,GAAG,qBAAqB,CAAC,CAAC;AAEnJ;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAuD;IACrE,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM;IAU3B;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAgG5D;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,yBAAyB;IAUzD,eAAe;IAKf,sBAAsB;IAK5B,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,mBAAmB;YA4Db,gBAAgB;YAUhB,uBAAuB;IAMrC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAId,eAAe,yBAAmB;IAClC,oBAAoB,8BAAwB;IAC5C,oBAAoB,8BAAwB;IAC5C,iBAAiB,2BAAqB;IACtC,sBAAsB,gCAA0B;IAChD,kBAAkB,4BAAsB;IACxC,uBAAuB,iCAA2B;IAClD,mBAAmB,6BAAuB;IAC1C,wBAAwB,kCAA4B;IACpD,sBAAsB,gCAA0B;CAC1D"}
+{"version":3,"file":"WriteClient.d.ts","sourceRoot":"","sources":["../../src/core/WriteClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAI1D,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAExE;;;;;;;;;;;;GAYG;AACH,KAAK,iBAAiB,GAAG;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,uBAAuB,EAAE,OAAO,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACzC,CAAC;AAEF,KAAK,yBAAyB,GAAG,IAAI,CAAC,iBAAiB,EAAE,YAAY,GAAG,YAAY,GAAG,SAAS,GAAG,sBAAsB,GAAG,qBAAqB,CAAC,CAAC;AAEnJ;;GAEG;AACH,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAuD;IACrE,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,CAAC,EAAE,MAAM;IAU3B;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAsG5D;;;OAGG;IACH,6BAA6B,CAAC,MAAM,EAAE,yBAAyB;IAUzD,eAAe;IAKf,sBAAsB;IAK5B,IAAW,MAAM,WAEhB;IAED,OAAO,CAAC,yBAAyB;IAyCjC,OAAO,CAAC,mBAAmB;YA4Db,gBAAgB;YAUhB,uBAAuB;IAMrC,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAId,eAAe,yBAAmB;IAClC,oBAAoB,8BAAwB;IAC5C,oBAAoB,8BAAwB;IAC5C,iBAAiB,2BAAqB;IACtC,sBAAsB,gCAA0B;IAChD,kBAAkB,4BAAsB;IACxC,uBAAuB,iCAA2B;IAClD,mBAAmB,6BAAuB;IAC1C,wBAAwB,kCAA4B;IACpD,sBAAsB,gCAA0B;IAChD,mBAAmB,6BAAuB;CACpD"}

package/dist/core/WriteClient.js

@@ -11,6 +11,7 @@ const sortModelByName_1 = require("./utils/sortModelByName");
 const unique_1 = require("./utils/unique");
 const writeClientCore_1 = require("./utils/writeClientCore");
 const writeClientCoreIndex_1 = require("./utils/writeClientCoreIndex");
+const writeClientExecutor_1 = require("./utils/writeClientExecutor");
 const writeClientFullIndex_1 = require("./utils/writeClientFullIndex");
 const writeClientModels_1 = require("./utils/writeClientModels");
 const writeClientModelsIndex_1 = require("./utils/writeClientModelsIndex");
@@ -69,6 +70,12 @@ class WriteClient {
                 outputServices,
                 useSeparatedIndexes,
             });
+            await this.writeClientExecutor({
+                outputPath: outputPaths.output,
+                outputCorePath: (0, pathHelpers_1.relativeHelper)(outputPaths.output, outputCore),
+                services: client.services,
+                templates,
+            });
         }
         /**
          * TODO: Нужно собирать импорты из всех вложенных моделей (link, properties в composition и т.д.) и передавать их в шаблон.
@@ -287,5 +294,6 @@ class WriteClient {
     writeClientServices = writeClientServices_1.writeClientServices;
     writeClientServicesIndex = writeClientServicesIndex_1.writeClientServicesIndex;
     writeClientSimpleIndex = writeClientSimpleIndex_1.writeClientSimpleIndex;
+    writeClientExecutor = writeClientExecutor_1.writeClientExecutor;
 }
 exports.WriteClient = WriteClient;

package/dist/core/__tests__/WriteClient.test.js

@@ -40,6 +40,7 @@ const WriteClient_1 = require("../WriteClient");
                 services: () => 'servicesIndex',
             },
             exports: {
+                client: () => 'client',
                 model: () => 'model',
                 schema: () => 'schema',
                 service: () => 'service',
@@ -52,7 +53,7 @@ const WriteClient_1 = require("../WriteClient");
                 request: () => 'request',
                 cancelablePromise: () => 'cancelablePromise',
                 httpStatusCode: () => 'httpStatusCode',
-                legacyRequestAdapter: () => 'legacyRequestAdapter',
+                createExecutorAdapter: () => 'createExecutorAdapter',
                 requestExecutor: () => 'requestExecutor',
             },
         };

package/dist/core/types/base/ClientArtifacts.model.d.ts

@@ -1,4 +1,4 @@
-import { Templates } from "../../utils/registerHandlebarTemplates";
+import { Templates } from "../../types/base/Templates.model";
 import { ExportedModel } from "./ExportedModel.model";
 import { ExportedService } from "./ExportedService.model";
 export type ClientArtifacts = {

package/dist/core/types/base/ClientArtifacts.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ClientArtifacts.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/ClientArtifacts.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC/B,CAAA"}
+{"version":3,"file":"ClientArtifacts.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/ClientArtifacts.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,MAAM,eAAe,GAAG;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC/B,CAAA"}

package/dist/core/types/base/SimpleClientArtifacts.model.d.ts

@@ -1,4 +1,4 @@
-import { Templates } from "../../utils/registerHandlebarTemplates";
+import { Templates } from "../../types/base/Templates.model";
 export type SimpleClientArtifacts = {
     templates: Templates;
     outputPath: string;

package/dist/core/types/base/SimpleClientArtifacts.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleClientArtifacts.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/SimpleClientArtifacts.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AAEnE,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB,CAAA"}
+{"version":3,"file":"SimpleClientArtifacts.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/SimpleClientArtifacts.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACtB,CAAA"}

package/dist/core/types/base/Templates.model.d.ts

@@ -0,0 +1,29 @@
+import * as Handlebars from 'handlebars/runtime';
+export interface Templates {
+    indexes: {
+        full: Handlebars.TemplateDelegate;
+        simple: Handlebars.TemplateDelegate;
+        core: Handlebars.TemplateDelegate;
+        models: Handlebars.TemplateDelegate;
+        schemas: Handlebars.TemplateDelegate;
+        services: Handlebars.TemplateDelegate;
+    };
+    exports: {
+        client: Handlebars.TemplateDelegate;
+        model: Handlebars.TemplateDelegate;
+        schema: Handlebars.TemplateDelegate | undefined;
+        service: Handlebars.TemplateDelegate;
+    };
+    core: {
+        settings: Handlebars.TemplateDelegate;
+        apiError: Handlebars.TemplateDelegate;
+        apiRequestOptions: Handlebars.TemplateDelegate;
+        apiResult: Handlebars.TemplateDelegate;
+        request: Handlebars.TemplateDelegate;
+        cancelablePromise: Handlebars.TemplateDelegate;
+        httpStatusCode: Handlebars.TemplateDelegate;
+        requestExecutor: Handlebars.TemplateDelegate;
+        createExecutorAdapter: Handlebars.TemplateDelegate;
+    };
+}
+//# sourceMappingURL=Templates.model.d.ts.map

package/dist/core/types/base/Templates.model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Templates.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/Templates.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAEjD,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAChD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,qBAAqB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACtD,CAAC;CACL"}

package/dist/core/types/base/Templates.model.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/core/utils/__mocks__/templates.d.ts

@@ -1,3 +1,3 @@
-import { Templates } from '../registerHandlebarTemplates';
+import { Templates } from '../../types/base/Templates.model';
 export declare const templates: Templates;
 //# sourceMappingURL=templates.d.ts.map

package/dist/core/utils/__mocks__/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,eAAO,MAAM,SAAS,EAAE,SAyBvB,CAAC"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,eAAO,MAAM,SAAS,EAAE,SA0BvB,CAAC"}

package/dist/core/utils/__mocks__/templates.js

@@ -11,6 +11,7 @@ exports.templates = {
         services: () => 'servicesIndex',
     },
     exports: {
+        client: () => 'client',
         model: () => 'model',
         schema: () => 'schema',
         service: () => 'service',
@@ -23,7 +24,7 @@ exports.templates = {
         request: () => 'request',
         cancelablePromise: () => 'cancelablePromise',
         httpStatusCode: () => 'httpStatusCode',
-        legacyRequestAdapter: () => 'legacyRequestAdapter',
+        createExecutorAdapter: () => 'createExecutorAdapter',
         requestExecutor: () => 'requestExecutor',
     },
 };

package/dist/core/utils/__tests__/resolveRefToImportPath.test.js

@@ -183,6 +183,16 @@ const normalizePath = (p) => p.replace(Consts_1.REGEX_BACKSLASH, '/');
             // so it returns relative path instead of fallback
             node_assert_1.strict.equal(normalizePath(result), './spec/UserList');
         });
+        (0, node_test_1.test)('EXTERNAL_FILE_FRAGMENT self-reference → treated as LOCAL_FRAGMENT', () => {
+            const parent = '/Users/user/Developer/my_app/openapi/app/spec/dir/some.yaml';
+            const result = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+                mainSpecPath,
+                parentFilePath: parent,
+                refValuePath: '../some.yaml#/components/schemas/User',
+                outputModelsPath,
+            });
+            node_assert_1.strict.equal(normalizePath(result), './spec/dir/User');
+        });
     });
     (0, node_test_1.describe)('EXTERNAL_FILE', () => {
         (0, node_test_1.test)('external link to the file → correct name via getClassName', () => {
@@ -246,6 +256,59 @@ const normalizePath = (p) => p.replace(Consts_1.REGEX_BACKSLASH, '/');
             const normalized = normalizePath(result);
             node_assert_1.strict.ok(normalized.includes('User') || normalized === './User');
         });
+        node_test_1.test.skip('external file reference with parentFilePath as directory', () => {
+            const result = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+                mainSpecPath: '/Developer/my-app/api/openapi_spec.yaml',
+                parentFilePath: '/Developer/my-app/api/ui/components/dir/some.yaml',
+                refValuePath: '../components/dir/file_name.yaml',
+                outputModelsPath: '/generated/models',
+            });
+            // NOTE:
+            // When parentFilePath is a directory, it is treated as a resolve base,
+            // not as a namespace to be duplicated.
+            node_assert_1.strict.equal(normalizePath(result), './ui/components/dir/FileName');
+        });
+        (0, node_test_1.test)('EXTERNAL_FILE self-reference via ./same.yaml → treated as LOCAL_FRAGMENT', () => {
+            const parent = '/Users/user/Developer/my_app/openapi/app/spec/dir/some.yaml';
+            const result = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+                mainSpecPath,
+                parentFilePath: parent,
+                refValuePath: './some.yaml',
+                outputModelsPath,
+            });
+            node_assert_1.strict.equal(normalizePath(result), './spec/dir/Some');
+        });
+        (0, node_test_1.test)('EXTERNAL_FILE via ../same.yaml → treated as external sibling file', () => {
+            const parent = '/Users/user/Developer/my_app/openapi/app/spec/dir/some.yaml';
+            const result = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+                mainSpecPath,
+                parentFilePath: parent,
+                refValuePath: '../some.yaml',
+                outputModelsPath,
+            });
+            node_assert_1.strict.equal(normalizePath(result), './spec/Some');
+        });
+        (0, node_test_1.test)('EXTERNAL_FILE self-reference via ./same.yaml', () => {
+            const parent = '/Users/user/Developer/my_app/openapi/app/spec/dir/some.yaml';
+            const result = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+                mainSpecPath,
+                parentFilePath: parent,
+                refValuePath: './some.yaml',
+                outputModelsPath,
+            });
+            node_assert_1.strict.equal(normalizePath(result), './spec/dir/Some');
+        });
+        (0, node_test_1.test)('EXTERNAL_FILE with same basename but different path is NOT self-reference', () => {
+            const parent = '/Users/user/Developer/my_app/openapi/app/spec/dir/some.yaml';
+            const result = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+                mainSpecPath,
+                parentFilePath: parent,
+                refValuePath: '../other/some.yaml',
+                outputModelsPath,
+            });
+            const normalized = normalizePath(result);
+            node_assert_1.strict.ok(normalized.includes('Some') && normalized.includes('other'), 'should be treated as external file');
+        });
     });
     (0, node_test_1.describe)('ABSOLUTE_PATH (default case)', () => {
         (0, node_test_1.test)('absolute path to file → resolves correctly', () => {
@@ -373,4 +436,14 @@ const normalizePath = (p) => p.replace(Consts_1.REGEX_BACKSLASH, '/');
             node_assert_1.strict.ok(typeof normalized === 'string');
         });
     });
+    (0, node_test_1.test)('self-reference works even with redundant path segments', () => {
+        const parent = '/Users/user/Developer/my_app/openapi/app/spec/dir/some.yaml';
+        const result = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+            mainSpecPath,
+            parentFilePath: parent,
+            refValuePath: './sub/../some.yaml',
+            outputModelsPath,
+        });
+        node_assert_1.strict.equal(normalizePath(result), './spec/dir/Some');
+    });
 });

package/dist/core/utils/precompileTemplates.js

@@ -68,6 +68,7 @@ const precompileTemplates = () => {
                             joiBaseSchema: true,
                             getRequiredFields: true,
                             getEnumType: true,
+                            camelCase: true,
                         },
                     });
                     const tsContent = header + precompiled;

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

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

package/dist/core/utils/registerHandlebarHelpers.js

@@ -32,8 +32,12 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registerHandlebarHelpers = registerHandlebarHelpers;
+const camelcase_1 = __importDefault(require("camelcase"));
 const Handlebars = __importStar(require("handlebars/runtime"));
 const Consts_1 = require("../types/Consts");
 const unique_1 = require("./unique");
@@ -178,4 +182,11 @@ function registerHandlebarHelpers(root) {
         const firstEnum = enumerators[0];
         return firstEnum.type === 'number' ? 'number' : 'string';
     });
+    Handlebars.registerHelper('camelCase', function (value) {
+        const name = (0, camelcase_1.default)(value, { pascalCase: true });
+        if (name && !name.endsWith('Service')) {
+            return `${name}Service`;
+        }
+        return name;
+    });
 }

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

@@ -1,32 +1,6 @@
-import * as Handlebars from 'handlebars/runtime';
 import { HttpClient } from '../types/enums/HttpClient.enum';
 import { ValidationLibrary } from '../types/enums/ValidationLibrary.enum';
-export interface Templates {
-    indexes: {
-        full: Handlebars.TemplateDelegate;
-        simple: Handlebars.TemplateDelegate;
-        core: Handlebars.TemplateDelegate;
-        models: Handlebars.TemplateDelegate;
-        schemas: Handlebars.TemplateDelegate;
-        services: Handlebars.TemplateDelegate;
-    };
-    exports: {
-        model: Handlebars.TemplateDelegate;
-        schema: Handlebars.TemplateDelegate | undefined;
-        service: Handlebars.TemplateDelegate;
-    };
-    core: {
-        settings: Handlebars.TemplateDelegate;
-        apiError: Handlebars.TemplateDelegate;
-        apiRequestOptions: Handlebars.TemplateDelegate;
-        apiResult: Handlebars.TemplateDelegate;
-        request: Handlebars.TemplateDelegate;
-        cancelablePromise: Handlebars.TemplateDelegate;
-        httpStatusCode: Handlebars.TemplateDelegate;
-        requestExecutor: Handlebars.TemplateDelegate;
-        legacyRequestAdapter: Handlebars.TemplateDelegate;
-    };
-}
+import { Templates } from '../types/base/Templates.model';
 /**
  * Read all the Handlebar templates that we need and return on wrapper object
  * so we can easily access the templates in out generator / write functions.

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAwFjD,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA0C1E,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAChD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,oBAAoB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACrD,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAqK1K"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AA0FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA0C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAsK1K"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -78,13 +78,14 @@ const OpenAPI_1 = __importDefault(require("../../templatesCompiled/client/core/O
 const CancelablePromise_1 = __importDefault(require("../../templatesCompiled/client/core/CancelablePromise"));
 const request_4 = __importDefault(require("../../templatesCompiled/client/core/request"));
 const request_executor_1 = __importDefault(require("../../templatesCompiled/client/core/request-executor"));
-const legacy_request_adapter_1 = __importDefault(require("../../templatesCompiled/client/core/legacy-request-adapter"));
+const createExecutorAdapter_1 = __importDefault(require("../../templatesCompiled/client/core/createExecutorAdapter"));
 const getHeaders_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getHeaders"));
 const getRequestBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getRequestBody"));
 const getResponseBody_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getResponseBody"));
 const getResponseHeader_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/getResponseHeader"));
 const request_5 = __importDefault(require("../../templatesCompiled/client/core/xhr/request"));
 const sendRequest_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/sendRequest"));
+const exportClient_1 = __importDefault(require("../../templatesCompiled/client/exportClient"));
 const exportModel_1 = __importDefault(require("../../templatesCompiled/client/exportModel"));
 const exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
 const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
@@ -179,6 +180,7 @@ function registerHandlebarTemplates(root) {
             services: Handlebars.template(indexServices_1.default),
         },
         exports: {
+            client: Handlebars.template(exportClient_1.default),
             model: Handlebars.template(exportModel_1.default),
             schema: undefined,
             service: Handlebars.template(exportService_1.default),
@@ -192,7 +194,7 @@ function registerHandlebarTemplates(root) {
             cancelablePromise: Handlebars.template(CancelablePromise_1.default),
             httpStatusCode: Handlebars.template(HttpStatusCode_1.default),
             requestExecutor: Handlebars.template(request_executor_1.default),
-            legacyRequestAdapter: Handlebars.template(legacy_request_adapter_1.default),
+            createExecutorAdapter: Handlebars.template(createExecutorAdapter_1.default),
         },
     };
     // Partials for the generations of the models, services, etc.

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

@@ -1 +1 @@
-{"version":3,"file":"resolveRefToImportPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefToImportPath.ts"],"names":[],"mappings":"AAQA,UAAU,OAAO;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAyFD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,EAAE,OAAO,UAiE/G"}
+{"version":3,"file":"resolveRefToImportPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefToImportPath.ts"],"names":[],"mappings":"AAQA,UAAU,OAAO;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;CAC5B;AAoED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,gBAAgB,EAAE,EAAE,OAAO,UA4C/G"}

package/dist/core/utils/resolveRefToImportPath.js

@@ -60,9 +60,7 @@ function prepareParentDirForResolve(parentFilePath, mainSpecPath, sourceRoot) {
 function removeParentBasenamePrefix(refValueClean, parentDirForResolveWithSep) {
     const baseNameParent = (0, path_1.basename)(parentDirForResolveWithSep);
     const baseNameParentWithSep = baseNameParent.endsWith('/') ? baseNameParent : baseNameParent + '/';
-    return refValueClean.startsWith(baseNameParentWithSep)
-        ? refValueClean.replace(baseNameParentWithSep, '')
-        : refValueClean;
+    return refValueClean.startsWith(baseNameParentWithSep) ? refValueClean.replace(baseNameParentWithSep, '') : refValueClean;
 }
 /**
  * Resolves $ref reference to import path for generated code.
@@ -95,11 +93,14 @@ function resolveRefToImportPath({ mainSpecPath, parentFilePath, refValuePath, ou
     // EXTERNAL_FILE: reference to external file (e.g., ./file.yaml)
     if (parsed.type === parseRef_1.RefType.EXTERNAL_FILE) {
         const targetFileAbs = (0, pathHelpers_1.joinHelper)(parentDirForResolveWithSep, currentRefValue);
+        // ВАЖНО: проверка self-reference
+        if (parentFilePath && fileSystemHelpers_1.fileSystemHelpers.isSameFilePath(targetFileAbs, parentFilePath)) {
+            const modelName = (0, stripNamespace_1.stripNamespace)(parentFilePath);
+            return resolveFragmentRef(modelName, parentFilePath, mainSpecPath, sourceRoot, outputModelsPath, absOutputModelsPath);
+        }
         return resolveExternalFileOrAbsolutePath(targetFileAbs, sourceRoot, outputModelsPath, absOutputModelsPath);
     }
     // ABSOLUTE_PATH (default case): absolute path reference
-    const targetFileAbs = fileSystemHelpers_1.fileSystemHelpers.isPathToFile(refValueClean)
-        ? (0, pathHelpers_1.joinHelper)(parentDirForResolveWithSep, refValueClean)
-        : (0, pathHelpers_1.resolveHelper)(parentDirForResolveWithSep, refValueClean);
+    const targetFileAbs = fileSystemHelpers_1.fileSystemHelpers.isPathToFile(refValueClean) ? (0, pathHelpers_1.joinHelper)(parentDirForResolveWithSep, refValueClean) : (0, pathHelpers_1.resolveHelper)(parentDirForResolveWithSep, refValueClean);
     return resolveExternalFileOrAbsolutePath(targetFileAbs, sourceRoot, outputModelsPath, absOutputModelsPath);
 }

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

@@ -1,7 +1,7 @@
+import { Templates } from '../types/base/Templates.model';
 import { HttpClient } from '../types/enums/HttpClient.enum';
 import type { Client } from '../types/shared/Client.model';
 import { WriteClient } from '../WriteClient';
-import { Templates } from './registerHandlebarTemplates';
 /**
  * @param client Client object, containing, models, schemas and services
  * @param templates The loaded handlebar templates

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,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD;;;;;;;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,CAmCjG"}
+{"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,CAqCjG"}

package/dist/core/utils/writeClientCore.js

@@ -22,6 +22,7 @@ async function writeClientCore(options) {
         useSeparatedIndexes,
     };
     this.logger.info("The recording of the kernel files begins");
+    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({}));
@@ -33,8 +34,8 @@ async function writeClientCore(options) {
     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, 'request-executor.ts'), templates.core.requestExecutor({}));
     // TODO: Добавлять только, если не выбран custom-ный request
-    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'legacy-request-adapter.ts'), templates.core.legacyRequestAdapter({}));
-    if (request) {
+    await fileSystemHelpers_1.fileSystemHelpers.writeFile((0, pathHelpers_1.resolveHelper)(outputCorePath, 'createExecutorAdapter.ts'), templates.core.createExecutorAdapter({ useCustomRequest: hasCustomRequest }));
+    if (hasCustomRequest) {
         const requestFile = (0, pathHelpers_1.resolveHelper)(process.cwd(), request);
         const requestFileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(requestFile);
         if (!requestFileExists) {

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

@@ -1,5 +1,5 @@
+import { Templates } from '../types/base/Templates.model';
 import { WriteClient } from '../WriteClient';
-import { Templates } from './registerHandlebarTemplates';
 interface IOptionsProps {
     templates: Templates;
     outputCorePath: string;

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,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,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":"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"}