Skip to content

Use undefined instead of null as the default value #112

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

Merged
mourner merged 2 commits into from
Nov 12, 2019
Merged

Use undefined instead of null as the default value #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b723c1
Use undefined instead of null as default value
Timmmm Nov 6, 2019
3104c7b
Fix tests
Nov 7, 2019
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 compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function compileDest(ctx) {
for (var i = 0; i < ctx._proto.fields.length; i++) {
var field = ctx._proto.fields[i];
props[field.name + ': ' + JSON.stringify(ctx._defaults[field.name])] = true;
if (field.oneof) props[field.oneof + ': null'] = true;
if (field.oneof) props[field.oneof + ': undefined'] = true;
}
return '{' + Object.keys(props).join(', ') + '}';
}
Expand Down Expand Up @@ -295,7 +295,7 @@ function getDefaultValue(field, value) {
case 'string': return value || '';
case 'bool': return value === 'true';
case 'map': return {};
default: return null;
default: return undefined;
}
}

Expand Down
6 changes: 3 additions & 3 deletions test/compile.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ test('handles all implicit default values', function(t) {
t.equals(data.id, 0);
t.deepEqual(data.tags, []);
t.deepEqual(data.numbers, []);
t.equals(data.bytes, null);
t.equals(data.custom, null);
t.equals(data.bytes, undefined);
t.equals(data.custom, undefined);
t.deepEqual(data.types, []);

t.end();
Expand All @@ -237,7 +237,7 @@ test('sets oneof field name', function(t) {
Envelope.write({}, pbf);
var data = Envelope.read(new Pbf(pbf.finish()));

t.equals(data.value, null);
t.equals(data.value, undefined);
t.equals(data.id, 0);

pbf = new Pbf();
Expand Down