@penkov/swagger-code-gen 1.6.5 → 1.6.7

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 {
@@ -55,9 +57,6 @@ export class Method {
                 }
             });
         });
-        this.body.foreach(b => {
-            console.log(path + ' => body: ' + b.schemaType + ' ' + b.required);
-        });
         this.bodyDescription = option(def.requestBody).flatMap(body => option(body.description));
         const statusCodes = Collection.from(Object.keys(def.responses))
             .map(x => parseInt(x));

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))

package/dist/schemas.js

@@ -20,19 +20,39 @@ export class SchemaFactory {
             return SchemaEnum.fromDefinition(name, def);
         }
         else if (def.type === 'string') {
-            return Property.fromDefinition(name, def, schemasTypes, options);
+            return Property.fromDefinition(name, {
+                ...def,
+                required: option(def.required).filter(x => typeof x === 'boolean')
+                    .map(x => x).orUndefined
+            }, schemasTypes, options);
         }
         else if (def.type === 'boolean') {
-            return Property.fromDefinition(name, def, schemasTypes, options);
+            return Property.fromDefinition(name, {
+                ...def,
+                required: option(def.required).filter(x => typeof x === 'boolean')
+                    .map(x => x).orUndefined
+            }, schemasTypes, options);
         }
         else if (def.type === 'integer') {
-            return Property.fromDefinition(name, def, schemasTypes, options);
+            return Property.fromDefinition(name, {
+                ...def,
+                required: option(def.required).filter(x => typeof x === 'boolean')
+                    .map(x => x).orUndefined
+            }, schemasTypes, options);
         }
         else if (def.type === 'array') {
-            return Property.fromDefinition(name, def, schemasTypes, options);
+            return Property.fromDefinition(name, {
+                ...def,
+                required: option(def.required).filter(x => typeof x === 'boolean')
+                    .map(x => x).orUndefined
+            }, schemasTypes, options);
         }
         else {
-            return Property.fromDefinition(name, def, schemasTypes, options);
+            return Property.fromDefinition(name, {
+                ...def,
+                required: option(def.required).filter(x => typeof x === 'boolean')
+                    .map(x => x).orUndefined
+            }, schemasTypes, options);
         }
     }
 }
@@ -58,7 +78,14 @@ export class SchemaObject {
         this.schemaType = 'object';
     }
     static fromDefinition(name, def, schemasTypes, options) {
-        const properties = Collection.from(Object.keys(def.properties)).map(p => Property.fromDefinition(p, def.properties[p], schemasTypes, options));
+        const explicitlyRequired = option(def.required)
+            .map(arr => typeof arr === 'boolean' ? Nil : Collection.from(arr));
+        const properties = Collection.from(Object.keys(def.properties)).map(propName => {
+            const property = Property.fromDefinition(propName, def.properties[propName], schemasTypes, options);
+            return property.copy({
+                required: explicitlyRequired.exists(c => c.contains(propName)) ? true : property.required
+            });
+        });
         return new SchemaObject(name, def.title, def.type, properties);
     }
 }

package/dist/templates/scats-method.ejs

@@ -39,6 +39,8 @@ 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) { -%>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "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 http://localhost:3000/-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"
   }
 }