quicktype-core 23.0.41 → 23.0.43

package/dist/language/Dart.d.ts

@@ -16,6 +16,7 @@ export declare const dartOptions: {
     generateCopyWith: BooleanOption;
     useFreezed: BooleanOption;
     useHive: BooleanOption;
+    useJsonAnnotation: BooleanOption;
     partName: StringOption;
 };
 export declare class DartTargetLanguage extends TargetLanguage {

package/dist/language/Dart.js

@@ -22,6 +22,7 @@ exports.dartOptions = {
     generateCopyWith: new RendererOptions_1.BooleanOption("copy-with", "Generate CopyWith method", false),
     useFreezed: new RendererOptions_1.BooleanOption("use-freezed", "Generate class definitions with @freezed compatibility", false, "secondary"),
     useHive: new RendererOptions_1.BooleanOption("use-hive", "Generate annotations for Hive type adapters", false, "secondary"),
+    useJsonAnnotation: new RendererOptions_1.BooleanOption("use-json-annotation", "Generate annotations for json_serializable", false, "secondary"),
     partName: new RendererOptions_1.StringOption("part-name", "Use this name in `part` directive", "NAME", "", "secondary")
 };
 class DartTargetLanguage extends TargetLanguage_1.TargetLanguage {
@@ -39,6 +40,7 @@ class DartTargetLanguage extends TargetLanguage_1.TargetLanguage {
             exports.dartOptions.generateCopyWith,
             exports.dartOptions.useFreezed,
             exports.dartOptions.useHive,
+            exports.dartOptions.useJsonAnnotation,
             exports.dartOptions.partName
         ];
     }
@@ -245,8 +247,11 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
         if (this._options.useHive) {
             this.emitLine("import 'package:hive/hive.dart';");
         }
+        if (this._options.useJsonAnnotation) {
+            this.emitLine("import 'package:json_annotation/json_annotation.dart';");
+        }
         this.emitLine("import 'dart:convert';");
-        if (this._options.useFreezed || this._options.useHive) {
+        if (this._options.useFreezed || this._options.useHive || this._options.useJsonAnnotation) {
             this.ensureBlankLine();
             const optionNameIsEmpty = this._options.partName.length === 0;
             // FIXME: This should use a `Name`, not `modifySource`
@@ -429,6 +434,10 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                 this.classPropertyCounter++;
                 this.emitLine(`@HiveField(${this.classPropertyCounter})`);
             }
+            if (this._options.useJsonAnnotation) {
+                this.classPropertyCounter++;
+                this.emitLine(`@JsonKey(name:"${jsonName}")`);
+            }
             this.emitLine(this._options.finalProperties ? "final " : "", this.dartType(p.type, true), " ", name, ";");
         });
     }
@@ -482,6 +491,9 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             this.emitLine(`@HiveType(typeId: ${this.classCounter})`);
             this.classPropertyCounter = 0;
         }
+        if (this._options.useJsonAnnotation) {
+            this.emitLine(`@JsonSerializable()`);
+        }
         this.emitBlock(["class ", className], () => {
             if (c.getProperties().size === 0) {
                 this._emitEmptyConstructor(className);
@@ -494,12 +506,24 @@ class DartRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             if (this._options.generateCopyWith) {
                 this._emitCopyConstructor(c, className);
             }
-            if (this._options.justTypes)
-                return;
-            if (this._options.codersInClass) {
-                this._emitStringJsonEncoderDecoder(className);
+            if (this._options.useJsonAnnotation) {
+                this.ensureBlankLine();
+                this.emitLine(
+                // factory PublicAnswer.fromJson(Map<String, dynamic> json) => _$PublicAnswerFromJson(json);
+                "factory ", className, ".fromJson(Map<String, dynamic> json) => ", "_$", className, "FromJson(json);");
+                this.ensureBlankLine();
+                this.emitLine(
+                // Map<String, dynamic> toJson() => _$PublicAnswerToJson(this);
+                "Map<String, dynamic> toJson() => ", "_$", className, "ToJson(this);");
+            }
+            else {
+                if (this._options.justTypes)
+                    return;
+                if (this._options.codersInClass) {
+                    this._emitStringJsonEncoderDecoder(className);
+                }
+                this._emitMapEncoderDecoder(c, className);
             }
-            this._emitMapEncoderDecoder(c, className);
         });
     }
     emitFreezedClassDefinition(c, className) {

package/dist/language/Golang.d.ts

@@ -10,6 +10,7 @@ export declare const goOptions: {
     justTypesAndPackage: BooleanOption;
     packageName: StringOption;
     multiFileOutput: BooleanOption;
+    fieldTags: StringOption;
 };
 export declare class GoTargetLanguage extends TargetLanguage {
     constructor();

package/dist/language/Golang.js

@@ -15,14 +15,21 @@ exports.goOptions = {
     justTypes: new RendererOptions_1.BooleanOption("just-types", "Plain types only", false),
     justTypesAndPackage: new RendererOptions_1.BooleanOption("just-types-and-package", "Plain types with package only", false),
     packageName: new RendererOptions_1.StringOption("package", "Generated package name", "NAME", "main"),
-    multiFileOutput: new RendererOptions_1.BooleanOption("multi-file-output", "Renders each top-level object in its own Go file", false)
+    multiFileOutput: new RendererOptions_1.BooleanOption("multi-file-output", "Renders each top-level object in its own Go file", false),
+    fieldTags: new RendererOptions_1.StringOption("field-tags", "list of tags which should be generated for fields", "TAGS", "json")
 };
 class GoTargetLanguage extends TargetLanguage_1.TargetLanguage {
     constructor() {
         super("Go", ["go", "golang"], "go");
     }
     getOptions() {
-        return [exports.goOptions.justTypes, exports.goOptions.packageName, exports.goOptions.multiFileOutput, exports.goOptions.justTypesAndPackage];
+        return [
+            exports.goOptions.justTypes,
+            exports.goOptions.packageName,
+            exports.goOptions.multiFileOutput,
+            exports.goOptions.justTypesAndPackage,
+            exports.goOptions.fieldTags
+        ];
     }
     get supportsUnionsWithBothNumberTypes() {
         return true;
@@ -189,10 +196,14 @@ class GoRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             const goType = this.propertyGoType(p);
             const omitEmpty = canOmitEmpty(p) ? ",omitempty" : [];
             docStrings.forEach(doc => columns.push([doc]));
+            const tags = this._options.fieldTags
+                .split(",")
+                .map(tag => tag + ':"' + (0, Strings_1.stringEscape)(jsonName) + omitEmpty + '"')
+                .join(" ");
             columns.push([
                 [name, " "],
                 [goType, " "],
-                ['`json:"', (0, Strings_1.stringEscape)(jsonName), omitEmpty, '"`']
+                ["`", tags, "`"]
             ]);
         });
         this.emitDescription(this.descriptionForType(c));

package/package.json

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