protobufjs 8.0.4-experimental → 8.1.1-experimental

package/dist/light/protobuf.js

@@ -1,6 +1,6 @@
 /*!
- * protobuf.js v8.0.4-experimental (c) 2016, daniel wirtz
- * compiled thu, 27 mar 2025 04:14:10 utc
+ * protobuf.js v8.1.1-experimental (c) 2016, daniel wirtz
+ * compiled wed, 07 may 2025 22:28:18 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
@@ -1707,12 +1707,6 @@ function Enum(name, values, options, comment, comments, valuesOptions) {
      */
     this._valuesFeatures = {};
 
-    /**
-     * Unresolved values features, if any
-     * @type {Object<string, Object<string, *>>|undefined}
-     */
-    this._valuesProtoFeatures = {};
-
     /**
      * Reserved ranges, if any.
      * @type {Array.<number[]|string>}
@@ -1733,12 +1727,12 @@ function Enum(name, values, options, comment, comments, valuesOptions) {
  * @override
  */
 Enum.prototype._resolveFeatures = function _resolveFeatures(edition) {
-    var edition = this._edition || edition;
+    edition = this._edition || edition;
     ReflectionObject.prototype._resolveFeatures.call(this, edition);
 
-    Object.keys(this._valuesProtoFeatures).forEach(key => {
+    Object.keys(this.values).forEach(key => {
         var parentFeaturesCopy = Object.assign({}, this._features);
-        this._valuesFeatures[key] = Object.assign(parentFeaturesCopy, this._valuesProtoFeatures[key] || {});
+        this._valuesFeatures[key] = Object.assign(parentFeaturesCopy, this.valuesOptions && this.valuesOptions[key] && this.valuesOptions[key].features);
     });
 
     return this;
@@ -1824,21 +1818,6 @@ Enum.prototype.add = function add(name, id, comment, options) {
         if (this.valuesOptions === undefined)
             this.valuesOptions = {};
         this.valuesOptions[name] = options || null;
-
-        for (var key of Object.keys(this.valuesOptions)) {
-            var features = Array.isArray(this.valuesOptions[key]) ? this.valuesOptions[key].find(x => {return Object.prototype.hasOwnProperty.call(x, "features");}) : this.valuesOptions[key] === "features";
-            if (features) {
-                this._valuesProtoFeatures[key] = features.features;
-            } else {
-                this._valuesProtoFeatures[key] = {};
-            }
-        }
-    }
-
-    for (var enumValue of Object.keys(this.values)) {
-        if (!this._valuesProtoFeatures[enumValue]) {
-            this._valuesProtoFeatures[enumValue] = {};
-        }
     }
 
     this.comments[name] = comment || null;
@@ -2257,16 +2236,22 @@ Field.prototype.resolve = function resolve() {
  */
 Field.prototype._inferLegacyProtoFeatures = function _inferLegacyProtoFeatures(edition) {
     if (edition !== "proto2" && edition !== "proto3") {
-        return;
+        return {};
     }
 
     var features = {};
-    this.resolve();
+
     if (this.rule === "required") {
         features.field_presence = "LEGACY_REQUIRED";
     }
-    if (this.resolvedType instanceof Type && this.resolvedType.group) {
-        features.message_encoding = "DELIMITED";
+    if (this.parent && types.defaults[this.type] === undefined) {
+        // We can't use resolvedType because types may not have been resolved yet.  However,
+        // legacy groups are always in the same scope as the field so we don't have to do a
+        // full scan of the tree.
+        var type = this.parent.get(this.type.split(".").pop());
+        if (type && type instanceof Type && type.group) {
+            features.message_encoding = "DELIMITED";
+        }
     }
     if (this.getOption("packed") === true) {
         features.repeated_field_encoding = "PACKED";
@@ -2438,7 +2423,7 @@ protobuf.types            = require(32);
 protobuf.util             = require(33);
 
 // Set up possibly cyclic reflection dependencies
-protobuf.ReflectionObject._configure(protobuf.Root, protobuf.Namespace);
+protobuf.ReflectionObject._configure(protobuf.Root);
 protobuf.Namespace._configure(protobuf.Type, protobuf.Service, protobuf.Enum);
 protobuf.Root._configure(protobuf.Type);
 protobuf.Field._configure(protobuf.Type);
@@ -3238,7 +3223,7 @@ Namespace.prototype.resolveAll = function resolveAll() {
  * @override
  */
 Namespace.prototype._resolveFeaturesRecursive = function _resolveFeaturesRecursive(edition) {
-    var edition = this._edition || edition;
+    edition = this._edition || edition;
 
     ReflectionObject.prototype._resolveFeaturesRecursive.call(this, edition);
     this.nestedArray.forEach(nested => {
@@ -3378,7 +3363,7 @@ ReflectionObject.className = "ReflectionObject";
 const OneOf = require(23);
 var util = require(33);
 
-var Root, Namespace; // cyclic
+var Root; // cyclic
 
 /* eslint-disable no-warning-comments */
 // TODO: Replace with embedded proto.
@@ -3439,6 +3424,12 @@ function ReflectionObject(name, options) {
      */
     this._features = {};
 
+    /**
+     * Whether or not features have been resolved.
+     * @type {boolean}
+     * /
+    this._featuresResolved = false;
+
     /**
      * Parent namespace.
      * @type {Namespace|null}
@@ -3545,7 +3536,6 @@ ReflectionObject.prototype.resolve = function resolve() {
     if (this.resolved)
         return this;
     if (this instanceof Root) {
-        this._resolveFeaturesRecursive(this._edition);
         this.resolved = true;
     }
     return this;
@@ -3566,8 +3556,13 @@ ReflectionObject.prototype._resolveFeaturesRecursive = function _resolveFeatures
  * @returns {undefined}
  */
 ReflectionObject.prototype._resolveFeatures = function _resolveFeatures(edition) {
+    if (this._featuresResolved) {
+        return;
+    }
+
     var defaults = {};
 
+    /* istanbul ignore if */
     if (!edition) {
         throw new Error("Unknown edition for " + this.fullName);
     }
@@ -3577,6 +3572,7 @@ ReflectionObject.prototype._resolveFeatures = function _resolveFeatures(edition)
 
     if (this._edition) {
         // For a namespace marked with a specific edition, reset defaults.
+        /* istanbul ignore else */
         if (edition === "proto2") {
             defaults = Object.assign({}, proto2Defaults);
         } else if (edition === "proto3") {
@@ -3587,11 +3583,13 @@ ReflectionObject.prototype._resolveFeatures = function _resolveFeatures(edition)
             throw new Error("Unknown edition: " + edition);
         }
         this._features = Object.assign(defaults, protoFeatures || {});
+        this._featuresResolved = true;
         return;
     }
 
     // fields in Oneofs aren't actually children of them, so we have to
     // special-case it
+    /* istanbul ignore else */
     if (this.partOf instanceof OneOf) {
         var lexicalParentFeaturesCopy = Object.assign({}, this.partOf._features);
         this._features = Object.assign(lexicalParentFeaturesCopy, protoFeatures || {});
@@ -3601,12 +3599,13 @@ ReflectionObject.prototype._resolveFeatures = function _resolveFeatures(edition)
         var parentFeaturesCopy = Object.assign({}, this.parent._features);
         this._features = Object.assign(parentFeaturesCopy, protoFeatures || {});
     } else {
-        this._features = Object.assign({}, protoFeatures);
+        throw new Error("Unable to find a parent for " + this.fullName);
     }
     if (this.extensionField) {
         // Sister fields should have the same features as their extensions.
         this.extensionField._features = this._features;
     }
+    this._featuresResolved = true;
 };
 
 /**
@@ -3640,13 +3639,7 @@ ReflectionObject.prototype.getOption = function getOption(name) {
 ReflectionObject.prototype.setOption = function setOption(name, value, ifNotSet) {
     if (!this.options)
         this.options = {};
-    if (name === "features") {
-        if (ifNotSet) {
-            this.options.features = Object.assign(Object.assign({}, value), this.options.features || {});
-        } else {
-            this.options.features = Object.assign(this.options.features || {}, value);
-        }
-    } else if (/^features\./.test(name)) {
+    if (/^features\./.test(name)) {
         util.setProperty(this.options, name, value, ifNotSet);
     } else if (!ifNotSet || this.options[name] === undefined) {
         if (this.getOption(name) !== value) this.resolved = false;
@@ -3667,7 +3660,6 @@ ReflectionObject.prototype.setParsedOption = function setParsedOption(name, valu
     if (!this.parsedOptions) {
         this.parsedOptions = [];
     }
-    var isFeature = /^features$/.test(name);
     var parsedOptions = this.parsedOptions;
     if (propName) {
         // If setting a sub property of an option then try to merge it
@@ -3732,12 +3724,11 @@ ReflectionObject.prototype._editionToJSON = function _editionToJSON() {
         return undefined;
     }
     return this._edition;
-}
+};
 
 // Sets up cyclic dependencies (called in index-light)
-ReflectionObject._configure = function(Root_, Namespace_) {
+ReflectionObject._configure = function(Root_) {
     Root = Root_;
-    Namespace = Namespace_;
 };
 
 },{"23":23,"33":33}],23:[function(require,module,exports){
@@ -4489,7 +4480,7 @@ Root.fromJSON = function fromJSON(json, root) {
         root = new Root();
     if (json.options)
         root.setOptions(json.options);
-    return root.addJSON(json.nested).resolveAll();
+    return root.addJSON(json.nested)._resolveFeaturesRecursive();
 };
 
 /**
@@ -4537,6 +4528,9 @@ Root.prototype.load = function load(filename, options, callback) {
 
     // Finishes loading by calling the callback (exactly once)
     function finish(err, root) {
+        if (root) {
+            root._resolveFeaturesRecursive();
+        }
         /* istanbul ignore if */
         if (!callback) {
             return;
@@ -4546,9 +4540,6 @@ Root.prototype.load = function load(filename, options, callback) {
         }
         var cb = callback;
         callback = null;
-        if (root) {
-            root.resolveAll();
-        }
         cb(err, root);
     }
 
@@ -4656,8 +4647,8 @@ Root.prototype.load = function load(filename, options, callback) {
     for (var i = 0, resolved; i < filename.length; ++i)
         if (resolved = self.resolvePath("", filename[i]))
             fetch(resolved);
-    self.resolveAll();
     if (sync) {
+        self._resolveFeaturesRecursive();
         return self;
     }
     if (!queued) {
@@ -4710,6 +4701,7 @@ Root.prototype.resolveAll = function resolveAll() {
         throw Error("unresolvable extensions: " + this.deferred.map(function(field) {
             return "'extend " + field.extend + "' in " + field.parent.fullName;
         }).join(", "));
+    this._resolveFeaturesRecursive(this._edition);
     return Namespace.prototype.resolveAll.call(this);
 };
 
@@ -5147,11 +5139,11 @@ Service.prototype.resolveAll = function resolveAll() {
  * @override
  */
 Service.prototype._resolveFeaturesRecursive = function _resolveFeaturesRecursive(edition) {
-    var edition = this._edition || edition;
+    edition = this._edition || edition;
 
     Namespace.prototype._resolveFeaturesRecursive.call(this, edition);
     this.methodsArray.forEach(method => {
-        method._resolveFeaturesRecursive(edition);        
+        method._resolveFeaturesRecursive(edition);
     });
     return this;
 };
@@ -5447,7 +5439,7 @@ function clearCache(type) {
  * @param {IType} json Message type descriptor
  * @returns {Type} Created message type
  */
-Type.fromJSON = function fromJSON(name, json, nested) {
+Type.fromJSON = function fromJSON(name, json) {
     var type = new Type(name, json.options);
     type.extensions = json.extensions;
     type.reserved = json.reserved;
@@ -5530,14 +5522,14 @@ Type.prototype.resolveAll = function resolveAll() {
  * @override
  */
 Type.prototype._resolveFeaturesRecursive = function _resolveFeaturesRecursive(edition) {
-    var edition = this._edition || edition;
+    edition = this._edition || edition;
 
     Namespace.prototype._resolveFeaturesRecursive.call(this, edition);
     this.oneofsArray.forEach(oneof => {
-        oneof._resolveFeatures(edition);        
+        oneof._resolveFeatures(edition);
     });
     this.fieldsArray.forEach(field => {
-        field._resolveFeatures(edition);        
+        field._resolveFeatures(edition);
     });
     return this;
 };