protobufjs 8.7.2 → 8.8.1

package/README.md

@@ -316,26 +316,32 @@ protobuf.js is validated against the official Protocol Buffers conformance suite
 | ↳ Proto2   |   100.00% (707/707) |   100.00% (489/489) |   100.00% (218/218) |
 | ↳ Proto3   |   100.00% (707/707) |   100.00% (486/486) |   100.00% (221/221) |
 | ↳ Editions | 100.00% (1421/1421) |   100.00% (983/983) |   100.00% (438/438) |
-| ProtoJSON  | 100.00% (2796/2796) | 100.00% (2362/2362) |   100.00% (434/434) |
+| ProtoJSON  | 100.00% (2814/2814) | 100.00% (2362/2362) |   100.00% (452/452) |
 | TextFormat |   100.00% (909/909) |   100.00% (845/845) |     100.00% (64/64) |
-| Overall    | 100.00% (6540/6540) | 100.00% (5165/5165) | 100.00% (1375/1375) |
+| Overall    | 100.00% (6558/6558) | 100.00% (5165/5165) | 100.00% (1393/1393) |
 
 <!-- END CONFORMANCE DATA -->
 
+| Edition | Supported since
+|---------|----------------
+| 2023    | v7.5.0
+| 2024    | v8.0.0
+| 2026    | v8.8.0
+
 [Structured results](https://github.com/protobufjs/protobuf.js/actions/workflows/test.yml?query=branch%3Amaster+event%3Apush) of the conformance tests are also available as CI artifacts.
 
 ## Performance
 
-Both reflection and static modes use specialized encoders and decoders backed by the same hand-tuned reader and writer primitives.
+protobuf.js's reflection and static modes share the same code-generation backend and underlying hand-tuned reader and writer primitives. Reflection mode emits specialized encoders and decoders just in time, while static mode emits equivalent code ahead of time.
 
-The repository includes a [benchmark suite](./bench) you can run yourself. It compares protobuf.js with other general-purpose JavaScript implementations across three substantially different cases: our classic common message shape and two unmodified, structurally distinct fixtures sourced externally. The suite measures each library's recommended serialization and deserialization path using identical schemas and inputs, with JSON included as an additional baseline. Across these cases, protobuf.js is a clear upgrade over using JSON and consistently the fastest Protobuf implementation by a considerable margin.
+To see how this architecture compares in practice, the repository includes a reproducible [benchmark suite](./bench) measuring both modes alongside other general-purpose JavaScript implementations across three cases: our classic common message shape and two unmodified, structurally distinct fixtures sourced from other implementations. Each library is tested through its recommended serialization and deserialization path using identical schemas and message contents.
 
 <!-- BEGIN BENCHMARK DATA -->
 
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="./bench/results/encode-dark.svg">
   <source media="(prefers-color-scheme: light)" srcset="./bench/results/encode-light.svg">
-  <img alt="Encode benchmark" src="./bench/results/encode.svg">
+  <img alt="Encode Throughput" src="./bench/results/encode.svg">
 </picture>
 
 <details>
@@ -343,18 +349,18 @@ The repository includes a [benchmark suite](./bench) you can run yourself. It co
 
 | Implementation | Common | Vector tile | Buf perf |
 | --- | ---: | ---: | ---: |
-| protobuf.js static | **5.34M ops/s** &nbsp; <small>1.0x</small> | **3.09K ops/s** &nbsp; <small>1.0x</small> | 43.1K ops/s &nbsp; <small>1.0x</small> |
-| protobuf.js reflect | 4.89M ops/s &nbsp; <small>1.1x</small> | 3.03K ops/s &nbsp; <small>1.0x</small> | **43.3K ops/s** &nbsp; <small>1.0x</small> |
-| JSON | 2.09M ops/s &nbsp; <small>2.6x</small> | 897 ops/s &nbsp; <small>3.4x</small> | 6.70K ops/s &nbsp; <small>6.5x</small> |
-| protoc-gen-js | 1.03M ops/s &nbsp; <small>5.2x</small> | 700 ops/s &nbsp; <small>4.4x</small> | 13.9K ops/s &nbsp; <small>3.1x</small> |
-| protoc-gen-es | 402K ops/s &nbsp; <small>13.3x</small> | 235 ops/s &nbsp; <small>13.2x</small> | 8.22K ops/s &nbsp; <small>5.3x</small> |
+| protobuf.js static | **5.28M ops/s** &nbsp; <small>1.0x</small> | 3.06K ops/s &nbsp; <small>1.0x</small> | **49.2K ops/s** &nbsp; <small>1.0x</small> |
+| protobuf.js reflect | 5.16M ops/s &nbsp; <small>1.0x</small> | **3.08K ops/s** &nbsp; <small>1.0x</small> | 47.5K ops/s &nbsp; <small>1.0x</small> |
+| JSON | 3.44M ops/s &nbsp; <small>1.5x</small> | 1.50K ops/s &nbsp; <small>2.1x</small> | 7.13K ops/s &nbsp; <small>6.9x</small> |
+| protoc-gen-js | 1.05M ops/s &nbsp; <small>5.0x</small> | 691 ops/s &nbsp; <small>4.5x</small> | 15.0K ops/s &nbsp; <small>3.3x</small> |
+| protoc-gen-es | 1.22M ops/s &nbsp; <small>4.3x</small> | 1.14K ops/s &nbsp; <small>2.7x</small> | 35.8K ops/s &nbsp; <small>1.4x</small> |
 
 </details>
 
 <picture>
   <source media="(prefers-color-scheme: dark)" srcset="./bench/results/decode-dark.svg">
   <source media="(prefers-color-scheme: light)" srcset="./bench/results/decode-light.svg">
-  <img alt="Decode benchmark" src="./bench/results/decode.svg">
+  <img alt="Decode Throughput" src="./bench/results/decode.svg">
 </picture>
 
 <details>
@@ -362,22 +368,23 @@ The repository includes a [benchmark suite](./bench) you can run yourself. It co
 
 | Implementation | Common | Vector tile | Buf perf |
 | --- | ---: | ---: | ---: |
-| protobuf.js static | 6.45M ops/s &nbsp; <small>1.1x</small> | 2.70K ops/s &nbsp; <small>1.1x</small> | **81.7K ops/s** &nbsp; <small>1.0x</small> |
-| protobuf.js reflect | **6.93M ops/s** &nbsp; <small>1.0x</small> | **2.99K ops/s** &nbsp; <small>1.0x</small> | 80.3K ops/s &nbsp; <small>1.0x</small> |
-| JSON | 1.37M ops/s &nbsp; <small>5.0x</small> | 1.06K ops/s &nbsp; <small>2.8x</small> | 19.5K ops/s &nbsp; <small>4.2x</small> |
-| protoc-gen-js | 811K ops/s &nbsp; <small>8.5x</small> | 851 ops/s &nbsp; <small>3.5x</small> | 21.7K ops/s &nbsp; <small>3.8x</small> |
-| protoc-gen-es | 691K ops/s &nbsp; <small>10.0x</small> | 376 ops/s &nbsp; <small>8.0x</small> | 14.3K ops/s &nbsp; <small>5.7x</small> |
+| protobuf.js static | 5.84M ops/s &nbsp; <small>1.1x</small> | 2.45K ops/s &nbsp; <small>1.1x</small> | **78.9K ops/s** &nbsp; <small>1.0x</small> |
+| protobuf.js reflect | **6.54M ops/s** &nbsp; <small>1.0x</small> | **2.66K ops/s** &nbsp; <small>1.0x</small> | 77.0K ops/s &nbsp; <small>1.0x</small> |
+| JSON | 1.58M ops/s &nbsp; <small>4.1x</small> | 1.21K ops/s &nbsp; <small>2.2x</small> | 21.0K ops/s &nbsp; <small>3.8x</small> |
+| protoc-gen-js | 701K ops/s &nbsp; <small>9.3x</small> | 946 ops/s &nbsp; <small>2.8x</small> | 21.5K ops/s &nbsp; <small>3.7x</small> |
+| protoc-gen-es | 1.67M ops/s &nbsp; <small>3.9x</small> | 1.19K ops/s &nbsp; <small>2.2x</small> | 31.0K ops/s &nbsp; <small>2.5x</small> |
 
 </details>
 
 <!-- END BENCHMARK DATA -->
 
-[Structured results](./bench/results/latest.json) and environment details for this run are also available as committed artifacts.
+[Structured results](./bench/results/latest.json) include environment details for this run and are committed alongside the charts. The suite also runs in CI.
 
 To run the benchmark on your own hardware:
 
 ```sh
 npm --prefix bench install
+npm --prefix bench run generate
 npm run bench
 ```
 

package/dist/light/protobuf.js

@@ -1,6 +1,6 @@
 /*!
- * protobuf.js v8.7.2 (c) 2016, daniel wirtz
- * compiled sat, 08 aug 2026 13:15:56 utc
+ * protobuf.js v8.8.1 (c) 2016, daniel wirtz
+ * compiled sun, 11 oct 2026 17:08:01 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
@@ -446,7 +446,17 @@ function decoder(mtype) {
     ("if(q===undefined)q=0")
     ("if(q>Reader.recursionLimit)")
         ("throw Error(\"max depth exceeded\")")
-    ("var c=l===undefined?r.len:r.pos+l,m=g||new C" + (hasMapField ? ",k,v" : needsValueVar ? ",v" : ""))
+    ("var c,m" + (hasMapField ? ",k,v" : needsValueVar ? ",v" : ""))
+    ("if(l===undefined)")
+        ("c=r.len")
+    ("else{")
+        ("c=r.pos+l")
+        ("if(c>r.len)")
+            ("throw RangeError(\"index out of range\")")
+        ("l=r.len")
+        ("r.len=c")
+    ("}")
+    ("m=g||new C")
     ("while(r.pos<c){")
         ("var s=r.pos")
         ("var t=r.tag()")
@@ -473,7 +483,10 @@ function decoder(mtype) {
                 ("if(%s===util.emptyObject)", ref)
                     ("%s={}", ref);
             gen
-                ("var c2=r.uint32()+r.pos");
+                ("var c2=r.size()+r.pos")
+                ("if(c2>r.len)")
+                    ("throw RangeError(\"index out of range\")")
+                ("r.len=c2");
 
             if (types.defaults[field.keyType] !== undefined) gen
                 ("k=%j", types.defaults[field.keyType]);
@@ -502,7 +515,7 @@ function decoder(mtype) {
                                 ("break");
 
             if (types.basic[type] === undefined) gen
-                            ("v=types[%i].decode(r,r.uint32(),undefined,q+1,v)", i); // can't be groups
+                            ("v=types[%i].decode(r,r.size(),undefined,q+1,v)", i); // can't be groups
             else gen
                             ("v=r.%s()", type === "string" ? stringMethod(field) : type);
 
@@ -511,6 +524,10 @@ function decoder(mtype) {
                     ("}")
                     ("r.skipType(u,q,t2)")
                 ("}");
+            gen
+                ("if(r.pos!==c2)")
+                    ("throw RangeError(\"index out of range\")")
+                ("r.len=c");
 
             if (closed) { gen
                 ("if(types[%i].valuesById[v]===undefined){", i);
@@ -543,7 +560,10 @@ function decoder(mtype) {
                 ("if(u===2){");
                 if (closed) {
                     gen
-                    ("var c2=r.uint32()+r.pos")
+                    ("var c2=r.size()+r.pos")
+                    ("if(c2>r.len)")
+                        ("throw RangeError(\"index out of range\")")
+                    ("r.len=c2")
                     ("while(r.pos<c2){")
                         ("s=r.pos")
                         ("v=r.%s()", type)
@@ -554,6 +574,10 @@ function decoder(mtype) {
                         ("}else");
                             genPreserveUnknown(gen, "util.rawField(" + field.id + ",0,r.raw(s,r.pos))")
                     ("}");
+                    gen
+                    ("if(r.pos!==c2)")
+                        ("throw RangeError(\"index out of range\")")
+                    ("r.len=c");
                 } else gen
                     ("if(!(%s&&%s.length))", ref, ref)
                         ("%s=[]", ref)
@@ -574,7 +598,7 @@ function decoder(mtype) {
                 if (field.delimited) gen
                     ("%s.push(types[%i].decode(r,undefined,%i,q+1))", ref, i, field.id * 8 + 4);
                 else gen
-                    ("%s.push(types[%i].decode(r,r.uint32(),undefined,q+1))", ref, i);
+                    ("%s.push(types[%i].decode(r,r.size(),undefined,q+1))", ref, i);
             } else if (closed) { gen
                     ("v=r.%s()", type)
                     ("if(types[%i].valuesById[v]!==undefined){", i)
@@ -595,7 +619,7 @@ function decoder(mtype) {
             if (field.delimited) gen
                 ("%s=types[%i].decode(r,undefined,%i,q+1,%s)", ref, i, field.id * 8 + 4, ref);
             else gen
-                ("%s=types[%i].decode(r,r.uint32(),undefined,q+1,%s)", ref, i, ref);
+                ("%s=types[%i].decode(r,r.size(),undefined,q+1,%s)", ref, i, ref);
         }
         else if (field.hasPresence) {
             gen
@@ -662,6 +686,11 @@ function decoder(mtype) {
         ("r.skipType(%s,q,t)", i ? "u" : "t&7");
     genPreserveUnknown(gen, "r.raw(s,r.pos)")
     ("}")
+    ("if(l!==undefined){")
+        ("if(r.pos!==c)")
+            ("throw RangeError(\"index out of range\")")
+        ("r.len=l")
+    ("}")
     ("if(z!==undefined)")
         ("throw Error(\"missing end group\")");
 
@@ -882,6 +911,12 @@ function Enum(name, values, options, comment, comments, valuesOptions) {
      */
     this.reserved = undefined; // toJSON
 
+    /**
+     * Declared symbol visibility, if any.
+     * @type {"local"|"export"|undefined}
+     */
+    this.visibility = undefined; // toJSON
+
     // Note that values inherit valuesById on their prototype which makes them a TypeScript-
     // compatible enum. This is used by pbts to write actual enum definitions that work for
     // static and reflection code alike instead of emitting generic object definitions.
@@ -918,6 +953,7 @@ Enum.prototype._resolveFeatures = function _resolveFeatures(edition) {
  * @property {Object.<string,*>} [options] Enum options
  * @property {Object.<string,Object.<string,*>>} [valuesOptions] Enum value options
  * @property {Array.<number[]|string>} [reserved] Reserved ranges
+ * @property {"local"|"export"} [visibility] Declared symbol visibility
  * @property {string|null} [comment] Enum comment
  * @property {Object.<string,string|null>} [comments] Value comments
  */
@@ -932,6 +968,8 @@ Enum.prototype._resolveFeatures = function _resolveFeatures(edition) {
 Enum.fromJSON = function fromJSON(name, json) {
     var enm = new Enum(name, json.values, json.options, json.comment, json.comments, json.valuesOptions);
     enm.reserved = json.reserved;
+    if (json.visibility)
+        enm.visibility = json.visibility;
     if (json.edition)
         enm._edition = json.edition;
     enm._defaultEdition = "proto3";  // For backwards-compatibility.
@@ -951,6 +989,7 @@ Enum.prototype.toJSON = function toJSON(toJSONOptions) {
         "valuesOptions" , this.valuesOptions,
         "values"        , this.values,
         "reserved"      , this.reserved && this.reserved.length ? this.reserved : undefined,
+        "visibility"    , this.visibility,
         "comment"       , keepComments ? this.comment : undefined,
         "comments"      , keepComments ? this.comments : undefined
     ]);
@@ -2761,10 +2800,11 @@ var Root; // cyclic
 
 /* eslint-disable no-warning-comments */
 // TODO: Replace with embedded proto.
-var editions2024Defaults = {enum_type: "OPEN", field_presence: "EXPLICIT", json_format: "ALLOW", message_encoding: "LENGTH_PREFIXED", repeated_field_encoding: "PACKED", utf8_validation: "VERIFY", enforce_naming_style: "STYLE2024", default_symbol_visibility: "EXPORT_TOP_LEVEL" };
-var editions2023Defaults = {enum_type: "OPEN", field_presence: "EXPLICIT", json_format: "ALLOW", message_encoding: "LENGTH_PREFIXED", repeated_field_encoding: "PACKED", utf8_validation: "VERIFY", enforce_naming_style: "STYLE_LEGACY", default_symbol_visibility: "EXPORT_ALL" };
 var proto2Defaults = {enum_type: "CLOSED", field_presence: "EXPLICIT", json_format: "LEGACY_BEST_EFFORT", message_encoding: "LENGTH_PREFIXED", repeated_field_encoding: "EXPANDED", utf8_validation: "NONE", enforce_naming_style: "STYLE_LEGACY", default_symbol_visibility: "EXPORT_ALL" };
 var proto3Defaults = {enum_type: "OPEN", field_presence: "IMPLICIT", json_format: "ALLOW", message_encoding: "LENGTH_PREFIXED", repeated_field_encoding: "PACKED", utf8_validation: "VERIFY", enforce_naming_style: "STYLE_LEGACY", default_symbol_visibility: "EXPORT_ALL" };
+var editions2023Defaults = {enum_type: "OPEN", field_presence: "EXPLICIT", json_format: "ALLOW", message_encoding: "LENGTH_PREFIXED", repeated_field_encoding: "PACKED", utf8_validation: "VERIFY", enforce_naming_style: "STYLE_LEGACY", default_symbol_visibility: "EXPORT_ALL" };
+var editions2024Defaults = {enum_type: "OPEN", field_presence: "EXPLICIT", json_format: "ALLOW", message_encoding: "LENGTH_PREFIXED", repeated_field_encoding: "PACKED", utf8_validation: "VERIFY", enforce_naming_style: "STYLE2024", default_symbol_visibility: "EXPORT_TOP_LEVEL" };
+var editions2026Defaults = {enum_type: "OPEN", field_presence: "EXPLICIT", json_format: "ALLOW", message_encoding: "LENGTH_PREFIXED", repeated_field_encoding: "PACKED", utf8_validation: "VERIFY", enforce_naming_style: "STYLE2026", default_symbol_visibility: "STRICT", enforce_proto_limits: "PROTO_LIMITS2026" };
 
 /**
  * Constructs a new reflection object instance.
@@ -2978,6 +3018,8 @@ ReflectionObject.prototype._resolveFeatures = function _resolveFeatures(edition)
             defaults = Object.assign({}, editions2023Defaults);
         } else if (edition === "2024") {
             defaults = Object.assign({}, editions2024Defaults);
+        } else if (edition === "2026") {
+            defaults = Object.assign({}, editions2026Defaults);
         } else {
             throw new Error("Unknown edition: " + edition);
         }
@@ -3474,12 +3516,32 @@ Reader.prototype.raw = function read_raw(start, end) {
     return this.buf.subarray(start, end);
 };
 
+function readVarint32NearEnd(reader) {
+    // Safely read up to four bytes of a varint32 near the reader limit
+    var value = 0;
+    for (var i = 0; i < 4; ++i) {
+        if (reader.pos >= reader.len)
+            throw indexOutOfRange(reader);
+        var b = reader.buf[reader.pos++];
+        value = (value | (b & 127) << i * 7) >>> 0;
+        if (b < 128)
+            return value;
+    }
+    throw indexOutOfRange(reader);
+}
+
 /**
  * Reads a varint as an unsigned 32 bit value.
  * @function
  * @returns {number} Value read
  */
 Reader.prototype.uint32 = function read_uint32() {
+    if (this.len - this.pos < 5) {
+        if (this.pos >= this.len)
+            throw indexOutOfRange(this);
+        if (this.buf[this.pos] >= 128)
+            return readVarint32NearEnd(this);
+    }
     var buf = this.buf,
         pos = this.pos,
         value = (buf[pos] & 127) >>> 0;
@@ -3530,6 +3592,12 @@ Reader.prototype.uint32 = function read_uint32() {
  * @returns {number} Tag read
  */
 Reader.prototype.tag = function read_tag() {
+    if (this.len - this.pos < 5) {
+        if (this.pos >= this.len)
+            throw indexOutOfRange(this);
+        if (this.buf[this.pos] >= 128)
+            return readVarint32NearEnd(this);
+    }
     var buf = this.buf,
         pos = this.pos,
         value = (buf[pos] & 127) >>> 0;
@@ -3562,6 +3630,45 @@ Reader.prototype.tag = function read_tag() {
     throw Error("invalid tag encoding");
 };
 
+/**
+ * Reads a varint length prefix within signed 32 bit range.
+ * @returns {number} Length read
+ */
+Reader.prototype.size = function read_size() {
+    if (this.len - this.pos < 5) {
+        if (this.pos >= this.len)
+            throw indexOutOfRange(this);
+        if (this.buf[this.pos] >= 128)
+            return readVarint32NearEnd(this);
+    }
+    var buf = this.buf,
+        pos = this.pos,
+        value = (buf[pos] & 127) >>> 0;
+    if (buf[pos++] < 128) {
+        this.pos = pos;
+        return value;
+    }
+    value = (value | (buf[pos] & 127) << 7) >>> 0;
+    if (buf[pos++] < 128) {
+        this.pos = pos;
+        return value;
+    }
+    value = (value | (buf[pos] & 127) << 14) >>> 0;
+    if (buf[pos++] < 128) {
+        this.pos = pos;
+        return value;
+    }
+    value = (value | (buf[pos] & 127) << 21) >>> 0;
+    if (buf[pos++] < 128) {
+        this.pos = pos;
+        return value;
+    }
+    this.pos = pos + 1;
+    if (buf[pos] > 7)
+        throw Error("invalid length encoding");
+    return (value | buf[pos] << 28) >>> 0;
+};
+
 /**
  * Reads a varint as a signed 32 bit value.
  * @returns {number} Value read
@@ -3775,7 +3882,9 @@ Reader.prototype.double = function read_double() {
  */
 Reader.prototype.uint32s = function read_uint32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, buf = this.buf, pos = this.pos, value;
+    var end = this.size() + this.pos, len = this.len, buf = this.buf, pos = this.pos, value;
+    if (end > len) throw indexOutOfRange(this, end - this.pos);
+    this.len = end;
     while (pos < end) {
         value = buf[pos++];
         if (value < 128)
@@ -3787,6 +3896,8 @@ Reader.prototype.uint32s = function read_uint32s(array) {
         }
     }
     this.pos = pos;
+    if (pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -3797,7 +3908,9 @@ Reader.prototype.uint32s = function read_uint32s(array) {
  */
 Reader.prototype.int32s = function read_int32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, buf = this.buf, pos = this.pos, value;
+    var end = this.size() + this.pos, len = this.len, buf = this.buf, pos = this.pos, value;
+    if (end > len) throw indexOutOfRange(this, end - this.pos);
+    this.len = end;
     while (pos < end) {
         value = buf[pos++];
         if (value < 128)
@@ -3809,6 +3922,8 @@ Reader.prototype.int32s = function read_int32s(array) {
         }
     }
     this.pos = pos;
+    if (pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -3819,9 +3934,13 @@ Reader.prototype.int32s = function read_int32s(array) {
  */
 Reader.prototype.sint32s = function read_sint32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos;
+    var end = this.size() + this.pos, len = this.len;
+    if (end > len) throw indexOutOfRange(this, end - this.pos);
+    this.len = end;
     while (this.pos < end)
         array.push(this.sint32());
+    if (this.pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -3832,7 +3951,9 @@ Reader.prototype.sint32s = function read_sint32s(array) {
  */
 Reader.prototype.bools = function read_bools(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, buf = this.buf, pos = this.pos, value;
+    var end = this.size() + this.pos, len = this.len, buf = this.buf, pos = this.pos, value;
+    if (end > len) throw indexOutOfRange(this, end - this.pos);
+    this.len = end;
     while (pos < end) {
         value = buf[pos++];
         if (value < 128)
@@ -3844,6 +3965,8 @@ Reader.prototype.bools = function read_bools(array) {
         }
     }
     this.pos = pos;
+    if (pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -3866,7 +3989,7 @@ function getLazyView(reader, count, threshold) {
  */
 Reader.prototype.fixed32s = function read_fixed32s(array) {
     if (array === undefined) array = [];
-    var len = this.uint32(), end = this.pos + len;
+    var len = this.size(), end = this.pos + len;
     /* istanbul ignore if */
     if (end > this.len) throw indexOutOfRange(this, len);
     var count = len >>> 2, i = array.length, pos = this.pos;
@@ -3890,7 +4013,7 @@ Reader.prototype.fixed32s = function read_fixed32s(array) {
  */
 Reader.prototype.sfixed32s = function read_sfixed32s(array) {
     if (array === undefined) array = [];
-    var len = this.uint32(), end = this.pos + len;
+    var len = this.size(), end = this.pos + len;
     /* istanbul ignore if */
     if (end > this.len) throw indexOutOfRange(this, len);
     var count = len >>> 2, i = array.length, pos = this.pos;
@@ -3914,7 +4037,7 @@ Reader.prototype.sfixed32s = function read_sfixed32s(array) {
  */
 Reader.prototype.floats = function read_floats(array) {
     if (array === undefined) array = [];
-    var len = this.uint32(), end = this.pos + len;
+    var len = this.size(), end = this.pos + len;
     /* istanbul ignore if */
     if (end > this.len) throw indexOutOfRange(this, len);
     var count = len >>> 2, i = array.length, pos = this.pos;
@@ -3938,7 +4061,7 @@ Reader.prototype.floats = function read_floats(array) {
  */
 Reader.prototype.doubles = function read_doubles(array) {
     if (array === undefined) array = [];
-    var len = this.uint32(), end = this.pos + len;
+    var len = this.size(), end = this.pos + len;
     /* istanbul ignore if */
     if (end > this.len) throw indexOutOfRange(this, len);
     var count = len >>> 3, i = array.length, pos = this.pos;
@@ -3962,9 +4085,13 @@ Reader.prototype.doubles = function read_doubles(array) {
  */
 Reader.prototype.uint64s = function read_uint64s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos;
+    var end = this.size() + this.pos, len = this.len;
+    if (end > len) throw indexOutOfRange(this, end - this.pos);
+    this.len = end;
     while (this.pos < end)
         array.push(this.uint64());
+    if (this.pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -3975,9 +4102,13 @@ Reader.prototype.uint64s = function read_uint64s(array) {
  */
 Reader.prototype.int64s = function read_int64s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos;
+    var end = this.size() + this.pos, len = this.len;
+    if (end > len) throw indexOutOfRange(this, end - this.pos);
+    this.len = end;
     while (this.pos < end)
         array.push(this.int64());
+    if (this.pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -3988,9 +4119,13 @@ Reader.prototype.int64s = function read_int64s(array) {
  */
 Reader.prototype.sint64s = function read_sint64s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos;
+    var end = this.size() + this.pos, len = this.len;
+    if (end > len) throw indexOutOfRange(this, end - this.pos);
+    this.len = end;
     while (this.pos < end)
         array.push(this.sint64());
+    if (this.pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -4001,7 +4136,7 @@ Reader.prototype.sint64s = function read_sint64s(array) {
  */
 Reader.prototype.fixed64s = function read_fixed64s(array) {
     if (array === undefined) array = [];
-    var len = this.uint32(), end = this.pos + len, i = array.length;
+    var len = this.size(), end = this.pos + len, i = array.length;
     /* istanbul ignore if */
     if (end > this.len) throw indexOutOfRange(this, len);
     var count = len >>> 3;
@@ -4019,7 +4154,7 @@ Reader.prototype.fixed64s = function read_fixed64s(array) {
  */
 Reader.prototype.sfixed64s = function read_sfixed64s(array) {
     if (array === undefined) array = [];
-    var len = this.uint32(), end = this.pos + len, i = array.length;
+    var len = this.size(), end = this.pos + len, i = array.length;
     /* istanbul ignore if */
     if (end > this.len) throw indexOutOfRange(this, len);
     var count = len >>> 3;
@@ -4035,7 +4170,7 @@ Reader.prototype.sfixed64s = function read_sfixed64s(array) {
  * @returns {Uint8Array} Value read
  */
 Reader.prototype.bytes = function read_bytes() {
-    var length = this.uint32(),
+    var length = this.size(),
         start  = this.pos,
         end    = this.pos + length;
 
@@ -4052,7 +4187,7 @@ Reader.prototype.bytes = function read_bytes() {
  * @returns {string} Value read
  */
 Reader.prototype.string = function read_string() {
-    var length = this.uint32(),
+    var length = this.size(),
         start  = this.pos,
         end    = this.pos + length;
 
@@ -4069,7 +4204,7 @@ Reader.prototype.string = function read_string() {
  * @returns {string} Value read
  */
 Reader.prototype.stringVerify = function read_string_verify() {
-    var length = this.uint32(),
+    var length = this.size(),
         start  = this.pos,
         end    = this.pos + length;
 
@@ -4135,7 +4270,7 @@ Reader.prototype.skipType = function(wireType, depth, fieldNumber) {
             this.skip(8);
             break;
         case 2:
-            this.skip(this.uint32());
+            this.skip(this.size());
             break;
         case 3:
             while (true) {
@@ -4250,7 +4385,7 @@ BufferReader.prototype.raw = function read_raw_buffer(start, end) {
  * @override
  */
 BufferReader.prototype.string = function read_string_buffer() {
-    var len = this.uint32(), // modifies pos
+    var len = this.size(), // modifies pos
         start = this.pos,
         end = this.pos + len;
 
@@ -5195,6 +5330,12 @@ function Type(name, options) {
      */
     this.group = undefined; // toJSON
 
+    /**
+     * Declared symbol visibility, if any.
+     * @type {"local"|"export"|undefined}
+     */
+    this.visibility = undefined; // toJSON
+
     /**
      * Cached fields by id.
      * @type {Object.<number,Field>|null}
@@ -5379,6 +5520,7 @@ function clearCache(type) {
  * @property {number[][]} [extensions] Extension ranges
  * @property {Array.<number[]|string>} [reserved] Reserved ranges
  * @property {boolean} [group=false] Whether a legacy group or not
+ * @property {"local"|"export"} [visibility] Declared symbol visibility
  * @property {string|null} [comment] Message type comment
  */
 
@@ -5429,6 +5571,8 @@ Type.fromJSON = function fromJSON(name, json, depth) {
         type.reserved = json.reserved;
     if (json.group)
         type.group = true;
+    if (json.visibility)
+        type.visibility = json.visibility;
     if (json.comment)
         type.comment = json.comment;
     if (json.edition)
@@ -5453,6 +5597,7 @@ Type.prototype.toJSON = function toJSON(toJSONOptions) {
         "extensions" , this.extensions && this.extensions.length ? this.extensions : undefined,
         "reserved"   , this.reserved && this.reserved.length ? this.reserved : undefined,
         "group"      , this.group || undefined,
+        "visibility" , this.visibility,
         "nested"     , inherited && inherited.nested || undefined,
         "comment"    , keepComments ? this.comment : undefined
     ]);
@@ -5715,7 +5860,7 @@ Type.prototype.decode = function decode_setup(reader, length) { // eslint-disabl
 Type.prototype.decodeDelimited = function decodeDelimited(reader) {
     if (!(reader instanceof Reader))
         reader = Reader.create(reader);
-    return this.decode(reader, reader.uint32());
+    return this.decode(reader, reader.size());
 };
 
 /**
@@ -8416,6 +8561,10 @@ var Message = require(10),
 wrappers[".google.protobuf.Any"] = {
 
     fromObject: function(object, depth) {
+        if (depth === undefined)
+            depth = 0;
+        if (depth > util.recursionLimit)
+            throw Error("max depth exceeded");
 
         // unwrap value type if mapped
         if (object && object["@type"]) {
@@ -8433,7 +8582,7 @@ wrappers[".google.protobuf.Any"] = {
                 }
                 return this.create({
                     type_url: type_url,
-                    value: type.encode(type.fromObject(object, depth === undefined ? 1 : depth + 1)).finish()
+                    value: type.encode(type.fromObject(object, depth + 1)).finish()
                 });
             }
         }