Do not use null-defaults to decide type signature for pb3-optionals (this only sets the default of optional fields, it doesn't control whether a field is optional or not)

Author: martin-traverse

cli/README.md

@@ -68,7 +68,8 @@ Translates between file formats and generates static code.
   --force-long     Enforces the use of 'Long' for s-/u-/int64 and s-/fixed64 fields.
   --force-number   Enforces the use of 'number' for s-/u-/int64 and s-/fixed64 fields.
   --force-message  Enforces the use of message instances instead of plain objects.
-  --pb3-optional    Make type declarations respect optional fields for PB3.
+  --null-defaults  Default value for optional fields is null instead of zero value.
+  --pb3-optional   Make type declarations respect optional fields for PB3.
 
 usage: pbjs [options] file1.proto file2.json ...  (or pipe)  other | pbjs [options] -
 ```

cli/targets/static.js

@@ -356,7 +356,7 @@ function toJsType(field) {
 
 function handleOptionalFields(jsType, field) {
 
-    if (field.optional && !field.map && !field.repeated && (field.resolvedType instanceof Type || config["null-defaults"]) || field.partOf)
+    if (field.optional && !field.map && !field.repeated && field.resolvedType instanceof Type || field.partOf)
         return jsType + "|null|undefined";
     else
         return jsType
@@ -410,8 +410,16 @@ function buildType(ref, type) {
         if (config.comments) {
             push("");
             var jsType = toJsType(field);
-            // No need to check config.tsOptional for member types, this logic has not changed
-            jsType = handleOptionalFields(jsType, field);
+
+            // Hide the fix for PB3 optional fields behind a config flag, it is an API change in generated output
+            if (config.pb3Optional) {
+                jsType = handleOptionalFields(jsType, field);
+            }
+            else {
+                if (field.optional && !field.map && !field.repeated && (field.resolvedType instanceof Type || config["null-defaults"]) || field.partOf)
+                    jsType = jsType + "|null|undefined";
+            }
+
             pushComment([
                 field.comment || type.name + " " + field.name + ".",
                 "@member {" + jsType + "} " + field.name,