@penkov/swagger-code-gen 1.8.0 → 1.8.1

package/dist/property.js

@@ -19,12 +19,12 @@ export class Property {
     copy(p) {
         return new Property(option(p.name).getOrElseValue(this.name), option(p.type).getOrElseValue(this.type), option(p.format).getOrElseValue(this.format), option(p.description).getOrElseValue(this.description), option(p.defaultValue).getOrElseValue(this.defaultValue), option(p.nullable).getOrElseValue(this.nullable), option(p.required).getOrElseValue(this.required), option(p.items).getOrElseValue(this.items), option(p.referencesObject).getOrElseValue(this.referencesObject), option(p.itemReferencesObject).getOrElseValue(this.itemReferencesObject), option(p.enumValues).getOrElseValue(this.enumValues));
     }
-    static fromDefinition(name, definition, schemas, options) {
+    static fromDefinition(name, definition, schemaTypes, options) {
         const referencesObject = option(definition.$ref)
-            .exists(ref => schemas.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));
+            .exists(ref => schemaTypes.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));
         const itemReferencesObject = option(definition.items)
             .flatMap(i => option(i.$ref))
-            .exists(ref => schemas.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));
+            .exists(ref => schemaTypes.get(ref.substring(SCHEMA_PREFIX.length)).contains('object'));
         const type = option(definition.$ref)
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
             .orElse(() => option(definition.allOf)
@@ -109,10 +109,14 @@ export class Property {
             default: return NameUtils.normaliseClassname(tpe);
         }
     }
+    get normalType() {
+        return NameUtils.normaliseClassname(this.type);
+    }
     get itemScatsWrapperType() {
         if (this.isArray) {
             if (this.itemReferencesObject) {
-                return `${this.items}Dto`;
+                const cls = NameUtils.normaliseClassname(this.items);
+                return `${cls}Dto`;
             }
             else {
                 return Property.toJsType(this.items);
@@ -124,11 +128,13 @@ export class Property {
     }
     get scatsWrapperType() {
         if (this.referencesObject) {
-            return !this.nullable && this.required ? `${this.type}Dto` : `Option<${this.type}Dto>`;
+            const cls = NameUtils.normaliseClassname(this.type);
+            return !this.nullable && this.required ? `${cls}Dto` : `Option<${cls}Dto>`;
         }
         else if (this.isArray) {
             if (this.itemReferencesObject) {
-                return `Collection<${this.items}Dto>`;
+                const cls = NameUtils.normaliseClassname(this.items);
+                return `Collection<${cls}Dto>`;
             }
             else {
                 return `Collection<${Property.toJsType(this.items)}>`;

package/dist/schemas.js

@@ -3,7 +3,7 @@ import { Property } from './property.js';
 import { NameUtils } from './name.utils.js';
 export class SchemaFactory {
     static resolveSchemaType(def) {
-        if (def.type === 'object') {
+        if (def.type === 'object' || option(def.properties).exists(p => Object.keys(p).length > 0)) {
             return 'object';
         }
         else if (def.enum) {

package/dist/templates/scats-schema.ejs

@@ -15,7 +15,7 @@ export class <%= schema.normalName %>Dto {
             <%_ if (p.required && !p.nullable) { _%>
             <%- p.scatsWrapperType %>.fromJson(json.<%= p.name %>),
             <%_ } else { _%>
-            option(json.<%= p.name %>).map(_ => <%- p.type %>Dto.fromJson(_)),
+            option(json.<%= p.name %>).map(_ => <%- p.normalType %>Dto.fromJson(_)),
             <%_ } _%>
             <%_ } else if (p.isArray) { _%>
             Collection.from(option(json.<%= p.name %>).getOrElseValue([]))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"