Skip to content

fix(C#): Enhance number handling in SystemTextJsonCSharpRenderer #2805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(C#): Enhance number handling in SystemTextJsonCSharpRenderer #2805

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 73 additions & 15 deletions packages/quicktype-core/src/language/CSharp/SystemTextJsonCSharpRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@ export class SystemTextJsonCSharpRenderer extends CSharpRenderer {
xfer: Transformer | undefined,
targetType: Type,
emitFinish: (value: Sourcelike) => void,
varGen?: { counter: number },
): void {
if (xfer === undefined) return;

Expand All @@ -529,6 +530,7 @@ export class SystemTextJsonCSharpRenderer extends CSharpRenderer {
targetType,
emitFinish,
variableName,
varGen,
);
if (!allHandled) {
this.emitLine("break;");
Expand All @@ -555,6 +557,7 @@ export class SystemTextJsonCSharpRenderer extends CSharpRenderer {
targetType: Type,
emitFinish: (value: Sourcelike) => void,
variableName = "value",
varGen: { counter: number } = { counter: 0 },
): boolean {
if (xfer instanceof DecodingTransformer) {
const source = xfer.sourceType;
Expand Down Expand Up @@ -617,6 +620,7 @@ export class SystemTextJsonCSharpRenderer extends CSharpRenderer {
xfer.itemTargetType,
(v) => this.emitLine(variableName, ".Add(", v, ");"),
"arrayItem",
varGen,
);
// FIXME: handle EOF
this.emitLine("reader.Read();");
Expand All @@ -641,34 +645,85 @@ export class SystemTextJsonCSharpRenderer extends CSharpRenderer {
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,
);
// 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"],
Expand All @@ -677,20 +732,23 @@ export class SystemTextJsonCSharpRenderer extends CSharpRenderer {
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;
Expand Down