@penkov/swagger-code-gen 1.6.6 → 1.6.8

package/dist/property.js

@@ -30,9 +30,23 @@ export class Property {
             .map(x => x.flatMapOption(oneOfItem => option(oneOfItem.$ref)
             .map(ref => ref.substring(SCHEMA_PREFIX.length))
             .orElseValue(option(oneOfItem.type))).mkString(' & ')))
+            .orElse(() => option(definition.anyOf)
+            .map(x => Collection.from(x))
+            .filter(x => x.nonEmpty)
+            .map(x => {
+            return x
+                .filter(t => t.type !== 'null')
+                .flatMapOption(oneOfItem => option(oneOfItem.$ref)
+                .map(ref => ref.substring(SCHEMA_PREFIX.length))
+                .orElseValue(option(oneOfItem.type))).mkString(' | ');
+        }))
             .getOrElseValue(definition.type);
         const nullable = option(definition.nullable).contains(true) ||
-            (referencesObject && options.referencedObjectsNullableByDefault && !option(definition.nullable).contains(false));
+            (referencesObject && options.referencedObjectsNullableByDefault && !option(definition.nullable).contains(false)) ||
+            option(definition.anyOf)
+                .map(x => Collection.from(x))
+                .filter(x => x.nonEmpty)
+                .exists(anyOf => anyOf.exists(t => t.type === 'null'));
         const description = option(definition.description);
         const required = option(definition.required).contains(true);
         const items = option(definition.items?.$ref)
@@ -50,7 +64,7 @@ export class Property {
     get jsType() {
         let res = Property.toJsType(this.type, this.items);
         if (this.nullable) {
-            res = res + '| null';
+            res = res + ' | null';
         }
         return res;
     }
@@ -90,7 +104,8 @@ export class Property {
             }
         }
         else {
-            return !this.nullable && this.required ? this.jsType : `Option<${this.jsType}>`;
+            const jsType = Property.toJsType(this.type, this.items);
+            return !this.nullable && this.required ? this.jsType : `Option<${jsType}>`;
         }
     }
 }

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/package.json

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