converter.fromObject: Do not skip null-checking all elements to unbreak optional fields, skip the check if it's a .google.protobuf.Value object so it can properly generate a NullValue

Author: mrene

src/converter.js

@@ -32,10 +32,14 @@ function genValuePartial_fromObject(gen, field, fieldIndex, prop) {
                     ("break");
             } gen
             ("}");
+        } else if (field.resolvedType.fullName === '.google.protobuf.Value') {
+            // .google.protobuf.Value can render multiple types
+            gen
+            ("m%s=types[%i].fromObject(d%s)", prop, fieldIndex, prop);
         } else {
             gen
-            // ("if(typeof d%s!==\"object\")", prop)
-            //     ("throw TypeError(%j)", field.fullName + ": object expected")
+            ("if(typeof d%s!==\"object\")", prop)
+                ("throw TypeError(%j)", field.fullName + ": object expected")
             ("m%s=types[%i].fromObject(d%s)", prop, fieldIndex, prop);
         }
     } else {
@@ -134,11 +138,12 @@ converter.fromObject = function fromObject(mtype) {
 
         // Non-repeated fields
         } else {
-            if (!(field.resolvedType instanceof Enum)) gen // no need to test for null/undefined if an enum (uses switch)
-    // ("if(d%s!=null){", prop); // !== undefined && !== null
+            var needsGuard = !(field.resolvedType instanceof Enum || (field.resolvedType && field.resolvedType.fullName === '.google.protobuf.Value'));
+            if (needsGuard) gen // no need to test for null/undefined if an enum (uses switch)
+    ("if(d%s!=null){", prop); // !== undefined && !== null
     genValuePartial_fromObject(gen, field, /* not sorted */ i, prop);
-        // if (!(field.resolvedType instanceof Enum)) gen
-    // ("}");
+    if (needsGuard) gen
+    ("}");
         }
     } return gen
     ("return m");

src/wrappers.js

@@ -186,7 +186,7 @@ wrappers[".google.protobuf.Timestamp"] = {
 
     // given a protobuf Timestamp object, return a plain JS object
     toObject: function(message, options) {
-        var Timestamp = this.lookup("google.protobuf.Timestamp");
+
         return new Date(message.seconds*1000 + message.nanos/1000);
     }
 }