protobufjs 8.7.1 → 8.8.0

package/src/parse.js

@@ -23,6 +23,8 @@ var base10Re    = /^[1-9][0-9]*$/,
     base16NegRe = /^-?0[x][0-9a-fA-F]+$/,
     base8Re     = /^0[0-7]+$/,
     base8NegRe  = /^-?0[0-7]+$/,
+    integerTypeRe = /^(?:u?int|sint|s?fixed)(?:32|64)$/,
+    unsignedTypeRe = /^(?:uint|fixed)(?:32|64)$/,
     numberRe    = util.patterns.numberRe,
     nameRe      = /^[a-zA-Z_][a-zA-Z_0-9]*$/,
     typeRefRe   = util.patterns.typeRefRe;
@@ -202,7 +204,7 @@ function parse(source, root, options) {
             case "nan": case "NAN": case "Nan": case "NaN":
                 return NaN;
             case "0":
-                return 0;
+                return sign * 0;
         }
         if (base10Re.test(token))
             return sign * parseInt(token, 10);
@@ -219,32 +221,31 @@ function parse(source, root, options) {
         throw illegal(token, "number", insideTryCatch);
     }
 
-    function parseId(token, acceptNegative, max) {
-        if (token === null) {
+    function parseInteger(token, acceptNegative, name) {
+        if (token === null)
             throw illegal(token, "end of input");
-        }
+        if (!acceptNegative && token.charAt(0) === "-")
+            throw illegal(token, name || "integer");
+        if (token === "0" || token === "-0")
+            return 0;
+        var value;
+        if (base10NegRe.test(token))
+            value = parseInt(token, 10);
+        else if (base16NegRe.test(token))
+            value = parseInt(token, 16);
+        else if (base8NegRe.test(token))
+            value = parseInt(token, 8);
+        else
+            throw illegal(token, name || "integer");
+        return value || 0;
+    }
+
+    function parseId(token, acceptNegative, max) {
         switch (token) {
             case "max": case "MAX": case "Max":
                 return max || maxFieldId;
-            case "0":
-                return 0;
         }
-
-        /* istanbul ignore if */
-        if (!acceptNegative && token.charAt(0) === "-")
-            throw illegal(token, "id");
-
-        if (base10NegRe.test(token))
-            return parseInt(token, 10);
-        if (base16NegRe.test(token))
-            return parseInt(token, 16);
-
-        /* istanbul ignore else */
-        if (base8NegRe.test(token))
-            return parseInt(token, 8);
-
-        /* istanbul ignore next */
-        throw illegal(token, "id");
+        return parseInteger(token, acceptNegative, "id");
     }
 
     function parsePackage() {
@@ -307,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))
@@ -341,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;
@@ -348,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);
@@ -455,6 +459,7 @@ function parse(source, root, options) {
         if (parent === ptr) {
             topLevelObjects.push(type);
         }
+        return type;
     }
 
     function parseField(parent, rule, extend, depth) {
@@ -719,6 +724,7 @@ function parse(source, root, options) {
         if (parent === ptr) {
             topLevelObjects.push(enm);
         }
+        return enm;
     }
 
     function parseEnumValue(token) {
@@ -881,7 +887,9 @@ function parse(source, root, options) {
             return objectResult;
         }
 
-        var simpleValue = readValue(true);
+        var simpleValue = name === "default" && parent instanceof Field && integerTypeRe.test(parent.type)
+            ? parseInteger(next(), !unsignedTypeRe.test(parent.type))
+            : readValue(true);
         setOption(parent, name, simpleValue);
         return simpleValue;
         // Does not enforce a delimiter to be universal

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;
@@ -395,9 +421,22 @@ Reader.prototype.double = function read_double() {
  */
 Reader.prototype.uint32s = function read_uint32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos;
-    while (this.pos < end)
-        array.push(this.uint32());
+    var end = this.uint32() + 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)
+            array.push(value);
+        else {
+            this.pos = pos - 1;
+            array.push(this.uint32());
+            pos = this.pos;
+        }
+    }
+    this.pos = pos;
+    if (pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -408,9 +447,22 @@ Reader.prototype.uint32s = function read_uint32s(array) {
  */
 Reader.prototype.int32s = function read_int32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos;
-    while (this.pos < end)
-        array.push(this.int32());
+    var end = this.uint32() + 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)
+            array.push(value);
+        else {
+            this.pos = pos - 1;
+            array.push(this.int32());
+            pos = this.pos;
+        }
+    }
+    this.pos = pos;
+    if (pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -421,9 +473,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.uint32() + 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;
 };
 
@@ -434,9 +490,22 @@ Reader.prototype.sint32s = function read_sint32s(array) {
  */
 Reader.prototype.bools = function read_bools(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos;
-    while (this.pos < end)
-        array.push(this.bool());
+    var end = this.uint32() + 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)
+            array.push(value !== 0);
+        else {
+            this.pos = pos - 1;
+            array.push(this.bool());
+            pos = this.pos;
+        }
+    }
+    this.pos = pos;
+    if (pos !== end) throw RangeError("index out of range");
+    this.len = len;
     return array;
 };
 
@@ -555,9 +624,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.uint32() + 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;
 };
 
@@ -568,9 +641,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.uint32() + 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;
 };
 
@@ -581,9 +658,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.uint32() + 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;
 };
 

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
     ]);

package/src/util/codegen.js

@@ -64,7 +64,9 @@ function codegen(functionParams, functionName) {
         formatStringOrScope = formatStringOrScope.replace(/%([%dfijs])/g, function replace($0, $1) {
             var value = formatParams[formatOffset++];
             switch ($1) {
-                case "d": case "f": return String(Number(value));
+                case "d": case "f":
+                    value = Number(value);
+                    return Object.is(value, -0) ? "-0" : String(value);
                 case "i": return String(Math.floor(value));
                 case "j": return JSON.stringify(value);
                 case "s": return String(value);

package/src/util/utf8.js

@@ -6,7 +6,6 @@
  * @namespace
  */
 var utf8 = exports,
-    replacementChar = "\ufffd",
     looseDecoder = new TextDecoder("utf-8", { ignoreBOM: true }),
     strictDecoder;
 var TEXT_DECODER_MIN_LENGTH = 64;
@@ -41,31 +40,6 @@ utf8.length = function utf8_length(string) {
     return len;
 };
 
-function utf8_read_js(buffer, start, end, str) {
-    for (var i = start; i < end;) {
-        var t = buffer[i++];
-        if (t <= 0x7F) {
-            str += String.fromCharCode(t);
-        } else if (t >= 0xC0 && t < 0xE0) {
-            var c2 = (t & 0x1F) << 6 | buffer[i++] & 0x3F;
-            str += c2 >= 0x80 ? String.fromCharCode(c2) : replacementChar;
-        } else if (t >= 0xE0 && t < 0xF0) {
-            var c3 = (t & 0xF) << 12 | (buffer[i++] & 0x3F) << 6 | buffer[i++] & 0x3F;
-            str += c3 >= 0x800 ? String.fromCharCode(c3) : replacementChar;
-        } else if (t >= 0xF0) {
-            var t2 = (t & 7) << 18 | (buffer[i++] & 0x3F) << 12 | (buffer[i++] & 0x3F) << 6 | buffer[i++] & 0x3F;
-            if (t2 < 0x10000 || t2 > 0x10FFFF)
-                str += replacementChar;
-            else {
-                t2 -= 0x10000;
-                str += String.fromCharCode(0xD800 + (t2 >> 10));
-                str += String.fromCharCode(0xDC00 + (t2 & 0x3FF));
-            }
-        }
-    }
-    return str;
-}
-
 function utf8_read_decoder(decoder, buffer, start, end) {
     var source = start === 0 && end === buffer.length
         ? buffer
@@ -100,14 +74,14 @@ utf8.read = function utf8_read_loose(buffer, start, end) {
         c7 = buffer[i + 6];
         c8 = buffer[i + 7];
         if ((c1 | c2 | c3 | c4 | c5 | c6 | c7 | c8) & 0x80)
-            return utf8_read_js(buffer, i, end, str);
+            return str + utf8_read_decoder(looseDecoder, buffer, i, end);
         str += String.fromCharCode(c1, c2, c3, c4, c5, c6, c7, c8);
     }
 
     for (; i < end; ++i) {
         c1 = buffer[i];
         if (c1 & 0x80)
-            return utf8_read_js(buffer, i, end, str);
+            return str + utf8_read_decoder(looseDecoder, buffer, i, end);
         str += String.fromCharCode(c1);
     }
 

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()
                 });
             }
         }

package/src/writer.js

@@ -26,7 +26,7 @@ function Writer() {
      * Backing buffer.
      * @type {Uint8Array}
      */
-    this.buf = this.constructor.alloc(64);
+    this.buf = this.constructor.alloc(Writer.initialBufferSize);
 
     /**
      * Cached DataView over {@link Writer#buf}.
@@ -41,6 +41,12 @@ function Writer() {
     this.states = null;
 }
 
+/**
+ * Initial backing buffer size in bytes. Defaults to 128.
+ * @type {number}
+ */
+Writer.initialBufferSize = 128;
+
 /**
  * Current write position.
  * @name Writer#len