@bufbuild/protobuf 2.0.0-alpha.1 → 2.0.0-alpha.2

package/dist/cjs/codegenv1/embed.d.ts

@@ -1,4 +1,4 @@
-import type { DescEnum, DescExtension, DescFile, DescMessage, DescService } from "../desc-types.js";
+import type { DescEnum, DescExtension, DescMessage, DescService } from "../desc-types.js";
 import type { FileDescriptorProto } from "../wkt/gen/google/protobuf/descriptor_pb.js";
 import type { FileDescriptorProtoBoot } from "./boot.js";
 type EmbedUnknown = {
@@ -16,7 +16,7 @@ type EmbedDescriptorProto = Omit<EmbedUnknown, "bootable"> & {
  *
  * @private
  */
-export declare function embedFileDesc(file: DescFile): EmbedUnknown | EmbedDescriptorProto;
+export declare function embedFileDesc(file: FileDescriptorProto): EmbedUnknown | EmbedDescriptorProto;
 /**
  * Compute the path to a message, enumeration, extension, or service in a
  * file descriptor.

package/dist/cjs/codegenv1/embed.js

@@ -31,9 +31,9 @@ function embedFileDesc(file) {
     const embed = {
         bootable: false,
         proto() {
-            const stripped = (0, clone_js_1.clone)(descriptor_pb_js_1.FileDescriptorProtoDesc, file.proto);
-            (0, fields_js_1.clearField)(descriptor_pb_js_1.FileDescriptorProtoDesc, stripped, "dependency");
-            (0, fields_js_1.clearField)(descriptor_pb_js_1.FileDescriptorProtoDesc, stripped, "sourceCodeInfo");
+            const stripped = (0, clone_js_1.clone)(descriptor_pb_js_1.FileDescriptorProtoDesc, file);
+            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoDesc.field.dependency);
+            (0, fields_js_1.clearField)(stripped, descriptor_pb_js_1.FileDescriptorProtoDesc.field.sourceCodeInfo);
             stripped.messageType.map(stripJsonNames);
             return stripped;
         },
@@ -42,7 +42,7 @@ function embedFileDesc(file) {
             return (0, base64_encoding_js_1.base64Encode)(bytes, "std_raw");
         },
     };
-    return file.proto.name == "google/protobuf/descriptor.proto"
+    return file.name == "google/protobuf/descriptor.proto"
         ? Object.assign(Object.assign({}, embed), { bootable: true, boot() {
                 return createFileDescriptorProtoBoot(this.proto());
             } }) : embed;
@@ -51,7 +51,7 @@ exports.embedFileDesc = embedFileDesc;
 function stripJsonNames(d) {
     for (const f of d.field) {
         if (f.jsonName === (0, names_js_1.protoCamelCase)(f.name)) {
-            (0, fields_js_1.clearField)(descriptor_pb_js_1.FieldDescriptorProtoDesc, f, "jsonName");
+            (0, fields_js_1.clearField)(f, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.jsonName);
         }
     }
     for (const n of d.nestedType) {
@@ -163,27 +163,27 @@ function createDescriptorBoot(proto) {
     return b;
 }
 function createFieldDescriptorBoot(proto) {
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "name"));
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "number"));
-    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "type"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "oneofIndex"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "jsonName") ||
+    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.name));
+    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.number));
+    (0, assert_js_1.assert)((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.type));
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.oneofIndex));
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.jsonName) ||
         proto.jsonName === (0, names_js_1.protoCamelCase)(proto.name));
     const b = {
         name: proto.name,
         number: proto.number,
         type: proto.type,
     };
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "label")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.label)) {
         b.label = proto.label;
     }
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "typeName")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.typeName)) {
         b.typeName = proto.typeName;
     }
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "extendee")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.extendee)) {
         b.extendee = proto.extendee;
     }
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldDescriptorProtoDesc, proto, "defaultValue")) {
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldDescriptorProtoDesc.field.defaultValue)) {
         b.defaultValue = proto.defaultValue;
     }
     if (proto.options) {
@@ -193,19 +193,19 @@ function createFieldDescriptorBoot(proto) {
 }
 function createFieldOptionsBoot(proto) {
     const b = {};
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "ctype"));
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "packed")) {
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.ctype));
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.packed)) {
         b.packed = proto.packed;
     }
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "jstype"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "lazy"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "unverifiedLazy"));
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "deprecated")) {
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.jstype));
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.lazy));
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.unverifiedLazy));
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.deprecated)) {
         b.deprecated = proto.deprecated;
     }
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "weak"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "debugRedact"));
-    if ((0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "retention")) {
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.weak));
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.debugRedact));
+    if ((0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.retention)) {
         b.retention = proto.retention;
     }
     if (proto.targets.length) {
@@ -217,8 +217,8 @@ function createFieldOptionsBoot(proto) {
             edition: d.edition,
         }));
     }
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "features"));
-    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(descriptor_pb_js_1.FieldOptionsDesc, proto, "uninterpretedOption"));
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.features));
+    (0, assert_js_1.assert)(!(0, fields_js_1.isFieldSet)(proto, descriptor_pb_js_1.FieldOptionsDesc.field.uninterpretedOption));
     return b;
 }
 function createEnumDescriptorBoot(proto) {

package/dist/cjs/codegenv1/enum.js

@@ -14,7 +14,6 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsEnum = exports.enumDesc = void 0;
-const names_js_1 = require("../reflect/names.js");
 /**
  * Hydrate an enum descriptor.
  *
@@ -34,9 +33,8 @@ exports.enumDesc = enumDesc;
 function tsEnum(desc) {
     const enumObject = {};
     for (const value of desc.values) {
-        const name = (0, names_js_1.localName)(value);
-        enumObject[name] = value.number;
-        enumObject[value.number] = name;
+        enumObject[value.localName] = value.number;
+        enumObject[value.number] = value.localName;
     }
     return enumObject;
 }

package/dist/cjs/codegenv1/restore-json-names.d.ts

@@ -1,2 +1,5 @@
 import type { DescriptorProto } from "../wkt/gen/google/protobuf/descriptor_pb.js";
+/**
+ * @private
+ */
 export declare function restoreJsonNames(message: DescriptorProto): void;

package/dist/cjs/codegenv1/restore-json-names.js

@@ -16,6 +16,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.restoreJsonNames = void 0;
 const names_js_1 = require("../reflect/names.js");
 const unsafe_js_1 = require("../reflect/unsafe.js");
+/**
+ * @private
+ */
 function restoreJsonNames(message) {
     for (const f of message.field) {
         if (!(0, unsafe_js_1.unsafeIsSetExplicit)(f, "jsonName")) {

package/dist/cjs/codegenv1/symbols.d.ts

@@ -1,5 +1,14 @@
+/**
+ * @private
+ */
 export declare const packageName = "@bufbuild/protobuf";
+/**
+ * @private
+ */
 export declare const wktPublicImportPaths: Readonly<Record<string, string>>;
+/**
+ * @private
+ */
 export declare const symbols: {
     readonly isMessage: {
         readonly typeOnly: false;

package/dist/cjs/codegenv1/symbols.js

@@ -14,7 +14,13 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.symbols = exports.wktPublicImportPaths = exports.packageName = void 0;
+/**
+ * @private
+ */
 exports.packageName = "@bufbuild/protobuf";
+/**
+ * @private
+ */
 exports.wktPublicImportPaths = {
     "google/protobuf/compiler/plugin.proto": exports.packageName + "/wkt",
     "google/protobuf/any.proto": exports.packageName + "/wkt",
@@ -29,6 +35,9 @@ exports.wktPublicImportPaths = {
     "google/protobuf/type.proto": exports.packageName + "/wkt",
     "google/protobuf/wrappers.proto": exports.packageName + "/wkt",
 };
+/**
+ * @private
+ */
 // prettier-ignore
 exports.symbols = {
     isMessage: { typeOnly: false, bootstrapWktFrom: "../../is-message.js", from: exports.packageName },

package/dist/cjs/codegenv1/types.d.ts

@@ -1,10 +1,52 @@
 import type { Message } from "../types.js";
-import type { DescEnum, DescExtension, DescFile, DescMessage, DescService } from "../desc-types.js";
+import type { DescEnum, DescExtension, DescField, DescFile, DescMessage, DescService } from "../desc-types.js";
+/**
+ * Describes a protobuf source file.
+ *
+ * @private
+ */
 export type GenDescFile = DescFile;
-export type GenDescMessage<RuntimeShape extends Message> = DescMessage & brand<RuntimeShape>;
+/**
+ * Describes a message declaration in a protobuf source file.
+ *
+ * This type is identical to DescMessage, but carries additional type
+ * information.
+ *
+ * @private
+ */
+export type GenDescMessage<RuntimeShape extends Message> = Omit<DescMessage, "field"> & {
+    field: Record<MessageFieldNames<RuntimeShape>, DescField>;
+} & brand<RuntimeShape>;
+/**
+ * Describes an enumeration in a protobuf source file.
+ *
+ * This type is identical to DescEnum, but carries additional type
+ * information.
+ *
+ * @private
+ */
 export type GenDescEnum<RuntimeShape> = DescEnum & brand<RuntimeShape>;
+/**
+ * Describes an extension in a protobuf source file.
+ *
+ * This type is identical to DescExtension, but carries additional type
+ * information.
+ *
+ * @private
+ */
 export type GenDescExtension<Extendee extends Message = Message, RuntimeShape = unknown> = DescExtension & brand<Extendee, RuntimeShape>;
+/**
+ * Describes a service declaration in a protobuf source file.
+ *
+ * This type is identical to DescService, but carries additional type
+ * information.
+ *
+ * @private
+ */
 export type GenDescService<RuntimeShape extends GenDescServiceShape> = DescService & brand<RuntimeShape>;
+/**
+ * @private
+ */
 export type GenDescServiceShape = {
     [localName: string]: {
         kind: "unary" | "server_streaming" | "client_streaming" | "bidi_streaming";
@@ -16,4 +58,15 @@ declare class brand<A, B = unknown> {
     protected a: A | boolean;
     protected b: B | boolean;
 }
+/**
+ * Union of the property names of all fields, including oneof members.
+ * For an anonymous message (no generated message shape), it's simply a string.
+ */
+type MessageFieldNames<T extends Message> = Message extends T ? string : Exclude<keyof {
+    [P in keyof T as P extends ("$typeName" | "$unknown") ? never : T[P] extends Oneof<infer K> ? K : P]-?: true;
+}, number | symbol>;
+type Oneof<K extends string> = {
+    case: K | undefined;
+    value?: unknown;
+};
 export {};

package/dist/cjs/create.js

@@ -15,15 +15,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const is_message_js_1 = require("./is-message.js");
-const names_js_1 = require("./reflect/names.js");
 const scalar_js_1 = require("./reflect/scalar.js");
 const guard_js_1 = require("./reflect/guard.js");
 const unsafe_js_1 = require("./reflect/unsafe.js");
 const wrappers_js_1 = require("./wkt/wrappers.js");
 // bootstrap-inject google.protobuf.Edition.EDITION_PROTO3: const $name: Edition.$localName = $number;
 const EDITION_PROTO3 = 999;
-// bootstrap-inject google.protobuf.FeatureSet.FieldPresence.EXPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
-const EXPLICIT = 1;
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.IMPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
 const IMPLICIT = 2;
 /**
@@ -48,7 +45,7 @@ exports.create = create;
  */
 function initMessage(messageDesc, message, init) {
     for (const member of messageDesc.members) {
-        let value = init[(0, names_js_1.localName)(member)];
+        let value = init[member.localName];
         if (value == null) {
             // intentionally ignore undefined and null
             continue;
@@ -146,17 +143,9 @@ function createZeroMessage(desc) {
         // the `optional` keyword generate an optional property.
         msg = {};
         for (const member of desc.members) {
-            if (member.kind == "field") {
-                if (member.fieldKind == "scalar" ||
-                    member.fieldKind == "enum" ||
-                    member.fieldKind == "message") {
-                    if (member.presence == EXPLICIT) {
-                        // skips message fields and optional scalar/enum
-                        continue;
-                    }
-                }
+            if (member.kind == "oneof" || member.presence == IMPLICIT) {
+                msg[member.localName] = createZeroField(member);
             }
-            msg[(0, names_js_1.localName)(member)] = createZeroField(member);
         }
     }
     else {
@@ -183,12 +172,12 @@ function createZeroMessage(desc) {
                     continue;
                 }
                 if (member.presence == IMPLICIT) {
-                    // implicit presence tracks field presence by zero values
-                    // e.g. 0, false, "", are unset, 1, true, "x" are set
+                    // implicit presence tracks field presence by zero values - e.g. 0, false, "", are unset, 1, true, "x" are set.
+                    // message, map, list fields are mutable, and also have IMPLICIT presence.
                     continue;
                 }
                 members.add(member);
-                prototype[(0, names_js_1.localName)(member)] = createZeroField(member);
+                prototype[member.localName] = createZeroField(member);
             }
             messagePrototypes.set(desc, { prototype, members });
         }
@@ -207,7 +196,7 @@ function createZeroMessage(desc) {
                     }
                 }
             }
-            msg[(0, names_js_1.localName)(member)] = createZeroField(member);
+            msg[member.localName] = createZeroField(member);
         }
     }
     msg.$typeName = desc.typeName;

package/dist/cjs/desc-types.d.ts

@@ -108,6 +108,10 @@ export interface DescEnumValue {
      * The name of the enumeration value, as specified in the protobuf source.
      */
     readonly name: string;
+    /**
+     * A safe and idiomatic name for the value in a TypeScript enum.
+     */
+    readonly localName: string;
     /**
      * The enumeration this value belongs to.
      */
@@ -152,6 +156,10 @@ export interface DescMessage {
      * group.
      */
     readonly fields: DescField[];
+    /**
+     * All fields of this message by their "localName".
+     */
+    readonly field: Record<string, DescField>;
     /**
      * Oneof groups declared for this message.
      * This does not include synthetic oneofs for proto3 optionals.
@@ -195,6 +203,10 @@ type descFieldCommon = descFieldAndExtensionShared & {
      * The message this field is declared on.
      */
     readonly parent: DescMessage;
+    /**
+     * A safe and idiomatic name for the field as a property in ECMAScript.
+     */
+    readonly localName: string;
 };
 /**
  * Describes an extension in a protobuf source file.
@@ -240,6 +252,11 @@ interface descFieldAndExtensionShared {
      * Marked as deprecated in the protobuf source.
      */
     readonly deprecated: boolean;
+    /**
+     * Presence of the field.
+     * See https://protobuf.dev/programming-guides/field_presence/
+     */
+    readonly presence: SupportedFieldPresence;
     /**
      * The compiler-generated descriptor.
      */
@@ -256,15 +273,6 @@ type descFieldSingularCommon = {
      * This does not include synthetic oneofs for proto3 optionals.
      */
     readonly oneof: DescOneof | undefined;
-    /**
-     * Whether this field was declared with `optional` in the protobuf source.
-     */
-    readonly optional: boolean;
-    /**
-     * Presence of the field.
-     * See https://protobuf.dev/programming-guides/field_presence/
-     */
-    readonly presence: SupportedFieldPresence;
 };
 type descFieldScalar<T extends ScalarType = ScalarType> = T extends T ? {
     readonly fieldKind: "scalar";
@@ -414,7 +422,8 @@ type descFieldMapCommon<T extends ScalarType = ScalarType> = T extends Exclude<S
     readonly oneof: undefined;
     /**
      * Encode the map entry message delimited (a.k.a. proto2 group encoding),
-     * or length-prefixed? This is always false for map fields.
+     * or length-prefixed? As of Edition 2023, this is always false for map fields,
+     * and also applies to map values, if they are messages.
      */
     readonly delimitedEncoding: false;
 } : never;
@@ -472,6 +481,10 @@ export interface DescOneof {
      * The name of the oneof group, as specified in the protobuf source.
      */
     readonly name: string;
+    /**
+     * A safe and idiomatic name for the oneof group as a property in ECMAScript.
+     */
+    readonly localName: string;
     /**
      * The message this oneof group was declared in.
      */
@@ -532,6 +545,10 @@ export interface DescMethod {
      * The name of the RPC, as specified in the protobuf source.
      */
     readonly name: string;
+    /**
+     * A safe and idiomatic name for the RPC as a method in ECMAScript.
+     */
+    readonly localName: string;
     /**
      * The parent service.
      */

package/dist/cjs/extensions.d.ts

@@ -1,6 +1,7 @@
-import type { DescExtension, DescField } from "./desc-types.js";
+import type { AnyDesc, DescEnum, DescEnumValue, DescExtension, DescField, DescFile, DescMessage, DescMethod, DescOneof, DescService } from "./desc-types.js";
 import type { ReflectMessage } from "./reflect/reflect-types.js";
 import type { Extendee, ExtensionValueShape } from "./types.js";
+import type { EnumOptions, EnumValueOptions, FieldOptions, FileOptions, MessageOptions, MethodOptions, OneofOptions, ServiceOptions } from "./wkt/gen/google/protobuf/descriptor_pb.js";
 /**
  * Retrieve an extension value from a message.
  *
@@ -33,7 +34,26 @@ export declare function clearExtension<Desc extends DescExtension>(message: Exte
  * Check whether an extension is set on a message.
  */
 export declare function hasExtension<Desc extends DescExtension>(message: Extendee<Desc>, extension: Desc): boolean;
+/**
+ * Check whether an option is set on a descriptor.
+ *
+ * Options are extensions to the `google.protobuf.*Options` messages defined in
+ * google/protobuf/descriptor.proto. This function gets the option message from
+ * the descriptor, and calls hasExtension().
+ */
+export declare function hasOption<Ext extends DescExtension, Desc extends DescForOptionExtension<Ext>>(element: Desc, option: Ext): boolean;
+/**
+ * Retrieve an option value from a descriptor.
+ *
+ * Options are extensions to the `google.protobuf.*Options` messages defined in
+ * google/protobuf/descriptor.proto. This function gets the option message from
+ * the descriptor, and calls getExtension(). Same as getExtension(), this
+ * function never returns undefined.
+ */
+export declare function getOption<Ext extends DescExtension, Desc extends DescForOptionExtension<Ext>>(element: Desc, option: Ext): ExtensionValueShape<Ext>;
+type DescForOptionExtension<Ext extends DescExtension> = Extendee<Ext> extends FileOptions ? DescFile : Extendee<Ext> extends EnumOptions ? DescEnum : Extendee<Ext> extends EnumValueOptions ? DescEnumValue : Extendee<Ext> extends MessageOptions ? DescMessage : Extendee<Ext> extends MessageOptions ? DescEnum : Extendee<Ext> extends FieldOptions ? DescField | DescExtension : Extendee<Ext> extends OneofOptions ? DescOneof : Extendee<Ext> extends ServiceOptions ? DescService : Extendee<Ext> extends EnumOptions ? DescEnum : Extendee<Ext> extends MethodOptions ? DescMethod : AnyDesc;
 /**
  * @private
  */
 export declare function createExtensionContainer<Desc extends DescExtension>(extension: Desc, value?: ExtensionValueShape<Desc>): [ReflectMessage, DescField, () => ExtensionValueShape<Desc>];
+export {};

package/dist/cjs/extensions.js

@@ -13,11 +13,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createExtensionContainer = exports.hasExtension = exports.clearExtension = exports.setExtension = exports.getExtension = void 0;
+exports.createExtensionContainer = exports.getOption = exports.hasOption = exports.hasExtension = exports.clearExtension = exports.setExtension = exports.getExtension = void 0;
 const assert_js_1 = require("./reflect/assert.js");
 const create_js_1 = require("./create.js");
 const from_binary_js_1 = require("./from-binary.js");
-const names_js_1 = require("./reflect/names.js");
 const reflect_js_1 = require("./reflect/reflect.js");
 const scalar_js_1 = require("./reflect/scalar.js");
 const to_binary_js_1 = require("./to-binary.js");
@@ -65,7 +64,7 @@ function setExtension(message, extension, value) {
     const reader = new binary_encoding_js_1.BinaryReader(writer.finish());
     while (reader.pos < reader.len) {
         const [no, wireType] = reader.tag();
-        const data = reader.skip(wireType);
+        const data = reader.skip(wireType, no);
         ufs.push({ no, wireType, data });
     }
     message.$unknown = ufs;
@@ -93,6 +92,38 @@ function hasExtension(message, extension) {
         !!((_a = message.$unknown) === null || _a === void 0 ? void 0 : _a.find((uf) => uf.no === extension.number)));
 }
 exports.hasExtension = hasExtension;
+/**
+ * Check whether an option is set on a descriptor.
+ *
+ * Options are extensions to the `google.protobuf.*Options` messages defined in
+ * google/protobuf/descriptor.proto. This function gets the option message from
+ * the descriptor, and calls hasExtension().
+ */
+function hasOption(element, option) {
+    const message = element.proto.options;
+    if (!message) {
+        return false;
+    }
+    return hasExtension(message, option);
+}
+exports.hasOption = hasOption;
+/**
+ * Retrieve an option value from a descriptor.
+ *
+ * Options are extensions to the `google.protobuf.*Options` messages defined in
+ * google/protobuf/descriptor.proto. This function gets the option message from
+ * the descriptor, and calls getExtension(). Same as getExtension(), this
+ * function never returns undefined.
+ */
+function getOption(element, option) {
+    const message = element.proto.options;
+    if (!message) {
+        const [, , get] = createExtensionContainer(option);
+        return get();
+    }
+    return getExtension(message, option);
+}
+exports.getOption = getOption;
 function filterUnknownFields(unknownFields, extension) {
     if (unknownFields === undefined)
         return [];
@@ -111,15 +142,15 @@ function filterUnknownFields(unknownFields, extension) {
  * @private
  */
 function createExtensionContainer(extension, value) {
-    const field = Object.assign(Object.assign({}, extension), { kind: "field", parent: extension.extendee });
+    const localName = extension.typeName;
+    const field = Object.assign(Object.assign({}, extension), { kind: "field", parent: extension.extendee, localName });
     const desc = Object.assign(Object.assign({}, extension.extendee), { fields: [field], members: [field], oneofs: [] });
-    const fieldName = (0, names_js_1.localName)(field);
-    const container = (0, create_js_1.create)(desc, value !== undefined ? { [fieldName]: value } : undefined);
+    const container = (0, create_js_1.create)(desc, value !== undefined ? { [localName]: value } : undefined);
     return [
         (0, reflect_js_1.reflect)(desc, container),
         field,
         () => {
-            const value = container[fieldName];
+            const value = container[localName];
             if (value === undefined) {
                 // Only message fields are undefined, rest will have a zero value.
                 const desc = extension.message;

package/dist/cjs/fields.d.ts

@@ -1,22 +1,23 @@
-import type { Message, MessageShape } from "./types.js";
-import type { DescMessage } from "./desc-types.js";
+import type { MessageShape } from "./types.js";
+import type { DescField, DescMessage } from "./desc-types.js";
 /**
  * Returns true if the field is set.
+ *
+ * - Scalar and enum fields with implicit presence (proto3):
+ *   Set if not a zero value.
+ *
+ * - Scalar and enum fields with explicit presence (proto2, oneof):
+ *   Set if a value was set when creating or parsing the message, or when a
+ *   value was assigned to the field's property.
+ *
+ * - Message fields:
+ *   Set if the property is not undefined.
+ *
+ * - List and map fields:
+ *   Set if not empty.
  */
-export declare function isFieldSet<Desc extends DescMessage>(messageDesc: Desc, message: MessageShape<Desc>, fieldName: MessageFieldNames<MessageShape<Desc>>): boolean;
+export declare function isFieldSet<Desc extends DescMessage>(message: MessageShape<Desc>, field: DescField): boolean;
 /**
  * Resets the field, so that isFieldSet() will return false.
  */
-export declare function clearField<Desc extends DescMessage>(messageDesc: Desc, message: MessageShape<Desc>, fieldName: MessageFieldNames<MessageShape<Desc>>): void;
-/**
- * Union of the property names of all fields, including oneof members.
- * For an anonymous message (no generated message shape), it's simply a string.
- */
-type MessageFieldNames<T extends Message> = Message extends T ? string : Exclude<keyof {
-    [P in keyof T as P extends ("$typeName" | "$unknown") ? never : T[P] extends Oneof<infer K> ? K : P]-?: true;
-}, number | symbol>;
-type Oneof<K extends string> = {
-    case: K | undefined;
-    value?: unknown;
-};
-export {};
+export declare function clearField<Desc extends DescMessage>(message: MessageShape<Desc>, field: DescField): void;

package/dist/cjs/fields.js

@@ -14,25 +14,32 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clearField = exports.isFieldSet = void 0;
-const names_js_1 = require("./reflect/names.js");
 const unsafe_js_1 = require("./reflect/unsafe.js");
 /**
  * Returns true if the field is set.
+ *
+ * - Scalar and enum fields with implicit presence (proto3):
+ *   Set if not a zero value.
+ *
+ * - Scalar and enum fields with explicit presence (proto2, oneof):
+ *   Set if a value was set when creating or parsing the message, or when a
+ *   value was assigned to the field's property.
+ *
+ * - Message fields:
+ *   Set if the property is not undefined.
+ *
+ * - List and map fields:
+ *   Set if not empty.
  */
-function isFieldSet(messageDesc, message, fieldName) {
-    const field = messageDesc.fields.find((f) => (0, names_js_1.localName)(f) === fieldName);
-    if (field) {
-        return (0, unsafe_js_1.unsafeIsSet)(message, field);
-    }
-    return false;
+function isFieldSet(message, field) {
+    return (field.parent.typeName == message.$typeName && (0, unsafe_js_1.unsafeIsSet)(message, field));
 }
 exports.isFieldSet = isFieldSet;
 /**
  * Resets the field, so that isFieldSet() will return false.
  */
-function clearField(messageDesc, message, fieldName) {
-    const field = messageDesc.fields.find((f) => (0, names_js_1.localName)(f) === fieldName);
-    if (field) {
+function clearField(message, field) {
+    if (field.parent.typeName == message.$typeName) {
         (0, unsafe_js_1.unsafeClear)(message, field);
     }
 }