quicktype-core 23.3.18 → 23.3.20

package/dist/language/CSharp/SystemTextJsonCSharpRenderer.js

@@ -350,7 +350,13 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
             if (converter !== undefined) {
                 const typeSource = this.csType(targetType);
                 this.emitLine("var converter = ", this.converterObject(converter), ";");
-                this.emitLine("var ", variableName, " = (", typeSource, ")converter.ReadJson(reader, typeof(", typeSource, "), null, serializer);");
+                // The converter is for the non-null type, so if the target
+                // type is nullable we have to handle null ourselves.
+                const isNullable = targetType instanceof Type_1.UnionType &&
+                    (0, TypeUtils_1.nullableFromUnion)(targetType) !== null;
+                this.emitLine("var ", variableName, " = ", isNullable
+                    ? "reader.TokenType == JsonTokenType.Null ? null : "
+                    : "", "(", typeSource, ")converter.Read(ref reader, typeof(", typeSource, "), options);");
             }
             else if (source.kind !== "null") {
                 const output = targetType.kind === "double" ? targetType : source;
@@ -366,7 +372,7 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
             // FIXME: handle EOF
             this.emitLine("reader.Read();");
             this.emitLine("var ", variableName, " = new List<", this.csType(targetType.items), ">();");
-            this.emitLine("while (reader.TokenType != JsonToken.EndArray)");
+            this.emitLine("while (reader.TokenType != JsonTokenType.EndArray)");
             this.emitBlock(() => {
                 this.emitDecodeTransformer(xfer.itemTransformer, xfer.itemTargetType, (v) => this.emitLine(variableName, ".Add(", v, ");"), "arrayItem", varGen);
                 // FIXME: handle EOF
@@ -525,7 +531,24 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
             const converter = this.converterForType(xfer.sourceType);
             if (converter !== undefined) {
                 this.emitLine("var converter = ", this.converterObject(converter), ";");
-                this.emitLine("converter.WriteJson(writer, ", variable, ", serializer);");
+                // The converter is for the non-null type, so if the source
+                // type is nullable we have to handle null ourselves.
+                const maybeNullable = xfer.sourceType instanceof Type_1.UnionType
+                    ? (0, TypeUtils_1.nullableFromUnion)(xfer.sourceType)
+                    : null;
+                if (maybeNullable !== null) {
+                    let member = variable;
+                    if ((0, utils_1.isValueType)((0, Transformers_1.followTargetType)(maybeNullable))) {
+                        member = [member, ".Value"];
+                    }
+                    this.emitLine("if (", variable, " == null)");
+                    this.emitBlock(() => this.emitLine("writer.WriteNullValue();"));
+                    this.emitLine("else");
+                    this.emitBlock(() => this.emitLine("converter.Write(writer, ", member, ", options);"));
+                }
+                else {
+                    this.emitLine("converter.Write(writer, ", variable, ", options);");
+                }
             }
             else {
                 this.emitLine(this.serializeValueCode(variable), ";");

package/dist/language/Rust/constants.d.ts

@@ -1 +1 @@
-export declare const keywords: readonly ["Serialize", "Deserialize", "{{root}}", "$crate", "as", "async", "box", "break", "const", "continue", "crate", "else", "enum", "extern", "false", "fn", "for", "if", "impl", "in", "let", "loop", "match", "mod", "move", "mut", "pub", "ref", "return", "self", "Self", "static", "struct", "super", "trait", "true", "type", "unsafe", "use", "where", "while", "abstract", "alignof", "become", "do", "final", "macro", "offsetof", "override", "priv", "proc", "pure", "sizeof", "typeof", "unsized", "virtual", "yield", "catch", "default", "dyn", "'static", "union", "option"];
+export declare const keywords: readonly ["Serialize", "Deserialize", "{{root}}", "$crate", "as", "async", "box", "break", "const", "continue", "crate", "else", "enum", "extern", "false", "fn", "for", "if", "impl", "in", "let", "loop", "match", "mod", "move", "mut", "pub", "ref", "return", "self", "Self", "static", "struct", "super", "trait", "true", "type", "unsafe", "use", "where", "while", "abstract", "alignof", "become", "do", "final", "macro", "offsetof", "override", "priv", "proc", "pure", "sizeof", "typeof", "unsized", "virtual", "yield", "catch", "default", "dyn", "'static", "union", "option", "Option", "Some", "None", "Result", "Ok", "Err", "String", "Vec", "Box", "HashMap"];

package/dist/language/Rust/constants.js

@@ -71,4 +71,19 @@ exports.keywords = [
     "union",
     // Conflict between `std::Option` and potentially generated Option
     "option",
+    // Prelude and standard-library names that generated code refers to
+    // unqualified; a generated type with one of these names would shadow
+    // them and break compilation (e.g. a struct named `Option`).
+    "Option",
+    "Some",
+    "None",
+    "Result",
+    "Ok",
+    "Err",
+    "String",
+    "Vec",
+    "Box",
+    // Generated code contains `use std::collections::HashMap;`, which a
+    // type of the same name would conflict with.
+    "HashMap",
 ];

package/package.json

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