Write default values to oneof fields in generated code (#135)

* Write default values to oneof field anyway * update oneof test fixture --------- Co-authored-by: farwayer <farwayer@gmail.com>
mapbox · Jul 5, 2024 · 2995e6d · 2995e6d
1 parent 1d724b1
commit 2995e6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/compile.js b/compile.js
@@ -401,7 +401,7 @@ function getDefaultWriteTest(ctx, field) {
     let code = `    if (obj.${field.name}`;
 
     if (!field.repeated && (!type || !type._proto.fields)) {
-        if (def === undefined || def) {
+        if (def === undefined || def || field.oneof) {
             code += ' != null';
         }
         if (def) {

diff --git a/test/compile.test.js b/test/compile.test.js
@@ -234,6 +234,15 @@ test('sets oneof field name', () => {
 
     assert.equal(data.value, 'float');
     assert.equal(data[data.value], 1.5);
+
+    pbf = new Pbf();
+    writeEnvelope({
+        float: 0
+    }, pbf);
+    data = readEnvelope(new Pbf(pbf.finish()));
+
+    assert.equal(data.value, 'float');
+    assert.equal(data[data.value], 0);
 });
 
 test('handles jstype=JS_STRING', () => {

diff --git a/test/fixtures/oneof.js b/test/fixtures/oneof.js
@@ -10,7 +10,7 @@ function readEnvelopeField(tag, obj, pbf) {
 }
 export function writeEnvelope(obj, pbf) {
     if (obj.id) pbf.writeVarintField(1, obj.id);
-    if (obj.int) pbf.writeVarintField(2, obj.int);
-    if (obj.float) pbf.writeFloatField(3, obj.float);
-    if (obj.string) pbf.writeStringField(4, obj.string);
+    if (obj.int != null) pbf.writeVarintField(2, obj.int);
+    if (obj.float != null) pbf.writeFloatField(3, obj.float);
+    if (obj.string != null) pbf.writeStringField(4, obj.string);
 }