@bufbuild/protobuf 1.4.0 → 1.4.2

package/dist/cjs/codegen-info.d.ts

@@ -1,17 +1,22 @@
-import { localName, safeIdentifier, safeObjectProperty } from "./private/names.js";
-import { getUnwrappedFieldType } from "./private/field-wrapper.js";
-import { scalarDefaultValue } from "./private/scalars.js";
 import { reifyWkt } from "./private/reify-wkt.js";
+import type { DescEnum, DescEnumValue, DescField, DescMessage, DescMethod, DescOneof, DescService } from "./descriptor-set";
+import { LongType, ScalarType } from "./field.js";
 interface CodegenInfo {
+    /**
+     * Name of the runtime library NPM package.
+     */
     readonly packageName: string;
-    readonly localName: typeof localName;
+    readonly localName: (desc: DescEnum | DescEnumValue | DescMessage | DescOneof | DescField | DescService | DescMethod) => string;
     readonly symbols: Record<RuntimeSymbolName, RuntimeSymbolInfo>;
-    readonly getUnwrappedFieldType: typeof getUnwrappedFieldType;
+    readonly getUnwrappedFieldType: (field: DescField) => ScalarType | undefined;
     readonly wktSourceFiles: readonly string[];
-    readonly scalarDefaultValue: typeof scalarDefaultValue;
+    readonly scalarDefaultValue: (type: ScalarType, longType: LongType) => any;
+    /**
+     * @deprecated please use reifyWkt from @bufbuild/protoplugin/ecmascript instead
+     */
     readonly reifyWkt: typeof reifyWkt;
-    readonly safeIdentifier: typeof safeIdentifier;
-    readonly safeObjectProperty: typeof safeObjectProperty;
+    readonly safeIdentifier: (name: string) => string;
+    readonly safeObjectProperty: (name: string) => string;
 }
 type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoDouble" | "protoInt64" | "ScalarType" | "LongType" | "MethodKind" | "MethodIdempotency" | "IMessageTypeRegistry";
 type RuntimeSymbolInfo = {

package/dist/cjs/codegen-info.js

@@ -20,7 +20,7 @@ const scalars_js_1 = require("./private/scalars.js");
 const reify_wkt_js_1 = require("./private/reify-wkt.js");
 const packageName = "@bufbuild/protobuf";
 exports.codegenInfo = {
-    packageName,
+    packageName: "@bufbuild/protobuf",
     localName: names_js_1.localName,
     reifyWkt: reify_wkt_js_1.reifyWkt,
     getUnwrappedFieldType: field_wrapper_js_1.getUnwrappedFieldType,

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

@@ -1,9 +1,66 @@
+import { proto2 } from "../../proto2.js";
 import type { PartialMessage, PlainMessage } from "../../message.js";
 import { Message } from "../../message.js";
-import { proto2 } from "../../proto2.js";
 import type { FieldList } from "../../field-list.js";
 import type { BinaryReadOptions } from "../../binary-format.js";
 import type { JsonReadOptions, JsonValue } from "../../json-format.js";
+/**
+ * The full set of known editions.
+ *
+ * @generated from enum google.protobuf.Edition
+ */
+export declare enum Edition {
+    /**
+     * A placeholder for an unknown edition value.
+     *
+     * @generated from enum value: EDITION_UNKNOWN = 0;
+     */
+    EDITION_UNKNOWN = 0,
+    /**
+     * Legacy syntax "editions".  These pre-date editions, but behave much like
+     * distinct editions.  These can't be used to specify the edition of proto
+     * files, but feature definitions must supply proto2/proto3 defaults for
+     * backwards compatibility.
+     *
+     * @generated from enum value: EDITION_PROTO2 = 998;
+     */
+    EDITION_PROTO2 = 998,
+    /**
+     * @generated from enum value: EDITION_PROTO3 = 999;
+     */
+    EDITION_PROTO3 = 999,
+    /**
+     * Editions that have been released.  The specific values are arbitrary and
+     * should not be depended on, but they will always be time-ordered for easy
+     * comparison.
+     *
+     * @generated from enum value: EDITION_2023 = 1000;
+     */
+    EDITION_2023 = 1000,
+    /**
+     * Placeholder editions for testing feature resolution.  These should not be
+     * used or relyed on outside of tests.
+     *
+     * @generated from enum value: EDITION_1_TEST_ONLY = 1;
+     */
+    EDITION_1_TEST_ONLY = 1,
+    /**
+     * @generated from enum value: EDITION_2_TEST_ONLY = 2;
+     */
+    EDITION_2_TEST_ONLY = 2,
+    /**
+     * @generated from enum value: EDITION_99997_TEST_ONLY = 99997;
+     */
+    EDITION_99997_TEST_ONLY = 99997,
+    /**
+     * @generated from enum value: EDITION_99998_TEST_ONLY = 99998;
+     */
+    EDITION_99998_TEST_ONLY = 99998,
+    /**
+     * @generated from enum value: EDITION_99999_TEST_ONLY = 99999;
+     */
+    EDITION_99999_TEST_ONLY = 99999
+}
 /**
  * The protocol compiler can output a FileDescriptorSet containing the .proto
  * files it parses.
@@ -102,11 +159,11 @@ export declare class FileDescriptorProto extends Message<FileDescriptorProto> {
      */
     syntax?: string;
     /**
-     * The edition of the proto file, which is an opaque string.
+     * The edition of the proto file.
      *
-     * @generated from field: optional string edition = 13;
+     * @generated from field: optional google.protobuf.Edition edition = 14;
      */
-    edition?: string;
+    edition?: Edition;
     constructor(data?: PartialMessage<FileDescriptorProto>);
     static readonly runtime: typeof proto2;
     static readonly typeName = "google.protobuf.FileDescriptorProto";
@@ -258,7 +315,7 @@ export declare class ExtensionRangeOptions extends Message<ExtensionRangeOptions
     features?: FeatureSet;
     /**
      * The verification state of the range.
-     * TODO(b/278783756): flip the default to DECLARATION once all empty ranges
+     * TODO: flip the default to DECLARATION once all empty ranges
      * are marked as UNVERIFIED.
      *
      * @generated from field: optional google.protobuf.ExtensionRangeOptions.VerificationState verification = 3 [default = UNVERIFIED];
@@ -496,9 +553,10 @@ export declare enum FieldDescriptorProto_Type {
     STRING = 9,
     /**
      * Tag-delimited aggregate.
-     * Group type is deprecated and not supported in proto3. However, Proto3
+     * Group type is deprecated and not supported after google.protobuf. However, Proto3
      * implementations should still be able to parse the group wire format and
-     * treat group fields as unknown fields.
+     * treat group fields as unknown fields.  In Editions, the group wire format
+     * can be enabled via the `message_encoding` feature.
      *
      * @generated from enum value: TYPE_GROUP = 10;
      */
@@ -555,13 +613,17 @@ export declare enum FieldDescriptorProto_Label {
      */
     OPTIONAL = 1,
     /**
-     * @generated from enum value: LABEL_REQUIRED = 2;
+     * @generated from enum value: LABEL_REPEATED = 3;
      */
-    REQUIRED = 2,
+    REPEATED = 3,
     /**
-     * @generated from enum value: LABEL_REPEATED = 3;
+     * The required label is only allowed in google.protobuf.  In proto3 and Editions
+     * it's explicitly prohibited.  In Editions, the `field_presence` feature
+     * can be used to get this behavior.
+     *
+     * @generated from enum value: LABEL_REQUIRED = 2;
      */
-    REPEATED = 3
+    REQUIRED = 2
 }
 /**
  * Describes a oneof.
@@ -1050,7 +1112,7 @@ export declare class MessageOptions extends Message<MessageOptions> {
      * This should only be used as a temporary measure against broken builds due
      * to the change in behavior for JSON field name conflicts.
      *
-     * TODO(b/261750190) This is legacy behavior we plan to remove once downstream
+     * TODO This is legacy behavior we plan to remove once downstream
      * teams have had time to migrate.
      *
      * @generated from field: optional bool deprecated_legacy_json_field_conflicts = 11 [deprecated = true];
@@ -1098,7 +1160,9 @@ export declare class FieldOptions extends Message<FieldOptions> {
      * a more efficient representation on the wire. Rather than repeatedly
      * writing the tag and type for each element, the entire array is encoded as
      * a single length-delimited blob. In proto3, only explicit setting it to
-     * false will avoid using packed encoding.
+     * false will avoid using packed encoding.  This option is prohibited in
+     * Editions, but the `repeated_field_encoding` feature can be used to control
+     * the behavior.
      *
      * @generated from field: optional bool packed = 2;
      */
@@ -1342,9 +1406,9 @@ export declare enum FieldOptions_OptionTargetType {
  */
 export declare class FieldOptions_EditionDefault extends Message<FieldOptions_EditionDefault> {
     /**
-     * @generated from field: optional string edition = 1;
+     * @generated from field: optional google.protobuf.Edition edition = 3;
      */
-    edition?: string;
+    edition?: Edition;
     /**
      * Textproto value.
      *
@@ -1410,7 +1474,7 @@ export declare class EnumOptions extends Message<EnumOptions> {
      * and strips underscored from the fields before comparison in proto3 only.
      * The new behavior takes `json_name` into account and applies to proto2 as
      * well.
-     * TODO(b/261750190) Remove this legacy behavior once downstream teams have
+     * TODO Remove this legacy behavior once downstream teams have
      * had time to migrate.
      *
      * @generated from field: optional bool deprecated_legacy_json_field_conflicts = 6 [deprecated = true];
@@ -1656,7 +1720,7 @@ export declare class UninterpretedOption_NamePart extends Message<UninterpretedO
     static equals(a: UninterpretedOption_NamePart | PlainMessage<UninterpretedOption_NamePart> | undefined, b: UninterpretedOption_NamePart | PlainMessage<UninterpretedOption_NamePart> | undefined): boolean;
 }
 /**
- * TODO(b/274655146) Enums in C++ gencode (and potentially other languages) are
+ * TODO Enums in C++ gencode (and potentially other languages) are
  * not well scoped.  This means that each of the feature enums below can clash
  * with each other.  The short names we've chosen maximize call-site
  * readability, but leave us very open to this scenario.  A future feature will
@@ -1679,9 +1743,9 @@ export declare class FeatureSet extends Message<FeatureSet> {
      */
     repeatedFieldEncoding?: FeatureSet_RepeatedFieldEncoding;
     /**
-     * @generated from field: optional google.protobuf.FeatureSet.StringFieldValidation string_field_validation = 4;
+     * @generated from field: optional google.protobuf.FeatureSet.Utf8Validation utf8_validation = 4;
      */
-    stringFieldValidation?: FeatureSet_StringFieldValidation;
+    utf8Validation?: FeatureSet_Utf8Validation;
     /**
      * @generated from field: optional google.protobuf.FeatureSet.MessageEncoding message_encoding = 5;
      */
@@ -1690,10 +1754,6 @@ export declare class FeatureSet extends Message<FeatureSet> {
      * @generated from field: optional google.protobuf.FeatureSet.JsonFormat json_format = 6;
      */
     jsonFormat?: FeatureSet_JsonFormat;
-    /**
-     * @generated from field: optional google.protobuf.FeatureSet raw_features = 999;
-     */
-    rawFeatures?: FeatureSet;
     constructor(data?: PartialMessage<FeatureSet>);
     static readonly runtime: typeof proto2;
     static readonly typeName = "google.protobuf.FeatureSet";
@@ -1759,25 +1819,21 @@ export declare enum FeatureSet_RepeatedFieldEncoding {
     EXPANDED = 2
 }
 /**
- * @generated from enum google.protobuf.FeatureSet.StringFieldValidation
+ * @generated from enum google.protobuf.FeatureSet.Utf8Validation
  */
-export declare enum FeatureSet_StringFieldValidation {
-    /**
-     * @generated from enum value: STRING_FIELD_VALIDATION_UNKNOWN = 0;
-     */
-    STRING_FIELD_VALIDATION_UNKNOWN = 0,
+export declare enum FeatureSet_Utf8Validation {
     /**
-     * @generated from enum value: MANDATORY = 1;
+     * @generated from enum value: UTF8_VALIDATION_UNKNOWN = 0;
      */
-    MANDATORY = 1,
+    UTF8_VALIDATION_UNKNOWN = 0,
     /**
-     * @generated from enum value: HINT = 2;
+     * @generated from enum value: NONE = 1;
      */
-    HINT = 2,
+    NONE = 1,
     /**
-     * @generated from enum value: NONE = 3;
+     * @generated from enum value: VERIFY = 2;
      */
-    NONE = 3
+    VERIFY = 2
 }
 /**
  * @generated from enum google.protobuf.FeatureSet.MessageEncoding
@@ -1813,6 +1869,68 @@ export declare enum FeatureSet_JsonFormat {
      */
     LEGACY_BEST_EFFORT = 2
 }
+/**
+ * A compiled specification for the defaults of a set of features.  These
+ * messages are generated from FeatureSet extensions and can be used to seed
+ * feature resolution. The resolution with this object becomes a simple search
+ * for the closest matching edition, followed by proto merges.
+ *
+ * @generated from message google.protobuf.FeatureSetDefaults
+ */
+export declare class FeatureSetDefaults extends Message<FeatureSetDefaults> {
+    /**
+     * @generated from field: repeated google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault defaults = 1;
+     */
+    defaults: FeatureSetDefaults_FeatureSetEditionDefault[];
+    /**
+     * The minimum supported edition (inclusive) when this was constructed.
+     * Editions before this will not have defaults.
+     *
+     * @generated from field: optional google.protobuf.Edition minimum_edition = 4;
+     */
+    minimumEdition?: Edition;
+    /**
+     * The maximum known edition (inclusive) when this was constructed. Editions
+     * after this will not have reliable defaults.
+     *
+     * @generated from field: optional google.protobuf.Edition maximum_edition = 5;
+     */
+    maximumEdition?: Edition;
+    constructor(data?: PartialMessage<FeatureSetDefaults>);
+    static readonly runtime: typeof proto2;
+    static readonly typeName = "google.protobuf.FeatureSetDefaults";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): FeatureSetDefaults;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): FeatureSetDefaults;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): FeatureSetDefaults;
+    static equals(a: FeatureSetDefaults | PlainMessage<FeatureSetDefaults> | undefined, b: FeatureSetDefaults | PlainMessage<FeatureSetDefaults> | undefined): boolean;
+}
+/**
+ * A map from every known edition with a unique set of defaults to its
+ * defaults. Not all editions may be contained here.  For a given edition,
+ * the defaults at the closest matching edition ordered at or before it should
+ * be used.  This field must be in strict ascending order by edition.
+ *
+ * @generated from message google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault
+ */
+export declare class FeatureSetDefaults_FeatureSetEditionDefault extends Message<FeatureSetDefaults_FeatureSetEditionDefault> {
+    /**
+     * @generated from field: optional google.protobuf.Edition edition = 3;
+     */
+    edition?: Edition;
+    /**
+     * @generated from field: optional google.protobuf.FeatureSet features = 2;
+     */
+    features?: FeatureSet;
+    constructor(data?: PartialMessage<FeatureSetDefaults_FeatureSetEditionDefault>);
+    static readonly runtime: typeof proto2;
+    static readonly typeName = "google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): FeatureSetDefaults_FeatureSetEditionDefault;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): FeatureSetDefaults_FeatureSetEditionDefault;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): FeatureSetDefaults_FeatureSetEditionDefault;
+    static equals(a: FeatureSetDefaults_FeatureSetEditionDefault | PlainMessage<FeatureSetDefaults_FeatureSetEditionDefault> | undefined, b: FeatureSetDefaults_FeatureSetEditionDefault | PlainMessage<FeatureSetDefaults_FeatureSetEditionDefault> | undefined): boolean;
+}
 /**
  * Encapsulates information about the original source file from which a
  * FileDescriptorProto was generated.

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

@@ -13,9 +13,89 @@
 // 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.FeatureSet_JsonFormat = exports.FeatureSet_MessageEncoding = exports.FeatureSet_StringFieldValidation = 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 = void 0;
-const message_js_1 = require("../../message.js");
+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;
+// Author: kenton@google.com (Kenton Varda)
+//  Based on original Protocol Buffers design by
+//  Sanjay Ghemawat, Jeff Dean, and others.
+//
+// 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.4.2 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");
+const message_js_1 = require("../../message.js");
+/**
+ * The full set of known editions.
+ *
+ * @generated from enum google.protobuf.Edition
+ */
+var Edition;
+(function (Edition) {
+    /**
+     * A placeholder for an unknown edition value.
+     *
+     * @generated from enum value: EDITION_UNKNOWN = 0;
+     */
+    Edition[Edition["EDITION_UNKNOWN"] = 0] = "EDITION_UNKNOWN";
+    /**
+     * Legacy syntax "editions".  These pre-date editions, but behave much like
+     * distinct editions.  These can't be used to specify the edition of proto
+     * files, but feature definitions must supply proto2/proto3 defaults for
+     * backwards compatibility.
+     *
+     * @generated from enum value: EDITION_PROTO2 = 998;
+     */
+    Edition[Edition["EDITION_PROTO2"] = 998] = "EDITION_PROTO2";
+    /**
+     * @generated from enum value: EDITION_PROTO3 = 999;
+     */
+    Edition[Edition["EDITION_PROTO3"] = 999] = "EDITION_PROTO3";
+    /**
+     * Editions that have been released.  The specific values are arbitrary and
+     * should not be depended on, but they will always be time-ordered for easy
+     * comparison.
+     *
+     * @generated from enum value: EDITION_2023 = 1000;
+     */
+    Edition[Edition["EDITION_2023"] = 1000] = "EDITION_2023";
+    /**
+     * Placeholder editions for testing feature resolution.  These should not be
+     * used or relyed on outside of tests.
+     *
+     * @generated from enum value: EDITION_1_TEST_ONLY = 1;
+     */
+    Edition[Edition["EDITION_1_TEST_ONLY"] = 1] = "EDITION_1_TEST_ONLY";
+    /**
+     * @generated from enum value: EDITION_2_TEST_ONLY = 2;
+     */
+    Edition[Edition["EDITION_2_TEST_ONLY"] = 2] = "EDITION_2_TEST_ONLY";
+    /**
+     * @generated from enum value: EDITION_99997_TEST_ONLY = 99997;
+     */
+    Edition[Edition["EDITION_99997_TEST_ONLY"] = 99997] = "EDITION_99997_TEST_ONLY";
+    /**
+     * @generated from enum value: EDITION_99998_TEST_ONLY = 99998;
+     */
+    Edition[Edition["EDITION_99998_TEST_ONLY"] = 99998] = "EDITION_99998_TEST_ONLY";
+    /**
+     * @generated from enum value: EDITION_99999_TEST_ONLY = 99999;
+     */
+    Edition[Edition["EDITION_99999_TEST_ONLY"] = 99999] = "EDITION_99999_TEST_ONLY";
+})(Edition || (exports.Edition = Edition = {}));
+// Retrieve enum metadata with: proto2.getEnumType(Edition)
+proto2_js_1.proto2.util.setEnumType(Edition, "google.protobuf.Edition", [
+    { no: 0, name: "EDITION_UNKNOWN" },
+    { no: 998, name: "EDITION_PROTO2" },
+    { no: 999, name: "EDITION_PROTO3" },
+    { no: 1000, name: "EDITION_2023" },
+    { no: 1, name: "EDITION_1_TEST_ONLY" },
+    { no: 2, name: "EDITION_2_TEST_ONLY" },
+    { no: 99997, name: "EDITION_99997_TEST_ONLY" },
+    { no: 99998, name: "EDITION_99998_TEST_ONLY" },
+    { no: 99999, name: "EDITION_99999_TEST_ONLY" },
+]);
 /**
  * The protocol compiler can output a FileDescriptorSet containing the .proto
  * files it parses.
@@ -126,7 +206,7 @@ FileDescriptorProto.fields = proto2_js_1.proto2.util.newFieldList(() => [
     { no: 8, name: "options", kind: "message", T: FileOptions, opt: true },
     { no: 9, name: "source_code_info", kind: "message", T: SourceCodeInfo, opt: true },
     { no: 12, name: "syntax", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
-    { no: 13, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { no: 14, name: "edition", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
 ]);
 /**
  * Describes a message type.
@@ -451,9 +531,10 @@ var FieldDescriptorProto_Type;
     FieldDescriptorProto_Type[FieldDescriptorProto_Type["STRING"] = 9] = "STRING";
     /**
      * Tag-delimited aggregate.
-     * Group type is deprecated and not supported in proto3. However, Proto3
+     * Group type is deprecated and not supported after google.protobuf. However, Proto3
      * implementations should still be able to parse the group wire format and
-     * treat group fields as unknown fields.
+     * treat group fields as unknown fields.  In Editions, the group wire format
+     * can be enabled via the `message_encoding` feature.
      *
      * @generated from enum value: TYPE_GROUP = 10;
      */
@@ -531,20 +612,24 @@ var FieldDescriptorProto_Label;
      * @generated from enum value: LABEL_OPTIONAL = 1;
      */
     FieldDescriptorProto_Label[FieldDescriptorProto_Label["OPTIONAL"] = 1] = "OPTIONAL";
-    /**
-     * @generated from enum value: LABEL_REQUIRED = 2;
-     */
-    FieldDescriptorProto_Label[FieldDescriptorProto_Label["REQUIRED"] = 2] = "REQUIRED";
     /**
      * @generated from enum value: LABEL_REPEATED = 3;
      */
     FieldDescriptorProto_Label[FieldDescriptorProto_Label["REPEATED"] = 3] = "REPEATED";
+    /**
+     * The required label is only allowed in google.protobuf.  In proto3 and Editions
+     * it's explicitly prohibited.  In Editions, the `field_presence` feature
+     * can be used to get this behavior.
+     *
+     * @generated from enum value: LABEL_REQUIRED = 2;
+     */
+    FieldDescriptorProto_Label[FieldDescriptorProto_Label["REQUIRED"] = 2] = "REQUIRED";
 })(FieldDescriptorProto_Label || (exports.FieldDescriptorProto_Label = FieldDescriptorProto_Label = {}));
 // Retrieve enum metadata with: proto2.getEnumType(FieldDescriptorProto_Label)
 proto2_js_1.proto2.util.setEnumType(FieldDescriptorProto_Label, "google.protobuf.FieldDescriptorProto.Label", [
     { no: 1, name: "LABEL_OPTIONAL" },
-    { no: 2, name: "LABEL_REQUIRED" },
     { no: 3, name: "LABEL_REPEATED" },
+    { no: 2, name: "LABEL_REQUIRED" },
 ]);
 /**
  * Describes a oneof.
@@ -1124,7 +1209,7 @@ exports.FieldOptions_EditionDefault = FieldOptions_EditionDefault;
 FieldOptions_EditionDefault.runtime = proto2_js_1.proto2;
 FieldOptions_EditionDefault.typeName = "google.protobuf.FieldOptions.EditionDefault";
 FieldOptions_EditionDefault.fields = proto2_js_1.proto2.util.newFieldList(() => [
-    { no: 1, name: "edition", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+    { 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 },
 ]);
 /**
@@ -1416,7 +1501,7 @@ UninterpretedOption_NamePart.fields = proto2_js_1.proto2.util.newFieldList(() =>
     { no: 2, name: "is_extension", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
 ]);
 /**
- * TODO(b/274655146) Enums in C++ gencode (and potentially other languages) are
+ * TODO Enums in C++ gencode (and potentially other languages) are
  * not well scoped.  This means that each of the feature enums below can clash
  * with each other.  The short names we've chosen maximize call-site
  * readability, but leave us very open to this scenario.  A future feature will
@@ -1450,10 +1535,9 @@ FeatureSet.fields = proto2_js_1.proto2.util.newFieldList(() => [
     { no: 1, name: "field_presence", kind: "enum", T: proto2_js_1.proto2.getEnumType(FeatureSet_FieldPresence), opt: true },
     { no: 2, name: "enum_type", kind: "enum", T: proto2_js_1.proto2.getEnumType(FeatureSet_EnumType), opt: true },
     { no: 3, name: "repeated_field_encoding", kind: "enum", T: proto2_js_1.proto2.getEnumType(FeatureSet_RepeatedFieldEncoding), opt: true },
-    { no: 4, name: "string_field_validation", kind: "enum", T: proto2_js_1.proto2.getEnumType(FeatureSet_StringFieldValidation), opt: true },
+    { no: 4, name: "utf8_validation", kind: "enum", T: proto2_js_1.proto2.getEnumType(FeatureSet_Utf8Validation), opt: true },
     { no: 5, name: "message_encoding", kind: "enum", T: proto2_js_1.proto2.getEnumType(FeatureSet_MessageEncoding), opt: true },
     { no: 6, name: "json_format", kind: "enum", T: proto2_js_1.proto2.getEnumType(FeatureSet_JsonFormat), opt: true },
-    { no: 999, name: "raw_features", kind: "message", T: FeatureSet, opt: true },
 ]);
 /**
  * @generated from enum google.protobuf.FeatureSet.FieldPresence
@@ -1533,33 +1617,28 @@ proto2_js_1.proto2.util.setEnumType(FeatureSet_RepeatedFieldEncoding, "google.pr
     { no: 2, name: "EXPANDED" },
 ]);
 /**
- * @generated from enum google.protobuf.FeatureSet.StringFieldValidation
+ * @generated from enum google.protobuf.FeatureSet.Utf8Validation
  */
-var FeatureSet_StringFieldValidation;
-(function (FeatureSet_StringFieldValidation) {
+var FeatureSet_Utf8Validation;
+(function (FeatureSet_Utf8Validation) {
     /**
-     * @generated from enum value: STRING_FIELD_VALIDATION_UNKNOWN = 0;
+     * @generated from enum value: UTF8_VALIDATION_UNKNOWN = 0;
      */
-    FeatureSet_StringFieldValidation[FeatureSet_StringFieldValidation["STRING_FIELD_VALIDATION_UNKNOWN"] = 0] = "STRING_FIELD_VALIDATION_UNKNOWN";
+    FeatureSet_Utf8Validation[FeatureSet_Utf8Validation["UTF8_VALIDATION_UNKNOWN"] = 0] = "UTF8_VALIDATION_UNKNOWN";
     /**
-     * @generated from enum value: MANDATORY = 1;
+     * @generated from enum value: NONE = 1;
      */
-    FeatureSet_StringFieldValidation[FeatureSet_StringFieldValidation["MANDATORY"] = 1] = "MANDATORY";
+    FeatureSet_Utf8Validation[FeatureSet_Utf8Validation["NONE"] = 1] = "NONE";
     /**
-     * @generated from enum value: HINT = 2;
+     * @generated from enum value: VERIFY = 2;
      */
-    FeatureSet_StringFieldValidation[FeatureSet_StringFieldValidation["HINT"] = 2] = "HINT";
-    /**
-     * @generated from enum value: NONE = 3;
-     */
-    FeatureSet_StringFieldValidation[FeatureSet_StringFieldValidation["NONE"] = 3] = "NONE";
-})(FeatureSet_StringFieldValidation || (exports.FeatureSet_StringFieldValidation = FeatureSet_StringFieldValidation = {}));
-// Retrieve enum metadata with: proto2.getEnumType(FeatureSet_StringFieldValidation)
-proto2_js_1.proto2.util.setEnumType(FeatureSet_StringFieldValidation, "google.protobuf.FeatureSet.StringFieldValidation", [
-    { no: 0, name: "STRING_FIELD_VALIDATION_UNKNOWN" },
-    { no: 1, name: "MANDATORY" },
-    { no: 2, name: "HINT" },
-    { no: 3, name: "NONE" },
+    FeatureSet_Utf8Validation[FeatureSet_Utf8Validation["VERIFY"] = 2] = "VERIFY";
+})(FeatureSet_Utf8Validation || (exports.FeatureSet_Utf8Validation = FeatureSet_Utf8Validation = {}));
+// Retrieve enum metadata with: proto2.getEnumType(FeatureSet_Utf8Validation)
+proto2_js_1.proto2.util.setEnumType(FeatureSet_Utf8Validation, "google.protobuf.FeatureSet.Utf8Validation", [
+    { no: 0, name: "UTF8_VALIDATION_UNKNOWN" },
+    { no: 1, name: "NONE" },
+    { no: 2, name: "VERIFY" },
 ]);
 /**
  * @generated from enum google.protobuf.FeatureSet.MessageEncoding
@@ -1609,6 +1688,77 @@ proto2_js_1.proto2.util.setEnumType(FeatureSet_JsonFormat, "google.protobuf.Feat
     { no: 1, name: "ALLOW" },
     { no: 2, name: "LEGACY_BEST_EFFORT" },
 ]);
+/**
+ * A compiled specification for the defaults of a set of features.  These
+ * messages are generated from FeatureSet extensions and can be used to seed
+ * feature resolution. The resolution with this object becomes a simple search
+ * for the closest matching edition, followed by proto merges.
+ *
+ * @generated from message google.protobuf.FeatureSetDefaults
+ */
+class FeatureSetDefaults extends message_js_1.Message {
+    constructor(data) {
+        super();
+        /**
+         * @generated from field: repeated google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault defaults = 1;
+         */
+        this.defaults = [];
+        proto2_js_1.proto2.util.initPartial(data, this);
+    }
+    static fromBinary(bytes, options) {
+        return new FeatureSetDefaults().fromBinary(bytes, options);
+    }
+    static fromJson(jsonValue, options) {
+        return new FeatureSetDefaults().fromJson(jsonValue, options);
+    }
+    static fromJsonString(jsonString, options) {
+        return new FeatureSetDefaults().fromJsonString(jsonString, options);
+    }
+    static equals(a, b) {
+        return proto2_js_1.proto2.util.equals(FeatureSetDefaults, a, b);
+    }
+}
+exports.FeatureSetDefaults = FeatureSetDefaults;
+FeatureSetDefaults.runtime = proto2_js_1.proto2;
+FeatureSetDefaults.typeName = "google.protobuf.FeatureSetDefaults";
+FeatureSetDefaults.fields = proto2_js_1.proto2.util.newFieldList(() => [
+    { no: 1, name: "defaults", kind: "message", T: FeatureSetDefaults_FeatureSetEditionDefault, repeated: true },
+    { no: 4, name: "minimum_edition", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
+    { no: 5, name: "maximum_edition", kind: "enum", T: proto2_js_1.proto2.getEnumType(Edition), opt: true },
+]);
+/**
+ * A map from every known edition with a unique set of defaults to its
+ * defaults. Not all editions may be contained here.  For a given edition,
+ * the defaults at the closest matching edition ordered at or before it should
+ * be used.  This field must be in strict ascending order by edition.
+ *
+ * @generated from message google.protobuf.FeatureSetDefaults.FeatureSetEditionDefault
+ */
+class FeatureSetDefaults_FeatureSetEditionDefault extends message_js_1.Message {
+    constructor(data) {
+        super();
+        proto2_js_1.proto2.util.initPartial(data, this);
+    }
+    static fromBinary(bytes, options) {
+        return new FeatureSetDefaults_FeatureSetEditionDefault().fromBinary(bytes, options);
+    }
+    static fromJson(jsonValue, options) {
+        return new FeatureSetDefaults_FeatureSetEditionDefault().fromJson(jsonValue, options);
+    }
+    static fromJsonString(jsonString, options) {
+        return new FeatureSetDefaults_FeatureSetEditionDefault().fromJsonString(jsonString, options);
+    }
+    static equals(a, b) {
+        return proto2_js_1.proto2.util.equals(FeatureSetDefaults_FeatureSetEditionDefault, a, b);
+    }
+}
+exports.FeatureSetDefaults_FeatureSetEditionDefault = FeatureSetDefaults_FeatureSetEditionDefault;
+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 },
+]);
 /**
  * Encapsulates information about the original source file from which a
  * FileDescriptorProto was generated.

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

@@ -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.4.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.4.2 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");