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

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) {

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;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/v3/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/v3/parser/getOperationResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getOperationResponse.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getOperationResponse.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;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;AAIvF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAGtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAqF1J"}

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

@@ -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");
@@ -82,7 +79,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/v3/parser/getOperationResponses.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"getServer.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAUlD"}
+{"version":3,"file":"getServer.d.ts","sourceRoot":"","sources":["../../../../../src/core/api/v3/parser/getServer.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEtD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAUlD"}

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

@@ -1,16 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getServer = getServer;
-const get_1 = __importDefault(require("lodash-es/get"));
+const safeHasOwn_1 = require("../../../../common/utils/safeHasOwn");
 function getServer(openApi) {
     const server = openApi.servers?.[0];
     const variables = server?.variables || {};
     let url = server?.url || '';
     for (const variable in variables) {
-        if ((0, get_1.default)(variables, variable, null)) {
+        if ((0, safeHasOwn_1.safeHasOwn)(variables, variable)) {
             url = url.replace(`{${variable}}`, variables[variable].default);
         }
     }

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":"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/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"}

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

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

package/dist/core/api/v3/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,20 +37,12 @@ function getType(value, parentRef) {
             refValuePath: normalizedValue,
             outputModelsPath: this.context.output?.outputModels,
         });
-        const type = this.getTypeNameByRef((0, getTypeName_1.getTypeName)(valueClean));
-        // Only prefix with "./" when the path is non-empty and does not already
-        // start with "/" (absolute) or "." (relative like "./" or "../").
-        let valueImportPath = valuePath;
-        if (valuePath && !valuePath.startsWith('/') && !valuePath.startsWith('.')) {
-            valueImportPath = `./${valuePath}`;
-        }
+        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;
-        // Push import only when we actually have a path (avoid './' for empty)
-        if (valuePath) {
-            result.imports.push({ name: type, alias: '', path: valueImportPath });
-        }
+        result.imports.push({ name: type, alias: '', path: valueImportPath });
     }
     return result;
 }

package/dist/core/index.d.ts

@@ -1,4 +1,8 @@
 import { TMultiOptions, TOptions } from '../common/Options';
 export { HttpClient } from './types/enums/HttpClient.enum';
+/**
+ * @throws {Error} If options validation fails or generation encounters an error
+ * @returns {Promise<void>}
+ */
 export declare function generate(options: TOptions | TOptions[] | TMultiOptions): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

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

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

package/dist/core/index.js

@@ -1,17 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpClient = void 0;
 exports.generate = generate;
-/* istanbul ignore file */
-const path_1 = __importDefault(require("path"));
+const fileSystemHelpers_1 = require("../common/utils/fileSystemHelpers");
+const pathHelpers_1 = require("../common/utils/pathHelpers");
 const Parser_1 = require("./api/v2/Parser");
 const Parser_2 = require("./api/v3/Parser");
 const Context_1 = require("./Context");
 const HttpClient_enum_1 = require("./types/enums/HttpClient.enum");
-const fileSystem_1 = require("./utils/fileSystem");
 const getOpenApiSpec_1 = require("./utils/getOpenApiSpec");
 const getOpenApiVersion_1 = require("./utils/getOpenApiVersion");
 const getOutputPaths_1 = require("./utils/getOutputPaths");
@@ -55,7 +51,8 @@ async function generateFrom({ input, output, outputCore, outputServices, outputM
         outputModels,
         outputSchemas,
     });
-    const context = new Context_1.Context({ input, output: outputPaths, prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix }, sortByRequired });
+    const absoluteInput = (0, isString_1.isString)(input) ? (0, pathHelpers_1.resolveHelper)(process.cwd(), input) : input;
+    const context = new Context_1.Context({ input: absoluteInput, output: outputPaths, prefix: { interface: interfacePrefix, enum: enumPrefix, type: typePrefix }, sortByRequired });
     const openApi = (0, isString_1.isString)(input) ? await (0, getOpenApiSpec_1.getOpenApiSpec)(context, input) : input;
     const openApiVersion = (0, getOpenApiVersion_1.getOpenApiVersion)(openApi);
     const templates = (0, registerHandlebarTemplates_1.registerHandlebarTemplates)({
@@ -109,6 +106,10 @@ async function generateFrom({ input, output, outputCore, outputServices, outputM
         }
     }
 }
+/**
+ * @throws {Error} If options validation fails or generation encounters an error
+ * @returns {Promise<void>}
+ */
 async function generate(options) {
     let preparedOptions = [];
     if (Array.isArray(options)) {
@@ -123,30 +124,21 @@ async function generate(options) {
     }
     const optionsFinal = preparedOptions.map(op => (0, prepareOptions_1.prepareOptions)(op));
     const writeClient = new WriteClient_1.WriteClient();
-    writeClient.logger.forceInfo(`Generation has begun. Total number of specification files: ${optionsFinal.length}`);
+    writeClient.logger.forceInfo(`${GENERATION_MESSAGES.STARTED}. Total number of specification files: ${optionsFinal.length}`);
+    if (optionsFinal.length === 0) {
+        throw new Error('No options provided for generation');
+    }
     try {
         const start = process.hrtime();
         for (const option of optionsFinal) {
-            if (option.output) {
-                await fileSystem_1.fileSystem.rmdir(option.output);
-            }
-            if (option.outputCore) {
-                await fileSystem_1.fileSystem.rmdir(option.outputCore);
-            }
-            if (option.outputSchemas) {
-                await fileSystem_1.fileSystem.rmdir(option.outputSchemas);
-            }
-            if (option.outputModels) {
-                await fileSystem_1.fileSystem.rmdir(option.outputModels);
-            }
-            if (option.outputServices) {
-                await fileSystem_1.fileSystem.rmdir(option.outputServices);
-            }
+            await cleanOutputDirectories(option);
         }
         for (const option of optionsFinal) {
+            const fileStart = process.hrtime();
             await generateFrom(option, writeClient);
-            writeClient.logger.info(`Generation from "${option.input}" was finished`);
-            writeClient.logger.info(`Output folder: ${path_1.default.resolve(process.cwd(), option.output)}`, true);
+            const [fileSeconds, fileNanoseconds] = process.hrtime(fileStart);
+            const fileDuration = fileSeconds + fileNanoseconds / 1e6;
+            writeClient.logger.info(`Duration for "${option.input}": ${fileDuration.toFixed(2)} sec`);
         }
         if (optionsFinal[0]?.useSeparatedIndexes) {
             await writeClient.combineAndWrightSimple();
@@ -154,13 +146,28 @@ async function generate(options) {
         else {
             await writeClient.combineAndWrite();
         }
-        writeClient.logger.forceInfo("Generation from has been finished");
+        writeClient.logger.forceInfo(GENERATION_MESSAGES.FINISHED);
         const [seconds, nanoseconds] = process.hrtime(start);
         const durationInMs = seconds + nanoseconds / 1e6;
-        writeClient.logger.forceInfo(`Lead time: ${durationInMs.toFixed(2)} sec`);
+        writeClient.logger.forceInfo(GENERATION_MESSAGES.DURATION(durationInMs));
+        writeClient.logger.forceInfo(GENERATION_MESSAGES.FINISHED);
     }
     catch (error) {
         writeClient.logger.error(error.message);
     }
     writeClient.logger.shutdownLogger();
 }
+const cleanOutputDirectories = async (option) => {
+    const outputDirs = [option.output, option.outputCore, option.outputSchemas, option.outputModels, option.outputServices];
+    for (const dir of outputDirs) {
+        if (dir) {
+            await fileSystemHelpers_1.fileSystemHelpers.rmdir(dir);
+        }
+    }
+};
+const GENERATION_MESSAGES = {
+    STARTED: 'Generation has begun',
+    FINISHED: 'Generation from has been finished',
+    FILE_FINISHED: (input) => `Generation from "${input}" was finished`,
+    DURATION: (ms) => `Lead time: ${ms.toFixed(2)} sec`,
+};

package/dist/core/types/Consts.d.ts

@@ -1,4 +1,8 @@
-export declare const SEARCH_REGEXP: RegExp;
+export declare const REGEX_BACKSLASH: RegExp;
+export declare const REGEX_MULTIPLE_SLASHES: RegExp;
+export declare const REGEX_DOT_SLASH: RegExp;
+export declare const REGEX_LEADING_DOT_SLASH: RegExp;
+export declare const REGEX_TRAILING_SLASH: RegExp;
 export declare const GROUP_PRIORITY_EXTENDED: {
     readonly required: 0;
     readonly 'required-with-default': 1;

package/dist/core/types/Consts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../../src/core/types/Consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,aAAa,QAAQ,CAAC;AAEnC,eAAO,MAAM,uBAAuB;;;;;CAK1B,CAAC;AAEX,eAAO,MAAM,qBAAqB;;;CAGxB,CAAC"}
+{"version":3,"file":"Consts.d.ts","sourceRoot":"","sources":["../../../src/core/types/Consts.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,QAAQ,CAAC;AAErC,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAE7C,eAAO,MAAM,eAAe,QAAe,CAAC;AAE5C,eAAO,MAAM,uBAAuB,QAAc,CAAC;AAEnD,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAE3C,eAAO,MAAM,uBAAuB;;;;;CAK1B,CAAC;AAEX,eAAO,MAAM,qBAAqB;;;CAGxB,CAAC"}