openapi-ts-generator 9.24.2 → 9.31.2

package/openapidoc-converter.js

@@ -1,53 +1,44 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenApiDocConverter = void 0;
-var generator_options_1 = require("./models/generator-options");
-var schema_info_1 = require("./models/schema-info");
-var pluralize_1 = require("pluralize");
-var lodash_1 = require("lodash");
-var OpenApiDocConverter = /** @class */ (function () {
-    function OpenApiDocConverter(options, apiDocument) {
+/* eslint-disable @typescript-eslint/no-unnecessary-type-conversion */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-unnecessary-condition */
+const generator_options_1 = require("./models/generator-options");
+const schema_info_1 = require("./models/schema-info");
+const pluralize_1 = require("pluralize");
+const lodash_1 = require("lodash");
+class OpenApiDocConverter {
+    constructor(options, apiDocument) {
         this.options = options;
         this.apiDocument = apiDocument;
         this.endAlphaNumRegex = /[A-z0-9]*$/s;
         this.startNumberregex = /^\d*/;
     }
-    OpenApiDocConverter.prototype.convertDocument = function () {
-        var entities = this.convertEntities();
-        var paths = this.convertPaths();
-        return { entities: entities, paths: paths };
-    };
-    OpenApiDocConverter.prototype.convertPaths = function () {
-        var paths = [];
-        for (var key in this.apiDocument.paths) {
-            var path = this.apiDocument.paths[key] || {};
-            var tagLookup = path.get || path.post || path.put;
+    convertDocument() {
+        const entities = this.convertEntities();
+        const paths = this.convertPaths();
+        return { entities, paths };
+    }
+    convertPaths() {
+        const paths = [];
+        for (const key in this.apiDocument.paths) {
+            const path = this.apiDocument.paths[key];
+            let tagLookup = path.get || path.post || path.put;
             tagLookup = tagLookup || path.delete || path.patch;
-            var tag = ((tagLookup === null || tagLookup === void 0 ? void 0 : tagLookup.tags) || ['unknown_endpoint'])[0];
+            const tag = (tagLookup?.tags || ['unknown_endpoint'])[0];
             paths.push({
                 tag: (0, lodash_1.snakeCase)(tag),
                 endpoint: this.options.pathUrlFormattingCallBack ? this.options.pathUrlFormattingCallBack(key) : key,
             });
         }
         return paths;
-    };
-    OpenApiDocConverter.prototype.convertEntities = function () {
-        var _a, _b, _c;
-        var entities = [];
-        for (var schemaName in (_a = this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) {
-            if ((_b = this.apiDocument.components) === null || _b === void 0 ? void 0 : _b.schemas[schemaName]) {
-                var schemaWrapperInfo = new schema_info_1.SchemaWrapperInfo((_c = this.apiDocument.components) === null || _c === void 0 ? void 0 : _c.schemas[schemaName]);
+    }
+    convertEntities() {
+        const entities = [];
+        for (const schemaName in this.apiDocument.components?.schemas) {
+            if (this.apiDocument.components.schemas[schemaName]) {
+                const schemaWrapperInfo = new schema_info_1.SchemaWrapperInfo(this.apiDocument.components?.schemas[schemaName]);
                 if (schemaWrapperInfo.componentSchemaObject.enum) {
                     this.buildSchemaWrapperInfoForEnum(schemaWrapperInfo);
                 }
@@ -55,14 +46,15 @@ var OpenApiDocConverter = /** @class */ (function () {
                     this.buildSchemaWrapperInfo(schemaName, schemaWrapperInfo);
                 }
                 schemaWrapperInfo.updateReferenceProperties(this.options);
-                var entity = {
+                const entity = {
                     isEnum: schemaWrapperInfo.isEnum,
-                    enumValues: schemaWrapperInfo.enumValues.map(function (t) {
-                        var _a;
-                        return typeof t === 'string' || t instanceof String
-                            ? t
-                            : __assign(__assign({}, t), { key: (_a = t.key) !== null && _a !== void 0 ? _a : 0 });
-                    }),
+                    isCharEnum: schemaWrapperInfo.isCharEnum || false,
+                    enumValues: schemaWrapperInfo.enumValues.map((t) => typeof t === 'string' || t instanceof String
+                        ? t
+                        : {
+                            ...t,
+                            key: schemaWrapperInfo.isCharEnum ? t.key : +t.key,
+                        }),
                     name: schemaName,
                     kebabCasedName: (0, lodash_1.kebabCase)(schemaName),
                     singularName: (0, pluralize_1.singular)(schemaName),
@@ -76,25 +68,34 @@ var OpenApiDocConverter = /** @class */ (function () {
             }
         }
         return entities.filter(this.options.typeFilterCallBack || generator_options_1.defaultFilter);
-    };
-    OpenApiDocConverter.prototype.buildSchemaWrapperInfoForEnum = function (schemaWrapperInfo) {
-        var _a;
-        var _this = this;
+    }
+    buildSchemaWrapperInfoForEnum(schemaWrapperInfo) {
         schemaWrapperInfo.isEnum = true;
-        (_a = schemaWrapperInfo.enumValues).push.apply(_a, (schemaWrapperInfo.componentSchemaObject.enum || []).map(function (x) {
-            var _a, _b, _c;
-            var key = (_a = _this.startNumberregex.exec(x)) === null || _a === void 0 ? void 0 : _a.at(0);
-            var name = (_c = (_b = _this.endAlphaNumRegex.exec(x)) === null || _b === void 0 ? void 0 : _b.at(0)) !== null && _c !== void 0 ? _c : '';
-            return {
-                key: key ? +key : 0,
-                name: name,
-                titleName: (0, lodash_1.startCase)(name),
-                snakeCaseName: (0, lodash_1.snakeCase)(name).toUpperCase(),
-            };
-        }));
-    };
-    OpenApiDocConverter.prototype.buildSchemaWrapperInfo = function (parentTypeName, schemaWrapperInfo) {
-        for (var propertyName in schemaWrapperInfo.componentSchemaObject.properties) {
+        let enumValues = [...(schemaWrapperInfo.componentSchemaObject.enum || []).map((x) => {
+                const key = this.startNumberregex.exec(x)?.at(0);
+                const name = this.endAlphaNumRegex.exec(x)?.at(0) ?? '';
+                return {
+                    key: key ? +key : 0,
+                    name,
+                    titleName: (0, lodash_1.startCase)(name),
+                    snakeCaseName: (0, lodash_1.snakeCase)(name).toUpperCase(),
+                };
+            })];
+        schemaWrapperInfo.isCharEnum = enumValues.length > 0 &&
+            enumValues
+                .filter((enumVal) => typeof enumVal !== 'string' && typeof enumVal.key === 'number')
+                .map((enumVal) => enumVal.key)
+                .every((val) => val >= 65 && val <= 90); // A-Z ASCII range
+        if (schemaWrapperInfo.isCharEnum) {
+            enumValues = enumValues.map(enumvalue => ({
+                ...enumvalue,
+                key: String.fromCharCode(enumvalue.key)
+            }));
+        }
+        schemaWrapperInfo.enumValues.push(...enumValues);
+    }
+    buildSchemaWrapperInfo(parentTypeName, schemaWrapperInfo) {
+        for (const propertyName in schemaWrapperInfo.componentSchemaObject.properties) {
             if ((schemaWrapperInfo.propertySchemaObject = schemaWrapperInfo.componentSchemaObject.properties[propertyName]).type && // NOSONAR
                 schemaWrapperInfo.propertySchemaObject.type !== 'array') {
                 schemaWrapperInfo.valueProperties.push(this.convertSchemaObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo));
@@ -109,9 +110,9 @@ var OpenApiDocConverter = /** @class */ (function () {
                 }
             }
         }
-    };
-    OpenApiDocConverter.prototype.convertArray = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var arraySchemaObject = schemaWrapperInfo.propertySchemaObject.items;
+    }
+    convertArray(parentTypeName, propertyName, schemaWrapperInfo) {
+        const arraySchemaObject = schemaWrapperInfo.propertySchemaObject.items;
         if (arraySchemaObject.type) {
             schemaWrapperInfo.valueProperties.push(this.convertArrayObjectToValuePropertyType(parentTypeName, propertyName, schemaWrapperInfo));
         }
@@ -119,20 +120,19 @@ var OpenApiDocConverter = /** @class */ (function () {
             schemaWrapperInfo.propertyReferenceObject = schemaWrapperInfo.propertySchemaObject.items;
             schemaWrapperInfo.referenceProperties.push(this.convertArrayObjectToReferencePropertyType(parentTypeName, propertyName, schemaWrapperInfo));
         }
-    };
-    OpenApiDocConverter.prototype.convertSchemaObjectToPropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var _a, _b;
-        var required = this.getIsRequired(propertyName, schemaWrapperInfo);
-        var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
-        var initialValue = this.options.genAngularFormGroupsWithDefaultValues
+    }
+    convertSchemaObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo) {
+        const required = this.getIsRequired(propertyName, schemaWrapperInfo);
+        const validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
+        const initialValue = this.options.genAngularFormGroupsWithDefaultValues
             ? this.getInitialValue(propertyName, schemaWrapperInfo)
             : 'undefined';
-        var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
+        const initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
         return {
-            required: required,
+            required,
             name: propertyName,
-            initialValue: initialValue,
-            initialTestValue: initialTestValue,
+            initialValue,
+            initialTestValue,
             isArray: false,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             typeScriptType: this.getPropertyTypeScriptType(schemaWrapperInfo),
@@ -140,8 +140,8 @@ var OpenApiDocConverter = /** @class */ (function () {
             minLength: schemaWrapperInfo.propertySchemaObject.minLength,
             maximum: schemaWrapperInfo.propertySchemaObject.maximum,
             minimum: schemaWrapperInfo.propertySchemaObject.minimum,
-            email: ((_a = schemaWrapperInfo.propertySchemaObject.format) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'email',
-            uri: ((_b = schemaWrapperInfo.propertySchemaObject.format) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'uri',
+            email: schemaWrapperInfo.propertySchemaObject.format?.toLowerCase() === 'email',
+            uri: schemaWrapperInfo.propertySchemaObject.format?.toLowerCase() === 'uri',
             minItems: schemaWrapperInfo.propertySchemaObject.minItems,
             maxItems: schemaWrapperInfo.propertySchemaObject.maxItems,
             description: schemaWrapperInfo.propertySchemaObject.description,
@@ -149,23 +149,23 @@ var OpenApiDocConverter = /** @class */ (function () {
             hasMultipleValidators: validatorCount > 1,
             hasValidators: validatorCount > 0,
         };
-    };
-    OpenApiDocConverter.prototype.convertValidator = function (validationValue) {
-        var exists = validationValue !== null && validationValue !== undefined;
+    }
+    convertValidator(validationValue) {
+        const exists = validationValue !== null && validationValue !== undefined;
         return +exists;
-    };
-    OpenApiDocConverter.prototype.convertArrayObjectToValuePropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var required = this.getIsRequired(propertyName, schemaWrapperInfo);
-        var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
-        var initialValue = this.options.genAngularFormGroupsWithDefaultValues
+    }
+    convertArrayObjectToValuePropertyType(parentTypeName, propertyName, schemaWrapperInfo) {
+        const required = this.getIsRequired(propertyName, schemaWrapperInfo);
+        const validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
+        const initialValue = this.options.genAngularFormGroupsWithDefaultValues
             ? this.getInitialValue(propertyName, schemaWrapperInfo)
             : 'undefined';
-        var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
+        const initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
         return {
-            required: required,
+            required,
             typeScriptType: this.getPropertyTypeScriptType(schemaWrapperInfo),
-            initialValue: initialValue,
-            initialTestValue: initialTestValue,
+            initialValue,
+            initialTestValue,
             name: propertyName,
             email: false,
             uri: false,
@@ -174,23 +174,21 @@ var OpenApiDocConverter = /** @class */ (function () {
             hasMultipleValidators: false,
             hasValidators: validatorCount > 0,
         };
-    };
-    OpenApiDocConverter.prototype.getInitialValue = function (propertyName, schemaWrapperInfo) {
-        var _a, _b;
-        var typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
-        var isRequired = this.getIsRequired(propertyName, schemaWrapperInfo);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        var refName = (((_a = schemaWrapperInfo === null || schemaWrapperInfo === void 0 ? void 0 : schemaWrapperInfo.componentSchemaObject) === null || _a === void 0 ? void 0 : _a.properties) || {})[propertyName].$ref;
-        var refObject = (((_b = this.apiDocument.components) === null || _b === void 0 ? void 0 : _b.schemas) || {})[refName];
-        var defaultValue = (schemaWrapperInfo.componentSchemaObject.default || (refObject === null || refObject === void 0 ? void 0 : refObject.default) || ((refObject === null || refObject === void 0 ? void 0 : refObject.enum) || [])[0]);
+    }
+    getInitialValue(propertyName, schemaWrapperInfo) {
+        const typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
+        const isRequired = this.getIsRequired(propertyName, schemaWrapperInfo);
+        const refName = (schemaWrapperInfo?.componentSchemaObject?.properties?.[propertyName]).$ref;
+        const refObject = this.apiDocument.components?.schemas?.[refName];
+        const defaultValue = (schemaWrapperInfo.componentSchemaObject.default || refObject?.default || (refObject?.enum || [])[0]);
         if (!isRequired) {
             return 'null';
         }
         else if (defaultValue && refObject.enum) {
-            return "".concat(schemaWrapperInfo.propertyReferenceObject['$ref'], ".").concat(defaultValue.split(' ').pop());
+            return `${schemaWrapperInfo.propertyReferenceObject['$ref']}.${defaultValue.split(' ').pop()}`;
         }
         else if (defaultValue) {
-            return "'".concat(defaultValue.split(' ').pop(), "'");
+            return `'${defaultValue.split(' ').pop()}'`;
         }
         else if (typescriptType === 'Date') {
             return 'new Date()';
@@ -202,35 +200,33 @@ var OpenApiDocConverter = /** @class */ (function () {
             return '0';
         }
         else {
-            return "''";
+            return `''`;
         }
-    };
-    OpenApiDocConverter.prototype.getInitialTestValue = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var _a, _b, _c, _d, _e, _f;
-        var typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
-        var schemaObject = ((_b = (_a = schemaWrapperInfo === null || schemaWrapperInfo === void 0 ? void 0 : schemaWrapperInfo.componentSchemaObject) === null || _a === void 0 ? void 0 : _a.properties) !== null && _b !== void 0 ? _b : {})[propertyName];
-        var maxLength = schemaWrapperInfo.propertySchemaObject.maxLength;
-        var minLength = schemaWrapperInfo.propertySchemaObject.minLength;
-        var minValue = schemaWrapperInfo.propertySchemaObject.minimum;
-        var email = ((_c = schemaWrapperInfo.propertySchemaObject.format) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'email';
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        var refName = (schemaObject === null || schemaObject === void 0 ? void 0 : schemaObject.$ref) || ((_d = schemaObject.items) === null || _d === void 0 ? void 0 : _d.$ref);
-        var refObject = ((_f = (_e = this.apiDocument.components) === null || _e === void 0 ? void 0 : _e.schemas) !== null && _f !== void 0 ? _f : {})[refName];
-        var defaultValue = (schemaWrapperInfo.componentSchemaObject.default || (refObject === null || refObject === void 0 ? void 0 : refObject.default) || ((refObject === null || refObject === void 0 ? void 0 : refObject.enum) || [])[0]);
+    }
+    getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo) {
+        const typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
+        const schemaObject = schemaWrapperInfo?.componentSchemaObject?.properties?.[propertyName];
+        const maxLength = schemaWrapperInfo.propertySchemaObject.maxLength;
+        const minLength = schemaWrapperInfo.propertySchemaObject.minLength;
+        const minValue = schemaWrapperInfo.propertySchemaObject.minimum;
+        const email = schemaWrapperInfo.propertySchemaObject.format?.toLowerCase() === 'email';
+        const refName = schemaObject?.$ref || schemaObject.items?.$ref;
+        const refObject = this.apiDocument.components?.schemas?.[refName];
+        const defaultValue = (schemaWrapperInfo.componentSchemaObject.default || refObject?.default || (refObject?.enum || [])[0]);
         if (defaultValue && refObject.enum && schemaObject.type === 'array') {
-            return "[".concat(schemaWrapperInfo.propertyReferenceObject['$ref'], ".").concat(defaultValue.split(' ').pop(), "]");
+            return `[${schemaWrapperInfo.propertyReferenceObject['$ref']}.${defaultValue.split(' ').pop()}]`;
         }
         else if (defaultValue && refObject.enum) {
-            return "".concat(schemaWrapperInfo.propertyReferenceObject['$ref'], ".").concat(defaultValue.split(' ').pop());
+            return `${schemaWrapperInfo.propertyReferenceObject['$ref']}.${defaultValue.split(' ').pop()}`;
         }
         else if (refObject) {
-            return schemaObject.type === 'array' ? "[]" : "undefined";
+            return schemaObject.type === 'array' ? `[]` : `undefined`;
         }
         else if (defaultValue) {
-            return "'".concat(defaultValue.split(' ').pop(), "'");
+            return `'${defaultValue.split(' ').pop()}'`;
         }
         else if (email) {
-            return "'".concat((0, lodash_1.kebabCase)(parentTypeName), "@email.org'");
+            return `'${(0, lodash_1.kebabCase)(parentTypeName)}@email.org'`;
         }
         else if (typescriptType === 'Date') {
             return 'new Date()';
@@ -239,65 +235,66 @@ var OpenApiDocConverter = /** @class */ (function () {
             return 'false';
         }
         else if (typescriptType === 'number' && schemaObject.type === 'array') {
-            return minValue ? "[".concat(minValue, "]") : '[0]';
+            return minValue ? `[${minValue}]` : '[0]';
         }
         else if (schemaObject.type === 'array') {
-            return defaultValue ? "[".concat(defaultValue, "]") : '[]';
+            return defaultValue ? `[${defaultValue}]` : '[]';
         }
         else if (typescriptType === 'number') {
-            return minValue ? "".concat(minValue) : '0';
+            return minValue ? `${minValue}` : '0';
         }
         else {
-            var retValue = (0, lodash_1.snakeCase)(propertyName).toUpperCase();
+            let retValue = (0, lodash_1.snakeCase)(propertyName).toUpperCase();
             while (minLength && retValue.length < minLength) {
-                retValue = "".concat(retValue, "_").concat(retValue);
+                retValue = `${retValue}_${retValue}`;
             }
-            return "'".concat(maxLength ? retValue.substring(0, maxLength) : retValue, "'");
+            return `'${maxLength ? retValue.substring(0, maxLength) : retValue}'`;
         }
-    };
-    OpenApiDocConverter.prototype.convertArrayObjectToReferencePropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var refProperty = __assign(__assign({}, this.convertReferenceObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo)), { isArray: true });
+    }
+    convertArrayObjectToReferencePropertyType(parentTypeName, propertyName, schemaWrapperInfo) {
+        const refProperty = {
+            ...this.convertReferenceObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo),
+            isArray: true,
+        };
         refProperty.isEnumAndArray = refProperty.isEnum && refProperty.isArray;
         return refProperty;
-    };
-    OpenApiDocConverter.prototype.convertReferenceObjectToPropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var _a, _b, _c;
-        var propertySchema = (((_a = this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[this.parseRef(schemaWrapperInfo)];
-        var refSchema = (((_b = schemaWrapperInfo === null || schemaWrapperInfo === void 0 ? void 0 : schemaWrapperInfo.componentSchemaObject) === null || _b === void 0 ? void 0 : _b.properties) || {})[propertyName];
-        var required = this.getIsRequired(propertyName, schemaWrapperInfo);
-        var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
-        var initialValue = this.options.genAngularFormGroupsWithDefaultValues
+    }
+    convertReferenceObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo) {
+        const propertySchema = this.apiDocument.components?.schemas?.[this.parseRef(schemaWrapperInfo)];
+        const refSchema = schemaWrapperInfo?.componentSchemaObject?.properties?.[propertyName];
+        const required = this.getIsRequired(propertyName, schemaWrapperInfo);
+        const validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
+        const initialValue = this.options.genAngularFormGroupsWithDefaultValues
             ? this.getInitialValue(propertyName, schemaWrapperInfo)
             : 'undefined';
-        var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
-        var typeName = this.parseRef(schemaWrapperInfo);
+        const initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
+        const typeName = this.parseRef(schemaWrapperInfo);
         return {
-            required: required,
+            required,
             name: propertyName,
             isSameAsParentTypescriptType: parentTypeName.toLowerCase() === typeName.toLowerCase(),
-            initialValue: initialValue,
-            initialTestValue: initialTestValue,
+            initialValue,
+            initialTestValue,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             referenceTypeName: typeName,
             typeScriptType: typeName,
             isArray: false,
-            isEnum: ((_c = propertySchema === null || propertySchema === void 0 ? void 0 : propertySchema.enum) !== null && _c !== void 0 ? _c : []).length > 0,
+            isEnum: (propertySchema?.enum ?? []).length > 0,
             isEnumAndArray: false,
             hasValidators: validatorCount > 0,
             hasMultipleValidators: validatorCount > 1,
-            maxLength: refSchema === null || refSchema === void 0 ? void 0 : refSchema.maxLength,
-            minLength: refSchema === null || refSchema === void 0 ? void 0 : refSchema.minLength,
-            maximum: refSchema === null || refSchema === void 0 ? void 0 : refSchema.maximum,
-            minimum: refSchema === null || refSchema === void 0 ? void 0 : refSchema.minimum,
-            minItems: refSchema === null || refSchema === void 0 ? void 0 : refSchema.minItems,
-            maxItems: refSchema === null || refSchema === void 0 ? void 0 : refSchema.maxItems,
+            maxLength: refSchema?.maxLength,
+            minLength: refSchema?.minLength,
+            maximum: refSchema?.maximum,
+            minimum: refSchema?.minimum,
+            minItems: refSchema?.minItems,
+            maxItems: refSchema?.maxItems,
         };
-    };
-    OpenApiDocConverter.prototype.getValidatorCount = function (propertyName, schemaWrapperInfo) {
-        var _a, _b;
-        var required = this.getIsRequired(propertyName, schemaWrapperInfo);
-        var email = ((_a = schemaWrapperInfo.propertySchemaObject.format) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'email' || false;
-        var uri = ((_b = schemaWrapperInfo.propertySchemaObject.format) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'uri' || false;
+    }
+    getValidatorCount(propertyName, schemaWrapperInfo) {
+        const required = this.getIsRequired(propertyName, schemaWrapperInfo);
+        const email = schemaWrapperInfo.propertySchemaObject.format?.toLowerCase() === 'email' || false;
+        const uri = schemaWrapperInfo.propertySchemaObject.format?.toLowerCase() === 'uri' || false;
         return (+required +
             +email +
             +uri +
@@ -308,11 +305,10 @@ var OpenApiDocConverter = /** @class */ (function () {
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.maxItems) +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.minItems) +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.pattern));
-    };
-    OpenApiDocConverter.prototype.getPropertyTypeScriptType = function (schemaWrapperInfo) {
-        var _a;
+    }
+    getPropertyTypeScriptType(schemaWrapperInfo) {
         if (schemaWrapperInfo.propertySchemaObject.type === 'array' && schemaWrapperInfo.propertySchemaObject.items) {
-            var type = schemaWrapperInfo.propertySchemaObject.items.type;
+            const type = schemaWrapperInfo.propertySchemaObject.items.type;
             return type === 'integer' ? 'number' : type;
         }
         else if (schemaWrapperInfo.propertySchemaObject.type === 'integer' && schemaWrapperInfo.propertySchemaObject.enum) {
@@ -324,11 +320,11 @@ var OpenApiDocConverter = /** @class */ (function () {
         else if (schemaWrapperInfo.propertySchemaObject.format === 'date' || schemaWrapperInfo.propertySchemaObject.format === 'date-time') {
             return 'Date';
         }
-        return (_a = schemaWrapperInfo.propertySchemaObject.type) !== null && _a !== void 0 ? _a : 'string';
-    };
-    OpenApiDocConverter.prototype.parseRef = function (schemaWrapperInfo) {
-        var regexResult;
-        var result = null;
+        return schemaWrapperInfo.propertySchemaObject.type ?? 'string';
+    }
+    parseRef(schemaWrapperInfo) {
+        let regexResult;
+        let result = null;
         if (schemaWrapperInfo.propertyReferenceObject.$ref &&
             // tslint:disable-next-line: no-conditional-assignment
             (regexResult = this.endAlphaNumRegex.exec(schemaWrapperInfo.propertyReferenceObject.$ref)) // NOSONAR
@@ -337,37 +333,38 @@ var OpenApiDocConverter = /** @class */ (function () {
             result = schemaWrapperInfo.propertyReferenceObject.$ref;
         }
         return result || 'unknown';
-    };
-    OpenApiDocConverter.prototype.getImportTypes = function (entityName, schemaWrapperInfo) {
-        var _a;
-        var _this = this;
-        var _b, _c, _d;
-        var schemaProperties = (_d = ((_c = (_b = this.apiDocument.components) === null || _b === void 0 ? void 0 : _b.schemas) !== null && _c !== void 0 ? _c : (_a = {}, _a[entityName] = { properties: {} }, _a))[entityName].properties) !== null && _d !== void 0 ? _d : {};
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        var properties = Object.keys(schemaProperties).map(function (key) { return (__assign(__assign({ key: key }, schemaProperties[key]), { $ref: schemaProperties[key].$ref, items: schemaProperties[key].items || {}, type: schemaProperties[key].type })); });
+    }
+    getImportTypes(entityName, schemaWrapperInfo) {
+        const schemaProperties = (this.apiDocument.components?.schemas ?? { [entityName]: { properties: {} } })[entityName].properties ?? {};
+        const properties = Object.keys(schemaProperties).map((key) => ({
+            key,
+            ...schemaProperties[key],
+            $ref: schemaProperties[key].$ref,
+            items: schemaProperties[key].items || {},
+            type: schemaProperties[key].type,
+        }));
         return schemaWrapperInfo.referenceProperties
-            .map(function (t) { return t.referenceTypeName; })
-            .filter(function (value, index, array) { return array.indexOf(value) === index; })
-            .map(function (value) {
-            var _a, _b;
-            var refSchema = (((_a = _this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[value];
-            var props = properties.filter(function (t) { return t.items.$ref === value || t.$ref === value; });
+            .map((t) => t.referenceTypeName)
+            .filter((value, index, array) => array.indexOf(value) === index)
+            .map((value) => {
+            const refSchema = this.apiDocument.components?.schemas?.[value];
+            const props = properties.filter((t) => t.items.$ref === value || t.$ref === value);
             return {
                 name: value,
                 kebabCasedTypeName: (0, lodash_1.kebabCase)(value),
-                isEnum: ((_b = refSchema === null || refSchema === void 0 ? void 0 : refSchema.enum) !== null && _b !== void 0 ? _b : []).length > 0,
-                areAllArrays: props.every(function (val) { return val.type === 'array'; }),
-                hasArrays: props.some(function (val) { return val.type === 'array'; }),
+                isEnum: (refSchema?.enum ?? []).length > 0,
+                areAllArrays: props.every((val) => val.type === 'array'),
+                hasArrays: props.some((val) => val.type === 'array'),
                 isSelfReferencing: entityName === value,
             };
         });
-    };
-    OpenApiDocConverter.prototype.getIsRequired = function (propertyName, schemaWrapperInfo) {
-        var _a;
-        return ((((_a = schemaWrapperInfo.componentSchemaObject.required) !== null && _a !== void 0 ? _a : []).indexOf(propertyName) > -1 ||
-            (schemaWrapperInfo.propertySchemaObject.nullable === undefined ? false : !schemaWrapperInfo.propertySchemaObject.nullable)) &&
+    }
+    getIsRequired(propertyName, schemaWrapperInfo) {
+        return (((schemaWrapperInfo.componentSchemaObject.required ?? []).includes(propertyName) ||
+            (schemaWrapperInfo.propertySchemaObject.nullable === undefined
+                ? false
+                : !schemaWrapperInfo.propertySchemaObject.nullable)) &&
             propertyName !== 'id');
-    };
-    return OpenApiDocConverter;
-}());
+    }
+}
 exports.OpenApiDocConverter = OpenApiDocConverter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-generator",
-  "version": "9.24.2",
+  "version": "9.31.2",
   "description": "Based on swagger-ts-generator, this is a type script model generator specifically for services with OpenApi spec documentation.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -49,37 +49,38 @@
   ],
   "homepage": "https://github.com/ikemtz/OpenApi-TS-Generator#readme",
   "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.15",
-    "@types/node": "^20.11.21",
+    "@eslint/js": "^9.39.2",
+    "@types/jest": "^30.0.0",
+    "@types/lodash": "^4.17.23",
+    "@types/node": "^22.19.7",
     "@types/pluralize": "^0.0.33",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
-    "@typescript-eslint/parser": "^7.1.0",
-    "eslint": "8.56",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.31.0",
+    "@typescript-eslint/eslint-plugin": "^8.54.0",
+    "@typescript-eslint/parser": "^8.54.0",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.6.0",
-    "jest": "^29.7.0",
+    "eslint-plugin-promise": "^7.2.1",
+    "jest": "^30.2.0",
     "jest-junit": "^16.0.0",
-    "openapi3-ts": "^4.4.0",
-    "prettier": "^3.5.2",
+    "jest-util": "^30.2.0",
+    "openapi3-ts": "^4.5.0",
+    "prettier": "^3.8.1",
     "rxjs": "^7.6.0",
-    "ts-jest": "^29.2.6",
-    "typescript": "^4.9.5"
+    "ts-jest": "^29.4.6",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.54.0"
   },
   "dependencies": {
-    "axios": ">=1.12.2",
+    "axios": ">=1.13.x",
     "handlebars": ">=4.x",
-    "lodash": ">=4.17.23",
-    "pluralize": "^8.0.0"
+    "lodash": "^4.17.23",
+    "pluralize": ">=8.x"
   },
   "peerDependencies": {
-    "axios": ">=1.x",
+    "axios": ">=1.13.x",
     "handlebars": ">=4.x",
-    "lodash": ">=4.x",
-    "rxjs": "*",
-    "pluralize": "^8.0.0"
+    "pluralize": ">=8.x",
+    "rxjs": "*"
   }
 }