quicktype-core 7.0.2 → 7.0.4

package/dist/language/Dart.d.ts

@@ -1,12 +1,13 @@
-import { Type, EnumType, UnionType, ClassType, ClassProperty } from "../Type";
+import { ClassProperty, ClassType, EnumType, Type, UnionType } from "../Type";
 import { Sourcelike } from "../Source";
 import { StringTypeMapping } from "../TypeBuilder";
-import { Name, Namer, DependencyName } from "../Naming";
+import { DependencyName, Name, Namer } from "../Naming";
 import { ConvenienceRenderer, ForbiddenWordsInfo } from "../ConvenienceRenderer";
 import { TargetLanguage } from "../TargetLanguage";
-import { Option, BooleanOption, OptionValues, StringOption } from "../RendererOptions";
+import { BooleanOption, Option, OptionValues, StringOption } from "../RendererOptions";
 import { RenderContext } from "../Renderer";
 export declare const dartOptions: {
+    nullSafety: BooleanOption;
     justTypes: BooleanOption;
     codersInClass: BooleanOption;
     methodNamesWithMap: BooleanOption;

package/dist/language/Dart.js

@@ -12,6 +12,7 @@ const Annotation_1 = require("../Annotation");
 const Support_1 = require("../support/Support");
 const collection_utils_1 = require("collection-utils");
 exports.dartOptions = {
+    nullSafety: new RendererOptions_1.BooleanOption("null-safety", "Null Safety", true),
     justTypes: new RendererOptions_1.BooleanOption("just-types", "Types only", false),
     codersInClass: new RendererOptions_1.BooleanOption("coders-in-class", "Put encoder & decoder in Class", false),
     methodNamesWithMap: new RendererOptions_1.BooleanOption("from-map", "Use method names fromMap() & toMap()", false),
@@ -258,7 +259,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
     }
     emitDescriptionBlock(lines) {
-        this.emitCommentLines(lines, " * ", "/**", " */");
+        this.emitCommentLines(lines, "///", "");
     }
     emitBlock(line, f) {
         this.emitLine(line, " {");
@@ -266,7 +267,47 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine("}");
     }
     dartType(t, withIssues = false) {
-        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "dynamic"), _nullType => Source_1.maybeAnnotated(withIssues, Annotation_1.nullTypeIssueAnnotation, "dynamic"), _boolType => "bool", _integerType => "int", _doubleType => "double", _stringType => "String", arrayType => ["List<", this.dartType(arrayType.items, withIssues), ">"], classType => this.nameForNamedType(classType), mapType => ["Map<String, ", this.dartType(mapType.values, withIssues), ">"], enumType => this.nameForNamedType(enumType), unionType => {
+        return TypeUtils_1.matchType(t, _anyType => Source_1.maybeAnnotated(withIssues, Annotation_1.anyTypeIssueAnnotation, "dynamic"), _nullType => 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 maybeNullable = TypeUtils_1.nullableFromUnion(unionType);
             if (maybeNullable === null) {
                 return "dynamic";
@@ -276,27 +317,41 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             switch (transformedStringType.kind) {
                 case "date-time":
                 case "date":
-                    return "DateTime";
+                    return this._options.nullSafety ? ["DateTime", "?"] : "DateTime";
                 default:
-                    return "String";
+                    return this._options.nullSafety ? ["String", "?"] : "String";
             }
         });
     }
     mapList(itemType, list, mapper) {
+        if (this._options.nullSafety) {
+            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) {
+            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) {
         return 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 => [Support_1.defined(this._enumValues.get(enumType)), ".map[", dynamic, "]"], unionType => {
+        _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 [Support_1.defined(this._enumValues.get(enumType)), "!.map[", dynamic, "]"];
+            }
+            return [Support_1.defined(this._enumValues.get(enumType)), ".map[", dynamic, "]"];
+        }, unionType => {
             const maybeNullable = TypeUtils_1.nullableFromUnion(unionType);
             if (maybeNullable === null) {
                 return dynamic;
             }
-            return [dynamic, " == null ? null : ", this.fromDynamicExpression(maybeNullable, dynamic)];
+            if (maybeNullable.kind === "array") {
+                return [dynamic, " == null ? [] : ", this.fromDynamicExpression(maybeNullable, dynamic)];
+            }
+            return dynamic;
         }, transformedStringType => {
             switch (transformedStringType.kind) {
                 case "date-time":
@@ -308,17 +363,45 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     toDynamicExpression(t, ...dynamic) {
-        return 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 => [dynamic, ".", this.toJson, "()"], mapType => this.mapMap("dynamic", dynamic, this.toDynamicExpression(mapType.values, "v")), enumType => [Support_1.defined(this._enumValues.get(enumType)), ".reverse[", dynamic, "]"], unionType => {
+        return 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, "()"];
+            }
+            return [dynamic, ".", this.toJson, "()"];
+        }, mapType => this.mapMap("dynamic", dynamic, this.toDynamicExpression(mapType.values, "v")), enumType => {
+            if (this._options.nullSafety) {
+                return [Support_1.defined(this._enumValues.get(enumType)), ".reverse![", dynamic, "]"];
+            }
+            return [Support_1.defined(this._enumValues.get(enumType)), ".reverse[", dynamic, "]"];
+        }, unionType => {
             const maybeNullable = TypeUtils_1.nullableFromUnion(unionType);
             if (maybeNullable === null) {
                 return dynamic;
             }
-            return [dynamic, " == null ? null : ", this.toDynamicExpression(maybeNullable, dynamic)];
+            if (maybeNullable.kind === "array") {
+                return [dynamic, " == null ? [] : ", this.toDynamicExpression(maybeNullable, dynamic)];
+            }
+            return dynamic;
         }, transformedStringType => {
             switch (transformedStringType.kind) {
                 case "date-time":
+                    if (this._options.nullSafety) {
+                        return [dynamic, "?.toIso8601String()"];
+                    }
                     return [dynamic, ".toIso8601String()"];
                 case "date":
+                    if (this._options.nullSafety) {
+                        return [
+                            '"${',
+                            dynamic,
+                            "!.year.toString().padLeft(4, '0')",
+                            "}-${",
+                            dynamic,
+                            "!.month.toString().padLeft(2, '0')}-${",
+                            dynamic,
+                            "!.day.toString().padLeft(2, '0')}\""
+                        ];
+                    }
                     return [
                         '"${',
                         dynamic,
@@ -456,14 +539,12 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.ensureBlankLine();
         this.emitMultiline(`class EnumValues<T> {
     Map<String, T> map;
-    Map<T, String> reverseMap;
+    Map<T, String>? reverseMap;
 
     EnumValues(this.map);
 
-    Map<T, String> get reverse {
-        if (reverseMap == null) {
-            reverseMap = map.map((k, v) => new MapEntry(v, k));
-        }
+    Map<T, String>? get reverse {
+        reverseMap ??= map.map((k, v) => MapEntry(v, k));
         return reverseMap;
     }
 }`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "quicktype-core",
-    "version": "7.0.2",
+    "version": "7.0.4",
     "description": "The quicktype engine as a library",
     "license": "Apache-2.0",
     "main": "dist/index.js",
@@ -45,6 +45,6 @@
         "fs": false
     },
     "config": {
-        "commit": "5dbf11c85037e3f6a1ae842cf124c14546827a43"
+        "commit": "b120116abc68de36d9e80c497a7e1245f7c846ee"
     }
 }