openapi-ts-generator 5.221.5 → 5.223.2

package/models/template-data.d.ts

@@ -46,6 +46,7 @@ export interface IReferenceProperty {
     snakeCaseName: string;
     referenceTypeName: string;
     typeScriptType: string;
+    kebabCasedTypeScriptType: string;
     hasValidators: boolean;
     isArray: boolean;
     required: boolean;

package/openapidoc-converter.js

@@ -155,14 +155,19 @@ var OpenApiDocConverter = /** @class */ (function () {
         var _a, _b;
         var typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
         var isRequired = this.getIsRequired(propertyName, schemaWrapperInfo);
-        var defaultValue = (schemaWrapperInfo.componentSchemaObject.default ||
-            ((_b = (((_a = this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[schemaWrapperInfo.propertyReferenceObject['$ref']]) === null || _b === void 0 ? void 0 : _b.default));
-        if (defaultValue) {
-            return "'".concat(defaultValue.split(' ').pop(), "'");
-        }
-        else if (!isRequired) {
+        // 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 (!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 (typescriptType === 'Date') {
             return 'new Date()';
         }
@@ -185,13 +190,15 @@ var OpenApiDocConverter = /** @class */ (function () {
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
         var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
         var initialValue = this.getInitialValue(propertyName, schemaWrapperInfo);
+        var typeName = this.parseRef(schemaWrapperInfo);
         return {
             required: required,
             name: propertyName,
             initialValue: initialValue,
             snakeCaseName: _.snakeCase(propertyName).toUpperCase(),
-            referenceTypeName: this.parseRef(schemaWrapperInfo),
-            typeScriptType: this.parseRef(schemaWrapperInfo),
+            referenceTypeName: typeName,
+            typeScriptType: typeName,
+            kebabCasedTypeScriptType: (0, lodash_1.kebabCase)(typeName),
             isArray: false,
             isEnum: (propertySchema.enum || []).length > 0,
             hasValidators: validatorCount > 0,

package/package.json

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

package/templates/form-group-factory.ts.hbs

@@ -6,9 +6,9 @@
  * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
  * Do not edit.
  */
-import { FormControl, FormArray, FormGroup, Validators } from '@angular/forms'; //NOSONAR{{#if importTypes}}{{#importTypes}}{{#if isEnum}}
-import { {{name}} } from './{{kebabCasedTypeName}}.enum'; //NOSONAR{{else}}
-import { I{{name}} } from './{{kebabCasedTypeName}}.model'; //NOSONAR{{/if}}{{/importTypes}}{{/if}}
+import { FormControl, FormArray, FormGroup, Validators } from '@angular/forms'; //NOSONAR{{#referenceProperties}}{{#unless isArray}}{{#if isEnum}}
+import { {{typeScriptType}} } from './{{kebabCasedTypeScriptType}}.enum';{{else}}
+import { I{{typeScriptType}} } from './{{kebabCasedTypeScriptType}}.model';{{/if}}{{/unless}}{{/referenceProperties}}
 
 export function {{name}}FormGroupFac(): FormGroup {
   return new FormGroup({