Skip to content

fix: NullValue handling when oneof=unions-value is set #1203

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: main
Choose a base branch
from
Open

fix: NullValue handling when oneof=unions-value is set #1203

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions integration/oneof-unions-value/google/protobuf/struct.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions integration/oneof-unions-value/oneof-unions-value-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,17 @@ describe('oneof=unions-value', () => {
let decoded = PleaseChoose.decode(encoded);
expect(decoded).toEqual(obj);
});

it('handles null values', () => {
let obj: PleaseChoose = {
name: 'Debbie',
age: 37,
choice: { $case: 'aNumber', value: 42 },
signature: new Uint8Array([0xab, 0xcd]),
value: null,
};
let encoded = PleaseChoose.encode(obj).finish();
let decoded = PleaseChoose.decode(encoded);
expect(decoded).toEqual(obj);
});
});
4 changes: 2 additions & 2 deletions src/generate-struct-wrappers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export function generateWrapShallow(ctx: Context, fullProtoTypeName: string, fie
chunks.push(code`wrap(value: any): ${wrapTypeName(ctx.options, "Value")} {
const result = createBase${wrapTypeName(ctx.options, "Value")}()${maybeAsAny(ctx.options)};
if (value === null) {
result.kind = {$case: '${fieldNames.nullValue}', value };
result.kind = {$case: '${fieldNames.nullValue}', value: ${wrapTypeName(ctx.options, "NullValue")}.NULL_VALUE};
} else if (typeof value === 'boolean') {
result.kind = {$case: '${fieldNames.boolValue}', value };
} else if (typeof value === 'number') {
Expand Down Expand Up @@ -343,7 +343,7 @@ export function generateUnwrapShallow(ctx: Context, fullProtoTypeName: string, f
ctx.options,
"Value",
)}): string | number | boolean | Object | null | Array<any> | undefined {
return message.kind?.value;
return (message.kind?.$case === '${fieldNames.nullValue}') ? null : message.kind?.value;
}`);
} else {
chunks.push(code`unwrap(message: any): string | number | boolean | Object | null | Array<any> | undefined {
Expand Down
Loading