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

package/dist/cjs/reflect/scalar.js

@@ -13,74 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scalarTypeScriptType = exports.scalarTypeDescription = exports.checkScalarValue = exports.isScalarZeroValue = exports.scalarZeroValue = exports.scalarEquals = exports.LongType = exports.ScalarType = void 0;
+exports.isScalarZeroValue = exports.scalarZeroValue = exports.scalarEquals = void 0;
 const proto_int64_js_1 = require("../proto-int64.js");
-const text_encoding_js_1 = require("../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.
- */
-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 || (exports.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
- * ```
- */
-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 || (exports.LongType = LongType = {}));
+const descriptors_js_1 = require("../descriptors.js");
 /**
  * Returns true if both scalar values are equal.
  */
@@ -90,7 +25,7 @@ function scalarEquals(type, a, b) {
         return true;
     }
     // Special case BYTES - we need to compare each byte individually
-    if (type == ScalarType.BYTES) {
+    if (type == descriptors_js_1.ScalarType.BYTES) {
         if (!(a instanceof Uint8Array) || !(b instanceof Uint8Array)) {
             return false;
         }
@@ -107,11 +42,11 @@ function scalarEquals(type, a, b) {
     // Special case 64-bit integers - we support number, string and bigint representation.
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (type) {
-        case ScalarType.UINT64:
-        case ScalarType.FIXED64:
-        case ScalarType.INT64:
-        case ScalarType.SFIXED64:
-        case ScalarType.SINT64:
+        case descriptors_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.SINT64:
             // Loose comparison will match between 0n, 0 and "0".
             return a == b;
     }
@@ -123,27 +58,27 @@ exports.scalarEquals = scalarEquals;
 /**
  * Returns the zero value for the given scalar type.
  */
-function scalarZeroValue(type, longType) {
+function scalarZeroValue(type, longAsString) {
     switch (type) {
-        case ScalarType.BOOL:
-            return false;
-        case ScalarType.UINT64:
-        case ScalarType.FIXED64:
-        case ScalarType.INT64:
-        case ScalarType.SFIXED64:
-        case ScalarType.SINT64:
-            return (longType == 0 ? proto_int64_js_1.protoInt64.zero : "0");
-        case ScalarType.DOUBLE:
-        case ScalarType.FLOAT:
-            return 0.0;
-        case ScalarType.BYTES:
-            return new Uint8Array(0);
-        case ScalarType.STRING:
+        case descriptors_js_1.ScalarType.STRING:
             return "";
+        case descriptors_js_1.ScalarType.BOOL:
+            return false;
         default:
             // Handles INT32, UINT32, SINT32, FIXED32, SFIXED32.
             // We do not use individual cases to save a few bytes code size.
             return 0;
+        case descriptors_js_1.ScalarType.DOUBLE:
+        case descriptors_js_1.ScalarType.FLOAT:
+            return 0.0;
+        case descriptors_js_1.ScalarType.INT64:
+        case descriptors_js_1.ScalarType.UINT64:
+        case descriptors_js_1.ScalarType.SFIXED64:
+        case descriptors_js_1.ScalarType.FIXED64:
+        case descriptors_js_1.ScalarType.SINT64:
+            return (longAsString ? "0" : proto_int64_js_1.protoInt64.zero);
+        case descriptors_js_1.ScalarType.BYTES:
+            return new Uint8Array(0);
     }
 }
 exports.scalarZeroValue = scalarZeroValue;
@@ -156,143 +91,14 @@ exports.scalarZeroValue = scalarZeroValue;
  */
 function isScalarZeroValue(type, value) {
     switch (type) {
-        case ScalarType.BOOL:
+        case descriptors_js_1.ScalarType.BOOL:
             return value === false;
-        case ScalarType.STRING:
+        case descriptors_js_1.ScalarType.STRING:
             return value === "";
-        case ScalarType.BYTES:
+        case descriptors_js_1.ScalarType.BYTES:
             return value instanceof Uint8Array && !value.byteLength;
         default:
             return value == 0; // Loose comparison matches 0n, 0 and "0"
     }
 }
 exports.isScalarZeroValue = isScalarZeroValue;
-const FLOAT32_MAX = 3.4028234663852886e38, FLOAT32_MIN = -3.4028234663852886e38, UINT32_MAX = 0xffffffff, INT32_MAX = 0x7fffffff, INT32_MIN = -0x80000000;
-// TODO this checks UTF-8 validity
-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 (0, text_encoding_js_1.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 {
-                proto_int64_js_1.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 {
-                proto_int64_js_1.protoInt64.uParse(value);
-            }
-            catch (e) {
-                return `${value} out of range`;
-            }
-            return true;
-    }
-}
-exports.checkScalarValue = checkScalarValue;
-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)";
-    }
-}
-exports.scalarTypeDescription = scalarTypeDescription;
-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";
-    }
-}
-exports.scalarTypeScriptType = scalarTypeScriptType;

package/dist/cjs/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/cjs/reflect/unsafe.js

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

package/dist/cjs/{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/cjs/{reflect/registry.js → registry.js}

@@ -14,12 +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 names_js_1 = require("./names.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.
  *
@@ -226,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-rc2
+// generated from protoc v27.0
 exports.minimumEdition = 998, exports.maximumEdition = 1000;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -285,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);
         },
     };
@@ -460,6 +459,7 @@ function addService(proto, file, reg) {
         name: proto.name,
         typeName: makeTypeName(proto, undefined, file),
         methods: [],
+        method: {},
         toString() {
             return `service ${this.typeName}`;
         },
@@ -467,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;
     }
 }
 /**
@@ -490,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",
@@ -546,7 +548,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         mapKey: undefined,
         delimitedEncoding: undefined,
         packed: undefined,
-        longType: undefined,
+        longAsString: false,
         getDefaultValue: undefined,
     };
     if (isExtension) {
@@ -562,13 +564,13 @@ 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");
+        assert(parent.kind == "message");
         field.parent = parent;
         field.oneof = oneof;
         field.localName = oneof
@@ -588,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.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
@@ -612,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);
@@ -636,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 = () => {
@@ -655,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)
@@ -773,7 +766,7 @@ 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;
 }
 /**
@@ -830,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/
@@ -877,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.
@@ -56,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));
@@ -91,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;
@@ -116,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();
@@ -126,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;