@bufbuild/protobuf 2.10.2 → 2.12.0

package/dist/cjs/clone.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/enum.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/extension.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/file.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/message.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/service.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/symbols.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv1/types.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/boot.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/embed.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/enum.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/extension.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/file.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/message.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/restore-json-names.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/scalar.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/service.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/symbols.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/codegenv2/types.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/create.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/descriptors.d.ts

@@ -114,7 +114,7 @@ export interface DescEnum {
      * A prefix shared by all enum values.
      * For example, `my_enum_` for `enum MyEnum {MY_ENUM_A=0; MY_ENUM_B=1;}`
      */
-    readonly sharedPrefix?: string;
+    readonly sharedPrefix?: string | undefined;
     /**
      * Marked as deprecated in the protobuf source.
      */
@@ -192,8 +192,8 @@ export interface DescMessage {
      */
     readonly oneofs: DescOneof[];
     /**
-     * Fields and oneof groups for this message, ordered by their appearance in the
-     * protobuf source.
+     * Standalone fields and oneof groups for this message, ordered by
+     * their appearance in the protobuf source.
      */
     readonly members: (DescField | DescOneof)[];
     /**
@@ -283,6 +283,13 @@ interface descFieldAndExtensionShared {
      * See https://protobuf.dev/programming-guides/field_presence/
      */
     readonly presence: SupportedFieldPresence;
+    /**
+     * Whether to reject invalid UTF-8 when reading this field from the binary
+     * wire format. Reflects the resolved `utf8_validation` feature: true for
+     * VERIFY (proto3 and editions 2023+ default), false for NONE (proto2
+     * default).
+     */
+    readonly utf8Validation: boolean;
     /**
      * The compiler-generated descriptor.
      */
@@ -620,8 +627,8 @@ export interface DescMethod {
  */
 export interface DescComments {
     readonly leadingDetached: readonly string[];
-    readonly leading?: string;
-    readonly trailing?: string;
+    readonly leading?: string | undefined;
+    readonly trailing?: string | undefined;
     readonly sourcePath: readonly number[];
 }
 export {};

package/dist/cjs/descriptors.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/equals.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/extensions.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/fields.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/from-binary.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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.
@@ -94,7 +94,7 @@ function readField(message, reader, field, wireType, options) {
     var _a;
     switch (field.fieldKind) {
         case "scalar":
-            message.set(field, readScalar(reader, field.scalar));
+            message.set(field, readScalar(reader, field.scalar, field.utf8Validation));
             break;
         case "enum":
             const val = readScalar(reader, descriptors_js_1.ScalarType.INT32);
@@ -144,12 +144,12 @@ function readMapEntry(reader, map, options) {
         const [fieldNo] = reader.tag();
         switch (fieldNo) {
             case 1:
-                key = readScalar(reader, field.mapKey);
+                key = readScalar(reader, field.mapKey, field.utf8Validation);
                 break;
             case 2:
                 switch (field.mapKind) {
                     case "scalar":
-                        val = readScalar(reader, field.scalar);
+                        val = readScalar(reader, field.scalar, field.utf8Validation);
                         break;
                     case "enum":
                         val = reader.int32();
@@ -191,12 +191,12 @@ function readListField(reader, wireType, list, options) {
         scalarType != descriptors_js_1.ScalarType.STRING &&
         scalarType != descriptors_js_1.ScalarType.BYTES;
     if (!packed) {
-        list.add(readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType, field.utf8Validation));
         return;
     }
     const e = reader.uint32() + reader.pos;
     while (reader.pos < e) {
-        list.add(readScalar(reader, scalarType));
+        list.add(readScalar(reader, scalarType, field.utf8Validation));
     }
 }
 function readMessageField(reader, options, field, mergeMessage) {
@@ -205,10 +205,10 @@ function readMessageField(reader, options, field, mergeMessage) {
     readMessage(message, reader, options, delimited, delimited ? field.number : reader.uint32());
     return message;
 }
-function readScalar(reader, type) {
+function readScalar(reader, type, validateUtf8 = false) {
     switch (type) {
         case descriptors_js_1.ScalarType.STRING:
-            return reader.string();
+            return reader.string(validateUtf8);
         case descriptors_js_1.ScalarType.BOOL:
             return reader.bool();
         case descriptors_js_1.ScalarType.DOUBLE:

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

@@ -16,7 +16,7 @@ export interface JsonReadOptions {
      * This option is required to read `google.protobuf.Any` and extensions
      * from JSON format.
      */
-    registry?: Registry;
+    registry?: Registry | undefined;
 }
 /**
  * Parse a message from a JSON string.

package/dist/cjs/from-json.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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.
@@ -25,7 +25,7 @@ const create_js_1 = require("./create.js");
 const reflect_js_1 = require("./reflect/reflect.js");
 const error_js_1 = require("./reflect/error.js");
 const reflect_check_js_1 = require("./reflect/reflect-check.js");
-const scalar_js_1 = require("./reflect/scalar.js");
+const names_js_1 = require("./reflect/names.js");
 const base64_encoding_js_1 = require("./wire/base64-encoding.js");
 const index_js_1 = require("./wkt/index.js");
 const extensions_js_1 = require("./extensions.js");
@@ -101,11 +101,7 @@ function mergeFromJson(schema, target, json, options) {
  * Parses an enum value from JSON.
  */
 function enumFromJson(descEnum, json) {
-    const val = readEnum(descEnum, json, false, false);
-    if (val === tokenIgnoredUnknownEnum) {
-        throw new Error(`cannot decode ${descEnum} from JSON: ${(0, reflect_check_js_1.formatVal)(json)}`);
-    }
-    return val;
+    return readEnum(descEnum, json, false);
 }
 /**
  * Is the given value a JSON enum value?
@@ -113,6 +109,18 @@ function enumFromJson(descEnum, json) {
 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)) {
@@ -122,12 +130,8 @@ function readMessage(msg, json, opts) {
         throw new Error(`cannot decode ${msg.desc} from JSON: ${(0, reflect_check_js_1.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") {
@@ -178,6 +182,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 = (0, reflect_js_1.reflect)(field.message);
+        readMessage(msgValue, json, opts);
+        return msgValue;
+    }
+    if (field.enum && !isResetSentinelNullValue(field, json)) {
+        return readEnum(field.enum, json, opts.ignoreUnknownFields);
+    }
+    throw new error_js_1.FieldError(field, `${field.fieldKind === "list" ? "list item" : "map value"} must not be null`);
+}
 function readMapField(map, json, opts) {
     if (json === null) {
         return;
@@ -187,28 +205,11 @@ function readMapField(map, json, opts) {
         throw new error_js_1.FieldError(field, "expected object, got " + (0, reflect_check_js_1.formatVal)(json));
     }
     for (const [jsonMapKey, jsonMapValue] of Object.entries(json)) {
-        if (jsonMapValue === null && !isSafeNullValueInListOrMap(field)) {
-            throw new error_js_1.FieldError(field, "map value must not be null");
-        }
-        let value;
-        switch (field.mapKind) {
-            case "message":
-                const msgValue = (0, reflect_js_1.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) {
@@ -220,34 +221,14 @@ function readListField(list, json, opts) {
         throw new error_js_1.FieldError(field, "expected Array, got " + (0, reflect_check_js_1.formatVal)(json));
     }
     for (const jsonItem of json) {
-        if (jsonItem === null && !isSafeNullValueInListOrMap(field)) {
-            throw new error_js_1.FieldError(field, "list item must not be null");
-        }
-        switch (field.listKind) {
-            case "message":
-                const msgValue = (0, reflect_js_1.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;
     }
@@ -256,30 +237,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":
@@ -299,14 +294,13 @@ function readEnum(desc, json, ignoreUnknownFields, nullAsZeroValue) {
     }
     throw new Error(`cannot decode ${desc} from JSON: ${(0, reflect_check_js_1.formatVal)(json)}`);
 }
-const tokenNull = Symbol();
-function scalarFromJson(field, json, nullAsZeroValue) {
-    if (json === null) {
-        if (nullAsZeroValue) {
-            return (0, scalar_js_1.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) {
@@ -379,24 +373,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 descriptors_js_1.ScalarType.BOOL:
-            switch (json) {
+            switch (jsonString) {
                 case "true":
                     return true;
                 case "false":
                     return false;
             }
-            return json;
+            return jsonString;
         case descriptors_js_1.ScalarType.INT32:
         case descriptors_js_1.ScalarType.FIXED32:
         case descriptors_js_1.ScalarType.UINT32:
         case descriptors_js_1.ScalarType.SFIXED32:
         case descriptors_js_1.ScalarType.SINT32:
-            return int32FromJson(json);
+            return int32FromJson(jsonString);
         default:
-            return json;
+            return jsonString;
     }
 }
 /**
@@ -467,7 +461,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;
             }
@@ -497,7 +491,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 = (0, reflect_js_1.reflect)(desc);
-    if (typeName.startsWith("google.protobuf.") &&
+    if ((0, index_js_1.hasCustomJsonRepresentation)(desc) &&
         Object.prototype.hasOwnProperty.call(json, "value")) {
         const value = json.value;
         readMessage(msg, value, opts);
@@ -565,14 +559,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 (0, names_js_1.protoSnakeCase)(path);
+    });
 }
 function structFromJson(struct, json) {
     if (typeof json != "object" || json == null || Array.isArray(json)) {

package/dist/cjs/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/is-message.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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/cjs/json-value.js

@@ -1,5 +1,5 @@
 "use strict";
-// 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.