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

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

@@ -11,11 +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 { 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.
  *
@@ -200,8 +200,6 @@ const TYPE_BYTES = 12;
 const TYPE_ENUM = 14;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Label.LABEL_REPEATED: const $name: FieldDescriptorProto_Label.$localName = $number;
 const LABEL_REPEATED = 3;
-// bootstrap-inject google.protobuf.FieldDescriptorProto.Label.LABEL_OPTIONAL: const $name: FieldDescriptorProto_Label.$localName = $number;
-const LABEL_OPTIONAL = 1;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Label.LABEL_REQUIRED: const $name: FieldDescriptorProto_Label.$localName = $number;
 const LABEL_REQUIRED = 2;
 // bootstrap-inject google.protobuf.FieldOptions.JSType.JS_STRING: const $name: FieldOptions_JSType.$localName = $number;
@@ -210,6 +208,8 @@ const JS_STRING = 1;
 const IDEMPOTENCY_UNKNOWN = 0;
 // 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;
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.LEGACY_REQUIRED: const $name: FeatureSet_FieldPresence.$localName = $number;
 const LEGACY_REQUIRED = 3;
 // bootstrap-inject google.protobuf.FeatureSet.RepeatedFieldEncoding.PACKED: const $name: FeatureSet_RepeatedFieldEncoding.$localName = $number;
@@ -220,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-rc1
+// generated from protoc v27.0
 export const minimumEdition = 998, maximumEdition = 1000;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -261,7 +261,7 @@ function addFile(proto, reg) {
         proto,
         deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
         edition: getFileEdition(proto),
-        name: proto.name.replace(/\.proto/, ""),
+        name: proto.name.replace(/\.proto$/, ""),
         dependencies: findFileDependencies(proto, reg),
         enums: [],
         messages: [],
@@ -269,7 +269,7 @@ function addFile(proto, reg) {
         services: [],
         toString() {
             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- we asserted above
-            return `file ${this.proto.name}`;
+            return `file ${proto.name}`;
         },
     };
     const mapEntriesStore = new Map();
@@ -340,6 +340,7 @@ function addFields(message, reg, mapEntries) {
         const oneof = findOneof(proto, allOneofs);
         const field = newField(proto, message, reg, oneof, mapEntries);
         message.fields.push(field);
+        message.field[field.localName] = field;
         if (oneof === undefined) {
             message.members.push(field);
         }
@@ -364,6 +365,7 @@ function addFields(message, reg, mapEntries) {
  */
 function addEnum(proto, file, parent, reg) {
     var _a, _b, _c;
+    const sharedPrefix = findEnumSharedPrefix(proto.name, proto.value);
     const desc = {
         kind: "enum",
         proto,
@@ -374,7 +376,7 @@ function addEnum(proto, file, parent, reg) {
         name: proto.name,
         typeName: makeTypeName(proto, parent, file),
         values: [],
-        sharedPrefix: findEnumSharedPrefix(proto.name, proto.value.map((v) => v.name)),
+        sharedPrefix,
         toString() {
             return `enum ${this.typeName}`;
         },
@@ -383,12 +385,14 @@ function addEnum(proto, file, parent, reg) {
     reg.add(desc);
     proto.value.forEach((proto) => {
         var _a, _b;
+        const name = proto.name;
         desc.values.push({
             kind: "enum_value",
             proto,
             deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
             parent: desc,
             name: proto.name,
+            localName: safeObjectProperty(sharedPrefix == undefined ? name : name.substring(sharedPrefix.length)),
             number: proto.number,
             toString() {
                 return `enum value ${desc.typeName}.${this.name}`;
@@ -412,6 +416,7 @@ function addMessage(proto, file, parent, reg, mapEntries) {
         name: proto.name,
         typeName: makeTypeName(proto, parent, file),
         fields: [],
+        field: {},
         oneofs: [],
         members: [],
         nestedEnums: [],
@@ -449,6 +454,7 @@ function addService(proto, file, reg) {
         name: proto.name,
         typeName: makeTypeName(proto, undefined, file),
         methods: [],
+        method: {},
         toString() {
             return `service ${this.typeName}`;
         },
@@ -456,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;
     }
 }
 /**
@@ -488,6 +496,9 @@ function newMethod(proto, parent, reg) {
         deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
         parent,
         name,
+        localName: safeObjectProperty(name.length
+            ? safeObjectProperty(name[0].toLowerCase() + name.substring(1))
+            : name),
         methodKind,
         input,
         output,
@@ -508,6 +519,7 @@ function newOneof(proto, parent) {
         parent,
         fields: [],
         name: proto.name,
+        localName: safeObjectProperty(protoCamelCase(proto.name)),
         toString() {
             return `oneof ${parent.typeName}.${this.name}`;
         },
@@ -515,7 +527,9 @@ function newOneof(proto, parent) {
 }
 function newField(proto, parentOrFile, reg, oneof, mapEntries) {
     var _a, _b, _c;
+    const isExtension = mapEntries === undefined;
     const field = {
+        kind: "field",
         proto,
         deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
         name: proto.name,
@@ -523,8 +537,16 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         scalar: undefined,
         message: undefined,
         enum: undefined,
+        presence: getFieldPresence(proto, oneof, isExtension, parentOrFile),
+        listKind: undefined,
+        mapKind: undefined,
+        mapKey: undefined,
+        delimitedEncoding: undefined,
+        packed: undefined,
+        longAsString: false,
+        getDefaultValue: undefined,
     };
-    if (mapEntries === undefined) {
+    if (isExtension) {
         // extension field
         const file = parentOrFile.kind == "file" ? parentOrFile : parentOrFile.file;
         const parent = parentOrFile.kind == "file" ? undefined : parentOrFile;
@@ -544,9 +566,11 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         // regular field
         const parent = parentOrFile;
         assert(parent.kind == "message");
-        field.kind = "field";
         field.parent = parent;
         field.oneof = oneof;
+        field.localName = oneof
+            ? protoCamelCase(proto.name)
+            : safeObjectProperty(protoCamelCase(proto.name));
         field.jsonName = proto.jsonName;
         field.toString = () => `field ${parent.typeName}.${proto.name}`;
     }
@@ -561,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.proto.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
@@ -596,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);
@@ -628,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)
@@ -637,8 +652,6 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
             break;
         }
     }
-    field.presence = getFieldPresence(proto, oneof, parentOrFile);
-    field.optional = isOptionalField(field);
     return field;
 }
 /**
@@ -677,13 +690,13 @@ function findFileDependencies(proto, reg) {
  * Finds a prefix shared by enum values, for example `my_enum_` for
  * `enum MyEnum {MY_ENUM_A=0; MY_ENUM_B=1;}`.
  */
-function findEnumSharedPrefix(enumName, valueNames) {
+function findEnumSharedPrefix(enumName, values) {
     const prefix = camelToSnakeCase(enumName) + "_";
-    for (const name of valueNames) {
-        if (!name.toLowerCase().startsWith(prefix)) {
+    for (const value of values) {
+        if (!value.name.toLowerCase().startsWith(prefix)) {
             return undefined;
         }
-        const shortName = name.substring(prefix.length);
+        const shortName = value.name.substring(prefix.length);
         if (shortName.length == 0) {
             return undefined;
         }
@@ -755,39 +768,28 @@ function findOneof(proto, allOneofs) {
  * Presence of the field.
  * See https://protobuf.dev/programming-guides/field_presence/
  */
-function getFieldPresence(proto, oneof, parent) {
+function getFieldPresence(proto, oneof, isExtension, parent) {
     if (proto.label == LABEL_REQUIRED) {
         // proto2 required is LEGACY_REQUIRED
         return LEGACY_REQUIRED;
     }
-    const { edition } = parent.kind == "message" ? parent.file : parent;
-    if (edition == EDITION_PROTO3) {
-        // proto3 oneof and optional are explicit
-        if (oneof != undefined || proto.proto3Optional) {
-            return EXPLICIT;
-        }
-        // proto3 singular message is explicit
-        const singularMessage = proto.label != LABEL_REPEATED && proto.type == TYPE_MESSAGE;
-        if (singularMessage) {
-            return EXPLICIT;
-        }
+    if (proto.label == LABEL_REPEATED) {
+        // repeated fields (including maps) do not track presence
+        return IMPLICIT;
     }
-    // also resolves proto2/proto3 defaults
-    return resolveFeature("fieldPresence", { proto, parent });
-}
-/**
- * Did the user use the `optional` keyword?
- */
-function isOptionalField(field) {
-    const edition = (field.kind == "extension" ? field.file : field.parent.file)
-        .edition;
-    if (edition == EDITION_PROTO2) {
-        return !field.oneof && field.proto.label == LABEL_OPTIONAL;
+    if (!!oneof || proto.proto3Optional) {
+        // oneof is always explicit
+        return EXPLICIT;
     }
-    if (edition == EDITION_PROTO3) {
-        return field.proto.proto3Optional;
+    if (proto.type == TYPE_MESSAGE) {
+        // singular message field cannot be implicit
+        return EXPLICIT;
     }
-    return false;
+    if (isExtension) {
+        // extensions always track presence
+        return EXPLICIT;
+    }
+    return resolveFeature("fieldPresence", { proto, parent });
 }
 /**
  * Pack this repeated field?
@@ -816,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/
@@ -863,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.
@@ -30,9 +30,7 @@ function writeFields(writer, opts, msg) {
     var _a;
     for (const f of msg.sortedFields) {
         if (!msg.isSet(f)) {
-            if (f.fieldKind != "map" &&
-                f.fieldKind != "list" &&
-                f.presence == LEGACY_REQUIRED) {
+            if (f.presence == LEGACY_REQUIRED) {
                 throw new Error(`cannot encode field ${msg.desc.typeName}.${f.name} to binary: required field not set`);
             }
             continue;

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.FieldDescriptorProto.Label.LABEL_OPTIONAL: const $name: FieldDescriptorProto_Label.$localName = $number;
-const LABEL_OPTIONAL = 1;
+// 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,
 };
@@ -55,15 +56,11 @@ function reflectToJson(msg, opts) {
     const json = {};
     for (const f of msg.sortedFields) {
         if (!msg.isSet(f)) {
-            if (f.fieldKind != "map" &&
-                f.fieldKind != "list" &&
-                f.presence == LEGACY_REQUIRED) {
-                throw new Error(`cannot encode field ${msg.desc.typeName}.${f.name} to binary: required field not set`);
+            if (f.presence == LEGACY_REQUIRED) {
+                throw new Error(`cannot encode field ${msg.desc.typeName}.${f.name} to JSON: required field not set`);
             }
-            if (!opts.emitDefaultValues) {
-                continue;
-            }
-            if (!canEmitFieldDefaultValue(f)) {
+            if (!opts.alwaysEmitImplicit || f.presence !== IMPLICIT) {
+                // Fields with implicit presence omit zero values (e.g. empty string) by default
                 continue;
             }
         }
@@ -85,8 +82,8 @@ function reflectToJson(msg, opts) {
                 continue;
             }
             const value = getExtension(msg.message, extension);
-            const [, field] = createExtensionContainer(extension);
-            const jsonValue = fieldToJson(field, value, opts);
+            const [container, field] = createExtensionContainer(extension, value);
+            const jsonValue = fieldToJson(field, container.get(field), opts);
             if (jsonValue !== undefined) {
                 json[extension.jsonName] = jsonValue;
             }
@@ -97,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":
@@ -114,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":
@@ -130,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();
@@ -138,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":
@@ -152,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;
     }
@@ -166,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";
@@ -191,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:
@@ -203,31 +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);
-    }
-}
-// Decide whether an unset field should be emitted with JSON write option `emitDefaultValues`
-function canEmitFieldDefaultValue(field) {
-    switch (true) {
-        // oneof fields are never emitted
-        case field.oneof !== undefined:
-        // singular message field are allowed to emit JSON null, but we do not
-        // eslint-disable-next-line no-fallthrough
-        case field.fieldKind === "message":
-        // the field uses explicit presence, so we cannot emit a zero value
-        // eslint-disable-next-line no-fallthrough
-        case field.proto.label === LABEL_OPTIONAL:
-            return false;
-        default:
-            return true;
+            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) {
@@ -256,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;
     }
@@ -290,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) {
@@ -314,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');
         }
@@ -357,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";
 /**