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

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

@@ -13,6 +13,9 @@
 // limitations under the License.
 import { protoCamelCase } from "../reflect/names.js";
 import { unsafeIsSetExplicit } from "../reflect/unsafe.js";
+/**
+ * @private
+ */
 export function restoreJsonNames(message) {
     for (const f of message.field) {
         if (!unsafeIsSetExplicit(f, "jsonName")) {

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

@@ -11,7 +11,13 @@
 // 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.
+/**
+ * @private
+ */
 export const packageName = "@bufbuild/protobuf";
+/**
+ * @private
+ */
 export const wktPublicImportPaths = {
     "google/protobuf/compiler/plugin.proto": packageName + "/wkt",
     "google/protobuf/any.proto": packageName + "/wkt",
@@ -26,6 +32,9 @@ export const wktPublicImportPaths = {
     "google/protobuf/type.proto": packageName + "/wkt",
     "google/protobuf/wrappers.proto": packageName + "/wkt",
 };
+/**
+ * @private
+ */
 // prettier-ignore
 export const symbols = {
     isMessage: { typeOnly: false, bootstrapWktFrom: "../../is-message.js", from: packageName },

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

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { isMessage } from "./is-message.js";
-import { localName } from "./reflect/names.js";
 import { LongType, ScalarType, scalarZeroValue } from "./reflect/scalar.js";
 import { FieldError } from "./reflect/error.js";
 import { isObject } from "./reflect/guard.js";
@@ -20,8 +19,6 @@ import { unsafeGet, unsafeOneofCase, unsafeSet } from "./reflect/unsafe.js";
 import { isWrapperDesc } from "./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;
 /**
@@ -45,7 +42,7 @@ export function create(messageDesc, init) {
  */
 function initMessage(messageDesc, message, init) {
     for (const member of messageDesc.members) {
-        let value = init[localName(member)];
+        let value = init[member.localName];
         if (value == null) {
             // intentionally ignore undefined and null
             continue;
@@ -143,17 +140,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[localName(member)] = createZeroField(member);
         }
     }
     else {
@@ -180,12 +169,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[localName(member)] = createZeroField(member);
+                prototype[member.localName] = createZeroField(member);
             }
             messagePrototypes.set(desc, { prototype, members });
         }
@@ -204,7 +193,7 @@ function createZeroMessage(desc) {
                     }
                 }
             }
-            msg[localName(member)] = createZeroField(member);
+            msg[member.localName] = createZeroField(member);
         }
     }
     msg.$typeName = desc.typeName;

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

@@ -14,7 +14,6 @@
 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 +60,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 +85,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,15 +133,15 @@ 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;

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 "./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/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.js

@@ -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) {
@@ -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.js

@@ -16,10 +16,10 @@ import { protoInt64 } from "./proto-int64.js";
 import { create } from "./create.js";
 import { reflect } from "./reflect/reflect.js";
 import { formatVal } from "./reflect/reflect-check.js";
-import { scalarZeroValue, LongType, ScalarType, } from "./reflect/scalar.js";
+import { LongType, ScalarType, scalarZeroValue, } from "./reflect/scalar.js";
 import { base64Decode } from "./wire/base64-encoding.js";
 import { getTextEncoding } from "./wire/text-encoding.js";
-import { ListValueDesc, NullValue, StructDesc, ValueDesc, anyPack, } from "./wkt/index.js";
+import { anyPack, ListValueDesc, NullValue, StructDesc, ValueDesc, } from "./wkt/index.js";
 import { isWrapperDesc } from "./wkt/wrappers.js";
 import { createExtensionContainer, setExtension } from "./extensions.js";
 // Default options for parsing JSON.
@@ -168,7 +168,7 @@ function readMapField(msg, field, json, opts) {
                 break;
             case "scalar":
                 try {
-                    msg.setMapEntry(field, key, readScalar(field.scalar, jsonMapValue, LongType.BIGINT, true));
+                    msg.setMapEntry(field, key, readScalar(field.scalar, jsonMapValue, true));
                 }
                 catch (e) {
                     let m = `cannot decode map value for field ${msg.desc.typeName}.${field.name} from JSON: ${formatVal(jsonMapValue)}`;
@@ -206,7 +206,7 @@ function readListField(msg, field, json, opts) {
                 break;
             case "scalar":
                 try {
-                    msg.addListItem(field, readScalar(field.scalar, jsonItem, field.longType, true));
+                    msg.addListItem(field, readScalar(field.scalar, jsonItem, true));
                 }
                 catch (e) {
                     let m = `cannot decode field ${msg.desc.typeName}.${field.name} from JSON: ${formatVal(jsonItem)}`;
@@ -239,7 +239,7 @@ function readEnumField(msg, field, json, opts) {
 }
 function readScalarField(msg, field, json) {
     try {
-        const scalarValue = readScalar(field.scalar, json, field.longType, false);
+        const scalarValue = readScalar(field.scalar, json, false);
         if (scalarValue === tokenNull) {
             msg.clear(field);
         }
@@ -267,7 +267,7 @@ function readMapKey(type, json) {
                 break;
         }
     }
-    return readScalar(type, json, LongType.BIGINT, true);
+    return readScalar(type, json, true);
 }
 const tokenIgnoredUnknownEnum = Symbol();
 function readEnum(desc, json, ignoreUnknownFields, nullAsZeroValue) {
@@ -297,10 +297,10 @@ function readEnum(desc, json, ignoreUnknownFields, nullAsZeroValue) {
     throw new Error(`cannot decode enum ${desc.typeName} from JSON: ${formatVal(json)}`);
 }
 const tokenNull = Symbol();
-function readScalar(type, json, longType, nullAsZeroValue) {
+function readScalar(type, json, nullAsZeroValue) {
     if (json === null) {
         if (nullAsZeroValue) {
-            return scalarZeroValue(type, longType);
+            return scalarZeroValue(type, LongType.BIGINT);
         }
         return tokenNull;
     }
@@ -366,16 +366,12 @@ function readScalar(type, json, longType, nullAsZeroValue) {
         case ScalarType.SINT64:
             if (typeof json != "number" && typeof json != "string")
                 break;
-            const long = protoInt64.parse(json);
-            // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-            return longType ? long.toString() : long;
+            return protoInt64.parse(json);
         case ScalarType.FIXED64:
         case ScalarType.UINT64:
             if (typeof json != "number" && typeof json != "string")
                 break;
-            const uLong = protoInt64.uParse(json);
-            // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-            return longType ? uLong.toString() : uLong;
+            return protoInt64.uParse(json);
         // bool:
         case ScalarType.BOOL:
             if (typeof json !== "boolean")
@@ -443,7 +439,7 @@ function tryWktFromJson(msg, jsonValue, opts) {
                     msg.clear(valueField);
                 }
                 else {
-                    msg.set(valueField, readScalar(valueField.scalar, jsonValue, valueField.longType, true));
+                    msg.set(valueField, readScalar(valueField.scalar, jsonValue, true));
                 }
                 return true;
             }

package/dist/esm/index.d.ts

@@ -12,5 +12,5 @@ export { fromBinary, mergeFromBinary } from "./from-binary.js";
 export type { BinaryReadOptions } from "./from-binary.js";
 export * from "./to-json.js";
 export * from "./from-json.js";
-export { hasExtension, getExtension, setExtension, clearExtension, } from "./extensions.js";
+export { hasExtension, getExtension, setExtension, clearExtension, hasOption, getOption, } from "./extensions.js";
 export * from "./proto-int64.js";

package/dist/esm/index.js

@@ -22,5 +22,5 @@ export { toBinary } from "./to-binary.js";
 export { fromBinary, mergeFromBinary } from "./from-binary.js";
 export * from "./to-json.js";
 export * from "./from-json.js";
-export { hasExtension, getExtension, setExtension, clearExtension, } from "./extensions.js";
+export { hasExtension, getExtension, setExtension, clearExtension, hasOption, getOption, } from "./extensions.js";
 export * from "./proto-int64.js";