npm - @bufbuild/protobuf - Versions diffs - 1.9.0 → 1.10.1 - Mend

@bufbuild/protobuf 1.9.0 → 1.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (32) hide show

package/README.md +1 -1
package/dist/cjs/binary-encoding.d.ts +6 -4
package/dist/cjs/binary-encoding.js +14 -7
package/dist/cjs/create-registry.d.ts +5 -1
package/dist/cjs/create-registry.js +44 -35
package/dist/cjs/extension-accessor.js +1 -1
package/dist/cjs/google/protobuf/descriptor_pb.d.ts +82 -8
package/dist/cjs/google/protobuf/descriptor_pb.js +46 -3
package/dist/cjs/google/protobuf/struct_pb.js +1 -1
package/dist/cjs/google/protobuf/type_pb.js +1 -1
package/dist/cjs/index.d.ts +1 -1
package/dist/cjs/index.js +2 -1
package/dist/cjs/private/binary-format.js +3 -2
package/dist/cjs/private/feature-set.js +17 -3
package/dist/cjs/private/util-common.js +12 -2
package/dist/cjs/type-registry.d.ts +9 -0
package/dist/esm/binary-encoding.d.ts +6 -4
package/dist/esm/binary-encoding.js +14 -7
package/dist/esm/create-registry.d.ts +5 -1
package/dist/esm/create-registry.js +41 -33
package/dist/esm/extension-accessor.js +1 -1
package/dist/esm/google/protobuf/descriptor_pb.d.ts +82 -8
package/dist/esm/google/protobuf/descriptor_pb.js +44 -2
package/dist/esm/google/protobuf/struct_pb.js +1 -1
package/dist/esm/google/protobuf/type_pb.js +1 -1
package/dist/esm/index.d.ts +1 -1
package/dist/esm/index.js +1 -1
package/dist/esm/private/binary-format.js +3 -2
package/dist/esm/private/feature-set.js +17 -3
package/dist/esm/private/util-common.js +12 -2
package/dist/esm/type-registry.d.ts +9 -0
package/package.json +8 -5

package/README.md CHANGED Viewed

@@ -15,7 +15,7 @@ Some additional features that set it apart from the others:
 - ECMAScript module support
 - First-class TypeScript support
 - Generation of idiomatic JavaScript and TypeScript code.
-- Generation of [much smaller bundles](https://github.com/bufbuild/protobuf-es/blob/main/packages/protobuf-bench)
+- Generation of [much smaller bundles](https://github.com/bufbuild/protobuf-es/blob/main/packages/bundle-size)
 - Implementation of all proto3 features, including the [canonical JSON format](https://developers.google.com/protocol-buffers/docs/proto3#json).
 - Implementation of all proto2 features, except for extensions and the text format.
 - Usage of standard JavaScript APIs instead of the [Closure Library](http://googlecode.blogspot.com/2009/11/introducing-closure-tools.html)

package/dist/cjs/binary-encoding.d.ts CHANGED Viewed

@@ -61,7 +61,7 @@ export interface IBinaryReader {
     /**
      * Skip one element on the wire and return the skipped data.
      */
-    skip(wireType: WireType): Uint8Array;
+    skip(wireType: WireType, fieldNo?: number): Uint8Array;
     /**
      * Read a `uint32` field, an unsigned 32 bit varint.
      */
@@ -347,10 +347,12 @@ export declare class BinaryReader implements IBinaryReader {
      */
     tag(): [number, WireType];
     /**
-     * Skip one element on the wire and return the skipped data.
-     * Supports WireType.StartGroup since v2.0.0-alpha.23.
+     * Skip one element and return the skipped data.
+     *
+     * When skipping StartGroup, provide the tags field number to check for
+     * matching field number in the EndGroup tag.
      */
-    skip(wireType: WireType): Uint8Array;
+    skip(wireType: WireType, fieldNo?: number): Uint8Array;
     protected varint64: () => [number, number];
     /**
      * Throws error if position in byte array is out of range.

package/dist/cjs/binary-encoding.js CHANGED Viewed

@@ -294,10 +294,12 @@ class BinaryReader {
         return [fieldNo, wireType];
     }
     /**
-     * Skip one element on the wire and return the skipped data.
-     * Supports WireType.StartGroup since v2.0.0-alpha.23.
+     * Skip one element and return the skipped data.
+     *
+     * When skipping StartGroup, provide the tags field number to check for
+     * matching field number in the EndGroup tag.
      */
-    skip(wireType) {
+    skip(wireType, fieldNo) {
         let start = this.pos;
         switch (wireType) {
             case WireType.Varint:
@@ -319,10 +321,15 @@ class BinaryReader {
                 this.pos += len;
                 break;
             case WireType.StartGroup:
-                // TODO check for matching field numbers in StartGroup / EndGroup tags
-                let t;
-                while ((t = this.tag()[1]) !== WireType.EndGroup) {
-                    this.skip(t);
+                for (;;) {
+                    const [fn, wt] = this.tag();
+                    if (wt === WireType.EndGroup) {
+                        if (fieldNo !== undefined && fn !== fieldNo) {
+                            throw new Error("invalid end group tag");
+                        }
+                        break;
+                    }
+                    this.skip(wt, fn);
                 }
                 break;
             default:

package/dist/cjs/create-registry.d.ts CHANGED Viewed

@@ -1,9 +1,13 @@
 import type { MessageType } from "./message-type.js";
 import type { EnumType } from "./enum.js";
 import type { ServiceType } from "./service-type.js";
-import type { IEnumTypeRegistry, IExtensionRegistry, IMessageTypeRegistry, IServiceTypeRegistry } from "./type-registry.js";
+import type { IEnumTypeRegistry, IExtensionRegistry, IMessageTypeRegistry, IMutableRegistry, IServiceTypeRegistry } from "./type-registry.js";
 import type { Extension } from "./extension.js";
 /**
  * Create a new registry from the given types.
  */
 export declare function createRegistry(...types: Array<MessageType | EnumType | ServiceType | Extension>): IMessageTypeRegistry & IEnumTypeRegistry & IExtensionRegistry & IServiceTypeRegistry;
+/**
+ * Create a mutable registry from the given types.
+ */
+export declare function createMutableRegistry(...types: Array<MessageType | EnumType | ServiceType | Extension>): IMutableRegistry;

package/dist/cjs/create-registry.js CHANGED Viewed

@@ -13,11 +13,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRegistry = void 0;
+exports.createMutableRegistry = exports.createRegistry = void 0;
 /**
  * Create a new registry from the given types.
  */
 function createRegistry(...types) {
+    const mutable = createMutableRegistry(...types);
+    delete mutable.add;
+    return mutable;
+}
+exports.createRegistry = createRegistry;
+/**
+ * Create a mutable registry from the given types.
+ */
+function createMutableRegistry(...types) {
     const messages = {};
     const enums = {};
     const services = {};
@@ -41,54 +50,54 @@ function createRegistry(...types) {
             var _a;
             return (_a = extensionsByName.get(typeName)) !== null && _a !== void 0 ? _a : undefined;
         },
-    };
-    function addType(type) {
-        var _a;
-        if ("fields" in type) {
-            if (!registry.findMessage(type.typeName)) {
-                messages[type.typeName] = type;
-                type.fields.list().forEach(addField);
+        add(type) {
+            var _a;
+            if ("fields" in type) {
+                if (!this.findMessage(type.typeName)) {
+                    messages[type.typeName] = type;
+                    type.fields.list().forEach(addField);
+                }
             }
-        }
-        else if ("methods" in type) {
-            if (!registry.findService(type.typeName)) {
-                services[type.typeName] = type;
-                for (const method of Object.values(type.methods)) {
-                    addType(method.I);
-                    addType(method.O);
+            else if ("methods" in type) {
+                if (!this.findService(type.typeName)) {
+                    services[type.typeName] = type;
+                    for (const method of Object.values(type.methods)) {
+                        this.add(method.I);
+                        this.add(method.O);
+                    }
                 }
             }
-        }
-        else if ("extendee" in type) {
-            if (!extensionsByName.has(type.typeName)) {
-                extensionsByName.set(type.typeName, type);
-                const extendeeName = type.extendee.typeName;
-                if (!extensionsByExtendee.has(extendeeName)) {
-                    extensionsByExtendee.set(extendeeName, new Map());
+            else if ("extendee" in type) {
+                if (!extensionsByName.has(type.typeName)) {
+                    extensionsByName.set(type.typeName, type);
+                    const extendeeName = type.extendee.typeName;
+                    if (!extensionsByExtendee.has(extendeeName)) {
+                        extensionsByExtendee.set(extendeeName, new Map());
+                    }
+                    (_a = extensionsByExtendee.get(extendeeName)) === null || _a === void 0 ? void 0 : _a.set(type.field.no, type);
+                    this.add(type.extendee);
+                    addField(type.field);
                 }
-                (_a = extensionsByExtendee.get(extendeeName)) === null || _a === void 0 ? void 0 : _a.set(type.field.no, type);
-                addType(type.extendee);
-                addField(type.field);
             }
-        }
-        else {
-            enums[type.typeName] = type;
-        }
-    }
+            else {
+                enums[type.typeName] = type;
+            }
+        },
+    };
     function addField(field) {
         if (field.kind == "message") {
-            addType(field.T);
+            registry.add(field.T);
         }
         else if (field.kind == "map" && field.V.kind == "message") {
-            addType(field.V.T);
+            registry.add(field.V.T);
         }
         else if (field.kind == "enum") {
-            addType(field.T);
+            registry.add(field.T);
         }
     }
     for (const type of types) {
-        addType(type);
+        registry.add(type);
     }
     return registry;
 }
-exports.createRegistry = createRegistry;
+exports.createMutableRegistry = createMutableRegistry;

package/dist/cjs/extension-accessor.js CHANGED Viewed

@@ -74,7 +74,7 @@ function setExtension(message, extension, value, options) {
     const reader = readOpt.readerFactory(writer.finish());
     while (reader.pos < reader.len) {
         const [no, wireType] = reader.tag();
-        const data = reader.skip(wireType);
+        const data = reader.skip(wireType, no);
         message.getType().runtime.bin.onUnknownField(message, no, wireType, data);
     }
 }

package/dist/cjs/google/protobuf/descriptor_pb.d.ts CHANGED Viewed

@@ -16,6 +16,13 @@ export declare enum Edition {
      * @generated from enum value: EDITION_UNKNOWN = 0;
      */
     EDITION_UNKNOWN = 0,
+    /**
+     * A placeholder edition for specifying default behaviors *before* a feature
+     * was first introduced.  This is effectively an "infinite past".
+     *
+     * @generated from enum value: EDITION_LEGACY = 900;
+     */
+    EDITION_LEGACY = 900,
     /**
      * Legacy syntax "editions".  These pre-date editions, but behave much like
      * distinct editions.  These can't be used to specify the edition of proto
@@ -876,12 +883,16 @@ export declare class FileOptions extends Message<FileOptions> {
      */
     javaGenerateEqualsAndHash?: boolean;
     /**
-     * If set true, then the Java2 code generator will generate code that
-     * throws an exception whenever an attempt is made to assign a non-UTF-8
-     * byte sequence to a string field.
-     * Message reflection will do the same.
-     * However, an extension field still accepts non-UTF-8 byte sequences.
-     * This option has no effect on when used with the lite runtime.
+     * A proto2 file can set this to true to opt in to UTF-8 checking for Java,
+     * which will throw an exception if invalid UTF-8 is parsed from the wire or
+     * assigned to a string field.
+     *
+     * TODO: clarify exactly what kinds of field types this option
+     * applies to, and update these docs accordingly.
+     *
+     * Proto3 files already perform these checks. Setting the option explicitly to
+     * false has no effect: it cannot be used to opt proto3 files out of UTF-8
+     * checks.
      *
      * @generated from field: optional bool java_string_check_utf8 = 27 [default = false];
      */
@@ -1266,6 +1277,10 @@ export declare class FieldOptions extends Message<FieldOptions> {
      * @generated from field: optional google.protobuf.FeatureSet features = 21;
      */
     features?: FeatureSet;
+    /**
+     * @generated from field: optional google.protobuf.FieldOptions.FeatureSupport feature_support = 22;
+     */
+    featureSupport?: FieldOptions_FeatureSupport;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -1424,6 +1439,51 @@ export declare class FieldOptions_EditionDefault extends Message<FieldOptions_Ed
     static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): FieldOptions_EditionDefault;
     static equals(a: FieldOptions_EditionDefault | PlainMessage<FieldOptions_EditionDefault> | undefined, b: FieldOptions_EditionDefault | PlainMessage<FieldOptions_EditionDefault> | undefined): boolean;
 }
+/**
+ * Information about the support window of a feature.
+ *
+ * @generated from message google.protobuf.FieldOptions.FeatureSupport
+ */
+export declare class FieldOptions_FeatureSupport extends Message<FieldOptions_FeatureSupport> {
+    /**
+     * The edition that this feature was first available in.  In editions
+     * earlier than this one, the default assigned to EDITION_LEGACY will be
+     * used, and proto files will not be able to override it.
+     *
+     * @generated from field: optional google.protobuf.Edition edition_introduced = 1;
+     */
+    editionIntroduced?: Edition;
+    /**
+     * The edition this feature becomes deprecated in.  Using this after this
+     * edition may trigger warnings.
+     *
+     * @generated from field: optional google.protobuf.Edition edition_deprecated = 2;
+     */
+    editionDeprecated?: Edition;
+    /**
+     * The deprecation warning text if this feature is used after the edition it
+     * was marked deprecated in.
+     *
+     * @generated from field: optional string deprecation_warning = 3;
+     */
+    deprecationWarning?: string;
+    /**
+     * The edition this feature is no longer available in.  In editions after
+     * this one, the last default assigned will be used, and proto files will
+     * not be able to override it.
+     *
+     * @generated from field: optional google.protobuf.Edition edition_removed = 4;
+     */
+    editionRemoved?: Edition;
+    constructor(data?: PartialMessage<FieldOptions_FeatureSupport>);
+    static readonly runtime: typeof proto2;
+    static readonly typeName = "google.protobuf.FieldOptions.FeatureSupport";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): FieldOptions_FeatureSupport;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): FieldOptions_FeatureSupport;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): FieldOptions_FeatureSupport;
+    static equals(a: FieldOptions_FeatureSupport | PlainMessage<FieldOptions_FeatureSupport> | undefined, b: FieldOptions_FeatureSupport | PlainMessage<FieldOptions_FeatureSupport> | undefined): boolean;
+}
 /**
  * @generated from message google.protobuf.OneofOptions
  */
@@ -1529,6 +1589,12 @@ export declare class EnumValueOptions extends Message<EnumValueOptions> {
      * @generated from field: optional bool debug_redact = 3 [default = false];
      */
     debugRedact?: boolean;
+    /**
+     * Information about the support window of a feature value.
+     *
+     * @generated from field: optional google.protobuf.FieldOptions.FeatureSupport feature_support = 4;
+     */
+    featureSupport?: FieldOptions_FeatureSupport;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -1919,9 +1985,17 @@ export declare class FeatureSetDefaults_FeatureSetEditionDefault extends Message
      */
     edition?: Edition;
     /**
-     * @generated from field: optional google.protobuf.FeatureSet features = 2;
+     * Defaults of features that can be overridden in this edition.
+     *
+     * @generated from field: optional google.protobuf.FeatureSet overridable_features = 4;
      */
-    features?: FeatureSet;
+    overridableFeatures?: FeatureSet;
+    /**
+     * Defaults of features that can't be overridden in this edition.
+     *
+     * @generated from field: optional google.protobuf.FeatureSet fixed_features = 5;
+     */
+    fixedFeatures?: FeatureSet;
     constructor(data?: PartialMessage<FeatureSetDefaults_FeatureSetEditionDefault>);
     static readonly runtime: typeof proto2;
     static readonly typeName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault";

package/dist/cjs/google/protobuf/descriptor_pb.js CHANGED Viewed

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GeneratedCodeInfo_Annotation_Semantic = exports.GeneratedCodeInfo_Annotation = exports.GeneratedCodeInfo = exports.SourceCodeInfo_Location = exports.SourceCodeInfo = exports.FeatureSetDefaults_FeatureSetEditionDefault = exports.FeatureSetDefaults = exports.FeatureSet_JsonFormat = exports.FeatureSet_MessageEncoding = exports.FeatureSet_Utf8Validation = exports.FeatureSet_RepeatedFieldEncoding = exports.FeatureSet_EnumType = exports.FeatureSet_FieldPresence = exports.FeatureSet = exports.UninterpretedOption_NamePart = exports.UninterpretedOption = exports.MethodOptions_IdempotencyLevel = exports.MethodOptions = exports.ServiceOptions = exports.EnumValueOptions = exports.EnumOptions = exports.OneofOptions = exports.FieldOptions_EditionDefault = exports.FieldOptions_OptionTargetType = exports.FieldOptions_OptionRetention = exports.FieldOptions_JSType = exports.FieldOptions_CType = exports.FieldOptions = exports.MessageOptions = exports.FileOptions_OptimizeMode = exports.FileOptions = exports.MethodDescriptorProto = exports.ServiceDescriptorProto = exports.EnumValueDescriptorProto = exports.EnumDescriptorProto_EnumReservedRange = exports.EnumDescriptorProto = exports.OneofDescriptorProto = exports.FieldDescriptorProto_Label = exports.FieldDescriptorProto_Type = exports.FieldDescriptorProto = exports.ExtensionRangeOptions_Declaration = exports.ExtensionRangeOptions_VerificationState = exports.ExtensionRangeOptions = exports.DescriptorProto_ReservedRange = exports.DescriptorProto_ExtensionRange = exports.DescriptorProto = exports.FileDescriptorProto = exports.FileDescriptorSet = exports.Edition = void 0;
+exports.GeneratedCodeInfo_Annotation_Semantic = exports.GeneratedCodeInfo_Annotation = exports.GeneratedCodeInfo = exports.SourceCodeInfo_Location = exports.SourceCodeInfo = exports.FeatureSetDefaults_FeatureSetEditionDefault = exports.FeatureSetDefaults = exports.FeatureSet_JsonFormat = exports.FeatureSet_MessageEncoding = exports.FeatureSet_Utf8Validation = exports.FeatureSet_RepeatedFieldEncoding = exports.FeatureSet_EnumType = exports.FeatureSet_FieldPresence = exports.FeatureSet = exports.UninterpretedOption_NamePart = exports.UninterpretedOption = exports.MethodOptions_IdempotencyLevel = exports.MethodOptions = exports.ServiceOptions = exports.EnumValueOptions = exports.EnumOptions = exports.OneofOptions = exports.FieldOptions_FeatureSupport = exports.FieldOptions_EditionDefault = exports.FieldOptions_OptionTargetType = exports.FieldOptions_OptionRetention = exports.FieldOptions_JSType = exports.FieldOptions_CType = exports.FieldOptions = exports.MessageOptions = exports.FileOptions_OptimizeMode = exports.FileOptions = exports.MethodDescriptorProto = exports.ServiceDescriptorProto = exports.EnumValueDescriptorProto = exports.EnumDescriptorProto_EnumReservedRange = exports.EnumDescriptorProto = exports.OneofDescriptorProto = exports.FieldDescriptorProto_Label = exports.FieldDescriptorProto_Type = exports.FieldDescriptorProto = exports.ExtensionRangeOptions_Declaration = exports.ExtensionRangeOptions_VerificationState = exports.ExtensionRangeOptions = exports.DescriptorProto_ReservedRange = exports.DescriptorProto_ExtensionRange = exports.DescriptorProto = exports.FileDescriptorProto = exports.FileDescriptorSet = exports.Edition = void 0;
 // Author: kenton@google.com (Kenton Varda)
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
@@ -21,7 +21,7 @@ exports.GeneratedCodeInfo_Annotation_Semantic = exports.GeneratedCodeInfo_Annota
 // The messages in this file describe the definitions found in .proto files.
 // A valid .proto file can be translated directly to a FileDescriptorProto
 // without any other information (e.g. without reading its imports).
-// @generated by protoc-gen-es v1.9.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.10.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/descriptor.proto (package google.protobuf, syntax proto2)
 /* eslint-disable */
 const proto2_js_1 = require("../../proto2.js");
@@ -39,6 +39,13 @@ var Edition;
      * @generated from enum value: EDITION_UNKNOWN = 0;
      */
     Edition[Edition["EDITION_UNKNOWN"] = 0] = "EDITION_UNKNOWN";
+    /**
+     * A placeholder edition for specifying default behaviors *before* a feature
+     * was first introduced.  This is effectively an "infinite past".
+     *
+     * @generated from enum value: EDITION_LEGACY = 900;
+     */
+    Edition[Edition["EDITION_LEGACY"] = 900] = "EDITION_LEGACY";
     /**
      * Legacy syntax "editions".  These pre-date editions, but behave much like
      * distinct editions.  These can't be used to specify the edition of proto
@@ -99,6 +106,7 @@ var Edition;
 // Retrieve enum metadata with: proto2.getEnumType(Edition)
 proto2_js_1.proto2.util.setEnumType(Edition, "google.protobuf.Edition", [
     { no: 0, name: "EDITION_UNKNOWN" },
+    { no: 900, name: "EDITION_LEGACY" },
     { no: 998, name: "EDITION_PROTO2" },
     { no: 999, name: "EDITION_PROTO3" },
     { no: 1000, name: "EDITION_2023" },
@@ -1040,6 +1048,7 @@ FieldOptions.fields = proto2_js_1.proto2.util.newFieldList(() => [
     { no: 19, name: "targets", kind: "enum", T: proto2_js_1.proto2.getEnumType(FieldOptions_OptionTargetType), repeated: true },
     { no: 20, name: "edition_defaults", kind: "message", T: FieldOptions_EditionDefault, repeated: true },
     { no: 21, name: "features", kind: "message", T: FeatureSet, opt: true },
+    { no: 22, name: "feature_support", kind: "message", T: FieldOptions_FeatureSupport, opt: true },
     { no: 999, name: "uninterpreted_option", kind: "message", T: UninterpretedOption, repeated: true },
 ]);
 /**
@@ -1225,6 +1234,38 @@ FieldOptions_EditionDefault.fields = proto2_js_1.proto2.util.newFieldList(() =>
     { no: 3, name: "edition", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
     { no: 2, name: "value", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
 ]);
+/**
+ * Information about the support window of a feature.
+ *
+ * @generated from message google.protobuf.FieldOptions.FeatureSupport
+ */
+class FieldOptions_FeatureSupport extends message_js_1.Message {
+    constructor(data) {
+        super();
+        proto2_js_1.proto2.util.initPartial(data, this);
+    }
+    static fromBinary(bytes, options) {
+        return new FieldOptions_FeatureSupport().fromBinary(bytes, options);
+    }
+    static fromJson(jsonValue, options) {
+        return new FieldOptions_FeatureSupport().fromJson(jsonValue, options);
+    }
+    static fromJsonString(jsonString, options) {
+        return new FieldOptions_FeatureSupport().fromJsonString(jsonString, options);
+    }
+    static equals(a, b) {
+        return proto2_js_1.proto2.util.equals(FieldOptions_FeatureSupport, a, b);
+    }
+}
+exports.FieldOptions_FeatureSupport = FieldOptions_FeatureSupport;
+FieldOptions_FeatureSupport.runtime = proto2_js_1.proto2;
+FieldOptions_FeatureSupport.typeName = "google.protobuf.FieldOptions.FeatureSupport";
+FieldOptions_FeatureSupport.fields = proto2_js_1.proto2.util.newFieldList(() => [
+    { no: 1, name: "edition_introduced", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
+    { no: 2, name: "edition_deprecated", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
+    { no: 3, name: "deprecation_warning", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 4, name: "edition_removed", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
+]);
 /**
  * @generated from message google.protobuf.OneofOptions
  */
@@ -1330,6 +1371,7 @@ EnumValueOptions.fields = proto2_js_1.proto2.util.newFieldList(() => [
     { no: 1, name: "deprecated", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true, default: false },
     { no: 2, name: "features", kind: "message", T: FeatureSet, opt: true },
     { no: 3, name: "debug_redact", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true, default: false },
+    { no: 4, name: "feature_support", kind: "message", T: FieldOptions_FeatureSupport, opt: true },
     { no: 999, name: "uninterpreted_option", kind: "message", T: UninterpretedOption, repeated: true },
 ]);
 /**
@@ -1770,7 +1812,8 @@ FeatureSetDefaults_FeatureSetEditionDefault.runtime = proto2_js_1.proto2;
 FeatureSetDefaults_FeatureSetEditionDefault.typeName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault";
 FeatureSetDefaults_FeatureSetEditionDefault.fields = proto2_js_1.proto2.util.newFieldList(() => [
     { no: 3, name: "edition", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
-    { no: 2, name: "features", kind: "message", T: FeatureSet, opt: true },
+    { no: 4, name: "overridable_features", kind: "message", T: FeatureSet, opt: true },
+    { no: 5, name: "fixed_features", kind: "message", T: FeatureSet, opt: true },
 ]);
 /**
  * Encapsulates information about the original source file from which a

package/dist/cjs/google/protobuf/struct_pb.js CHANGED Viewed

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListValue = exports.Value = exports.Struct = exports.NullValue = void 0;
-// @generated by protoc-gen-es v1.9.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.10.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/google/protobuf/type_pb.js CHANGED Viewed

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Option = exports.EnumValue = exports.Enum = exports.Field_Cardinality = exports.Field_Kind = exports.Field = exports.Type = exports.Syntax = void 0;
-// @generated by protoc-gen-es v1.9.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.10.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/index.d.ts CHANGED Viewed

@@ -25,7 +25,7 @@ export type { JsonFormat, JsonObject, JsonValue, JsonReadOptions, JsonWriteOptio
 export type { DescriptorSet, AnyDesc, DescFile, DescEnum, DescEnumValue, DescMessage, DescOneof, DescField, DescService, DescMethod, DescExtension, DescComments, } from "./descriptor-set.js";
 export { createDescriptorSet } from "./create-descriptor-set.js";
 export type { IMessageTypeRegistry, IExtensionRegistry, } from "./type-registry.js";
-export { createRegistry } from "./create-registry.js";
+export { createRegistry, createMutableRegistry } from "./create-registry.js";
 export { createRegistryFromDescriptors } from "./create-registry-from-desc.js";
 export { toPlainMessage } from "./to-plain-message.js";
 export * from "./google/protobuf/compiler/plugin_pb.js";

package/dist/cjs/index.js CHANGED Viewed

@@ -27,7 +27,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPlainMessage = exports.createRegistryFromDescriptors = exports.createRegistry = exports.createDescriptorSet = exports.BinaryReader = exports.BinaryWriter = exports.WireType = exports.MethodIdempotency = exports.MethodKind = exports.clearExtension = exports.hasExtension = exports.setExtension = exports.getExtension = exports.ScalarType = exports.LongType = exports.isMessage = exports.Message = exports.codegenInfo = exports.protoDelimited = exports.protoBase64 = exports.protoInt64 = exports.protoDouble = exports.proto2 = exports.proto3 = void 0;
+exports.toPlainMessage = exports.createRegistryFromDescriptors = exports.createMutableRegistry = exports.createRegistry = exports.createDescriptorSet = exports.BinaryReader = exports.BinaryWriter = exports.WireType = exports.MethodIdempotency = exports.MethodKind = exports.clearExtension = exports.hasExtension = exports.setExtension = exports.getExtension = exports.ScalarType = exports.LongType = exports.isMessage = exports.Message = exports.codegenInfo = exports.protoDelimited = exports.protoBase64 = exports.protoInt64 = exports.protoDouble = exports.proto2 = exports.proto3 = void 0;
 var proto3_js_1 = require("./proto3.js");
 Object.defineProperty(exports, "proto3", { enumerable: true, get: function () { return proto3_js_1.proto3; } });
 var proto2_js_1 = require("./proto2.js");
@@ -65,6 +65,7 @@ var create_descriptor_set_js_1 = require("./create-descriptor-set.js");
 Object.defineProperty(exports, "createDescriptorSet", { enumerable: true, get: function () { return create_descriptor_set_js_1.createDescriptorSet; } });
 var create_registry_js_1 = require("./create-registry.js");
 Object.defineProperty(exports, "createRegistry", { enumerable: true, get: function () { return create_registry_js_1.createRegistry; } });
+Object.defineProperty(exports, "createMutableRegistry", { enumerable: true, get: function () { return create_registry_js_1.createMutableRegistry; } });
 var create_registry_from_desc_js_1 = require("./create-registry-from-desc.js");
 Object.defineProperty(exports, "createRegistryFromDescriptors", { enumerable: true, get: function () { return create_registry_from_desc_js_1.createRegistryFromDescriptors; } });
 var to_plain_message_js_1 = require("./to-plain-message.js");

package/dist/cjs/private/binary-format.js CHANGED Viewed

@@ -75,12 +75,13 @@ function makeBinaryFormat() {
             let fieldNo, wireType;
             while (reader.pos < end) {
                 [fieldNo, wireType] = reader.tag();
-                if (wireType == binary_encoding_js_1.WireType.EndGroup) {
+                if (delimitedMessageEncoding === true &&
+                    wireType == binary_encoding_js_1.WireType.EndGroup) {
                     break;
                 }
                 const field = type.fields.find(fieldNo);
                 if (!field) {
-                    const data = reader.skip(wireType);
+                    const data = reader.skip(wireType, fieldNo);
                     if (options.readUnknownFields) {
                         this.onUnknownField(message, fieldNo, wireType, data);
                     }

package/dist/cjs/private/feature-set.js CHANGED Viewed

@@ -21,14 +21,14 @@ const proto_base64_js_1 = require("../proto-base64.js");
  */
 function getFeatureSetDefaults(options) {
     return descriptor_pb_js_1.FeatureSetDefaults.fromBinary(proto_base64_js_1.protoBase64.dec(
-    /*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiADKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
+    /*upstream-inject-feature-defaults-start*/ "ChMY5gciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
 }
 /**
  * Create an edition feature resolver with the given feature set defaults, or
  * the feature set defaults supported by @bufbuild/protobuf.
  */
 function createFeatureResolver(edition, compiledFeatureSetDefaults, serializationOptions) {
-    var _a, _b;
+    var _a;
     const fds = compiledFeatureSetDefaults !== null && compiledFeatureSetDefaults !== void 0 ? compiledFeatureSetDefaults : getFeatureSetDefaults(serializationOptions);
     const min = fds.minimumEdition;
     const max = fds.maximumEdition;
@@ -52,9 +52,23 @@ function createFeatureResolver(edition, compiledFeatureSetDefaults, serializatio
         if (highestMatch !== undefined && highestMatch.e > e) {
             continue;
         }
+        let f;
+        if (c.fixedFeatures && c.overridableFeatures) {
+            f = c.fixedFeatures;
+            f.fromBinary(c.overridableFeatures.toBinary());
+        }
+        else if (c.fixedFeatures) {
+            f = c.fixedFeatures;
+        }
+        else if (c.overridableFeatures) {
+            f = c.overridableFeatures;
+        }
+        else {
+            f = new descriptor_pb_js_1.FeatureSet();
+        }
         highestMatch = {
             e,
-            f: (_b = c.features) !== null && _b !== void 0 ? _b : new descriptor_pb_js_1.FeatureSet(),
+            f,
         };
     }
     if (highestMatch === undefined) {

package/dist/cjs/private/util-common.js CHANGED Viewed

@@ -29,7 +29,7 @@ function makeUtilCommon() {
             const type = target.getType();
             for (const member of type.fields.byMember()) {
                 const localName = member.localName, t = target, s = source;
-                if (s[localName] === undefined) {
+                if (s[localName] == null) {
                     // TODO if source is a Message instance, we should use isFieldSet() here to support future field presence
                     continue;
                 }
@@ -143,7 +143,17 @@ function makeUtilCommon() {
                 }
                 switch (m.kind) {
                     case "message":
-                        return m.T.equals(va, vb);
+                        let a = va;
+                        let b = vb;
+                        if (m.T.fieldWrapper) {
+                            if (a !== undefined && !(0, is_message_js_1.isMessage)(a)) {
+                                a = m.T.fieldWrapper.wrapField(a);
+                            }
+                            if (b !== undefined && !(0, is_message_js_1.isMessage)(b)) {
+                                b = m.T.fieldWrapper.wrapField(b);
+                            }
+                        }
+                        return m.T.equals(a, b);
                     case "enum":
                         return (0, scalars_js_1.scalarEquals)(scalar_js_1.ScalarType.INT32, va, vb);
                     case "scalar":

package/dist/cjs/type-registry.d.ts CHANGED Viewed

@@ -55,3 +55,12 @@ export interface IExtensionRegistry {
      */
     findExtension(typeName: string): Extension | undefined;
 }
+/**
+ * A registry that allows
+ */
+export interface IMutableRegistry extends IMessageTypeRegistry, IEnumTypeRegistry, IServiceTypeRegistry, IExtensionRegistry {
+    /**
+     * Adds the type to the registry.
+     */
+    add(type: MessageType | EnumType | ServiceType | Extension): void;
+}

package/dist/esm/binary-encoding.d.ts CHANGED Viewed

@@ -61,7 +61,7 @@ export interface IBinaryReader {
     /**
      * Skip one element on the wire and return the skipped data.
      */
-    skip(wireType: WireType): Uint8Array;
+    skip(wireType: WireType, fieldNo?: number): Uint8Array;
     /**
      * Read a `uint32` field, an unsigned 32 bit varint.
      */
@@ -347,10 +347,12 @@ export declare class BinaryReader implements IBinaryReader {
      */
     tag(): [number, WireType];
     /**
-     * Skip one element on the wire and return the skipped data.
-     * Supports WireType.StartGroup since v2.0.0-alpha.23.
+     * Skip one element and return the skipped data.
+     *
+     * When skipping StartGroup, provide the tags field number to check for
+     * matching field number in the EndGroup tag.
      */
-    skip(wireType: WireType): Uint8Array;
+    skip(wireType: WireType, fieldNo?: number): Uint8Array;
     protected varint64: () => [number, number];
     /**
      * Throws error if position in byte array is out of range.

package/dist/esm/binary-encoding.js CHANGED Viewed

@@ -290,10 +290,12 @@ export class BinaryReader {
         return [fieldNo, wireType];
     }
     /**
-     * Skip one element on the wire and return the skipped data.
-     * Supports WireType.StartGroup since v2.0.0-alpha.23.
+     * Skip one element and return the skipped data.
+     *
+     * When skipping StartGroup, provide the tags field number to check for
+     * matching field number in the EndGroup tag.
      */
-    skip(wireType) {
+    skip(wireType, fieldNo) {
         let start = this.pos;
         switch (wireType) {
             case WireType.Varint:
@@ -315,10 +317,15 @@ export class BinaryReader {
                 this.pos += len;
                 break;
             case WireType.StartGroup:
-                // TODO check for matching field numbers in StartGroup / EndGroup tags
-                let t;
-                while ((t = this.tag()[1]) !== WireType.EndGroup) {
-                    this.skip(t);
+                for (;;) {
+                    const [fn, wt] = this.tag();
+                    if (wt === WireType.EndGroup) {
+                        if (fieldNo !== undefined && fn !== fieldNo) {
+                            throw new Error("invalid end group tag");
+                        }
+                        break;
+                    }
+                    this.skip(wt, fn);
                 }
                 break;
             default:

package/dist/esm/create-registry.d.ts CHANGED Viewed

@@ -1,9 +1,13 @@
 import type { MessageType } from "./message-type.js";
 import type { EnumType } from "./enum.js";
 import type { ServiceType } from "./service-type.js";
-import type { IEnumTypeRegistry, IExtensionRegistry, IMessageTypeRegistry, IServiceTypeRegistry } from "./type-registry.js";
+import type { IEnumTypeRegistry, IExtensionRegistry, IMessageTypeRegistry, IMutableRegistry, IServiceTypeRegistry } from "./type-registry.js";
 import type { Extension } from "./extension.js";
 /**
  * Create a new registry from the given types.
  */
 export declare function createRegistry(...types: Array<MessageType | EnumType | ServiceType | Extension>): IMessageTypeRegistry & IEnumTypeRegistry & IExtensionRegistry & IServiceTypeRegistry;
+/**
+ * Create a mutable registry from the given types.
+ */
+export declare function createMutableRegistry(...types: Array<MessageType | EnumType | ServiceType | Extension>): IMutableRegistry;

package/dist/esm/create-registry.js CHANGED Viewed

@@ -15,6 +15,14 @@
  * Create a new registry from the given types.
  */
 export function createRegistry(...types) {
+    const mutable = createMutableRegistry(...types);
+    delete mutable.add;
+    return mutable;
+}
+/**
+ * Create a mutable registry from the given types.
+ */
+export function createMutableRegistry(...types) {
     const messages = {};
     const enums = {};
     const services = {};
@@ -38,53 +46,53 @@ export function createRegistry(...types) {
             var _a;
             return (_a = extensionsByName.get(typeName)) !== null && _a !== void 0 ? _a : undefined;
         },
-    };
-    function addType(type) {
-        var _a;
-        if ("fields" in type) {
-            if (!registry.findMessage(type.typeName)) {
-                messages[type.typeName] = type;
-                type.fields.list().forEach(addField);
+        add(type) {
+            var _a;
+            if ("fields" in type) {
+                if (!this.findMessage(type.typeName)) {
+                    messages[type.typeName] = type;
+                    type.fields.list().forEach(addField);
+                }
             }
-        }
-        else if ("methods" in type) {
-            if (!registry.findService(type.typeName)) {
-                services[type.typeName] = type;
-                for (const method of Object.values(type.methods)) {
-                    addType(method.I);
-                    addType(method.O);
+            else if ("methods" in type) {
+                if (!this.findService(type.typeName)) {
+                    services[type.typeName] = type;
+                    for (const method of Object.values(type.methods)) {
+                        this.add(method.I);
+                        this.add(method.O);
+                    }
                 }
             }
-        }
-        else if ("extendee" in type) {
-            if (!extensionsByName.has(type.typeName)) {
-                extensionsByName.set(type.typeName, type);
-                const extendeeName = type.extendee.typeName;
-                if (!extensionsByExtendee.has(extendeeName)) {
-                    extensionsByExtendee.set(extendeeName, new Map());
+            else if ("extendee" in type) {
+                if (!extensionsByName.has(type.typeName)) {
+                    extensionsByName.set(type.typeName, type);
+                    const extendeeName = type.extendee.typeName;
+                    if (!extensionsByExtendee.has(extendeeName)) {
+                        extensionsByExtendee.set(extendeeName, new Map());
+                    }
+                    (_a = extensionsByExtendee.get(extendeeName)) === null || _a === void 0 ? void 0 : _a.set(type.field.no, type);
+                    this.add(type.extendee);
+                    addField(type.field);
                 }
-                (_a = extensionsByExtendee.get(extendeeName)) === null || _a === void 0 ? void 0 : _a.set(type.field.no, type);
-                addType(type.extendee);
-                addField(type.field);
             }
-        }
-        else {
-            enums[type.typeName] = type;
-        }
-    }
+            else {
+                enums[type.typeName] = type;
+            }
+        },
+    };
     function addField(field) {
         if (field.kind == "message") {
-            addType(field.T);
+            registry.add(field.T);
         }
         else if (field.kind == "map" && field.V.kind == "message") {
-            addType(field.V.T);
+            registry.add(field.V.T);
         }
         else if (field.kind == "enum") {
-            addType(field.T);
+            registry.add(field.T);
         }
     }
     for (const type of types) {
-        addType(type);
+        registry.add(type);
     }
     return registry;
 }

package/dist/esm/extension-accessor.js CHANGED Viewed

@@ -70,7 +70,7 @@ export function setExtension(message, extension, value, options) {
     const reader = readOpt.readerFactory(writer.finish());
     while (reader.pos < reader.len) {
         const [no, wireType] = reader.tag();
-        const data = reader.skip(wireType);
+        const data = reader.skip(wireType, no);
         message.getType().runtime.bin.onUnknownField(message, no, wireType, data);
     }
 }

package/dist/esm/google/protobuf/descriptor_pb.d.ts CHANGED Viewed

@@ -16,6 +16,13 @@ export declare enum Edition {
      * @generated from enum value: EDITION_UNKNOWN = 0;
      */
     EDITION_UNKNOWN = 0,
+    /**
+     * A placeholder edition for specifying default behaviors *before* a feature
+     * was first introduced.  This is effectively an "infinite past".
+     *
+     * @generated from enum value: EDITION_LEGACY = 900;
+     */
+    EDITION_LEGACY = 900,
     /**
      * Legacy syntax "editions".  These pre-date editions, but behave much like
      * distinct editions.  These can't be used to specify the edition of proto
@@ -876,12 +883,16 @@ export declare class FileOptions extends Message<FileOptions> {
      */
     javaGenerateEqualsAndHash?: boolean;
     /**
-     * If set true, then the Java2 code generator will generate code that
-     * throws an exception whenever an attempt is made to assign a non-UTF-8
-     * byte sequence to a string field.
-     * Message reflection will do the same.
-     * However, an extension field still accepts non-UTF-8 byte sequences.
-     * This option has no effect on when used with the lite runtime.
+     * A proto2 file can set this to true to opt in to UTF-8 checking for Java,
+     * which will throw an exception if invalid UTF-8 is parsed from the wire or
+     * assigned to a string field.
+     *
+     * TODO: clarify exactly what kinds of field types this option
+     * applies to, and update these docs accordingly.
+     *
+     * Proto3 files already perform these checks. Setting the option explicitly to
+     * false has no effect: it cannot be used to opt proto3 files out of UTF-8
+     * checks.
      *
      * @generated from field: optional bool java_string_check_utf8 = 27 [default = false];
      */
@@ -1266,6 +1277,10 @@ export declare class FieldOptions extends Message<FieldOptions> {
      * @generated from field: optional google.protobuf.FeatureSet features = 21;
      */
     features?: FeatureSet;
+    /**
+     * @generated from field: optional google.protobuf.FieldOptions.FeatureSupport feature_support = 22;
+     */
+    featureSupport?: FieldOptions_FeatureSupport;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -1424,6 +1439,51 @@ export declare class FieldOptions_EditionDefault extends Message<FieldOptions_Ed
     static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): FieldOptions_EditionDefault;
     static equals(a: FieldOptions_EditionDefault | PlainMessage<FieldOptions_EditionDefault> | undefined, b: FieldOptions_EditionDefault | PlainMessage<FieldOptions_EditionDefault> | undefined): boolean;
 }
+/**
+ * Information about the support window of a feature.
+ *
+ * @generated from message google.protobuf.FieldOptions.FeatureSupport
+ */
+export declare class FieldOptions_FeatureSupport extends Message<FieldOptions_FeatureSupport> {
+    /**
+     * The edition that this feature was first available in.  In editions
+     * earlier than this one, the default assigned to EDITION_LEGACY will be
+     * used, and proto files will not be able to override it.
+     *
+     * @generated from field: optional google.protobuf.Edition edition_introduced = 1;
+     */
+    editionIntroduced?: Edition;
+    /**
+     * The edition this feature becomes deprecated in.  Using this after this
+     * edition may trigger warnings.
+     *
+     * @generated from field: optional google.protobuf.Edition edition_deprecated = 2;
+     */
+    editionDeprecated?: Edition;
+    /**
+     * The deprecation warning text if this feature is used after the edition it
+     * was marked deprecated in.
+     *
+     * @generated from field: optional string deprecation_warning = 3;
+     */
+    deprecationWarning?: string;
+    /**
+     * The edition this feature is no longer available in.  In editions after
+     * this one, the last default assigned will be used, and proto files will
+     * not be able to override it.
+     *
+     * @generated from field: optional google.protobuf.Edition edition_removed = 4;
+     */
+    editionRemoved?: Edition;
+    constructor(data?: PartialMessage<FieldOptions_FeatureSupport>);
+    static readonly runtime: typeof proto2;
+    static readonly typeName = "google.protobuf.FieldOptions.FeatureSupport";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): FieldOptions_FeatureSupport;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): FieldOptions_FeatureSupport;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): FieldOptions_FeatureSupport;
+    static equals(a: FieldOptions_FeatureSupport | PlainMessage<FieldOptions_FeatureSupport> | undefined, b: FieldOptions_FeatureSupport | PlainMessage<FieldOptions_FeatureSupport> | undefined): boolean;
+}
 /**
  * @generated from message google.protobuf.OneofOptions
  */
@@ -1529,6 +1589,12 @@ export declare class EnumValueOptions extends Message<EnumValueOptions> {
      * @generated from field: optional bool debug_redact = 3 [default = false];
      */
     debugRedact?: boolean;
+    /**
+     * Information about the support window of a feature value.
+     *
+     * @generated from field: optional google.protobuf.FieldOptions.FeatureSupport feature_support = 4;
+     */
+    featureSupport?: FieldOptions_FeatureSupport;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -1919,9 +1985,17 @@ export declare class FeatureSetDefaults_FeatureSetEditionDefault extends Message
      */
     edition?: Edition;
     /**
-     * @generated from field: optional google.protobuf.FeatureSet features = 2;
+     * Defaults of features that can be overridden in this edition.
+     *
+     * @generated from field: optional google.protobuf.FeatureSet overridable_features = 4;
      */
-    features?: FeatureSet;
+    overridableFeatures?: FeatureSet;
+    /**
+     * Defaults of features that can't be overridden in this edition.
+     *
+     * @generated from field: optional google.protobuf.FeatureSet fixed_features = 5;
+     */
+    fixedFeatures?: FeatureSet;
     constructor(data?: PartialMessage<FeatureSetDefaults_FeatureSetEditionDefault>);
     static readonly runtime: typeof proto2;
     static readonly typeName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault";

package/dist/esm/google/protobuf/descriptor_pb.js CHANGED Viewed

@@ -18,7 +18,7 @@
 // The messages in this file describe the definitions found in .proto files.
 // A valid .proto file can be translated directly to a FileDescriptorProto
 // without any other information (e.g. without reading its imports).
-// @generated by protoc-gen-es v1.9.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.10.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/descriptor.proto (package google.protobuf, syntax proto2)
 /* eslint-disable */
 import { proto2 } from "../../proto2.js";
@@ -36,6 +36,13 @@ export var Edition;
      * @generated from enum value: EDITION_UNKNOWN = 0;
      */
     Edition[Edition["EDITION_UNKNOWN"] = 0] = "EDITION_UNKNOWN";
+    /**
+     * A placeholder edition for specifying default behaviors *before* a feature
+     * was first introduced.  This is effectively an "infinite past".
+     *
+     * @generated from enum value: EDITION_LEGACY = 900;
+     */
+    Edition[Edition["EDITION_LEGACY"] = 900] = "EDITION_LEGACY";
     /**
      * Legacy syntax "editions".  These pre-date editions, but behave much like
      * distinct editions.  These can't be used to specify the edition of proto
@@ -96,6 +103,7 @@ export var Edition;
 // Retrieve enum metadata with: proto2.getEnumType(Edition)
 proto2.util.setEnumType(Edition, "google.protobuf.Edition", [
     { no: 0, name: "EDITION_UNKNOWN" },
+    { no: 900, name: "EDITION_LEGACY" },
     { no: 998, name: "EDITION_PROTO2" },
     { no: 999, name: "EDITION_PROTO3" },
     { no: 1000, name: "EDITION_2023" },
@@ -1020,6 +1028,7 @@ FieldOptions.fields = proto2.util.newFieldList(() => [
     { no: 19, name: "targets", kind: "enum", T: proto2.getEnumType(FieldOptions_OptionTargetType), repeated: true },
     { no: 20, name: "edition_defaults", kind: "message", T: FieldOptions_EditionDefault, repeated: true },
     { no: 21, name: "features", kind: "message", T: FeatureSet, opt: true },
+    { no: 22, name: "feature_support", kind: "message", T: FieldOptions_FeatureSupport, opt: true },
     { no: 999, name: "uninterpreted_option", kind: "message", T: UninterpretedOption, repeated: true },
 ]);
 /**
@@ -1204,6 +1213,37 @@ FieldOptions_EditionDefault.fields = proto2.util.newFieldList(() => [
     { no: 3, name: "edition", kind: "enum", T: proto2.getEnumType(Edition), opt: true },
     { no: 2, name: "value", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
 ]);
+/**
+ * Information about the support window of a feature.
+ *
+ * @generated from message google.protobuf.FieldOptions.FeatureSupport
+ */
+export class FieldOptions_FeatureSupport extends Message {
+    constructor(data) {
+        super();
+        proto2.util.initPartial(data, this);
+    }
+    static fromBinary(bytes, options) {
+        return new FieldOptions_FeatureSupport().fromBinary(bytes, options);
+    }
+    static fromJson(jsonValue, options) {
+        return new FieldOptions_FeatureSupport().fromJson(jsonValue, options);
+    }
+    static fromJsonString(jsonString, options) {
+        return new FieldOptions_FeatureSupport().fromJsonString(jsonString, options);
+    }
+    static equals(a, b) {
+        return proto2.util.equals(FieldOptions_FeatureSupport, a, b);
+    }
+}
+FieldOptions_FeatureSupport.runtime = proto2;
+FieldOptions_FeatureSupport.typeName = "google.protobuf.FieldOptions.FeatureSupport";
+FieldOptions_FeatureSupport.fields = proto2.util.newFieldList(() => [
+    { no: 1, name: "edition_introduced", kind: "enum", T: proto2.getEnumType(Edition), opt: true },
+    { no: 2, name: "edition_deprecated", kind: "enum", T: proto2.getEnumType(Edition), opt: true },
+    { no: 3, name: "deprecation_warning", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 4, name: "edition_removed", kind: "enum", T: proto2.getEnumType(Edition), opt: true },
+]);
 /**
  * @generated from message google.protobuf.OneofOptions
  */
@@ -1306,6 +1346,7 @@ EnumValueOptions.fields = proto2.util.newFieldList(() => [
     { no: 1, name: "deprecated", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true, default: false },
     { no: 2, name: "features", kind: "message", T: FeatureSet, opt: true },
     { no: 3, name: "debug_redact", kind: "scalar", T: 8 /* ScalarType.BOOL */, opt: true, default: false },
+    { no: 4, name: "feature_support", kind: "message", T: FieldOptions_FeatureSupport, opt: true },
     { no: 999, name: "uninterpreted_option", kind: "message", T: UninterpretedOption, repeated: true },
 ]);
 /**
@@ -1739,7 +1780,8 @@ FeatureSetDefaults_FeatureSetEditionDefault.runtime = proto2;
 FeatureSetDefaults_FeatureSetEditionDefault.typeName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault";
 FeatureSetDefaults_FeatureSetEditionDefault.fields = proto2.util.newFieldList(() => [
     { no: 3, name: "edition", kind: "enum", T: proto2.getEnumType(Edition), opt: true },
-    { no: 2, name: "features", kind: "message", T: FeatureSet, opt: true },
+    { no: 4, name: "overridable_features", kind: "message", T: FeatureSet, opt: true },
+    { no: 5, name: "fixed_features", kind: "message", T: FeatureSet, opt: true },
 ]);
 /**
  * Encapsulates information about the original source file from which a

package/dist/esm/google/protobuf/struct_pb.js CHANGED Viewed

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v1.9.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.10.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/google/protobuf/type_pb.js CHANGED Viewed

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-// @generated by protoc-gen-es v1.9.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.10.1 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/index.d.ts CHANGED Viewed

@@ -25,7 +25,7 @@ export type { JsonFormat, JsonObject, JsonValue, JsonReadOptions, JsonWriteOptio
 export type { DescriptorSet, AnyDesc, DescFile, DescEnum, DescEnumValue, DescMessage, DescOneof, DescField, DescService, DescMethod, DescExtension, DescComments, } from "./descriptor-set.js";
 export { createDescriptorSet } from "./create-descriptor-set.js";
 export type { IMessageTypeRegistry, IExtensionRegistry, } from "./type-registry.js";
-export { createRegistry } from "./create-registry.js";
+export { createRegistry, createMutableRegistry } from "./create-registry.js";
 export { createRegistryFromDescriptors } from "./create-registry-from-desc.js";
 export { toPlainMessage } from "./to-plain-message.js";
 export * from "./google/protobuf/compiler/plugin_pb.js";

package/dist/esm/index.js CHANGED Viewed

@@ -25,7 +25,7 @@ export { getExtension, setExtension, hasExtension, clearExtension, } from "./ext
 export { MethodKind, MethodIdempotency } from "./service-type.js";
 export { WireType, BinaryWriter, BinaryReader } from "./binary-encoding.js";
 export { createDescriptorSet } from "./create-descriptor-set.js";
-export { createRegistry } from "./create-registry.js";
+export { createRegistry, createMutableRegistry } from "./create-registry.js";
 export { createRegistryFromDescriptors } from "./create-registry-from-desc.js";
 export { toPlainMessage } from "./to-plain-message.js";
 // ideally, we would export these types with sub-path exports:

package/dist/esm/private/binary-format.js CHANGED Viewed

@@ -73,12 +73,13 @@ export function makeBinaryFormat() {
             let fieldNo, wireType;
             while (reader.pos < end) {
                 [fieldNo, wireType] = reader.tag();
-                if (wireType == WireType.EndGroup) {
+                if (delimitedMessageEncoding === true &&
+                    wireType == WireType.EndGroup) {
                     break;
                 }
                 const field = type.fields.find(fieldNo);
                 if (!field) {
-                    const data = reader.skip(wireType);
+                    const data = reader.skip(wireType, fieldNo);
                     if (options.readUnknownFields) {
                         this.onUnknownField(message, fieldNo, wireType, data);
                     }

package/dist/esm/private/feature-set.js CHANGED Viewed

@@ -18,14 +18,14 @@ import { protoBase64 } from "../proto-base64.js";
  */
 function getFeatureSetDefaults(options) {
     return FeatureSetDefaults.fromBinary(protoBase64.dec(
-    /*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiADKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
+    /*upstream-inject-feature-defaults-start*/ "ChMY5gciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
 }
 /**
  * Create an edition feature resolver with the given feature set defaults, or
  * the feature set defaults supported by @bufbuild/protobuf.
  */
 export function createFeatureResolver(edition, compiledFeatureSetDefaults, serializationOptions) {
-    var _a, _b;
+    var _a;
     const fds = compiledFeatureSetDefaults !== null && compiledFeatureSetDefaults !== void 0 ? compiledFeatureSetDefaults : getFeatureSetDefaults(serializationOptions);
     const min = fds.minimumEdition;
     const max = fds.maximumEdition;
@@ -49,9 +49,23 @@ export function createFeatureResolver(edition, compiledFeatureSetDefaults, seria
         if (highestMatch !== undefined && highestMatch.e > e) {
             continue;
         }
+        let f;
+        if (c.fixedFeatures && c.overridableFeatures) {
+            f = c.fixedFeatures;
+            f.fromBinary(c.overridableFeatures.toBinary());
+        }
+        else if (c.fixedFeatures) {
+            f = c.fixedFeatures;
+        }
+        else if (c.overridableFeatures) {
+            f = c.overridableFeatures;
+        }
+        else {
+            f = new FeatureSet();
+        }
         highestMatch = {
             e,
-            f: (_b = c.features) !== null && _b !== void 0 ? _b : new FeatureSet(),
+            f,
         };
     }
     if (highestMatch === undefined) {

package/dist/esm/private/util-common.js CHANGED Viewed

@@ -27,7 +27,7 @@ export function makeUtilCommon() {
             const type = target.getType();
             for (const member of type.fields.byMember()) {
                 const localName = member.localName, t = target, s = source;
-                if (s[localName] === undefined) {
+                if (s[localName] == null) {
                     // TODO if source is a Message instance, we should use isFieldSet() here to support future field presence
                     continue;
                 }
@@ -141,7 +141,17 @@ export function makeUtilCommon() {
                 }
                 switch (m.kind) {
                     case "message":
-                        return m.T.equals(va, vb);
+                        let a = va;
+                        let b = vb;
+                        if (m.T.fieldWrapper) {
+                            if (a !== undefined && !isMessage(a)) {
+                                a = m.T.fieldWrapper.wrapField(a);
+                            }
+                            if (b !== undefined && !isMessage(b)) {
+                                b = m.T.fieldWrapper.wrapField(b);
+                            }
+                        }
+                        return m.T.equals(a, b);
                     case "enum":
                         return scalarEquals(ScalarType.INT32, va, vb);
                     case "scalar":

package/dist/esm/type-registry.d.ts CHANGED Viewed

@@ -55,3 +55,12 @@ export interface IExtensionRegistry {
      */
     findExtension(typeName: string): Extension | undefined;
 }
+/**
+ * A registry that allows
+ */
+export interface IMutableRegistry extends IMessageTypeRegistry, IEnumTypeRegistry, IServiceTypeRegistry, IExtensionRegistry {
+    /**
+     * Adds the type to the registry.
+     */
+    add(type: MessageType | EnumType | ServiceType | Extension): void;
+}

package/package.json CHANGED Viewed

@@ -1,8 +1,14 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "1.9.0",
+  "version": "1.10.1",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of Protocol Buffers in TypeScript, suitable for web browsers and Node.js.",
+  "keywords": [
+    "protobuf",
+    "schema",
+    "typescript",
+    "ecmascript"
+  ],
   "repository": {
     "type": "git",
     "url": "https://github.com/bufbuild/protobuf-es.git",
@@ -30,8 +36,5 @@
   },
   "devDependencies": {
     "upstream-protobuf": "*"
-  },
-  "files": [
-    "dist/**"
-  ]
+  }
 }