quicktype-core 23.3.7 → 23.3.9

package/dist/language/CPlusPlus/CPlusPlusRenderer.js

@@ -1257,8 +1257,8 @@ class CPlusPlusRenderer extends ConvenienceRenderer_1.ConvenienceRenderer {
                     ]), ") x = ", ourQualifier, enumName, "::", name, ";");
                     onFirst = false;
                 });
-                this.emitLine('else { throw std::runtime_error("Input JSON does not conform to schema!"); }');
             }
+            this.emitLine('else { throw std::runtime_error("Input JSON does not conform to schema!"); }');
         });
         this.ensureBlankLine();
         this.emitBlock([

package/dist/language/CSharp/SystemTextJsonCSharpRenderer.js

@@ -323,14 +323,14 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
             }, true);
         });
     }
-    emitDecoderTransformerCase(tokenCases, variableName, xfer, targetType, emitFinish) {
+    emitDecoderTransformerCase(tokenCases, variableName, xfer, targetType, emitFinish, varGen) {
         if (xfer === undefined)
             return;
         for (const tokenCase of tokenCases) {
             this.emitTokenCase(tokenCase);
         }
         this.indent(() => {
-            const allHandled = this.emitDecodeTransformer(xfer, targetType, emitFinish, variableName);
+            const allHandled = this.emitDecodeTransformer(xfer, targetType, emitFinish, variableName, varGen);
             if (!allHandled) {
                 this.emitLine("break;");
             }
@@ -343,7 +343,7 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
         }
         return this.emitTransformer(value, consumer, targetType, emitFinish);
     }
-    emitDecodeTransformer(xfer, targetType, emitFinish, variableName = "value") {
+    emitDecodeTransformer(xfer, targetType, emitFinish, variableName = "value", varGen = { counter: 0 }) {
         if (xfer instanceof Transformers_1.DecodingTransformer) {
             const source = xfer.sourceType;
             const converter = this.converterForType(targetType);
@@ -368,7 +368,7 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
             this.emitLine("var ", variableName, " = new List<", this.csType(targetType.items), ">();");
             this.emitLine("while (reader.TokenType != JsonToken.EndArray)");
             this.emitBlock(() => {
-                this.emitDecodeTransformer(xfer.itemTransformer, xfer.itemTargetType, (v) => this.emitLine(variableName, ".Add(", v, ");"), "arrayItem");
+                this.emitDecodeTransformer(xfer.itemTransformer, xfer.itemTargetType, (v) => this.emitLine(variableName, ".Add(", v, ");"), "arrayItem", varGen);
                 // FIXME: handle EOF
                 this.emitLine("reader.Read();");
             });
@@ -385,22 +385,57 @@ class SystemTextJsonCSharpRenderer extends CSharpRenderer_1.CSharpRenderer {
                 if (nullTransformer !== undefined) {
                     this.emitTokenCase("Null");
                     this.indent(() => {
-                        const allHandled = this.emitDecodeTransformer(nullTransformer, targetType, emitFinish, "null");
+                        const allHandled = this.emitDecodeTransformer(nullTransformer, targetType, emitFinish, "null", varGen);
                         if (!allHandled) {
                             this.emitLine("break");
                         }
                     });
                 }
-                this.emitDecoderTransformerCase(["Number"], "integerValue", xfer.integerTransformer, targetType, emitFinish);
-                this.emitDecoderTransformerCase(["Number"], 
-                // xfer.integerTransformer === undefined ? ["Integer", "Float"] : ["Float"],
-                "doubleValue", xfer.doubleTransformer, targetType, emitFinish);
-                this.emitDecoderTransformerCase(["True", "False"], "boolValue", xfer.boolTransformer, targetType, emitFinish);
+                // Handle number (integer/double) union properly
+                if (xfer.integerTransformer !== undefined && xfer.doubleTransformer !== undefined) {
+                    varGen.counter++;
+                    const intTryVar = `intTryValue${varGen.counter}`;
+                    varGen.counter++;
+                    const intVar = `intValue${varGen.counter}`;
+                    varGen.counter++;
+                    const doubleVar = `doubleValue${varGen.counter}`;
+                    this.emitTokenCase("Number");
+                    this.indent(() => {
+                        this.emitLine(`if (reader.TryGetInt64(out long ${intTryVar}))`);
+                        this.emitBlock(() => {
+                            const allHandled = this.emitDecodeTransformer(xfer.integerTransformer, targetType, emitFinish, intVar, varGen);
+                            if (!allHandled) {
+                                this.emitLine("break;");
+                            }
+                        });
+                        this.emitLine("else");
+                        this.emitBlock(() => {
+                            const allHandled = this.emitDecodeTransformer(xfer.doubleTransformer, targetType, emitFinish, doubleVar, varGen);
+                            if (!allHandled) {
+                                this.emitLine("break;");
+                            }
+                        });
+                    });
+                }
+                else {
+                    // Only one present, emit as before
+                    if (xfer.integerTransformer !== undefined) {
+                        varGen.counter++;
+                        const intVar = `intValue${varGen.counter}`;
+                        this.emitDecoderTransformerCase(["Number"], intVar, xfer.integerTransformer, targetType, emitFinish, varGen);
+                    }
+                    else if (xfer.doubleTransformer !== undefined) {
+                        varGen.counter++;
+                        const doubleVar = `doubleValue${varGen.counter}`;
+                        this.emitDecoderTransformerCase(["Number"], doubleVar, xfer.doubleTransformer, targetType, emitFinish, varGen);
+                    }
+                }
+                this.emitDecoderTransformerCase(["True", "False"], "boolValue", xfer.boolTransformer, targetType, emitFinish, varGen);
                 this.emitDecoderTransformerCase(
                 // ["String", "Date"],
-                ["String"], "stringValue", xfer.stringTransformer, targetType, emitFinish);
-                this.emitDecoderTransformerCase(["StartObject"], "objectValue", xfer.objectTransformer, targetType, emitFinish);
-                this.emitDecoderTransformerCase(["StartArray"], "arrayValue", xfer.arrayTransformer, targetType, emitFinish);
+                ["String"], "stringValue", xfer.stringTransformer, targetType, emitFinish, varGen);
+                this.emitDecoderTransformerCase(["StartObject"], "objectValue", xfer.objectTransformer, targetType, emitFinish, varGen);
+                this.emitDecoderTransformerCase(["StartArray"], "arrayValue", xfer.arrayTransformer, targetType, emitFinish, varGen);
             });
             return false;
         }

package/package.json

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