@bufbuild/protobuf 2.10.2 → 2.12.0

package/dist/esm/from-json.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.
@@ -17,9 +17,9 @@ import { create } from "./create.js";
 import { reflect } from "./reflect/reflect.js";
 import { FieldError, isFieldError } from "./reflect/error.js";
 import { formatVal } from "./reflect/reflect-check.js";
-import { scalarZeroValue } from "./reflect/scalar.js";
+import { protoSnakeCase } from "./reflect/names.js";
 import { base64Decode } from "./wire/base64-encoding.js";
-import { isWrapperDesc, anyPack, ListValueSchema, NullValue, StructSchema, ValueSchema, } from "./wkt/index.js";
+import { hasCustomJsonRepresentation, isWrapperDesc, anyPack, ListValueSchema, NullValue, StructSchema, ValueSchema, } from "./wkt/index.js";
 import { createExtensionContainer, setExtension } from "./extensions.js";
 // Default options for parsing JSON.
 const jsonReadDefaults = {
@@ -93,11 +93,7 @@ export function mergeFromJson(schema, target, json, options) {
  * Parses an enum value from JSON.
  */
 export function enumFromJson(descEnum, json) {
-    const val = readEnum(descEnum, json, false, false);
-    if (val === tokenIgnoredUnknownEnum) {
-        throw new Error(`cannot decode ${descEnum} from JSON: ${formatVal(json)}`);
-    }
-    return val;
+    return readEnum(descEnum, json, false);
 }
 /**
  * Is the given value a JSON enum value?
@@ -105,6 +101,18 @@ export function enumFromJson(descEnum, json) {
 export function isEnumJson(descEnum, value) {
     return undefined !== descEnum.values.find((v) => v.name === value);
 }
+const messageJsonFields = new WeakMap();
+function getJsonField(desc, jsonKey) {
+    var _a;
+    if (!messageJsonFields.has(desc)) {
+        const jsonNames = new Map();
+        for (const field of desc.fields) {
+            jsonNames.set(field.name, field).set(field.jsonName, field);
+        }
+        messageJsonFields.set(desc, jsonNames);
+    }
+    return (_a = messageJsonFields.get(desc)) === null || _a === void 0 ? void 0 : _a.get(jsonKey);
+}
 function readMessage(msg, json, opts) {
     var _a;
     if (tryWktFromJson(msg, json, opts)) {
@@ -114,12 +122,8 @@ function readMessage(msg, json, opts) {
         throw new Error(`cannot decode ${msg.desc} from JSON: ${formatVal(json)}`);
     }
     const oneofSeen = new Map();
-    const jsonNames = new Map();
-    for (const field of msg.desc.fields) {
-        jsonNames.set(field.name, field).set(field.jsonName, field);
-    }
     for (const [jsonKey, jsonValue] of Object.entries(json)) {
-        const field = jsonNames.get(jsonKey);
+        const field = getJsonField(msg.desc, jsonKey);
         if (field) {
             if (field.oneof) {
                 if (jsonValue === null && field.fieldKind == "scalar") {
@@ -170,6 +174,20 @@ function readField(msg, field, json, opts) {
             break;
     }
 }
+function readListOrMapItem(field, json, opts) {
+    if (field.scalar && json !== null) {
+        return scalarFromJson(field, json);
+    }
+    if (field.message && !isResetSentinelNullValue(field, json)) {
+        const msgValue = reflect(field.message);
+        readMessage(msgValue, json, opts);
+        return msgValue;
+    }
+    if (field.enum && !isResetSentinelNullValue(field, json)) {
+        return readEnum(field.enum, json, opts.ignoreUnknownFields);
+    }
+    throw new FieldError(field, `${field.fieldKind === "list" ? "list item" : "map value"} must not be null`);
+}
 function readMapField(map, json, opts) {
     if (json === null) {
         return;
@@ -179,28 +197,11 @@ function readMapField(map, json, opts) {
         throw new FieldError(field, "expected object, got " + formatVal(json));
     }
     for (const [jsonMapKey, jsonMapValue] of Object.entries(json)) {
-        if (jsonMapValue === null && !isSafeNullValueInListOrMap(field)) {
-            throw new FieldError(field, "map value must not be null");
-        }
-        let value;
-        switch (field.mapKind) {
-            case "message":
-                const msgValue = reflect(field.message);
-                readMessage(msgValue, jsonMapValue, opts);
-                value = msgValue;
-                break;
-            case "enum":
-                value = readEnum(field.enum, jsonMapValue, opts.ignoreUnknownFields, true);
-                if (value === tokenIgnoredUnknownEnum) {
-                    return;
-                }
-                break;
-            case "scalar":
-                value = scalarFromJson(field, jsonMapValue, true);
-                break;
-        }
         const key = mapKeyFromJson(field.mapKey, jsonMapKey);
-        map.set(key, value);
+        const value = readListOrMapItem(field, jsonMapValue, opts);
+        if (value !== tokenIgnoredUnknownEnum) {
+            map.set(key, value);
+        }
     }
 }
 function readListField(list, json, opts) {
@@ -212,34 +213,14 @@ function readListField(list, json, opts) {
         throw new FieldError(field, "expected Array, got " + formatVal(json));
     }
     for (const jsonItem of json) {
-        if (jsonItem === null && !isSafeNullValueInListOrMap(field)) {
-            throw new FieldError(field, "list item must not be null");
-        }
-        switch (field.listKind) {
-            case "message":
-                const msgValue = reflect(field.message);
-                readMessage(msgValue, jsonItem, opts);
-                list.add(msgValue);
-                break;
-            case "enum":
-                const enumValue = readEnum(field.enum, jsonItem, opts.ignoreUnknownFields, true);
-                if (enumValue !== tokenIgnoredUnknownEnum) {
-                    list.add(enumValue);
-                }
-                break;
-            case "scalar":
-                list.add(scalarFromJson(field, jsonItem, true));
-                break;
+        const value = readListOrMapItem(field, jsonItem, opts);
+        if (value !== tokenIgnoredUnknownEnum) {
+            list.add(value);
         }
     }
 }
-function isSafeNullValueInListOrMap(field) {
-    var _a, _b;
-    return (((_a = field.message) === null || _a === void 0 ? void 0 : _a.typeName) == "google.protobuf.Value" ||
-        ((_b = field.enum) === null || _b === void 0 ? void 0 : _b.typeName) == "google.protobuf.NullValue");
-}
 function readMessageField(msg, field, json, opts) {
-    if (json === null && field.message.typeName != "google.protobuf.Value") {
+    if (isResetSentinelNullValue(field, json)) {
         msg.clear(field);
         return;
     }
@@ -248,30 +229,44 @@ function readMessageField(msg, field, json, opts) {
     msg.set(field, msgValue);
 }
 function readEnumField(msg, field, json, opts) {
-    const enumValue = readEnum(field.enum, json, opts.ignoreUnknownFields, false);
-    if (enumValue === tokenNull) {
+    if (isResetSentinelNullValue(field, json)) {
         msg.clear(field);
+        return;
     }
-    else if (enumValue !== tokenIgnoredUnknownEnum) {
+    const enumValue = readEnum(field.enum, json, opts.ignoreUnknownFields);
+    if (enumValue !== tokenIgnoredUnknownEnum) {
         msg.set(field, enumValue);
     }
 }
 function readScalarField(msg, field, json) {
-    const scalarValue = scalarFromJson(field, json, false);
-    if (scalarValue === tokenNull) {
+    if (json === null) {
         msg.clear(field);
     }
     else {
-        msg.set(field, scalarValue);
+        msg.set(field, scalarFromJson(field, json));
     }
 }
+/**
+ * Indicates whether a value is a sentinel for reseting a field.
+ *
+ * For this to be true, the value must be a JSON null and the field must not
+ * permit a present, Protobuf-serializable null.
+ *
+ * Only message google.protobuf.Value and enum google.protobuf.NullValue fields
+ * permit Protobuf-serializable nulls.
+ *
+ * Note that field-resetting sentinel nulls are not permitted in lists and maps.
+ */
+function isResetSentinelNullValue(field, json) {
+    var _a, _b;
+    return (json === null &&
+        ((_a = field.message) === null || _a === void 0 ? void 0 : _a.typeName) != "google.protobuf.Value" &&
+        ((_b = field.enum) === null || _b === void 0 ? void 0 : _b.typeName) != "google.protobuf.NullValue");
+}
 const tokenIgnoredUnknownEnum = Symbol();
-function readEnum(desc, json, ignoreUnknownFields, nullAsZeroValue) {
+function readEnum(desc, json, ignoreUnknownFields) {
     if (json === null) {
-        if (desc.typeName == "google.protobuf.NullValue") {
-            return 0; // google.protobuf.NullValue.NULL_VALUE = 0
-        }
-        return nullAsZeroValue ? desc.values[0].number : tokenNull;
+        return desc.values[0].number;
     }
     switch (typeof json) {
         case "number":
@@ -291,14 +286,13 @@ function readEnum(desc, json, ignoreUnknownFields, nullAsZeroValue) {
     }
     throw new Error(`cannot decode ${desc} from JSON: ${formatVal(json)}`);
 }
-const tokenNull = Symbol();
-function scalarFromJson(field, json, nullAsZeroValue) {
-    if (json === null) {
-        if (nullAsZeroValue) {
-            return scalarZeroValue(field.scalar, false);
-        }
-        return tokenNull;
-    }
+/**
+ * Try to parse a JSON value to a scalar value for the reflect API.
+ *
+ * Returns the input if the JSON value cannot be converted. Raises a FieldError
+ * if conversion would be ambiguous.
+ */
+function scalarFromJson(field, json) {
     // int64, sfixed64, sint64, fixed64, uint64: Reflect supports string and number.
     // string, bool: Supported by reflect.
     switch (field.scalar) {
@@ -371,24 +365,24 @@ function scalarFromJson(field, json, nullAsZeroValue) {
  *
  * Returns the input if the JSON value cannot be converted.
  */
-function mapKeyFromJson(type, json) {
+function mapKeyFromJson(type, jsonString) {
     switch (type) {
         case ScalarType.BOOL:
-            switch (json) {
+            switch (jsonString) {
                 case "true":
                     return true;
                 case "false":
                     return false;
             }
-            return json;
+            return jsonString;
         case ScalarType.INT32:
         case ScalarType.FIXED32:
         case ScalarType.UINT32:
         case ScalarType.SFIXED32:
         case ScalarType.SINT32:
-            return int32FromJson(json);
+            return int32FromJson(jsonString);
         default:
-            return json;
+            return jsonString;
     }
 }
 /**
@@ -459,7 +453,7 @@ function tryWktFromJson(msg, jsonValue, opts) {
                     msg.clear(valueField);
                 }
                 else {
-                    msg.set(valueField, scalarFromJson(valueField, jsonValue, true));
+                    msg.set(valueField, scalarFromJson(valueField, jsonValue));
                 }
                 return true;
             }
@@ -489,7 +483,7 @@ function anyFromJson(any, json, opts) {
         throw new Error(`cannot decode message ${any.$typeName} from JSON: ${typeUrl} is not in the type registry`);
     }
     const msg = reflect(desc);
-    if (typeName.startsWith("google.protobuf.") &&
+    if (hasCustomJsonRepresentation(desc) &&
         Object.prototype.hasOwnProperty.call(json, "value")) {
         const value = json.value;
         readMessage(msg, value, opts);
@@ -557,14 +551,12 @@ function fieldMaskFromJson(fieldMask, json) {
     if (json === "") {
         return;
     }
-    function camelToSnake(str) {
-        if (str.includes("_")) {
+    fieldMask.paths = json.split(",").map((path) => {
+        if (path.includes("_")) {
             throw new Error(`cannot decode message ${fieldMask.$typeName} from JSON: path names must be lowerCamelCase`);
         }
-        const sc = str.replace(/[A-Z]/g, (letter) => "_" + letter.toLowerCase());
-        return sc[0] === "_" ? sc.substring(1) : sc;
-    }
-    fieldMask.paths = json.split(",").map(camelToSnake);
+        return protoSnakeCase(path);
+    });
 }
 function structFromJson(struct, json) {
     if (typeof json != "object" || json == null || Array.isArray(json)) {

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/is-message.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/json-value.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/merge.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/proto-int64.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/error.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/guard.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/index.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/names.d.ts

@@ -9,8 +9,19 @@ export declare function qualifiedName(desc: AnyDesc): string;
 /**
  * Converts snake_case to protoCamelCase according to the convention
  * used by protoc to convert a field name to a JSON name.
+ *
+ * See https://protobuf.com/docs/language-spec#default-json-names
+ *
+ * The function protoSnakeCase provides the reverse.
  */
 export declare function protoCamelCase(snakeCase: string): string;
+/**
+ * Converts protoCamelCase to snake_case.
+ *
+ * This function is the reverse of function protoCamelCase. Note that some names
+ * are not reversible - for example, "foo__bar" -> "fooBar" -> "foo_bar".
+ */
+export declare function protoSnakeCase(lowerCamelCase: string): string;
 /**
  * Escapes names that are reserved for ECMAScript built-in object properties.
  *

package/dist/esm/reflect/names.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.
@@ -41,6 +41,10 @@ export function qualifiedName(desc) {
 /**
  * Converts snake_case to protoCamelCase according to the convention
  * used by protoc to convert a field name to a JSON name.
+ *
+ * See https://protobuf.com/docs/language-spec#default-json-names
+ *
+ * The function protoSnakeCase provides the reverse.
  */
 export function protoCamelCase(snakeCase) {
     let capNext = false;
@@ -75,6 +79,15 @@ export function protoCamelCase(snakeCase) {
     }
     return b.join("");
 }
+/**
+ * Converts protoCamelCase to snake_case.
+ *
+ * This function is the reverse of function protoCamelCase. Note that some names
+ * are not reversible - for example, "foo__bar" -> "fooBar" -> "foo_bar".
+ */
+export function protoSnakeCase(lowerCamelCase) {
+    return lowerCamelCase.replace(/[A-Z]/g, (letter) => "_" + letter.toLowerCase());
+}
 /**
  * Names that cannot be used for object properties because they are reserved
  * by built-in JavaScript properties.

package/dist/esm/reflect/nested-types.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/path.d.ts

@@ -89,7 +89,7 @@ export declare function buildPath(schema: DescMessage): PathBuilder;
  * paths that refer to an extension.
  */
 export declare function parsePath(schema: DescMessage, path: string, options?: {
-    registry?: Registry;
+    registry?: Registry | undefined;
 }): Path;
 /**
  * Stringify a path.

package/dist/esm/reflect/path.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/reflect-check.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/reflect-types.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/reflect.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/scalar.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/reflect/unsafe.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/registry.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.
@@ -191,6 +191,8 @@ function initBaseRegistry(inputs) {
 const EDITION_PROTO2 = 998;
 // bootstrap-inject google.protobuf.Edition.EDITION_PROTO3: const $name: Edition.$localName = $number;
 const EDITION_PROTO3 = 999;
+// bootstrap-inject google.protobuf.Edition.EDITION_UNSTABLE: const $name: Edition.$localName = $number;
+const EDITION_UNSTABLE = 9999;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Type.TYPE_STRING: const $name: FieldDescriptorProto_Type.$localName = $number;
 const TYPE_STRING = 9;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Type.TYPE_GROUP: const $name: FieldDescriptorProto_Type.$localName = $number;
@@ -221,9 +223,11 @@ const PACKED = 1;
 const DELIMITED = 2;
 // bootstrap-inject google.protobuf.FeatureSet.EnumType.OPEN: const $name: FeatureSet_EnumType.$localName = $number;
 const OPEN = 1;
+// bootstrap-inject google.protobuf.FeatureSet.Utf8Validation.VERIFY: const $name: FeatureSet_Utf8Validation.$localName = $number;
+const VERIFY = 2;
 // biome-ignore format: want this to read well
 // bootstrap-inject defaults: EDITION_PROTO2 to EDITION_2024: export const minimumEdition: SupportedEdition = $minimumEdition, maximumEdition: SupportedEdition = $maximumEdition;
-// generated from protoc v33.2
+// generated from protoc v34.0
 export const minimumEdition = 998, maximumEdition = 1001;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -562,6 +566,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         message: undefined,
         enum: undefined,
         presence: getFieldPresence(proto, oneof, isExtension, parentOrFile),
+        utf8Validation: isUtf8Validated(proto, parentOrFile),
         listKind: undefined,
         mapKind: undefined,
         mapKey: undefined,
@@ -690,6 +695,12 @@ function getFileEdition(proto) {
         case "proto3":
             return EDITION_PROTO3;
         case "editions":
+            // EDITION_UNSTABLE is a sandbox for in-development features. Collapse
+            // it to maximumEdition so SupportedEdition and feature resolution do
+            // not leak the test-only edition to users.
+            if (proto.edition === EDITION_UNSTABLE) {
+                return maximumEdition;
+            }
             if (proto.edition in featureDefaults) {
                 return proto.edition;
             }
@@ -885,6 +896,18 @@ function isDelimitedEncoding(proto, parent) {
             parent,
         }));
 }
+/**
+ * Reject invalid UTF-8 when reading string fields from the binary wire format?
+ * Driven by the resolved `utf8_validation` feature: VERIFY (proto3 / editions
+ * 2023+ default) enforces; NONE (proto2 default) does not.
+ */
+function isUtf8Validated(proto, parent) {
+    return (VERIFY ==
+        resolveFeature("utf8Validation", {
+            proto,
+            parent,
+        }));
+}
 function resolveFeature(name, ref) {
     var _a, _b;
     const featureSet = (_a = ref.proto.options) === null || _a === void 0 ? void 0 : _a.features;

package/dist/esm/to-binary.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

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

@@ -32,7 +32,7 @@ export interface JsonWriteOptions {
      * This option is required to write `google.protobuf.Any` and extensions
      * to JSON format.
      */
-    registry?: Registry;
+    registry?: Registry | undefined;
 }
 /**
  * Options for serializing to JSON.

package/dist/esm/to-json.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { ScalarType, } from "./descriptors.js";
-import { protoCamelCase } from "./reflect/names.js";
+import { protoCamelCase, protoSnakeCase } from "./reflect/names.js";
 import { reflect } from "./reflect/reflect.js";
 import { anyUnpack } from "./wkt/index.js";
-import { isWrapperDesc } from "./wkt/wrappers.js";
+import { hasCustomJsonRepresentation, isWrapperDesc } from "./wkt/wrappers.js";
 import { base64Encode } from "./wire/index.js";
 import { createExtensionContainer, getExtension } from "./extensions.js";
 import { checkField, formatVal } from "./reflect/reflect-check.js";
@@ -221,10 +221,12 @@ function scalarToJson(field, value) {
         case ScalarType.INT64:
         case ScalarType.SFIXED64:
         case ScalarType.SINT64:
-            if (typeof value != "bigint" && typeof value != "string") {
-                throw new Error(`cannot encode ${field} to JSON: ${(_e = checkField(field, value)) === null || _e === void 0 ? void 0 : _e.message}`);
+            if (typeof value == "bigint" ||
+                typeof value == "string" ||
+                (typeof value == "number" && Number.isInteger(value))) {
+                return value.toString();
             }
-            return value.toString();
+            throw new Error(`cannot encode ${field} to JSON: ${(_e = checkField(field, value)) === null || _e === void 0 ? void 0 : _e.message}`);
         // bytes: JSON value will be the data encoded as a string using standard base64 encoding with paddings.
         // Either standard or URL-safe base64 encoding with/without paddings are accepted.
         case ScalarType.BYTES:
@@ -281,13 +283,10 @@ function anyToJson(val, opts) {
     if (!desc || !message) {
         throw new Error(`cannot encode message ${val.$typeName} to JSON: "${val.typeUrl}" is not in the type registry`);
     }
-    let json = reflectToJson(reflect(desc, message), opts);
-    if (desc.typeName.startsWith("google.protobuf.") ||
-        json === null ||
-        Array.isArray(json) ||
-        typeof json !== "object") {
-        json = { value: json };
-    }
+    const reflected = reflect(desc, message);
+    const json = hasCustomJsonRepresentation(desc)
+        ? { value: tryWktToJson(reflected, opts) }
+        : reflectToJson(reflected, opts);
     json["@type"] = val.typeUrl;
     return json;
 }
@@ -320,10 +319,8 @@ function durationToJson(val) {
 function fieldMaskToJson(val) {
     return val.paths
         .map((p) => {
-        if (p.match(/_[0-9]?_/g) || p.match(/[A-Z]/g)) {
-            throw new Error(`cannot encode message ${val.$typeName} to JSON: lowerCamelCase of path name "` +
-                p +
-                '" is irreversible');
+        if (protoSnakeCase(protoCamelCase(p)) !== p) {
+            throw new Error(`cannot encode message ${val.$typeName} to JSON: lowerCamelCase of path name "${p}" is irreversible`);
         }
         return protoCamelCase(p);
     })

package/dist/esm/types.d.ts

@@ -15,7 +15,7 @@ export type Message<TypeName extends string = string> = {
     /**
      * Unknown fields and extensions stored on the message.
      */
-    $unknown?: UnknownField[];
+    $unknown?: UnknownField[] | undefined;
 };
 /**
  * Extract the message type from a message descriptor.

package/dist/esm/types.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.

package/dist/esm/wire/base64-encoding.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2025 Buf Technologies, Inc.
+// Copyright 2021-2026 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.