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

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

@@ -55,6 +55,9 @@ const WriteClient_1 = require("../WriteClient");
                 httpStatusCode: () => 'httpStatusCode',
                 createExecutorAdapter: () => 'createExecutorAdapter',
                 requestExecutor: () => 'requestExecutor',
+                apiErrorInterceptor: () => 'apiErrorInterceptor',
+                interceptors: () => 'interceptors',
+                withInterceptors: () => 'withInterceptors'
             },
         };
         const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });

package/dist/core/api/v2/Parser.d.ts

@@ -15,7 +15,7 @@ export declare class Parser {
     _context: Context;
     constructor(context: Context);
     get context(): Context;
-    getTypeNameByRef(value: string, ref?: string): string;
+    getTypeNameByRef(value: string, ref: string, parentSourceFile?: string): string;
     parse: typeof parse;
     getModels: typeof getModels;
     getType: typeof getType;

package/dist/core/api/v2/Parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Parser.d.ts","sourceRoot":"","sources":["../../../../src/core/api/v2/Parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACR,QAAQ,EAAE,OAAO,CAAC;gBAEb,OAAO,EAAE,OAAO;IAI5B,IAAI,OAAO,IAAI,OAAO,CAErB;IAEM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IASrD,KAAK,eAAS;IACd,SAAS,mBAAa;IACtB,OAAO,iBAAW;IAClB,QAAQ,kBAAY;IACpB,mBAAmB,6BAAuB;IAC1C,kBAAkB,4BAAsB;IACxC,WAAW,qBAAe;IAC1B,sBAAsB,gCAA0B;IAChD,qBAAqB,+BAAyB;IAC9C,YAAY,sBAAgB;IAC5B,qBAAqB,+BAAyB;IAC9C,oBAAoB,8BAAwB;CACtD"}
+{"version":3,"file":"Parser.d.ts","sourceRoot":"","sources":["../../../../src/core/api/v2/Parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACR,QAAQ,EAAE,OAAO,CAAC;gBAEb,OAAO,EAAE,OAAO;IAI5B,IAAI,OAAO,IAAI,OAAO,CAErB;IAEM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAS/E,KAAK,eAAS;IACd,SAAS,mBAAa;IACtB,OAAO,iBAAW;IAClB,QAAQ,kBAAY;IACpB,mBAAmB,6BAAuB;IAC1C,kBAAkB,4BAAsB;IACxC,WAAW,qBAAe;IAC1B,sBAAsB,gCAA0B;IAChD,qBAAqB,+BAAyB;IAC9C,YAAY,sBAAgB;IAC5B,qBAAqB,+BAAyB;IAC9C,oBAAoB,8BAAwB;CACtD"}

package/dist/core/api/v2/Parser.js

@@ -22,9 +22,9 @@ class Parser {
     get context() {
         return this._context;
     }
-    getTypeNameByRef(value, ref) {
+    getTypeNameByRef(value, ref, parentSourceFile) {
         if (ref) {
-            const definition = this.context.get(ref);
+            const definition = this.context.get(ref, parentSourceFile);
             return (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(value, definition, this._context.prefix);
         }
         return value;

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

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

@@ -6,7 +6,6 @@ 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 = {
@@ -45,8 +44,7 @@ function getModel(config) {
         properties: [],
     };
     if (definition.$ref) {
-        const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.$ref, parentRef);
-        const definitionRef = this.getType(definition.$ref, normalizedRef);
+        const definitionRef = this.getType(definition.$ref, parentRef);
         model.export = 'reference';
         model.type = definitionRef.type;
         model.base = definitionRef.base;
@@ -77,8 +75,7 @@ function getModel(config) {
     }
     if (definition.type === 'array' && definition.items) {
         if (definition.items.$ref) {
-            const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.items.$ref, parentRef);
-            const arrayItems = this.getType(definition.items.$ref, normalizedRef);
+            const arrayItems = this.getType(definition.items.$ref, parentRef);
             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":"AACA,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"}
+{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getModelProperties.ts"],"names":[],"mappings":"AACA,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"}

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

@@ -5,7 +5,6 @@ const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 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) {
@@ -13,8 +12,7 @@ function getModelProperties(openApi, definition, parentRef) {
             const property = definition.properties[propertyName];
             const propertyRequired = definition.required?.includes(propertyName) || property.default !== undefined;
             if (property.$ref) {
-                const normalizedRef = (0, normalizeRef_1.normalizeRef)(property.$ref, parentRef);
-                const model = this.getType(property.$ref, normalizedRef);
+                const model = this.getType(property.$ref, parentRef);
                 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,CAsBjE"}
+{"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;AAI/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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
-const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
@@ -16,7 +15,7 @@ function getModels(openApi) {
                 openApi: openApi,
                 definition: definition,
                 isDefinition: true,
-                name: (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(definitionType.base, definition, this.context.prefix),
+                name: definitionType.base,
                 path: definitionType.path,
                 parentRef: modelRef,
             });

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;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,CAwIxI"}
+{"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,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CAsIxI"}

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

@@ -7,7 +7,6 @@ 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, parentRef) {
     const operationParameter = {
@@ -45,8 +44,7 @@ function getOperationParameter(openApi, parameter, parentRef) {
         mediaType: null,
     };
     if (parameter.$ref) {
-        const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.$ref, parentRef);
-        const definitionRef = this.getType(parameter.$ref, normalizedRef);
+        const definitionRef = this.getType(parameter.$ref, parentRef);
         operationParameter.export = 'reference';
         operationParameter.type = definitionRef.type;
         operationParameter.base = definitionRef.base;
@@ -101,8 +99,7 @@ function getOperationParameter(openApi, parameter, parentRef) {
     }
     if (parameter.schema) {
         if (parameter.schema.$ref) {
-            const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.schema.$ref, parentRef);
-            const model = this.getType(parameter.schema.$ref, normalizedRef);
+            const model = this.getType(parameter.schema.$ref, parentRef);
             operationParameter.export = 'reference';
             operationParameter.type = model.type;
             operationParameter.base = model.base;

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

@@ -16,7 +16,7 @@ function getOperationParameters(openApi, parameters, parentRef) {
     };
     // Iterate over the parameters
     parameters.forEach(parameterOrReference => {
-        const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref) : parameterOrReference);
+        const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref, parentRef) : parameterOrReference);
         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.

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":"AACA,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"}
+{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponse.ts"],"names":[],"mappings":"AACA,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"}

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

@@ -4,7 +4,6 @@ exports.getOperationResponse = getOperationResponse;
 const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const getComment_1 = require("../../../utils/getComment");
 const getPattern_1 = require("../../../utils/getPattern");
-const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getOperationResponse(openApi, response, responseCode, parentRef) {
     const operationResponse = {
         in: 'response',
@@ -33,8 +32,7 @@ function getOperationResponse(openApi, response, responseCode, parentRef) {
     // then we need to parse the schema!
     if (response.schema) {
         if (response.schema.$ref) {
-            const normalizedRef = (0, normalizeRef_1.normalizeRef)(response.schema.$ref, parentRef);
-            const model = this.getType(response.schema.$ref, normalizedRef);
+            const model = this.getType(response.schema.$ref, parentRef);
             operationResponse.export = 'reference';
             operationResponse.type = model.type;
             operationResponse.base = model.base;

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

@@ -10,7 +10,7 @@ function getOperationResponses(openApi, responses, parentRef) {
     for (const code in responses) {
         if ((0, safeHasOwn_1.safeHasOwn)(responses, code)) {
             const responseOrReference = responses[code];
-            const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref) : responseOrReference);
+            const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref, parentRef) : responseOrReference);
             const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);
             if (responseCode) {
                 const operationResponse = this.getOperationResponse(openApi, response, responseCode, parentRef);

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

@@ -1 +1 @@
-{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getServices.ts"],"names":[],"mappings":"AACA,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"}
+{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getServices.ts"],"names":[],"mappings":"AACA,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,CAiCrE"}

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

@@ -14,9 +14,10 @@ function getServices(openApi) {
         if ((0, safeHasOwn_1.safeHasOwn)(openApi.paths, url)) {
             // Grab path and parse any global 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 || '';
+            const rootPath = this.context.root?.path || '';
+            const path = (pathByUrl.$ref ? this.context.get(pathByUrl.$ref, rootPath) : pathByUrl);
+            const parentFileRef = pathByUrl.$ref || rootPath;
+            const pathParams = this.getOperationParameters(openApi, path.parameters || [], parentFileRef);
             // Parse all the methods for this path
             (0, serviceHelpers_1.forEachOperationInPath)(path, (method, op) => {
                 // Each method contains an OpenAPI operation, we parse the operation

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

@@ -1 +1 @@
-{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA4C5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAK7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA6C5E"}

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

@@ -35,7 +35,7 @@ function getType(value, parentRef) {
          * В этом случае надо брать непосредственно normalizedValue - это относительный путь или фрагмент.
          * Предполагаем, что в таком случае расчитывать нет нужды. Это путь от папки outputModels
          */
-        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue);
+        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue, parentRef);
         let valuePath = valueClean;
         if (canonicalValue) {
             const refValuePath = canonicalValue?.fragment ? `${canonicalValue.outputFile}${canonicalValue.fragment}` : canonicalValue?.outputFile || '';
@@ -43,7 +43,7 @@ function getType(value, parentRef) {
             valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
         }
         valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), normalizedValue, parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         result.type = type;

package/dist/core/api/v3/Parser.d.ts

@@ -16,7 +16,7 @@ export declare class Parser {
     private _context;
     constructor(context: Context);
     get context(): Context;
-    getTypeNameByRef(value: string, ref?: string): string;
+    getTypeNameByRef(value: string, ref: string, parentSourceFile?: string): string;
     parse: typeof parse;
     getModels: typeof getModels;
     getType: typeof getType;

package/dist/core/api/v3/Parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Parser.d.ts","sourceRoot":"","sources":["../../../../src/core/api/v3/Parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAU;gBAEd,OAAO,EAAE,OAAO;IAI5B,IAAI,OAAO,IAAI,OAAO,CAErB;IAEM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM;IASrD,KAAK,eAAS;IACd,SAAS,mBAAa;IACtB,OAAO,iBAAW;IAClB,QAAQ,kBAAY;IACpB,mBAAmB,6BAAuB;IAC1C,kBAAkB,4BAAsB;IACxC,WAAW,qBAAe;IAC1B,sBAAsB,gCAA0B;IAChD,qBAAqB,+BAAyB;IAC9C,YAAY,sBAAgB;IAC5B,qBAAqB,+BAAyB;IAC9C,oBAAoB,8BAAwB;IAC5C,uBAAuB,iCAA2B;CAC5D"}
+{"version":3,"file":"Parser.d.ts","sourceRoot":"","sources":["../../../../src/core/api/v3/Parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,qBAAa,MAAM;IACf,OAAO,CAAC,QAAQ,CAAU;gBAEd,OAAO,EAAE,OAAO;IAI5B,IAAI,OAAO,IAAI,OAAO,CAErB;IAEM,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAS/E,KAAK,eAAS;IACd,SAAS,mBAAa;IACtB,OAAO,iBAAW;IAClB,QAAQ,kBAAY;IACpB,mBAAmB,6BAAuB;IAC1C,kBAAkB,4BAAsB;IACxC,WAAW,qBAAe;IAC1B,sBAAsB,gCAA0B;IAChD,qBAAqB,+BAAyB;IAC9C,YAAY,sBAAgB;IAC5B,qBAAqB,+BAAyB;IAC9C,oBAAoB,8BAAwB;IAC5C,uBAAuB,iCAA2B;CAC5D"}

package/dist/core/api/v3/Parser.js

@@ -23,9 +23,9 @@ class Parser {
     get context() {
         return this._context;
     }
-    getTypeNameByRef(value, ref) {
+    getTypeNameByRef(value, ref, parentSourceFile) {
         if (ref) {
-            const definition = this.context.get(ref);
+            const definition = this.context.get(ref, parentSourceFile);
             return (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(value, definition, this._context.prefix);
         }
         return value;

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

@@ -1 +1 @@
-{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/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;AAGzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CAkLjE"}
+{"version":3,"file":"getModel.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/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;AAGzD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,CAgLjE"}

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

@@ -6,7 +6,6 @@ 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");
 const getModelDefault_1 = require("./getModelDefault");
 function getModel(config) {
     const { openApi, definition, isDefinition = false, name = '', path = '', parentRef } = config;
@@ -44,8 +43,7 @@ function getModel(config) {
         properties: [],
     };
     if (definition.$ref) {
-        const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.$ref, parentRef);
-        const definitionRef = this.getType(definition.$ref, normalizedRef);
+        const definitionRef = this.getType(definition.$ref, parentRef);
         model.export = 'reference';
         model.type = definitionRef.type;
         model.base = definitionRef.base;
@@ -78,8 +76,7 @@ function getModel(config) {
     }
     if (definition.type === 'array' && definition.items) {
         if (definition.items.$ref) {
-            const normalizedRef = (0, normalizeRef_1.normalizeRef)(definition.items.$ref, parentRef);
-            const arrayItems = this.getType(definition.items.$ref, normalizedRef);
+            const arrayItems = this.getType(definition.items.$ref, parentRef);
             model.export = 'array';
             model.type = arrayItems.type;
             model.base = arrayItems.base;

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

@@ -1 +1 @@
-{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModelProperties.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAM/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,CAkFxH"}
+{"version":3,"file":"getModelProperties.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getModelProperties.ts"],"names":[],"mappings":"AACA,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/v3/parser/getModelProperties.js

@@ -6,7 +6,6 @@ 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) {
@@ -14,8 +13,7 @@ function getModelProperties(openApi, definition, parentRef) {
             const property = definition.properties[propertyName];
             const propertyRequired = definition.required?.includes(propertyName) || property.default !== undefined;
             if (property.$ref) {
-                const normalizedRef = (0, normalizeRef_1.normalizeRef)(property.$ref, parentRef);
-                const model = this.getType(property.$ref, normalizedRef);
+                const model = this.getType(property.$ref, parentRef);
                 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,CAsBjE"}
+{"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;AAI/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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
-const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
@@ -16,7 +15,7 @@ function getModels(openApi) {
                 openApi: openApi,
                 definition: definition,
                 isDefinition: true,
-                name: (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(definitionType.base, definition, this.context.prefix),
+                name: definitionType.base,
                 path: definitionType.path,
                 parentRef: modelRef,
             });

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

@@ -48,7 +48,7 @@ function getOperation(openApi, url, method, op, pathParams, serviceClassName, pa
     }
     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 requestBodyDef = (op.requestBody.$ref ? this.context.get(op.requestBody.$ref, parentFileRef) : op.requestBody);
         const requestBody = this.getOperationRequestBody(openApi, requestBodyDef, parentFileRef);
         operation.imports.push(...requestBody.imports);
         operation.parameters.push(requestBody);

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;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"}
+{"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,EAAE,SAAS,EAAE,MAAM,GAAG,kBAAkB,CA8ExI"}

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

@@ -4,7 +4,6 @@ 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, parentRef) {
     const operationParameter = {
@@ -30,8 +29,7 @@ function getOperationParameter(openApi, parameter, parentRef) {
         mediaType: null,
     };
     if (parameter.$ref) {
-        const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.$ref, parentRef);
-        const definitionRef = this.getType(parameter.$ref, normalizedRef);
+        const definitionRef = this.getType(parameter.$ref, parentRef);
         operationParameter.export = 'reference';
         operationParameter.type = definitionRef.type;
         operationParameter.base = definitionRef.base;
@@ -41,8 +39,7 @@ function getOperationParameter(openApi, parameter, parentRef) {
     }
     if (parameter.schema) {
         if (parameter.schema.$ref) {
-            const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.schema.$ref, parentRef);
-            const model = this.getType(parameter.schema.$ref, normalizedRef);
+            const model = this.getType(parameter.schema.$ref, parentRef);
             operationParameter.export = 'reference';
             operationParameter.type = model.type;
             operationParameter.base = model.base;

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

@@ -16,7 +16,7 @@ function getOperationParameters(openApi, parameters, parentRef) {
     };
     // Iterate over the parameters
     parameters.forEach(parameterOrReference => {
-        const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref) : parameterOrReference);
+        const parameterDef = (parameterOrReference.$ref ? this.context.get(parameterOrReference.$ref, parentRef) : parameterOrReference);
         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.

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

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

@@ -3,7 +3,6 @@ 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 = {
@@ -38,8 +37,7 @@ function getOperationRequestBody(openApi, parameter, parentRef) {
                 (requestBody.in = 'formData'), (requestBody.name = 'formData'), (requestBody.prop = 'formData');
             }
             if (content?.schema?.$ref) {
-                const normalizedRef = (0, normalizeRef_1.normalizeRef)(content.schema.$ref, parentRef);
-                const model = this.getType(content.schema.$ref, normalizedRef);
+                const model = this.getType(content.schema.$ref, parentRef);
                 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":"AACA,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"}
+{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponse.ts"],"names":[],"mappings":"AACA,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"}

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

@@ -4,7 +4,6 @@ exports.getOperationResponse = getOperationResponse;
 const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 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 = {
@@ -32,8 +31,7 @@ function getOperationResponse(openApi, response, responseCode, parentRef) {
         const content = (0, getContent_1.getContent)(response.content);
         if (content) {
             if (content?.schema?.$ref) {
-                const normalizedRef = (0, normalizeRef_1.normalizeRef)(content.schema.$ref, parentRef);
-                const model = this.getType(content.schema.$ref, normalizedRef);
+                const model = this.getType(content.schema.$ref, parentRef);
                 operationResponse.export = 'reference';
                 operationResponse.type = model.type;
                 operationResponse.base = model.base;

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

@@ -10,7 +10,7 @@ function getOperationResponses(openApi, responses, parentRef) {
     for (const code in responses) {
         if ((0, safeHasOwn_1.safeHasOwn)(responses, code)) {
             const responseOrReference = responses[code];
-            const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref) : responseOrReference);
+            const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref, parentRef) : responseOrReference);
             const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);
             if (responseCode) {
                 const operationResponse = this.getOperationResponse(openApi, response, responseCode, parentRef);

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":"AACA,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"}
+{"version":3,"file":"getServices.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServices.ts"],"names":[],"mappings":"AACA,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,CAiCrE"}

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

@@ -14,9 +14,10 @@ function getServices(openApi) {
         if ((0, safeHasOwn_1.safeHasOwn)(openApi.paths, url)) {
             // Grab path and parse any global 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 || '';
+            const rootPath = this.context.root?.path || '';
+            const path = (pathByUrl.$ref ? this.context.get(pathByUrl.$ref, rootPath) : pathByUrl);
+            const parentFileRef = pathByUrl.$ref || rootPath;
+            const pathParams = this.getOperationParameters(openApi, path.parameters || [], parentFileRef);
             // Parse all the methods for this path
             (0, serviceHelpers_1.forEachOperationInPath)(path, (method, op) => {
                 // Each method contains an OpenAPI operation, we parse the operation

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

@@ -35,7 +35,7 @@ function getType(value, parentRef) {
          * В этом случае надо брать непосредственно normalizedValue - это относительный путь или фрагмент.
          * Предполагаем, что в таком случае расчитывать нет нужды. Это путь от папки outputModels
          */
-        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue);
+        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue, parentRef);
         let valuePath = valueClean;
         if (canonicalValue) {
             const refValuePath = canonicalValue?.fragment ? `${canonicalValue.outputFile}${canonicalValue.fragment}` : canonicalValue?.outputFile || '';
@@ -43,7 +43,7 @@ function getType(value, parentRef) {
             valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
         }
         valuePath = !valuePath.startsWith('./') && !valuePath.startsWith('../') ? `./${valuePath}` : valuePath;
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), normalizedValue, parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         result.type = type;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAGrE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,wBAAsB,QAAQ,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE"}

package/dist/core/index.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 exports.generate = generate;
 const OpenApiClient_1 = require("./OpenApiClient");
+const validateRawOptions_1 = require("./utils/validateRawOptions");
 var HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
 Object.defineProperty(exports, "HttpClient", { enumerable: true, get: function () { return HttpClient_enum_1.HttpClient; } });
 async function generate(rawOptions) {
+    (0, validateRawOptions_1.validateRawOptions)(rawOptions);
     const openApiClient = new OpenApiClient_1.OpenApiClient();
     await openApiClient.generate(rawOptions);
 }

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

@@ -24,6 +24,9 @@ export interface Templates {
         httpStatusCode: Handlebars.TemplateDelegate;
         requestExecutor: Handlebars.TemplateDelegate;
         createExecutorAdapter: Handlebars.TemplateDelegate;
+        interceptors: Handlebars.TemplateDelegate;
+        apiErrorInterceptor: Handlebars.TemplateDelegate;
+        withInterceptors: Handlebars.TemplateDelegate;
     };
 }
 //# sourceMappingURL=Templates.model.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Templates.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/Templates.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAEjD,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAChD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,qBAAqB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACtD,CAAC;CACL"}
+{"version":3,"file":"Templates.model.d.ts","sourceRoot":"","sources":["../../../../src/core/types/base/Templates.model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,oBAAoB,CAAC;AAEjD,MAAM,WAAW,SAAS;IACtB,OAAO,EAAE;QACL,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,IAAI,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAClC,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACzC,CAAC;IACF,OAAO,EAAE;QACL,MAAM,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACpC,KAAK,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnC,MAAM,EAAE,UAAU,CAAC,gBAAgB,GAAG,SAAS,CAAC;QAChD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACxC,CAAC;IACF,IAAI,EAAE;QACF,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,QAAQ,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACtC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,SAAS,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACvC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACrC,iBAAiB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC/C,cAAc,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC5C,eAAe,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC7C,qBAAqB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACnD,YAAY,EAAE,UAAU,CAAC,gBAAgB,CAAC;QAC1C,mBAAmB,EAAE,UAAU,CAAC,gBAAgB,CAAC;QACjD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB,CAAC;KACjD,CAAC;CACL"}

package/dist/core/utils/__mocks__/templates.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,eAAO,MAAM,SAAS,EAAE,SA0BvB,CAAC"}
+{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/__mocks__/templates.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,eAAO,MAAM,SAAS,EAAE,SA6BvB,CAAC"}

package/dist/core/utils/__mocks__/templates.js

@@ -26,5 +26,8 @@ exports.templates = {
         httpStatusCode: () => 'httpStatusCode',
         createExecutorAdapter: () => 'createExecutorAdapter',
         requestExecutor: () => 'requestExecutor',
+        apiErrorInterceptor: () => 'apiErrorInterceptor',
+        interceptors: () => 'interceptors',
+        withInterceptors: () => 'withInterceptors',
     },
 };

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

@@ -7,8 +7,8 @@ const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const pathHelpers_1 = require("../../../common/utils/pathHelpers");
 const isSubdirectory_1 = require("../isSubdirectory");
-(0, node_test_1.describe)('@unit: isSubDirectory', () => {
-    node_test_1.test.skip('should return correct result', () => {
+node_test_1.describe.skip('@unit: isSubDirectory', () => {
+    (0, node_test_1.test)('should return correct result', () => {
         node_assert_1.default.strictEqual((0, isSubdirectory_1.isSubDirectory)((0, pathHelpers_1.resolveHelper)('/'), (0, pathHelpers_1.resolveHelper)('/')), false);
         node_assert_1.default.strictEqual((0, isSubdirectory_1.isSubDirectory)((0, pathHelpers_1.resolveHelper)('.'), (0, pathHelpers_1.resolveHelper)('.')), false);
         node_assert_1.default.strictEqual((0, isSubdirectory_1.isSubDirectory)((0, pathHelpers_1.resolveHelper)('./project'), (0, pathHelpers_1.resolveHelper)('./project')), false);