@penkov/swagger-code-gen 1.6.4 → 1.6.6

package/dist/method.js

@@ -37,6 +37,7 @@ export class Method {
         });
         this.body = option(def.requestBody).flatMap(body => option(body.content))
             .flatMap(body => {
+            const bodyRequired = option(def.requestBody.required).contains(true);
             const mimeTypes = Collection.from(Object.keys(body));
             return mimeTypes
                 .find(_ => _ === 'application/json')
@@ -47,7 +48,8 @@ export class Method {
                 if (res.schemaType === 'property') {
                     const bProperty = res;
                     return bProperty.copy({
-                        nullable: bProperty.referencesObject ? option(bodySchemaDef['nullable']).contains(true) : bProperty.nullable
+                        nullable: bProperty.referencesObject ? option(bodySchemaDef['nullable']).contains(true) : bProperty.nullable,
+                        required: bodyRequired
                     });
                 }
                 else {
@@ -69,7 +71,8 @@ export class Method {
         this.response = mimeTypes.get('application/json')
             .orElseValue(mimeTypes.values.headOption)
             .map(p => Property.fromDefinition('', p.schema, schemasTypes, options).copy({
-            nullable: false
+            nullable: false,
+            required: true
         }))
             .map(r => ({
             asProperty: r,

package/dist/property.js

@@ -34,7 +34,7 @@ export class Property {
         const nullable = option(definition.nullable).contains(true) ||
             (referencesObject && options.referencedObjectsNullableByDefault && !option(definition.nullable).contains(false));
         const description = option(definition.description);
-        const required = option(definition.required).contains(false);
+        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))
@@ -48,7 +48,11 @@ export class Property {
         return new Property(name, type, description, null, nullable, required, items, referencesObject, itemReferencesObject);
     }
     get jsType() {
-        return Property.toJsType(this.type, this.items);
+        let res = Property.toJsType(this.type, this.items);
+        if (this.nullable) {
+            res = res + '| null';
+        }
+        return res;
     }
     get isArray() {
         return this.type === 'array';
@@ -75,7 +79,7 @@ export class Property {
     }
     get scatsWrapperType() {
         if (this.referencesObject) {
-            return this.nullable ? `Option<${this.type}Dto>` : `${this.type}Dto`;
+            return !this.nullable && this.required ? `${this.type}Dto` : `Option<${this.type}Dto>`;
         }
         else if (this.isArray) {
             if (this.itemReferencesObject) {
@@ -86,7 +90,7 @@ export class Property {
             }
         }
         else {
-            return this.nullable ? `Option<${this.jsType}>` : this.jsType;
+            return !this.nullable && this.required ? this.jsType : `Option<${this.jsType}>`;
         }
     }
 }

package/dist/templates/method.ejs

@@ -31,7 +31,7 @@ export async function <%= method.endpointName %>(
     },
     <%_ } -%>
     <%_ if (method.body.nonEmpty) { -%>
-    body: <%- method.body.get.jsType %>,
+    body<%= method.body.get.required ? '' : '?'%>: <%- method.body.get.jsType %>,
     <%_ } -%>
     requestOptions: RequestOptions = defReqOpts()
 ): Promise<<%- method.response.responseType %>> {

package/dist/templates/scats-method.ejs

@@ -39,8 +39,12 @@ export class ApiClient {
                     body.map(_ => _.toJson).toArray,
                     <%_ } else if (body.isArray && !body.itemReferencesObject) { -%>
                     body.toArray,
+                    <%_ } else if (body.referencesObject && !body.required) { -%>
+                    body.map(b => b.toJson).orUndefined,
                     <%_ } else if (body.referencesObject) { -%>
                     body.toJson,
+                    <%_ } else if (!body.required) { -%>
+                    body.orUndefined,
                     <%_ } else { -%>
                     body,
                     <%_ } -%>

package/dist/templates/scats-schema.ejs

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

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.required ? '?' : '' %>: <%- p.jsType %>;
     <%_ }); -%>
 }
 <%_ } if (schema.schemaType === 'enum') { -%>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"
@@ -22,7 +22,7 @@
   },
   "homepage": "https://github.com/papirosko/swagger-code-gen#readme",
   "scripts": {
-    "test:petstore": "npm run build && mkdir -p tmp && ts-node-esm ./dist/cli.mjs --enableScats --targetNode --url https://petstore3.swagger.io/api/v3/openapi.json tmp/petstore.ts",
+    "test:petstore": "node --loader ts-node/esm ./src/cli.mjs --enableScats --targetNode --url https://petstore3.swagger.io/api/v3/openapi.json tmp/petstore.ts",
     "clean": "rimraf dist",
     "lint": "eslint \"{src,test}/**/*.ts\" --fix",
     "prebuild": "npm run lint && npm run clean",
@@ -43,7 +43,7 @@
     "@typescript-eslint/parser": "^5.10.2",
     "eslint": "^7.30.0",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "typescript": "^4.9.3"
   }
 }