protobufjs 8.7.0 → 8.7.1

package/google/protobuf/descriptor.proto

@@ -2,14 +2,6 @@ syntax = "proto2";
 
 package google.protobuf;
 
-option go_package = "google.golang.org/protobuf/types/descriptorpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DescriptorProtos";
-option csharp_namespace = "Google.Protobuf.Reflection";
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-option optimize_for = "SPEED";
-
 message FileDescriptorSet {
 
     repeated FileDescriptorProto file = 1;

package/google/protobuf/source_context.json

@@ -8,7 +8,8 @@
               "fields": {
                 "fileName": {
                   "type": "string",
-                  "id": 1
+                  "id": 1,
+                  "protoName": "file_name"
                 }
               }
             }

package/google/protobuf/type.json

@@ -27,7 +27,8 @@
                 },
                 "sourceContext": {
                   "type": "SourceContext",
-                  "id": 5
+                  "id": 5,
+                  "protoName": "source_context"
                 },
                 "syntax": {
                   "type": "Syntax",
@@ -55,11 +56,13 @@
                 },
                 "typeUrl": {
                   "type": "string",
-                  "id": 6
+                  "id": 6,
+                  "protoName": "type_url"
                 },
                 "oneofIndex": {
                   "type": "int32",
-                  "id": 7
+                  "id": 7,
+                  "protoName": "oneof_index"
                 },
                 "packed": {
                   "type": "bool",
@@ -72,11 +75,13 @@
                 },
                 "jsonName": {
                   "type": "string",
-                  "id": 10
+                  "id": 10,
+                  "protoName": "json_name"
                 },
                 "defaultValue": {
                   "type": "string",
-                  "id": 11
+                  "id": 11,
+                  "protoName": "default_value"
                 }
               },
               "nested": {
@@ -131,7 +136,8 @@
                 },
                 "sourceContext": {
                   "type": "SourceContext",
-                  "id": 4
+                  "id": 4,
+                  "protoName": "source_context"
                 },
                 "syntax": {
                   "type": "Syntax",
@@ -190,7 +196,8 @@
               "fields": {
                 "fileName": {
                   "type": "string",
-                  "id": 1
+                  "id": 1,
+                  "protoName": "file_name"
                 }
               }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "description": "Protocol Buffers for JavaScript & TypeScript.",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",
   "license": "BSD-3-Clause",
@@ -49,11 +49,11 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.0",
-    "@types/node": ">=13.7.0",
+    "@types/node": "^18.19.130",
     "browserify": "^17.0.0",
     "browserify-wrap": "^1.0.2",
     "bundle-collapser": "^1.3.0",
-    "escodegen": "^1.13.0",
+    "escodegen": "^2.0.0",
     "eslint": "^10.0.0",
     "eslint-plugin-jsdoc": "^63.0.0",
     "espree": "^9.0.0",
@@ -71,7 +71,7 @@
     "reflect-metadata": "^0.2.0",
     "tape": "^5.0.0",
     "tslint": "^6.0.0",
-    "typescript": "^3.7.5",
+    "typescript": "^4.9.5",
     "vinyl-buffer": "^1.0.1",
     "vinyl-fs": "^4.0.0",
     "vinyl-source-stream": "^2.0.0"

package/src/common.js

@@ -163,27 +163,33 @@ common("struct", {
         fields: {
             nullValue: {
                 type: "NullValue",
-                id: 1
+                id: 1,
+                protoName: "null_value"
             },
             numberValue: {
                 type: "double",
-                id: 2
+                id: 2,
+                protoName: "number_value"
             },
             stringValue: {
                 type: "string",
-                id: 3
+                id: 3,
+                protoName: "string_value"
             },
             boolValue: {
                 type: "bool",
-                id: 4
+                id: 4,
+                protoName: "bool_value"
             },
             structValue: {
                 type: "Struct",
-                id: 5
+                id: 5,
+                protoName: "struct_value"
             },
             listValue: {
                 type: "ListValue",
-                id: 6
+                id: 6,
+                protoName: "list_value"
             }
         }
     },

package/src/converter.js

@@ -298,7 +298,7 @@ converter.toObject = function toObject(mtype) {
             else if (field.bytes) {
                 var arrayDefault = Array.prototype.slice.call(field.typeDefault);
                 gen
-        ("if(o.bytes===String)d%s=%j", prop, String.fromCharCode.apply(String, field.typeDefault))
+        ("if(o.bytes===String)d%s=%j", prop, util.base64.encode(field.typeDefault, 0, field.typeDefault.length))
         ("else{")
             ("d%s=%j", prop, arrayDefault)
             ("if(o.bytes!==Array)d%s=util.newBuffer(d%s)", prop, prop)

package/src/decoder.js

@@ -102,7 +102,7 @@ function decoder(mtype) {
                                 ("break");
 
             if (types.basic[type] === undefined) gen
-                            ("v=types[%i].decode(r,r.uint32(),undefined,q+1)", i); // can't be groups
+                            ("v=types[%i].decode(r,r.uint32(),undefined,q+1,v)", i); // can't be groups
             else gen
                             ("v=r.%s()", type === "string" ? stringMethod(field) : type);
 

package/src/index-minimal.js

@@ -26,6 +26,7 @@ exports.configure    = configure;
  * @returns {undefined}
  */
 function configure() {
+    exports.util.LongBits._configure(exports.util.Long);
     exports.Writer._configure(exports.BufferWriter);
     exports.Reader._configure(exports.BufferReader);
 }

package/src/parse.js

@@ -559,6 +559,10 @@ function parse(source, root, options) {
                 case ";":
                     break;
 
+                case "map":
+                    parseMapField(type);
+                    break;
+
                 case "option":
                     parseOption(type, token);
                     skip(";");
@@ -688,7 +692,8 @@ function parse(source, root, options) {
         if ((token = next()) === null || !nameRe.test(token))
             throw illegal(token, "name");
 
-        var enm = new Enum(token);
+        var enm = new Enum(token),
+            values = [];
         ifBlock(enm, function parseEnum_block(token) {
           switch(token) {
             case ";":
@@ -705,16 +710,18 @@ function parse(source, root, options) {
               break;
 
             default:
-              parseEnumValue(enm, token);
+              values.push(parseEnumValue(token));
           }
         });
+        for (var i = 0; i < values.length; ++i)
+            enm.add(values[i].name, values[i].id, values[i].comment, values[i].options);
         parent.add(enm);
         if (parent === ptr) {
             topLevelObjects.push(enm);
         }
     }
 
-    function parseEnumValue(parent, token) {
+    function parseEnumValue(token) {
 
         /* istanbul ignore if */
         if (!nameRe.test(token))
@@ -746,7 +753,12 @@ function parse(source, root, options) {
         }, function parseEnumValue_line() {
             parseInlineOptions(dummy); // skip
         });
-        parent.add(token, value, dummy.comment, dummy.parsedOptions || dummy.options);
+        return {
+            name: token,
+            id: value,
+            comment: dummy.comment,
+            options: dummy.parsedOptions || dummy.options
+        };
     }
 
     function parseOption(parent, token) {
@@ -797,16 +809,27 @@ function parse(source, root, options) {
             var objectResult = {};
 
             while (!skip("}", true)) {
-                /* istanbul ignore if */
-                if (!nameRe.test(token = next())) {
-                    throw illegal(token, "name");
-                }
-                if (token === null) {
-                  throw illegal(token, "end of input");
+                token = next();
+                var propName;
+                if (token === null)
+                    throw illegal(token, "end of input");
+                if (token === "[") {
+                    token = next();
+                    // Extension name or, for Any, a type URL: "<prefix>/<fully.qualified.Type>".
+                    var slash = token === null ? -1 : token.lastIndexOf("/");
+                    if (token === null || !typeRefRe.test(slash < 0 ? token : token.slice(slash + 1)))
+                        throw illegal(token, "name");
+                    propName = "[" + token + "]";
+                    skip("]");
+                } else {
+                    /* istanbul ignore if */
+                    if (!nameRe.test(token)) {
+                        throw illegal(token, "name");
+                    }
+                    propName = token;
                 }
 
                 var value;
-                var propName = token;
 
                 skip(":", true);
 
@@ -814,25 +837,30 @@ function parse(source, root, options) {
                     // option (my_option) = {
                     //     repeated_value: [ "foo", "bar" ]
                     // };
-                    value = parseOptionValue(parent, name + "." + token, depth + 1);
+                    value = parseOptionValue(parent, name + "." + propName, depth + 1);
                 } else if (peek() === "[") {
                     value = [];
-                    var lastValue;
+                    var lastValue,
+                        lastValueIsAggregate;
                     if (skip("[", true)) {
                         if (!skip("]", true)) {
                             do {
-                                lastValue = readValue(true);
+                                lastValueIsAggregate = peek() === "{";
+                                lastValue = lastValueIsAggregate
+                                    ? parseOptionValue(parent, name + "." + propName, depth + 1)
+                                    : readValue(true);
                                 value.push(lastValue);
                             } while (skip(",", true));
                             skip("]");
                             if (typeof lastValue !== "undefined") {
-                                setOption(parent, name + "." + token, lastValue);
+                                if (!lastValueIsAggregate)
+                                    setOption(parent, name + "." + propName, lastValue);
                             }
                         }
                     }
                 } else {
                     value = readValue(true);
-                    setOption(parent, name + "." + token, value);
+                    setOption(parent, name + "." + propName, value);
                 }
 
                 var prevValue = Object.prototype.hasOwnProperty.call(objectResult, propName)

package/src/util/longbits.js

@@ -1,7 +1,7 @@
 "use strict";
 module.exports = LongBits;
 
-var util = require("../util/minimal");
+var Long;
 
 /**
  * Constructs new long bits.
@@ -80,10 +80,10 @@ LongBits.fromNumber = function fromNumber(value) {
 LongBits.from = function from(value) {
     if (typeof value === "number")
         return LongBits.fromNumber(value);
-    if (util.isString(value)) {
+    if (typeof value === "string" || value instanceof String) {
         /* istanbul ignore else */
-        if (util.Long)
-            value = util.Long.fromString(value);
+        if (Long)
+            value = Long.fromString(value);
         else
             return LongBits.fromNumber(parseInt(value, 10));
     }
@@ -112,8 +112,8 @@ LongBits.prototype.toNumber = function toNumber(unsigned) {
  * @returns {Long} Long
  */
 LongBits.prototype.toLong = function toLong(unsigned) {
-    return util.Long
-        ? new util.Long(this.lo | 0, this.hi | 0, Boolean(unsigned))
+    return Long
+        ? new Long(this.lo | 0, this.hi | 0, Boolean(unsigned))
         /* istanbul ignore next */
         : { low: this.lo | 0, high: this.hi | 0, unsigned: Boolean(unsigned) };
 };
@@ -198,3 +198,7 @@ LongBits.prototype.length = function length() {
              : part1 < 2097152 ? 7 : 8
          : part2 < 128 ? 9 : 10;
 };
+
+LongBits._configure = function(Long_) {
+    Long = Long_;
+};