quicktype-core 23.0.61 → 23.0.63

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),
@@ -551,9 +550,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/dist/language/Rust.d.ts

@@ -19,6 +19,7 @@ export declare const rustOptions: {
     visibility: EnumOption<Visibility>;
     deriveDebug: BooleanOption;
     deriveClone: BooleanOption;
+    derivePartialEq: BooleanOption;
     edition2018: BooleanOption;
     leadingComments: BooleanOption;
 };

package/dist/language/Rust.js

@@ -34,6 +34,7 @@ exports.rustOptions = {
     ]),
     deriveDebug: new RendererOptions_1.BooleanOption("derive-debug", "Derive Debug impl", false),
     deriveClone: new RendererOptions_1.BooleanOption("derive-clone", "Derive Clone impl", false),
+    derivePartialEq: new RendererOptions_1.BooleanOption("derive-partial-eq", "Derive PartialEq impl", false),
     edition2018: new RendererOptions_1.BooleanOption("edition-2018", "Edition 2018", true),
     leadingComments: new RendererOptions_1.BooleanOption("leading-comments", "Leading Comments", true)
 };
@@ -94,6 +95,7 @@ class RustTargetLanguage extends TargetLanguage_1.TargetLanguage {
             exports.rustOptions.visibility,
             exports.rustOptions.deriveDebug,
             exports.rustOptions.deriveClone,
+            exports.rustOptions.derivePartialEq,
             exports.rustOptions.edition2018,
             exports.rustOptions.leadingComments
         ];
@@ -275,7 +277,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     emitStructDefinition(c, className) {
         this.emitDescription(this.descriptionForType(c));
-        this.emitLine("#[derive(", this._options.deriveDebug ? "Debug, " : "", this._options.deriveClone ? "Clone, " : "", "Serialize, Deserialize)]");
+        this.emitLine("#[derive(", this._options.deriveDebug ? "Debug, " : "", this._options.deriveClone ? "Clone, " : "", this._options.derivePartialEq ? "PartialEq, " : "", "Serialize, Deserialize)]");
         // List the possible naming styles for every class property
         const propertiesNamingStyles = {};
         this.forEachClassProperty(c, "none", (_name, jsonName, _prop) => {
@@ -306,7 +308,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
             return;
         }
         this.emitDescription(this.descriptionForType(u));
-        this.emitLine("#[derive(", this._options.deriveDebug ? "Debug, " : "", this._options.deriveClone ? "Clone, " : "", "Serialize, Deserialize)]");
+        this.emitLine("#[derive(", this._options.deriveDebug ? "Debug, " : "", this._options.deriveClone ? "Clone, " : "", this._options.derivePartialEq ? "PartialEq, " : "", "Serialize, Deserialize)]");
         this.emitLine("#[serde(untagged)]");
         const [, nonNulls] = (0, TypeUtils_1.removeNullFromUnion)(u);
         const blankLines = this._options.density === Density.Dense ? "none" : "interposing";
@@ -317,7 +319,7 @@ class RustRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
     }
     emitEnumDefinition(e, enumName) {
         this.emitDescription(this.descriptionForType(e));
-        this.emitLine("#[derive(", this._options.deriveDebug ? "Debug, " : "", this._options.deriveClone ? "Clone, " : "", "Serialize, Deserialize)]");
+        this.emitLine("#[derive(", this._options.deriveDebug ? "Debug, " : "", this._options.deriveClone ? "Clone, " : "", this._options.derivePartialEq ? "PartialEq, " : "", "Serialize, Deserialize)]");
         // List the possible naming styles for every enum case
         const enumCasesNamingStyles = {};
         this.forEachEnumCase(e, "none", (_name, jsonName) => {

package/package.json

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