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

package/dist/cjs/create.js

@@ -15,15 +15,13 @@
 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 descriptors_js_1 = require("./descriptors.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 +46,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;
@@ -90,14 +88,14 @@ function initMessage(messageDesc, message, init) {
     return message;
 }
 function initScalar(field, value) {
-    if (field.scalar == scalar_js_1.ScalarType.BYTES) {
+    if (field.scalar == descriptors_js_1.ScalarType.BYTES) {
         return toU8Arr(value);
     }
     return value;
 }
 function initMap(field, value) {
     if ((0, guard_js_1.isObject)(value)) {
-        if (field.scalar == scalar_js_1.ScalarType.BYTES) {
+        if (field.scalar == descriptors_js_1.ScalarType.BYTES) {
             return convertObjectValues(value, toU8Arr);
         }
         if (field.mapKind == "message") {
@@ -108,7 +106,7 @@ function initMap(field, value) {
 }
 function initList(field, value) {
     if (Array.isArray(value)) {
-        if (field.scalar == scalar_js_1.ScalarType.BYTES) {
+        if (field.scalar == descriptors_js_1.ScalarType.BYTES) {
             return value.map(toU8Arr);
         }
         if (field.listKind == "message") {
@@ -146,17 +144,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 +173,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 +197,7 @@ function createZeroMessage(desc) {
                     }
                 }
             }
-            msg[(0, names_js_1.localName)(member)] = createZeroField(member);
+            msg[member.localName] = createZeroField(member);
         }
     }
     msg.$typeName = desc.typeName;
@@ -232,11 +222,11 @@ function createZeroField(field) {
     }
     const defaultValue = field.getDefaultValue();
     if (defaultValue !== undefined) {
-        return field.fieldKind == "scalar" && field.longType == scalar_js_1.LongType.STRING
+        return field.fieldKind == "scalar" && field.longAsString
             ? defaultValue.toString()
             : defaultValue;
     }
     return field.fieldKind == "scalar"
-        ? (0, scalar_js_1.scalarZeroValue)(field.scalar, field.longType)
+        ? (0, scalar_js_1.scalarZeroValue)(field.scalar, field.longAsString)
         : field.enum.values[0].number;
 }

package/dist/cjs/{desc-types.d.ts → descriptors.d.ts}

@@ -1,7 +1,29 @@
 import type { DescriptorProto, Edition, EnumDescriptorProto, EnumValueDescriptorProto, FeatureSet_FieldPresence, FieldDescriptorProto, FileDescriptorProto, MethodDescriptorProto, MethodOptions_IdempotencyLevel, OneofDescriptorProto, ServiceDescriptorProto } from "./wkt/gen/google/protobuf/descriptor_pb.js";
-import type { LongType, ScalarType, ScalarValue } from "./reflect/scalar.js";
+import type { ScalarValue } from "./reflect/scalar.js";
 export type SupportedEdition = Extract<Edition, Edition.EDITION_PROTO2 | Edition.EDITION_PROTO3 | Edition.EDITION_2023>;
 type SupportedFieldPresence = Extract<FeatureSet_FieldPresence, FeatureSet_FieldPresence.EXPLICIT | FeatureSet_FieldPresence.IMPLICIT | FeatureSet_FieldPresence.LEGACY_REQUIRED>;
+/**
+ * Scalar value types. This is a subset of field types declared by protobuf
+ * enum google.protobuf.FieldDescriptorProto.Type The types GROUP and MESSAGE
+ * are omitted, but the numerical values are identical.
+ */
+export declare enum ScalarType {
+    DOUBLE = 1,
+    FLOAT = 2,
+    INT64 = 3,
+    UINT64 = 4,
+    INT32 = 5,
+    FIXED64 = 6,
+    FIXED32 = 7,
+    BOOL = 8,
+    STRING = 9,
+    BYTES = 12,
+    UINT32 = 13,
+    SFIXED32 = 15,
+    SFIXED64 = 16,
+    SINT32 = 17,// Uses ZigZag encoding.
+    SINT64 = 18
+}
 /**
  * A union of all descriptors, discriminated by a `kind` property.
  */
@@ -108,6 +130,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 +178,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 +225,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 +274,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 +295,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";
@@ -273,10 +303,13 @@ type descFieldScalar<T extends ScalarType = ScalarType> = T extends T ? {
      */
     readonly scalar: T;
     /**
-     * JavaScript type for 64 bit integral types (int64, uint64,
-     * sint64, fixed64, sfixed64).
+     * By default, 64-bit integral types (int64, uint64, sint64, fixed64,
+     * sfixed64) are represented with BigInt.
+     *
+     * If the field option `jstype = JS_STRING` is set, this property
+     * is true, and 64-bit integral types are represented with String.
      */
-    readonly longType: LongType;
+    readonly longAsString: boolean;
     /**
      * The message type, if it is a message field.
      */
@@ -361,10 +394,13 @@ type descFieldListScalar<T extends ScalarType = ScalarType> = T extends T ? {
      */
     readonly scalar: T;
     /**
-     * JavaScript type for 64 bit integral types (int64, uint64,
-     * sint64, fixed64, sfixed64).
+     * By default, 64-bit integral types (int64, uint64, sint64, fixed64,
+     * sfixed64) are represented with BigInt.
+     *
+     * If the field option `jstype = JS_STRING` is set, this property
+     * is true, and 64-bit integral types are represented with String.
      */
-    readonly longType: LongType;
+    readonly longAsString: boolean;
 } : never;
 type descFieldListEnum = {
     readonly listKind: "enum";
@@ -414,7 +450,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 +509,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.
      */
@@ -513,6 +554,10 @@ export interface DescService {
      * The RPCs this service declares.
      */
     readonly methods: DescMethod[];
+    /**
+     * All methods of this service by their "localName".
+     */
+    readonly method: Record<string, DescMethod>;
     /**
      * Marked as deprecated in the protobuf source.
      */
@@ -532,6 +577,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/descriptors.js

@@ -0,0 +1,53 @@
+"use strict";
+// Copyright 2021-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScalarType = void 0;
+/**
+ * Scalar value types. This is a subset of field types declared by protobuf
+ * enum google.protobuf.FieldDescriptorProto.Type The types GROUP and MESSAGE
+ * are omitted, but the numerical values are identical.
+ */
+var ScalarType;
+(function (ScalarType) {
+    // 0 is reserved for errors.
+    // Order is weird for historical reasons.
+    ScalarType[ScalarType["DOUBLE"] = 1] = "DOUBLE";
+    ScalarType[ScalarType["FLOAT"] = 2] = "FLOAT";
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
+    // negative values are likely.
+    ScalarType[ScalarType["INT64"] = 3] = "INT64";
+    ScalarType[ScalarType["UINT64"] = 4] = "UINT64";
+    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
+    // negative values are likely.
+    ScalarType[ScalarType["INT32"] = 5] = "INT32";
+    ScalarType[ScalarType["FIXED64"] = 6] = "FIXED64";
+    ScalarType[ScalarType["FIXED32"] = 7] = "FIXED32";
+    ScalarType[ScalarType["BOOL"] = 8] = "BOOL";
+    ScalarType[ScalarType["STRING"] = 9] = "STRING";
+    // Tag-delimited aggregate.
+    // Group type is deprecated and not supported in proto3. However, Proto3
+    // implementations should still be able to parse the group wire format and
+    // treat group fields as unknown fields.
+    // TYPE_GROUP = 10,
+    // TYPE_MESSAGE = 11,  // Length-delimited aggregate.
+    // New in version 2.
+    ScalarType[ScalarType["BYTES"] = 12] = "BYTES";
+    ScalarType[ScalarType["UINT32"] = 13] = "UINT32";
+    // TYPE_ENUM = 14,
+    ScalarType[ScalarType["SFIXED32"] = 15] = "SFIXED32";
+    ScalarType[ScalarType["SFIXED64"] = 16] = "SFIXED64";
+    ScalarType[ScalarType["SINT32"] = 17] = "SINT32";
+    ScalarType[ScalarType["SINT64"] = 18] = "SINT64";
+})(ScalarType || (exports.ScalarType = ScalarType = {}));

package/dist/cjs/equals.d.ts

@@ -1,5 +1,5 @@
 import type { MessageShape } from "./types.js";
-import type { DescMessage } from "./desc-types.js";
+import type { DescMessage } from "./descriptors.js";
 /**
  * Compare two messages of the same type.
  *

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 "./descriptors.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,9 @@
 // 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;
-const assert_js_1 = require("./reflect/assert.js");
+exports.createExtensionContainer = exports.getOption = exports.hasOption = exports.hasExtension = exports.clearExtension = exports.setExtension = exports.getExtension = void 0;
 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 +63,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 +91,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,20 +141,20 @@ 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;
                 if ((0, wrappers_js_1.isWrapperDesc)(desc)) {
-                    return (0, scalar_js_1.scalarZeroValue)(desc.fields[0].scalar, desc.fields[0].longType);
+                    return (0, scalar_js_1.scalarZeroValue)(desc.fields[0].scalar, desc.fields[0].longAsString);
                 }
                 return (0, create_js_1.create)(desc);
             }
@@ -134,5 +164,7 @@ function createExtensionContainer(extension, value) {
 }
 exports.createExtensionContainer = createExtensionContainer;
 function assertExtendee(extension, message) {
-    (0, assert_js_1.assert)(extension.extendee.typeName == message.$typeName, `extension ${extension.typeName} can only be applied to message ${extension.extendee.typeName}`);
+    if (extension.extendee.typeName != message.$typeName) {
+        throw new Error(`extension ${extension.typeName} can only be applied to message ${extension.extendee.typeName}`);
+    }
 }

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 "./descriptors.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);
     }
 }

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

@@ -1,4 +1,4 @@
-import type { DescField, DescMessage } from "./desc-types.js";
+import { type DescField, type DescMessage } from "./descriptors.js";
 import type { MessageShape } from "./types.js";
 import type { ReflectMessage } from "./reflect/index.js";
 import { BinaryReader, WireType } from "./wire/binary-encoding.js";
@@ -27,7 +27,7 @@ export declare function fromBinary<Desc extends DescMessage>(messageDesc: Desc,
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromBinary<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): MessageShape<Desc>;
+export declare function mergeFromBinary<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, bytes: Uint8Array, options?: Partial<BinaryReadOptions>): void;
 /**
  * @private
  */