ts-openapi-codegen 2.0.0-beta.1 → 2.0.0-beta.10

package/dist/core/WriteClient.js

@@ -5,11 +5,13 @@ const Enums_1 = require("../common/Enums");
 const Logger_1 = require("../common/Logger");
 const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
 const pathHelpers_1 = require("../common/utils/pathHelpers");
+const ValidationLibrary_enum_1 = require("./types/enums/ValidationLibrary.enum");
 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 writeClientExecutor_1 = require("./utils/writeClientExecutor");
 const writeClientFullIndex_1 = require("./utils/writeClientFullIndex");
 const writeClientModels_1 = require("./utils/writeClientModels");
 const writeClientModelsIndex_1 = require("./utils/writeClientModelsIndex");
@@ -25,29 +27,25 @@ class WriteClient {
     config = new Map();
     _logger;
     constructor(logger) {
-        this._logger = logger || new Logger_1.Logger({
-            level: Enums_1.ELogLevel.ERROR,
-            instanceId: 'client',
-            logOutput: Enums_1.ELogOutput.CONSOLE,
-        });
+        this._logger =
+            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;
+        const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, validationLibrary = ValidationLibrary_enum_1.ValidationLibrary.NONE, } = options;
         if (!excludeCoreServiceFiles) {
+            const executorPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'executor');
+            const interceptorsPath = (0, pathHelpers_1.resolveHelper)(outputPaths.outputCore, 'interceptors');
             await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputCore);
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(executorPath);
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(interceptorsPath);
             await this.writeClientCore({ client, templates, outputCorePath: outputPaths.outputCore, httpClient, request, useCancelableRequest });
             await this.writeClientCoreIndex({
                 templates,
@@ -76,8 +74,18 @@ class WriteClient {
                 outputServices,
                 useSeparatedIndexes,
             });
+            await this.writeClientExecutor({
+                outputPath: outputPaths.output,
+                outputCorePath: (0, pathHelpers_1.relativeHelper)(outputPaths.output, outputCore),
+                services: client.services,
+                templates,
+            });
         }
-        if (includeSchemasFiles) {
+        /**
+         * TODO: Нужно собирать импорты из всех вложенных моделей (link, properties в composition и т.д.) и передавать их в шаблон.
+         * Это делается в writeClientSchemas или в парсере моделей.
+         */
+        if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
             await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputSchemas);
             await this.writeClientSchemas({
                 models: client.models,
@@ -85,6 +93,7 @@ class WriteClient {
                 outputSchemasPath: outputPaths.outputSchemas,
                 httpClient,
                 useUnionTypes,
+                validationLibrary,
             });
             await this.writeClientSchemasIndex({
                 models: client.models,
@@ -114,7 +123,7 @@ class WriteClient {
             outputPaths,
             useUnionTypes,
             excludeCoreServiceFiles,
-            includeSchemasFiles,
+            validationLibrary,
         });
     }
     /**
@@ -146,7 +155,7 @@ class WriteClient {
         const result = new Map();
         for (const [key, value] of this.config.entries()) {
             for (const item of value) {
-                const { outputPaths, templates, excludeCoreServiceFiles, includeSchemasFiles } = item;
+                const { outputPaths, templates, excludeCoreServiceFiles, validationLibrary } = 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');
@@ -166,7 +175,7 @@ class WriteClient {
                 if (!clientIndex.models.includes(relativePathModel)) {
                     clientIndex.models.push(relativePathModel);
                 }
-                if (includeSchemasFiles) {
+                if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
                     const relativePathSchema = (0, pathHelpers_1.relativeHelper)(key, outputSchemas);
                     if (!clientIndex.schemas.includes(relativePathSchema)) {
                         clientIndex.schemas.push(relativePathSchema);
@@ -180,7 +189,7 @@ class WriteClient {
         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 { outputPaths, client, templates, useUnionTypes, excludeCoreServiceFiles, validationLibrary } = 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');
@@ -216,7 +225,7 @@ class WriteClient {
                     if (!clientIndex.models.some(m => this.isSameModel(m, modelFinal))) {
                         clientIndex.models.push(modelFinal);
                     }
-                    if (includeSchemasFiles) {
+                    if (validationLibrary !== ValidationLibrary_enum_1.ValidationLibrary.NONE) {
                         const schema = { ...modelFinal, package: relativePathSchema };
                         if (!clientIndex.schemas.some(s => this.isSameShema(s, schema))) {
                             clientIndex.schemas.push(schema);
@@ -289,5 +298,6 @@ class WriteClient {
     writeClientServices = writeClientServices_1.writeClientServices;
     writeClientServicesIndex = writeClientServicesIndex_1.writeClientServicesIndex;
     writeClientSimpleIndex = writeClientSimpleIndex_1.writeClientSimpleIndex;
+    writeClientExecutor = writeClientExecutor_1.writeClientExecutor;
 }
 exports.WriteClient = WriteClient;

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

@@ -7,6 +7,7 @@ const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = require("node:test");
 const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../types/enums/HttpClient.enum");
+const ValidationLibrary_enum_1 = require("../types/enums/ValidationLibrary.enum");
 const getOutputPaths_1 = require("../utils/getOutputPaths");
 const WriteClient_1 = require("../WriteClient");
 (0, node_test_1.describe)('@unit: writeClient', () => {
@@ -39,6 +40,7 @@ const WriteClient_1 = require("../WriteClient");
                 services: () => 'servicesIndex',
             },
             exports: {
+                client: () => 'client',
                 model: () => 'model',
                 schema: () => 'schema',
                 service: () => 'service',
@@ -51,8 +53,11 @@ const WriteClient_1 = require("../WriteClient");
                 request: () => 'request',
                 cancelablePromise: () => 'cancelablePromise',
                 httpStatusCode: () => 'httpStatusCode',
-                legacyRequestAdapter: () => 'legacyRequestAdapter',
+                createExecutorAdapter: () => 'createExecutorAdapter',
                 requestExecutor: () => 'requestExecutor',
+                apiErrorInterceptor: () => 'apiErrorInterceptor',
+                interceptors: () => 'interceptors',
+                withInterceptors: () => 'withInterceptors'
             },
         };
         const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
@@ -64,7 +69,7 @@ const WriteClient_1 = require("../WriteClient");
             useOptions: false,
             useUnionTypes: false,
             excludeCoreServiceFiles: false,
-            includeSchemasFiles: false,
+            validationLibrary: ValidationLibrary_enum_1.ValidationLibrary.NONE,
         });
         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.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;AAM/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,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
-const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
-const getRefFromSchema_1 = require("../../../utils/getRefFromSchema");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
 function getModels(openApi) {
     let models = [];
-    const listOfModelsRef = (0, getRefFromSchema_1.getRefFromSchema)(this.context, openApi);
+    const listOfModelsRef = this.context.getAllCanonicalRefs();
     if (listOfModelsRef) {
         for (const modelRef of listOfModelsRef) {
             const definition = this.context.get(modelRef);
@@ -17,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":"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,CAoC5E"}
+{"version":3,"file":"getType.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getType.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AAM7D,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CA8C5E"}

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

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
+const pathHelpers_1 = require("../../../../common/utils/pathHelpers");
 const getMappedType_1 = require("../../../utils/getMappedType");
+const getRelativeModelPath_1 = require("../../../utils/getRelativeModelPath");
 const getTypeName_1 = require("../../../utils/getTypeName");
 const normalizeString_1 = require("../../../utils/normalizeString");
-const resolveRefToImportPath_1 = require("../../../utils/resolveRefToImportPath");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
 /**
  * Parse any string value into a type object.
@@ -30,14 +31,20 @@ function getType(value, parentRef) {
         }
     }
     else if (valueClean) {
-        // 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), parentRef);
+        /**
+         * canonicalValue может быть пустой строкой.
+         * В этом случае надо брать непосредственно normalizedValue - это относительный путь или фрагмент.
+         * Предполагаем, что в таком случае расчитывать нет нужды. Это путь от папки outputModels
+         */
+        const canonicalValue = this.context.resolveCanonicalRef(normalizedValue, parentRef);
+        let valuePath = valueClean;
+        if (canonicalValue) {
+            const refValuePath = canonicalValue?.fragment ? `${canonicalValue.outputFile}${canonicalValue.fragment}` : canonicalValue?.outputFile || '';
+            const cleanedRefValuePath = (0, stripNamespace_1.stripNamespace)(refValuePath);
+            valuePath = (0, pathHelpers_1.relativeHelper)(this.context.output?.outputModels, cleanedRefValuePath);
+        }
+        valuePath = (0, getRelativeModelPath_1.getRelativeModelPath)(this.context.output?.outputModels, valuePath);
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), normalizedValue, parentRef);
         const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         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;AAM/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,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModels = getModels;
-const getModelNameWithPrefix_1 = require("../../../utils/getModelNameWithPrefix");
-const getRefFromSchema_1 = require("../../../utils/getRefFromSchema");
 const modelHelpers_1 = require("../../../utils/modelHelpers");
 const sortModelsByName_1 = require("../../../utils/sortModelsByName");
 const unique_1 = require("../../../utils/unique");
 function getModels(openApi) {
     let models = [];
-    const listOfModelsRef = (0, getRefFromSchema_1.getRefFromSchema)(this.context, openApi);
+    const listOfModelsRef = this.context.getAllCanonicalRefs();
     if (listOfModelsRef) {
         for (const modelRef of listOfModelsRef) {
             const definition = this.context.get(modelRef);
@@ -17,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;