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

package/dist/esm/reflect/scalar.js

@@ -12,72 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { protoInt64 } from "../proto-int64.js";
-import { getTextEncoding } from "../wire/text-encoding.js";
-/**
- * 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 = {}));
-/**
- * JavaScript representation of fields with 64 bit integral types (int64, uint64,
- * sint64, fixed64, sfixed64).
- *
- * This is a subset of google.protobuf.FieldOptions.JSType, which defines JS_NORMAL,
- * JS_STRING, and JS_NUMBER. Protobuf-ES uses BigInt by default, but will use
- * String if `[jstype = JS_STRING]` is specified.
- *
- * ```protobuf
- * uint64 field_a = 1; // BigInt
- * uint64 field_b = 2 [jstype = JS_NORMAL]; // BigInt
- * uint64 field_b = 2 [jstype = JS_NUMBER]; // BigInt
- * uint64 field_b = 2 [jstype = JS_STRING]; // String
- * ```
- */
-export var LongType;
-(function (LongType) {
-    /**
-     * Use JavaScript BigInt.
-     */
-    LongType[LongType["BIGINT"] = 0] = "BIGINT";
-    /**
-     * Use JavaScript String.
-     *
-     * Field option `[jstype = JS_STRING]`.
-     */
-    LongType[LongType["STRING"] = 1] = "STRING";
-})(LongType || (LongType = {}));
+import { ScalarType } from "../descriptors.js";
 /**
  * Returns true if both scalar values are equal.
  */
@@ -119,27 +54,27 @@ export function scalarEquals(type, a, b) {
 /**
  * Returns the zero value for the given scalar type.
  */
-export function scalarZeroValue(type, longType) {
+export function scalarZeroValue(type, longAsString) {
     switch (type) {
+        case ScalarType.STRING:
+            return "";
         case ScalarType.BOOL:
             return false;
-        case ScalarType.UINT64:
-        case ScalarType.FIXED64:
-        case ScalarType.INT64:
-        case ScalarType.SFIXED64:
-        case ScalarType.SINT64:
-            return (longType == 0 ? protoInt64.zero : "0");
+        default:
+            // Handles INT32, UINT32, SINT32, FIXED32, SFIXED32.
+            // We do not use individual cases to save a few bytes code size.
+            return 0;
         case ScalarType.DOUBLE:
         case ScalarType.FLOAT:
             return 0.0;
+        case ScalarType.INT64:
+        case ScalarType.UINT64:
+        case ScalarType.SFIXED64:
+        case ScalarType.FIXED64:
+        case ScalarType.SINT64:
+            return (longAsString ? "0" : protoInt64.zero);
         case ScalarType.BYTES:
             return new Uint8Array(0);
-        case ScalarType.STRING:
-            return "";
-        default:
-            // Handles INT32, UINT32, SINT32, FIXED32, SFIXED32.
-            // We do not use individual cases to save a few bytes code size.
-            return 0;
     }
 }
 /**
@@ -161,129 +96,3 @@ export function isScalarZeroValue(type, value) {
             return value == 0; // Loose comparison matches 0n, 0 and "0"
     }
 }
-const FLOAT32_MAX = 3.4028234663852886e38, FLOAT32_MIN = -3.4028234663852886e38, UINT32_MAX = 0xffffffff, INT32_MAX = 0x7fffffff, INT32_MIN = -0x80000000;
-// TODO this checks UTF-8 validity
-export function checkScalarValue(value, scalar) {
-    switch (scalar) {
-        case ScalarType.DOUBLE:
-            return typeof value == "number";
-        case ScalarType.FLOAT:
-            if (typeof value != "number") {
-                return false;
-            }
-            if (Number.isNaN(value) || !Number.isFinite(value)) {
-                return true;
-            }
-            if (value > FLOAT32_MAX || value < FLOAT32_MIN) {
-                return `${value.toFixed()} out of range`;
-            }
-            return true;
-        case ScalarType.INT32:
-        case ScalarType.SFIXED32:
-        case ScalarType.SINT32:
-            // signed
-            if (typeof value !== "number" || !Number.isInteger(value)) {
-                return false;
-            }
-            if (value > INT32_MAX || value < INT32_MIN) {
-                return `${value.toFixed()} out of range`;
-            }
-            return true;
-        case ScalarType.FIXED32:
-        case ScalarType.UINT32:
-            // unsigned
-            if (typeof value !== "number" || !Number.isInteger(value)) {
-                return false;
-            }
-            if (value > UINT32_MAX || value < 0) {
-                return `${value.toFixed()} out of range`;
-            }
-            return true;
-        case ScalarType.BOOL:
-            return typeof value == "boolean";
-        case ScalarType.STRING:
-            if (typeof value != "string") {
-                return false;
-            }
-            return getTextEncoding().checkUtf8(value) || "invalid UTF8";
-        case ScalarType.BYTES:
-            return value instanceof Uint8Array;
-        case ScalarType.INT64:
-        case ScalarType.SFIXED64:
-        case ScalarType.SINT64:
-            // signed
-            if (typeof value != "string" &&
-                typeof value !== "bigint" &&
-                typeof value !== "number") {
-                return false;
-            }
-            try {
-                protoInt64.parse(value);
-            }
-            catch (e) {
-                return `${value} out of range`;
-            }
-            return true;
-        case ScalarType.FIXED64:
-        case ScalarType.UINT64:
-            // unsigned
-            if (typeof value != "string" &&
-                typeof value !== "bigint" &&
-                typeof value !== "number") {
-                return false;
-            }
-            try {
-                protoInt64.uParse(value);
-            }
-            catch (e) {
-                return `${value} out of range`;
-            }
-            return true;
-    }
-}
-export function scalarTypeDescription(scalar) {
-    switch (scalar) {
-        case ScalarType.STRING:
-            return "string";
-        case ScalarType.BOOL:
-            return "boolean";
-        case ScalarType.INT64:
-        case ScalarType.SINT64:
-        case ScalarType.SFIXED64:
-            return "bigint (int64)";
-        case ScalarType.UINT64:
-        case ScalarType.FIXED64:
-            return "bigint (uint64)";
-        case ScalarType.BYTES:
-            return "Uint8Array";
-        case ScalarType.DOUBLE:
-            return "number (float64)";
-        case ScalarType.FLOAT:
-            return "number (float32)";
-        case ScalarType.FIXED32:
-        case ScalarType.UINT32:
-            return "number (uint32)";
-        case ScalarType.INT32:
-        case ScalarType.SFIXED32:
-        case ScalarType.SINT32:
-            return "number (int32)";
-    }
-}
-export function scalarTypeScriptType(scalar, long) {
-    switch (scalar) {
-        case ScalarType.STRING:
-            return "string";
-        case ScalarType.BOOL:
-            return "boolean";
-        case ScalarType.UINT64:
-        case ScalarType.SFIXED64:
-        case ScalarType.FIXED64:
-        case ScalarType.SINT64:
-        case ScalarType.INT64:
-            return long == LongType.STRING ? "string" : "bigint";
-        case ScalarType.BYTES:
-            return "Uint8Array";
-        default:
-            return "number";
-    }
-}

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

@@ -1,4 +1,4 @@
-import type { DescField, DescOneof } from "../desc-types.js";
+import type { DescField, DescOneof } from "../descriptors.js";
 export declare const unsafeLocal: unique symbol;
 /**
  * Return the selected field of a oneof group.

package/dist/esm/reflect/unsafe.js

@@ -132,7 +132,7 @@ field) {
                 target[name] = field.enum.values[0].number;
                 break;
             case "scalar":
-                target[name] = scalarZeroValue(field.scalar, field.longType);
+                target[name] = scalarZeroValue(field.scalar, field.longAsString);
                 break;
         }
     }

package/dist/esm/{reflect/registry.d.ts → registry.d.ts}

@@ -1,5 +1,5 @@
-import type { FileDescriptorProto, FileDescriptorSet } from "../wkt/gen/google/protobuf/descriptor_pb.js";
-import type { DescEnum, DescExtension, DescFile, DescMessage, DescService, SupportedEdition } from "../desc-types.js";
+import type { FileDescriptorProto, FileDescriptorSet } from "./wkt/gen/google/protobuf/descriptor_pb.js";
+import { type DescEnum, type DescExtension, type DescFile, type DescMessage, type DescService, type SupportedEdition } from "./descriptors.js";
 /**
  * A set of descriptors for messages, enumerations, extensions,
  * and services.

package/dist/esm/{reflect/registry.js → registry.js}

@@ -11,12 +11,11 @@
 // 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 "./assert.js";
-import { parseTextFormatEnumValue, parseTextFormatScalarValue, } from "../wire/text-format.js";
-import { LongType, ScalarType } from "./scalar.js";
-import { nestedTypes } from "./nested-types.js";
-import { unsafeIsSetExplicit } from "./unsafe.js";
-import { protoCamelCase, safeObjectProperty } from "./names.js";
+import { ScalarType, } from "./descriptors.js";
+import { parseTextFormatEnumValue, parseTextFormatScalarValue, } from "./wire/text-format.js";
+import { nestedTypes } from "./reflect/nested-types.js";
+import { unsafeIsSetExplicit } from "./reflect/unsafe.js";
+import { protoCamelCase, safeObjectProperty } from "./reflect/names.js";
 /**
  * Create a registry from the given inputs.
  *
@@ -221,7 +220,7 @@ const DELIMITED = 2;
 const OPEN = 1;
 // prettier-ignore
 // bootstrap-inject defaults: EDITION_PROTO2 to EDITION_2023: export const minimumEdition: SupportedEdition = $minimumEdition, maximumEdition: SupportedEdition = $maximumEdition;
-// generated from protoc v27.0-rc2
+// generated from protoc v27.0
 export const minimumEdition = 998, maximumEdition = 1000;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -455,6 +454,7 @@ function addService(proto, file, reg) {
         name: proto.name,
         typeName: makeTypeName(proto, undefined, file),
         methods: [],
+        method: {},
         toString() {
             return `service ${this.typeName}`;
         },
@@ -462,7 +462,9 @@ function addService(proto, file, reg) {
     file.services.push(desc);
     reg.add(desc);
     for (const methodProto of proto.method) {
-        desc.methods.push(newMethod(methodProto, desc, reg));
+        const method = newMethod(methodProto, desc, reg);
+        desc.methods.push(method);
+        desc.method[method.localName] = method;
     }
 }
 /**
@@ -541,7 +543,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         mapKey: undefined,
         delimitedEncoding: undefined,
         packed: undefined,
-        longType: undefined,
+        longAsString: false,
         getDefaultValue: undefined,
     };
     if (isExtension) {
@@ -583,21 +585,13 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         if (mapEntry) {
             // map field
             field.fieldKind = "map";
-            const keyField = mapEntry.fields.find((f) => f.number === 1);
-            assert(keyField);
-            assert(keyField.fieldKind == "scalar");
-            assert(keyField.scalar != ScalarType.BYTES &&
-                keyField.scalar != ScalarType.FLOAT &&
-                keyField.scalar != ScalarType.DOUBLE);
-            const valueField = mapEntry.fields.find((f) => f.number === 2);
-            assert(valueField);
-            assert(valueField.fieldKind != "list" && valueField.fieldKind != "map");
-            field.mapKey = keyField.scalar;
-            field.mapKind = valueField.fieldKind;
-            field.message = valueField.message;
+            const { key, value } = findMapEntryFields(mapEntry);
+            field.mapKey = key.scalar;
+            field.mapKind = value.fieldKind;
+            field.message = value.message;
             field.delimitedEncoding = false; // map fields are always LENGTH_PREFIXED
-            field.enum = valueField.enum;
-            field.scalar = valueField.scalar;
+            field.enum = value.enum;
+            field.scalar = value.scalar;
             return field;
         }
         // list field
@@ -618,8 +612,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
             default:
                 field.listKind = "scalar";
                 field.scalar = type;
-                field.longType =
-                    jstype == JS_STRING ? LongType.STRING : LongType.BIGINT;
+                field.longAsString = jstype == JS_STRING;
                 break;
         }
         field.packed = isPackedField(proto, parentOrFile);
@@ -650,7 +643,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         default: {
             field.fieldKind = "scalar";
             field.scalar = type;
-            field.longType = jstype == JS_STRING ? LongType.STRING : LongType.BIGINT;
+            field.longAsString = jstype == JS_STRING;
             field.getDefaultValue = () => {
                 return unsafeIsSetExplicit(proto, "defaultValue")
                     ? parseTextFormatScalarValue(type, proto.defaultValue)
@@ -825,6 +818,22 @@ function isPackedField(proto, parent) {
             parent,
         }));
 }
+/**
+ * Find the key and value fields of a synthetic map entry message.
+ */
+function findMapEntryFields(mapEntry) {
+    const key = mapEntry.fields.find((f) => f.number === 1);
+    const value = mapEntry.fields.find((f) => f.number === 2);
+    assert(key &&
+        key.fieldKind == "scalar" &&
+        key.scalar != ScalarType.BYTES &&
+        key.scalar != ScalarType.FLOAT &&
+        key.scalar != ScalarType.DOUBLE &&
+        value &&
+        value.fieldKind != "list" &&
+        value.fieldKind != "map");
+    return { key, value };
+}
 /**
  * Enumerations can be open or closed.
  * See https://protobuf.dev/programming-guides/enum/
@@ -872,3 +881,12 @@ function resolveFeature(name, ref) {
     }
     return resolveFeature(name, ref.parent);
 }
+/**
+ * Assert that condition is truthy or throw error (with message)
+ */
+function assert(condition, msg) {
+    // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions -- we want the implicit conversion to boolean
+    if (!condition) {
+        throw new Error(msg);
+    }
+}

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

@@ -1,6 +1,6 @@
 import type { MessageShape } from "./types.js";
 import { BinaryWriter } from "./wire/binary-encoding.js";
-import type { DescField, DescMessage } from "./desc-types.js";
+import { type DescField, type DescMessage } from "./descriptors.js";
 import type { ReflectMessage } from "./reflect/index.js";
 /**
  * Options for serializing to binary data.

package/dist/esm/to-binary.js

@@ -13,7 +13,7 @@
 // limitations under the License.
 import { reflect } from "./reflect/reflect.js";
 import { BinaryWriter, WireType } from "./wire/binary-encoding.js";
-import { ScalarType } from "./reflect/scalar.js";
+import { ScalarType } from "./descriptors.js";
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.LEGACY_REQUIRED: const $name: FeatureSet_FieldPresence.$localName = $number;
 const LEGACY_REQUIRED = 3;
 // Default options for serializing binary data.

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

@@ -1,17 +1,18 @@
-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 serializing to JSON.
  */
 export interface JsonWriteOptions {
     /**
-     * Emit fields with default values: Fields with default values are omitted
-     * by default in proto3 JSON output. This option overrides this behavior
-     * and outputs fields with their default values.
+     * By default, fields with implicit presence are not serialized if they are
+     * unset. For example, an empty list field or a proto3 int32 field with 0 is
+     * not serialized. With this option enabled, such fields are included in the
+     * output.
      */
-    emitDefaultValues: boolean;
+    alwaysEmitImplicit: boolean;
     /**
      * Emit enum values as integers instead of strings: The name of an enum
      * value is used by default in JSON output. An option may be provided to

package/dist/esm/to-json.js

@@ -11,21 +11,22 @@
 // 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 { ScalarType, } from "./descriptors.js";
 import { protoCamelCase } from "./reflect/names.js";
 import { reflect } from "./reflect/reflect.js";
-import { ScalarType } from "./reflect/scalar.js";
 import { anyUnpack } from "./wkt/index.js";
 import { 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";
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.LEGACY_REQUIRED: const $name: FeatureSet_FieldPresence.$localName = $number;
 const LEGACY_REQUIRED = 3;
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.IMPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
 const IMPLICIT = 2;
 // Default options for serializing to JSON.
 const jsonWriteDefaults = {
-    emitDefaultValues: false,
+    alwaysEmitImplicit: false,
     enumAsInteger: false,
     useProtoFieldName: false,
 };
@@ -56,9 +57,9 @@ function reflectToJson(msg, opts) {
     for (const f of msg.sortedFields) {
         if (!msg.isSet(f)) {
             if (f.presence == LEGACY_REQUIRED) {
-                throw new Error(`cannot encode field ${msg.desc.typeName}.${f.name} to binary: required field not set`);
+                throw new Error(`cannot encode field ${msg.desc.typeName}.${f.name} to JSON: required field not set`);
             }
-            if (!opts.emitDefaultValues || f.presence !== IMPLICIT) {
+            if (!opts.alwaysEmitImplicit || f.presence !== IMPLICIT) {
                 // Fields with implicit presence omit zero values (e.g. empty string) by default
                 continue;
             }
@@ -93,7 +94,7 @@ function reflectToJson(msg, opts) {
 function fieldToJson(f, val, opts) {
     switch (f.fieldKind) {
         case "scalar":
-            return scalarToJson(f.scalar, val);
+            return scalarToJson(f, val);
         case "message":
             return reflectToJson(val, opts);
         case "enum":
@@ -110,7 +111,7 @@ function mapToJson(map, opts) {
     switch (f.mapKind) {
         case "scalar":
             for (const [entryKey, entryValue] of map) {
-                jsonObj[entryKey.toString()] = scalarToJson(f.scalar, entryValue); // JSON standard allows only (double quoted) string as property key
+                jsonObj[entryKey.toString()] = scalarToJson(f, entryValue); // JSON standard allows only (double quoted) string as property key
             }
             break;
         case "message":
@@ -126,7 +127,7 @@ function mapToJson(map, opts) {
             }
             break;
     }
-    return opts.emitDefaultValues || map.size > 0 ? jsonObj : undefined;
+    return opts.alwaysEmitImplicit || map.size > 0 ? jsonObj : undefined;
 }
 function listToJson(list, opts) {
     const f = list.field();
@@ -134,7 +135,7 @@ function listToJson(list, opts) {
     switch (f.listKind) {
         case "scalar":
             for (const item of list) {
-                jsonArr.push(scalarToJson(f.scalar, item));
+                jsonArr.push(scalarToJson(f, item));
             }
             break;
         case "enum":
@@ -148,11 +149,13 @@ function listToJson(list, opts) {
             }
             break;
     }
-    return opts.emitDefaultValues || jsonArr.length > 0 ? jsonArr : undefined;
+    return opts.alwaysEmitImplicit || jsonArr.length > 0 ? jsonArr : undefined;
 }
 function enumToJson(desc, value, enumAsInteger) {
     var _a;
-    assert(typeof value == "number");
+    if (typeof value != "number") {
+        throw new Error(`cannot encode ${desc} to JSON: expected number, got ${formatVal(value)}`);
+    }
     if (desc.typeName == "google.protobuf.NullValue") {
         return null;
     }
@@ -162,23 +165,27 @@ function enumToJson(desc, value, enumAsInteger) {
     const val = desc.values.find((v) => v.number == value);
     return (_a = val === null || val === void 0 ? void 0 : val.name) !== null && _a !== void 0 ? _a : value; // if we don't know the enum value, just return the number
 }
-function scalarToJson(type, value) {
-    switch (type) {
+function scalarToJson(field, value) {
+    var _a, _b, _c, _d, _e, _f;
+    switch (field.scalar) {
         // int32, fixed32, uint32: JSON value will be a decimal number. Either numbers or strings are accepted.
         case ScalarType.INT32:
         case ScalarType.SFIXED32:
         case ScalarType.SINT32:
         case ScalarType.FIXED32:
         case ScalarType.UINT32:
-            assert(typeof value == "number");
+            if (typeof value != "number") {
+                throw new Error(`cannot encode ${field} to JSON: ${(_a = checkField(field, value)) === null || _a === void 0 ? void 0 : _a.message}`);
+            }
             return value;
         // float, double: JSON value will be a number or one of the special string values "NaN", "Infinity", and "-Infinity".
         // Either numbers or strings are accepted. Exponent notation is also accepted.
         case ScalarType.FLOAT:
-        // assertFloat32(value);
         case ScalarType.DOUBLE: // eslint-disable-line no-fallthrough
-            assert(typeof value == "number");
-            if (Number.isNaN(value))
+            if (typeof value != "number") {
+                throw new Error(`cannot encode ${field} to JSON: ${(_b = checkField(field, value)) === null || _b === void 0 ? void 0 : _b.message}`);
+            }
+            if (isNaN(value))
                 return "NaN";
             if (value === Number.POSITIVE_INFINITY)
                 return "Infinity";
@@ -187,11 +194,15 @@ function scalarToJson(type, value) {
             return value;
         // string:
         case ScalarType.STRING:
-            assert(typeof value == "string");
+            if (typeof value != "string") {
+                throw new Error(`cannot encode ${field} to JSON: ${(_c = checkField(field, value)) === null || _c === void 0 ? void 0 : _c.message}`);
+            }
             return value;
         // bool:
         case ScalarType.BOOL:
-            assert(typeof value == "boolean");
+            if (typeof value != "boolean") {
+                throw new Error(`cannot encode ${field} to JSON: ${(_d = checkField(field, value)) === null || _d === void 0 ? void 0 : _d.message}`);
+            }
             return value;
         // JSON value will be a decimal string. Either numbers or strings are accepted.
         case ScalarType.UINT64:
@@ -199,15 +210,17 @@ function scalarToJson(type, value) {
         case ScalarType.INT64:
         case ScalarType.SFIXED64:
         case ScalarType.SINT64:
-            assert(typeof value == "bigint" ||
-                typeof value == "string" ||
-                typeof value == "number");
+            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}`);
+            }
             return value.toString();
         // 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:
-            assert(value instanceof Uint8Array);
-            return base64Encode(value);
+            if (value instanceof Uint8Array) {
+                return base64Encode(value);
+            }
+            throw new Error(`cannot encode ${field} to JSON: ${(_f = checkField(field, value)) === null || _f === void 0 ? void 0 : _f.message}`);
     }
 }
 function jsonName(f, opts) {
@@ -236,7 +249,7 @@ function tryWktToJson(msg, opts) {
         default:
             if (isWrapperDesc(msg.desc)) {
                 const valueField = msg.desc.fields[0];
-                return scalarToJson(valueField.scalar, msg.get(valueField));
+                return scalarToJson(valueField, msg.get(valueField));
             }
             return undefined;
     }
@@ -270,7 +283,7 @@ function anyToJson(val, opts) {
 function durationToJson(val) {
     if (Number(val.seconds) > 315576000000 ||
         Number(val.seconds) < -315576000000) {
-        throw new Error(`cannot encode ${val.$typeName} to JSON: value out of range`);
+        throw new Error(`cannot encode message ${val.$typeName} to JSON: value out of range`);
     }
     let text = val.seconds.toString();
     if (val.nanos !== 0) {
@@ -294,7 +307,7 @@ function fieldMaskToJson(val) {
         .map((p) => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         if (p.match(/_[0-9]?_/g) || p.match(/[A-Z]/g)) {
-            throw new Error(`cannot encode ${val.$typeName} to JSON: lowerCamelCase of path name "` +
+            throw new Error(`cannot encode message ${val.$typeName} to JSON: lowerCamelCase of path name "` +
                 p +
                 '" is irreversible');
         }
@@ -337,10 +350,10 @@ function timestampToJson(val) {
     const ms = Number(val.seconds) * 1000;
     if (ms < Date.parse("0001-01-01T00:00:00Z") ||
         ms > Date.parse("9999-12-31T23:59:59Z")) {
-        throw new Error(`cannot encode ${val.$typeName} to JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);
+        throw new Error(`cannot encode message ${val.$typeName} to JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);
     }
     if (val.nanos < 0) {
-        throw new Error(`cannot encode ${val.$typeName} to JSON: nanos must not be negative`);
+        throw new Error(`cannot encode message ${val.$typeName} to JSON: nanos must not be negative`);
     }
     let z = "Z";
     if (val.nanos > 0) {

package/dist/esm/types.d.ts

@@ -1,5 +1,5 @@
 import type { GenDescEnum, GenDescExtension, GenDescMessage } from "./codegenv1/types.js";
-import type { DescEnum, DescExtension, DescMessage } from "./desc-types.js";
+import type { DescEnum, DescExtension, DescMessage } from "./descriptors.js";
 import type { OneofADT } from "./reflect/guard.js";
 import type { WireType } from "./wire/index.js";
 /**