protobufjs 8.7.2 → 8.8.1

package/src/object.js

@@ -10,10 +10,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.
@@ -227,6 +228,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);
         }

package/src/parse.js

@@ -308,7 +308,7 @@ function parse(source, root, options) {
     function parseEdition() {
         skip("=");
         edition = readString();
-        const supportedEditions = ["2023", "2024"];
+        const supportedEditions = ["2023", "2024", "2026"];
 
         /* istanbul ignore if */
         if (!supportedEditions.includes(edition))
@@ -342,6 +342,7 @@ function parse(source, root, options) {
                 if (edition < "2024") {
                     return false;
                 }
+                var visibility = token;
                 token = next();
                 if (token === "export" || token === "local") {
                     return false;
@@ -349,9 +350,11 @@ function parse(source, root, options) {
                 if (token !== "message" && token !== "enum") {
                     return false;
                 }
-                /* eslint-disable no-warning-comments */
-                // TODO: actually enforce visiblity modifiers like protoc does.
-                return parseCommon(parent, token, depth);
+                (token === "message"
+                    ? parseType(parent, token, depth + 1)
+                    : parseEnum(parent, token)
+                ).visibility = visibility;
+                return true;
 
             case "service":
                 parseService(parent, token, depth + 1);
@@ -456,6 +459,7 @@ function parse(source, root, options) {
         if (parent === ptr) {
             topLevelObjects.push(type);
         }
+        return type;
     }
 
     function parseField(parent, rule, extend, depth) {
@@ -720,6 +724,7 @@ function parse(source, root, options) {
         if (parent === ptr) {
             topLevelObjects.push(enm);
         }
+        return enm;
     }
 
     function parseEnumValue(token) {

package/src/reader.js

@@ -94,12 +94,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;
@@ -150,6 +170,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;
@@ -182,6 +208,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
@@ -395,7 +460,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)
@@ -407,6 +474,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;
 };
 
@@ -417,7 +486,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)
@@ -429,6 +500,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;
 };
 
@@ -439,9 +512,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;
 };
 
@@ -452,7 +529,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)
@@ -464,6 +543,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;
 };
 
@@ -486,7 +567,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;
@@ -510,7 +591,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;
@@ -534,7 +615,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;
@@ -558,7 +639,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;
@@ -582,9 +663,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;
 };
 
@@ -595,9 +680,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;
 };
 
@@ -608,9 +697,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;
 };
 
@@ -621,7 +714,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;
@@ -639,7 +732,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;
@@ -655,7 +748,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;
 
@@ -672,7 +765,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;
 
@@ -689,7 +782,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;
 
@@ -755,7 +848,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) {

package/src/reader_buffer.js

@@ -53,7 +53,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;
 

package/src/tokenize.js

@@ -9,13 +9,19 @@ var setCommentRe = /^ *[*/]+ */,
     setCommentAltRe = /^\s*\*?\/*/,
     setCommentSplitRe = /\n/g,
     whitespaceRe = /\s/,
-    unescapeRe = /\\(.?)/g;
+    unescapeRe = /\\([0-7]{1,3}|[xX][0-9a-fA-F]{1,2}|.?)/g;
 
 var unescapeMap = {
-    "0": "\0",
+    "a": "\x07",
+    "b": "\b",
+    "f": "\f",
     "r": "\r",
     "n": "\n",
-    "t": "\t"
+    "t": "\t",
+    "v": "\v",
+    "?": "?",
+    "'": "'",
+    "\"": "\""
 };
 
 /**
@@ -27,6 +33,11 @@ var unescapeMap = {
  */
 function unescape(str) {
     return str.replace(unescapeRe, function($0, $1) {
+        var first = $1.charAt(0);
+        if (first >= "0" && first <= "7")
+            return String.fromCharCode(parseInt($1, 8) & 255);
+        if (first === "x" || first === "X")
+            return String.fromCharCode(parseInt($1.substring(1), 16));
         switch ($1) {
             case "\\":
             case "":

package/src/type.js

@@ -70,6 +70,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}
@@ -254,6 +260,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
  */
 
@@ -304,6 +311,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)
@@ -328,6 +337,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
     ]);
@@ -590,7 +600,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());
 };
 
 /**

package/src/wrappers.js

@@ -40,6 +40,10 @@ var Message = require("./message"),
 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"]) {
@@ -57,7 +61,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()
                 });
             }
         }