protobufjs 8.0.0-experimental → 8.0.3-experimental

package/dist/minimal/protobuf.js

@@ -1,6 +1,6 @@
 /*!
- * protobuf.js v8.0.0-experimental (c) 2016, daniel wirtz
- * compiled fri, 21 mar 2025 17:14:14 utc
+ * protobuf.js v8.0.3-experimental (c) 2016, daniel wirtz
+ * compiled tue, 25 mar 2025 02:15:04 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */

package/dist/minimal/protobuf.min.js

@@ -1,6 +1,6 @@
 /*!
- * protobuf.js v8.0.0-experimental (c) 2016, daniel wirtz
- * compiled fri, 21 mar 2025 17:14:14 utc
+ * protobuf.js v8.0.3-experimental (c) 2016, daniel wirtz
+ * compiled tue, 25 mar 2025 02:15:04 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */

package/dist/protobuf.js

@@ -1,6 +1,6 @@
 /*!
- * protobuf.js v8.0.0-experimental (c) 2016, daniel wirtz
- * compiled fri, 21 mar 2025 17:14:14 utc
+ * protobuf.js v8.0.3-experimental (c) 2016, daniel wirtz
+ * compiled tue, 25 mar 2025 02:15:04 utc
  * licensed under the bsd-3-clause license
  * see: https://github.com/dcodeio/protobuf.js for details
  */
@@ -2821,7 +2821,7 @@ protobuf.types            = require(36);
 protobuf.util             = require(37);
 
 // Set up possibly cyclic reflection dependencies
-protobuf.ReflectionObject._configure(protobuf.Root);
+protobuf.ReflectionObject._configure(protobuf.Root, protobuf.Namespace);
 protobuf.Namespace._configure(protobuf.Type, protobuf.Service, protobuf.Enum);
 protobuf.Root._configure(protobuf.Type);
 protobuf.Field._configure(protobuf.Type);
@@ -3753,7 +3753,7 @@ ReflectionObject.className = "ReflectionObject";
 const OneOf = require(25);
 var util = require(37);
 
-var Root; // cyclic
+var Root, Namespace; // cyclic
 
 /* eslint-disable no-warning-comments */
 // TODO: Replace with embedded proto.
@@ -3910,7 +3910,8 @@ ReflectionObject.prototype.onRemove = function onRemove(parent) {
 ReflectionObject.prototype.resolve = function resolve() {
     if (this.resolved)
         return this;
-    if (this instanceof Root || this.parent && this.parent.resolved) {
+    var edition = this.getOption("edition");
+    if ((this instanceof Namespace && edition) || (this.parent && this.parent.resolved)) {
         this._resolveFeatures();
         this.resolved = true;
     }
@@ -3924,24 +3925,27 @@ ReflectionObject.prototype.resolve = function resolve() {
 ReflectionObject.prototype._resolveFeatures = function _resolveFeatures() {
     var defaults = {};
 
-    var edition = this.root.getOption("edition");
-    if (this instanceof Root) {
-        if (this.root.getOption("syntax") === "proto3") {
+    var protoFeatures = Object.assign(Object.assign({}, this._protoFeatures), this._inferLegacyProtoFeatures(edition));
+
+    var edition = this.getOption("edition");
+    if (this instanceof Namespace && edition) {
+        // For a namespace marked with a specific edition, reset defaults.
+        if (edition === "proto2") {
+            defaults = Object.assign({}, proto2Defaults);
+        } else if (edition === "proto3") {
             defaults = Object.assign({}, proto3Defaults);
         } else if (edition === "2023") {
             defaults = Object.assign({}, editions2023Defaults);
         } else {
-            defaults = Object.assign({}, proto2Defaults);
+            throw new Error("Unknown edition: " + edition);
         }
+        this._features = Object.assign(defaults, protoFeatures || {});
+        return;
     }
 
-    var protoFeatures = Object.assign(Object.assign({}, this._protoFeatures), this._inferLegacyProtoFeatures(edition));
-
-    if (this instanceof Root) {
-        this._features = Object.assign(defaults, protoFeatures || {});
     // fields in Oneofs aren't actually children of them, so we have to
     // special-case it
-    } else if (this.partOf instanceof OneOf) {
+    if (this.partOf instanceof OneOf) {
         var lexicalParentFeaturesCopy = Object.assign({}, this.partOf._features);
         this._features = Object.assign(lexicalParentFeaturesCopy, protoFeatures || {});
     } else if (this.declaringField) {
@@ -3988,8 +3992,10 @@ ReflectionObject.prototype.getOption = function getOption(name) {
  * @returns {ReflectionObject} `this`
  */
 ReflectionObject.prototype.setOption = function setOption(name, value, ifNotSet) {
-    if (!ifNotSet || !this.options || this.options[name] === undefined)
+    if (!ifNotSet || !this.options || this.options[name] === undefined) {
+        if (this.getOption(name) !== value) this.resolved = false;
         (this.options || (this.options = {}))[name] = value;
+    }
     return this;
 };
 
@@ -4065,8 +4071,9 @@ ReflectionObject.prototype.toString = function toString() {
 };
 
 // Sets up cyclic dependencies (called in index-light)
-ReflectionObject._configure = function(Root_) {
+ReflectionObject._configure = function(Root_, Namespace_) {
     Root = Root_;
+    Namespace = Namespace_;
 };
 
 },{"25":25,"37":37}],25:[function(require,module,exports){
@@ -4329,7 +4336,6 @@ var base10Re    = /^[1-9][0-9]*$/,
  * @property {string|undefined} package Package name, if declared
  * @property {string[]|undefined} imports Imports, if any
  * @property {string[]|undefined} weakImports Weak imports, if any
- * @property {string|undefined} syntax Syntax, if specified (either `"proto2"` or `"proto3"`)
  * @property {Root} root Populated root instance
  */
 
@@ -4377,9 +4383,9 @@ function parse(source, root, options) {
         pkg,
         imports,
         weakImports,
-        syntax,
-        edition = false,
-        isProto3 = false;
+        edition = "proto2",
+        isProto3 = false,
+        isProto2 = true;
 
     var ptr = root;
 
@@ -4441,7 +4447,7 @@ function parse(source, root, options) {
                 try {
                     target.push([ start = parseId(next()), skip("to", true) ? parseId(next()) : start ]);
                 } catch (err) {
-                    if (typeRefRe.test(token) && edition) {
+                    if (typeRefRe.test(token) && (!isProto2 && !isProto3)) {
                         target.push(token);
                     } else {
                         throw err;
@@ -4524,7 +4530,6 @@ function parse(source, root, options) {
     }
 
     function parsePackage() {
-
         /* istanbul ignore if */
         if (pkg !== undefined)
             throw illegal("package");
@@ -4536,6 +4541,12 @@ function parse(source, root, options) {
             throw illegal(pkg, "name");
 
         ptr = ptr.define(pkg);
+
+        var oldEdition = ptr.getOption("edition");
+        if (oldEdition && oldEdition !== edition) {
+            throw new Error("incompatible editions detected in package " + pkg + ": " + edition + " vs " + oldEdition);
+        }
+        ptr.setOption("edition", edition);
         skip(";");
     }
 
@@ -4561,16 +4572,17 @@ function parse(source, root, options) {
 
     function parseSyntax() {
         skip("=");
-        syntax = readString();
-        isProto3 = syntax === "proto3";
+        edition = readString();
+        isProto3 = edition === "proto3";
+        isProto2 = edition === "proto2";
 
         /* istanbul ignore if */
-        if (!isProto3 && syntax !== "proto2")
-            throw illegal(syntax, "syntax");
+        if (!isProto3 && !isProto2)
+            throw illegal(edition, "syntax");
 
         // Syntax is needed to understand the meaning of the optional field rule
         // Otherwise the meaning is ambiguous between proto2 and proto3
-        root.setOption("syntax", syntax);
+        root.setOption("edition", edition);
 
         skip(";");
     }
@@ -4578,6 +4590,8 @@ function parse(source, root, options) {
     function parseEdition() {
         skip("=");
         edition = readString();
+        isProto3 = false;
+        isProto2 = false;
         const supportedEditions = ["2023"];
 
         /* istanbul ignore if */
@@ -4657,7 +4671,7 @@ function parse(source, root, options) {
                     break;
 
                 case "required":
-                    if (edition)
+                    if (!isProto2)
                         throw illegal(token);
                 /* eslint-disable no-fallthrough */
                 case "repeated":
@@ -4668,7 +4682,7 @@ function parse(source, root, options) {
                     /* istanbul ignore if */
                     if (isProto3) {
                         parseField(type, "proto3_optional");
-                    } else if (edition) {
+                    } else if (!isProto2) {
                         throw illegal(token);
                     } else {
                         parseField(type, "optional");
@@ -4689,7 +4703,7 @@ function parse(source, root, options) {
 
                 default:
                     /* istanbul ignore if */
-                    if (!isProto3 && !edition || !typeRefRe.test(token)) {
+                    if (isProto2 || !typeRefRe.test(token)) {
                         throw illegal(token);
                     }
 
@@ -5150,7 +5164,7 @@ function parse(source, root, options) {
 
                 default:
                     /* istanbul ignore if */
-                    if (!isProto3 && !edition || !typeRefRe.test(token))
+                    if (isProto2 || !typeRefRe.test(token))
                         throw illegal(token);
                     push(token);
                     parseField(parent, "optional", reference);
@@ -5220,7 +5234,6 @@ function parse(source, root, options) {
         "package"     : pkg,
         "imports"     : imports,
          weakImports  : weakImports,
-         syntax       : syntax,
          root         : root
     };
 }
@@ -5746,6 +5759,9 @@ function Root(options) {
      * @type {string[]}
      */
     this.files = [];
+
+    // Default to proto2 if not specified.
+    this.setOption("edition", "proto2", true);
 }
 
 /**