protobufjs 8.8.0 → 8.8.1

package/ext/descriptor.js

@@ -1,6 +1,7 @@
 "use strict";
 var $protobuf = require("../light");
 module.exports = exports = $protobuf.descriptor = $protobuf.Root.fromJSON(require("../google/protobuf/descriptor.json")).lookup(".google.protobuf");
+exports.root.define("pb").addJSON(require("../google/protobuf/json_enumvalue_options.json").nested.pb.nested);
 
 var Namespace = $protobuf.Namespace,
     Root      = $protobuf.Root,
@@ -1091,6 +1092,10 @@ function fromDescriptorOptionsRecursive(obj, type) {
         if ((key = (field = type._fieldsArray[i]).name) === "uninterpretedOption") continue;
         if (!Object.prototype.hasOwnProperty.call(obj, key)) continue;
 
+        if (key === ".pb.enumvalue.json") {
+            val["(pb.enumvalue.json).string"] = obj[key].string === undefined ? "" : obj[key].string;
+            continue;
+        }
         var newKey = underScore(key);
         if (field.resolvedType instanceof Type) {
             val[newKey] = fromDescriptorOptionsRecursive(obj[key], field.resolvedType);
@@ -1115,6 +1120,10 @@ function toDescriptorOptionsRecursive(obj, type) {
     var keys = Object.keys(obj);
     for (var i = 0; i < keys.length; ++i) {
         var key = keys[i];
+        if (type === exports.EnumValueOptions && key === "(pb.enumvalue.json).string") {
+            val[".pb.enumvalue.json"] = { string: obj[key] };
+            continue;
+        }
         var newKey = $protobuf.util.camelCase(key);
         if (!Object.prototype.hasOwnProperty.call(type.fields, newKey)) continue;
         var field = type.fields[newKey];

package/ext/protojson.js

@@ -241,11 +241,19 @@ function readScalar(type, value, name) {
     }
 }
 
+function enumJsonName(enm, name) {
+    var options = hasOwn(enm.valuesOptions, name) && enm.valuesOptions[name];
+    return hasOwn(options, "(pb.enumvalue.json).string") ? options["(pb.enumvalue.json).string"] : undefined;
+}
+
 function readEnum(enm, value, name, options) {
     if (typeof value === "string") {
-        var num = enm.values[value];
-        if (num !== undefined)
-            return num;
+        if (hasOwn(enm.values, value))
+            return enm.values[value];
+        if (enm.valuesOptions)
+            for (var names = Object.keys(enm.valuesOptions), i = 0; i < names.length; ++i)
+                if (hasOwn(enm.values, names[i]) && enumJsonName(enm, names[i]) === value)
+                    return enm.values[names[i]];
         if (options.ignoreUnknownFields)
             return SKIP;
         throw invalid(name, value, "unknown enum value");
@@ -448,7 +456,10 @@ function writeSingular(field, value, options, depth) {
         if (field.resolvedType.fullName === ".google.protobuf.NullValue")
             return null;
         var name = field.resolvedType.valuesById[value];
-        return name === undefined ? value : name;
+        if (name === undefined)
+            return value;
+        var jsonName = enumJsonName(field.resolvedType, name);
+        return jsonName === undefined ? name : jsonName;
     }
     return writeScalar(field.type, value);
 }

package/google/protobuf/descriptor.json

@@ -971,6 +971,10 @@
                 }
               },
               "extensions": [
+                [
+                  990,
+                  998
+                ],
                 [
                   1000,
                   536870911

package/google/protobuf/descriptor.proto

@@ -341,6 +341,7 @@ message EnumValueOptions {
     optional FieldOptions.FeatureSupport feature_support = 4;
     repeated UninterpretedOption uninterpreted_option = 999;
 
+    extensions 990 to 998;
     extensions 1000 to max;
 }
 

package/google/protobuf/json_enumvalue_options.json

@@ -0,0 +1,56 @@
+{
+  "nested": {
+    "pb": {
+      "nested": {
+        "enumvalue": {
+          "options": {
+            "java_package": "com.google.protobuf.util"
+          },
+          "nested": {
+            "JsonEnumValueOptions": {
+              "edition": "2024",
+              "fields": {
+                "string": {
+                  "type": "string",
+                  "id": 1
+                }
+              },
+              "visibility": "local"
+            },
+            "json": {
+              "edition": "2024",
+              "type": "JsonEnumValueOptions",
+              "id": 998,
+              "extend": "google.protobuf.EnumValueOptions",
+              "options": {
+                "feature_support.edition_introduced": "EDITION_2026"
+              }
+            }
+          }
+        }
+      }
+    },
+    "google": {
+      "nested": {
+        "protobuf": {
+          "nested": {
+            "EnumValueOptions": {
+              "edition": "proto2",
+              "fields": {},
+              "extensions": [
+                [
+                  990,
+                  998
+                ],
+                [
+                  1000,
+                  536870911
+                ]
+              ]
+            }
+          }
+        }
+      }
+    }
+  }
+}

package/google/protobuf/json_enumvalue_options.proto

@@ -0,0 +1,31 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2026 Google LLC.  All rights reserved.
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file or at
+// https://developers.google.com/open-source/licenses/bsd
+
+edition = "2024";
+
+package pb.enumvalue;
+
+import "google/protobuf/descriptor.proto";
+
+option java_package = "com.google.protobuf.util";
+
+local message JsonEnumValueOptions {
+  // Allows user to specify a custom string to use when serializing an enum
+  // value to JSON.
+  //
+  // Sample usage:
+  // enum Foo {
+  //   ...
+  //   FOO_BAR = 42 [(pb.enumvalue.json).string = "my_custom_name"];
+  // }
+  string string = 1;
+}
+
+extend google.protobuf.EnumValueOptions {
+  JsonEnumValueOptions json = 998
+      [feature_support = { edition_introduced: EDITION_2026 }];
+}

package/index.d.ts

@@ -1270,6 +1270,12 @@ export class Reader {
      */
     tag(): number;
 
+    /**
+     * Reads a varint length prefix within signed 32 bit range.
+     * @returns Length read
+     */
+    size(): number;
+
     /**
      * Reads a varint as a signed 32 bit value.
      * @returns Value read

package/package.json

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

package/src/decoder.js

@@ -83,7 +83,7 @@ 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");
@@ -115,7 +115,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);
 
@@ -160,7 +160,7 @@ 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")
@@ -198,7 +198,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)
@@ -219,7 +219,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

package/src/reader.js

@@ -208,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
@@ -421,7 +460,7 @@ Reader.prototype.double = function read_double() {
  */
 Reader.prototype.uint32s = function read_uint32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, len = this.len, 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) {
@@ -447,7 +486,7 @@ Reader.prototype.uint32s = function read_uint32s(array) {
  */
 Reader.prototype.int32s = function read_int32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, len = this.len, 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) {
@@ -473,7 +512,7 @@ Reader.prototype.int32s = function read_int32s(array) {
  */
 Reader.prototype.sint32s = function read_sint32s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, len = this.len;
+    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)
@@ -490,7 +529,7 @@ Reader.prototype.sint32s = function read_sint32s(array) {
  */
 Reader.prototype.bools = function read_bools(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, len = this.len, 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) {
@@ -528,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;
@@ -552,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;
@@ -576,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;
@@ -600,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;
@@ -624,7 +663,7 @@ Reader.prototype.doubles = function read_doubles(array) {
  */
 Reader.prototype.uint64s = function read_uint64s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, len = this.len;
+    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)
@@ -641,7 +680,7 @@ Reader.prototype.uint64s = function read_uint64s(array) {
  */
 Reader.prototype.int64s = function read_int64s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, len = this.len;
+    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)
@@ -658,7 +697,7 @@ Reader.prototype.int64s = function read_int64s(array) {
  */
 Reader.prototype.sint64s = function read_sint64s(array) {
     if (array === undefined) array = [];
-    var end = this.uint32() + this.pos, len = this.len;
+    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)
@@ -675,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;
@@ -693,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;
@@ -709,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;
 
@@ -726,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;
 
@@ -743,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;
 
@@ -809,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

@@ -600,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());
 };
 
 /**