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

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

package/dist/core/utils/getOpenApiSpec.js

@@ -17,7 +17,20 @@ async function getOpenApiSpec(context, input) {
         throw new Error(`OpenAPI spec not found: ${absoluteInput}`);
     }
     const parser = new swagger_parser_1.default();
-    const resolved = await parser.resolve(absoluteInput);
+    const previousCwd = process.cwd();
+    const inputDir = (0, pathHelpers_1.dirNameHelper)(absoluteInput);
+    if (previousCwd !== inputDir) {
+        process.chdir(inputDir);
+    }
+    let resolved;
+    try {
+        resolved = await parser.resolve(absoluteInput);
+    }
+    finally {
+        if (process.cwd() !== previousCwd) {
+            process.chdir(previousCwd);
+        }
+    }
     context.addRefs(resolved);
     // Получить основную схему
     const raw = resolved.get(absoluteInput);

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

package/dist/core/utils/postProcessModelImports.js

@@ -1,15 +1,28 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.postProcessModelImports = postProcessModelImports;
+const path_1 = __importDefault(require("path"));
 const sort_1 = require("./sort");
 const unique_1 = require("./unique");
+function normalizePath(value) {
+    return value.startsWith('./') ? value.slice(2) : value;
+}
 /**
  * Set unique imports, sorted by name
  * @param model The model that is post-processed
  */
 function postProcessModelImports(model) {
+    const currentModelPath = normalizePath(model.path);
+    const currentModelDir = path_1.default.posix.dirname(currentModelPath);
     return model?.imports
         ?.filter(unique_1.unique)
         ?.sort(sort_1.sort)
-        ?.filter(item => model.name !== item.name);
+        ?.filter(item => {
+        const importPath = normalizePath(item.path);
+        const resolvedFromCurrentModel = path_1.default.posix.normalize(path_1.default.posix.join(currentModelDir, importPath));
+        return resolvedFromCurrentModel !== currentModelPath;
+    });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAKpE"}
+{"version":3,"file":"postProcessServiceImports.d.ts","sourceRoot":"","sources":["../../../src/core/utils/postProcessServiceImports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAI7D;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAIpE"}

package/dist/core/utils/postProcessServiceImports.js

@@ -10,6 +10,5 @@ const unique_1 = require("./unique");
 function postProcessServiceImports(service) {
     return service.imports
         .filter(unique_1.unique)
-        .sort(sort_1.sort)
-        .filter(item => service.name !== item.name);
+        .sort(sort_1.sort);
 }

package/dist/core/utils/precompileTemplates.js

@@ -66,6 +66,7 @@ const precompileTemplates = () => {
                             isBasicType: true,
                             yupBaseSchema: true,
                             joiBaseSchema: true,
+                            zodBaseSchema: true,
                             getRequiredFields: true,
                             getEnumType: true,
                             camelCase: true,

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

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

package/dist/core/utils/registerHandlebarHelpers.js

@@ -168,6 +168,31 @@ function registerHandlebarHelpers(root) {
                 return 'Joi.any()';
         }
     });
+    Handlebars.registerHelper('zodBaseSchema', function (base) {
+        if (!base)
+            return 'z.any()';
+        const baseLower = base.toLowerCase();
+        switch (baseLower) {
+            case 'string':
+                return 'z.string()';
+            case 'number':
+                return 'z.number()';
+            case 'integer':
+            case 'int':
+                return 'z.number().int()';
+            case 'boolean':
+                return 'z.boolean()';
+            case 'null':
+                return 'z.null()';
+            case 'uuid':
+                return 'z.uuid()';
+            case 'file':
+            case 'any':
+                return 'z.any()';
+            default:
+                return `${base}Schema`;
+        }
+    });
     Handlebars.registerHelper('getRequiredFields', function (properties) {
         const required = properties
             .filter(prop => prop.isRequired)

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

@@ -1 +1 @@
-{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AA6FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAyK1K"}
+{"version":3,"file":"registerHandlebarTemplates.d.ts","sourceRoot":"","sources":["../../../src/core/utils/registerHandlebarTemplates.ts"],"names":[],"mappings":"AA8FA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AA2C1E,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,OAAO,CAAC;IAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAAE,GAAG,SAAS,CAqK1K"}

package/dist/core/utils/registerHandlebarTemplates.js

@@ -89,6 +89,7 @@ const getResponseHeader_4 = __importDefault(require("../../templatesCompiled/cli
 const request_5 = __importDefault(require("../../templatesCompiled/client/core/xhr/request"));
 const sendRequest_4 = __importDefault(require("../../templatesCompiled/client/core/xhr/sendRequest"));
 const exportClient_1 = __importDefault(require("../../templatesCompiled/client/exportClient"));
+const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/exportSchema"));
 const exportModel_1 = __importDefault(require("../../templatesCompiled/client/exportModel"));
 const exportService_1 = __importDefault(require("../../templatesCompiled/client/exportService"));
 const indexFull_1 = __importDefault(require("../../templatesCompiled/client/indexFull"));
@@ -130,7 +131,7 @@ const typeReference_1 = __importDefault(require("../../templatesCompiled/client/
 const typeUnion_1 = __importDefault(require("../../templatesCompiled/client/partials/typeUnion"));
 const registerHandlebarHelpers_1 = require("./registerHandlebarHelpers");
 const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
-const exportSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
+const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/zod/exportSchema"));
 const zodSchema_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchema"));
 const zodSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaInterface"));
 const zodSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaEnum"));
@@ -139,7 +140,7 @@ const zodSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const zodSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaGeneric"));
 const zodSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaReference"));
 const zodSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/zod/partials/zodSchemaComposition"));
-const exportSchema_2 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
+const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/yup/exportSchema"));
 const yupSchema_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchema"));
 const yupSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaInterface"));
 const yupSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaEnum"));
@@ -148,7 +149,7 @@ const yupSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const yupSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaGeneric"));
 const yupSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaReference"));
 const yupSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/yup/partials/yupSchemaComposition"));
-const exportSchema_3 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
+const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/joi/exportSchema"));
 const joiSchema_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchema"));
 const joiSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaInterface"));
 const joiSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaEnum"));
@@ -157,7 +158,7 @@ const joiSchemaDictionary_1 = __importDefault(require("../../templatesCompiled/c
 const joiSchemaGeneric_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaGeneric"));
 const joiSchemaReference_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaReference"));
 const joiSchemaComposition_1 = __importDefault(require("../../templatesCompiled/client/joi/partials/joiSchemaComposition"));
-const exportSchema_4 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
+const exportSchema_5 = __importDefault(require("../../templatesCompiled/client/jsonschema/exportSchema"));
 const jsonschemaSchema_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchema"));
 const jsonschemaSchemaInterface_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaInterface"));
 const jsonschemaSchemaEnum_1 = __importDefault(require("../../templatesCompiled/client/jsonschema/partials/jsonschemaSchemaEnum"));
@@ -185,7 +186,7 @@ function registerHandlebarTemplates(root) {
         exports: {
             client: Handlebars.template(exportClient_1.default),
             model: Handlebars.template(exportModel_1.default),
-            schema: undefined,
+            schema: Handlebars.template(exportSchema_1.default),
             service: Handlebars.template(exportService_1.default),
         },
         core: {
@@ -277,50 +278,50 @@ function registerHandlebarTemplates(root) {
     Handlebars.registerPartial('axios/request', Handlebars.template(request_1.default));
     // Register Zod partials if validationLibrary is ZOD
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.ZOD) {
-        templates.exports.schema = Handlebars.template(exportSchema_1.default);
-        Handlebars.registerPartial('zodSchema', Handlebars.template(zodSchema_1.default));
-        Handlebars.registerPartial('zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
-        Handlebars.registerPartial('zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
-        Handlebars.registerPartial('zodSchemaArray', Handlebars.template(zodSchemaArray_1.default));
-        Handlebars.registerPartial('zodSchemaDictionary', Handlebars.template(zodSchemaDictionary_1.default));
-        Handlebars.registerPartial('zodSchemaGeneric', Handlebars.template(zodSchemaGeneric_1.default));
-        Handlebars.registerPartial('zodSchemaReference', Handlebars.template(zodSchemaReference_1.default));
-        Handlebars.registerPartial('zodSchemaComposition', Handlebars.template(zodSchemaComposition_1.default));
+        Handlebars.registerPartial('zod/exportSchema', Handlebars.template(exportSchema_2.default));
+        Handlebars.registerPartial('zod/zodSchema', Handlebars.template(zodSchema_1.default));
+        Handlebars.registerPartial('zod/zodSchemaInterface', Handlebars.template(zodSchemaInterface_1.default));
+        Handlebars.registerPartial('zod/zodSchemaEnum', Handlebars.template(zodSchemaEnum_1.default));
+        Handlebars.registerPartial('zod/zodSchemaArray', Handlebars.template(zodSchemaArray_1.default));
+        Handlebars.registerPartial('zod/zodSchemaDictionary', Handlebars.template(zodSchemaDictionary_1.default));
+        Handlebars.registerPartial('zod/zodSchemaGeneric', Handlebars.template(zodSchemaGeneric_1.default));
+        Handlebars.registerPartial('zod/zodSchemaReference', Handlebars.template(zodSchemaReference_1.default));
+        Handlebars.registerPartial('zod/zodSchemaComposition', Handlebars.template(zodSchemaComposition_1.default));
     }
     // Register Yup partials if validationLibrary is YUP
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.YUP) {
-        templates.exports.schema = Handlebars.template(exportSchema_2.default);
-        Handlebars.registerPartial('yupSchema', Handlebars.template(yupSchema_1.default));
-        Handlebars.registerPartial('yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
-        Handlebars.registerPartial('yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
-        Handlebars.registerPartial('yupSchemaArray', Handlebars.template(yupSchemaArray_1.default));
-        Handlebars.registerPartial('yupSchemaDictionary', Handlebars.template(yupSchemaDictionary_1.default));
-        Handlebars.registerPartial('yupSchemaGeneric', Handlebars.template(yupSchemaGeneric_1.default));
-        Handlebars.registerPartial('yupSchemaReference', Handlebars.template(yupSchemaReference_1.default));
-        Handlebars.registerPartial('yupSchemaComposition', Handlebars.template(yupSchemaComposition_1.default));
+        Handlebars.registerPartial('yup/exportSchema', Handlebars.template(exportSchema_3.default));
+        Handlebars.registerPartial('yup/yupSchema', Handlebars.template(yupSchema_1.default));
+        Handlebars.registerPartial('yup/yupSchemaInterface', Handlebars.template(yupSchemaInterface_1.default));
+        Handlebars.registerPartial('yup/yupSchemaEnum', Handlebars.template(yupSchemaEnum_1.default));
+        Handlebars.registerPartial('yup/yupSchemaArray', Handlebars.template(yupSchemaArray_1.default));
+        Handlebars.registerPartial('yup/yupSchemaDictionary', Handlebars.template(yupSchemaDictionary_1.default));
+        Handlebars.registerPartial('yup/yupSchemaGeneric', Handlebars.template(yupSchemaGeneric_1.default));
+        Handlebars.registerPartial('yup/yupSchemaReference', Handlebars.template(yupSchemaReference_1.default));
+        Handlebars.registerPartial('yup/yupSchemaComposition', Handlebars.template(yupSchemaComposition_1.default));
     }
     // Register Joi partials if validationLibrary is JOI
     if (root?.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JOI) {
-        templates.exports.schema = Handlebars.template(exportSchema_3.default);
-        Handlebars.registerPartial('joiSchema', Handlebars.template(joiSchema_1.default));
-        Handlebars.registerPartial('joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
-        Handlebars.registerPartial('joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
-        Handlebars.registerPartial('joiSchemaArray', Handlebars.template(joiSchemaArray_1.default));
-        Handlebars.registerPartial('joiSchemaDictionary', Handlebars.template(joiSchemaDictionary_1.default));
-        Handlebars.registerPartial('joiSchemaGeneric', Handlebars.template(joiSchemaGeneric_1.default));
-        Handlebars.registerPartial('joiSchemaReference', Handlebars.template(joiSchemaReference_1.default));
-        Handlebars.registerPartial('joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
+        Handlebars.registerPartial('joi/exportSchema', Handlebars.template(exportSchema_4.default));
+        Handlebars.registerPartial('joi/joiSchema', Handlebars.template(joiSchema_1.default));
+        Handlebars.registerPartial('joi/joiSchemaInterface', Handlebars.template(joiSchemaInterface_1.default));
+        Handlebars.registerPartial('joi/joiSchemaEnum', Handlebars.template(joiSchemaEnum_1.default));
+        Handlebars.registerPartial('joi/joiSchemaArray', Handlebars.template(joiSchemaArray_1.default));
+        Handlebars.registerPartial('joi/joiSchemaDictionary', Handlebars.template(joiSchemaDictionary_1.default));
+        Handlebars.registerPartial('joi/joiSchemaGeneric', Handlebars.template(joiSchemaGeneric_1.default));
+        Handlebars.registerPartial('joi/joiSchemaReference', Handlebars.template(joiSchemaReference_1.default));
+        Handlebars.registerPartial('joi/joiSchemaComposition', Handlebars.template(joiSchemaComposition_1.default));
     }
     if (root.validationLibrary === ValidationLibrary_enum_1.ValidationLibrary.JSONSCHEMA) {
-        templates.exports.schema = Handlebars.template(exportSchema_4.default);
-        Handlebars.registerPartial('jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaArray', Handlebars.template(jsonschemaSchemaArray_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaDictionary', Handlebars.template(jsonschemaSchemaDictionary_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaGeneric', Handlebars.template(jsonschemaSchemaGeneric_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaReference', Handlebars.template(jsonschemaSchemaReference_1.default));
-        Handlebars.registerPartial('jsonschemaSchemaComposition', Handlebars.template(jsonschemaSchemaComposition_1.default));
+        Handlebars.registerPartial('jsonschema/exportSchema', Handlebars.template(exportSchema_5.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchema', Handlebars.template(jsonschemaSchema_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaInterface', Handlebars.template(jsonschemaSchemaInterface_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaEnum', Handlebars.template(jsonschemaSchemaEnum_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaArray', Handlebars.template(jsonschemaSchemaArray_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaDictionary', Handlebars.template(jsonschemaSchemaDictionary_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaGeneric', Handlebars.template(jsonschemaSchemaGeneric_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaReference', Handlebars.template(jsonschemaSchemaReference_1.default));
+        Handlebars.registerPartial('jsonschema/jsonschemaSchemaComposition', Handlebars.template(jsonschemaSchemaComposition_1.default));
     }
     return templates;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"resolveRefPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefPath.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CA4BnF"}
+{"version":3,"file":"resolveRefPath.d.ts","sourceRoot":"","sources":["../../../src/core/utils/resolveRefPath.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAW,MAAM,YAAY,CAAC;AAEhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CA0BnF"}

package/dist/core/utils/resolveRefPath.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveRefPath = resolveRefPath;
 const pathHelpers_1 = require("../../common/utils/pathHelpers");
-const advancedDeduplicatePath_1 = require("./advancedDeduplicatePath");
 const parseRef_1 = require("./parseRef");
 /**
  * Resolve a parsed reference to an absolute path (when applicable).
@@ -19,9 +18,7 @@ function resolveRefPath(parsedRef, parentFilePath) {
         case parseRef_1.RefType.EXTERNAL_FILE_FRAGMENT:
             // Resolve relative to parent file directory
             if (parsedRef.filePath) {
-                const resolvedPath = (0, pathHelpers_1.resolveHelper)(parentDir, parsedRef.filePath);
-                // Clean any duplicate path segments
-                return (0, advancedDeduplicatePath_1.advancedDeduplicatePath)(resolvedPath);
+                return (0, pathHelpers_1.resolveHelper)(parentDir, parsedRef.filePath);
             }
             return parentFilePath;
         case parseRef_1.RefType.ABSOLUTE_PATH:

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

@@ -1 +1 @@
-{"version":3,"file":"serviceHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/serviceHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAK7D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAOhH;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAWxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAMvF;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAiChE"}
+{"version":3,"file":"serviceHelpers.d.ts","sourceRoot":"","sources":["../../../src/core/utils/serviceHelpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAK7D;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,IAAI,GAAG,IAAI,CAOhH;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAWxG;AAED;;;;;;;;;GASG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,GAAG,IAAI,CAMvF;AA+CD;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAiChE"}

package/dist/core/utils/serviceHelpers.js

@@ -63,13 +63,39 @@ function mergeOperationImportsIntoService(service, operation) {
 /**
  * Internal helper: apply alias value to models that reference the import.
  */
+function normalizeImportPath(path) {
+    return path.startsWith('./') ? path.slice(2) : path;
+}
+function applyAliasToModel(model, value) {
+    const modelPath = normalizeImportPath(model.path);
+    const importPath = normalizeImportPath(value.path);
+    if (modelPath === importPath && model.type === value.name && value.alias) {
+        model.alias = value.alias;
+        model.base = value.alias;
+    }
+    if (value.alias && model.imports?.some(imprt => normalizeImportPath(imprt.path) === importPath && imprt.name === value.name)) {
+        if (model.base === value.name) {
+            model.base = value.alias;
+        }
+        if (model.type === value.name) {
+            model.type = value.alias;
+        }
+        if (!model.alias) {
+            model.alias = value.alias;
+        }
+    }
+    if (model.link) {
+        applyAliasToModel(model.link, value);
+    }
+    if (model.properties?.length) {
+        model.properties.forEach(child => applyAliasToModel(child, value));
+    }
+    if (model.enums?.length) {
+        model.enums.forEach(child => applyAliasToModel(child, value));
+    }
+}
 function fillModelsByAlias(items = [], value) {
-    items
-        .filter(result => result.path === value.path && result.type === value.name && value.alias)
-        .forEach(result => {
-        result.alias = value.alias;
-        result.base = value.alias;
-    });
+    items.forEach(item => applyAliasToModel(item, value));
 }
 /**
  * Finalize imports for a service: