ts-openapi-codegen 1.0.0-beta.5 → 1.0.0-beta.7

package/dist/core/WriteClient.js

@@ -0,0 +1,293 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WriteClient = void 0;
+const Enums_1 = require("../common/Enums");
+const Logger_1 = require("../common/Logger");
+const fileSystem_1 = require("./utils/fileSystem");
+const pathHelpers_1 = require("./utils/pathHelpers");
+const prepareAlias_1 = require("./utils/prepareAlias");
+const sortModelByName_1 = require("./utils/sortModelByName");
+const unique_1 = require("./utils/unique");
+const writeClientCore_1 = require("./utils/writeClientCore");
+const writeClientCoreIndex_1 = require("./utils/writeClientCoreIndex");
+const writeClientFullIndex_1 = require("./utils/writeClientFullIndex");
+const writeClientModels_1 = require("./utils/writeClientModels");
+const writeClientModelsIndex_1 = require("./utils/writeClientModelsIndex");
+const writeClientSchemas_1 = require("./utils/writeClientSchemas");
+const writeClientSchemasIndex_1 = require("./utils/writeClientSchemasIndex");
+const writeClientServices_1 = require("./utils/writeClientServices");
+const writeClientServicesIndex_1 = require("./utils/writeClientServicesIndex");
+const writeClientSimpleIndex_1 = require("./utils/writeClientSimpleIndex");
+/**
+ * The client which is writing all items and keep the parameters to write index file
+ */
+class WriteClient {
+    config = new Map();
+    _logger;
+    constructor() {
+        this._logger = new Logger_1.Logger({
+            level: Enums_1.ELogLevel.ERROR,
+            instanceId: 'client',
+            logOutput: Enums_1.ELogOutput.CONSOLE,
+        });
+    }
+    /**
+     * Write our OpenAPI client, using the given templates at the given output
+     * @param client Client object with all the models, services, etc.
+     * @param templates Templates wrapper with all loaded Handlebars templates
+     * @param outputPaths A set of parameters with paths for generating main sections (folders)
+     * @param httpClient The selected httpClient (fetch, xhr or node)
+     * @param useOptions Use options or arguments functions
+     * @param useUnionTypes Use union types instead of enums
+     * @param excludeCoreServiceFiles:
+     * @param includeSchemasFiles:
+     * @param request: Path to custom request file
+     * @param useCancelableRequest Use cancelable request type.
+     */
+    async writeClient(options) {
+        const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, includeSchemasFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, } = options;
+        if (!excludeCoreServiceFiles) {
+            await fileSystem_1.fileSystem.mkdir(outputPaths.outputCore);
+            await this.writeClientCore({ client, templates, outputCorePath: outputPaths.outputCore, httpClient, request, useCancelableRequest });
+            await this.writeClientCoreIndex({
+                templates,
+                outputCorePath: outputPaths.outputCore,
+                useCancelableRequest,
+                useSeparatedIndexes,
+            });
+            const { outputCore, outputServices, outputModels } = outputPaths;
+            await fileSystem_1.fileSystem.mkdir(outputPaths.outputServices);
+            await this.writeClientServices({
+                services: client.services,
+                templates,
+                outputPaths: {
+                    outputServices,
+                    outputCore: `${(0, pathHelpers_1.relative)(outputServices, outputCore)}`,
+                    outputModels: `${(0, pathHelpers_1.relative)(outputServices, outputModels)}`,
+                },
+                httpClient,
+                useUnionTypes,
+                useOptions,
+                useCancelableRequest,
+            });
+            await this.writeClientServicesIndex({
+                services: client.services,
+                templates,
+                outputServices,
+                useSeparatedIndexes,
+            });
+        }
+        if (includeSchemasFiles) {
+            await fileSystem_1.fileSystem.mkdir(outputPaths.outputSchemas);
+            await this.writeClientSchemas({
+                models: client.models,
+                templates,
+                outputSchemasPath: outputPaths.outputSchemas,
+                httpClient,
+                useUnionTypes,
+            });
+            await this.writeClientSchemasIndex({
+                models: client.models,
+                templates,
+                outputSchemasPath: outputPaths.outputSchemas,
+                useSeparatedIndexes,
+            });
+        }
+        await fileSystem_1.fileSystem.mkdir(outputPaths.outputModels);
+        await this.writeClientModels({
+            models: client.models,
+            templates,
+            outputModelsPath: outputPaths.outputModels,
+            httpClient,
+            useUnionTypes,
+        });
+        await this.writeClientModelsIndex({
+            models: client.models,
+            templates,
+            outputModelsPath: outputPaths.outputModels,
+            useSeparatedIndexes,
+        });
+        await fileSystem_1.fileSystem.mkdir(outputPaths.output);
+        this.buildClientGeneratorConfigMap({
+            client,
+            templates,
+            outputPaths,
+            useUnionTypes,
+            excludeCoreServiceFiles,
+            includeSchemasFiles,
+        });
+    }
+    /**
+     * Method keeps all options that is need to create index file
+     * @param config
+     */
+    buildClientGeneratorConfigMap(config) {
+        const { outputPaths } = config;
+        const values = this.config.get(outputPaths.output);
+        if (values) {
+            values.push(config);
+        }
+        else {
+            this.config.set(outputPaths.output, Array.of(config));
+        }
+    }
+    async combineAndWrite() {
+        const result = this.buildClientIndexMap();
+        await this.finalizeAndWrite(result);
+    }
+    async combineAndWrightSimple() {
+        const result = this.buildSimpleClientIndexMap();
+        await this.simpledFinalizeAndWrite(result);
+    }
+    get logger() {
+        return this._logger;
+    }
+    buildSimpleClientIndexMap() {
+        const result = new Map();
+        for (const [key, value] of this.config.entries()) {
+            for (const item of value) {
+                const { outputPaths, templates, excludeCoreServiceFiles, includeSchemasFiles } = item;
+                const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
+                const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
+                const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
+                const outputServices = this.getOutputPath(outputPaths?.outputServices, key, 'services');
+                const clientIndex = this.ensureSimpleClientIndex(result, key, templates);
+                if (!excludeCoreServiceFiles) {
+                    const relativePathCore = (0, pathHelpers_1.relative)(key, outputCore);
+                    if (!clientIndex.core.includes(relativePathCore)) {
+                        clientIndex.core.push(relativePathCore);
+                    }
+                    const relativeService = (0, pathHelpers_1.relative)(key, outputServices);
+                    if (!clientIndex.services.includes(relativeService)) {
+                        clientIndex.services.push(relativeService);
+                    }
+                }
+                const relativePathModel = (0, pathHelpers_1.relative)(key, outputModels);
+                if (!clientIndex.models.includes(relativePathModel)) {
+                    clientIndex.models.push(relativePathModel);
+                }
+                if (includeSchemasFiles) {
+                    const relativePathSchema = (0, pathHelpers_1.relative)(key, outputSchemas);
+                    if (!clientIndex.schemas.includes(relativePathSchema)) {
+                        clientIndex.schemas.push(relativePathSchema);
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    buildClientIndexMap() {
+        const result = new Map();
+        for (const [key, value] of this.config.entries()) {
+            for (const item of value) {
+                const { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, includeSchemasFiles } = item;
+                const outputCore = this.getOutputPath(outputPaths?.outputCore, key, 'core');
+                const outputModels = this.getOutputPath(outputPaths?.outputModels, key, 'models');
+                const outputSchemas = this.getOutputPath(outputPaths?.outputSchemas, key, 'schemas');
+                const outputServices = this.getOutputPath(outputPaths?.outputServices, key, 'services');
+                const clientIndex = this.ensureClientIndex(result, key, templates);
+                if (!excludeCoreServiceFiles) {
+                    const rel = (0, pathHelpers_1.relative)(key, outputCore);
+                    if (!clientIndex.core.includes(rel)) {
+                        clientIndex.core.push(rel);
+                    }
+                    const relativeService = `${(0, pathHelpers_1.relative)(key, outputServices)}`;
+                    for (const service of client.services) {
+                        if (!clientIndex.services.some(s => this.isSomeService(s, service.name, relativeService))) {
+                            clientIndex.services.push({
+                                name: service.name,
+                                package: relativeService,
+                            });
+                        }
+                    }
+                }
+                const relativePathModel = `${(0, pathHelpers_1.relative)(key, outputModels)}`;
+                const relativePathSchema = `${(0, pathHelpers_1.relative)(key, outputSchemas)}`;
+                for (const model of client.models) {
+                    const modelFinal = {
+                        name: model.name,
+                        alias: '',
+                        path: model.path,
+                        package: relativePathModel,
+                        enum: model.enum && model.enum.length > 0,
+                        useUnionTypes,
+                        enums: model.enums && model.enums.length > 0,
+                    };
+                    if (!clientIndex.models.some(m => this.isSameModel(m, modelFinal))) {
+                        clientIndex.models.push(modelFinal);
+                    }
+                    if (includeSchemasFiles) {
+                        const schema = { ...modelFinal, package: relativePathSchema };
+                        if (!clientIndex.schemas.some(s => this.isSameShema(s, schema))) {
+                            clientIndex.schemas.push(schema);
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    }
+    async finalizeAndWrite(result) {
+        for (const value of result.values()) {
+            value.models = value.models.filter(unique_1.unique).sort(sortModelByName_1.sortModelByName);
+            (0, prepareAlias_1.prepareAlias)(value.models);
+            value.schemas = value.schemas.filter(unique_1.unique).sort(sortModelByName_1.sortModelByName);
+            (0, prepareAlias_1.prepareAlias)(value.schemas);
+            await this.writeClientFullIndex(value);
+        }
+    }
+    async simpledFinalizeAndWrite(result) {
+        for (const value of result.values()) {
+            await this.writeClientSimpleIndex(value);
+        }
+    }
+    getOutputPath(output, key, fallback) {
+        return output ? output : (0, pathHelpers_1.resolve)(key, fallback);
+    }
+    ensureClientIndex(map, key, templates) {
+        if (!map.has(key)) {
+            map.set(key, {
+                templates,
+                outputPath: key,
+                core: [],
+                models: [],
+                schemas: [],
+                services: [],
+            });
+        }
+        return map.get(key);
+    }
+    ensureSimpleClientIndex(map, key, templates) {
+        if (!map.has(key)) {
+            map.set(key, {
+                templates,
+                outputPath: key,
+                core: [],
+                models: [],
+                schemas: [],
+                services: [],
+            });
+        }
+        return map.get(key);
+    }
+    isSameModel(a, b) {
+        return a.name === b.name && a.path === b.path && a.package === b.package && a.enum === b.enum && a.enums === b.enums && a.useUnionTypes === b.useUnionTypes;
+    }
+    isSameShema(a, b) {
+        return a.name === b.name && a.path === b.path && a.package === b.package;
+    }
+    isSomeService(a, name, pkg) {
+        return a.name === name && a.package === pkg;
+    }
+    writeClientCore = writeClientCore_1.writeClientCore;
+    writeClientCoreIndex = writeClientCoreIndex_1.writeClientCoreIndex;
+    writeClientFullIndex = writeClientFullIndex_1.writeClientFullIndex;
+    writeClientModels = writeClientModels_1.writeClientModels;
+    writeClientModelsIndex = writeClientModelsIndex_1.writeClientModelsIndex;
+    writeClientSchemas = writeClientSchemas_1.writeClientSchemas;
+    writeClientSchemasIndex = writeClientSchemasIndex_1.writeClientSchemasIndex;
+    writeClientServices = writeClientServices_1.writeClientServices;
+    writeClientServicesIndex = writeClientServicesIndex_1.writeClientServicesIndex;
+    writeClientSimpleIndex = writeClientSimpleIndex_1.writeClientSimpleIndex;
+}
+exports.WriteClient = WriteClient;

package/dist/core/__tests__/WriteClient.test.d.ts

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

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

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

package/dist/core/{utils/__tests__/writeClient.test.js → __tests__/WriteClient.test.js}

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = require("node:test");
-const Enums_1 = require("../../types/Enums");
-const fileSystem_1 = require("../fileSystem");
-const getOutputPaths_1 = require("../getOutputPaths");
-const writeClient_1 = require("../writeClient");
+const HttpClient_enum_1 = require("../types/enums/HttpClient.enum");
+const fileSystem_1 = require("../utils/fileSystem");
+const getOutputPaths_1 = require("../utils/getOutputPaths");
+const WriteClient_1 = require("../WriteClient");
 (0, node_test_1.test)('@unit: writeClient should write to filesystem', async () => {
     const mkdirCalls = [];
     const writeFileCalls = [];
@@ -30,7 +30,14 @@ const writeClient_1 = require("../writeClient");
         services: [],
     };
     const templates = {
-        index: () => 'index',
+        indexes: {
+            full: () => 'fullIndex',
+            simple: () => 'simpleIndex',
+            core: () => 'coreIndex',
+            models: () => 'modelsIndex',
+            schemas: () => 'schemasIndex',
+            services: () => 'servicesIndex',
+        },
         exports: {
             model: () => 'model',
             schema: () => 'schema',
@@ -47,18 +54,15 @@ const writeClient_1 = require("../writeClient");
         },
     };
     const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
-    await new writeClient_1.WriteClient().writeClient({
+    await new WriteClient_1.WriteClient().writeClient({
         client,
         templates,
         outputPaths,
-        httpClient: Enums_1.HttpClient.FETCH,
+        httpClient: HttpClient_enum_1.HttpClient.FETCH,
         useOptions: false,
         useUnionTypes: false,
-        exportCore: true,
-        exportServices: true,
-        exportModels: true,
-        exportSchemas: true,
-        clean: true,
+        excludeCoreServiceFiles: false,
+        includeSchemasFiles: false,
     });
     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/__tests__/getType.test.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
-const json_schema_ref_parser_1 = __importDefault(require("json-schema-ref-parser"));
+const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"));
 const Context_1 = require("../../../../Context");
 const getOutputPaths_1 = require("../../../../utils/getOutputPaths");
 const Parser_1 = require("../../Parser");
@@ -13,7 +13,7 @@ const Parser_1 = require("../../Parser");
     (0, node_test_1.test)('@unit: should convert int', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
+        const parser = new swagger_parser_1.default();
         const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('int', '');
@@ -25,37 +25,19 @@ const Parser_1 = require("../../Parser");
     (0, node_test_1.test)('@unit: should support file with ext', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
+        const parser = new swagger_parser_1.default();
         const context = new Context_1.Context({ input: 'test/spec/v3.yml', output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
         context.addRefs(await parser.resolve('test/spec/v3.yml'));
         const type = new Parser_1.Parser(context).getType('schemas/ModelWithString.yml', '');
-        node_assert_1.default.strictEqual(type.type, 'IModelWithString');
-        node_assert_1.default.strictEqual(type.base, 'IModelWithString');
+        node_assert_1.default.strictEqual(type.type, 'ModelWithString');
+        node_assert_1.default.strictEqual(type.base, 'ModelWithString');
         node_assert_1.default.strictEqual(type.template, null);
         node_assert_1.default.deepStrictEqual(type.imports, [
             {
-                name: 'IModelWithString',
+                name: 'ModelWithString',
                 alias: '',
-                path: './schemas/ModelWithString',
+                path: '././schemas/ModelWithString',
             },
         ]);
     });
-    const object = {
-        components: {
-            schemas: {
-                someSpecialSchema: {
-                    type: 'object',
-                },
-            },
-        },
-    };
-    (0, node_test_1.test)('@unit: should support external generation type', async () => {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        const parser = new json_schema_ref_parser_1.default();
-        const context = new Context_1.Context({ input: object, output: (0, getOutputPaths_1.getOutputPaths)({ output: './generated' }) });
-        context.addRefs(await parser.resolve(object));
-        const type = new Parser_1.Parser(context).getType('#/components/schemas/someSpecialSchema', '');
-        node_assert_1.default.strictEqual(type.type, 'ISomeSpecialSchema');
-    });
 });

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

@@ -1 +1 @@
-{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CAyJjE"}
+{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAO/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CA2JjE"}

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

@@ -6,6 +6,7 @@ const getComment_1 = require("../../../utils/getComment");
 const getEnum_1 = require("../../../utils/getEnum");
 const getEnumFromDescription_1 = require("../../../utils/getEnumFromDescription");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getModel(config) {
     const { openApi, definition, isDefinition = false, name = '', path = '', parentRef } = config;
     const model = {
@@ -44,7 +45,8 @@ function getModel(config) {
         properties: [],
     };
     if (definition.$ref) {
-        const definitionRef = this.getType(definition.$ref, parentRef);
+        const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.$ref, parentRef);
+        const definitionRef = this.getType(definition.$ref, normalizedRef);
         model.export = 'reference';
         model.type = definitionRef.type;
         model.base = definitionRef.base;
@@ -75,7 +77,8 @@ function getModel(config) {
     }
     if (definition.type === 'array' && definition.items) {
         if (definition.items.$ref) {
-            const arrayItems = this.getType(definition.items.$ref, parentRef);
+            const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.items.$ref, parentRef);
+            const arrayItems = this.getType(definition.items.$ref, normalizedRef);
             model.export = 'array';
             model.type = arrayItems.type;
             model.base = arrayItems.base;

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

@@ -1 +1 @@
-{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModelProperties.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK,EAAE,CAgFxH"}
+{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModelProperties.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAK/D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,GAAG,KAAK,EAAE,CAiFxH"}

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

@@ -8,6 +8,7 @@ const get_1 = __importDefault(require("lodash-es/get"));
 const escapeName_1 = require("../../../utils/escapeName");
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getModelProperties(openApi, definition, parentRef) {
     const models = [];
     for (const propertyName in definition.properties) {
@@ -15,7 +16,8 @@ function getModelProperties(openApi, definition, parentRef) {
             const property = definition.properties[propertyName];
             const propertyRequired = definition.required?.includes(propertyName) || property.default !== undefined;
             if (property.$ref) {
-                const model = this.getType(property.$ref, parentRef);
+                const normalizedRef = (0, normalizeRef_1.normalizeRef)(property.$ref, parentRef);
+                const model = this.getType(property.$ref, normalizedRef);
                 models.push({
                     name: (0, escapeName_1.escapeName)(propertyName),
                     alias: '',

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

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

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
 const getRefFromSchema_1 = require("../../../utils/getRefFromSchema");
-const pathHelpers_1 = require("../../../utils/pathHelpers");
+const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
 function getModels(openApi) {
@@ -23,34 +23,8 @@ function getModels(openApi) {
             models.push(model);
         }
         models = (0, sortModelsByName_1.sortModelsByName)(models.filter(unique_1.unique));
-        let previous;
-        let index = 1;
-        models.forEach(model => {
-            if (previous && previous.name === model.name) {
-                if (index === 1) {
-                    previous.alias = `${model.name}$${index}`;
-                    index++;
-                }
-                model.alias = `${model.name}$${index}`;
-                index++;
-            }
-            else {
-                model.alias = '';
-                index = 1;
-            }
-            previous = model;
-        });
-        models.forEach(model => {
-            model.imports = model.imports.map(imprt => {
-                const importModel = models.filter(value => `${value.path}${value.name}` === imprt.path && value.name === imprt.name);
-                const importAlias = importModel.length > 0 ? importModel[0].alias : imprt?.alias;
-                const importPath = importModel.length > 0 ? (0, pathHelpers_1.join)((0, pathHelpers_1.relative)(model.path, importModel[0].path), imprt.name) : imprt.path;
-                return Object.assign(imprt, {
-                    alias: importAlias,
-                    path: importPath,
-                });
-            });
-        });
+        (0, modelHelpers_1.setDuplicateModelAliases)(models);
+        (0, modelHelpers_1.resolveModelImports)(models, this.context.output.outputModels);
     }
     return models.filter(unique_1.unique);
 }

package/dist/core/api/v2/parser/getOperation.d.ts

@@ -3,5 +3,5 @@ import type { OperationParameters } from '../../../types/shared/OperationParamet
 import { Parser } from '../Parser';
 import type { OpenApi } from '../types/OpenApi.model';
 import type { OpenApiOperation } from '../types/OpenApiOperation.model';
-export declare function getOperation(this: Parser, openApi: OpenApi, url: string, method: string, op: OpenApiOperation, pathParams: OperationParameters): Operation;
+export declare function getOperation(this: Parser, openApi: OpenApi, url: string, method: string, op: OpenApiOperation, pathParams: OperationParameters, parentRef: string): Operation;
 //# sourceMappingURL=getOperation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAQ3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,GAAG,SAAS,CAwD1J"}
+{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAQ3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,UAAU,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAwD7K"}

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

@@ -8,7 +8,7 @@ const getOperationPath_1 = require("../../../utils/getOperationPath");
 const getOperationResponseHeader_1 = require("../../../utils/getOperationResponseHeader");
 const getOperationResults_1 = require("../../../utils/getOperationResults");
 const getServiceClassName_1 = require("../../../utils/getServiceClassName");
-function getOperation(openApi, url, method, op, pathParams) {
+function getOperation(openApi, url, method, op, pathParams, parentRef) {
     const serviceName = op.tags?.[0] || 'Service';
     const serviceClassName = (0, getServiceClassName_1.getServiceClassName)(serviceName);
     const operationNameFallback = `${method}${serviceClassName}`;
@@ -37,7 +37,7 @@ function getOperation(openApi, url, method, op, pathParams) {
     };
     // Parse the operation parameters (path, query, body, etc).
     if (op.parameters) {
-        const parameters = this.getOperationParameters(openApi, op.parameters);
+        const parameters = this.getOperationParameters(openApi, op.parameters, parentRef);
         operation.imports.push(...parameters.imports);
         operation.parameters.push(...parameters.parameters);
         operation.parametersPath.push(...parameters.parametersPath);
@@ -49,7 +49,7 @@ function getOperation(openApi, url, method, op, pathParams) {
     }
     // Parse the operation responses.
     if (op.responses) {
-        const operationResponses = this.getOperationResponses(openApi, op.responses);
+        const operationResponses = this.getOperationResponses(openApi, op.responses, parentRef);
         const operationResults = (0, getOperationResults_1.getOperationResults)(operationResponses);
         operation.errors = (0, getOperationErrors_1.getOperationErrors)(operationResponses);
         operation.responseHeader = (0, getOperationResponseHeader_1.getOperationResponseHeader)(operationResults);

package/dist/core/api/v2/parser/getOperationParameter.d.ts

@@ -2,5 +2,5 @@ import type { OperationParameter } from '../../../types/shared/OperationParamete
 import { Parser } from '../Parser';
 import type { OpenApi } from '../types/OpenApi.model';
 import type { OpenApiParameter } from '../types/OpenApiParameter.model';
-export declare function getOperationParameter(this: Parser, openApi: OpenApi, parameter: OpenApiParameter): OperationParameter;
+export declare function getOperationParameter(this: Parser, openApi: OpenApi, parameter: OpenApiParameter, parentRef: string): OperationParameter;
 //# sourceMappingURL=getOperationParameter.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAOzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,GAAG,kBAAkB,CAsIrH"}
+{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAQzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAGxE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CAuIxI"}

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

@@ -7,8 +7,9 @@ const getEnum_1 = require("../../../utils/getEnum");
 const getEnumFromDescription_1 = require("../../../utils/getEnumFromDescription");
 const getOperationParameterName_1 = require("../../../utils/getOperationParameterName");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getOperationParameterDefault_1 = require("./getOperationParameterDefault");
-function getOperationParameter(openApi, parameter) {
+function getOperationParameter(openApi, parameter, parentRef) {
     const operationParameter = {
         path: '',
         in: parameter.in,
@@ -44,7 +45,8 @@ function getOperationParameter(openApi, parameter) {
         mediaType: null,
     };
     if (parameter.$ref) {
-        const definitionRef = this.getType(parameter.$ref, '');
+        const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.$ref, parentRef);
+        const definitionRef = this.getType(parameter.$ref, normalizedRef);
         operationParameter.export = 'reference';
         operationParameter.type = definitionRef.type;
         operationParameter.base = definitionRef.base;

package/dist/core/api/v2/parser/getOperationParameters.d.ts

@@ -2,5 +2,5 @@ import type { OperationParameters } from '../../../types/shared/OperationParamet
 import { Parser } from '../Parser';
 import type { OpenApi } from '../types/OpenApi.model';
 import type { OpenApiParameter } from '../types/OpenApiParameter.model';
-export declare function getOperationParameters(this: Parser, openApi: OpenApi, parameters: OpenApiParameter[]): OperationParameters;
+export declare function getOperationParameters(this: Parser, openApi: OpenApi, parameters: OpenApiParameter[], parentRef: string): OperationParameters;
 //# sourceMappingURL=getOperationParameters.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAG3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,mBAAmB,CA+D1H"}
+{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationParameters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAG3F,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,mBAAmB,CA+D7I"}

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationParameters = getOperationParameters;
 const sortByRequiredExtended_1 = require("../../../utils/sortByRequiredExtended");
 const sortByRequiredSimple_1 = require("../../../utils/sortByRequiredSimple");
-function getOperationParameters(openApi, parameters) {
+function getOperationParameters(openApi, parameters, parentRef) {
     const operationParameters = {
         imports: [],
         parameters: [],
@@ -17,7 +17,7 @@ function getOperationParameters(openApi, parameters) {
     // Iterate over the parameters
     parameters.forEach(parameterOrReference => {
         const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref) : parameterOrReference);
-        const parameter = this.getOperationParameter(openApi, parameterDef);
+        const parameter = this.getOperationParameter(openApi, parameterDef, parentRef);
         // We ignore the "api-version" param, since we do not want to add this
         // as the first / default parameter for each of the service calls.
         if (parameter.prop !== 'api-version') {

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAGvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAmF1J"}
+{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAIvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAoF1J"}