protobufjs 8.6.3 → 8.6.4

package/ext/protojson.js

@@ -535,7 +535,12 @@ WKT_FROM[".google.protobuf.Duration"] = function (type, value) {
         nanos = match[3] ? fracToNanos(match[3]) * sign || 0 : 0;
     if (seconds > 315576000000 || seconds < -315576000000)
         throw invalid(type.fullName, value, "duration out of range");
-    return { seconds: seconds, nanos: nanos };
+    var message = {};
+    if (seconds !== 0)
+        message.seconds = seconds;
+    if (nanos !== 0)
+        message.nanos = nanos;
+    return message;
 };
 WKT_TO[".google.protobuf.Duration"] = function (type, message) {
     var seconds = longToNumber(message.seconds),
@@ -568,7 +573,12 @@ WKT_FROM[".google.protobuf.Timestamp"] = function (type, value) {
         nanos = match[7] ? fracToNanos(match[7]) : 0;
     if (seconds < -62135596800 || seconds > 253402300799)
         throw invalid(type.fullName, value, "timestamp out of range");
-    return { seconds: seconds, nanos: nanos };
+    var message = {};
+    if (seconds !== 0)
+        message.seconds = seconds;
+    if (nanos !== 0)
+        message.nanos = nanos;
+    return message;
 };
 WKT_TO[".google.protobuf.Timestamp"] = function (type, message) {
     var seconds = longToNumber(message.seconds),
@@ -611,10 +621,17 @@ WKT_TO[".google.protobuf.FieldMask"] = function (type, message) {
  "UInt32Value", "BoolValue", "StringValue", "BytesValue"].forEach(function (name) {
     var fullName = ".google.protobuf." + name;
     WKT_FROM[fullName] = function (type, value, options, depth) {
-        return { value: readSingular(type.fields.value.resolve(), value, options, depth) };
+        var field = type.fields.value.resolve(),
+            fieldValue = readSingular(field, value, options, depth),
+            message = {};
+        if (!isImplicitDefault(field, fieldValue))
+            message.value = fieldValue;
+        return message;
     };
     WKT_TO[fullName] = function (type, message, options, depth) {
-        return writeSingular(type.fields.value.resolve(), message.value, options, depth);
+        var field = type.fields.value.resolve(),
+            value = wktFieldValue(type, message, "value");
+        return writeSingular(field, value === undefined ? field.defaultValue : value, options, depth);
     };
 });
 
@@ -736,7 +753,9 @@ WKT_FROM[".google.protobuf.Any"] = function (type, value, options, depth) {
     if (url.indexOf("/") === -1)
         url = "/" + url;
     out[wktFieldName(type, "type_url")] = url;
-    out[wktFieldName(type, "value")] = msgType.encode(inner).finish();
+    var bytes = msgType.encode(inner).finish();
+    if (bytes.length)
+        out[wktFieldName(type, "value")] = bytes;
     return out;
 };
 WKT_TO[".google.protobuf.Any"] = function (type, message, options, depth) {
@@ -745,7 +764,8 @@ WKT_TO[".google.protobuf.Any"] = function (type, message, options, depth) {
         return {};
     var name = typeUrl.substring(typeUrl.lastIndexOf("/") + 1),
         msgType = type.root.lookupType(name),
-        decoded = msgType.decode(wktFieldValue(type, message, "value")),
+        value = wktFieldValue(type, message, "value"),
+        decoded = msgType.decode(value || util.emptyArray),
         body = toJsonValue(msgType, decoded, options, depth + 1),
         result;
     if (WKT_TO[msgType.fullName])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "8.6.3",
+  "version": "8.6.4",
   "description": "Protocol Buffers for JavaScript & TypeScript.",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",
   "license": "BSD-3-Clause",

package/src/util/utf8.js

@@ -7,7 +7,14 @@
  */
 var utf8 = exports,
     replacementChar = "\ufffd",
+    strictDecoder;
+
+try {
     strictDecoder = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
+} catch (err) {
+    // "fatal" option is not supported on Node.js compiled without ICU
+    strictDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
+}
 
 /**
  * Calculates the UTF8 byte length of a string.