fix: proto3 optional scalars should default to null in reflection API (#1693)

dae · web-flow · commit d9144dea611c · 2022-07-07T17:13:48.000-07:00
#1584 made proto3 optional scalars default to null when using static/static-module, but the old behaviour remained when using reflection (eg json-module).
diff --git a/src/field.js b/src/field.js
@@ -270,6 +270,9 @@ Field.prototype.resolve = function resolve() {
             this.typeDefault = null;
         else // instanceof Enum
             this.typeDefault = this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]; // first defined
+    } else if (this.options && this.options.proto3_optional) {
+        // proto3 scalar value marked optional; should default to null
+        this.typeDefault = null;
     }
 
     // use explicitly set default value if present
diff --git a/tests/comp_optional.js b/tests/comp_optional.js
@@ -22,5 +22,9 @@ tape.test("proto3 optional", function(test) {
     test.equal(Message.oneofs._optionalInt32.name, '_optionalInt32');
     test.deepEqual(Message.oneofs._optionalInt32.oneof, ['optionalInt32']);
 
+    var m = Message.create({});
+    test.strictEqual(m.regularInt32, 0);
+    test.strictEqual(m.optionalInt32, null);
+
     test.end();
 });

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,9 @@ Field.prototype.resolve = function resolve() {`
`270`	`270`	`this.typeDefault = null;`
`271`	`271`	`else // instanceof Enum`
`272`	`272`	`this.typeDefault = this.resolvedType.values[Object.keys(this.resolvedType.values)[0]]; // first defined`
	`273`	`+ } else if (this.options && this.options.proto3_optional) {`
	`274`	`+ // proto3 scalar value marked optional; should default to null`
	`275`	`+ this.typeDefault = null;`
`273`	`276`	`}`
`274`	`277`
`275`	`278`	`// use explicitly set default value if present`