openapi-ts-generator 5.221.7 → 5.223.4

package/models/template-data.d.ts

@@ -24,6 +24,8 @@ export interface IImportType {
     kebabCasedTypeName: string;
     name: string;
     isEnum: boolean;
+    areAllArrays: boolean;
+    isSelfReferencing: boolean;
 }
 export interface IValueProperty {
     name: string;
@@ -46,7 +48,6 @@ export interface IReferenceProperty {
     snakeCaseName: string;
     referenceTypeName: string;
     typeScriptType: string;
-    kebabCasedTypeScriptType: string;
     hasValidators: boolean;
     isArray: boolean;
     required: boolean;

package/openapidoc-converter.js

@@ -14,7 +14,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenApiDocConverter = void 0;
 var generator_options_1 = require("./models/generator-options");
 var schema_info_1 = require("./models/schema-info");
-var _ = require("lodash");
 var pluralize_1 = require("pluralize");
 var lodash_1 = require("lodash");
 var OpenApiDocConverter = /** @class */ (function () {
@@ -37,7 +36,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             tagLookup = tagLookup || path.delete || path.patch;
             var tag = ((tagLookup === null || tagLookup === void 0 ? void 0 : tagLookup.tags) || ['unknown_endpoint'])[0];
             paths.push({
-                tag: _.snakeCase(tag),
+                tag: (0, lodash_1.snakeCase)(tag),
                 endpoint: this.options.pathUrlFormattingCallBack ? this.options.pathUrlFormattingCallBack(key) : key,
             });
         }
@@ -81,7 +80,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             var _a, _b;
             var key = (_a = _this.startNumberregex.exec(x)) === null || _a === void 0 ? void 0 : _a.at(0);
             var name = ((_b = _this.endAlphaNumRegex.exec(x)) === null || _b === void 0 ? void 0 : _b.at(0)) || '';
-            return { key: key ? +key : 0, name: name, titleName: _.startCase(name) };
+            return { key: key ? +key : 0, name: name, titleName: (0, lodash_1.startCase)(name) };
         }));
     };
     OpenApiDocConverter.prototype.buildSchemaWrapperInfo = function (schemaWrapperInfo) {
@@ -120,7 +119,7 @@ var OpenApiDocConverter = /** @class */ (function () {
             name: propertyName,
             initialValue: initialValue,
             isArray: false,
-            snakeCaseName: _.snakeCase(propertyName).toUpperCase(),
+            snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             typeScriptType: this.getPropertyTypeScriptType(schemaWrapperInfo),
             maxLength: schemaWrapperInfo.propertySchemaObject.maxLength,
             minLength: schemaWrapperInfo.propertySchemaObject.minLength,
@@ -146,23 +145,28 @@ var OpenApiDocConverter = /** @class */ (function () {
             initialValue: initialValue,
             name: propertyName,
             isArray: true,
-            snakeCaseName: _.snakeCase(propertyName).toUpperCase(),
+            snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             hasMultipleValidators: false,
             hasValidators: validatorCount > 0,
         };
     };
     OpenApiDocConverter.prototype.getInitialValue = function (propertyName, schemaWrapperInfo) {
-        var _a;
+        var _a, _b;
         var typescriptType = this.getPropertyTypeScriptType(schemaWrapperInfo);
         var isRequired = this.getIsRequired(propertyName, schemaWrapperInfo);
-        var refObject = (((_a = this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[schemaWrapperInfo.propertyReferenceObject['$ref']];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        var refName = (((_a = schemaWrapperInfo === null || schemaWrapperInfo === void 0 ? void 0 : schemaWrapperInfo.componentSchemaObject) === null || _a === void 0 ? void 0 : _a.properties) || {})[propertyName].$ref;
+        var refObject = (((_b = this.apiDocument.components) === null || _b === void 0 ? void 0 : _b.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) {
-            return "'".concat(defaultValue.split(' ').pop(), "'");
-        }
-        else if (!isRequired) {
+        if (!isRequired) {
             return 'null';
         }
+        else if (defaultValue && refObject.enum) {
+            return "".concat(schemaWrapperInfo.propertyReferenceObject['$ref'], ".").concat(defaultValue.split(' ').pop());
+        }
+        else if (defaultValue) {
+            return "'".concat(defaultValue.split(' ').pop(), "'");
+        }
         else if (typescriptType === 'Date') {
             return 'new Date()';
         }
@@ -190,10 +194,9 @@ var OpenApiDocConverter = /** @class */ (function () {
             required: required,
             name: propertyName,
             initialValue: initialValue,
-            snakeCaseName: _.snakeCase(propertyName).toUpperCase(),
+            snakeCaseName: (0, lodash_1.snakeCase)(propertyName).toUpperCase(),
             referenceTypeName: typeName,
             typeScriptType: typeName,
-            kebabCasedTypeScriptType: (0, lodash_1.kebabCase)(typeName),
             isArray: false,
             isEnum: (propertySchema.enum || []).length > 0,
             hasValidators: validatorCount > 0,
@@ -237,17 +240,23 @@ var OpenApiDocConverter = /** @class */ (function () {
     };
     OpenApiDocConverter.prototype.getImportTypes = function (entityName, schemaWrapperInfo) {
         var _this = this;
+        var _a;
+        var schemaProperties = (((_a = this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || { properties: {} })[entityName].properties || {};
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        var properties = Object.keys(schemaProperties).map(function (key) { return (__assign(__assign({ key: key }, schemaProperties[key]), { $ref: schemaProperties[key].$ref, items: schemaProperties[key].items || {}, type: schemaProperties[key].type })); });
         return schemaWrapperInfo.referenceProperties
             .map(function (t) { return t.referenceTypeName; })
-            .filter(function (t) { return t !== entityName; })
             .filter(function (value, index, array) { return array.indexOf(value) === index; })
             .map(function (value) {
             var _a;
-            var propertySchema = (((_a = _this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[value];
+            var refSchema = (((_a = _this.apiDocument.components) === null || _a === void 0 ? void 0 : _a.schemas) || {})[value];
+            var props = properties.filter(function (t) { return t.items.$ref === value || t.$ref === value; });
             return {
                 name: value,
-                kebabCasedTypeName: _.kebabCase(value),
-                isEnum: (propertySchema.enum || []).length > 0,
+                kebabCasedTypeName: (0, lodash_1.kebabCase)(value),
+                isEnum: (refSchema.enum || []).length > 0,
+                areAllArrays: props.every(function (val) { return val.type === 'array'; }),
+                isSelfReferencing: entityName === value,
             };
         });
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-ts-generator",
-  "version": "5.221.7",
+  "version": "5.223.4",
   "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,9 +6,9 @@
  * 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{{#referenceProperties}}{{#unless isArray}}{{#if isEnum}}
-import { {{typeScriptType}} } from './{{kebabCasedTypeScriptType}}.enum';{{else}}
-import { I{{typeScriptType}} } from './{{kebabCasedTypeScriptType}}.model';{{/if}}{{/unless}}{{/referenceProperties}}
+import { FormControl, FormArray, FormGroup, Validators } from '@angular/forms'; //NOSONAR{{#if importTypes}}{{#importTypes}}{{#unless areAllArrays}}{{#if isEnum}}
+import { {{name}} } from './{{kebabCasedTypeName}}.enum';{{else}}
+import { I{{name}} } from './{{kebabCasedTypeName}}.model';{{/if}}{{/unless}}{{/importTypes}}{{/if}}
 
 export function {{name}}FormGroupFac(): FormGroup {
   return new FormGroup({

package/templates/model.ts.hbs

@@ -5,9 +5,9 @@
  * For issues or feature request, visit the repo: https://github.com/ikemtz/openapi-ts-generator
  * Do not edit.
  */
-{{#if importTypes}}{{#importTypes}}{{#if isEnum}}
+{{#if importTypes}}{{#importTypes}}{{#unless isSelfReferencing}}{{#if isEnum}}
 import { {{name}} } from './{{kebabCasedTypeName}}.enum';{{else}}
-import { I{{name}} } from './{{kebabCasedTypeName}}.model';{{/if}}{{/importTypes}}
+import { I{{name}} } from './{{kebabCasedTypeName}}.model';{{/if}}{{/unless}}{{/importTypes}}
 
 {{/if}}{{#if description}}/**
  * {{description}}