openapi-ts-generator 5.225.9 → 5.227.6

package/models/template-data.d.ts

@@ -43,6 +43,7 @@ export interface IValueProperty {
     minimum?: number;
     maxItems?: number;
     minItems?: number;
+    email: boolean;
     description?: string;
     pattern?: string;
     initialValue: string;
@@ -54,6 +55,7 @@ export interface IReferenceProperty {
     referenceTypeName: string;
     typeScriptType: string;
     hasValidators: boolean;
+    isSameAsParentTypescriptType: boolean;
     hasMultipleValidators: boolean;
     maxItems?: number;
     minItems?: number;

package/openapidoc-converter.js

@@ -112,6 +112,7 @@ var OpenApiDocConverter = /** @class */ (function () {
         }
     };
     OpenApiDocConverter.prototype.convertSchemaObjectToPropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
+        var _a;
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
         var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
         var initialValue = this.getInitialValue(propertyName, schemaWrapperInfo);
@@ -128,6 +129,7 @@ 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',
             minItems: schemaWrapperInfo.propertySchemaObject.minItems,
             maxItems: schemaWrapperInfo.propertySchemaObject.maxItems,
             description: schemaWrapperInfo.propertySchemaObject.description,
@@ -151,6 +153,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             initialValue: initialValue,
             initialTestValue: initialTestValue,
             name: propertyName,
+            email: false,
             isArray: true,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             hasMultipleValidators: false,
@@ -188,27 +191,29 @@ var OpenApiDocConverter = /** @class */ (function () {
         }
     };
     OpenApiDocConverter.prototype.getInitialTestValue = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         var typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
         var schemaObject = (((_a = schemaWrapperInfo === null || schemaWrapperInfo === void 0 ? void 0 : schemaWrapperInfo.componentSchemaObject) === null || _a === void 0 ? void 0 : _a.properties) || {})[propertyName];
         var maxLength = schemaWrapperInfo.propertySchemaObject.maxLength;
         var minLength = schemaWrapperInfo.propertySchemaObject.minLength;
+        var minValue = schemaWrapperInfo.propertySchemaObject.minimum;
+        var email = ((_b = schemaWrapperInfo.propertySchemaObject.format) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'email';
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        var refName = schemaObject.$ref || ((_b = schemaObject.items) === null || _b === void 0 ? void 0 : _b.$ref);
-        var refObject = (((_c = this.apiDocument.components) === null || _c === void 0 ? void 0 : _c.schemas) || {})[refName];
+        var refName = schemaObject.$ref || ((_c = schemaObject.items) === null || _c === void 0 ? void 0 : _c.$ref);
+        var refObject = (((_d = this.apiDocument.components) === null || _d === void 0 ? void 0 : _d.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) {
             return "".concat(schemaWrapperInfo.propertyReferenceObject['$ref'], ".").concat(defaultValue.split(' ').pop());
         }
-        else if (refObject && parentTypeName !== refName) {
-            return schemaObject.type === 'array' ? "[createTest".concat(refName, "()]") : "createTest".concat(refName, "()");
-        }
-        else if (refObject && parentTypeName == refName) {
-            return schemaObject.type === 'array' ? "[]" : "null";
+        else if (refObject) {
+            return schemaObject.type === 'array' ? "[]" : "undefined";
         }
         else if (defaultValue) {
             return "'".concat(defaultValue.split(' ').pop(), "'");
         }
+        else if (email) {
+            return "'".concat((0, lodash_1.kebabCase)(parentTypeName), "@email.org'");
+        }
         else if (typescriptType === 'Date') {
             return 'new Date()';
         }
@@ -216,14 +221,14 @@ var OpenApiDocConverter = /** @class */ (function () {
             return 'false';
         }
         else if (typescriptType === 'number') {
-            return '0';
+            return minValue ? "".concat(minValue) : '0';
         }
         else {
             var retValue = (0, lodash_1.snakeCase)(propertyName).toUpperCase();
             while (minLength && retValue.length < minLength) {
-                retValue += retValue;
+                retValue = "".concat(retValue, "_").concat(retValue);
             }
-            return "'".concat(maxLength ? (0, lodash_1.snakeCase)(propertyName).toUpperCase().substring(0, maxLength) : (0, lodash_1.snakeCase)(propertyName).toUpperCase(), "'");
+            return "'".concat(maxLength ? retValue.substring(0, maxLength) : retValue, "'");
         }
     };
     OpenApiDocConverter.prototype.convertArrayObjectToReferencePropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
@@ -241,6 +246,7 @@ var OpenApiDocConverter = /** @class */ (function () {
         return {
             required: required,
             name: propertyName,
+            isSameAsParentTypescriptType: parentTypeName.toLowerCase() === typeName.toLowerCase(),
             initialValue: initialValue,
             initialTestValue: initialTestValue,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
@@ -259,8 +265,11 @@ var OpenApiDocConverter = /** @class */ (function () {
         };
     };
     OpenApiDocConverter.prototype.getValidatorCount = function (propertyName, schemaWrapperInfo) {
+        var _a;
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
+        var email = ((_a = schemaWrapperInfo.propertySchemaObject.format) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'email' || false;
         return (+required +
+            +email +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.maxLength) +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.minLength) +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.maximum) +

package/package.json

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

@@ -23,9 +23,9 @@ export function {{name}}FormGroupFac(): FormGroup<I{{name}}Form> {
 {{/if}}
 {{else}}
 {{#if hasMultipleValidators}}
-    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}, { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}]){{#if required}}, nonNullable: true{{/if}} }),
+    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}, { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{#if email}}Validators.email, {{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}]){{#if required}}, nonNullable: true{{/if}} }),
 {{else}}
-    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
+    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{#if email}}Validators.email {{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
 {{/if}}
 {{/if}}
 {{/valueProperties}}
@@ -44,9 +44,9 @@ export function {{name}}FormGroupFac(): FormGroup<I{{name}}Form> {
 {{/if}}
 {{else}}
 {{#if hasMultipleValidators}}
-    {{name}}: new FormGroup<I{{typeScriptType}}Form{{#unless required}} | null{{/unless}}>({{typeScriptType}}FormGroupFac().controls, { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}]){{#if required}}, nonNullable: true{{/if}} }),
+    {{name}}: new FormGroup<I{{typeScriptType}}Form>({{#if isSameAsParentTypescriptType}}{}{{else}}{{typeScriptType}}FormGroupFac().controls{{/if}}, { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}]){{#if required}}, nonNullable: true{{/if}} }),
 {{else}}
-    {{name}}: new FormGroup<I{{typeScriptType}}Form{{#unless required}} | null{{/unless}}>({{typeScriptType}}FormGroupFac().controls{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
+    {{name}}: new FormGroup<I{{typeScriptType}}Form>({{#if isSameAsParentTypescriptType}}{}{{else}}{{typeScriptType}}FormGroupFac().controls{{/if}}{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
 {{/if}}
 {{/if}}
 {{/referenceProperties}}

package/templates/form.ts.hbs

@@ -13,18 +13,18 @@ import { I{{name}}Form } from './{{kebabCasedTypeName}}.form';{{/if}}{{/unless}}
 export interface I{{name}}Form {
 {{#valueProperties}}
 {{#if isArray}}
-    {{name}}: FormArray<FormControl<{{typeScriptType}}>>;
+    {{name}}?: FormArray<FormControl<{{typeScriptType}}>>;
 {{else}} 
-    {{name}}: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>;
+    {{name}}?: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}} | undefined>;
 {{/if}}
 {{/valueProperties}}
 {{#referenceProperties}}
 {{#if isArray}} 
-    {{name}}: FormArray<FormGroup<I{{typeScriptType}}Form>>;
+    {{name}}?: FormArray<FormGroup<I{{typeScriptType}}Form>>;
 {{else if isEnum}}
-    {{name}}: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>;
+    {{name}}?: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}} | undefined>;
 {{else}}
-    {{name}}: FormGroup<I{{typeScriptType}}Form{{#unless required}} | null{{/unless}}>;
+    {{name}}?: FormGroup<I{{typeScriptType}}Form>;
 {{/if}}
 {{/referenceProperties}}
 }

package/templates/model.ts.hbs

@@ -22,9 +22,9 @@ export interface I{{{name}}} {
 {{/valueProperties}}
 {{#referenceProperties}}
 {{#if isEnum}}
-  {{name}}?: {{referenceTypeName}}{{#if isArray}}[]{{/if}}{{#unless required}} | null{{/unless}};
+  {{name}}?: {{referenceTypeName}}{{#if isArray}}[]{{/if}};
 {{else}}
-  {{name}}?: Partial<I{{referenceTypeName}}{{#if isArray}}[]{{/if}}>{{#unless required}} | null{{/unless}};
+  {{name}}?: Partial<I{{referenceTypeName}}{{#if isArray}}[]{{/if}}>;
 {{/if}}
 {{/referenceProperties}}
 }

package/templates/test-object-factory.ts.hbs

@@ -6,12 +6,10 @@
  * Do not edit.
  */
 {{#if importTypes}}{{#importTypes}}{{#unless isSelfReferencing}}{{#if isEnum}}
-import { {{name}} } from './{{kebabCasedTypeName}}.enum';{{else}}
-import { createTest{{name}} } from './{{kebabCasedTypeName}}.test-obj-fac';{{/if}}{{/unless}}{{/importTypes}}{{/if}}
-import { I{{name}} } from './{{kebabCasedName}}.model';
+import { {{name}} } from './{{kebabCasedTypeName}}.enum';{{/if}}{{/unless}}{{/importTypes}}{{/if}}
 import { {{name}}Properties } from './{{kebabCasedName}}.properties';
 
-export function createTest{{name}}(): Partial<I{{name}}> {
+export function createTest{{name}}() {
     return { {{#valueProperties}}
       [{{../name}}Properties.{{snakeCaseName}}]: {{{initialTestValue}}},{{/valueProperties}} {{#referenceProperties}}
       [{{../name}}Properties.{{snakeCaseName}}]: {{{initialTestValue}}},{{/referenceProperties}}