protobufjs 8.7.0 → 8.7.2

package/ext/descriptor.js

@@ -13,7 +13,7 @@ var Namespace = $protobuf.Namespace,
     Method    = $protobuf.Method,
     patterns  = $protobuf.util.patterns;
 
-var numberRe  = patterns.numberRe,
+var integerRe = /^[+-]?[0-9]+$/,
     typeRefRe = patterns.typeRefRe;
 
 // --- Root ---
@@ -519,17 +519,33 @@ function Field_fromDescriptor(descriptor, ctx, nested) {
 
     if (descriptor.defaultValue && descriptor.defaultValue.length) {
         var defaultValue = descriptor.defaultValue;
-        switch (defaultValue) {
-            case "true": case "TRUE":
-                defaultValue = true;
+        switch (fieldType) {
+            case "double": case "float":
+                switch (defaultValue.toLowerCase()) {
+                    case "inf": defaultValue = Infinity; break;
+                    case "-inf": defaultValue = -Infinity; break;
+                    case "nan": case "-nan": defaultValue = NaN; break;
+                    default:
+                        defaultValue = Number(defaultValue);
+                        if (Number.isNaN(defaultValue))
+                            throw Error("illegal default value for " + fieldType);
+                        break;
+                }
                 break;
-            case "false": case "FALSE":
-                defaultValue = false;
+            case "int32": case "uint32": case "sint32": case "fixed32": case "sfixed32":
+                if (!integerRe.test(defaultValue))
+                    throw Error("illegal default value for " + fieldType);
+                defaultValue = parseInt(defaultValue, 10);
                 break;
-            default:
-                var match = numberRe.exec(defaultValue);
-                if (match)
-                    defaultValue = parseInt(defaultValue); // eslint-disable-line radix
+            case "int64": case "uint64": case "sint64": case "fixed64": case "sfixed64":
+                if (!integerRe.test(defaultValue))
+                    throw Error("illegal default value for " + fieldType);
+                break;
+            case "bool":
+                switch (defaultValue) {
+                    case "true": case "TRUE": defaultValue = true; break;
+                    case "false": case "FALSE": defaultValue = false; break;
+                }
                 break;
         }
         field.setOption("default", defaultValue);

package/ext/protojson.js

@@ -295,7 +295,7 @@ function readField(field, value, options, depth) {
             throw invalid(field.fullName, value, "expected array");
         var arr = [], i = 0;
         for (; i < value.length; ++i) {
-            if (value[i] === null && !isValueType(field.resolvedType))
+            if (value[i] === null && !isValueType(field.resolvedType) && !isNullValueType(field.resolvedType))
                 throw invalid(field.fullName, null, "null element");
             var el = readSingular(field, value[i], options, depth);
             if (el !== SKIP)
@@ -318,6 +318,10 @@ function isValueType(type) {
     return type instanceof Type && type.fullName === ".google.protobuf.Value";
 }
 
+function isNullValueType(type) {
+    return type instanceof Enum && type.fullName === ".google.protobuf.NullValue";
+}
+
 function isImplicitDefault(field, value) {
     if (field.hasPresence || field.repeated || field.map || field.resolvedType instanceof Type)
         return false;

package/google/api/annotations.json

@@ -58,7 +58,8 @@
                 "additionalBindings": {
                   "rule": "repeated",
                   "type": "HttpRule",
-                  "id": 11
+                  "id": 11,
+                  "protoName": "additional_bindings"
                 }
               }
             }
@@ -67,6 +68,7 @@
         "protobuf": {
           "nested": {
             "MethodOptions": {
+              "edition": "proto2",
               "fields": {},
               "extensions": [
                 [

package/google/api/http.json

@@ -62,7 +62,8 @@
                 "additionalBindings": {
                   "rule": "repeated",
                   "type": "HttpRule",
-                  "id": 11
+                  "id": 11,
+                  "protoName": "additional_bindings"
                 }
               }
             },

package/google/protobuf/api.json

@@ -26,7 +26,8 @@
                 },
                 "sourceContext": {
                   "type": "SourceContext",
-                  "id": 5
+                  "id": 5,
+                  "protoName": "source_context"
                 },
                 "mixins": {
                   "rule": "repeated",
@@ -47,19 +48,23 @@
                 },
                 "requestTypeUrl": {
                   "type": "string",
-                  "id": 2
+                  "id": 2,
+                  "protoName": "request_type_url"
                 },
                 "requestStreaming": {
                   "type": "bool",
-                  "id": 3
+                  "id": 3,
+                  "protoName": "request_streaming"
                 },
                 "responseTypeUrl": {
                   "type": "string",
-                  "id": 4
+                  "id": 4,
+                  "protoName": "response_type_url"
                 },
                 "responseStreaming": {
                   "type": "bool",
-                  "id": 5
+                  "id": 5,
+                  "protoName": "response_streaming"
                 },
                 "options": {
                   "rule": "repeated",
@@ -88,7 +93,8 @@
               "fields": {
                 "fileName": {
                   "type": "string",
-                  "id": 1
+                  "id": 1,
+                  "protoName": "file_name"
                 }
               }
             },