openapi-ts-generator 7.284.4 → 7.339.2

package/enums/enum-helpers.d.ts

@@ -0,0 +1,4 @@
+import { IEnumValue } from './enum-value';
+export declare function getEnumKey(data: IEnumValue[], lookupValue: number | string): number | undefined;
+export declare function getEnumDisplayText(data: IEnumValue[], lookupValue: number | string): string | undefined;
+export declare function getEnum(data: IEnumValue[], looupValue: number | string): IEnumValue | undefined;

package/enums/enum-helpers.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnum = exports.getEnumDisplayText = exports.getEnumKey = void 0;
+function getEnumKey(data, lookupValue) {
+    var _a;
+    return (_a = getEnum(data, lookupValue)) === null || _a === void 0 ? void 0 : _a.key;
+}
+exports.getEnumKey = getEnumKey;
+function getEnumDisplayText(data, lookupValue) {
+    var _a;
+    return (_a = getEnum(data, lookupValue)) === null || _a === void 0 ? void 0 : _a.displayText;
+}
+exports.getEnumDisplayText = getEnumDisplayText;
+function getEnum(data, looupValue) {
+    return data.find(function (f) { return f.name === looupValue || f.key === looupValue; });
+}
+exports.getEnum = getEnum;

package/{interfaces → enums}/index.d.ts

@@ -1,2 +1,3 @@
 export * from './enum-value';
 export * from './enum-properties';
+export * from './enum-helpers';

package/{interfaces → enums}/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./enum-value"), exports);
 __exportStar(require("./enum-properties"), exports);
+__exportStar(require("./enum-helpers"), exports);

package/models/generator-options.d.ts

@@ -9,6 +9,7 @@ export interface IGeneratorOptions {
     openApiJsonUrl?: string;
     openApiJsonFileName?: string;
     genAngularFormGroups?: boolean;
+    genAngularFormGroupsWithDefaultValues?: boolean;
     genClasses?: boolean;
     typeFilterCallBack?: (entity: IEntity, index: number, array: IEntity[]) => boolean;
     valuePropertyTypeFilterCallBack?: (valueProperty: IValueProperty, index: number, array: IValueProperty[]) => boolean;

package/openapidoc-converter.js

@@ -58,9 +58,10 @@ var OpenApiDocConverter = /** @class */ (function () {
                 var entity = {
                     isEnum: schemaWrapperInfo.isEnum,
                     enumValues: schemaWrapperInfo.enumValues.map(function (t) {
+                        var _a;
                         return typeof t === 'string' || t instanceof String
                             ? t
-                            : __assign(__assign({}, t), { key: t.key || 0 });
+                            : __assign(__assign({}, t), { key: (_a = t.key) !== null && _a !== void 0 ? _a : 0 });
                     }),
                     name: schemaName,
                     kebabCasedName: (0, lodash_1.kebabCase)(schemaName),
@@ -123,7 +124,9 @@ var OpenApiDocConverter = /** @class */ (function () {
         var _a, _b;
         var required = this.getIsRequired(propertyName, schemaWrapperInfo);
         var validatorCount = this.getValidatorCount(propertyName, schemaWrapperInfo);
-        var initialValue = this.getInitialValue(propertyName, schemaWrapperInfo);
+        var initialValue = this.options.genAngularFormGroupsWithDefaultValues
+            ? this.getInitialValue(propertyName, schemaWrapperInfo)
+            : 'undefined';
         var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
         return {
             required: required,
@@ -154,7 +157,9 @@ var OpenApiDocConverter = /** @class */ (function () {
     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 initialValue = this.options.genAngularFormGroupsWithDefaultValues
+            ? this.getInitialValue(propertyName, schemaWrapperInfo)
+            : 'undefined';
         var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
         return {
             required: required,
@@ -230,6 +235,12 @@ var OpenApiDocConverter = /** @class */ (function () {
         else if (typescriptType === 'boolean') {
             return 'false';
         }
+        else if (typescriptType === 'number' && schemaObject.type === 'array') {
+            return minValue ? "[".concat(minValue, "]") : '[0]';
+        }
+        else if (schemaObject.type === 'array') {
+            return defaultValue ? "[".concat(defaultValue, "]") : '[]';
+        }
         else if (typescriptType === 'number') {
             return minValue ? "".concat(minValue) : '0';
         }
@@ -250,7 +261,9 @@ var OpenApiDocConverter = /** @class */ (function () {
         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 initialValue = this.options.genAngularFormGroupsWithDefaultValues
+            ? this.getInitialValue(propertyName, schemaWrapperInfo)
+            : 'undefined';
         var initialTestValue = this.getInitialTestValue(parentTypeName, propertyName, schemaWrapperInfo);
         var typeName = this.parseRef(schemaWrapperInfo);
         return {
@@ -293,7 +306,8 @@ var OpenApiDocConverter = /** @class */ (function () {
     OpenApiDocConverter.prototype.getPropertyTypeScriptType = function (schemaWrapperInfo) {
         var _a;
         if (schemaWrapperInfo.propertySchemaObject.type === 'array' && schemaWrapperInfo.propertySchemaObject.items) {
-            return schemaWrapperInfo.propertySchemaObject.items.type;
+            var type = schemaWrapperInfo.propertySchemaObject.items.type;
+            return type === 'integer' ? 'number' : type;
         }
         else if (schemaWrapperInfo.propertySchemaObject.type === 'integer' && schemaWrapperInfo.propertySchemaObject.enum) {
             return 'string | number';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-generator",
-  "version": "7.284.4",
+  "version": "7.339.2",
   "description": "Based on swagger-ts-generator, this is a type script model generator specifically for services with OpenApi spec documentation.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -10,10 +10,10 @@
       "require": "./index.js",
       "types": "./index.d.ts"
     },
-    "./interfaces": {
-      "import": "./interfaces/index.js",
-      "require": "./interfaces/index.js",
-      "types": "./interfaces/index.d.ts"
+    "./enums": {
+      "import": "./enums/index.js",
+      "require": "./enums/index.js",
+      "types": "./enums/index.d.ts"
     }
   },
   "scripts": {

package/templates/endpoints.ts.hbs

@@ -5,7 +5,7 @@
  * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
  * Do not edit.
  */
-/* tslint:disable */
+/* eslint-disable */
 export enum Endpoints {
 {{#paths}}
   {{tag}} = '{{endpoint}}',

package/templates/enum.ts.hbs

@@ -5,7 +5,7 @@
  * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
  * Do not edit.
  */
-import { IEnumValue } from 'openapi-ts-generator/interfaces';
+import { IEnumValue } from 'openapi-ts-generator/enums';
 
 {{#if description}}/**
  * {{description}}

package/templates/index.ts.hbs

@@ -5,7 +5,7 @@
  * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
  * Do not edit.
  */
-/* tslint:disable */
+/* eslint-disable */
 {{#fileNames}}
 export * from './{{this}}';
 {{/fileNames}}

package/templates/model-properties.ts.hbs

@@ -5,7 +5,7 @@
  * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
  * Do not edit.
  */
-/* tslint:disable */
+/* eslint-disable */
 {{#if description}}/**
  * {{description}}
  */