openapi-ts-generator 5.232.1 → 5.258.3

package/generators/enum.generator.d.ts

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

package/generators/form-group-factory.generator.d.ts

@@ -1,5 +1,6 @@
 import { IGeneratorOptions } from '../models/generator-options';
-import { IEntity, ITemplateData } from '../models/template-data';
+import { ITemplateData } from '../models/template-data';
+import { IEntity } from '../models/entity';
 import { BaseGenerator } from './base.generator';
 import { IHelperContext, PropertyType } from '../models/helper-context';
 export declare class FormGroupFactoryGenerator extends BaseGenerator<IEntity> {

package/generators/form.generator.d.ts

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

package/generators/model-properties.generator.d.ts

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

package/generators/model.generator.d.ts

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

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

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

package/models/entity.d.ts

@@ -0,0 +1,18 @@
+import { IReferenceProperty } from './reference-property';
+import { IValueProperty } from './value-property';
+import { IImportType } from './template-data';
+export interface IEntity {
+    isEnum?: boolean;
+    enumValues: (string | {
+        key?: number;
+        name: string;
+        titleName: string;
+    })[];
+    name: string;
+    kebabCasedName: string;
+    camelSingularName: string;
+    description?: string;
+    importTypes: IImportType[];
+    valueProperties: IValueProperty[];
+    referenceProperties: IReferenceProperty[];
+}

package/models/entity.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/generator-options.d.ts

@@ -1,5 +1,7 @@
 import { ILogger } from './logger';
-import { IEntity, IReferenceProperty, IValueProperty } from './template-data';
+import { IEntity } from './entity';
+import { IReferenceProperty } from './reference-property';
+import { IValueProperty } from './value-property';
 export interface IGeneratorOptions {
     logger?: ILogger;
     outputPath: string;

package/models/helper-context.d.ts

@@ -1,4 +1,4 @@
-import { IEntity } from './template-data';
+import { IEntity } from './entity';
 export interface IHelperContext {
     data: {
         root: IEntity;

package/models/nrsrx-filters.d.ts

@@ -1,3 +1,4 @@
-import { IEntity, IValueProperty } from './template-data';
+import { IEntity } from './entity';
+import { IValueProperty } from './value-property';
 export declare function nrsrxTypeFilterCallBack(val: IEntity, _i: number, _arr: IEntity[]): boolean;
 export declare function nrsrxValuePropertyTypeFilterCallBack(val: IValueProperty, _i: number, _arr: IValueProperty[]): boolean;

package/models/reference-property.d.ts

@@ -0,0 +1,20 @@
+export interface IReferenceProperty {
+    name: string;
+    snakeCaseName: string;
+    referenceTypeName: string;
+    typeScriptType: string;
+    hasValidators: boolean;
+    isSameAsParentTypescriptType: boolean;
+    hasMultipleValidators: boolean;
+    maxItems?: number;
+    minItems?: number;
+    maxLength?: number;
+    minLength?: number;
+    maximum?: number;
+    minimum?: number;
+    isArray: boolean;
+    required: boolean;
+    isEnum?: boolean;
+    initialValue: string;
+    initialTestValue: string;
+}

package/models/reference-property.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/models/schema-info.d.ts

@@ -1,6 +1,7 @@
 import { ReferenceObject, SchemaObject } from 'openapi3-ts';
 import { IGeneratorOptions } from './generator-options';
-import { IReferenceProperty, IValueProperty } from './template-data';
+import { IReferenceProperty } from './reference-property';
+import { IValueProperty } from './value-property';
 export declare class SchemaWrapperInfo {
     propertySchemaObject: SchemaObject;
     propertyReferenceObject: ReferenceObject;

package/models/template-data.d.ts

@@ -1,3 +1,4 @@
+import { IEntity } from './entity';
 export interface ITemplateData {
     entities?: IEntity[];
     paths: IPath[];
@@ -6,21 +7,6 @@ export interface IPath {
     tag: string;
     endpoint: string;
 }
-export interface IEntity {
-    isEnum?: boolean;
-    enumValues: (string | {
-        key?: number;
-        name: string;
-        titleName: string;
-    })[];
-    name: string;
-    kebabCasedName: string;
-    camelSingularName: string;
-    description?: string;
-    importTypes: IImportType[];
-    valueProperties: IValueProperty[];
-    referenceProperties: IReferenceProperty[];
-}
 export interface IImportType {
     kebabCasedTypeName: string;
     name: string;
@@ -29,43 +15,3 @@ export interface IImportType {
     hasArrays: boolean;
     isSelfReferencing: boolean;
 }
-export interface IValueProperty {
-    name: string;
-    snakeCaseName: string;
-    typeScriptType: string;
-    isArray: boolean;
-    hasValidators: boolean;
-    hasMultipleValidators: boolean;
-    required: boolean;
-    maxLength?: number;
-    minLength?: number;
-    maximum?: number;
-    minimum?: number;
-    maxItems?: number;
-    minItems?: number;
-    email: boolean;
-    description?: string;
-    pattern?: string;
-    initialValue: string;
-    initialTestValue: string;
-}
-export interface IReferenceProperty {
-    name: string;
-    snakeCaseName: string;
-    referenceTypeName: string;
-    typeScriptType: string;
-    hasValidators: boolean;
-    isSameAsParentTypescriptType: boolean;
-    hasMultipleValidators: boolean;
-    maxItems?: number;
-    minItems?: number;
-    maxLength?: number;
-    minLength?: number;
-    maximum?: number;
-    minimum?: number;
-    isArray: boolean;
-    required: boolean;
-    isEnum?: boolean;
-    initialValue: string;
-    initialTestValue: string;
-}

package/models/value-property.d.ts

@@ -0,0 +1,21 @@
+export interface IValueProperty {
+    name: string;
+    snakeCaseName: string;
+    typeScriptType: string;
+    isArray: boolean;
+    hasValidators: boolean;
+    hasMultipleValidators: boolean;
+    required: boolean;
+    maxLength?: number;
+    minLength?: number;
+    maximum?: number;
+    minimum?: number;
+    maxItems?: number;
+    minItems?: number;
+    email: boolean;
+    uri: boolean;
+    description?: string;
+    pattern?: string;
+    initialValue: string;
+    initialTestValue: string;
+}

package/models/value-property.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/openapidoc-converter.d.ts

@@ -1,7 +1,10 @@
 import { OpenAPIObject } from 'openapi3-ts';
 import { IGeneratorOptions } from './models/generator-options';
 import { SchemaWrapperInfo } from './models/schema-info';
-import { IEntity, IImportType, IPath, IReferenceProperty, ITemplateData, IValueProperty } from './models/template-data';
+import { IImportType, IPath, ITemplateData } from './models/template-data';
+import { IEntity } from './models/entity';
+import { IReferenceProperty } from './models/reference-property';
+import { IValueProperty } from './models/value-property';
 export declare class OpenApiDocConverter {
     private readonly options;
     private readonly apiDocument;

package/openapidoc-converter.js

@@ -112,7 +112,7 @@ var OpenApiDocConverter = /** @class */ (function () {
         }
     };
     OpenApiDocConverter.prototype.convertSchemaObjectToPropertyType = function (parentTypeName, propertyName, schemaWrapperInfo) {
-        var _a;
+        var _a, _b;
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
         var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
         var initialValue = this.getInitialValue(propertyName, schemaWrapperInfo);
@@ -130,6 +130,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             maximum: schemaWrapperInfo.propertySchemaObject.maximum,
             minimum: schemaWrapperInfo.propertySchemaObject.minimum,
             email: ((_a = schemaWrapperInfo.propertySchemaObject.format) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'email',
+            uri: ((_b = schemaWrapperInfo.propertySchemaObject.format) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'uri',
             minItems: schemaWrapperInfo.propertySchemaObject.minItems,
             maxItems: schemaWrapperInfo.propertySchemaObject.maxItems,
             description: schemaWrapperInfo.propertySchemaObject.description,
@@ -154,6 +155,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             initialTestValue: initialTestValue,
             name: propertyName,
             email: false,
+            uri: false,
             isArray: true,
             snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             hasMultipleValidators: false,
@@ -265,11 +267,13 @@ var OpenApiDocConverter = /** @class */ (function () {
         };
     };
     OpenApiDocConverter.prototype.getValidatorCount = function (propertyName, schemaWrapperInfo) {
-        var _a;
+        var _a, _b;
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
         var email = ((_a = schemaWrapperInfo.propertySchemaObject.format) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'email' || false;
+        var uri = ((_b = schemaWrapperInfo.propertySchemaObject.format) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'uri' || false;
         return (+required +
             +email +
+            +uri +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.maxLength) +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.minLength) +
             +this.convertValidator(schemaWrapperInfo.propertySchemaObject.maximum) +

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "openapi-ts-generator",
-  "version": "5.232.1",
+  "version": "5.258.3",
   "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",
   "scripts": {
     "build": "npm run format && npm run lint && tsc && cp -rfv ./src/templates ./lib",
     "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "eslint . --ext .ts --output-file ./eslint-report.json --format json",
+    "lint": "eslint . --ext .ts --output-file ./eslint-report.json --format json && eslint . --ext .ts --output-file ./eslint-report.html --format html ",
     "link": "npm run build && cd lib && npm link && cd ..",
     "test": "npm run build && jest --collect-coverage",
     "prep:lib": "rm -rv ./lib/*.spec.* && rm -rv ./lib/**/*.spec.* && cp -v ./package.json ./lib/ && cp -v ./LICENSE ./lib/ && cp -v ./README.md ./lib/",

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}}{{#if email}}Validators.email, {{/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 | undefined{{/unless}}>({{{initialValue}}}, { validators: Validators.compose([{{#if required}}Validators.required, {{/if}}{{#if email}}Validators.email, {{/if}}{{#if uri}}Validators.pattern('(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?'), {{/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}}{{#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}}),
+    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null | undefined{{/unless}}>({{{initialValue}}}{{#if hasValidators}}, { validators: {{#if required}}Validators.required{{/if}}{{#if email}}Validators.email {{/if}}{{#if uri}}Validators.pattern('(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?') {{/if}}{{minLengthValidator "valueProperties"}}{{maxLengthValidator "valueProperties"}}{{minimumValidator "valueProperties"}}{{maximumValidator "valueProperties"}}{{minItemsValidator "valueProperties"}}{{maxItemsValidator "valueProperties"}}{{{patternValidator "valueProperties"}}}{{#if required}}, nonNullable: true{{/if}} } {{/if}}),
 {{/if}}
 {{/if}}
 {{/valueProperties}}
@@ -38,9 +38,9 @@ export function {{name}}FormGroupFac(): FormGroup<I{{name}}Form> {
 {{/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}} }),
+    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null | undefined{{/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}}),
+    {{name}}: new FormControl<{{typeScriptType}}{{#unless required}} | null| undefined{{/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}}

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 | undefined{{/unless}}>;
 {{/if}}
 {{/valueProperties}}
 {{#referenceProperties}}
-{{#if isArray}} 
-    {{name}}?: FormArray<FormGroup<I{{typeScriptType}}Form>>;
+{{#if isArray}}
+    {{name}}: FormArray<FormGroup<I{{typeScriptType}}Form>>;
 {{else if isEnum}}
-    {{name}}?: FormControl<{{typeScriptType}}{{#unless required}} | null{{/unless}}>;
+    {{name}}: FormControl<{{typeScriptType}}{{#unless required}} | null | undefined{{/unless}}>;
 {{else}}
-    {{name}}?: FormGroup<I{{typeScriptType}}Form>;
+    {{name}}: FormGroup<I{{typeScriptType}}Form>;
 {{/if}}
 {{/referenceProperties}}
 }