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

package/dist/core/WriteClient.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WriteClient = void 0;
 const Enums_1 = require("../common/Enums");
 const Logger_1 = require("../common/Logger");
-const fileSystem_1 = require("./utils/fileSystem");
-const pathHelpers_1 = require("./utils/pathHelpers");
+const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
+const pathHelpers_1 = require("../common/utils/pathHelpers");
 const prepareAlias_1 = require("./utils/prepareAlias");
 const sortModelByName_1 = require("./utils/sortModelByName");
 const unique_1 = require("./utils/unique");
@@ -24,8 +24,8 @@ const writeClientSimpleIndex_1 = require("./utils/writeClientSimpleIndex");
 class WriteClient {
     config = new Map();
     _logger;
-    constructor() {
-        this._logger = new Logger_1.Logger({
+    constructor(logger) {
+        this._logger = logger || new Logger_1.Logger({
             level: Enums_1.ELogLevel.ERROR,
             instanceId: 'client',
             logOutput: Enums_1.ELogOutput.CONSOLE,
@@ -47,7 +47,7 @@ class WriteClient {
     async writeClient(options) {
         const { client, templates, outputPaths, httpClient, useOptions, useUnionTypes, excludeCoreServiceFiles = false, includeSchemasFiles = false, request, useCancelableRequest = false, useSeparatedIndexes = false, } = options;
         if (!excludeCoreServiceFiles) {
-            await fileSystem_1.fileSystem.mkdir(outputPaths.outputCore);
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputCore);
             await this.writeClientCore({ client, templates, outputCorePath: outputPaths.outputCore, httpClient, request, useCancelableRequest });
             await this.writeClientCoreIndex({
                 templates,
@@ -56,14 +56,14 @@ class WriteClient {
                 useSeparatedIndexes,
             });
             const { outputCore, outputServices, outputModels } = outputPaths;
-            await fileSystem_1.fileSystem.mkdir(outputPaths.outputServices);
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputServices);
             await this.writeClientServices({
                 services: client.services,
                 templates,
                 outputPaths: {
                     outputServices,
-                    outputCore: `${(0, pathHelpers_1.relative)(outputServices, outputCore)}`,
-                    outputModels: `${(0, pathHelpers_1.relative)(outputServices, outputModels)}`,
+                    outputCore: `${(0, pathHelpers_1.relativeHelper)(outputServices, outputCore)}`,
+                    outputModels: `${(0, pathHelpers_1.relativeHelper)(outputServices, outputModels)}`,
                 },
                 httpClient,
                 useUnionTypes,
@@ -78,7 +78,7 @@ class WriteClient {
             });
         }
         if (includeSchemasFiles) {
-            await fileSystem_1.fileSystem.mkdir(outputPaths.outputSchemas);
+            await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputSchemas);
             await this.writeClientSchemas({
                 models: client.models,
                 templates,
@@ -93,7 +93,7 @@ class WriteClient {
                 useSeparatedIndexes,
             });
         }
-        await fileSystem_1.fileSystem.mkdir(outputPaths.outputModels);
+        await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.outputModels);
         await this.writeClientModels({
             models: client.models,
             templates,
@@ -107,7 +107,7 @@ class WriteClient {
             outputModelsPath: outputPaths.outputModels,
             useSeparatedIndexes,
         });
-        await fileSystem_1.fileSystem.mkdir(outputPaths.output);
+        await fileSystemHelpers_1.fileSystemHelpers.mkdir(outputPaths.output);
         this.buildClientGeneratorConfigMap({
             client,
             templates,
@@ -153,21 +153,21 @@ class WriteClient {
                 const outputServices = this.getOutputPath(outputPaths?.outputServices, key, 'services');
                 const clientIndex = this.ensureSimpleClientIndex(result, key, templates);
                 if (!excludeCoreServiceFiles) {
-                    const relativePathCore = (0, pathHelpers_1.relative)(key, outputCore);
+                    const relativePathCore = (0, pathHelpers_1.relativeHelper)(key, outputCore);
                     if (!clientIndex.core.includes(relativePathCore)) {
                         clientIndex.core.push(relativePathCore);
                     }
-                    const relativeService = (0, pathHelpers_1.relative)(key, outputServices);
+                    const relativeService = (0, pathHelpers_1.relativeHelper)(key, outputServices);
                     if (!clientIndex.services.includes(relativeService)) {
                         clientIndex.services.push(relativeService);
                     }
                 }
-                const relativePathModel = (0, pathHelpers_1.relative)(key, outputModels);
+                const relativePathModel = (0, pathHelpers_1.relativeHelper)(key, outputModels);
                 if (!clientIndex.models.includes(relativePathModel)) {
                     clientIndex.models.push(relativePathModel);
                 }
                 if (includeSchemasFiles) {
-                    const relativePathSchema = (0, pathHelpers_1.relative)(key, outputSchemas);
+                    const relativePathSchema = (0, pathHelpers_1.relativeHelper)(key, outputSchemas);
                     if (!clientIndex.schemas.includes(relativePathSchema)) {
                         clientIndex.schemas.push(relativePathSchema);
                     }
@@ -187,11 +187,11 @@ class WriteClient {
                 const outputServices = this.getOutputPath(outputPaths?.outputServices, key, 'services');
                 const clientIndex = this.ensureClientIndex(result, key, templates);
                 if (!excludeCoreServiceFiles) {
-                    const rel = (0, pathHelpers_1.relative)(key, outputCore);
+                    const rel = (0, pathHelpers_1.relativeHelper)(key, outputCore);
                     if (!clientIndex.core.includes(rel)) {
                         clientIndex.core.push(rel);
                     }
-                    const relativeService = `${(0, pathHelpers_1.relative)(key, outputServices)}`;
+                    const relativeService = `${(0, pathHelpers_1.relativeHelper)(key, outputServices)}`;
                     for (const service of client.services) {
                         if (!clientIndex.services.some(s => this.isSomeService(s, service.name, relativeService))) {
                             clientIndex.services.push({
@@ -201,8 +201,8 @@ class WriteClient {
                         }
                     }
                 }
-                const relativePathModel = `${(0, pathHelpers_1.relative)(key, outputModels)}`;
-                const relativePathSchema = `${(0, pathHelpers_1.relative)(key, outputSchemas)}`;
+                const relativePathModel = `${(0, pathHelpers_1.relativeHelper)(key, outputModels)}`;
+                const relativePathSchema = `${(0, pathHelpers_1.relativeHelper)(key, outputSchemas)}`;
                 for (const model of client.models) {
                     const modelFinal = {
                         name: model.name,
@@ -242,7 +242,7 @@ class WriteClient {
         }
     }
     getOutputPath(output, key, fallback) {
-        return output ? output : (0, pathHelpers_1.resolve)(key, fallback);
+        return output ? output : (0, pathHelpers_1.resolveHelper)(key, fallback);
     }
     ensureClientIndex(map, key, templates) {
         if (!map.has(key)) {

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

@@ -5,68 +5,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const strict_1 = __importDefault(require("node:assert/strict"));
 const node_test_1 = require("node:test");
+const fileSystemHelpers_1 = require("../../common/utils/fileSystemHelpers");
 const HttpClient_enum_1 = require("../types/enums/HttpClient.enum");
-const fileSystem_1 = require("../utils/fileSystem");
 const getOutputPaths_1 = require("../utils/getOutputPaths");
 const WriteClient_1 = require("../WriteClient");
-(0, node_test_1.test)('@unit: writeClient should write to filesystem', async () => {
-    const mkdirCalls = [];
-    const writeFileCalls = [];
-    // We keep the original implementations
-    const originalMkdir = fileSystem_1.fileSystem.mkdir;
-    const originalWriteFile = fileSystem_1.fileSystem.writeFile;
-    // Mock the functions
-    fileSystem_1.fileSystem.mkdir = node_test_1.mock.fn(async (path) => {
-        mkdirCalls.push(path);
-        return path;
+(0, node_test_1.describe)('@unit: writeClient', () => {
+    (0, node_test_1.test)('should write to filesystem', async () => {
+        const mkdirCalls = [];
+        const writeFileCalls = [];
+        // We keep the original implementations
+        const originalMkdir = fileSystemHelpers_1.fileSystemHelpers.mkdir;
+        const originalWriteFile = fileSystemHelpers_1.fileSystemHelpers.writeFile;
+        // Mock the functions
+        fileSystemHelpers_1.fileSystemHelpers.mkdir = node_test_1.mock.fn(async (path) => {
+            mkdirCalls.push(path);
+        });
+        fileSystemHelpers_1.fileSystemHelpers.writeFile = node_test_1.mock.fn(async (path, content) => {
+            writeFileCalls.push([path, content]);
+        });
+        const client = {
+            server: 'http://localhost:8080',
+            version: 'v1',
+            models: [],
+            services: [],
+        };
+        const templates = {
+            indexes: {
+                full: () => 'fullIndex',
+                simple: () => 'simpleIndex',
+                core: () => 'coreIndex',
+                models: () => 'modelsIndex',
+                schemas: () => 'schemasIndex',
+                services: () => 'servicesIndex',
+            },
+            exports: {
+                model: () => 'model',
+                schema: () => 'schema',
+                service: () => 'service',
+            },
+            core: {
+                settings: () => 'settings',
+                apiError: () => 'apiError',
+                apiRequestOptions: () => 'apiRequestOptions',
+                apiResult: () => 'apiResult',
+                request: () => 'request',
+                cancelablePromise: () => 'cancelablePromise',
+                httpStatusCode: () => 'httpStatusCode',
+            },
+        };
+        const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
+        await new WriteClient_1.WriteClient().writeClient({
+            client,
+            templates,
+            outputPaths,
+            httpClient: HttpClient_enum_1.HttpClient.FETCH,
+            useOptions: false,
+            useUnionTypes: false,
+            excludeCoreServiceFiles: false,
+            includeSchemasFiles: false,
+        });
+        strict_1.default.ok(mkdirCalls.length > 0, 'mkdir should be called at least once');
+        strict_1.default.ok(writeFileCalls.length > 0, 'writeFile should be called at least once');
+        // Restoring the original implementations
+        fileSystemHelpers_1.fileSystemHelpers.mkdir = originalMkdir;
+        fileSystemHelpers_1.fileSystemHelpers.writeFile = originalWriteFile;
     });
-    fileSystem_1.fileSystem.writeFile = node_test_1.mock.fn(async (path, content) => {
-        writeFileCalls.push([path, content]);
-    });
-    const client = {
-        server: 'http://localhost:8080',
-        version: 'v1',
-        models: [],
-        services: [],
-    };
-    const templates = {
-        indexes: {
-            full: () => 'fullIndex',
-            simple: () => 'simpleIndex',
-            core: () => 'coreIndex',
-            models: () => 'modelsIndex',
-            schemas: () => 'schemasIndex',
-            services: () => 'servicesIndex',
-        },
-        exports: {
-            model: () => 'model',
-            schema: () => 'schema',
-            service: () => 'service',
-        },
-        core: {
-            settings: () => 'settings',
-            apiError: () => 'apiError',
-            apiRequestOptions: () => 'apiRequestOptions',
-            apiResult: () => 'apiResult',
-            request: () => 'request',
-            cancelablePromise: () => 'cancelablePromise',
-            httpStatusCode: () => 'httpStatusCode',
-        },
-    };
-    const outputPaths = (0, getOutputPaths_1.getOutputPaths)({ output: './dist' });
-    await new WriteClient_1.WriteClient().writeClient({
-        client,
-        templates,
-        outputPaths,
-        httpClient: HttpClient_enum_1.HttpClient.FETCH,
-        useOptions: false,
-        useUnionTypes: false,
-        excludeCoreServiceFiles: false,
-        includeSchemasFiles: false,
-    });
-    strict_1.default.ok(mkdirCalls.length > 0, 'mkdir should be called at least once');
-    strict_1.default.ok(writeFileCalls.length > 0, 'writeFile should be called at least once');
-    // Restoring the original implementations
-    fileSystem_1.fileSystem.mkdir = originalMkdir;
-    fileSystem_1.fileSystem.writeFile = originalWriteFile;
 });

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;AACxC,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;IAcrD,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,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"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
+const getModelNameWithPrefix_1 = require("../../utils/getModelNameWithPrefix");
 const getModel_1 = require("../v2/parser/getModel");
 const getModelComposition_1 = require("./parser/getModelComposition");
 const getModelProperties_1 = require("./parser/getModelProperties");
@@ -24,15 +25,7 @@ class Parser {
     getTypeNameByRef(value, ref) {
         if (ref) {
             const definition = this.context.get(ref);
-            if (definition.oneOf || definition.anyOf || definition.allOf || ['string', 'number', 'integer', 'boolean', 'array'].includes(definition.type)) {
-                return `${this.context.prefix.type}${value}`;
-            }
-            else if (definition.enum && definition !== 'boolean') {
-                return `${this.context.prefix.enum}${value}`;
-            }
-            else if (definition.type === 'object') {
-                return `${this.context.prefix.interface}${value}`;
-            }
+            return (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(value, definition, this._context.prefix);
         }
         return value;
     }

package/dist/core/api/v2/parser/__tests__/getServer.test.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getServer_1 = require("../getServer");
-(0, node_test_1.describe)('getServer', () => {
-    (0, node_test_1.test)('@unit: should produce correct result', () => {
+(0, node_test_1.describe)('@unit: getServer', () => {
+    (0, node_test_1.test)('should produce correct result', () => {
         node_assert_1.default.strictEqual((0, getServer_1.getServer)({
             swagger: '2.0',
             info: {

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

@@ -9,8 +9,8 @@ const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"))
 const Context_1 = require("../../../../Context");
 const getOutputPaths_1 = require("../../../../utils/getOutputPaths");
 const Parser_1 = require("../../Parser");
-(0, node_test_1.describe)('getType', () => {
-    (0, node_test_1.test)('@unit: should convert int', async () => {
+(0, node_test_1.describe)('@unit: getType', () => {
+    (0, node_test_1.test)('should convert int', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new swagger_parser_1.default();
@@ -22,7 +22,7 @@ const Parser_1 = require("../../Parser");
         node_assert_1.default.strictEqual(type.template, null);
         node_assert_1.default.deepStrictEqual(type.imports, []);
     });
-    (0, node_test_1.test)('@unit: should support file with ext', async () => {
+    node_test_1.test.skip('should support file with ext', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new swagger_parser_1.default();

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

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

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

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModelProperties = getModelProperties;
-const get_1 = __importDefault(require("lodash-es/get"));
+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");
@@ -12,7 +9,7 @@ const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getModelProperties(openApi, definition, parentRef) {
     const models = [];
     for (const propertyName in definition.properties) {
-        if ((0, get_1.default)(definition.properties, propertyName, null)) {
+        if ((0, safeHasOwn_1.safeHasOwn)(definition.properties, propertyName)) {
             const property = definition.properties[propertyName];
             const propertyRequired = definition.required?.includes(propertyName) || property.default !== undefined;
             if (property.$ref) {

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

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

@@ -1,6 +1,7 @@
 "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");
@@ -16,7 +17,7 @@ function getModels(openApi) {
                 openApi: openApi,
                 definition: definition,
                 isDefinition: true,
-                name: definitionType.base,
+                name: (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(definitionType.base, definition, this.context.prefix),
                 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,CAuIxI"}
+{"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"}

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

@@ -101,7 +101,8 @@ function getOperationParameter(openApi, parameter, parentRef) {
     }
     if (parameter.schema) {
         if (parameter.schema.$ref) {
-            const model = this.getType(parameter.schema.$ref, '');
+            const normalizedRef = (0, normalizeRef_1.normalizeRef)(parameter.schema.$ref, parentRef);
+            const model = this.getType(parameter.schema.$ref, normalizedRef);
             operationParameter.export = 'reference';
             operationParameter.type = model.type;
             operationParameter.base = model.base;

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

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v2/parser/getOperationResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;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;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"}

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

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationResponse = getOperationResponse;
-const get_1 = __importDefault(require("lodash-es/get"));
+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");
@@ -80,7 +77,7 @@ function getOperationResponse(openApi, response, responseCode, parentRef) {
     // fetch and XHR client just support string types.
     if (response.headers) {
         for (const name in response.headers) {
-            if ((0, get_1.default)(response.headers, name, null)) {
+            if ((0, safeHasOwn_1.safeHasOwn)(response.headers, name)) {
                 operationResponse.in = 'header';
                 operationResponse.name = name;
                 operationResponse.type = 'string';

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

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

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

@@ -1,17 +1,14 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOperationResponses = getOperationResponses;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const getOperationResponseCode_1 = require("../../../utils/getOperationResponseCode");
 function getOperationResponses(openApi, responses, parentRef) {
     const operationResponses = [];
     // Iterate over each response code and get the
     // status code and response message (if any).
     for (const code in responses) {
-        if ((0, get_1.default)(responses, code, null)) {
+        if ((0, safeHasOwn_1.safeHasOwn)(responses, code)) {
             const responseOrReference = responses[code];
             const response = (responseOrReference.$ref ? this.context.get(responseOrReference.$ref) : responseOrReference);
             const responseCode = (0, getOperationResponseCode_1.getOperationResponseCode)(code);

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":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAGnE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAKtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAgCrE"}
+{"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"}

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

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServices = getServices;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const getClassName_1 = require("../../../utils/getClassName");
 const serviceHelpers_1 = require("../../../utils/serviceHelpers");
 const getServiceName_1 = require("./getServiceName");
@@ -14,7 +11,7 @@ const getServiceName_1 = require("./getServiceName");
 function getServices(openApi) {
     const services = new Map();
     for (const url in openApi.paths) {
-        if ((0, get_1.default)(openApi.paths, url, null)) {
+        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);

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getType = getType;
 const getMappedType_1 = require("../../../utils/getMappedType");
 const getTypeName_1 = require("../../../utils/getTypeName");
-const replaceString_1 = require("../../../utils/replaceString");
+const normalizeString_1 = require("../../../utils/normalizeString");
 const resolveRefToImportPath_1 = require("../../../utils/resolveRefToImportPath");
 const stripNamespace_1 = require("../../../utils/stripNamespace");
 /**
@@ -12,7 +12,7 @@ const stripNamespace_1 = require("../../../utils/stripNamespace");
  * @param parentRef Reference to a parent model
  */
 function getType(value, parentRef) {
-    const normalizedValue = (0, replaceString_1.replaceString)(value) || '';
+    const normalizedValue = (0, normalizeString_1.normalizeString)(value) || '';
     const result = {
         type: 'any',
         base: 'any',
@@ -37,8 +37,8 @@ function getType(value, parentRef) {
             refValuePath: normalizedValue,
             outputModelsPath: this.context.output?.outputModels,
         });
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean));
-        const valueImportPath = !valuePath.startsWith('/') ? `./${valuePath}` : valuePath;
+        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean), parentRef);
+        const valueImportPath = !valuePath.startsWith('./') ? `./${valuePath}` : valuePath;
         result.path = valuePath;
         result.type = type;
         result.base = type;

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

@@ -1,4 +1,4 @@
-import { Context } from '../../../core/Context';
+import { Context } from '../../Context';
 import { getModel } from '../v3/parser/getModel';
 import { getModelComposition } from './parser/getModelComposition';
 import { getModelProperties } from './parser/getModelProperties';

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,uBAAuB,CAAC;AAChD,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;IAcrD,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,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"}

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Parser = void 0;
+const getModelNameWithPrefix_1 = require("../../utils/getModelNameWithPrefix");
 const getModel_1 = require("../v3/parser/getModel");
 const getModelComposition_1 = require("./parser/getModelComposition");
 const getModelProperties_1 = require("./parser/getModelProperties");
@@ -25,15 +26,7 @@ class Parser {
     getTypeNameByRef(value, ref) {
         if (ref) {
             const definition = this.context.get(ref);
-            if (definition.enum && definition !== 'boolean') {
-                return `${this.context.prefix.enum}${value}`;
-            }
-            else if (definition.oneOf || definition.anyOf || definition.allOf || ['string', 'number', 'integer', 'boolean', 'array'].includes(definition.type)) {
-                return `${this.context.prefix.type}${value}`;
-            }
-            else if (definition.type === 'object') {
-                return `${this.context.prefix.interface}${value}`;
-            }
+            return (0, getModelNameWithPrefix_1.getModelNameWithPrefix)(value, definition, this._context.prefix);
         }
         return value;
     }

package/dist/core/api/v3/parser/__tests__/getServer.test.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_test_1 = require("node:test");
 const getServer_1 = require("../getServer");
-(0, node_test_1.describe)('getServer', () => {
-    (0, node_test_1.test)('@unit: should produce correct result', () => {
+(0, node_test_1.describe)('@unit: getServer', () => {
+    (0, node_test_1.test)('should produce correct result', () => {
         node_assert_1.default.strictEqual((0, getServer_1.getServer)({
             openapi: '3.0',
             info: {
@@ -22,7 +22,7 @@ const getServer_1 = require("../getServer");
             ],
         }), 'https://localhost:8080/api');
     });
-    (0, node_test_1.test)('@unit: should produce correct result with variables', () => {
+    (0, node_test_1.test)('should produce correct result with variables', () => {
         node_assert_1.default.strictEqual((0, getServer_1.getServer)({
             openapi: '3.0',
             info: {

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

@@ -9,8 +9,8 @@ const swagger_parser_1 = __importDefault(require("@apidevtools/swagger-parser"))
 const Context_1 = require("../../../../Context");
 const getOutputPaths_1 = require("../../../../utils/getOutputPaths");
 const Parser_1 = require("../../Parser");
-(0, node_test_1.describe)('getType', () => {
-    (0, node_test_1.test)('@unit: should convert int', async () => {
+(0, node_test_1.describe)('@unit: getType', () => {
+    (0, node_test_1.test)('should convert int', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new swagger_parser_1.default();
@@ -22,7 +22,7 @@ const Parser_1 = require("../../Parser");
         node_assert_1.default.strictEqual(type.template, null);
         node_assert_1.default.deepStrictEqual(type.imports, []);
     });
-    (0, node_test_1.test)('@unit: should support file with ext', async () => {
+    node_test_1.test.skip('should support file with ext', async () => {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         const parser = new swagger_parser_1.default();

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":"AAEA,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;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"}

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

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getModelProperties = getModelProperties;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 const escapeName_1 = require("../../../utils/escapeName");
 const getClassName_1 = require("../../../utils/getClassName");
 const getComment_1 = require("../../../utils/getComment");
@@ -13,7 +10,7 @@ const normalizeRef_1 = require("../../../utils/normalizeRef");
 function getModelProperties(openApi, definition, parentRef) {
     const models = [];
     for (const propertyName in definition.properties) {
-        if ((0, get_1.default)(definition.properties, propertyName, null)) {
+        if ((0, safeHasOwn_1.safeHasOwn)(definition.properties, propertyName)) {
             const property = definition.properties[propertyName];
             const propertyRequired = definition.required?.includes(propertyName) || property.default !== undefined;
             if (property.$ref) {