quicktype-core 7.0.6 → 7.0.7

package/dist/language/Python.js

@@ -247,15 +247,23 @@ class PythonRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     pythonType(t) {
         const actualType = Transformers_1.followTargetType(t);
         return TypeUtils_1.matchType(actualType, _anyType => this.withTyping("Any"), _nullType => "None", _boolType => "bool", _integerType => "int", _doubletype => "float", _stringType => "str", arrayType => [this.withTyping("List"), "[", this.pythonType(arrayType.items), "]"], classType => this.namedType(classType), mapType => [this.withTyping("Dict"), "[str, ", this.pythonType(mapType.values), "]"], enumType => this.namedType(enumType), unionType => {
-            const maybeNullable = TypeUtils_1.nullableFromUnion(unionType);
-            if (maybeNullable !== null) {
+            const [hasNull, nonNulls] = TypeUtils_1.removeNullFromUnion(unionType);
+            const memberTypes = Array.from(nonNulls).map(m => this.pythonType(m));
+            if (hasNull !== null) {
                 let rest = [];
                 if (!this.getAlphabetizeProperties() && this.pyOptions.features.dataClasses)
                     rest.push(" = None");
-                return [this.withTyping("Optional"), "[", this.pythonType(maybeNullable), "]", ...rest];
+                if (nonNulls.size > 1) {
+                    this.withImport("typing", "Union");
+                    return [this.withTyping("Optional"), "[Union[", collection_utils_1.arrayIntercalate(", ", memberTypes), "]]", ...rest];
+                }
+                else {
+                    return [this.withTyping("Optional"), "[", Support_1.defined(collection_utils_1.iterableFirst(memberTypes)), "]", ...rest];
+                }
+            }
+            else {
+                return [this.withTyping("Union"), "[", collection_utils_1.arrayIntercalate(", ", memberTypes), "]"];
             }
-            const memberTypes = Array.from(unionType.sortedMembers).map(m => this.pythonType(m));
-            return [this.withTyping("Union"), "[", collection_utils_1.arrayIntercalate(", ", memberTypes), "]"];
         }, transformedStringType => {
             if (transformedStringType.kind === "date-time") {
                 return this.withImport("datetime", "datetime");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "7.0.6",
+    "version": "7.0.7",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "6165d1a3cd069a88b7266c29f531776439bbc014"
+        "commit": "cb25f54dd119a71223dec2cf1d8846f49e5032c3"
     }
 }