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

package/README.md

@@ -526,80 +526,6 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
-### Custom Request Executor
-
-Starting from version 2.0.0-beta.1, generated services use the `RequestExecutor` interface instead of calling the core `request` function directly. This allows you to provide your own request implementation or adapt existing ones.
-
-**Using a custom RequestExecutor:**
-
-You can create your own `RequestExecutor` implementation:
-
-```ts
-import type { RequestExecutor, RequestConfig } from './generated/core/request-executor';
-import { SimpleService } from './generated/services/SimpleService';
-
-// Define your custom options type (optional)
-interface MyCustomOptions {
-    timeout?: number;
-    retries?: number;
-}
-
-// Create a custom executor
-const customExecutor: RequestExecutor<MyCustomOptions> = {
-    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {
-        // Your custom request logic here
-        const response = await fetch(config.url, {
-            method: config.method,
-            headers: config.headers,
-            body: config.body ? JSON.stringify(config.body) : undefined,
-            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,
-        });
-        
-        if (!response.ok) {
-            throw new Error(`Request failed: ${response.statusText}`);
-        }
-        
-        return response.json();
-    },
-};
-
-// Use it with generated services
-const simpleService = new SimpleService<MyCustomOptions>(customExecutor);
-await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });
-```
-
-**Using legacy request adapter:**
-
-If you have an existing custom `request` file (specified via `--request` option), you can use the `createLegacyExecutor` helper to adapt it to the new `RequestExecutor` interface:
-
-```ts
-import { createLegacyExecutor } from './generated/core/legacy-request-adapter';
-import { OpenAPI } from './generated/core/OpenAPI';
-import { SimpleService } from './generated/services/SimpleService';
-
-// The legacy adapter wraps your existing request function
-const executor = createLegacyExecutor(OpenAPI);
-
-// Optionally, you can map custom options to ApiRequestOptions
-interface XHROptions {
-    timeout?: number;
-}
-
-const executorWithOptions = createLegacyExecutor<XHROptions>(OpenAPI, (options) => {
-    // Map your custom options to ApiRequestOptions if needed
-    return {
-        // Add any ApiRequestOptions fields based on options
-    };
-});
-
-// Use with services
-const simpleService = new SimpleService(executor);
-await simpleService.getCallWithoutParametersAndResponse();
-```
-
-**Note:** The `--request` option still works for customizing the core `request` function. The generated 
-`legacy-request-adapter` will automatically use your custom request implementation when creating the adapter.
-
 ### Sorting strategy for function arguments `--sortByRequired`
 By default, the OpenAPI generator sorts the parameters of service functions according to a simplified scheme. If you need a more strict sorting option, then you need to use the `--sortByRequired` flag. The simplified sorting option is similar to the one used in version 0.2.3 of the OpenAPI generator. This flag allows you to upgrade to a new version of the generator if you are "stuck" on version 0.2.3.
 

package/README.rus.md

@@ -526,79 +526,6 @@ export function request<T>(config: TOpenAPIConfig, options: ApiRequestOptions):
 }
 ```
 
-### Пользовательский Request Executor
-
-Начиная с версии 2.0.0, сгенерированные сервисы используют интерфейс `RequestExecutor` вместо прямых вызовов core-функции `request`. Это позволяет вам предоставить свою собственную реализацию запросов или адаптировать существующие.
-
-**Использование пользовательского RequestExecutor:**
-
-Вы можете создать свою собственную реализацию `RequestExecutor`:
-
-```ts
-import type { RequestExecutor, RequestConfig } from './generated/core/request-executor';
-import { SimpleService } from './generated/services/SimpleService';
-
-// Определите свой тип опций (опционально)
-interface MyCustomOptions {
-    timeout?: number;
-    retries?: number;
-}
-
-// Создайте пользовательский executor
-const customExecutor: RequestExecutor<MyCustomOptions> = {
-    async request<TResponse>(config: RequestConfig, options?: MyCustomOptions): Promise<TResponse> {
-        // Ваша пользовательская логика запросов здесь
-        const response = await fetch(config.url, {
-            method: config.method,
-            headers: config.headers,
-            body: config.body ? JSON.stringify(config.body) : undefined,
-            signal: options?.timeout ? AbortSignal.timeout(options.timeout) : undefined,
-        });
-        
-        if (!response.ok) {
-            throw new Error(`Request failed: ${response.statusText}`);
-        }
-        
-        return response.json();
-    },
-};
-
-// Используйте его со сгенерированными сервисами
-const simpleService = new SimpleService<MyCustomOptions>(customExecutor);
-await simpleService.getCallWithoutParametersAndResponse({ timeout: 5000, retries: 3 });
-```
-
-**Использование legacy request adapter:**
-
-Если у вас есть существующий пользовательский файл `request` (указанный через опцию `--request`), вы можете использовать хелпер `createLegacyExecutor` для адаптации его к новому интерфейсу `RequestExecutor`:
-
-```ts
-import { createLegacyExecutor } from './generated/core/legacy-request-adapter';
-import { OpenAPI } from './generated/core/OpenAPI';
-import { SimpleService } from './generated/services/SimpleService';
-
-// Legacy адаптер оборачивает вашу существующую функцию request
-const executor = createLegacyExecutor(OpenAPI);
-
-// Опционально, вы можете мапить пользовательские опции в ApiRequestOptions
-interface XHROptions {
-    timeout?: number;
-}
-
-const executorWithOptions = createLegacyExecutor<XHROptions>(OpenAPI, (options) => {
-    // Мапьте ваши пользовательские опции в ApiRequestOptions при необходимости
-    return {
-        // Добавьте любые поля ApiRequestOptions на основе options
-    };
-});
-
-// Используйте со сервисами
-const simpleService = new SimpleService(executor);
-await simpleService.getCallWithoutParametersAndResponse();
-```
-
-**Примечание:** Опция --request по-прежнему работает для кастомизации core-функции request. Сгенерированный legacy-request-adapter автоматически будет использовать вашу пользовательскую реализацию request при создании адаптера.
-
 ### Стратегия сортировки аргументов функций `--sortByRequired`
 По умолчанию генератор OpenAPI сортирует параметры сервисных функций согласно упрощенной схеме. Если вам нужна более строгая опция сортировки, используйте флаг `--sortByRequired`. Упрощенная опция сортировки похожа на ту, что использовалась в версии 0.2.3 генератора OpenAPI. Этот флаг позволяет обновиться до новой версии генератора, если вы "застряли" на версии 0.2.3.
 

package/dist/cli/initOpenApiConfig/Types.d.ts

@@ -1,8 +1,3 @@
-import { EOptionType } from "./Enums";
-export type TInitOpenApiConfigParams = {
-    type: EOptionType;
-    openapiConfig?: string;
-};
 export type CLITemplates = {
     config: Handlebars.TemplateDelegate;
     request: Handlebars.TemplateDelegate;

package/dist/cli/initOpenApiConfig/Types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/Types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,MAAM,MAAM,wBAAwB,GAAG;IACnC,IAAI,EAAE,WAAW,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACrC,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;CAChD,CAAC"}
+{"version":3,"file":"Types.d.ts","sourceRoot":"","sources":["../../../src/cli/initOpenApiConfig/Types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACvB,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;IACrC,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;CAChD,CAAC"}

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

@@ -1,7 +1,6 @@
 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__;
@@ -13,7 +12,6 @@ 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,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"}
+{"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"}

package/dist/common/utils/fileSystemHelpers.js

@@ -73,14 +73,6 @@ 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,
@@ -92,6 +84,5 @@ const fileSystemHelpers = {
     isDirectory,
     isPathToFile,
     readdir,
-    isSameFilePath,
 };
 exports.fileSystemHelpers = fileSystemHelpers;

package/dist/core/Context.d.ts

@@ -14,6 +14,15 @@ type RefsLike = {
     paths: (...args: any[]) => string[];
     exists: (...args: any[]) => boolean;
 };
+interface VirtualFile {
+    /** Абсолютный путь исходного файла (БЕЗ fragment) */
+    sourceFile: string;
+    /** Абсолютный путь output-файла (.ts) */
+    outputFile: string;
+    /** Все fragment'ы, которые встречались у этого файла */
+    fragments: Set<string>;
+}
+type VirtualFileMap = Map<string, VirtualFile>;
 /**
  * A Context wich can share a data between methods
  */
@@ -23,6 +32,8 @@ export declare class Context {
     private _output;
     prefix: PrefixArtifacts;
     private _sortByRequired;
+    private specRoot;
+    private virtualFiles;
     constructor({ input, output, prefix, sortByRequired }: TContextProps);
     addRefs(refs: RefsLike): Context;
     values(...types: string[]): Record<string, any>;
@@ -33,6 +44,17 @@ export declare class Context {
     get output(): OutputPaths;
     get sortByRequired(): boolean;
     get root(): $Root | undefined;
+    private canonicalizeRef;
+    private mapSourceToOutput;
+    private registerRef;
+    private walkSchema;
+    initializeVirtualFileMap(rootSchema: unknown, entryFile: string): void;
+    getVirtualFiles(): VirtualFileMap;
+    getAllCanonicalRefs(): string[];
+    resolveCanonicalRef(canonicalRef: string): {
+        outputFile: string;
+        fragment?: string;
+    } | undefined;
 }
 export {};
 //# sourceMappingURL=Context.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGhF,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAIhD,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;IAC7E,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAc;IACtB,MAAM,EAAE,eAAe,CAI5B;IAEF,OAAO,CAAC,eAAe,CAAkB;gBAE7B,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa;IAmB7D,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKhC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAOtE,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO7B,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,gBAKhB;IAED,IAAW,cAAc,YAExB;IAED,IAAW,IAAI,IAAI,KAAK,GAAG,SAAS,CAEnC;CACJ"}
+{"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../src/core/Context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAIhF,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAKhD,KAAK,aAAa,GAAG;IACjB,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,KAAK,QAAQ,GAAG;IACZ,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChD,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,eAAe,GAAG,eAAe,GAAG,eAAe,CAAC;IAC7E,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAAC;IACpC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC;CACvC,CAAC;AAEF,UAAU,WAAW;IACjB,qDAAqD;IACrD,UAAU,EAAE,MAAM,CAAC;IAEnB,yCAAyC;IACzC,UAAU,EAAE,MAAM,CAAC;IAEnB,wDAAwD;IACxD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,KAAK,cAAc,GAAG,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAE/C;;GAEG;AACH,qBAAa,OAAO;IAChB,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,KAAK,CAAoB;IACjC,OAAO,CAAC,OAAO,CAAc;IACtB,MAAM,EAAE,eAAe,CAI5B;IAEF,OAAO,CAAC,eAAe,CAAkB;IAEzC,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,YAAY,CAA6B;gBAErC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE,aAAa;IAmB7D,OAAO,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO;IAKhC,MAAM,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAO/C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,eAAe,GAAG,eAAe;IAOtE,KAAK,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAOnC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO7B,QAAQ,IAAI,MAAM;IAOzB,IAAW,MAAM,gBAKhB;IAED,IAAW,cAAc,YAExB;IAED,IAAW,IAAI,IAAI,KAAK,GAAG,SAAS,CAEnC;IAED,OAAO,CAAC,eAAe;IAqBvB,OAAO,CAAC,iBAAiB;IASzB,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,UAAU;IAiBX,wBAAwB,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM;IAiB/D,eAAe,IAAI,cAAc;IAIjC,mBAAmB,IAAI,MAAM,EAAE;IAgB/B,mBAAmB,CAAC,YAAY,EAAE,MAAM,GACzC;QACI,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACrB,GACD,SAAS;CAYlB"}

package/dist/core/Context.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
+const path_1 = require("path");
 const pathHelpers_1 = require("../common/utils/pathHelpers");
 const getFileName_1 = require("./utils/getFileName");
 const isString_1 = require("./utils/isString");
+const parseRef_1 = require("./utils/parseRef");
 /**
  * A Context wich can share a data between methods
  */
@@ -17,6 +19,8 @@ class Context {
         type: 'T',
     };
     _sortByRequired = false;
+    specRoot;
+    virtualFiles = new Map();
     constructor({ input, output, prefix, sortByRequired }) {
         this._output = output;
         this._refs = {};
@@ -80,5 +84,98 @@ class Context {
     get root() {
         return this._root;
     }
+    canonicalizeRef(ref, parentSourceFile) {
+        const parsed = (0, parseRef_1.parseRef)(ref);
+        // LOCAL_FRAGMENT → тот же файл
+        if (parsed.type === parseRef_1.RefType.LOCAL_FRAGMENT) {
+            return {
+                sourceFile: (0, pathHelpers_1.normalizeHelper)(parentSourceFile),
+                fragment: parsed.fragment,
+            };
+        }
+        // Внешний ref
+        const parentDir = (0, pathHelpers_1.dirNameHelper)(parentSourceFile);
+        const absSource = (0, pathHelpers_1.resolveHelper)(parentDir, parsed.filePath);
+        return {
+            sourceFile: (0, pathHelpers_1.normalizeHelper)(absSource),
+            fragment: parsed.fragment,
+        };
+    }
+    mapSourceToOutput(sourceFile) {
+        const relative = (0, pathHelpers_1.relativeHelper)(this.specRoot, sourceFile);
+        const dir = (0, pathHelpers_1.dirNameHelper)(relative);
+        const baseName = (0, path_1.basename)(relative).replace(/\.(yaml|yml|json)$/i, '.ts');
+        return (0, pathHelpers_1.resolveHelper)(this.output.outputModels, dir, baseName);
+    }
+    registerRef(ref, parentSourceFile) {
+        const { sourceFile, fragment } = this.canonicalizeRef(ref, parentSourceFile);
+        let entry = this.virtualFiles.get(sourceFile);
+        if (!entry) {
+            entry = {
+                sourceFile,
+                outputFile: this.mapSourceToOutput(sourceFile),
+                fragments: new Set(),
+            };
+            this.virtualFiles.set(sourceFile, entry);
+        }
+        if (fragment) {
+            entry.fragments.add(fragment);
+        }
+    }
+    walkSchema(obj, parentSourceFile) {
+        if (!obj || typeof obj !== 'object')
+            return;
+        if (typeof obj.$ref === 'string') {
+            this.registerRef(obj.$ref, parentSourceFile);
+        }
+        if (Array.isArray(obj)) {
+            obj.forEach(item => this.walkSchema(item, parentSourceFile));
+            return;
+        }
+        for (const value of Object.values(obj)) {
+            this.walkSchema(value, parentSourceFile);
+        }
+    }
+    initializeVirtualFileMap(rootSchema, entryFile) {
+        this.specRoot = (0, pathHelpers_1.normalizeHelper)((0, pathHelpers_1.dirNameHelper)(entryFile));
+        const normalizedEntry = (0, pathHelpers_1.normalizeHelper)(entryFile);
+        // Гарантируем, что entry файл тоже есть в карте
+        if (!this.virtualFiles.has(normalizedEntry)) {
+            this.virtualFiles.set(normalizedEntry, {
+                sourceFile: normalizedEntry,
+                outputFile: this.mapSourceToOutput(normalizedEntry),
+                fragments: new Set(),
+            });
+        }
+        this.walkSchema(rootSchema, normalizedEntry);
+    }
+    getVirtualFiles() {
+        return this.virtualFiles;
+    }
+    getAllCanonicalRefs() {
+        const result = [];
+        for (const file of this.virtualFiles.values()) {
+            if (file.fragments.size > 0) {
+                for (const fragment of file.fragments) {
+                    result.push(`${file.sourceFile}${fragment}`);
+                }
+            }
+            else {
+                result.push(file.sourceFile);
+            }
+        }
+        return result;
+    }
+    resolveCanonicalRef(canonicalRef) {
+        const parsed = (0, parseRef_1.parseRef)(canonicalRef);
+        const sourceFile = (0, pathHelpers_1.normalizeHelper)(parsed.filePath ?? '');
+        const file = this.virtualFiles.get(sourceFile);
+        if (!file)
+            return undefined;
+        return {
+            outputFile: file.outputFile,
+            fragment: parsed.fragment,
+        };
+    }
 }
 exports.Context = Context;

package/dist/core/api/v2/parser/getModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}
+{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}

package/dist/core/api/v2/parser/getModels.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
 const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
-const getRefFromSchema_1 = require("../../../utils/getRefFromSchema");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
 function getModels(openApi) {
     let models = [];
-    const listOfModelsRef = (0, getRefFromSchema_1.getRefFromSchema)(this.context, openApi);
+    const listOfModelsRef = this.context.getAllCanonicalRefs();
     if (listOfModelsRef) {
         for (const modelRef of listOfModelsRef) {
             const definition = this.context.get(modelRef);

package/dist/core/api/v2/parser/getType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAoC5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA4C5E"}

package/dist/core/api/v2/parser/getType.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
+const pathHelpers_1 = require("../../../../common/utils/pathHelpers");
 const getMappedType_1 = require("../../../utils/getMappedType");
 const getTypeName_1 = require("../../../utils/getTypeName");
 const normalizeString_1 = require("../../../utils/normalizeString");
-const resolveRefToImportPath_1 = require("../../../utils/resolveRefToImportPath");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
 /**
  * Parse any string value into a type object.
@@ -30,13 +30,19 @@ function getType(value, parentRef) {
         }
     }
     else if (valueClean) {
-        // Safely calculate the path that the specification file will have in outputModels folder
-        const valuePath = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
-            mainSpecPath: this.context.root?.path || '',
-            parentFilePath: parentRef,
-            refValuePath: normalizedValue,
-            outputModelsPath: this.context.output?.outputModels,
-        });
+        /**
+         * canonicalValue может быть пустой строкой.
+         * В этом случае надо брать непосредственно normalizedValue - это относительный путь или фрагмент.
+         * Предполагаем, что в таком случае расчитывать нет нужды. Это путь от папки outputModels
+         */
+        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue);
+        let valuePath = valueClean;
+        if (canonicalValue) {
+            const refValuePath = canonicalValue?.fragment ? `${canonicalValue.outputFile}${canonicalValue.fragment}` : canonicalValue?.outputFile || '';
+            const cleanedRefValuePath = (0, stripNamespace_1.stripNamespace)(refValuePath);
+            valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
+        }
+        valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
         const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;

package/dist/core/api/v3/parser/getModels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}
+{"version":3,"file":"getModels.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE,CAsBjE"}

package/dist/core/api/v3/parser/getModels.js

@@ -2,13 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
 const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
-const getRefFromSchema_1 = require("../../../utils/getRefFromSchema");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
 function getModels(openApi) {
     let models = [];
-    const listOfModelsRef = (0, getRefFromSchema_1.getRefFromSchema)(this.context, openApi);
+    const listOfModelsRef = this.context.getAllCanonicalRefs();
     if (listOfModelsRef) {
         for (const modelRef of listOfModelsRef) {
             const definition = this.context.get(modelRef);

package/dist/core/api/v3/parser/getType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAoC5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA6C5E"}

package/dist/core/api/v3/parser/getType.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
+const pathHelpers_1 = require("../../../../common/utils/pathHelpers");
 const getMappedType_1 = require("../../../utils/getMappedType");
 const getTypeName_1 = require("../../../utils/getTypeName");
 const normalizeString_1 = require("../../../utils/normalizeString");
-const resolveRefToImportPath_1 = require("../../../utils/resolveRefToImportPath");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
 /**
  * Parse any string value into a type object.
@@ -30,13 +30,19 @@ function getType(value, parentRef) {
         }
     }
     else if (valueClean) {
-        // Safely calculate the path that the specification file will have in outputModels folder
-        const valuePath = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
-            mainSpecPath: this.context.root?.path || '',
-            parentFilePath: parentRef,
-            refValuePath: normalizedValue,
-            outputModelsPath: this.context.output?.outputModels,
-        });
+        /**
+         * canonicalValue может быть пустой строкой.
+         * В этом случае надо брать непосредственно normalizedValue - это относительный путь или фрагмент.
+         * Предполагаем, что в таком случае расчитывать нет нужды. Это путь от папки outputModels
+         */
+        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue);
+        let valuePath = valueClean;
+        if (canonicalValue) {
+            const refValuePath = canonicalValue?.fragment ? `${canonicalValue.outputFile}${canonicalValue.fragment}` : canonicalValue?.outputFile || '';
+            const cleanedRefValuePath = (0, stripNamespace_1.stripNamespace)(refValuePath);
+            valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
+        }
+        valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
         const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;

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

@@ -1,10 +1,4 @@
 import { Context } from '../Context';
 import { CommonOpenApi } from '../types/shared/CommonOpenApi.model';
-/**
- * Load and parse te open api spec. If the file extension is ".yml" or ".yaml"
- * we will try to parse the file as a YAML spec, otherwise we will fallback
- * on parsing the file as JSON.
- * @param input
- */
 export declare function getOpenApiSpec(context: Context, input: string): Promise<CommonOpenApi>;
 //# sourceMappingURL=getOpenApiSpec.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOpenApiSpec.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAIpE;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CA6B5F"}
+{"version":3,"file":"getOpenApiSpec.d.ts","sourceRoot":"","sources":["../../../src/core/utils/getOpenApiSpec.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAEpE,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAyB5F"}

package/dist/core/utils/getOpenApiSpec.js

@@ -7,33 +7,23 @@ exports.getOpenApiSpec = getOpenApiSpec;
 const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
-const normalizeAllRefs_1 = require("./normalizeAllRefs");
-/**
- * Load and parse te open api spec. If the file extension is ".yml" or ".yaml"
- * we will try to parse the file as a YAML spec, otherwise we will fallback
- * on parsing the file as JSON.
- * @param input
- */
 async function getOpenApiSpec(context, input) {
     const absoluteInput = (0, pathHelpers_1.resolveHelper)(process.cwd(), input);
     if (!input) {
-        throw new Error(`Could not find OpenApi spec: "${absoluteInput}"`);
+        throw new Error(`OpenAPI spec path is empty`);
     }
-    const fileExists = await fileSystemHelpers_1.fileSystemHelpers.exists(absoluteInput);
-    if (!fileExists) {
-        throw new Error(`Could not read OpenApi spec: "${absoluteInput}"`);
+    const exists = await fileSystemHelpers_1.fileSystemHelpers.exists(absoluteInput);
+    if (!exists) {
+        throw new Error(`OpenAPI spec not found: ${absoluteInput}`);
     }
-    // const isValidated = await SwaggerParser.validate(absoluteInput)
-    const resolvedRefs = await swagger_parser_1.default.resolve(absoluteInput, { validate: false });
-    // Coerce to the loose interface expected by Context
-    context.addRefs(resolvedRefs);
-    const raw = resolvedRefs.get(absoluteInput);
-    if (!raw || typeof raw !== 'object' || Array.isArray(raw) || !('paths' in raw)) {
-        throw new Error(`Schema at "${absoluteInput}" is not a valid OpenAPI object`);
+    const parser = new swagger_parser_1.default();
+    const resolved = await parser.resolve(absoluteInput);
+    context.addRefs(resolved);
+    // Получить основную схему
+    const raw = resolved.get(absoluteInput);
+    if (!raw || typeof raw !== 'object') {
+        throw new Error(`Invalid OpenAPI schema at ${absoluteInput}`);
     }
-    const mainSchema = raw;
-    // Normalize all $ref in the entire schema using the new comprehensive resolver
-    const normalizedSchema = (0, normalizeAllRefs_1.normalizeAllRefs)(mainSchema, context, absoluteInput);
-    // The schema is already fully normalized, so we can return it directly
-    return normalizedSchema;
+    context.initializeVirtualFileMap(raw, absoluteInput);
+    return raw;
 }

package/dist/core/utils/stripNamespace.js

@@ -17,7 +17,7 @@ function stripNamespace(value) {
         const foundFile = value.match(/^(.*)#/);
         const directoryName = foundFile ? (0, pathHelpers_1.dirNameHelper)(foundFile[1]) : (0, pathHelpers_1.dirNameHelper)(value);
         const extName = (0, path_1.extname)(value);
-        const baseName = extName.toLowerCase().match(/(\.json|\.yaml|\.yml)$/g) ? (0, getClassName_1.getClassName)((0, path_1.basename)(value, extName)) : (0, getClassName_1.getClassName)((0, path_1.basename)(value));
+        const baseName = extName ? (0, getClassName_1.getClassName)((0, path_1.basename)(value, extName)) : (0, getClassName_1.getClassName)((0, path_1.basename)(value));
         return directoryName ? (0, pathHelpers_1.joinHelper)(directoryName, baseName) : baseName;
     }
     const clearValue = value

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-openapi-codegen",
-    "version": "2.0.0-beta.6",
+    "version": "2.0.0-beta.7",
     "description": "Library that generates Typescript clients based on the OpenAPI specification. It bases on openapi-typescript-codegen",
     "author": "Alexey Zverev",
     "homepage": "https://github.com/ozonophore/openapi-codegen.git",
@@ -105,8 +105,6 @@
         "@typescript-eslint/eslint-plugin": "^8.34.1",
         "@typescript-eslint/parser": "^8.34.1",
         "abort-controller": "^3.0.0",
-        "ajv": "^8.17.1",
-        "ajv-formats": "^3.0.1",
         "axios": "1.8.2",
         "codecov": "3.8.3",
         "eslint": "^9.29.0",
@@ -128,16 +126,12 @@
         "ts-prune": "^0.10.3",
         "tsx": "^4.20.3",
         "typescript": "^5.8.3",
-        "yup": "^1.7.1",
         "zod": "^4.3.2"
     },
     "peerDependencies": {
-        "ajv": ">=8.17.1",
-        "ajv-formats": ">=3.0.1",
         "axios": ">=1.8.2 <=1.9.0",
         "joi": ">=17.13.3",
         "prettier": "3.4.2>= <=3.5.3",
-        "yup": ">=1.7.1",
         "zod": ">=4.3.2"
     }
 }