@bufbuild/protobuf 2.11.0 → 2.12.0

package/dist/cjs/descriptors.d.ts

@@ -114,7 +114,7 @@ export interface DescEnum {
      * A prefix shared by all enum values.
      * For example, `my_enum_` for `enum MyEnum {MY_ENUM_A=0; MY_ENUM_B=1;}`
      */
-    readonly sharedPrefix?: string;
+    readonly sharedPrefix?: string | undefined;
     /**
      * Marked as deprecated in the protobuf source.
      */
@@ -192,8 +192,8 @@ export interface DescMessage {
      */
     readonly oneofs: DescOneof[];
     /**
-     * Fields and oneof groups for this message, ordered by their appearance in the
-     * protobuf source.
+     * Standalone fields and oneof groups for this message, ordered by
+     * their appearance in the protobuf source.
      */
     readonly members: (DescField | DescOneof)[];
     /**
@@ -283,6 +283,13 @@ interface descFieldAndExtensionShared {
      * See https://protobuf.dev/programming-guides/field_presence/
      */
     readonly presence: SupportedFieldPresence;
+    /**
+     * Whether to reject invalid UTF-8 when reading this field from the binary
+     * wire format. Reflects the resolved `utf8_validation` feature: true for
+     * VERIFY (proto3 and editions 2023+ default), false for NONE (proto2
+     * default).
+     */
+    readonly utf8Validation: boolean;
     /**
      * The compiler-generated descriptor.
      */
@@ -620,8 +627,8 @@ export interface DescMethod {
  */
 export interface DescComments {
     readonly leadingDetached: readonly string[];
-    readonly leading?: string;
-    readonly trailing?: string;
+    readonly leading?: string | undefined;
+    readonly trailing?: string | undefined;
     readonly sourcePath: readonly number[];
 }
 export {};

package/dist/cjs/from-binary.js

@@ -94,7 +94,7 @@ function readField(message, reader, field, wireType, options) {
     var _a;
     switch (field.fieldKind) {
         case "scalar":
-            message.set(field, readScalar(reader, field.scalar));
+            message.set(field, readScalar(reader, field.scalar, field.utf8Validation));
             break;
         case "enum":
             const val = readScalar(reader, descriptors_js_1.ScalarType.INT32);
@@ -144,12 +144,12 @@ function readMapEntry(reader, map, options) {
         const [fieldNo] = reader.tag();
         switch (fieldNo) {
             case 1:
-                key = readScalar(reader, field.mapKey);
+                key = readScalar(reader, field.mapKey, field.utf8Validation);
                 break;
             case 2:
                 switch (field.mapKind) {
                     case "scalar":
-                        val = readScalar(reader, field.scalar);
+                        val = readScalar(reader, field.scalar, field.utf8Validation);
                         break;
                     case "enum":
                         val = reader.int32();
@@ -191,12 +191,12 @@ function readListField(reader, wireType, list, options) {
         scalarType != descriptors_js_1.ScalarType.STRING &&
         scalarType != descriptors_js_1.ScalarType.BYTES;
     if (!packed) {
-        list.add(readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType, field.utf8Validation));
         return;
     }
     const e = reader.uint32() + reader.pos;
     while (reader.pos < e) {
-        list.add(readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType, field.utf8Validation));
     }
 }
 function readMessageField(reader, options, field, mergeMessage) {
@@ -205,10 +205,10 @@ function readMessageField(reader, options, field, mergeMessage) {
     readMessage(message, reader, options, delimited, delimited ? field.number : reader.uint32());
     return message;
 }
-function readScalar(reader, type) {
+function readScalar(reader, type, validateUtf8 = false) {
     switch (type) {
         case descriptors_js_1.ScalarType.STRING:
-            return reader.string();
+            return reader.string(validateUtf8);
         case descriptors_js_1.ScalarType.BOOL:
             return reader.bool();
         case descriptors_js_1.ScalarType.DOUBLE:

package/dist/cjs/from-json.d.ts

@@ -16,7 +16,7 @@ export interface JsonReadOptions {
      * This option is required to read `google.protobuf.Any` and extensions
      * from JSON format.
      */
-    registry?: Registry;
+    registry?: Registry | undefined;
 }
 /**
  * Parse a message from a JSON string.

package/dist/cjs/from-json.js

@@ -491,7 +491,7 @@ function anyFromJson(any, json, opts) {
         throw new Error(`cannot decode message ${any.$typeName} from JSON: ${typeUrl} is not in the type registry`);
     }
     const msg = (0, reflect_js_1.reflect)(desc);
-    if (typeName.startsWith("google.protobuf.") &&
+    if ((0, index_js_1.hasCustomJsonRepresentation)(desc) &&
         Object.prototype.hasOwnProperty.call(json, "value")) {
         const value = json.value;
         readMessage(msg, value, opts);

package/dist/cjs/reflect/path.d.ts

@@ -89,7 +89,7 @@ export declare function buildPath(schema: DescMessage): PathBuilder;
  * paths that refer to an extension.
  */
 export declare function parsePath(schema: DescMessage, path: string, options?: {
-    registry?: Registry;
+    registry?: Registry | undefined;
 }): Path;
 /**
  * Stringify a path.

package/dist/cjs/registry.js

@@ -197,6 +197,8 @@ function initBaseRegistry(inputs) {
 const EDITION_PROTO2 = 998;
 // bootstrap-inject google.protobuf.Edition.EDITION_PROTO3: const $name: Edition.$localName = $number;
 const EDITION_PROTO3 = 999;
+// bootstrap-inject google.protobuf.Edition.EDITION_UNSTABLE: const $name: Edition.$localName = $number;
+const EDITION_UNSTABLE = 9999;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Type.TYPE_STRING: const $name: FieldDescriptorProto_Type.$localName = $number;
 const TYPE_STRING = 9;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Type.TYPE_GROUP: const $name: FieldDescriptorProto_Type.$localName = $number;
@@ -227,9 +229,11 @@ const PACKED = 1;
 const DELIMITED = 2;
 // bootstrap-inject google.protobuf.FeatureSet.EnumType.OPEN: const $name: FeatureSet_EnumType.$localName = $number;
 const OPEN = 1;
+// bootstrap-inject google.protobuf.FeatureSet.Utf8Validation.VERIFY: const $name: FeatureSet_Utf8Validation.$localName = $number;
+const VERIFY = 2;
 // biome-ignore format: want this to read well
 // bootstrap-inject defaults: EDITION_PROTO2 to EDITION_2024: export const minimumEdition: SupportedEdition = $minimumEdition, maximumEdition: SupportedEdition = $maximumEdition;
-// generated from protoc v33.2
+// generated from protoc v34.0
 exports.minimumEdition = 998, exports.maximumEdition = 1001;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -568,6 +572,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         message: undefined,
         enum: undefined,
         presence: getFieldPresence(proto, oneof, isExtension, parentOrFile),
+        utf8Validation: isUtf8Validated(proto, parentOrFile),
         listKind: undefined,
         mapKind: undefined,
         mapKey: undefined,
@@ -696,6 +701,12 @@ function getFileEdition(proto) {
         case "proto3":
             return EDITION_PROTO3;
         case "editions":
+            // EDITION_UNSTABLE is a sandbox for in-development features. Collapse
+            // it to maximumEdition so SupportedEdition and feature resolution do
+            // not leak the test-only edition to users.
+            if (proto.edition === EDITION_UNSTABLE) {
+                return exports.maximumEdition;
+            }
             if (proto.edition in featureDefaults) {
                 return proto.edition;
             }
@@ -891,6 +902,18 @@ function isDelimitedEncoding(proto, parent) {
             parent,
         }));
 }
+/**
+ * Reject invalid UTF-8 when reading string fields from the binary wire format?
+ * Driven by the resolved `utf8_validation` feature: VERIFY (proto3 / editions
+ * 2023+ default) enforces; NONE (proto2 default) does not.
+ */
+function isUtf8Validated(proto, parent) {
+    return (VERIFY ==
+        resolveFeature("utf8Validation", {
+            proto,
+            parent,
+        }));
+}
 function resolveFeature(name, ref) {
     var _a, _b;
     const featureSet = (_a = ref.proto.options) === null || _a === void 0 ? void 0 : _a.features;

package/dist/cjs/to-json.d.ts

@@ -32,7 +32,7 @@ export interface JsonWriteOptions {
      * This option is required to write `google.protobuf.Any` and extensions
      * to JSON format.
      */
-    registry?: Registry;
+    registry?: Registry | undefined;
 }
 /**
  * Options for serializing to JSON.

package/dist/cjs/to-json.js

@@ -226,10 +226,12 @@ function scalarToJson(field, value) {
         case descriptors_js_1.ScalarType.INT64:
         case descriptors_js_1.ScalarType.SFIXED64:
         case descriptors_js_1.ScalarType.SINT64:
-            if (typeof value != "bigint" && typeof value != "string") {
-                throw new Error(`cannot encode ${field} to JSON: ${(_e = (0, reflect_check_js_1.checkField)(field, value)) === null || _e === void 0 ? void 0 : _e.message}`);
+            if (typeof value == "bigint" ||
+                typeof value == "string" ||
+                (typeof value == "number" && Number.isInteger(value))) {
+                return value.toString();
             }
-            return value.toString();
+            throw new Error(`cannot encode ${field} to JSON: ${(_e = (0, reflect_check_js_1.checkField)(field, value)) === null || _e === void 0 ? void 0 : _e.message}`);
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
         case descriptors_js_1.ScalarType.BYTES:
@@ -286,13 +288,10 @@ function anyToJson(val, opts) {
     if (!desc || !message) {
         throw new Error(`cannot encode message ${val.$typeName} to JSON: "${val.typeUrl}" is not in the type registry`);
     }
-    let json = reflectToJson((0, reflect_js_1.reflect)(desc, message), opts);
-    if (desc.typeName.startsWith("google.protobuf.") ||
-        json === null ||
-        Array.isArray(json) ||
-        typeof json !== "object") {
-        json = { value: json };
-    }
+    const reflected = (0, reflect_js_1.reflect)(desc, message);
+    const json = (0, wrappers_js_1.hasCustomJsonRepresentation)(desc)
+        ? { value: tryWktToJson(reflected, opts) }
+        : reflectToJson(reflected, opts);
     json["@type"] = val.typeUrl;
     return json;
 }

package/dist/cjs/types.d.ts

@@ -15,7 +15,7 @@ export type Message<TypeName extends string = string> = {
     /**
      * Unknown fields and extensions stored on the message.
      */
-    $unknown?: UnknownField[];
+    $unknown?: UnknownField[] | undefined;
 };
 /**
  * Extract the message type from a message descriptor.

package/dist/cjs/wire/binary-encoding.d.ts

@@ -63,7 +63,7 @@ export declare class BinaryWriter {
     private readonly encodeUtf8;
     /**
      * We cannot allocate a buffer for the entire output
-     * because we don't know it's size.
+     * because we don't know its size.
      *
      * So we collect smaller chunks of known size and
      * concat them later.
@@ -120,7 +120,7 @@ export declare class BinaryWriter {
      */
     int32(value: number): this;
     /**
-     * Write a `bool` value, a variant.
+     * Write a `bool` value, a varint.
      */
     bool(value: boolean): this;
     /**
@@ -152,7 +152,7 @@ export declare class BinaryWriter {
      */
     sint32(value: number): this;
     /**
-     * Write a `fixed64` value, a signed, fixed-length 64-bit integer.
+     * Write a `sfixed64` value, a signed, fixed-length 64-bit integer.
      */
     sfixed64(value: string | number | bigint): this;
     /**
@@ -184,9 +184,10 @@ export declare class BinaryReader {
     readonly len: number;
     protected readonly buf: Uint8Array;
     private readonly view;
-    constructor(buf: Uint8Array, decodeUtf8?: (bytes: Uint8Array) => string);
+    constructor(buf: Uint8Array, decodeUtf8?: (bytes: Uint8Array, strict?: boolean) => string);
     /**
-     * Reads a tag - field number and wire type.
+     * Reads a tag - field number and wire type. Tags are uint32 varints; values
+     * that do not fit in uint32 are rejected.
      */
     tag(): [number, WireType];
     /**
@@ -258,7 +259,8 @@ export declare class BinaryReader {
      */
     bytes(): Uint8Array;
     /**
-     * Read a `string` field, length-delimited data converted to UTF-8 text.
+     * Read a `string` field, length-delimited data converted to UTF-8 text. If
+     * `strict` is true, throw on invalid UTF-8 instead of substituting U+FFFD.
      */
-    string(): string;
+    string(strict?: boolean): string;
 }

package/dist/cjs/wire/binary-encoding.js

@@ -181,7 +181,7 @@ class BinaryWriter {
         return this;
     }
     /**
-     * Write a `bool` value, a variant.
+     * Write a `bool` value, a varint.
      */
     bool(value) {
         this.buf.push(value ? 1 : 0);
@@ -248,7 +248,7 @@ class BinaryWriter {
         return this;
     }
     /**
-     * Write a `fixed64` value, a signed, fixed-length 64-bit integer.
+     * Write a `sfixed64` value, a signed, fixed-length 64-bit integer.
      */
     sfixed64(value) {
         let chunk = new Uint8Array(8), view = new DataView(chunk.buffer), tc = proto_int64_js_1.protoInt64.enc(value);
@@ -307,12 +307,21 @@ class BinaryReader {
         this.view = new DataView(buf.buffer, buf.byteOffset, buf.byteLength);
     }
     /**
-     * Reads a tag - field number and wire type.
+     * Reads a tag - field number and wire type. Tags are uint32 varints; values
+     * that do not fit in uint32 are rejected.
      */
     tag() {
-        let tag = this.uint32(), fieldNo = tag >>> 3, wireType = tag & 7;
-        if (fieldNo <= 0 || wireType < 0 || wireType > 5)
+        const start = this.pos;
+        const tag = this.uint32();
+        const bytesRead = this.pos - start;
+        if (bytesRead > 5 || (bytesRead == 5 && this.buf[this.pos - 1] > 0x0f)) {
+            throw new Error("illegal tag: varint overflows uint32");
+        }
+        const fieldNo = tag >>> 3;
+        const wireType = tag & 7;
+        if (fieldNo <= 0 || wireType > 5) {
             throw new Error("illegal tag: field no " + fieldNo + " wire type " + wireType);
+        }
         return [fieldNo, wireType];
     }
     /**
@@ -458,10 +467,11 @@ class BinaryReader {
         return this.buf.subarray(start, start + len);
     }
     /**
-     * Read a `string` field, length-delimited data converted to UTF-8 text.
+     * Read a `string` field, length-delimited data converted to UTF-8 text. If
+     * `strict` is true, throw on invalid UTF-8 instead of substituting U+FFFD.
      */
-    string() {
-        return this.decodeUtf8(this.bytes());
+    string(strict) {
+        return this.decodeUtf8(this.bytes(), strict);
     }
 }
 exports.BinaryReader = BinaryReader;

package/dist/cjs/wire/text-encoding.d.ts

@@ -8,9 +8,11 @@ interface TextEncoding {
      */
     encodeUtf8: (text: string) => Uint8Array<ArrayBuffer>;
     /**
-     * Decode UTF-8 text from binary.
+     * Decode UTF-8 text from binary. If `strict` is true, throw on invalid byte
+     * sequences instead of silently substituting U+FFFD. Implementations that
+     * do not support strict decoding may ignore the flag.
      */
-    decodeUtf8: (bytes: Uint8Array) => string;
+    decodeUtf8: (bytes: Uint8Array, strict?: boolean) => string;
 }
 /**
  * Protobuf-ES requires the Text Encoding API to convert UTF-8 from and to

package/dist/cjs/wire/text-encoding.js

@@ -32,11 +32,18 @@ function getTextEncoding() {
     if (globalThis[symbol] == undefined) {
         const te = new globalThis.TextEncoder();
         const td = new globalThis.TextDecoder();
+        let tdStrict;
         globalThis[symbol] = {
             encodeUtf8(text) {
                 return te.encode(text);
             },
-            decodeUtf8(bytes) {
+            decodeUtf8(bytes, strict) {
+                if (strict) {
+                    if (tdStrict === undefined) {
+                        tdStrict = new globalThis.TextDecoder("utf-8", { fatal: true });
+                    }
+                    return tdStrict.decode(bytes);
+                }
                 return td.decode(bytes);
             },
             checkUtf8(text) {

package/dist/cjs/wkt/gen/google/protobuf/api_pb.d.ts

@@ -75,7 +75,7 @@ export type Api = Message<"google.protobuf.Api"> & {
      *
      * @generated from field: google.protobuf.SourceContext source_context = 5;
      */
-    sourceContext?: SourceContext;
+    sourceContext?: SourceContext | undefined;
     /**
      * Included interfaces. See [Mixin][].
      *

package/dist/cjs/wkt/gen/google/protobuf/compiler/plugin_pb.d.ts

@@ -121,7 +121,7 @@ export type CodeGeneratorRequest = Message<"google.protobuf.compiler.CodeGenerat
      *
      * @generated from field: optional google.protobuf.compiler.Version compiler_version = 3;
      */
-    compilerVersion?: Version;
+    compilerVersion?: Version | undefined;
 };
 /**
  * An encoded CodeGeneratorRequest is written to the plugin's stdin.
@@ -371,7 +371,7 @@ export type CodeGeneratorResponse_File = Message<"google.protobuf.compiler.CodeG
      *
      * @generated from field: optional google.protobuf.GeneratedCodeInfo generated_code_info = 16;
      */
-    generatedCodeInfo?: GeneratedCodeInfo;
+    generatedCodeInfo?: GeneratedCodeInfo | undefined;
 };
 /**
  * Represents a single generated file.

package/dist/cjs/wkt/gen/google/protobuf/descriptor_pb.d.ts

@@ -100,7 +100,7 @@ export type FileDescriptorProto = Message<"google.protobuf.FileDescriptorProto">
     /**
      * @generated from field: optional google.protobuf.FileOptions options = 8;
      */
-    options?: FileOptions;
+    options?: FileOptions | undefined;
     /**
      * This field contains optional information about the original source code.
      * You may safely remove this entire field without harming runtime
@@ -109,7 +109,7 @@ export type FileDescriptorProto = Message<"google.protobuf.FileDescriptorProto">
      *
      * @generated from field: optional google.protobuf.SourceCodeInfo source_code_info = 9;
      */
-    sourceCodeInfo?: SourceCodeInfo;
+    sourceCodeInfo?: SourceCodeInfo | undefined;
     /**
      * The syntax of the proto file.
      * The supported values are "proto2", "proto3", and "editions".
@@ -273,7 +273,7 @@ export type DescriptorProto = Message<"google.protobuf.DescriptorProto"> & {
     /**
      * @generated from field: optional google.protobuf.MessageOptions options = 7;
      */
-    options?: MessageOptions;
+    options?: MessageOptions | undefined;
     /**
      * @generated from field: repeated google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
      */
@@ -374,7 +374,7 @@ export type DescriptorProto_ExtensionRange = Message<"google.protobuf.Descriptor
     /**
      * @generated from field: optional google.protobuf.ExtensionRangeOptions options = 3;
      */
-    options?: ExtensionRangeOptions;
+    options?: ExtensionRangeOptions | undefined;
 };
 /**
  * @generated from message google.protobuf.DescriptorProto.ExtensionRange
@@ -476,7 +476,7 @@ export type ExtensionRangeOptions = Message<"google.protobuf.ExtensionRangeOptio
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 50;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * The verification state of the range.
      * TODO: flip the default to DECLARATION once all empty ranges
@@ -712,7 +712,7 @@ export type FieldDescriptorProto = Message<"google.protobuf.FieldDescriptorProto
     /**
      * @generated from field: optional google.protobuf.FieldOptions options = 8;
      */
-    options?: FieldOptions;
+    options?: FieldOptions | undefined;
     /**
      * If true, this is a proto3 "optional". When a proto3 field is optional, it
      * tracks presence regardless of field type.
@@ -997,7 +997,7 @@ export type OneofDescriptorProto = Message<"google.protobuf.OneofDescriptorProto
     /**
      * @generated from field: optional google.protobuf.OneofOptions options = 2;
      */
-    options?: OneofOptions;
+    options?: OneofOptions | undefined;
 };
 /**
  * Describes a oneof.
@@ -1038,7 +1038,7 @@ export type EnumDescriptorProto = Message<"google.protobuf.EnumDescriptorProto">
     /**
      * @generated from field: optional google.protobuf.EnumOptions options = 3;
      */
-    options?: EnumOptions;
+    options?: EnumOptions | undefined;
     /**
      * Range of reserved numeric values. Reserved numeric values may not be used
      * by enum values in the same enum declaration. Reserved ranges may not
@@ -1180,7 +1180,7 @@ export type EnumValueDescriptorProto = Message<"google.protobuf.EnumValueDescrip
     /**
      * @generated from field: optional google.protobuf.EnumValueOptions options = 3;
      */
-    options?: EnumValueOptions;
+    options?: EnumValueOptions | undefined;
 };
 /**
  * Describes a value within an enum.
@@ -1225,7 +1225,7 @@ export type ServiceDescriptorProto = Message<"google.protobuf.ServiceDescriptorP
     /**
      * @generated from field: optional google.protobuf.ServiceOptions options = 3;
      */
-    options?: ServiceOptions;
+    options?: ServiceOptions | undefined;
 };
 /**
  * Describes a service.
@@ -1277,7 +1277,7 @@ export type MethodDescriptorProto = Message<"google.protobuf.MethodDescriptorPro
     /**
      * @generated from field: optional google.protobuf.MethodOptions options = 4;
      */
-    options?: MethodOptions;
+    options?: MethodOptions | undefined;
     /**
      * Identifies if client streams multiple client messages
      *
@@ -1506,7 +1506,7 @@ export type FileOptions = Message<"google.protobuf.FileOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 50;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * The parser stores options it doesn't recognize here.
      * See the documentation for the "Options" section above.
@@ -1832,7 +1832,7 @@ export type MessageOptions = Message<"google.protobuf.MessageOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 12;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -2072,11 +2072,11 @@ export type FieldOptions = Message<"google.protobuf.FieldOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 21;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * @generated from field: optional google.protobuf.FieldOptions.FeatureSupport feature_support = 22;
      */
-    featureSupport?: FieldOptions_FeatureSupport;
+    featureSupport?: FieldOptions_FeatureSupport | undefined;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -2299,6 +2299,13 @@ export type FieldOptions_FeatureSupport = Message<"google.protobuf.FieldOptions.
      * @generated from field: optional google.protobuf.Edition edition_removed = 4;
      */
     editionRemoved: Edition;
+    /**
+     * The removal error text if this feature is used after the edition it was
+     * removed in.
+     *
+     * @generated from field: optional string removal_error = 5;
+     */
+    removalError: string;
 };
 /**
  * Information about the support window of a feature.
@@ -2336,6 +2343,13 @@ export type FieldOptions_FeatureSupportJson = {
      * @generated from field: optional google.protobuf.Edition edition_removed = 4;
      */
     editionRemoved?: EditionJson;
+    /**
+     * The removal error text if this feature is used after the edition it was
+     * removed in.
+     *
+     * @generated from field: optional string removal_error = 5;
+     */
+    removalError?: string;
 };
 /**
  * Describes the message google.protobuf.FieldOptions.FeatureSupport.
@@ -2511,7 +2525,7 @@ export type OneofOptions = Message<"google.protobuf.OneofOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 1;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -2586,7 +2600,7 @@ export type EnumOptions = Message<"google.protobuf.EnumOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 7;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -2670,7 +2684,7 @@ export type EnumValueOptions = Message<"google.protobuf.EnumValueOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 2;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * Indicate that fields annotated with this enum value should not be printed
      * out when using debug formats, e.g. when the field contains sensitive
@@ -2684,7 +2698,7 @@ export type EnumValueOptions = Message<"google.protobuf.EnumValueOptions"> & {
      *
      * @generated from field: optional google.protobuf.FieldOptions.FeatureSupport feature_support = 4;
      */
-    featureSupport?: FieldOptions_FeatureSupport;
+    featureSupport?: FieldOptions_FeatureSupport | undefined;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -2754,7 +2768,7 @@ export type ServiceOptions = Message<"google.protobuf.ServiceOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 34;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * Is this service deprecated?
      * Depending on the target platform, this can emit Deprecated annotations
@@ -2832,7 +2846,7 @@ export type MethodOptions = Message<"google.protobuf.MethodOptions"> & {
      *
      * @generated from field: optional google.protobuf.FeatureSet features = 35;
      */
-    features?: FeatureSet;
+    features?: FeatureSet | undefined;
     /**
      * The parser stores options it doesn't recognize here. See above.
      *
@@ -3468,13 +3482,13 @@ export type FeatureSetDefaults_FeatureSetEditionDefault = Message<"google.protob
      *
      * @generated from field: optional google.protobuf.FeatureSet overridable_features = 4;
      */
-    overridableFeatures?: FeatureSet;
+    overridableFeatures?: FeatureSet | undefined;
     /**
      * Defaults of features that can't be overridden in this edition.
      *
      * @generated from field: optional google.protobuf.FeatureSet fixed_features = 5;
      */
-    fixedFeatures?: FeatureSet;
+    fixedFeatures?: FeatureSet | undefined;
 };
 /**
  * A map from every known edition with a unique set of defaults to its