openapi-ts-generator 5.223.20 → 5.225.6

package/generators/{barrel-generator.d.ts → barrel.generator.d.ts}

@@ -1,5 +1,5 @@
 import { IGeneratorOptions } from '../models/generator-options';
-import { BaseGenerator } from './base-generator';
+import { BaseGenerator } from './base.generator';
 export declare class BarrelGenerator extends BaseGenerator<{
     fileNames: string[];
 }> {

package/generators/{barrel-generator.js → barrel.generator.js}

@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BarrelGenerator = void 0;
 var fs_1 = require("fs");
-var base_generator_1 = require("./base-generator");
+var base_generator_1 = require("./base.generator");
 var BarrelGenerator = /** @class */ (function (_super) {
     __extends(BarrelGenerator, _super);
     function BarrelGenerator(options) {

package/generators/{endpoints-generator.d.ts → endpoints.generator.d.ts}

@@ -1,6 +1,6 @@
 import { IGeneratorOptions } from '../models/generator-options';
 import { IPath, ITemplateData } from '../models/template-data';
-import { BaseGenerator } from './base-generator';
+import { BaseGenerator } from './base.generator';
 export declare class EndPointsGenerator extends BaseGenerator<{
     paths: IPath[];
 }> {

package/generators/{endpoints-generator.js → endpoints.generator.js}

@@ -36,7 +36,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EndPointsGenerator = void 0;
-var base_generator_1 = require("./base-generator");
+var base_generator_1 = require("./base.generator");
 var _ = require("lodash");
 var EndPointsGenerator = /** @class */ (function (_super) {
     __extends(EndPointsGenerator, _super);

package/generators/{enum-generator.d.ts → enum.generator.d.ts}

@@ -1,6 +1,6 @@
 import { IGeneratorOptions } from '../models/generator-options';
 import { IEntity, ITemplateData } from '../models/template-data';
-import { BaseGenerator } from './base-generator';
+import { BaseGenerator } from './base.generator';
 export declare class EnumGenerator extends BaseGenerator<IEntity> {
     readonly GeneratorName = "EnumGenerator";
     constructor(options: IGeneratorOptions);

package/generators/{enum-generator.js → enum.generator.js}

@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnumGenerator = void 0;
 var _ = require("lodash");
-var base_generator_1 = require("./base-generator");
+var base_generator_1 = require("./base.generator");
 var EnumGenerator = /** @class */ (function (_super) {
     __extends(EnumGenerator, _super);
     function EnumGenerator(options) {

package/generators/{form-group-generator.d.ts → form-group-factory.generator.d.ts}

@@ -1,9 +1,9 @@
 import { IGeneratorOptions } from '../models/generator-options';
 import { IEntity, ITemplateData } from '../models/template-data';
-import { BaseGenerator } from './base-generator';
+import { BaseGenerator } from './base.generator';
 import { IHelperContext, PropertyType } from '../models/helper-context';
-export declare class FormGroupGenerator extends BaseGenerator<IEntity> {
-    readonly GeneratorName = "FormGroupGenerator";
+export declare class FormGroupFactoryGenerator extends BaseGenerator<IEntity> {
+    readonly GeneratorName = "FormGroupFactoryGenerator";
     constructor(options: IGeneratorOptions);
     generate(templateData: ITemplateData): void;
     registerHelpers(): void;

package/generators/{form-group-generator.js → form-group-factory.generator.js}

@@ -15,20 +15,20 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormGroupGenerator = void 0;
+exports.FormGroupFactoryGenerator = void 0;
 var _ = require("lodash");
-var base_generator_1 = require("./base-generator");
+var base_generator_1 = require("./base.generator");
 var HandleBars = require("handlebars");
-var FormGroupGenerator = /** @class */ (function (_super) {
-    __extends(FormGroupGenerator, _super);
-    function FormGroupGenerator(options) {
+var FormGroupFactoryGenerator = /** @class */ (function (_super) {
+    __extends(FormGroupFactoryGenerator, _super);
+    function FormGroupFactoryGenerator(options) {
         var _this = this;
         var _a;
         _this = _super.call(this, options, (_a = options.templates) === null || _a === void 0 ? void 0 : _a.formGroupFactory) || this;
-        _this.GeneratorName = 'FormGroupGenerator';
+        _this.GeneratorName = 'FormGroupFactoryGenerator';
         return _this;
     }
-    FormGroupGenerator.prototype.generate = function (templateData) {
+    FormGroupFactoryGenerator.prototype.generate = function (templateData) {
         var _this = this;
         var _a;
         this.registerHelpers();
@@ -36,7 +36,7 @@ var FormGroupGenerator = /** @class */ (function (_super) {
             _super.prototype.generateFile.call(_this, "".concat(_this.generatorOptions.outputPath, "/").concat(_.kebabCase(entity.name), ".form-group-fac.ts"), entity);
         });
     };
-    FormGroupGenerator.prototype.registerHelpers = function () {
+    FormGroupFactoryGenerator.prototype.registerHelpers = function () {
         this.registerValidatorHelper('minimum', 'min');
         this.registerValidatorHelper('maximum', 'max');
         this.registerValidatorHelper('minLength');
@@ -45,14 +45,14 @@ var FormGroupGenerator = /** @class */ (function (_super) {
         this.registerValidatorHelper('minItems', 'minLength');
         this.registerValidatorHelper('pattern');
     };
-    FormGroupGenerator.prototype.registerValidatorHelper = function (validatorName, angularValidatorName) {
+    FormGroupFactoryGenerator.prototype.registerValidatorHelper = function (validatorName, angularValidatorName) {
         var _this = this;
         if (angularValidatorName === void 0) { angularValidatorName = validatorName; }
         HandleBars.registerHelper("".concat(validatorName, "Validator"), function (x, y) {
             return _this.validatorFactory(x, y, validatorName, angularValidatorName);
         });
     };
-    FormGroupGenerator.prototype.validatorFactory = function (propertyCollection, propertyContext, validationName, angularValidatorFunctionName) {
+    FormGroupFactoryGenerator.prototype.validatorFactory = function (propertyCollection, propertyContext, validationName, angularValidatorFunctionName) {
         var props = propertyContext.data.root[propertyCollection];
         var prop = props[propertyContext.data.index];
         var value = prop[validationName];
@@ -63,6 +63,6 @@ var FormGroupGenerator = /** @class */ (function (_super) {
         }
         return '';
     };
-    return FormGroupGenerator;
+    return FormGroupFactoryGenerator;
 }(base_generator_1.BaseGenerator));
-exports.FormGroupGenerator = FormGroupGenerator;
+exports.FormGroupFactoryGenerator = FormGroupFactoryGenerator;

package/generators/form.generator.d.ts

@@ -0,0 +1,8 @@
+import { IGeneratorOptions } from '../models/generator-options';
+import { IEntity, ITemplateData } from '../models/template-data';
+import { BaseGenerator } from './base.generator';
+export declare class FormGenerator extends BaseGenerator<IEntity> {
+    readonly GeneratorName = "FormGenerator";
+    constructor(options: IGeneratorOptions);
+    generate(templateData: ITemplateData): void;
+}

package/generators/form.generator.js

@@ -0,0 +1,39 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormGenerator = void 0;
+var _ = require("lodash");
+var base_generator_1 = require("./base.generator");
+var FormGenerator = /** @class */ (function (_super) {
+    __extends(FormGenerator, _super);
+    function FormGenerator(options) {
+        var _this = this;
+        var _a;
+        _this = _super.call(this, options, (_a = options.templates) === null || _a === void 0 ? void 0 : _a.form) || this;
+        _this.GeneratorName = 'FormGenerator';
+        return _this;
+    }
+    FormGenerator.prototype.generate = function (templateData) {
+        var _this = this;
+        var _a;
+        (_a = templateData.entities) === null || _a === void 0 ? void 0 : _a.filter(function (val) { var _a, _b; return ((_a = val.valueProperties) === null || _a === void 0 ? void 0 : _a.length) + ((_b = val.referenceProperties) === null || _b === void 0 ? void 0 : _b.length) > 0; }).forEach(function (entity) {
+            _super.prototype.generateFile.call(_this, "".concat(_this.generatorOptions.outputPath, "/").concat(_.kebabCase(entity.name), ".form.ts"), entity);
+        });
+    };
+    return FormGenerator;
+}(base_generator_1.BaseGenerator));
+exports.FormGenerator = FormGenerator;

package/generators/index.d.ts

@@ -1,5 +1,8 @@
-export * from './model-generator';
-export * from './form-group-generator';
-export * from './model-properties-generator';
-export * from './barrel-generator';
-export * from './enum-generator';
+export * from './model.generator';
+export * from './form-group-factory.generator';
+export * from './model-properties.generator';
+export * from './barrel.generator';
+export * from './enum.generator';
+export * from './form.generator';
+export * from './test-object-factory.generator';
+export * from './endpoints.generator';

package/generators/index.js

@@ -14,8 +14,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./model-generator"), exports);
-__exportStar(require("./form-group-generator"), exports);
-__exportStar(require("./model-properties-generator"), exports);
-__exportStar(require("./barrel-generator"), exports);
-__exportStar(require("./enum-generator"), exports);
+__exportStar(require("./model.generator"), exports);
+__exportStar(require("./form-group-factory.generator"), exports);
+__exportStar(require("./model-properties.generator"), exports);
+__exportStar(require("./barrel.generator"), exports);
+__exportStar(require("./enum.generator"), exports);
+__exportStar(require("./form.generator"), exports);
+__exportStar(require("./test-object-factory.generator"), exports);
+__exportStar(require("./endpoints.generator"), exports);

package/generators/{model-properties-generator.d.ts → model-properties.generator.d.ts}

@@ -1,6 +1,6 @@
 import { IGeneratorOptions } from '../models/generator-options';
 import { IEntity, ITemplateData } from '../models/template-data';
-import { BaseGenerator } from './base-generator';
+import { BaseGenerator } from './base.generator';
 export declare class ModelPropertiesGenerator extends BaseGenerator<IEntity> {
     readonly GeneratorName = "ModelPropertiesGenerator";
     constructor(options: IGeneratorOptions);

package/generators/{model-properties-generator.js → model-properties.generator.js}

@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelPropertiesGenerator = void 0;
 var _ = require("lodash");
-var base_generator_1 = require("./base-generator");
+var base_generator_1 = require("./base.generator");
 var ModelPropertiesGenerator = /** @class */ (function (_super) {
     __extends(ModelPropertiesGenerator, _super);
     function ModelPropertiesGenerator(options) {

package/generators/{model-generator.d.ts → model.generator.d.ts}

@@ -1,6 +1,6 @@
 import { IGeneratorOptions } from '../models/generator-options';
 import { IEntity, ITemplateData } from '../models/template-data';
-import { BaseGenerator } from './base-generator';
+import { BaseGenerator } from './base.generator';
 export declare class ModelGenerator extends BaseGenerator<IEntity> {
     readonly GeneratorName = "ModelGenerator";
     constructor(options: IGeneratorOptions);

package/generators/{model-generator.js → model.generator.js}

@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelGenerator = void 0;
 var _ = require("lodash");
-var base_generator_1 = require("./base-generator");
+var base_generator_1 = require("./base.generator");
 var ModelGenerator = /** @class */ (function (_super) {
     __extends(ModelGenerator, _super);
     function ModelGenerator(options) {

package/generators/test-object-factory.generator.d.ts

@@ -0,0 +1,8 @@
+import { IGeneratorOptions } from '../models/generator-options';
+import { IEntity, ITemplateData } from '../models/template-data';
+import { BaseGenerator } from './base.generator';
+export declare class TestObjectFactoryGenerator extends BaseGenerator<IEntity> {
+    readonly GeneratorName = "TestObjectFactoryGenerator";
+    constructor(options: IGeneratorOptions);
+    generate(templateData: ITemplateData): void;
+}

package/generators/test-object-factory.generator.js

@@ -0,0 +1,39 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TestObjectFactoryGenerator = void 0;
+var _ = require("lodash");
+var base_generator_1 = require("./base.generator");
+var TestObjectFactoryGenerator = /** @class */ (function (_super) {
+    __extends(TestObjectFactoryGenerator, _super);
+    function TestObjectFactoryGenerator(options) {
+        var _this = this;
+        var _a;
+        _this = _super.call(this, options, (_a = options.templates) === null || _a === void 0 ? void 0 : _a.testObjectFactory) || this;
+        _this.GeneratorName = 'TestObjectFactoryGenerator';
+        return _this;
+    }
+    TestObjectFactoryGenerator.prototype.generate = function (templateData) {
+        var _this = this;
+        var _a;
+        (_a = templateData.entities) === null || _a === void 0 ? void 0 : _a.filter(function (val) { var _a, _b; return ((_a = val.valueProperties) === null || _a === void 0 ? void 0 : _a.length) + ((_b = val.referenceProperties) === null || _b === void 0 ? void 0 : _b.length) > 0; }).forEach(function (entity) {
+            _super.prototype.generateFile.call(_this, "".concat(_this.generatorOptions.outputPath, "/").concat(_.kebabCase(entity.name), ".test-obj-fac.ts"), entity);
+        });
+    };
+    return TestObjectFactoryGenerator;
+}(base_generator_1.BaseGenerator));
+exports.TestObjectFactoryGenerator = TestObjectFactoryGenerator;

package/index.js

@@ -39,7 +39,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTsModels = exports.nrsrxValuePropertyTypeFilterCallBack = exports.nrsrxTypeFilterCallBack = void 0;
 var fs = require("fs");
 var generators_1 = require("./generators");
-var endpoints_generator_1 = require("./generators/endpoints-generator");
 var generator_options_1 = require("./models/generator-options");
 var openapidoc_converter_1 = require("./openapidoc-converter");
 var axios_1 = require("axios");
@@ -100,15 +99,19 @@ function generateOutput(options, templateData) {
     var modelGenerator = new generators_1.ModelGenerator(options);
     modelGenerator.generate(templateData);
     if (options.genAngularFormGroups) {
-        var formGroupGenerator = new generators_1.FormGroupGenerator(options);
+        var formGroupGenerator = new generators_1.FormGroupFactoryGenerator(options);
         formGroupGenerator.generate(templateData);
+        var formGenerator = new generators_1.FormGenerator(options);
+        formGenerator.generate(templateData);
     }
     var modelPropertiesGenerator = new generators_1.ModelPropertiesGenerator(options);
     modelPropertiesGenerator.generate(templateData);
-    var endpointGenerator = new endpoints_generator_1.EndPointsGenerator(options);
+    var endpointGenerator = new generators_1.EndPointsGenerator(options);
     endpointGenerator.generate(templateData);
     var barrelGenerator = new generators_1.BarrelGenerator(options);
     var enumGenerator = new generators_1.EnumGenerator(options);
     enumGenerator.generate(templateData);
+    var testObjFacGenerator = new generators_1.TestObjectFactoryGenerator(options);
+    testObjFacGenerator.generate(templateData);
     barrelGenerator.generate();
 }

package/models/generator-options.d.ts

@@ -14,11 +14,13 @@ export interface IGeneratorOptions {
 }
 export interface ITemplates {
     model?: string;
+    testObjectFactory?: string;
+    form?: string;
     formGroupFactory?: string;
     modelProperties?: string;
     barrel?: string;
     enum?: string;
     endpoints?: string;
 }
-export declare function defaultFilter(value: IEntity | IValueProperty | IReferenceProperty, index: number, array: IEntity[] | IValueProperty[] | IReferenceProperty[]): boolean;
+export declare function defaultFilter(_value: IEntity | IValueProperty | IReferenceProperty, _index: number, _array: IEntity[] | IValueProperty[] | IReferenceProperty[]): boolean;
 export declare function setGeneratorOptionDefaults(options: IGeneratorOptions): IGeneratorOptions;

package/models/generator-options.js

@@ -14,17 +14,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setGeneratorOptionDefaults = exports.defaultFilter = void 0;
 /* eslint-disable @typescript-eslint/no-unused-vars */
 var path_1 = require("path");
-function defaultFilter(value, index, array) {
+function defaultFilter(_value, _index, _array) {
     return true;
 }
 exports.defaultFilter = defaultFilter;
 function setGeneratorOptionDefaults(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
     var templateFolder = (0, path_1.resolve)("".concat(__dirname, "/.."), 'templates');
     options.typeFilterCallBack = (_a = options.typeFilterCallBack) !== null && _a !== void 0 ? _a : defaultFilter;
     options.valuePropertyTypeFilterCallBack = (_b = options.valuePropertyTypeFilterCallBack) !== null && _b !== void 0 ? _b : defaultFilter;
     options.referencePropertyTypeFilterCallBack = (_c = options.referencePropertyTypeFilterCallBack) !== null && _c !== void 0 ? _c : defaultFilter;
-    options.templates = __assign(__assign({}, options.templates), { model: (_e = (_d = options.templates) === null || _d === void 0 ? void 0 : _d.model) !== null && _e !== void 0 ? _e : "".concat(templateFolder, "/model.ts.hbs"), formGroupFactory: (_g = (_f = options.templates) === null || _f === void 0 ? void 0 : _f.formGroupFactory) !== null && _g !== void 0 ? _g : "".concat(templateFolder, "/form-group-factory.ts.hbs"), barrel: (_j = (_h = options.templates) === null || _h === void 0 ? void 0 : _h.barrel) !== null && _j !== void 0 ? _j : "".concat(templateFolder, "/index.ts.hbs"), enum: (_l = (_k = options.templates) === null || _k === void 0 ? void 0 : _k.barrel) !== null && _l !== void 0 ? _l : "".concat(templateFolder, "/enum.ts.hbs"), modelProperties: (_o = (_m = options.templates) === null || _m === void 0 ? void 0 : _m.barrel) !== null && _o !== void 0 ? _o : "".concat(templateFolder, "/model-properties.ts.hbs"), endpoints: (_q = (_p = options.templates) === null || _p === void 0 ? void 0 : _p.endpoints) !== null && _q !== void 0 ? _q : "".concat(templateFolder, "/endpoints.ts.hbs") });
+    options.templates = __assign(__assign({}, options.templates), { model: (_e = (_d = options.templates) === null || _d === void 0 ? void 0 : _d.model) !== null && _e !== void 0 ? _e : "".concat(templateFolder, "/model.ts.hbs"), form: (_g = (_f = options.templates) === null || _f === void 0 ? void 0 : _f.form) !== null && _g !== void 0 ? _g : "".concat(templateFolder, "/form.ts.hbs"), formGroupFactory: (_j = (_h = options.templates) === null || _h === void 0 ? void 0 : _h.formGroupFactory) !== null && _j !== void 0 ? _j : "".concat(templateFolder, "/form-group-factory.ts.hbs"), testObjectFactory: (_l = (_k = options.templates) === null || _k === void 0 ? void 0 : _k.testObjectFactory) !== null && _l !== void 0 ? _l : "".concat(templateFolder, "/test-object-factory.ts.hbs"), barrel: (_o = (_m = options.templates) === null || _m === void 0 ? void 0 : _m.barrel) !== null && _o !== void 0 ? _o : "".concat(templateFolder, "/index.ts.hbs"), enum: (_q = (_p = options.templates) === null || _p === void 0 ? void 0 : _p.barrel) !== null && _q !== void 0 ? _q : "".concat(templateFolder, "/enum.ts.hbs"), modelProperties: (_s = (_r = options.templates) === null || _r === void 0 ? void 0 : _r.barrel) !== null && _s !== void 0 ? _s : "".concat(templateFolder, "/model-properties.ts.hbs"), endpoints: (_u = (_t = options.templates) === null || _t === void 0 ? void 0 : _t.endpoints) !== null && _u !== void 0 ? _u : "".concat(templateFolder, "/endpoints.ts.hbs") });
     return options;
 }
 exports.setGeneratorOptionDefaults = setGeneratorOptionDefaults;

package/models/template-data.d.ts

@@ -14,6 +14,7 @@ export interface IEntity {
         titleName: string;
     })[];
     name: string;
+    kebabCasedName: string;
     camelSingularName: string;
     description?: string;
     importTypes: IImportType[];
@@ -45,6 +46,7 @@ export interface IValueProperty {
     description?: string;
     pattern?: string;
     initialValue: string;
+    initialTestValue: string;
 }
 export interface IReferenceProperty {
     name: string;
@@ -63,4 +65,5 @@ export interface IReferenceProperty {
     required: boolean;
     isEnum?: boolean;
     initialValue: string;
+    initialTestValue: string;
 }

package/openapidoc-converter.d.ts

@@ -12,14 +12,15 @@ export declare class OpenApiDocConverter {
     convertPaths(): IPath[];
     convertEntities(): IEntity[];
     buildSchemaWrapperInfoForEnum(schemaWrapperInfo: SchemaWrapperInfo): void;
-    buildSchemaWrapperInfo(schemaWrapperInfo: SchemaWrapperInfo): void;
-    convertArray(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): void;
-    convertSchemaObjectToPropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
+    buildSchemaWrapperInfo(parentTypeName: string, schemaWrapperInfo: SchemaWrapperInfo): void;
+    convertArray(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): void;
+    convertSchemaObjectToPropertyType(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
     private convertValidator;
-    convertArrayObjectToValuePropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
+    convertArrayObjectToValuePropertyType(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IValueProperty;
     getInitialValue(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): string;
-    convertArrayObjectToReferencePropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IReferenceProperty;
-    convertReferenceObjectToPropertyType(propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IReferenceProperty;
+    getInitialTestValue(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): string;
+    convertArrayObjectToReferencePropertyType(parentTypeName: string, propertyName: string, schemaWrapperInfo: SchemaWrapperInfo): IReferenceProperty;
+    convertReferenceObjectToPropertyType(parentTypeName: string, 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(schemaWrapperInfo);
+                    this.buildSchemaWrapperInfo(schemaName, schemaWrapperInfo);
                 }
                 schemaWrapperInfo.updateReferenceProperties(this.options);
                 var entity = {
@@ -61,6 +61,7 @@ var OpenApiDocConverter = /** @class */ (function () {
                         return typeof t === 'string' || t instanceof String ? t : __assign(__assign({}, t), { key: t.key || 0 });
                     }),
                     name: schemaName,
+                    kebabCasedName: (0, lodash_1.kebabCase)(schemaName),
                     camelSingularName: (0, lodash_1.camelCase)((0, pluralize_1.singular)(schemaName)),
                     description: schemaWrapperInfo.description,
                     referenceProperties: schemaWrapperInfo.referenceProperties,
@@ -83,41 +84,43 @@ var OpenApiDocConverter = /** @class */ (function () {
             return { key: key ? +key : 0, name: name, titleName: (0, lodash_1.startCase)(name) };
         }));
     };
-    OpenApiDocConverter.prototype.buildSchemaWrapperInfo = function (schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.buildSchemaWrapperInfo = function (parentTypeName, 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(propertyName, schemaWrapperInfo));
+                schemaWrapperInfo.valueProperties.push(this.convertSchemaObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo));
             }
             else {
                 schemaWrapperInfo.propertyReferenceObject = schemaWrapperInfo.componentSchemaObject.properties[propertyName];
                 if (schemaWrapperInfo.propertyReferenceObject.$ref) {
-                    schemaWrapperInfo.referenceProperties.push(this.convertReferenceObjectToPropertyType(propertyName, schemaWrapperInfo));
+                    schemaWrapperInfo.referenceProperties.push(this.convertReferenceObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo));
                 }
                 else if (schemaWrapperInfo.propertySchemaObject.type === 'array' && schemaWrapperInfo.propertySchemaObject.items) {
-                    this.convertArray(propertyName, schemaWrapperInfo);
+                    this.convertArray(parentTypeName, propertyName, schemaWrapperInfo);
                 }
             }
         }
     };
-    OpenApiDocConverter.prototype.convertArray = function (propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertArray = function (parentTypeName, propertyName, schemaWrapperInfo) {
         var arraySchemaObject = schemaWrapperInfo.propertySchemaObject.items;
         if (arraySchemaObject.type) {
-            schemaWrapperInfo.valueProperties.push(this.convertArrayObjectToValuePropertyType(propertyName, schemaWrapperInfo));
+            schemaWrapperInfo.valueProperties.push(this.convertArrayObjectToValuePropertyType(parentTypeName, propertyName, schemaWrapperInfo));
         }
         else {
             schemaWrapperInfo.propertyReferenceObject = schemaWrapperInfo.propertySchemaObject.items;
-            schemaWrapperInfo.referenceProperties.push(this.convertArrayObjectToReferencePropertyType(propertyName, schemaWrapperInfo));
+            schemaWrapperInfo.referenceProperties.push(this.convertArrayObjectToReferencePropertyType(parentTypeName, propertyName, schemaWrapperInfo));
         }
     };
-    OpenApiDocConverter.prototype.convertSchemaObjectToPropertyType = function (propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertSchemaObjectToPropertyType = function (parentTypeName, 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);
         return {
             required: required,
             name: propertyName,
             initialValue: initialValue,
+            initialTestValue: initialTestValue,
             isArray: false,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             typeScriptType: this.getPropertyTypeScriptType(schemaWrapperInfo),
@@ -137,14 +140,16 @@ var OpenApiDocConverter = /** @class */ (function () {
         var exists = validationValue !== null && validationValue !== undefined;
         return +exists;
     };
-    OpenApiDocConverter.prototype.convertArrayObjectToValuePropertyType = function (propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertArrayObjectToValuePropertyType = function (parentTypeName, 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);
         return {
             required: required,
             typeScriptType: this.getPropertyTypeScriptType(schemaWrapperInfo),
             initialValue: initialValue,
+            initialTestValue: initialTestValue,
             name: propertyName,
             isArray: true,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
@@ -182,21 +187,62 @@ var OpenApiDocConverter = /** @class */ (function () {
             return "''";
         }
     };
-    OpenApiDocConverter.prototype.convertArrayObjectToReferencePropertyType = function (propertyName, schemaWrapperInfo) {
-        return __assign(__assign({}, this.convertReferenceObjectToPropertyType(propertyName, schemaWrapperInfo)), { isArray: true });
+    OpenApiDocConverter.prototype.getInitialTestValue = function (parentTypeName, 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];
+        var maxLength = schemaWrapperInfo.propertySchemaObject.maxLength;
+        var minLength = schemaWrapperInfo.propertySchemaObject.minLength;
+        // 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 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 (defaultValue) {
+            return "'".concat(defaultValue.split(' ').pop(), "'");
+        }
+        else if (typescriptType === 'Date') {
+            return 'new Date()';
+        }
+        else if (typescriptType === 'boolean') {
+            return 'false';
+        }
+        else if (typescriptType === 'number') {
+            return '0';
+        }
+        else {
+            var retValue = (0, lodash_1.snakeCase)(propertyName).toUpperCase();
+            while (minLength && retValue.length < minLength) {
+                retValue += retValue;
+            }
+            return "'".concat(maxLength ? (0, lodash_1.snakeCase)(propertyName).toUpperCase().substring(0, maxLength) : (0, lodash_1.snakeCase)(propertyName).toUpperCase(), "'");
+        }
+    };
+    OpenApiDocConverter.prototype.convertArrayObjectToReferencePropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
+        return __assign(__assign({}, this.convertReferenceObjectToPropertyType(parentTypeName, propertyName, schemaWrapperInfo)), { isArray: true });
     };
-    OpenApiDocConverter.prototype.convertReferenceObjectToPropertyType = function (propertyName, schemaWrapperInfo) {
+    OpenApiDocConverter.prototype.convertReferenceObjectToPropertyType = function (parentTypeName, 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 typeName = this.parseRef(schemaWrapperInfo);
         return {
             required: required,
             name: propertyName,
             initialValue: initialValue,
+            initialTestValue: initialTestValue,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             referenceTypeName: typeName,
             typeScriptType: typeName,

package/package.json

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

@@ -6,27 +6,10 @@
  * 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}}{{#unless areAllArrays}}{{#if isEnum}}
+import { FormControl, FormArray, FormGroup, Validators } from '@angular/forms'; //NOSONAR
+import { I{{name}}Form } from './{{kebabCasedName}}.form';{{#if importTypes}}{{#importTypes}}{{#unless isSelfReferencing}}{{#if isEnum}}
 import { {{name}} } from './{{kebabCasedTypeName}}.enum';{{else}}
-import { I{{name}} } from './{{kebabCasedTypeName}}.model';{{/if}}{{/unless}}{{#if hasArrays}}
-import { I{{name}}Form } from './{{kebabCasedTypeName}}.form-group-fac';{{/if}}{{/importTypes}}{{/if}}
-
-export interface I{{name}}Form {
-{{#valueProperties}}
-{{#if isArray}}
-    {{name}}: FormArray<FormControl<{{typeScriptType}}>>;
-{{else}} 
-    {{name}}: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>;
-{{/if}}
-{{/valueProperties}}
-{{#referenceProperties}}
-{{#if isArray}} 
-    {{name}}: FormArray<FormGroup<I{{typeScriptType}}Form>>;
-{{else}} 
-    {{name}}: FormControl<{{#unless isEnum}}I{{/unless}}{{typeScriptType}}{{#unless required}} | null{{/unless}}>;
-{{/if}}
-{{/referenceProperties}}
-}
+import { I{{name}}Form } from './{{kebabCasedTypeName}}.form';{{/if}}{{/unless}}{{/importTypes}}{{/if}}
 
 export function {{name}}FormGroupFac(): FormGroup<I{{name}}Form> {
   return new FormGroup<I{{name}}Form>({
@@ -52,11 +35,17 @@ export function {{name}}FormGroupFac(): FormGroup<I{{name}}Form> {
 {{else}}
     {{name}}: new FormArray<FormGroup<I{{typeScriptType}}Form>>([]{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{minLengthValidator "referenceProperties"}}{{maxLengthValidator "referenceProperties"}}{{minimumValidator "referenceProperties"}}{{maximumValidator "referenceProperties"}}{{minItemsValidator "referenceProperties"}}{{maxItemsValidator "referenceProperties"}}{{{patternValidator "referenceProperties"}}} } {{/if}}),
 {{/if}}
+{{else if isEnum}}
+{{#if hasMultipleValidators}}
+    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}, { 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 FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}{{#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}}
 {{else}}
 {{#if hasMultipleValidators}}
-    {{name}}: new FormControl<{{#unless isEnum}}I{{/unless}}{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}, { 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{{#unless required}} | null{{/unless}}>({{{initialValue}}}, { 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 FormControl<{{#unless isEnum}}I{{/unless}}{{typeScriptType}}{{#unless required}} | null{{/unless}}>({{{initialValue}}}{{#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{{#unless required}} | null{{/unless}}>({{{initialValue}}}{{#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

@@ -0,0 +1,30 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+/* istanbul ignore file */
+/**
+ * This file is generated by the openapi-ts-generator
+ * #form.ts.hbs
+ * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
+ * Do not edit.
+ */
+import { FormControl, FormArray, FormGroup } from '@angular/forms'; //NOSONAR{{#if importTypes}}{{#importTypes}}{{#unless isSelfReferencing}}{{#if isEnum}}
+import { {{name}} } from './{{kebabCasedTypeName}}.enum';{{else}}
+import { I{{name}}Form } from './{{kebabCasedTypeName}}.form-group-fac';{{/if}}{{/unless}}{{/importTypes}}{{/if}}
+
+export interface I{{name}}Form {
+{{#valueProperties}}
+{{#if isArray}}
+    {{name}}: FormArray<FormControl<{{typeScriptType}}>>;
+{{else}} 
+    {{name}}: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>;
+{{/if}}
+{{/valueProperties}}
+{{#referenceProperties}}
+{{#if isArray}} 
+    {{name}}: FormArray<FormGroup<I{{typeScriptType}}Form>>;
+{{else if isEnum}}
+    {{name}}: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>;
+{{else}}
+    {{name}}: FormGroup<I{{typeScriptType}}Form{{#unless required}} | null{{/unless}}>;
+{{/if}}
+{{/referenceProperties}}
+}

package/templates/model.ts.hbs

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

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

@@ -0,0 +1,19 @@
+/* istanbul ignore file */
+/**
+ * This file is generated by the openapi-ts-generator
+ * #test-object-factory.ts.hbs
+ * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
+ * 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.ts';
+import { {{name}}Properties } from './{{kebabCasedName}}.properties.ts';
+
+export function createTest{{name}}(): Partial<I{{name}}> {
+    return { {{#valueProperties}}
+      [{{../name}}Properties.{{snakeCaseName}}]: {{{initialTestValue}}},{{/valueProperties}} {{#referenceProperties}}
+      [{{../name}}Properties.{{snakeCaseName}}]: {{{initialTestValue}}},{{/referenceProperties}}
+    };
+}