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

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

@@ -14,11 +14,11 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.maximumEdition = exports.minimumEdition = exports.createFileRegistry = exports.createRegistry = void 0;
-const assert_js_1 = require("./assert.js");
-const text_format_js_1 = require("../wire/text-format.js");
-const scalar_js_1 = require("./scalar.js");
-const nested_types_js_1 = require("./nested-types.js");
-const unsafe_js_1 = require("./unsafe.js");
+const descriptors_js_1 = require("./descriptors.js");
+const text_format_js_1 = require("./wire/text-format.js");
+const nested_types_js_1 = require("./reflect/nested-types.js");
+const unsafe_js_1 = require("./reflect/unsafe.js");
+const names_js_1 = require("./reflect/names.js");
 /**
  * Create a registry from the given inputs.
  *
@@ -205,8 +205,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;
@@ -215,6 +213,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;
@@ -225,7 +225,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
 exports.minimumEdition = 998, exports.maximumEdition = 1000;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -266,7 +266,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: [],
@@ -274,7 +274,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();
@@ -284,7 +284,7 @@ function addFile(proto, reg) {
         },
         add(desc) {
             var _a;
-            (0, assert_js_1.assert)(((_a = desc.proto.options) === null || _a === void 0 ? void 0 : _a.mapEntry) === true);
+            assert(((_a = desc.proto.options) === null || _a === void 0 ? void 0 : _a.mapEntry) === true);
             mapEntriesStore.set(desc.typeName, desc);
         },
     };
@@ -345,6 +345,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);
         }
@@ -369,6 +370,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,
@@ -379,7 +381,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}`;
         },
@@ -388,12 +390,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: (0, names_js_1.safeObjectProperty)(sharedPrefix == undefined ? name : name.substring(sharedPrefix.length)),
             number: proto.number,
             toString() {
                 return `enum value ${desc.typeName}.${this.name}`;
@@ -417,6 +421,7 @@ function addMessage(proto, file, parent, reg, mapEntries) {
         name: proto.name,
         typeName: makeTypeName(proto, parent, file),
         fields: [],
+        field: {},
         oneofs: [],
         members: [],
         nestedEnums: [],
@@ -454,6 +459,7 @@ function addService(proto, file, reg) {
         name: proto.name,
         typeName: makeTypeName(proto, undefined, file),
         methods: [],
+        method: {},
         toString() {
             return `service ${this.typeName}`;
         },
@@ -461,7 +467,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;
     }
 }
 /**
@@ -484,8 +492,8 @@ function newMethod(proto, parent, reg) {
     }
     const input = reg.getMessage(trimLeadingDot(proto.inputType));
     const output = reg.getMessage(trimLeadingDot(proto.outputType));
-    (0, assert_js_1.assert)(input, `invalid MethodDescriptorProto: input_type ${proto.inputType} not found`);
-    (0, assert_js_1.assert)(output, `invalid MethodDescriptorProto: output_type ${proto.inputType} not found`);
+    assert(input, `invalid MethodDescriptorProto: input_type ${proto.inputType} not found`);
+    assert(output, `invalid MethodDescriptorProto: output_type ${proto.inputType} not found`);
     const name = proto.name;
     return {
         kind: "rpc",
@@ -493,6 +501,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: (0, names_js_1.safeObjectProperty)(name.length
+            ? (0, names_js_1.safeObjectProperty)(name[0].toLowerCase() + name.substring(1))
+            : name),
         methodKind,
         input,
         output,
@@ -513,6 +524,7 @@ function newOneof(proto, parent) {
         parent,
         fields: [],
         name: proto.name,
+        localName: (0, names_js_1.safeObjectProperty)((0, names_js_1.protoCamelCase)(proto.name)),
         toString() {
             return `oneof ${parent.typeName}.${this.name}`;
         },
@@ -520,7 +532,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,
@@ -528,8 +542,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;
@@ -542,16 +564,18 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         field.jsonName = `[${typeName}]`; // option json_name is not allowed on extension fields
         field.toString = () => `extension ${typeName}`;
         const extendee = reg.getMessage(trimLeadingDot(proto.extendee));
-        (0, assert_js_1.assert)(extendee, `invalid FieldDescriptorProto: extendee ${proto.extendee} not found`);
+        assert(extendee, `invalid FieldDescriptorProto: extendee ${proto.extendee} not found`);
         field.extendee = extendee;
     }
     else {
         // regular field
         const parent = parentOrFile;
-        (0, assert_js_1.assert)(parent.kind == "message");
-        field.kind = "field";
+        assert(parent.kind == "message");
         field.parent = parent;
         field.oneof = oneof;
+        field.localName = oneof
+            ? (0, names_js_1.protoCamelCase)(proto.name)
+            : (0, names_js_1.safeObjectProperty)((0, names_js_1.protoCamelCase)(proto.name));
         field.jsonName = proto.jsonName;
         field.toString = () => `field ${parent.typeName}.${proto.name}`;
     }
@@ -566,21 +590,13 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         if (mapEntry) {
             // map field
             field.fieldKind = "map";
-            const keyField = mapEntry.fields.find((f) => f.number === 1);
-            (0, assert_js_1.assert)(keyField);
-            (0, assert_js_1.assert)(keyField.fieldKind == "scalar");
-            (0, assert_js_1.assert)(keyField.scalar != scalar_js_1.ScalarType.BYTES &&
-                keyField.scalar != scalar_js_1.ScalarType.FLOAT &&
-                keyField.scalar != scalar_js_1.ScalarType.DOUBLE);
-            const valueField = mapEntry.fields.find((f) => f.proto.number === 2);
-            (0, assert_js_1.assert)(valueField);
-            (0, assert_js_1.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
@@ -590,19 +606,18 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
             case TYPE_GROUP:
                 field.listKind = "message";
                 field.message = reg.getMessage(trimLeadingDot(proto.typeName));
-                (0, assert_js_1.assert)(field.message);
+                assert(field.message);
                 field.delimitedEncoding = isDelimitedEncoding(proto, parentOrFile);
                 break;
             case TYPE_ENUM:
                 field.listKind = "enum";
                 field.enum = reg.getEnum(trimLeadingDot(proto.typeName));
-                (0, assert_js_1.assert)(field.enum);
+                assert(field.enum);
                 break;
             default:
                 field.listKind = "scalar";
                 field.scalar = type;
-                field.longType =
-                    jstype == JS_STRING ? scalar_js_1.LongType.STRING : scalar_js_1.LongType.BIGINT;
+                field.longAsString = jstype == JS_STRING;
                 break;
         }
         field.packed = isPackedField(proto, parentOrFile);
@@ -614,13 +629,13 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         case TYPE_GROUP:
             field.fieldKind = "message";
             field.message = reg.getMessage(trimLeadingDot(proto.typeName));
-            (0, assert_js_1.assert)(field.message, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
+            assert(field.message, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
             field.delimitedEncoding = isDelimitedEncoding(proto, parentOrFile);
             field.getDefaultValue = () => undefined;
             break;
         case TYPE_ENUM: {
             const enumeration = reg.getEnum(trimLeadingDot(proto.typeName));
-            (0, assert_js_1.assert)(enumeration !== undefined, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
+            assert(enumeration !== undefined, `invalid FieldDescriptorProto: type_name ${proto.typeName} not found`);
             field.fieldKind = "enum";
             field.enum = reg.getEnum(trimLeadingDot(proto.typeName));
             field.getDefaultValue = () => {
@@ -633,7 +648,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         default: {
             field.fieldKind = "scalar";
             field.scalar = type;
-            field.longType = jstype == JS_STRING ? scalar_js_1.LongType.STRING : scalar_js_1.LongType.BIGINT;
+            field.longAsString = jstype == JS_STRING;
             field.getDefaultValue = () => {
                 return (0, unsafe_js_1.unsafeIsSetExplicit)(proto, "defaultValue")
                     ? (0, text_format_js_1.parseTextFormatScalarValue)(type, proto.defaultValue)
@@ -642,8 +657,6 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
             break;
         }
     }
-    field.presence = getFieldPresence(proto, oneof, parentOrFile);
-    field.optional = isOptionalField(field);
     return field;
 }
 /**
@@ -682,13 +695,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;
         }
@@ -753,46 +766,35 @@ function findOneof(proto, allOneofs) {
         return undefined;
     }
     const oneof = allOneofs[proto.oneofIndex];
-    (0, assert_js_1.assert)(oneof, `invalid FieldDescriptorProto: oneof #${proto.oneofIndex} for field #${proto.number} not found`);
+    assert(oneof, `invalid FieldDescriptorProto: oneof #${proto.oneofIndex} for field #${proto.number} not found`);
     return oneof;
 }
 /**
  * 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?
@@ -821,6 +823,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 != descriptors_js_1.ScalarType.BYTES &&
+        key.scalar != descriptors_js_1.ScalarType.FLOAT &&
+        key.scalar != descriptors_js_1.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/
@@ -868,3 +886,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/cjs/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/cjs/to-binary.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeField = exports.toBinary = void 0;
 const reflect_js_1 = require("./reflect/reflect.js");
 const binary_encoding_js_1 = require("./wire/binary-encoding.js");
-const scalar_js_1 = require("./reflect/scalar.js");
+const descriptors_js_1 = require("./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.
@@ -34,9 +34,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;
@@ -58,7 +56,7 @@ function writeField(writer, opts, msg, field) {
     switch (field.fieldKind) {
         case "scalar":
         case "enum":
-            writeScalar(writer, (_a = field.scalar) !== null && _a !== void 0 ? _a : scalar_js_1.ScalarType.INT32, field.number, msg.get(field));
+            writeScalar(writer, (_a = field.scalar) !== null && _a !== void 0 ? _a : descriptors_js_1.ScalarType.INT32, field.number, msg.get(field));
             break;
         case "list":
             writeListField(writer, opts, field, msg.get(field));
@@ -93,7 +91,7 @@ function writeListField(writer, opts, field, list) {
         }
         return;
     }
-    const scalarType = (_a = field.scalar) !== null && _a !== void 0 ? _a : scalar_js_1.ScalarType.INT32;
+    const scalarType = (_a = field.scalar) !== null && _a !== void 0 ? _a : descriptors_js_1.ScalarType.INT32;
     if (field.packed) {
         if (!list.size) {
             return;
@@ -118,7 +116,7 @@ function writeMapEntry(writer, opts, field, key, value) {
     switch (field.mapKind) {
         case "scalar":
         case "enum":
-            writeScalar(writer, (_a = field.scalar) !== null && _a !== void 0 ? _a : scalar_js_1.ScalarType.INT32, 2, value);
+            writeScalar(writer, (_a = field.scalar) !== null && _a !== void 0 ? _a : descriptors_js_1.ScalarType.INT32, 2, value);
             break;
         case "message":
             writeFields(writer.tag(2, binary_encoding_js_1.WireType.LengthDelimited).fork(), opts, value).join();
@@ -128,65 +126,65 @@ function writeMapEntry(writer, opts, field, key, value) {
 }
 function writeScalarValue(writer, type, value) {
     switch (type) {
-        case scalar_js_1.ScalarType.STRING:
+        case descriptors_js_1.ScalarType.STRING:
             writer.string(value);
             break;
-        case scalar_js_1.ScalarType.BOOL:
+        case descriptors_js_1.ScalarType.BOOL:
             writer.bool(value);
             break;
-        case scalar_js_1.ScalarType.DOUBLE:
+        case descriptors_js_1.ScalarType.DOUBLE:
             writer.double(value);
             break;
-        case scalar_js_1.ScalarType.FLOAT:
+        case descriptors_js_1.ScalarType.FLOAT:
             writer.float(value);
             break;
-        case scalar_js_1.ScalarType.INT32:
+        case descriptors_js_1.ScalarType.INT32:
             writer.int32(value);
             break;
-        case scalar_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.INT64:
             writer.int64(value);
             break;
-        case scalar_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.UINT64:
             writer.uint64(value);
             break;
-        case scalar_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.FIXED64:
             writer.fixed64(value);
             break;
-        case scalar_js_1.ScalarType.BYTES:
+        case descriptors_js_1.ScalarType.BYTES:
             writer.bytes(value);
             break;
-        case scalar_js_1.ScalarType.FIXED32:
+        case descriptors_js_1.ScalarType.FIXED32:
             writer.fixed32(value);
             break;
-        case scalar_js_1.ScalarType.SFIXED32:
+        case descriptors_js_1.ScalarType.SFIXED32:
             writer.sfixed32(value);
             break;
-        case scalar_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.SFIXED64:
             writer.sfixed64(value);
             break;
-        case scalar_js_1.ScalarType.SINT64:
+        case descriptors_js_1.ScalarType.SINT64:
             writer.sint64(value);
             break;
-        case scalar_js_1.ScalarType.UINT32:
+        case descriptors_js_1.ScalarType.UINT32:
             writer.uint32(value);
             break;
-        case scalar_js_1.ScalarType.SINT32:
+        case descriptors_js_1.ScalarType.SINT32:
             writer.sint32(value);
             break;
     }
 }
 function writeTypeOfScalar(type) {
     switch (type) {
-        case scalar_js_1.ScalarType.BYTES:
-        case scalar_js_1.ScalarType.STRING:
+        case descriptors_js_1.ScalarType.BYTES:
+        case descriptors_js_1.ScalarType.STRING:
             return binary_encoding_js_1.WireType.LengthDelimited;
-        case scalar_js_1.ScalarType.DOUBLE:
-        case scalar_js_1.ScalarType.FIXED64:
-        case scalar_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.DOUBLE:
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.SFIXED64:
             return binary_encoding_js_1.WireType.Bit64;
-        case scalar_js_1.ScalarType.FIXED32:
-        case scalar_js_1.ScalarType.SFIXED32:
-        case scalar_js_1.ScalarType.FLOAT:
+        case descriptors_js_1.ScalarType.FIXED32:
+        case descriptors_js_1.ScalarType.SFIXED32:
+        case descriptors_js_1.ScalarType.FLOAT:
             return binary_encoding_js_1.WireType.Bit32;
         default:
             return binary_encoding_js_1.WireType.Varint;

package/dist/cjs/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