protobufjs 7.5.1 → 7.5.3

package/google/protobuf/descriptor.proto

@@ -2,9 +2,35 @@ 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;
+
+    extensions 536000000;
+}
+
+enum Edition {
+
+    EDITION_UNKNOWN = 0;
+    EDITION_LEGACY = 900;
+    EDITION_PROTO2 = 998;
+    EDITION_PROTO3 = 999;
+    EDITION_2023 = 1000;
+    EDITION_2024 = 1001;
+    EDITION_1_TEST_ONLY = 1;
+    EDITION_2_TEST_ONLY = 2;
+    EDITION_99997_TEST_ONLY = 99997;
+    EDITION_99998_TEST_ONLY = 99998;
+    EDITION_99999_TEST_ONLY = 99999;
+    EDITION_MAX = 2147483647;
 }
 
 message FileDescriptorProto {
@@ -14,6 +40,7 @@ message FileDescriptorProto {
     repeated string dependency = 3;
     repeated int32 public_dependency = 10;
     repeated int32 weak_dependency = 11;
+    repeated string option_dependency = 15;
     repeated DescriptorProto message_type = 4;
     repeated EnumDescriptorProto enum_type = 5;
     repeated ServiceDescriptorProto service = 6;
@@ -21,6 +48,7 @@ message FileDescriptorProto {
     optional FileOptions options = 8;
     optional SourceCodeInfo source_code_info = 9;
     optional string syntax = 12;
+    optional Edition edition = 14;
 }
 
 message DescriptorProto {
@@ -35,11 +63,13 @@ message DescriptorProto {
     optional MessageOptions options = 7;
     repeated ReservedRange reserved_range = 9;
     repeated string reserved_name = 10;
+    optional SymbolVisibility visibility = 11;
 
     message ExtensionRange {
 
         optional int32 start = 1;
         optional int32 end = 2;
+        optional ExtensionRangeOptions options = 3;
     }
 
     message ReservedRange {
@@ -49,6 +79,33 @@ message DescriptorProto {
     }
 }
 
+message ExtensionRangeOptions {
+
+    repeated UninterpretedOption uninterpreted_option = 999;
+    repeated Declaration declaration = 2 [retention="RETENTION_SOURCE"];
+    optional FeatureSet features = 50;
+    optional VerificationState verification = 3 [default=UNVERIFIED, retention="RETENTION_SOURCE"];
+
+    message Declaration {
+
+        optional int32 number = 1;
+        optional string full_name = 2;
+        optional string type = 3;
+        optional bool reserved = 5;
+        optional bool repeated = 6;
+
+        reserved 4;
+    }
+
+    enum VerificationState {
+
+        DECLARATION = 0;
+        UNVERIFIED = 1;
+    }
+
+    extensions 1000 to max;
+}
+
 message FieldDescriptorProto {
 
     optional string name = 1;
@@ -61,6 +118,7 @@ message FieldDescriptorProto {
     optional int32 oneof_index = 9;
     optional string json_name = 10;
     optional FieldOptions options = 8;
+    optional bool proto3_optional = 17;
 
     enum Type {
 
@@ -87,8 +145,8 @@ message FieldDescriptorProto {
     enum Label {
 
         LABEL_OPTIONAL = 1;
-        LABEL_REQUIRED = 2;
         LABEL_REPEATED = 3;
+        LABEL_REQUIRED = 2;
     }
 }
 
@@ -103,6 +161,15 @@ message EnumDescriptorProto {
     optional string name = 1;
     repeated EnumValueDescriptorProto value = 2;
     optional EnumOptions options = 3;
+    repeated EnumReservedRange reserved_range = 4;
+    repeated string reserved_name = 5;
+    optional SymbolVisibility visibility = 6;
+
+    message EnumReservedRange {
+
+        optional int32 start = 1;
+        optional int32 end = 2;
+    }
 }
 
 message EnumValueDescriptorProto {
@@ -142,9 +209,15 @@ message FileOptions {
     optional bool java_generic_services = 17;
     optional bool py_generic_services = 18;
     optional bool deprecated = 23;
-    optional bool cc_enable_arenas = 31;
+    optional bool cc_enable_arenas = 31 [default=true];
     optional string objc_class_prefix = 36;
     optional string csharp_namespace = 37;
+    optional string swift_prefix = 39;
+    optional string php_class_prefix = 40;
+    optional string php_namespace = 41;
+    optional string php_metadata_namespace = 44;
+    optional string ruby_package = 45;
+    optional FeatureSet features = 50;
     repeated UninterpretedOption uninterpreted_option = 999;
 
     enum OptimizeMode {
@@ -156,7 +229,7 @@ message FileOptions {
 
     extensions 1000 to max;
 
-    reserved 38;
+    reserved 42, "php_generic_services", 38;
 }
 
 message MessageOptions {
@@ -165,11 +238,13 @@ message MessageOptions {
     optional bool no_standard_descriptor_accessor = 2;
     optional bool deprecated = 3;
     optional bool map_entry = 7;
+    optional bool deprecated_legacy_json_field_conflicts = 11 [deprecated=true];
+    optional FeatureSet features = 12;
     repeated UninterpretedOption uninterpreted_option = 999;
 
     extensions 1000 to max;
 
-    reserved 8;
+    reserved 4, 5, 6, 8, 9;
 }
 
 message FieldOptions {
@@ -178,8 +253,15 @@ message FieldOptions {
     optional bool packed = 2;
     optional JSType jstype = 6 [default=JS_NORMAL];
     optional bool lazy = 5;
+    optional bool unverified_lazy = 15;
     optional bool deprecated = 3;
-    optional bool weak = 10;
+    optional bool weak = 10 [deprecated=true];
+    optional bool debug_redact = 16;
+    optional OptionRetention retention = 17;
+    repeated OptionTargetType targets = 19;
+    repeated EditionDefault edition_defaults = 20;
+    optional FeatureSet features = 21;
+    optional FeatureSupport feature_support = 22;
     repeated UninterpretedOption uninterpreted_option = 999;
 
     enum CType {
@@ -196,13 +278,49 @@ message FieldOptions {
         JS_NUMBER = 2;
     }
 
+    enum OptionRetention {
+
+        RETENTION_UNKNOWN = 0;
+        RETENTION_RUNTIME = 1;
+        RETENTION_SOURCE = 2;
+    }
+
+    enum OptionTargetType {
+
+        TARGET_TYPE_UNKNOWN = 0;
+        TARGET_TYPE_FILE = 1;
+        TARGET_TYPE_EXTENSION_RANGE = 2;
+        TARGET_TYPE_MESSAGE = 3;
+        TARGET_TYPE_FIELD = 4;
+        TARGET_TYPE_ONEOF = 5;
+        TARGET_TYPE_ENUM = 6;
+        TARGET_TYPE_ENUM_ENTRY = 7;
+        TARGET_TYPE_SERVICE = 8;
+        TARGET_TYPE_METHOD = 9;
+    }
+
+    message EditionDefault {
+
+        optional Edition edition = 3;
+        optional string value = 2;
+    }
+
+    message FeatureSupport {
+
+        optional Edition edition_introduced = 1;
+        optional Edition edition_deprecated = 2;
+        optional string deprecation_warning = 3;
+        optional Edition edition_removed = 4;
+    }
+
     extensions 1000 to max;
 
-    reserved 4;
+    reserved 4, 18;
 }
 
 message OneofOptions {
 
+    optional FeatureSet features = 1;
     repeated UninterpretedOption uninterpreted_option = 999;
 
     extensions 1000 to max;
@@ -212,14 +330,21 @@ message EnumOptions {
 
     optional bool allow_alias = 2;
     optional bool deprecated = 3;
+    optional bool deprecated_legacy_json_field_conflicts = 6 [deprecated=true];
+    optional FeatureSet features = 7;
     repeated UninterpretedOption uninterpreted_option = 999;
 
     extensions 1000 to max;
+
+    reserved 5;
 }
 
 message EnumValueOptions {
 
     optional bool deprecated = 1;
+    optional FeatureSet features = 2;
+    optional bool debug_redact = 3;
+    optional FieldOptions.FeatureSupport feature_support = 4;
     repeated UninterpretedOption uninterpreted_option = 999;
 
     extensions 1000 to max;
@@ -227,6 +352,7 @@ message EnumValueOptions {
 
 message ServiceOptions {
 
+    optional FeatureSet features = 34;
     optional bool deprecated = 33;
     repeated UninterpretedOption uninterpreted_option = 999;
 
@@ -236,8 +362,17 @@ message ServiceOptions {
 message MethodOptions {
 
     optional bool deprecated = 33;
+    optional IdempotencyLevel idempotency_level = 34 [default=IDEMPOTENCY_UNKNOWN];
+    optional FeatureSet features = 35;
     repeated UninterpretedOption uninterpreted_option = 999;
 
+    enum IdempotencyLevel {
+
+        IDEMPOTENCY_UNKNOWN = 0;
+        NO_SIDE_EFFECTS = 1;
+        IDEMPOTENT = 2;
+    }
+
     extensions 1000 to max;
 }
 
@@ -258,6 +393,102 @@ message UninterpretedOption {
     }
 }
 
+message FeatureSet {
+
+    optional FieldPresence field_presence = 1 [retention="RETENTION_RUNTIME", targets="TARGET_TYPE_FILE", feature_support.edition_introduced="EDITION_2023", edition_defaults.edition="EDITION_2023", edition_defaults.value="EXPLICIT"];
+    optional EnumType enum_type = 2 [retention="RETENTION_RUNTIME", targets="TARGET_TYPE_FILE", feature_support.edition_introduced="EDITION_2023", edition_defaults.edition="EDITION_PROTO3", edition_defaults.value="OPEN"];
+    optional RepeatedFieldEncoding repeated_field_encoding = 3 [retention="RETENTION_RUNTIME", targets="TARGET_TYPE_FILE", feature_support.edition_introduced="EDITION_2023", edition_defaults.edition="EDITION_PROTO3", edition_defaults.value="PACKED"];
+    optional Utf8Validation utf8_validation = 4 [retention="RETENTION_RUNTIME", targets="TARGET_TYPE_FILE", feature_support.edition_introduced="EDITION_2023", edition_defaults.edition="EDITION_PROTO3", edition_defaults.value="VERIFY"];
+    optional MessageEncoding message_encoding = 5 [retention="RETENTION_RUNTIME", targets="TARGET_TYPE_FILE", feature_support.edition_introduced="EDITION_2023", edition_defaults.edition="EDITION_LEGACY", edition_defaults.value="LENGTH_PREFIXED"];
+    optional JsonFormat json_format = 6 [retention="RETENTION_RUNTIME", targets="TARGET_TYPE_FILE", feature_support.edition_introduced="EDITION_2023", edition_defaults.edition="EDITION_PROTO3", edition_defaults.value="ALLOW"];
+    optional EnforceNamingStyle enforce_naming_style = 7 [retention="RETENTION_SOURCE", targets="TARGET_TYPE_METHOD", feature_support.edition_introduced="EDITION_2024", edition_defaults.edition="EDITION_2024", edition_defaults.value="STYLE2024"];
+    optional VisibilityFeature.DefaultSymbolVisibility default_symbol_visibility = 8 [retention="RETENTION_SOURCE", targets="TARGET_TYPE_FILE", feature_support.edition_introduced="EDITION_2024", edition_defaults.edition="EDITION_2024", edition_defaults.value="EXPORT_TOP_LEVEL"];
+
+    enum FieldPresence {
+
+        FIELD_PRESENCE_UNKNOWN = 0;
+        EXPLICIT = 1;
+        IMPLICIT = 2;
+        LEGACY_REQUIRED = 3;
+    }
+
+    enum EnumType {
+
+        ENUM_TYPE_UNKNOWN = 0;
+        OPEN = 1;
+        CLOSED = 2;
+    }
+
+    enum RepeatedFieldEncoding {
+
+        REPEATED_FIELD_ENCODING_UNKNOWN = 0;
+        PACKED = 1;
+        EXPANDED = 2;
+    }
+
+    enum Utf8Validation {
+
+        UTF8_VALIDATION_UNKNOWN = 0;
+        VERIFY = 2;
+        NONE = 3;
+    }
+
+    enum MessageEncoding {
+
+        MESSAGE_ENCODING_UNKNOWN = 0;
+        LENGTH_PREFIXED = 1;
+        DELIMITED = 2;
+    }
+
+    enum JsonFormat {
+
+        JSON_FORMAT_UNKNOWN = 0;
+        ALLOW = 1;
+        LEGACY_BEST_EFFORT = 2;
+    }
+
+    enum EnforceNamingStyle {
+
+        ENFORCE_NAMING_STYLE_UNKNOWN = 0;
+        STYLE2024 = 1;
+        STYLE_LEGACY = 2;
+    }
+
+    message VisibilityFeature {
+
+        enum DefaultSymbolVisibility {
+
+            DEFAULT_SYMBOL_VISIBILITY_UNKNOWN = 0;
+            EXPORT_ALL = 1;
+            EXPORT_TOP_LEVEL = 2;
+            LOCAL_ALL = 3;
+            STRICT = 4;
+        }
+
+        reserved 1 to max;
+    }
+
+    extensions 1000 to 9994, 9995 to 9999, 10000;
+
+    reserved 999;
+}
+
+message FeatureSetDefaults {
+
+    repeated FeatureSetEditionDefault defaults = 1;
+    optional Edition minimum_edition = 4;
+    optional Edition maximum_edition = 5;
+
+    message FeatureSetEditionDefault {
+
+        optional Edition edition = 3;
+        optional FeatureSet overridable_features = 4;
+        optional FeatureSet fixed_features = 5;
+
+        reserved 1, 2, "features";
+    }
+}
+
 message SourceCodeInfo {
 
     repeated Location location = 1;
@@ -270,6 +501,8 @@ message SourceCodeInfo {
         optional string trailing_comments = 4;
         repeated string leading_detached_comments = 6;
     }
+
+    extensions 536000000;
 }
 
 message GeneratedCodeInfo {
@@ -282,5 +515,20 @@ message GeneratedCodeInfo {
         optional string source_file = 2;
         optional int32 begin = 3;
         optional int32 end = 4;
+        optional Semantic semantic = 5;
+
+        enum Semantic {
+
+            NONE = 0;
+            SET = 1;
+            ALIAS = 2;
+        }
     }
 }
+
+enum SymbolVisibility {
+
+    VISIBILITY_UNSET = 0;
+    VISIBILITY_LOCAL = 1;
+    VISIBILITY_EXPORT = 2;
+}

package/index.d.ts

@@ -753,6 +753,9 @@ export abstract class NamespaceBase extends ReflectionObject {
     /** Whether or not objects contained in this namespace need feature resolution. */
     protected _needsRecursiveFeatureResolution: boolean;
 
+    /** Whether or not objects contained in this namespace need a resolve. */
+    protected _needsRecursiveResolve: boolean;
+
     /** Nested objects of this namespace as an array for iteration. */
     public readonly nestedArray: ReflectionObject[];
 
@@ -900,21 +903,6 @@ export abstract class ReflectionObject {
     /** Unique name within its namespace. */
     public name: string;
 
-    /** The edition specified for this object.  Only relevant for top-level objects. */
-    public _edition: string;
-
-    /**
-     * The default edition to use for this object if none is specified.  For legacy reasons,
-     * this is proto2 except in the JSON parsing case where it was proto3.
-     */
-    public _defaultEdition: string;
-
-    /** Resolved Features. */
-    public _features: object;
-
-    /** Whether or not features have been resolved. */
-    public _featuresResolved: boolean;
-
     /** Parent namespace. */
     public parent: (Namespace|null);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "protobufjs",
-  "version": "7.5.1",
+  "version": "7.5.3",
   "versionScheme": "~",
   "description": "Protocol Buffers for JavaScript (& TypeScript).",
   "author": "Daniel Wirtz <dcode+protobufjs@dcode.io>",

package/src/namespace.js

@@ -124,6 +124,13 @@ function Namespace(name, options) {
      * @protected
      */
     this._needsRecursiveFeatureResolution = true;
+
+    /**
+     * Whether or not objects contained in this namespace need a resolve.
+     * @type {boolean}
+     * @protected
+     */
+    this._needsRecursiveResolve = true;
 }
 
 function clearCache(namespace) {
@@ -273,11 +280,13 @@ Namespace.prototype.add = function add(object) {
     }
 
     this._needsRecursiveFeatureResolution = true;
+    this._needsRecursiveResolve = true;
 
     // Also clear parent caches, since they need to recurse down.
     var parent = this;
     while(parent = parent.parent) {
         parent._needsRecursiveFeatureResolution = true;
+        parent._needsRecursiveResolve = true;
     }
 
     object.onAdd(this);
@@ -341,6 +350,10 @@ Namespace.prototype.define = function define(path, json) {
  * @returns {Namespace} `this`
  */
 Namespace.prototype.resolveAll = function resolveAll() {
+    if (!this._needsRecursiveResolve) return this;
+
+    this._resolveFeaturesRecursive(this._edition);
+
     var nested = this.nestedArray, i = 0;
     this.resolve();
     while (i < nested.length)
@@ -348,6 +361,7 @@ Namespace.prototype.resolveAll = function resolveAll() {
             nested[i++].resolveAll();
         else
             nested[i++].resolve();
+    this._needsRecursiveResolve = false;
     return this;
 };
 
@@ -389,29 +403,47 @@ Namespace.prototype.lookup = function lookup(path, filterTypes, parentAlreadyChe
     } else if (!path.length)
         return this;
 
+    var flatPath = path.join(".");
+
     // Start at root if path is absolute
     if (path[0] === "")
         return this.root.lookup(path.slice(1), filterTypes);
 
-    var found = this._lookupImpl(path);
+    // Early bailout for objects with matching absolute paths
+    var found = this.root._fullyQualifiedObjects && this.root._fullyQualifiedObjects["." + flatPath];
     if (found && (!filterTypes || filterTypes.indexOf(found.constructor) > -1)) {
         return found;
     }
 
-    // If there hasn't been a match, try again at the parent
-    if (this.parent === null || parentAlreadyChecked)
+    // Do a regular lookup at this namespace and below
+    found = this._lookupImpl(path, flatPath);
+    if (found && (!filterTypes || filterTypes.indexOf(found.constructor) > -1)) {
+        return found;
+    }
+
+    if (parentAlreadyChecked)
         return null;
-    return this.parent.lookup(path, filterTypes);
+
+    // If there hasn't been a match, walk up the tree and look more broadly
+    var current = this;
+    while (current.parent) {
+        found = current.parent._lookupImpl(path, flatPath);
+        if (found && (!filterTypes || filterTypes.indexOf(found.constructor) > -1)) {
+            return found;
+        }
+        current = current.parent;
+    }
+    return null;
 };
 
 /**
  * Internal helper for lookup that handles searching just at this namespace and below along with caching.
  * @param {string[]} path Path to look up
+ * @param {string} flatPath Flattened version of the path to use as a cache key
  * @returns {ReflectionObject|null} Looked up object or `null` if none could be found
  * @private
  */
-Namespace.prototype._lookupImpl = function lookup(path) {
-    var flatPath = path.join(".");
+Namespace.prototype._lookupImpl = function lookup(path, flatPath) {
     if(Object.prototype.hasOwnProperty.call(this._lookupCache, flatPath)) {
         return this._lookupCache[flatPath];
     }
@@ -422,13 +454,15 @@ Namespace.prototype._lookupImpl = function lookup(path) {
     if (found) {
         if (path.length === 1) {
             exact = found;
-        } else if (found instanceof Namespace && (found = found._lookupImpl(path.slice(1))))
-            exact = found;
+        } else if (found instanceof Namespace) {
+            path = path.slice(1);
+            exact = found._lookupImpl(path, path.join("."));
+        }
 
     // Otherwise try each nested namespace
     } else {
         for (var i = 0; i < this.nestedArray.length; ++i)
-            if (this._nestedArray[i] instanceof Namespace && (found = this._nestedArray[i]._lookupImpl(path)))
+            if (this._nestedArray[i] instanceof Namespace && (found = this._nestedArray[i]._lookupImpl(path, flatPath)))
                 exact = found;
     }
 

package/src/object.js

@@ -51,6 +51,7 @@ function ReflectionObject(name, options) {
     /**
      * The edition specified for this object.  Only relevant for top-level objects.
      * @type {string}
+     * @private
      */
     this._edition = null;
 
@@ -58,18 +59,21 @@ function ReflectionObject(name, options) {
      * The default edition to use for this object if none is specified.  For legacy reasons,
      * this is proto2 except in the JSON parsing case where it was proto3.
      * @type {string}
+     * @private
      */
     this._defaultEdition = "proto2";
 
     /**
      * Resolved Features.
      * @type {object}
+     * @private
      */
     this._features = {};
 
     /**
      * Whether or not features have been resolved.
      * @type {boolean}
+     * @private
      */
     this._featuresResolved = false;
 

package/src/root.js

@@ -36,8 +36,19 @@ function Root(options) {
      */
     this.files = [];
 
-    // Default to proto2 if unspecified.
+    /**
+     * Edition, defaults to proto2 if unspecified.
+     * @type {string}
+     * @private
+     */
     this._edition = "proto2";
+
+    /**
+     * Global lookup cache of fully qualified names.
+     * @type {Object.<string,ReflectionObject>}
+     * @private
+     */
+    this._fullyQualifiedObjects = {};
 }
 
 /**
@@ -51,7 +62,7 @@ Root.fromJSON = function fromJSON(json, root) {
         root = new Root();
     if (json.options)
         root.setOptions(json.options);
-    return root.addJSON(json.nested)._resolveFeaturesRecursive();
+    return root.addJSON(json.nested).resolveAll();
 };
 
 /**
@@ -99,9 +110,6 @@ 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;
@@ -109,6 +117,9 @@ Root.prototype.load = function load(filename, options, callback) {
         if (sync) {
             throw err;
         }
+        if (root) {
+            root.resolveAll();
+        }
         var cb = callback;
         callback = null;
         cb(err, root);
@@ -219,7 +230,7 @@ Root.prototype.load = function load(filename, options, callback) {
         if (resolved = self.resolvePath("", filename[i]))
             fetch(resolved);
     if (sync) {
-        self._resolveFeaturesRecursive();
+        self.resolveAll();
         return self;
     }
     if (!queued) {
@@ -268,11 +279,12 @@ Root.prototype.loadSync = function loadSync(filename, options) {
  * @override
  */
 Root.prototype.resolveAll = function resolveAll() {
+    if (!this._needsRecursiveResolve) return this;
+
     if (this.deferred.length)
         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);
 };
 
@@ -335,6 +347,11 @@ Root.prototype._handleAdd = function _handleAdd(object) {
             object.parent[object.name] = object; // expose namespace as property of its parent
     }
 
+    if (object instanceof Type || object instanceof Enum || object instanceof Field) {
+        // Only store types and enums for quick lookup during resolve.
+        this._fullyQualifiedObjects[object.fullName] = object;
+    }
+
     // The above also adds uppercased (and thus conflict-free) nested types, services and enums as
     // properties of namespaces just like static code does. This allows using a .d.ts generated for
     // a static module with reflection-based solutions where the condition is met.
@@ -375,6 +392,8 @@ Root.prototype._handleRemove = function _handleRemove(object) {
             delete object.parent[object.name]; // unexpose namespaces
 
     }
+
+    delete this._fullyQualifiedObjects[object.fullName];
 };
 
 // Sets up cyclic dependencies (called in index-light)

package/src/service.js

@@ -110,6 +110,8 @@ Service.prototype.get = function get(name) {
  * @override
  */
 Service.prototype.resolveAll = function resolveAll() {
+    if (!this._needsRecursiveResolve) return this;
+
     Namespace.prototype.resolve.call(this);
     var methods = this.methodsArray;
     for (var i = 0; i < methods.length; ++i)