openapi-ts-generator 5.222.2 → 5.223.2

package/openapidoc-converter.js

@@ -152,20 +152,22 @@ var OpenApiDocConverter = /** @class */ (function () {
         };
     };
     OpenApiDocConverter.prototype.getInitialValue = function (propertyName, schemaWrapperInfo) {
-        var _a;
+        var _a, _b;
         var typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
         var isRequired = this.getIsRequired(propertyName, schemaWrapperInfo);
-        var refObject = (((_a = this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[schemaWrapperInfo.propertyReferenceObject['$ref']];
+        // 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]);
-        if (defaultValue && refObject.enum) {
+        if (!isRequired) {
+            return 'null';
+        }
+        else if (defaultValue && refObject.enum) {
             return "".concat(schemaWrapperInfo.propertyReferenceObject['$ref'], ".").concat(defaultValue.split(' ').pop());
         }
         else if (defaultValue) {
             return "'".concat(defaultValue.split(' ').pop(), "'");
         }
-        else if (!isRequired) {
-            return 'null';
-        }
         else if (typescriptType === 'Date') {
             return 'new Date()';
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-generator",
-  "version": "5.222.2",
+  "version": "5.223.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",