ts-openapi-codegen 2.0.0-beta.1 → 2.0.0-beta.11

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

@@ -0,0 +1,151 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const modelHelpers_1 = require("../modelHelpers");
+function createModel(overrides = {}) {
+    return {
+        name: 'Model',
+        alias: '',
+        path: 'Model',
+        export: 'reference',
+        type: 'Model',
+        base: 'Model',
+        template: null,
+        link: null,
+        description: null,
+        isDefinition: false,
+        isReadOnly: false,
+        isRequired: false,
+        isNullable: false,
+        imports: [],
+        enum: [],
+        enums: [],
+        properties: [],
+        ...overrides,
+    };
+}
+(0, node_test_1.describe)('@unit: modelHelpers', () => {
+    (0, node_test_1.test)('resolveModelImports should propagate duplicate aliases to nested model types', () => {
+        const importFooA = { name: 'Foo', alias: '', path: './a/Foo' };
+        const importFooB = { name: 'Foo', alias: '', path: './b/Foo' };
+        const propertyFooA = createModel({
+            name: 'fooA',
+            path: './a/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [importFooA],
+        });
+        const propertyFooBArray = createModel({
+            name: 'fooBArray',
+            export: 'array',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [importFooB],
+            link: createModel({
+                path: './b/Foo',
+                type: 'Foo',
+                base: 'Foo',
+                imports: [importFooB],
+            }),
+        });
+        const enumRefFooA = createModel({
+            name: 'FooEnumRef',
+            path: './a/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [importFooA],
+        });
+        const fooModelA = createModel({
+            name: 'Foo',
+            path: 'a/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            export: 'interface',
+        });
+        const fooModelB = createModel({
+            name: 'Foo',
+            path: 'b/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            export: 'interface',
+        });
+        const wrapper = createModel({
+            name: 'Wrapper',
+            path: 'wrapper/Wrapper',
+            export: 'interface',
+            type: 'any',
+            base: 'any',
+            imports: [importFooA, importFooB],
+            properties: [propertyFooA, propertyFooBArray],
+            enums: [enumRefFooA],
+        });
+        const models = [fooModelA, fooModelB, wrapper];
+        (0, modelHelpers_1.setDuplicateModelAliases)(models);
+        (0, modelHelpers_1.resolveModelImports)(models, '/tmp/generated/models');
+        const wrapperImportAliases = wrapper.imports.map(item => item.alias).filter(Boolean);
+        node_assert_1.default.deepStrictEqual(wrapperImportAliases, ['Foo$1', 'Foo$2']);
+        node_assert_1.default.equal(propertyFooA.base, 'Foo$1');
+        node_assert_1.default.equal(propertyFooA.type, 'Foo$1');
+        node_assert_1.default.equal(propertyFooBArray.base, 'Foo$2');
+        node_assert_1.default.equal(propertyFooBArray.type, 'Foo$2');
+        node_assert_1.default.equal(propertyFooBArray.link?.base, 'Foo$2');
+        node_assert_1.default.equal(propertyFooBArray.link?.type, 'Foo$2');
+        node_assert_1.default.equal(enumRefFooA.base, 'Foo$1');
+        node_assert_1.default.equal(enumRefFooA.type, 'Foo$1');
+        node_assert_1.default.equal(wrapper.alias, '');
+    });
+    (0, node_test_1.test)('resolveModelImports should propagate alias when nested import object is not reused after dedup', () => {
+        const importFooRoot = { name: 'Foo', alias: '', path: './a/Foo' };
+        const importFooNested = { name: 'Foo', alias: '', path: './a/Foo' };
+        const fooModel = createModel({
+            name: 'Foo',
+            path: 'a/Foo',
+            export: 'interface',
+            type: 'Foo',
+            base: 'Foo',
+        });
+        const duplicateFooModel = createModel({
+            name: 'Foo',
+            path: 'b/Foo',
+            export: 'interface',
+            type: 'Foo',
+            base: 'Foo',
+        });
+        const nestedRef = createModel({
+            name: 'nestedRef',
+            path: './a/Foo',
+            export: 'reference',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [importFooNested],
+        });
+        const wrapper = createModel({
+            name: 'Wrapper',
+            path: 'wrapper/Wrapper',
+            export: 'all-of',
+            type: 'any',
+            base: 'any',
+            imports: [importFooRoot],
+            properties: [
+                createModel({
+                    name: 'properties',
+                    export: 'interface',
+                    type: 'any',
+                    base: 'any',
+                    properties: [nestedRef],
+                }),
+            ],
+        });
+        const models = [fooModel, duplicateFooModel, wrapper];
+        (0, modelHelpers_1.setDuplicateModelAliases)(models);
+        (0, modelHelpers_1.resolveModelImports)(models, '/tmp/generated/models');
+        node_assert_1.default.equal(wrapper.imports[0].path, '../a/Foo');
+        node_assert_1.default.equal(wrapper.imports[0].alias, 'Foo$1');
+        node_assert_1.default.equal(nestedRef.base, 'Foo$1');
+        node_assert_1.default.equal(nestedRef.type, 'Foo$1');
+    });
+});

package/dist/core/utils/__tests__/postProcessModelImports.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=postProcessModelImports.test.d.ts.map

package/dist/core/utils/__tests__/postProcessModelImports.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"postProcessModelImports.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/postProcessModelImports.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const postProcessModelImports_1 = require("../postProcessModelImports");
+function createModel(overrides = {}) {
+    return {
+        name: 'ISimpleDto',
+        alias: '',
+        path: 'path/alias_request/SimpleDto',
+        export: 'interface',
+        type: 'ISimpleDto',
+        base: 'ISimpleDto',
+        template: null,
+        link: null,
+        description: null,
+        isDefinition: true,
+        isReadOnly: false,
+        isRequired: false,
+        isNullable: false,
+        imports: [],
+        enum: [],
+        enums: [],
+        properties: [],
+        ...overrides,
+    };
+}
+(0, node_test_1.describe)('@unit: postProcessModelImports', () => {
+    (0, node_test_1.test)('keeps same-name imports when path differs and removes only self import', () => {
+        const model = createModel({
+            imports: [
+                { name: 'ISimpleDto', alias: 'ISimpleDto$1', path: './path/alias_response/SimpleDto' },
+                { name: 'ISimpleDto', alias: 'ISimpleDto$2', path: './path/common_request/SimpleDto' },
+                { name: 'ISimpleDto', alias: '', path: './SimpleDto' },
+            ],
+        });
+        const result = (0, postProcessModelImports_1.postProcessModelImports)(model);
+        node_assert_1.default.deepStrictEqual(result.map(item => `${item.name}:${item.alias}:${item.path}`), [
+            'ISimpleDto:ISimpleDto$1:./path/alias_response/SimpleDto',
+            'ISimpleDto:ISimpleDto$2:./path/common_request/SimpleDto',
+        ]);
+    });
+    (0, node_test_1.test)('removes self import by path even if import name differs from model name', () => {
+        const model = createModel({
+            name: 'IModelWithCircularReference',
+            path: 'ModelWithCircularReference',
+            imports: [
+                { name: 'SomeOtherName', alias: '', path: './ModelWithCircularReference' },
+                { name: 'IAnotherModel', alias: '', path: './AnotherModel' },
+            ],
+        });
+        const result = (0, postProcessModelImports_1.postProcessModelImports)(model);
+        node_assert_1.default.deepStrictEqual(result.map(item => `${item.name}:${item.path}`), ['IAnotherModel:./AnotherModel']);
+    });
+    (0, node_test_1.test)('removes self import when model path has nested directory', () => {
+        const model = createModel({
+            name: 'IModelWithCircularReference',
+            path: 'schemas/base/ModelWithCircularReference',
+            imports: [{ name: 'IModelWithCircularReference', alias: '', path: './ModelWithCircularReference' }],
+        });
+        const result = (0, postProcessModelImports_1.postProcessModelImports)(model);
+        node_assert_1.default.deepStrictEqual(result, []);
+    });
+});

package/dist/core/utils/__tests__/postProcessServiceImports.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=postProcessServiceImports.test.d.ts.map

package/dist/core/utils/__tests__/postProcessServiceImports.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"postProcessServiceImports.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/postProcessServiceImports.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const postProcessServiceImports_1 = require("../postProcessServiceImports");
+(0, node_test_1.describe)('@unit: postProcessServiceImports', () => {
+    (0, node_test_1.test)('keeps import when model name equals service name', () => {
+        const service = {
+            name: 'UserService',
+            originName: 'UserService',
+            operations: [],
+            imports: [
+                { name: 'UserService', alias: '', path: '../models/UserService' },
+                { name: 'UserService', alias: 'UserService$1', path: '../models/path/UserService' },
+            ],
+        };
+        const result = (0, postProcessServiceImports_1.postProcessServiceImports)(service);
+        node_assert_1.default.deepStrictEqual(result.map(item => `${item.name}:${item.alias}:${item.path}`), [
+            'UserService:UserService$1:../models/path/UserService',
+            'UserService::../models/UserService',
+        ]);
+    });
+});

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

@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = __importStar(require("node:test"));
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
+const ValidationLibrary_enum_1 = require("../../types/enums/ValidationLibrary.enum");
 const registerHandlebarTemplates_1 = require("../registerHandlebarTemplates");
 (0, node_test_1.describe)('@unit: registerHandlebarTemplates', () => {
     (0, node_test_1.default)('should return correct templates', () => {
@@ -46,6 +47,7 @@ const registerHandlebarTemplates_1 = require("../registerHandlebarTemplates");
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useOptions: false,
             useUnionTypes: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.ZOD,
         });
         node_assert_1.default.notEqual(templates.indexes.full, undefined);
         node_assert_1.default.notEqual(templates.indexes.models, undefined);

package/dist/core/utils/__tests__/resolveRefPath.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=resolveRefPath.test.d.ts.map

package/dist/core/utils/__tests__/resolveRefPath.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveRefPath.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/resolveRefPath.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const parseRef_1 = require("../parseRef");
+const resolveRefPath_1 = require("../resolveRefPath");
+(0, node_test_1.describe)('@unit: resolveRefPath', () => {
+    (0, node_test_1.test)('should keep repeated folder names in absolute path', () => {
+        const parsedRef = {
+            type: parseRef_1.RefType.EXTERNAL_FILE,
+            originalRef: 'schemas/base/ModelWithString.yml',
+            filePath: 'schemas/base/ModelWithString.yml',
+            fragment: undefined,
+        };
+        const parentFilePath = '/home/runner/work/openapi-codegen/openapi-codegen/test/spec/v3.withDifferentRefs.yml';
+        const result = (0, resolveRefPath_1.resolveRefPath)(parsedRef, parentFilePath);
+        node_assert_1.default.strictEqual(result, '/home/runner/work/openapi-codegen/openapi-codegen/test/spec/schemas/base/ModelWithString.yml');
+    });
+});

package/dist/core/utils/__tests__/serviceHelpers.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=serviceHelpers.test.d.ts.map

package/dist/core/utils/__tests__/serviceHelpers.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serviceHelpers.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/serviceHelpers.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,121 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const serviceHelpers_1 = require("../serviceHelpers");
+function createModel(overrides = {}) {
+    return {
+        name: 'Model',
+        alias: '',
+        path: 'Model',
+        export: 'reference',
+        type: 'Model',
+        base: 'Model',
+        template: null,
+        link: null,
+        description: null,
+        isDefinition: false,
+        isReadOnly: false,
+        isRequired: false,
+        isNullable: false,
+        imports: [],
+        enum: [],
+        enums: [],
+        properties: [],
+        ...overrides,
+    };
+}
+function createOperationParameter(overrides = {}) {
+    return {
+        ...createModel(overrides),
+        in: 'query',
+        prop: 'value',
+        mediaType: null,
+        ...overrides,
+    };
+}
+function createOperationResponse(overrides = {}) {
+    return {
+        ...createModel(overrides),
+        in: 'response',
+        code: 200,
+        ...overrides,
+    };
+}
+(0, node_test_1.describe)('@unit: serviceHelpers', () => {
+    (0, node_test_1.test)('finalizeServiceImports should assign duplicate aliases and propagate to params/results', () => {
+        const importFooA = { name: 'Foo', alias: '', path: 'models/a/Foo' };
+        const importFooB = { name: 'Foo', alias: '', path: 'models/b/Foo' };
+        const paramFooA = createOperationParameter({
+            name: 'paramFooA',
+            path: './models/a/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [{ ...importFooA }],
+        });
+        const paramFooBArray = createOperationParameter({
+            name: 'paramFooBArray',
+            export: 'array',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [{ ...importFooB }],
+            link: createModel({
+                path: './models/b/Foo',
+                type: 'Foo',
+                base: 'Foo',
+                imports: [{ ...importFooB }],
+            }),
+        });
+        const resultFooB = createOperationResponse({
+            name: 'resultFooB',
+            path: './models/b/Foo',
+            type: 'Foo',
+            base: 'Foo',
+            imports: [{ ...importFooB }],
+        });
+        const operation = {
+            service: 'PetService',
+            name: 'getPet',
+            summary: null,
+            description: null,
+            deprecated: false,
+            method: 'GET',
+            path: '/pets/{id}',
+            imports: [],
+            parameters: [paramFooA, paramFooBArray],
+            parametersPath: [],
+            parametersQuery: [],
+            parametersForm: [],
+            parametersCookie: [],
+            parametersHeader: [],
+            parametersBody: null,
+            errors: [],
+            results: [resultFooB],
+            responseHeader: null,
+        };
+        const service = {
+            name: 'PetService',
+            originName: 'PetService',
+            operations: [operation],
+            imports: [importFooA, importFooB],
+        };
+        (0, serviceHelpers_1.finalizeServiceImports)(service);
+        const aliasByPath = new Map(service.imports.map(item => [item.path, item.alias]));
+        const aliasA = aliasByPath.get('models/a/Foo');
+        const aliasB = aliasByPath.get('models/b/Foo');
+        node_assert_1.default.ok(aliasA);
+        node_assert_1.default.ok(aliasB);
+        node_assert_1.default.notEqual(aliasA, aliasB);
+        node_assert_1.default.equal(paramFooA.base, aliasA);
+        node_assert_1.default.equal(paramFooA.type, aliasA);
+        node_assert_1.default.equal(paramFooBArray.base, aliasB);
+        node_assert_1.default.equal(paramFooBArray.type, aliasB);
+        node_assert_1.default.equal(paramFooBArray.link?.base, aliasB);
+        node_assert_1.default.equal(paramFooBArray.link?.type, aliasB);
+        node_assert_1.default.equal(operation.results[0].base, aliasB);
+        node_assert_1.default.equal(operation.results[0].type, aliasB);
+    });
+});

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=writeClientExecutor.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"writeClientExecutor.test.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__tests__/writeClientExecutor.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_assert_1 = __importDefault(require("node:assert"));
+const node_test_1 = require("node:test");
+const writeClientExecutor_1 = require("../writeClientExecutor");
+(0, node_test_1.describe)('@unit: writeClientExecutor', () => {
+    (0, node_test_1.test)('deduplicateServicesByName should keep first service by name', () => {
+        const services = [
+            { name: 'V2Service', originName: 'V2Service', operations: [], imports: [] },
+            { name: 'V2Service', originName: 'V2ServiceCopy', operations: [], imports: [] },
+            { name: 'SimpleService', originName: 'SimpleService', operations: [], imports: [] },
+        ];
+        const result = (0, writeClientExecutor_1.deduplicateServicesByName)(services);
+        node_assert_1.default.deepStrictEqual(result.map(item => item.name), ['V2Service', 'SimpleService']);
+        node_assert_1.default.equal(result[0].originName, 'V2Service');
+    });
+});

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

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../../common/utils/fileSystemHelpers");
+const EmptySchemaStrategy_enum_1 = require("../../types/enums/EmptySchemaStrategy.enum");
 const HttpClient_enum_1 = require("../../types/enums/HttpClient.enum");
+const ValidationLibrary_enum_1 = require("../../types/enums/ValidationLibrary.enum");
 const WriteClient_1 = require("../../WriteClient");
 const templates_1 = require("../__mocks__/templates");
 (0, node_test_1.describe)('@unit: writeClientSchemas', () => {
@@ -45,6 +47,8 @@ const templates_1 = require("../__mocks__/templates");
             outputSchemasPath: '/',
             httpClient: HttpClient_enum_1.HttpClient.FETCH,
             useUnionTypes: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
+            emptySchemaStrategy: EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP,
         });
         node_assert_1.default.ok(writeFileCalls.some(([filePath, content]) => filePath.toString().includes('MyModelSchema.ts') && content.toString().includes('schema')), 'Expected writeFile to be called with schema content for MyModelSchema.ts');
         // Restoring the original function

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,CAqC5F"}

package/dist/core/utils/getOpenApiSpec.js

@@ -7,33 +7,36 @@ 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 previousCwd = process.cwd();
+    const inputDir = (0, pathHelpers_1.dirNameHelper)(absoluteInput);
+    if (previousCwd !== inputDir) {
+        process.chdir(inputDir);
     }
-    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;
+    let resolved;
+    try {
+        resolved = await parser.resolve(absoluteInput);
+    }
+    finally {
+        if (process.cwd() !== previousCwd) {
+            process.chdir(previousCwd);
+        }
+    }
+    context.addRefs(resolved);
+    // Получить основную схему
+    const raw = resolved.get(absoluteInput);
+    if (!raw || typeof raw !== 'object') {
+        throw new Error(`Invalid OpenAPI schema at ${absoluteInput}`);
+    }
+    context.initializeVirtualFileMap(raw, absoluteInput);
+    return raw;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA+BrF"}
+{"version":3,"file":"modelHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/modelHelpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAkBjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,GAAG,KAAK,EAAE,CA4ErF"}

package/dist/core/utils/modelHelpers.js

@@ -52,8 +52,36 @@ function setDuplicateModelAliases(models) {
  * @returns the same array of models (modified)
  */
 function resolveModelImports(models, outputModelsDir) {
+    const normalizeImportPath = (value) => (value.startsWith('./') ? value.slice(2) : value);
+    const applyAliasToModel = (model, imprt) => {
+        const modelPath = normalizeImportPath(model.path);
+        const importPath = normalizeImportPath(imprt.path);
+        if (modelPath === importPath && model.type === imprt.name && imprt.alias) {
+            model.alias = imprt.alias;
+            model.base = imprt.alias;
+            model.type = imprt.alias;
+        }
+        if (imprt.alias && model.imports?.some(item => normalizeImportPath(item.path) === importPath && item.name === imprt.name)) {
+            if (model.base === imprt.name) {
+                model.base = imprt.alias;
+            }
+            if (model.type === imprt.name) {
+                model.type = imprt.alias;
+            }
+        }
+        if (model.link) {
+            applyAliasToModel(model.link, imprt);
+        }
+        if (model.properties?.length) {
+            model.properties.forEach(child => applyAliasToModel(child, imprt));
+        }
+        if (model.enums?.length) {
+            model.enums.forEach(child => applyAliasToModel(child, imprt));
+        }
+    };
     models.forEach(model => {
-        model.imports = model.imports.map(imprt => {
+        const importsWithSourcePath = model.imports.map(imprt => {
+            const sourcePath = imprt.path;
             const importModel = models.find(value => {
                 const normalizedPath = !value.path.startsWith('./') ? `./${value.path}` : value.path;
                 return normalizedPath === imprt.path && value.name === imprt.name;
@@ -69,16 +97,22 @@ function resolveModelImports(models, outputModelsDir) {
                     importPath = `./${file}`;
                 }
                 else if (relativePath.startsWith('./')) {
-                    importPath = `${relativePath}${file}`;
+                    importPath = `${relativePath}/${file}`;
                 }
                 else {
                     importPath = `${relativePath}/${file}`;
                 }
             }
-            return Object.assign(imprt, {
+            const mappedImport = Object.assign(imprt, {
                 alias: importAlias,
                 path: importPath,
             });
+            return { mappedImport, sourcePath };
+        });
+        model.imports = importsWithSourcePath.map(item => item.mappedImport);
+        importsWithSourcePath.forEach(item => {
+            applyAliasToModel(model, item.mappedImport);
+            applyAliasToModel(model, Object.assign({}, item.mappedImport, { path: item.sourcePath }));
         });
     });
     return models;

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

@@ -1 +1 @@
-{"version":3,"file":"postProcessModelImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessModelImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAIzD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,CAK9D"}
+{"version":3,"file":"postProcessModelImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessModelImports.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAQzD;;;GAGG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,EAAE,CAY9D"}