quicktype-core 20.0.26 → 20.0.27

package/dist/language/Dart.d.ts

@@ -54,10 +54,11 @@ export declare class DartRenderer extends ConvenienceRenderer {
     protected emitDescriptionBlock(lines: Sourcelike[]): void;
     protected emitBlock(line: Sourcelike, f: () => void): void;
     protected dartType(t: Type, withIssues?: boolean): Sourcelike;
-    protected mapList(itemType: Sourcelike, list: Sourcelike, mapper: Sourcelike): Sourcelike;
-    protected mapMap(valueType: Sourcelike, map: Sourcelike, valueMapper: Sourcelike): Sourcelike;
-    protected fromDynamicExpression(t: Type, ...dynamic: Sourcelike[]): Sourcelike;
-    protected toDynamicExpression(t: Type, ...dynamic: Sourcelike[]): Sourcelike;
+    protected mapList(isNullable: boolean, itemType: Sourcelike, list: Sourcelike, mapper: Sourcelike): Sourcelike;
+    protected mapMap(isNullable: boolean, valueType: Sourcelike, map: Sourcelike, valueMapper: Sourcelike): Sourcelike;
+    protected mapClass(isNullable: boolean, classType: ClassType, dynamic: Sourcelike): Sourcelike[];
+    protected fromDynamicExpression(isNullable: boolean | undefined, t: Type, ...dynamic: Sourcelike[]): Sourcelike;
+    protected toDynamicExpression(isNullable: boolean | undefined, t: Type, ...dynamic: Sourcelike[]): Sourcelike;
     protected emitClassDefinition(c: ClassType, className: Name): void;
     protected emitFreezedClassDefinition(c: ClassType, className: Name): void;
     protected emitEnumDefinition(e: EnumType, enumName: Name): void;

package/dist/language/Dart.js

@@ -49,7 +49,6 @@ class DartTargetLanguage extends TargetLanguage_1.TargetLanguage {
         const mapping = new Map();
         mapping.set("date", "date");
         mapping.set("date-time", "date-time");
-        //        mapping.set("uuid", "uuid");
         return mapping;
     }
     makeRenderer(renderContext, untypedOptionValues) {
@@ -269,132 +268,97 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("}");
     }
     dartType(t, withIssues = false) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, "dynamic"), _nullType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, "dynamic"), _boolType => {
-            if (this._options.nullSafety) {
-                return ["bool", "?"];
-            }
-            return "bool";
-        }, _integerType => {
-            if (this._options.nullSafety) {
-                return ["int", "?"];
-            }
-            return "int";
-        }, _doubleType => {
-            if (this._options.nullSafety) {
-                return ["double", "?"];
-            }
-            return "double";
-        }, _stringType => {
-            if (this._options.nullSafety) {
-                return ["String", "?"];
-            }
-            return "String";
-        }, arrayType => {
-            if (this._options.nullSafety) {
-                return ["List<", this.dartType(arrayType.items, withIssues), ">", "?"];
-            }
-            return ["List<", this.dartType(arrayType.items, withIssues), ">"];
-        }, classType => {
-            if (this._options.nullSafety) {
-                return [this.nameForNamedType(classType), "?"];
-            }
-            return this.nameForNamedType(classType);
-        }, mapType => {
-            if (this._options.nullSafety) {
-                return [["Map<String, ", this.dartType(mapType.values, withIssues), ">"], "?"];
-            }
-            return ["Map<String, ", this.dartType(mapType.values, withIssues), ">"];
-        }, enumType => {
-            if (this._options.nullSafety) {
-                return [this.nameForNamedType(enumType), "?"];
-            }
-            return this.nameForNamedType(enumType);
-        }, unionType => {
+        const nullable = this._options.nullSafety && t.isNullable && !this._options.requiredProperties;
+        const withNullable = (s) => (nullable ? [s, "?"] : s);
+        return (0, TypeUtils_1.matchType)(t, _anyType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.anyTypeIssueAnnotation, "dynamic"), _nullType => (0, Source_1.maybeAnnotated)(withIssues, Annotation_1.nullTypeIssueAnnotation, "dynamic"), _boolType => withNullable("bool"), _integerType => withNullable("int"), _doubleType => withNullable("double"), _stringType => withNullable("String"), arrayType => withNullable(["List<", this.dartType(arrayType.items, withIssues), ">"]), classType => withNullable(this.nameForNamedType(classType)), mapType => withNullable(["Map<String, ", this.dartType(mapType.values, withIssues), ">"]), enumType => withNullable(this.nameForNamedType(enumType)), unionType => {
             const maybeNullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (maybeNullable === null) {
                 return "dynamic";
             }
-            return this.dartType(maybeNullable, withIssues);
+            return withNullable(this.dartType(maybeNullable, withIssues));
         }, transformedStringType => {
             switch (transformedStringType.kind) {
                 case "date-time":
                 case "date":
-                    return this._options.nullSafety ? ["DateTime", "?"] : "DateTime";
+                    return withNullable("DateTime");
                 default:
-                    return this._options.nullSafety ? ["String", "?"] : "String";
+                    return withNullable("String");
             }
         });
     }
-    mapList(itemType, list, mapper) {
-        if (this._options.nullSafety) {
+    mapList(isNullable, itemType, list, mapper) {
+        if (this._options.nullSafety && isNullable && !this._options.requiredProperties) {
             return [list, " == null ? [] : ", "List<", itemType, ">.from(", list, "!.map((x) => ", mapper, "))"];
         }
         return ["List<", itemType, ">.from(", list, ".map((x) => ", mapper, "))"];
     }
-    mapMap(valueType, map, valueMapper) {
-        if (this._options.nullSafety) {
+    mapMap(isNullable, valueType, map, valueMapper) {
+        if (this._options.nullSafety && isNullable && !this._options.requiredProperties) {
             return ["Map.from(", map, "!).map((k, v) => MapEntry<String, ", valueType, ">(k, ", valueMapper, "))"];
         }
         return ["Map.from(", map, ").map((k, v) => MapEntry<String, ", valueType, ">(k, ", valueMapper, "))"];
     }
-    fromDynamicExpression(t, ...dynamic) {
+    mapClass(isNullable, classType, dynamic) {
+        if (this._options.nullSafety && isNullable && !this._options.requiredProperties) {
+            return [dynamic, " == null ? null : ", this.nameForNamedType(classType), ".", this.fromJson, "(", dynamic, ")"];
+        }
+        return [this.nameForNamedType(classType), ".", this.fromJson, "(", dynamic, ")"];
+    }
+    //If the first time is the unionType type, after nullableFromUnion conversion,
+    //the isNullable property will become false, which is obviously wrong,
+    //so add isNullable property
+    fromDynamicExpression(isNullable = false, t, ...dynamic) {
         return (0, TypeUtils_1.matchType)(t, _anyType => dynamic, _nullType => dynamic, // FIXME: check null
         // FIXME: check null
-        _boolType => dynamic, _integerType => dynamic, _doubleType => [dynamic, ".toDouble()"], _stringType => dynamic, arrayType => this.mapList(this.dartType(arrayType.items), dynamic, this.fromDynamicExpression(arrayType.items, "x")), classType => [this.nameForNamedType(classType), ".", this.fromJson, "(", dynamic, ")"], mapType => this.mapMap(this.dartType(mapType.values), dynamic, this.fromDynamicExpression(mapType.values, "v")), enumType => {
-            if (this._options.nullSafety) {
-                return [(0, Support_1.defined)(this._enumValues.get(enumType)), "!.map[", dynamic, "]"];
-            }
-            return [(0, Support_1.defined)(this._enumValues.get(enumType)), ".map[", dynamic, "]"];
+        _boolType => dynamic, _integerType => dynamic, _doubleType => [dynamic, this._options.nullSafety ? "?.toDouble()" : ".toDouble()"], _stringType => dynamic, arrayType => this.mapList(isNullable || arrayType.isNullable, this.dartType(arrayType.items), dynamic, this.fromDynamicExpression(arrayType.items.isNullable, arrayType.items, "x")), classType => this.mapClass(isNullable || classType.isNullable, classType, dynamic), mapType => this.mapMap(mapType.isNullable || isNullable, this.dartType(mapType.values), dynamic, this.fromDynamicExpression(mapType.values.isNullable, mapType.values, "v")), enumType => {
+            return [(0, Support_1.defined)(this._enumValues.get(enumType)), ".map[", dynamic, this._options.nullSafety ? "]!" : "]"];
         }, unionType => {
             const maybeNullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (maybeNullable === null) {
                 return dynamic;
             }
-            if (maybeNullable.kind === "array") {
-                return [dynamic, " == null ? [] : ", this.fromDynamicExpression(maybeNullable, dynamic)];
-            }
-            return dynamic;
+            return this.fromDynamicExpression(unionType.isNullable, maybeNullable, dynamic);
         }, transformedStringType => {
             switch (transformedStringType.kind) {
                 case "date-time":
                 case "date":
+                    if ((transformedStringType.isNullable || isNullable) && !this._options.requiredProperties && this._options.nullSafety) {
+                        return [dynamic, " == null ? null : ", "DateTime.parse(", dynamic, ")"];
+                    }
                     return ["DateTime.parse(", dynamic, ")"];
                 default:
                     return dynamic;
             }
         });
     }
-    toDynamicExpression(t, ...dynamic) {
-        return (0, TypeUtils_1.matchType)(t, _anyType => dynamic, _nullType => dynamic, _boolType => dynamic, _integerType => dynamic, _doubleType => dynamic, _stringType => dynamic, arrayType => this.mapList("dynamic", dynamic, this.toDynamicExpression(arrayType.items, "x")), _classType => {
-            if (this._options.nullSafety) {
-                return [dynamic, "!.", this.toJson, "()"];
+    //If the first time is the unionType type, after nullableFromUnion conversion,
+    //the isNullable property will become false, which is obviously wrong,
+    //so add isNullable property
+    toDynamicExpression(isNullable = false, t, ...dynamic) {
+        return (0, TypeUtils_1.matchType)(t, _anyType => dynamic, _nullType => dynamic, _boolType => dynamic, _integerType => dynamic, _doubleType => dynamic, _stringType => dynamic, arrayType => this.mapList(arrayType.isNullable || isNullable, "dynamic", dynamic, this.toDynamicExpression(arrayType.items.isNullable, arrayType.items, "x")), _classType => {
+            if (this._options.nullSafety && (_classType.isNullable || isNullable) && !this._options.requiredProperties) {
+                return [dynamic, "?.", this.toJson, "()"];
             }
             return [dynamic, ".", this.toJson, "()"];
-        }, mapType => this.mapMap("dynamic", dynamic, this.toDynamicExpression(mapType.values, "v")), enumType => {
-            if (this._options.nullSafety) {
-                return [(0, Support_1.defined)(this._enumValues.get(enumType)), ".reverse![", dynamic, "]"];
-            }
+        }, mapType => this.mapMap(mapType.isNullable || isNullable, "dynamic", dynamic, this.toDynamicExpression(mapType.values.isNullable, mapType.values, "v")), enumType => {
             return [(0, Support_1.defined)(this._enumValues.get(enumType)), ".reverse[", dynamic, "]"];
         }, unionType => {
             const maybeNullable = (0, TypeUtils_1.nullableFromUnion)(unionType);
             if (maybeNullable === null) {
                 return dynamic;
             }
-            if (maybeNullable.kind === "array") {
-                return [dynamic, " == null ? [] : ", this.toDynamicExpression(maybeNullable, dynamic)];
-            }
-            return dynamic;
+            return this.toDynamicExpression(unionType.isNullable, maybeNullable, dynamic);
         }, transformedStringType => {
             switch (transformedStringType.kind) {
                 case "date-time":
-                    if (this._options.nullSafety) {
+                    if (this._options.nullSafety && !this._options.requiredProperties && (transformedStringType.isNullable || isNullable)) {
                         return [dynamic, "?.toIso8601String()"];
                     }
                     return [dynamic, ".toIso8601String()"];
                 case "date":
-                    if (this._options.nullSafety) {
+                    if (this._options.nullSafety && !this._options.requiredProperties && (transformedStringType.isNullable || isNullable)) {
                         return [
-                            '"${',
+                            "\"${",
                             dynamic,
                             "!.year.toString().padLeft(4, '0')",
                             "}-${",
@@ -405,7 +369,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                         ];
                     }
                     return [
-                        '"${',
+                        "\"${",
                         dynamic,
                         ".year.toString().padLeft(4, '0')",
                         "}-${",
@@ -433,8 +397,9 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             else {
                 this.emitLine(className, "({");
                 this.indent(() => {
-                    this.forEachClassProperty(c, "none", (name, _, _p) => {
-                        this.emitLine(this._options.requiredProperties ? "required " : "", "this.", name, ",");
+                    this.forEachClassProperty(c, "none", (name, _, prop) => {
+                        const required = this._options.requiredProperties || (this._options.nullSafety && !prop.type.isNullable);
+                        this.emitLine(required ? "required " : "", "this.", name, ",");
                     });
                 });
                 this.emitLine("});");
@@ -482,7 +447,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("factory ", className, ".", this.fromJson, "(Map<String, dynamic> json) => ", className, "(");
             this.indent(() => {
                 this.forEachClassProperty(c, "none", (name, jsonName, property) => {
-                    this.emitLine(name, ": ", this.fromDynamicExpression(property.type, 'json["', stringEscape(jsonName), '"]'), ",");
+                    this.emitLine(name, ": ", this.fromDynamicExpression(property.type.isNullable, property.type, "json[\"", stringEscape(jsonName), "\"]"), ",");
                 });
             });
             this.emitLine(");");
@@ -490,7 +455,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine("Map<String, dynamic> ", this.toJson, "() => {");
             this.indent(() => {
                 this.forEachClassProperty(c, "none", (name, jsonName, property) => {
-                    this.emitLine('"', stringEscape(jsonName), '": ', this.toDynamicExpression(property.type, name), ",");
+                    this.emitLine("\"", stringEscape(jsonName), "\": ", this.toDynamicExpression(property.type.isNullable, property.type, name), ",");
                 });
             });
             this.emitLine("};");
@@ -531,7 +496,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.indent(() => {
             this.forEachEnumCase(e, "none", (name, jsonName, pos) => {
                 const comma = pos === "first" || pos === "middle" ? "," : [];
-                this.emitLine('"', stringEscape(jsonName), '": ', enumName, ".", name, comma);
+                this.emitLine("\"", stringEscape(jsonName), "\": ", enumName, ".", name, comma);
             });
         });
         this.emitLine("});");
@@ -541,12 +506,12 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.ensureBlankLine();
         this.emitMultiline(`class EnumValues<T> {
     Map<String, T> map;
-    Map<T, String>? reverseMap;
+    late Map<T, String> reverseMap;
 
     EnumValues(this.map);
 
-    Map<T, String>? get reverse {
-        reverseMap ??= map.map((k, v) => MapEntry(v, k));
+    Map<T, String> get reverse {
+        reverseMap = map.map((k, v) => MapEntry(v, k));
         return reverseMap;
     }
 }`);
@@ -556,9 +521,9 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (!this._options.justTypes && !this._options.codersInClass) {
             this.forEachTopLevel("leading-and-interposing", (t, name) => {
                 const { encoder, decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
-                this.emitLine(this.dartType(t), " ", decoder, "(String str) => ", this.fromDynamicExpression(t, "json.decode(str)"), ";");
+                this.emitLine(this.dartType(t), " ", decoder, "(String str) => ", this.fromDynamicExpression(t.isNullable, t, "json.decode(str)"), ";");
                 this.ensureBlankLine();
-                this.emitLine("String ", encoder, "(", this.dartType(t), " data) => json.encode(", this.toDynamicExpression(t, "data"), ");");
+                this.emitLine("String ", encoder, "(", this.dartType(t), " data) => json.encode(", this.toDynamicExpression(t.isNullable, t, "data"), ");");
                 // this.emitBlock(["String ", encoder, "(", this.dartType(t), " data)"], () => {
                 //     this.emitJsonEncoderBlock(t);
                 // });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "20.0.26",
+    "version": "20.0.27",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",