quicktype-core 23.0.62 → 23.0.64

package/dist/language/Dart.js

@@ -11,7 +11,6 @@ const TargetLanguage_1 = require("../TargetLanguage");
 const RendererOptions_1 = require("../RendererOptions");
 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),
@@ -231,12 +230,14 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         }
         if (this._options.justTypes)
             return;
-        this.emitLine("// To parse this JSON data, do");
-        this.emitLine("//");
-        this.forEachTopLevel("none", (_t, name) => {
-            const { decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
-            this.emitLine("//     final ", (0, Source_1.modifySource)(Strings_1.decapitalize, name), " = ", decoder, "(jsonString);");
-        });
+        if (!this._options.codersInClass) {
+            this.emitLine("// To parse this JSON data, do");
+            this.emitLine("//");
+            this.forEachTopLevel("none", (_t, name) => {
+                const { decoder } = (0, Support_1.defined)(this._topLevelDependents.get(name));
+                this.emitLine("//     final ", (0, Source_1.modifySource)(Strings_1.decapitalize, name), " = ", decoder, "(jsonString);");
+            });
+        }
         this.ensureBlankLine();
         if (this._options.requiredProperties) {
             this.emitLine("import 'package:meta/meta.dart';");
@@ -247,7 +248,8 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this._options.useHive) {
             this.emitLine("import 'package:hive/hive.dart';");
         }
-        if (this._options.useJsonAnnotation) {
+        if (this._options.useJsonAnnotation && !this._options.useFreezed) {
+            // The freezed annotatation import already provides the import for json_annotation
             this.emitLine("import 'package:json_annotation/json_annotation.dart';");
         }
         this.emitLine("import 'dart:convert';");
@@ -417,7 +419,8 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         this.emitLine(className, "({");
         this.indent(() => {
             this.forEachClassProperty(c, "none", (name, _, prop) => {
-                const required = this._options.requiredProperties || (this._options.nullSafety && !prop.type.isNullable);
+                const required = this._options.requiredProperties ||
+                    (this._options.nullSafety && (!prop.type.isNullable || !prop.isOptional));
                 this.emitLine(required ? "required " : "", "this.", name, ",");
             });
         });
@@ -436,7 +439,7 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             }
             if (this._options.useJsonAnnotation) {
                 this.classPropertyCounter++;
-                this.emitLine(`@JsonKey(name:"${jsonName}")`);
+                this.emitLine(`@JsonKey(name: "${jsonName}")`);
             }
             this.emitLine(this._options.finalProperties ? "final " : "", this.dartType(p.type, true), " ", name, ";");
         });
@@ -536,8 +539,14 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             else {
                 this.emitLine("const factory ", className, "({");
                 this.indent(() => {
-                    this.forEachClassProperty(c, "none", (name, _, _p) => {
-                        this.emitLine(this._options.requiredProperties ? "required " : "", this.dartType(_p.type, true), this._options.requiredProperties ? "" : "?", " ", name, ",");
+                    this.forEachClassProperty(c, "none", (name, jsonName, prop) => {
+                        const required = this._options.requiredProperties ||
+                            (this._options.nullSafety && (!prop.type.isNullable || !prop.isOptional));
+                        if (this._options.useJsonAnnotation) {
+                            this.classPropertyCounter++;
+                            this.emitLine(`@JsonKey(name: "${jsonName}")`);
+                        }
+                        this.emitLine(required ? "required " : "", this.dartType(prop.type, true), " ", name, ",");
                     });
                 });
                 this.emitLine("}) = _", className, ";");
@@ -551,9 +560,18 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         });
     }
     emitEnumDefinition(e, enumName) {
-        const caseNames = Array.from(e.cases).map(c => this.nameForEnumCase(e, c));
         this.emitDescription(this.descriptionForType(e));
-        this.emitLine("enum ", enumName, " { ", (0, collection_utils_1.arrayIntercalate)(", ", caseNames), " }");
+        this.emitLine("enum ", enumName, " {");
+        this.indent(() => {
+            this.forEachEnumCase(e, "none", (name, jsonName, pos) => {
+                const comma = pos === "first" || pos === "middle" ? "," : [];
+                if (this._options.useJsonAnnotation) {
+                    this.emitLine('@JsonValue("', stringEscape(jsonName), '")');
+                }
+                this.emitLine(name, comma);
+            });
+        });
+        this.emitLine("}");
         if (this._options.justTypes)
             return;
         this.ensureBlankLine();

package/package.json

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