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

package/dist/esm/{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/esm/descriptors.js

@@ -0,0 +1,50 @@
+// 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.
+/**
+ * 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 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 || (ScalarType = {}));

package/dist/esm/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/esm/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/esm/extensions.js

@@ -11,10 +11,8 @@
 // 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.
-import { assert } from "./reflect/assert.js";
 import { create } from "./create.js";
 import { readField } from "./from-binary.js";
-import { localName } from "./reflect/names.js";
 import { reflect } from "./reflect/reflect.js";
 import { scalarZeroValue } from "./reflect/scalar.js";
 import { writeField } from "./to-binary.js";
@@ -61,7 +59,7 @@ export function setExtension(message, extension, value) {
     const reader = new 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;
@@ -86,6 +84,36 @@ export function hasExtension(message, extension) {
     return (extension.extendee.typeName === message.$typeName &&
         !!((_a = message.$unknown) === null || _a === void 0 ? void 0 : _a.find((uf) => uf.no === extension.number)));
 }
+/**
+ * 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 function hasOption(element, option) {
+    const message = element.proto.options;
+    if (!message) {
+        return false;
+    }
+    return hasExtension(message, option);
+}
+/**
+ * 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 function getOption(element, option) {
+    const message = element.proto.options;
+    if (!message) {
+        const [, , get] = createExtensionContainer(option);
+        return get();
+    }
+    return getExtension(message, option);
+}
 function filterUnknownFields(unknownFields, extension) {
     if (unknownFields === undefined)
         return [];
@@ -104,20 +132,20 @@ function filterUnknownFields(unknownFields, extension) {
  * @private
  */
 export 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 = localName(field);
-    const container = create(desc, value !== undefined ? { [fieldName]: value } : undefined);
+    const container = create(desc, value !== undefined ? { [localName]: value } : undefined);
     return [
         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 (isWrapperDesc(desc)) {
-                    return scalarZeroValue(desc.fields[0].scalar, desc.fields[0].longType);
+                    return scalarZeroValue(desc.fields[0].scalar, desc.fields[0].longAsString);
                 }
                 return create(desc);
             }
@@ -126,5 +154,7 @@ export function createExtensionContainer(extension, value) {
     ];
 }
 function assertExtendee(extension, message) {
-    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/esm/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/esm/fields.js

@@ -11,24 +11,31 @@
 // 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.
-import { localName } from "./reflect/names.js";
 import { unsafeClear, unsafeIsSet } from "./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.
  */
-export function isFieldSet(messageDesc, message, fieldName) {
-    const field = messageDesc.fields.find((f) => localName(f) === fieldName);
-    if (field) {
-        return unsafeIsSet(message, field);
-    }
-    return false;
+export function isFieldSet(message, field) {
+    return (field.parent.typeName == message.$typeName && unsafeIsSet(message, field));
 }
 /**
  * Resets the field, so that isFieldSet() will return false.
  */
-export function clearField(messageDesc, message, fieldName) {
-    const field = messageDesc.fields.find((f) => localName(f) === fieldName);
-    if (field) {
+export function clearField(message, field) {
+    if (field.parent.typeName == message.$typeName) {
         unsafeClear(message, field);
     }
 }

package/dist/esm/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
  */

package/dist/esm/from-binary.js

@@ -11,7 +11,8 @@
 // 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.
-import { LongType, ScalarType, scalarZeroValue } from "./reflect/scalar.js";
+import { ScalarType } from "./descriptors.js";
+import { scalarZeroValue } from "./reflect/scalar.js";
 import { reflect } from "./reflect/reflect.js";
 import { BinaryReader, WireType } from "./wire/binary-encoding.js";
 // Default options for parsing binary data.
@@ -40,7 +41,6 @@ export function fromBinary(messageDesc, bytes, options) {
  */
 export function mergeFromBinary(messageDesc, target, bytes, options) {
     readMessage(reflect(messageDesc, target), new BinaryReader(bytes), makeReadOptions(options), false, bytes.byteLength);
-    return target;
 }
 /**
  * If `delimited` is false, read the length given in `lengthOrDelimitedFieldNo`.
@@ -57,12 +57,12 @@ function readMessage(message, reader, options, delimited, lengthOrDelimitedField
     const unknownFields = (_a = message.getUnknown()) !== null && _a !== void 0 ? _a : [];
     while (reader.pos < end) {
         [fieldNo, wireType] = reader.tag();
-        if (wireType == WireType.EndGroup) {
+        if (delimited && wireType == WireType.EndGroup) {
             break;
         }
         const field = message.findNumber(fieldNo);
         if (!field) {
-            const data = reader.skip(wireType);
+            const data = reader.skip(wireType, fieldNo);
             if (options.readUnknownFields) {
                 unknownFields.push({ no: fieldNo, wireType, data });
             }
@@ -85,7 +85,7 @@ function readMessage(message, reader, options, delimited, lengthOrDelimitedField
 export function readField(message, reader, field, wireType, options) {
     switch (field.fieldKind) {
         case "scalar":
-            message.set(field, readScalar(reader, field.scalar, field.longType));
+            message.set(field, readScalar(reader, field.scalar));
             break;
         case "enum":
             message.set(field, readScalar(reader, ScalarType.INT32));
@@ -97,14 +97,12 @@ export function readField(message, reader, field, wireType, options) {
             readListField(message, reader, options, field, wireType);
             break;
         case "map":
-            // eslint-disable-next-line no-case-declarations
-            const [key, val] = readMapEntry(field, reader, options);
-            message.setMapEntry(field, key, val);
+            readMapEntry(message, field, reader, options);
             break;
     }
 }
 // Read a map field, expecting key field = 1, value field = 2
-function readMapEntry(field, reader, options) {
+function readMapEntry(message, field, reader, options) {
     let key, val;
     const end = reader.pos + reader.uint32();
     while (reader.pos < end) {
@@ -129,12 +127,12 @@ function readMapEntry(field, reader, options) {
         }
     }
     if (key === undefined) {
-        key = scalarZeroValue(field.mapKey, LongType.BIGINT);
+        key = scalarZeroValue(field.mapKey, false);
     }
     if (val === undefined) {
         switch (field.mapKind) {
             case "scalar":
-                val = scalarZeroValue(field.scalar, LongType.BIGINT);
+                val = scalarZeroValue(field.scalar, false);
                 break;
             case "enum":
                 val = field.enum.values[0].number;
@@ -144,7 +142,7 @@ function readMapEntry(field, reader, options) {
                 break;
         }
     }
-    return [key, val];
+    message.setMapEntry(field, key, val);
 }
 function readListField(message, reader, options, field, wireType) {
     var _a;
@@ -153,17 +151,16 @@ function readListField(message, reader, options, field, wireType) {
         return;
     }
     const scalarType = (_a = field.scalar) !== null && _a !== void 0 ? _a : ScalarType.INT32;
-    const longType = field.listKind == "scalar" ? field.longType : undefined;
     const packed = wireType == WireType.LengthDelimited &&
         scalarType != ScalarType.STRING &&
         scalarType != ScalarType.BYTES;
     if (!packed) {
-        message.addListItem(field, readScalar(reader, scalarType, longType));
+        message.addListItem(field, readScalar(reader, scalarType));
         return;
     }
     const e = reader.uint32() + reader.pos;
     while (reader.pos < e) {
-        message.addListItem(field, readScalar(reader, scalarType, longType));
+        message.addListItem(field, readScalar(reader, scalarType));
     }
 }
 function readMessageField(reader, options, field, mergeMessage) {
@@ -172,14 +169,7 @@ function readMessageField(reader, options, field, mergeMessage) {
     readMessage(message, reader, options, delimited, delimited ? field.number : reader.uint32());
     return message;
 }
-function readScalar(reader, type, longType) {
-    let v = readScalarValue(reader, type);
-    if (longType === LongType.STRING) {
-        v = typeof v == "bigint" ? v.toString() : v;
-    }
-    return v;
-}
-function readScalarValue(reader, type) {
+function readScalar(reader, type) {
     switch (type) {
         case ScalarType.STRING:
             return reader.string();

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

@@ -1,6 +1,6 @@
-import type { DescMessage } from "./desc-types.js";
+import { type DescMessage } from "./descriptors.js";
 import type { JsonValue } from "./json-value.js";
-import type { Registry } from "./reflect/registry.js";
+import type { Registry } from "./registry.js";
 import type { MessageShape } from "./types.js";
 /**
  * Options for parsing JSON data.
@@ -31,7 +31,7 @@ export declare function fromJsonString<Desc extends DescMessage>(messageDesc: De
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromJsonString<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: string, options?: Partial<JsonReadOptions>): MessageShape<Desc>;
+export declare function mergeFromJsonString<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: string, options?: Partial<JsonReadOptions>): void;
 /**
  * Parse a message from a JSON value.
  */
@@ -45,4 +45,4 @@ export declare function fromJson<Desc extends DescMessage>(messageDesc: Desc, js
  * If a message field is already present, it will be merged with the
  * new data.
  */
-export declare function mergeFromJson<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: JsonValue, options?: Partial<JsonReadOptions>): MessageShape<Desc>;
+export declare function mergeFromJson<Desc extends DescMessage>(messageDesc: Desc, target: MessageShape<Desc>, json: JsonValue, options?: Partial<JsonReadOptions>): void;