quicktype-core 6.1.4 → 6.1.6

package/dist/TypeGraph.js

@@ -364,7 +364,7 @@ function optionalToNullable(graph, stringTypeMapping, debugPrintReconstitution)
                 const attributes = TypeNames_1.namesTypeAttributeKind.setDefaultInAttributes(t.getAttributes(), () => TypeNames_1.TypeNames.make(new Set([name]), new Set(), true));
                 ref = builder.getUnionType(attributes, members);
             }
-            return builder.makeClassProperty(ref, false);
+            return builder.makeClassProperty(ref, p.isOptional);
         });
         if (c.isFixed) {
             return builder.getUniqueClassType(c.getAttributes(), true, properties, forwardingRef);

package/dist/language/JavaScriptPropTypes.js

@@ -79,11 +79,7 @@ class JavaScriptPropTypesRenderer extends ConvenienceRenderer_1.ConvenienceRende
         return match;
     }
     typeMapTypeForProperty(p) {
-        const typeMap = this.typeMapTypeFor(p.type);
-        if (!p.isOptional) {
-            return typeMap;
-        }
-        return ["PropType.any"];
+        return this.typeMapTypeFor(p.type);
     }
     importStatement(lhs, moduleName) {
         if (this._jsOptions.moduleSystem) {

package/dist/language/Python.js

@@ -878,7 +878,14 @@ class JSONPythonRenderer extends PythonRenderer {
             this.emitLine("result", this.typeHint(": dict"), " = {}");
             this.forEachClassProperty(t, "none", (name, jsonName, cp) => {
                 const property = { value: ["self.", name] };
-                this.emitLine("result[", this.string(jsonName), "] = ", makeValue(this.serializer(property, cp.type)));
+                if (cp.isOptional) {
+                    this.emitBlock(["if self.", name, " is not None:"], () => {
+                        this.emitLine("result[", this.string(jsonName), "] = ", makeValue(this.serializer(property, cp.type)));
+                    });
+                }
+                else {
+                    this.emitLine("result[", this.string(jsonName), "] = ", makeValue(this.serializer(property, cp.type)));
+                }
             });
             this.emitLine("return result");
         });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "6.1.4",
+    "version": "6.1.6",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "a90171c4ddade83da7f4352b5ac75573fc0583f9"
+        "commit": "6eb66b53a444b9e64b14dc191cb6716e274b3504"
     }
 }