openapi-ts-generator 5.225.9 → 5.225.11

package/openapidoc-converter.d.ts

@@ -12,15 +12,15 @@ export declare class OpenApiDocConverter {
     convertPaths(): IPath[];
     convertEntities(): IEntity[];
     buildSchemaWrapperInfoForEnum(schemaWrapperInfo: SchemaWrapperInfo): void;
-    buildSchemaWrapperInfo(parentTypeName: string, schemaWrapperInfo: SchemaWrapperInfo): void;
-    convertArray(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): void;
-    convertSchemaObjectToPropertyType(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
+    buildSchemaWrapperInfo(schemaWrapperInfo: SchemaWrapperInfo): void;
+    convertArray(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): void;
+    convertSchemaObjectToPropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
     private convertValidator;
-    convertArrayObjectToValuePropertyType(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
+    convertArrayObjectToValuePropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
     getInitialValue(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): string;
-    getInitialTestValue(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): string;
-    convertArrayObjectToReferencePropertyType(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IReferenceProperty;
-    convertReferenceObjectToPropertyType(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IReferenceProperty;
+    getInitialTestValue(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): string;
+    convertArrayObjectToReferencePropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IReferenceProperty;
+    convertReferenceObjectToPropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IReferenceProperty;
     getValidatorCount(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): number;
     getPropertyTypeScriptType(schemaWrapperInfo: SchemaWrapperInfo): string;
     parseRef(schemaWrapperInfo: SchemaWrapperInfo): string;

package/openapidoc-converter.js

@@ -52,7 +52,7 @@ var OpenApiDocConverter = /** @class */ (function () {
                     this.buildSchemaWrapperInfoForEnum(schemaWrapperInfo);
                 }
                 else {
-                    this.buildSchemaWrapperInfo(schemaName, schemaWrapperInfo);
+                    this.buildSchemaWrapperInfo(schemaWrapperInfo);
                 }
                 schemaWrapperInfo.updateReferenceProperties(this.options);
                 var entity = {
@@ -84,38 +84,38 @@ var OpenApiDocConverter = /** @class */ (function () {
             return { key: key ? +key : 0, name: name, titleName: (0, lodash_1.startCase)(name) };
         }));
     };
-    OpenApiDocConverter.prototype.buildSchemaWrapperInfo = function (parentTypeName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.buildSchemaWrapperInfo = function (schemaWrapperInfo) {
         for (var 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));
+                schemaWrapperInfo.valueProperties.push(this.convertSchemaObjectToPropertyType(propertyName, schemaWrapperInfo));
             }
             else {
                 schemaWrapperInfo.propertyReferenceObject = schemaWrapperInfo.componentSchemaObject.properties[propertyName];
                 if (schemaWrapperInfo.propertyReferenceObject.$ref) {
-                    schemaWrapperInfo.referenceProperties.push(this.convertReferenceObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo));
+                    schemaWrapperInfo.referenceProperties.push(this.convertReferenceObjectToPropertyType(propertyName, schemaWrapperInfo));
                 }
                 else if (schemaWrapperInfo.propertySchemaObject.type === 'array' && schemaWrapperInfo.propertySchemaObject.items) {
-                    this.convertArray(parentTypeName, propertyName, schemaWrapperInfo);
+                    this.convertArray(propertyName, schemaWrapperInfo);
                 }
             }
         }
     };
-    OpenApiDocConverter.prototype.convertArray = function (parentTypeName, propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertArray = function (propertyName, schemaWrapperInfo) {
         var arraySchemaObject = schemaWrapperInfo.propertySchemaObject.items;
         if (arraySchemaObject.type) {
-            schemaWrapperInfo.valueProperties.push(this.convertArrayObjectToValuePropertyType(parentTypeName, propertyName, schemaWrapperInfo));
+            schemaWrapperInfo.valueProperties.push(this.convertArrayObjectToValuePropertyType(propertyName, schemaWrapperInfo));
         }
         else {
             schemaWrapperInfo.propertyReferenceObject = schemaWrapperInfo.propertySchemaObject.items;
-            schemaWrapperInfo.referenceProperties.push(this.convertArrayObjectToReferencePropertyType(parentTypeName, propertyName, schemaWrapperInfo));
+            schemaWrapperInfo.referenceProperties.push(this.convertArrayObjectToReferencePropertyType(propertyName, schemaWrapperInfo));
         }
     };
-    OpenApiDocConverter.prototype.convertSchemaObjectToPropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertSchemaObjectToPropertyType = function (propertyName, schemaWrapperInfo) {
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
         var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
         var initialValue = this.getInitialValue(propertyName, schemaWrapperInfo);
-        var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
+        var initialTestValue = this.getInitialTestValue(propertyName, schemaWrapperInfo);
         return {
             required: required,
             name: propertyName,
@@ -140,11 +140,11 @@ var OpenApiDocConverter = /** @class */ (function () {
         var exists = validationValue !== null && validationValue !== undefined;
         return +exists;
     };
-    OpenApiDocConverter.prototype.convertArrayObjectToValuePropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertArrayObjectToValuePropertyType = function (propertyName, schemaWrapperInfo) {
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
         var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
         var initialValue = this.getInitialValue(propertyName, schemaWrapperInfo);
-        var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
+        var initialTestValue = this.getInitialTestValue(propertyName, schemaWrapperInfo);
         return {
             required: required,
             typeScriptType: this.getPropertyTypeScriptType(schemaWrapperInfo),
@@ -187,7 +187,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             return "''";
         }
     };
-    OpenApiDocConverter.prototype.getInitialTestValue = function (parentTypeName, propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.getInitialTestValue = function (propertyName, schemaWrapperInfo) {
         var _a, _b, _c;
         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];
@@ -200,11 +200,8 @@ var OpenApiDocConverter = /** @class */ (function () {
         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(), "'");
@@ -221,22 +218,22 @@ var OpenApiDocConverter = /** @class */ (function () {
         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) {
-        return __assign(__assign({}, this.convertReferenceObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo)), { isArray: true });
+    OpenApiDocConverter.prototype.convertArrayObjectToReferencePropertyType = function (propertyName, schemaWrapperInfo) {
+        return __assign(__assign({}, this.convertReferenceObjectToPropertyType(propertyName, schemaWrapperInfo)), { isArray: true });
     };
-    OpenApiDocConverter.prototype.convertReferenceObjectToPropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertReferenceObjectToPropertyType = function (propertyName, schemaWrapperInfo) {
         var _a, _b;
         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.getInitialValue(propertyName, schemaWrapperInfo);
-        var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
+        var initialTestValue = this.getInitialTestValue(propertyName, schemaWrapperInfo);
         var typeName = this.parseRef(schemaWrapperInfo);
         return {
             required: required,

package/package.json

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

@@ -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>({{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}} }),
 {{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>({{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}}),
 {{/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}}