@penkov/swagger-code-gen 1.1.1 → 1.1.2

package/dist/property.js

@@ -1,4 +1,4 @@
-import { identity, option } from 'scats';
+import { Collection, option } from 'scats';
 const SCHEMA_PREFIX = '#/components/schemas/';
 export class Property {
     constructor(name, type, description, defaultValue, nullable, required, items, referencesObject, itemReferencesObject) {
@@ -22,12 +22,18 @@ export class Property {
         const type = option(definition.$ref)
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
             .getOrElseValue(definition.type);
-        const nullable = option(definition.nullable).exists(identity);
+        const nullable = option(definition.nullable).contains(true);
         const description = option(definition.description);
-        const required = option(definition.required).exists(identity);
+        const required = option(definition.required).contains(true);
         const items = option(definition.items?.$ref)
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
             .orElseValue(option(definition.items?.type))
+            .orElse(() => option(definition.items?.oneOf)
+            .map(x => Collection.from(x))
+            .filter(x => x.nonEmpty)
+            .map(x => x.flatMapOption(oneOfItem => option(oneOfItem.$ref)
+            .map(ref => ref.substring(SCHEMA_PREFIX.length))
+            .orElseValue(option(oneOfItem.type))).mkString(' | ')))
             .getOrElseValue('any');
         return new Property(name, type, description, null, nullable, required, items, referencesObject, itemReferencesObject);
     }
@@ -40,7 +46,7 @@ export class Property {
     static toJsType(tpe, itemTpe = 'any') {
         switch (tpe) {
             case 'integer': return 'number';
-            case 'array': return `readonly ${Property.toJsType(itemTpe)}[]`;
+            case 'array': return `ReadonlyArray<${Property.toJsType(itemTpe)}>`;
             default: return tpe;
         }
     }
@@ -62,7 +68,12 @@ export class Property {
             return this.nullable ? `Option<${this.type}Dto>` : `${this.type}Dto`;
         }
         else if (this.isArray) {
-            return this.itemReferencesObject ? `Collection<${this.items}Dto>` : `Collection<${Property.toJsType(this.items)}>`;
+            if (this.itemReferencesObject) {
+                return `Collection<${this.items}Dto>`;
+            }
+            else {
+                return `Collection<${Property.toJsType(this.items)}>`;
+            }
         }
         else {
             return this.nullable ? `Option<${this.jsType}>` : this.jsType;

package/dist/templates/method.ejs

@@ -16,12 +16,12 @@
 export async function <%= method.endpointName %>(
     <%_ if (method.parameters.size <= 2) { -%>
     <%_ method.parameters.foreach(p => { -%>
-    <%= p.uniqueName %><%= p.required ? '' : '?'%>: <%= p.jsType %>,
+    <%= p.uniqueName %><%= p.required ? '' : '?'%>: <%- p.jsType %>,
     <%_ }) -%>
     <%_ } else { -%>
     params: {
         <%_ method.parameters.foreach(p => { -%>
-        <%= p.uniqueName %><%= p.required ? '' : '?'%>: <%= p.jsType %>,
+        <%= p.uniqueName %><%= p.required ? '' : '?'%>: <%- p.jsType %>,
         <%_ }) -%>
     },
     <%_ } -%>
@@ -29,7 +29,7 @@ export async function <%= method.endpointName %>(
     body: <%= method.body.get.type %>,
     <%_ } -%>
     requestOptions: RequestOptions = defaultRequestOptions()
-): Promise<<%= method.response.responseType %>> {
+): Promise<<%- method.response.responseType %>> {
     let query = '';
     <%_ if (method.parameters.filter(x => x.in === 'query').nonEmpty) { -%>
     const queryParams = [];
@@ -72,7 +72,7 @@ export async function <%= method.endpointName %>(
             .map(cb => cb(preprocessed, resp))
             .getOrElseValue(resp);
         const json = await postprocessed.json();
-        return json as <%= method.response.responseType %>;
+        return json as <%- method.response.responseType %>;
     } else {
         throw resp;
     }

package/dist/templates/scats-method.ejs

@@ -13,7 +13,7 @@ export class ApiClient {
         <%_ } else { -%>
         params: {
             <%_ method.parameters.foreach(p => { -%>
-            <%= p.uniqueName %><%= p.required && !p.nullable ? '' : '?'%>: <%= p.jsType %>,
+            <%= p.uniqueName %><%= p.required && !p.nullable ? '' : '?'%>: <%- p.jsType %>,
             <%_ }) -%>
         },
         <%_ } -%>

package/dist/templates/scats-schema.ejs

@@ -12,7 +12,11 @@ export class <%= schema.name %>Dto {
         return new <%= schema.name %>Dto(
             <%_ schema.properties.foreach(p => { _%>
             <%_ if (p.referencesObject) { _%>
+            <%_ if (p.required || !p.nullable) { _%>
             <%- p.scatsWrapperType %>.fromJson(json.<%= p.name %>),
+            <%_ } else { _%>
+            option(json.<%= p.name %>).map(_ => <%- p.scatsWrapperType %>.fromJson(_)),
+            <%_ } _%>
             <%_ } else if (p.isArray) { _%>
             Collection.from(option(json.<%= p.name %>).getOrElseValue([]))
                 <% if (p.itemReferencesObject) { _%>.map(i => <%- p.itemScatsWrapperType %>.fromJson(i))<%_ }  _%>,

package/dist/templates/schema.ejs

@@ -1,7 +1,7 @@
 <%_ if (schema.schemaType === 'object') { -%>
 export interface <%= schema.name %> {
     <%_ schema.properties.foreach(p => { -%>
-    readonly <%= p.name %><%= p.nullable ? '?' : '' %>: <%= p.jsType %>;
+    readonly <%= p.name %><%= p.nullable ? '?' : '' %>: <%- p.jsType %>;
     <%_ }); -%>
 }
 <%_ } if (schema.schemaType === 'enum') { -%>

package/package.json

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