openapi-ts-generator 5.221.3 → 5.222.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

@@ -152,12 +152,15 @@ var OpenApiDocConverter = /** @class */ (function () {
         };
     };
     OpenApiDocConverter.prototype.getInitialValue = function (propertyName, schemaWrapperInfo) {
-        var _a, _b;
+        var _a;
         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) {
+        var refObject = (((_a = this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[schemaWrapperInfo.propertyReferenceObject['$ref']];
+        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) {
+            return "".concat(schemaWrapperInfo.propertyReferenceObject['$ref'], ".").concat(defaultValue.split(' ').pop());
+        }
+        else if (defaultValue) {
             return "'".concat(defaultValue.split(' ').pop(), "'");
         }
         else if (!isRequired) {
@@ -185,13 +188,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.3",
+  "version": "5.222.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({
@@ -17,7 +17,7 @@ export function {{name}}FormGroupFac(): FormGroup {
 {{#if hasMultipleValidators}}
     {{name}}: new FormControl([], { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}]) })),
 {{else}}
-    {{name}}: new FormControl([]{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}{{#if required}}, nonNullable: true{{/if}} }{{/if}}),
+    {{name}}: new FormControl([]{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{{patternValidator "valueProperties"}}} }{{/if}}),
 {{/if}}
 {{else}}
 {{#if hasMultipleValidators}}
@@ -30,9 +30,9 @@ export function {{name}}FormGroupFac(): FormGroup {
 {{#referenceProperties}}
 {{#if isArray}}
 {{#if hasMultipleValidators}}
-    {{name}}: new FormArray([], { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}]){{#if required}}, nonNullable: true{{/if}} }),
+    {{name}}: new FormArray([], { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}]) }),
 {{else}}
-    {{name}}: new FormArray([]{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
+    {{name}}: new FormArray([]{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}} } {{/if}}),
 {{/if}}
 {{else}}
 {{#if hasMultipleValidators}}