ts-openapi-codegen 2.0.0-beta.9 → 2.0.0

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 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 getOutputPaths_1 = require("../utils/getOutputPaths");
@@ -70,6 +71,7 @@ const WriteClient_1 = require("../WriteClient");
             useUnionTypes: false,
             excludeCoreServiceFiles: false,
             validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
+            emptySchemaStrategy: EmptySchemaStrategy_enum_1.EmptySchemaStrategy.KEEP,
         });
         strict_1.default.ok(mkdirCalls.length > 0, 'mkdir should be called at least once');
         strict_1.default.ok(writeFileCalls.length > 0, 'writeFile should be called at least once');

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":"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"}
+{"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;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,CA8C5E"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
 const pathHelpers_1 = require("../../../../common/utils/pathHelpers");
 const getMappedType_1 = require("../../../utils/getMappedType");
+const getRelativeModelPath_1 = require("../../../utils/getRelativeModelPath");
 const getTypeName_1 = require("../../../utils/getTypeName");
 const normalizeString_1 = require("../../../utils/normalizeString");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
@@ -42,7 +43,7 @@ function getType(value, parentRef) {
             const cleanedRefValuePath = (0, stripNamespace_1.stripNamespace)(refValuePath);
             valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
         }
-        valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
+        valuePath = (0, getRelativeModelPath_1.getRelativeModelPath)(this.context.output?.outputModels, valuePath);
         const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), normalizedValue, parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;

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":"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"}
+{"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;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,CA6C5E"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
 const pathHelpers_1 = require("../../../../common/utils/pathHelpers");
 const getMappedType_1 = require("../../../utils/getMappedType");
+const getRelativeModelPath_1 = require("../../../utils/getRelativeModelPath");
 const getTypeName_1 = require("../../../utils/getTypeName");
 const normalizeString_1 = require("../../../utils/normalizeString");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
@@ -42,7 +43,7 @@ function getType(value, parentRef) {
             const cleanedRefValuePath = (0, stripNamespace_1.stripNamespace)(refValuePath);
             valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
         }
-        valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
+        valuePath = (0, getRelativeModelPath_1.getRelativeModelPath)(this.context.output?.outputModels, valuePath);
         const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), normalizedValue, parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;

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

@@ -11,7 +11,7 @@ export interface Templates {
     exports: {
         client: Handlebars.TemplateDelegate;
         model: Handlebars.TemplateDelegate;
-        schema: Handlebars.TemplateDelegate | undefined;
+        schema: Handlebars.TemplateDelegate;
         service: Handlebars.TemplateDelegate;
     };
     core: {

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

@@ -1 +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;QACnD,YAAY,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC1C,mBAAmB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACjD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACjD,CAAC;CACL"}
+{"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,CAAC;QACpC,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;QACnD,YAAY,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC1C,mBAAmB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACjD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACjD,CAAC;CACL"}

package/dist/core/types/enums/EmptySchemaStrategy.enum.d.ts

@@ -0,0 +1,6 @@
+export declare enum EmptySchemaStrategy {
+    SEMANTIC = "semantic",
+    SKIP = "skip",
+    KEEP = "keep"
+}
+//# sourceMappingURL=EmptySchemaStrategy.enum.d.ts.map

package/dist/core/types/enums/EmptySchemaStrategy.enum.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EmptySchemaStrategy.enum.d.ts","sourceRoot":"","sources":["../../../../src/core/types/enums/EmptySchemaStrategy.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC3B,QAAQ,aAAa;IACrB,IAAI,SAAS;IACb,IAAI,SAAS;CAChB"}

package/dist/core/types/enums/EmptySchemaStrategy.enum.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EmptySchemaStrategy = void 0;
+var EmptySchemaStrategy;
+(function (EmptySchemaStrategy) {
+    EmptySchemaStrategy["SEMANTIC"] = "semantic";
+    EmptySchemaStrategy["SKIP"] = "skip";
+    EmptySchemaStrategy["KEEP"] = "keep";
+})(EmptySchemaStrategy || (exports.EmptySchemaStrategy = EmptySchemaStrategy = {}));

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

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

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

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

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

@@ -0,0 +1,27 @@
+"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 getRelativeModelPath_1 = require("../getRelativeModelPath");
+(0, node_test_1.describe)('@unit: getRelativeModelPath', () => {
+    (0, node_test_1.test)('should return model relative path when root is undefined', () => {
+        const modelRelativePath = '../../../models/truck';
+        const result = (0, getRelativeModelPath_1.getRelativeModelPath)(undefined, modelRelativePath);
+        node_assert_1.default.strictEqual(result, '../../../models/truck');
+    });
+    (0, node_test_1.test)('should return correct model relative path considering navigation symbols', () => {
+        const rootPath = '/home/generated';
+        const modelRelativePath = '../../../models/truck';
+        const result = (0, getRelativeModelPath_1.getRelativeModelPath)(rootPath, modelRelativePath);
+        node_assert_1.default.strictEqual(result, 'models/truck');
+    });
+    (0, node_test_1.test)('should collapse absolute path to type name', () => {
+        const rootPath = '/home/generated';
+        const modelAbsolutePath = '/home/other/models/truck';
+        const result = (0, getRelativeModelPath_1.getRelativeModelPath)(rootPath, modelAbsolutePath);
+        node_assert_1.default.strictEqual(result, 'truck');
+    });
+});

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

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

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

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

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__/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,6 +6,7 @@ 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");
@@ -47,6 +48,7 @@ const templates_1 = require("../__mocks__/templates");
             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.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;AAEpE,wBAAsB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAyB5F"}
+{"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"}