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

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

@@ -9,6 +9,7 @@ const escapeName_1 = require("../../../utils/escapeName");
 const getClassName_1 = require("../../../utils/getClassName");
 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) {
@@ -16,7 +17,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/v3/parser/getModels.d.ts.map

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

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

@@ -2,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/v3/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, serviceClassName: string): Operation;
+export declare function getOperation(this: Parser, openApi: OpenApi, url: string, method: string, op: OpenApiOperation, pathParams: OperationParameters, serviceClassName: string, parentFileRef: string): Operation;
 //# sourceMappingURL=getOperation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAS3F,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,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,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAgEpL"}
+{"version":3,"file":"getOperation.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAS3F,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,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,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,CAgE3M"}

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

@@ -9,7 +9,7 @@ const getOperationResponseHeader_1 = require("../../../utils/getOperationRespons
 const getOperationResults_1 = require("../../../utils/getOperationResults");
 const sortByRequiredExtended_1 = require("../../../utils/sortByRequiredExtended");
 const sortByRequiredSimple_1 = require("../../../utils/sortByRequiredSimple");
-function getOperation(openApi, url, method, op, pathParams, serviceClassName) {
+function getOperation(openApi, url, method, op, pathParams, serviceClassName, parentFileRef) {
     const operationNameFallback = `${method}${serviceClassName}`;
     const operationName = (0, getOperationName_1.getOperationName)(op.operationId || operationNameFallback);
     const operationPath = (0, getOperationPath_1.getOperationPath)(url);
@@ -36,7 +36,7 @@ function getOperation(openApi, url, method, op, pathParams, serviceClassName) {
     };
     // 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, parentFileRef);
         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, serviceClassName) {
     if (op.requestBody) {
         const sortByRequired = this.context.sortByRequired ? sortByRequiredExtended_1.sortByRequiredExtended : sortByRequiredSimple_1.sortByRequiredSimple;
         const requestBodyDef = (op.requestBody.$ref ? this.context.get(op.requestBody.$ref) : op.requestBody);
-        const requestBody = this.getOperationRequestBody(openApi, requestBodyDef, '');
+        const requestBody = this.getOperationRequestBody(openApi, requestBodyDef, parentFileRef);
         operation.imports.push(...requestBody.imports);
         operation.parameters.push(requestBody);
         operation.parameters = operation.parameters.sort(sortByRequired);
@@ -57,7 +57,7 @@ function getOperation(openApi, url, method, op, pathParams, serviceClassName) {
     }
     // Parse the operation responses.
     if (op.responses) {
-        const operationResponses = this.getOperationResponses(openApi, op.responses);
+        const operationResponses = this.getOperationResponses(openApi, op.responses, parentFileRef);
         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/v3/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/v3/parser/getOperationParameter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAIzF,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,CA8ErH"}
+{"version":3,"file":"getOperationParameter.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationParameter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAKzF,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,CAgFxI"}

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

@@ -4,8 +4,9 @@ exports.getOperationParameter = getOperationParameter;
 const getComment_1 = require("../../../utils/getComment");
 const getOperationParameterName_1 = require("../../../utils/getOperationParameterName");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getModelDefault_1 = require("./getModelDefault");
-function getOperationParameter(openApi, parameter) {
+function getOperationParameter(openApi, parameter, parentRef) {
     const operationParameter = {
         in: parameter.in,
         prop: parameter.name,
@@ -29,7 +30,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;
@@ -39,7 +41,8 @@ function getOperationParameter(openApi, parameter) {
     }
     if (parameter.schema) {
         if (parameter.schema.$ref) {
-            const model = this.getType(parameter.schema.$ref, '');
+            const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.schema.$ref, parentRef);
+            const model = this.getType(parameter.schema.$ref, normalizedRef);
             operationParameter.export = 'reference';
             operationParameter.type = model.type;
             operationParameter.base = model.base;

package/dist/core/api/v3/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/v3/parser/getOperationParameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/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,CAgE1H"}
+{"version":3,"file":"getOperationParameters.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/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,CAgE7I"}

package/dist/core/api/v3/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/v3/parser/getOperationRequestBody.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationRequestBody.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationRequestBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAG5E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CA6E5I"}
+{"version":3,"file":"getOperationRequestBody.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationRequestBody.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAIzF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAG5E,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CA8E5I"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationRequestBody = getOperationRequestBody;
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getContent_1 = require("./getContent");
 function getOperationRequestBody(openApi, parameter, parentRef) {
     const requestBody = {
@@ -37,7 +38,8 @@ function getOperationRequestBody(openApi, parameter, parentRef) {
                 (requestBody.in = 'formData'), (requestBody.name = 'formData'), (requestBody.prop = 'formData');
             }
             if (content?.schema?.$ref) {
-                const model = this.getType(content.schema.$ref, parentRef);
+                const normalizedRef = (0, normalizeRef_1.normalizeRef)(content.schema.$ref, parentRef);
+                const model = this.getType(content.schema.$ref, normalizedRef);
                 requestBody.export = 'reference';
                 requestBody.type = model.type;
                 requestBody.base = model.base;

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/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;AAGtE,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"}
+{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/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;AAGtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAqF1J"}

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

@@ -7,6 +7,7 @@ exports.getOperationResponse = getOperationResponse;
 const get_1 = __importDefault(require("lodash-es/get"));
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
+const normalizeRef_1 = require("../../../utils/normalizeRef");
 const getContent_1 = require("./getContent");
 function getOperationResponse(openApi, response, responseCode, parentRef) {
     const operationResponse = {
@@ -34,7 +35,8 @@ function getOperationResponse(openApi, response, responseCode, parentRef) {
         const content = (0, getContent_1.getContent)(response.content);
         if (content) {
             if (content?.schema?.$ref) {
-                const model = this.getType(content.schema.$ref, parentRef);
+                const normalizedRef = (0, normalizeRef_1.normalizeRef)(content.schema.$ref, parentRef);
+                const model = this.getType(content.schema.$ref, normalizedRef);
                 operationResponse.export = 'reference';
                 operationResponse.type = model.type;
                 operationResponse.base = model.base;

package/dist/core/api/v3/parser/getOperationResponses.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponses.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,GAAG,iBAAiB,EAAE,CAsBtH"}
+{"version":3,"file":"getOperationResponses.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponses.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAExE,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAsBzI"}

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationResponses = getOperationResponses;
 const get_1 = __importDefault(require("lodash-es/get"));
 const getOperationResponseCode_1 = require("../../../utils/getOperationResponseCode");
-function getOperationResponses(openApi, responses) {
+function getOperationResponses(openApi, responses, parentRef) {
     const operationResponses = [];
     // Iterate over each response code and get the
     // status code and response message (if any).
@@ -16,7 +16,7 @@ function getOperationResponses(openApi, responses) {
             const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref) : responseOrReference);
             const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);
             if (responseCode) {
-                const operationResponse = this.getOperationResponse(openApi, response, responseCode, '');
+                const operationResponse = this.getOperationResponse(openApi, response, responseCode, parentRef);
                 operationResponses.push(operationResponse);
             }
         }

package/dist/core/api/v3/parser/getServiceName.d.ts

@@ -0,0 +1,3 @@
+import { OpenApiOperation } from "../types/OpenApiOperation.model";
+export declare function getServiceName(op: OpenApiOperation, fileName: string): string;
+//# sourceMappingURL=getServiceName.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"getServiceName.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServiceName.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,wBAAgB,cAAc,CAAC,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAE7E"}

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

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getServiceName = getServiceName;
+const getClassName_1 = require("../../../utils/getClassName");
+const getServiceClassName_1 = require("../../../utils/getServiceClassName");
+function getServiceName(op, fileName) {
+    return (0, getServiceClassName_1.getServiceClassName)(op.tags?.[0] || `${(0, getClassName_1.getClassName)(fileName)}Service`);
+}

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

@@ -1 +1 @@
-{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServices.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAInE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAgBtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAoFrE"}
+{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServices.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAKtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAgCrE"}

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

@@ -6,19 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServices = getServices;
 const get_1 = __importDefault(require("lodash-es/get"));
 const getClassName_1 = require("../../../utils/getClassName");
-const getServiceClassName_1 = require("../../../utils/getServiceClassName");
-const unique_1 = require("../../../utils/unique");
-function getServiceName(op, fileName) {
-    return (0, getServiceClassName_1.getServiceClassName)(op.tags?.[0] || `${(0, getClassName_1.getClassName)(fileName)}Service`);
-}
-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;
-    });
-}
+const serviceHelpers_1 = require("../../../utils/serviceHelpers");
+const getServiceName_1 = require("./getServiceName");
 /**
  * Get the OpenAPI services
  */
@@ -27,81 +16,26 @@ function getServices(openApi) {
     for (const url in openApi.paths) {
         if ((0, get_1.default)(openApi.paths, url, null)) {
             // Grab path and parse any global path parameters
-            const path = openApi.paths[url];
-            const pathParams = this.getOperationParameters(openApi, path.parameters || []);
+            const pathByUrl = openApi.paths[url];
+            const path = (pathByUrl.$ref ? this.context.get(pathByUrl.$ref) : pathByUrl);
+            const pathParams = this.getOperationParameters(openApi, path.parameters || [], '');
+            const parentFileRef = pathByUrl.$ref || this.context.root?.path || '';
             // Parse all the methods for this path
-            for (const method in path) {
-                if ((0, get_1.default)(path, method, null)) {
-                    switch (method) {
-                        case 'get':
-                        case 'put':
-                        case 'post':
-                        case 'delete':
-                        case 'options':
-                        case 'head':
-                        case 'patch': {
-                            // Each method contains an OpenAPI operation, we parse the operation
-                            const op = path[method];
-                            const fileName = this.context.fileName();
-                            const serviceName = getServiceName(op, fileName);
-                            // If we have already declared a service, then we should fetch that and
-                            // append the new method to it. Otherwise we should create a new service object.
-                            const service = services.get(serviceName) ||
-                                {
-                                    name: serviceName,
-                                    originName: (0, getClassName_1.getClassName)(op.tags?.[0] || fileName),
-                                    operations: [],
-                                    imports: [],
-                                };
-                            const operation = this.getOperation(openApi, url, method, op, pathParams, serviceName);
-                            // Push the operation in the service
-                            service.operations.push(operation);
-                            operation.imports = operation.imports.map(item => {
-                                const operationImport = service.imports.find(serviceImport => serviceImport.path === item.path);
-                                if (!operationImport) {
-                                    return item;
-                                }
-                                return operationImport;
-                            });
-                            service.imports.push(...operation.imports);
-                            services.set(operation.service, service);
-                            break;
-                        }
-                    }
-                }
-            }
+            (0, serviceHelpers_1.forEachOperationInPath)(path, (method, op) => {
+                // Each method contains an OpenAPI operation, we parse the operation
+                const fileName = this.context.fileName();
+                const serviceName = (0, getServiceName_1.getServiceName)(op, fileName);
+                const service = (0, serviceHelpers_1.ensureService)(services, serviceName, (0, getClassName_1.getClassName)(op.tags?.[0] || fileName));
+                const operation = this.getOperation(openApi, url, method, op, pathParams, serviceName, parentFileRef);
+                // Merge operation imports into service (reuse import objects when possible)
+                (0, serviceHelpers_1.mergeOperationImportsIntoService)(service, operation);
+                service.operations.push(operation);
+                services.set(operation.service, service);
+            });
         }
     }
     services.forEach(service => {
-        service.imports = service.imports.filter(unique_1.unique).sort((a, b) => {
-            const nameA = a.name.toLowerCase();
-            const nameB = b.name.toLowerCase();
-            return nameA.localeCompare(nameB, 'en');
-        });
-        let previous;
-        let index = 1;
-        service.imports = service.imports.map(value => {
-            if (previous && previous.name === value.name) {
-                if (index === 1) {
-                    previous.alias = `${value.name}$${index}`;
-                    index++;
-                }
-                value.alias = `${value.name}$${index}`;
-                index++;
-            }
-            else {
-                value.alias = '';
-                index = 1;
-            }
-            previous = value;
-            return value;
-        });
-        service.imports.forEach(item => {
-            for (const operation of service.operations) {
-                fillModelsByAlias(operation.results, item);
-                fillModelsByAlias(operation.parameters, item);
-            }
-        });
+        (0, serviceHelpers_1.finalizeServiceImports)(service);
     });
     return Array.from(services.values());
 }

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

@@ -1 +1 @@
-{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAQ7D,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,CA8B5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA4C5E"}

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

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
-const getAbsolutePath_1 = require("../../../utils/getAbsolutePath");
 const getMappedType_1 = require("../../../utils/getMappedType");
-const getRelativeModelImportPath_1 = require("../../../utils/getRelativeModelImportPath");
-const getRelativeModelPath_1 = require("../../../utils/getRelativeModelPath");
 const getTypeName_1 = require("../../../utils/getTypeName");
 const replaceString_1 = require("../../../utils/replaceString");
+const resolveRefToImportPath_1 = require("../../../utils/resolveRefToImportPath");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
 /**
  * Parse any string value into a type object.
@@ -14,7 +12,7 @@ const stripNamespace_1 = require("../../../utils/stripNamespace");
  * @param parentRef Reference to a parent model
  */
 function getType(value, parentRef) {
-    const normalizedValue = (0, replaceString_1.replaceString)(value);
+    const normalizedValue = (0, replaceString_1.replaceString)(value) || '';
     const result = {
         type: 'any',
         base: 'any',
@@ -22,23 +20,37 @@ function getType(value, parentRef) {
         path: '',
         template: null,
     };
-    const valueClean = (0, stripNamespace_1.stripNamespace)(normalizedValue || '');
-    const valuePath = (0, getRelativeModelPath_1.getRelativeModelPath)(this.context.output?.outputModels, valueClean);
+    const valueClean = (0, stripNamespace_1.stripNamespace)(normalizedValue);
     if ((0, getMappedType_1.hasMappedType)(valueClean)) {
         const mapped = (0, getMappedType_1.getMappedType)(valueClean);
-        result.path = valuePath;
+        result.path = valueClean.toLowerCase();
         if (mapped) {
             result.type = mapped;
             result.base = mapped;
         }
     }
     else if (valueClean) {
-        const valueImportPath = (0, getRelativeModelImportPath_1.getRelativeModelImportPath)(this.context.output.outputModels, parentRef, valueClean);
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), (0, getAbsolutePath_1.getAbsolutePath)(value, parentRef));
+        // Safely calculate the path that the specification file will have in outputModels folder
+        const valuePath = (0, resolveRefToImportPath_1.resolveRefToImportPath)({
+            mainSpecPath: this.context.root?.path || '',
+            parentFilePath: parentRef,
+            refValuePath: normalizedValue,
+            outputModelsPath: this.context.output?.outputModels,
+        });
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean));
+        // Only prefix with "./" when the path is non-empty and does not already
+        // start with "/" (absolute) or "." (relative like "./" or "../").
+        let valueImportPath = valuePath;
+        if (valuePath && !valuePath.startsWith('/') && !valuePath.startsWith('.')) {
+            valueImportPath = `./${valuePath}`;
+        }
         result.path = valuePath;
         result.type = type;
         result.base = type;
-        result.imports.push({ name: type, alias: '', path: valueImportPath });
+        // Push import only when we actually have a path (avoid './' for empty)
+        if (valuePath) {
+            result.imports.push({ name: type, alias: '', path: valueImportPath });
+        }
     }
     return result;
 }

package/dist/core/api/v3/types/OpenApiPath.model.d.ts

@@ -1,10 +1,11 @@
+import { OpenApiReference } from '../../../types/shared/OpenApiReference.model';
 import type { OpenApiOperation } from './OpenApiOperation.model';
 import type { OpenApiParameter } from './OpenApiParameter.model';
 import type { OpenApiServer } from './OpenApiServer.model';
 /**
  * https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#pathItemObject
  */
-export interface OpenApiPath {
+export interface OpenApiPath extends OpenApiReference {
     summary?: string;
     description?: string;
     get?: OpenApiOperation;

package/dist/core/api/v3/types/OpenApiPath.model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenApiPath.model.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/types/OpenApiPath.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,WAAW;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,gBAAgB,CAAC;IACvB,GAAG,CAAC,EAAE,gBAAgB,CAAC;IACvB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACnC"}
+{"version":3,"file":"OpenApiPath.model.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/types/OpenApiPath.model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,gBAAgB,CAAC;IACvB,GAAG,CAAC,EAAE,gBAAgB,CAAC;IACvB,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,IAAI,CAAC,EAAE,gBAAgB,CAAC;IACxB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,gBAAgB,EAAE,CAAC;CACnC"}

package/dist/core/index.d.ts

@@ -1,4 +1,4 @@
 import { TMultiOptions, TOptions } from '../common/Options';
-export { HttpClient } from './types/Enums';
+export { HttpClient } from './types/enums/HttpClient.enum';
 export declare function generate(options: TOptions | TOptions[] | TMultiOptions): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAmB5D,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAyH3C,wBAAsB,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAmD5F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAmB5D,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAiH3D,wBAAsB,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,QAAQ,EAAE,GAAG,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAuD5F"}