@bufbuild/protobuf 1.7.2 → 1.9.0

package/dist/cjs/index.d.ts

@@ -7,9 +7,11 @@ export { protoDelimited } from "./proto-delimited.js";
 export { codegenInfo } from "./codegen-info.js";
 export { Message } from "./message.js";
 export type { AnyMessage, PartialMessage, PlainMessage } from "./message.js";
-export type { FieldInfo } from "./field.js";
+export { isMessage } from "./is-message.js";
+export type { FieldInfo, OneofInfo } from "./field.js";
 export type { FieldList } from "./field-list.js";
-export { ScalarType, LongType } from "./field.js";
+export { LongType, ScalarType } from "./scalar.js";
+export type { ScalarValue } from "./scalar.js";
 export type { MessageType } from "./message-type.js";
 export type { EnumType, EnumValueInfo } from "./enum.js";
 export type { Extension } from "./extension.js";

package/dist/cjs/index.js

@@ -27,7 +27,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPlainMessage = exports.createRegistryFromDescriptors = exports.createRegistry = exports.createDescriptorSet = exports.BinaryReader = exports.BinaryWriter = exports.WireType = exports.MethodIdempotency = exports.MethodKind = exports.clearExtension = exports.hasExtension = exports.setExtension = exports.getExtension = exports.LongType = exports.ScalarType = exports.Message = exports.codegenInfo = exports.protoDelimited = exports.protoBase64 = exports.protoInt64 = exports.protoDouble = exports.proto2 = exports.proto3 = void 0;
+exports.toPlainMessage = exports.createRegistryFromDescriptors = exports.createRegistry = exports.createDescriptorSet = exports.BinaryReader = exports.BinaryWriter = exports.WireType = exports.MethodIdempotency = exports.MethodKind = exports.clearExtension = exports.hasExtension = exports.setExtension = exports.getExtension = exports.ScalarType = exports.LongType = exports.isMessage = exports.Message = exports.codegenInfo = exports.protoDelimited = exports.protoBase64 = exports.protoInt64 = exports.protoDouble = exports.proto2 = exports.proto3 = void 0;
 var proto3_js_1 = require("./proto3.js");
 Object.defineProperty(exports, "proto3", { enumerable: true, get: function () { return proto3_js_1.proto3; } });
 var proto2_js_1 = require("./proto2.js");
@@ -44,9 +44,11 @@ var codegen_info_js_1 = require("./codegen-info.js");
 Object.defineProperty(exports, "codegenInfo", { enumerable: true, get: function () { return codegen_info_js_1.codegenInfo; } });
 var message_js_1 = require("./message.js");
 Object.defineProperty(exports, "Message", { enumerable: true, get: function () { return message_js_1.Message; } });
-var field_js_1 = require("./field.js");
-Object.defineProperty(exports, "ScalarType", { enumerable: true, get: function () { return field_js_1.ScalarType; } });
-Object.defineProperty(exports, "LongType", { enumerable: true, get: function () { return field_js_1.LongType; } });
+var is_message_js_1 = require("./is-message.js");
+Object.defineProperty(exports, "isMessage", { enumerable: true, get: function () { return is_message_js_1.isMessage; } });
+var scalar_js_1 = require("./scalar.js");
+Object.defineProperty(exports, "LongType", { enumerable: true, get: function () { return scalar_js_1.LongType; } });
+Object.defineProperty(exports, "ScalarType", { enumerable: true, get: function () { return scalar_js_1.ScalarType; } });
 var extension_accessor_js_1 = require("./extension-accessor.js");
 Object.defineProperty(exports, "getExtension", { enumerable: true, get: function () { return extension_accessor_js_1.getExtension; } });
 Object.defineProperty(exports, "setExtension", { enumerable: true, get: function () { return extension_accessor_js_1.setExtension; } });

package/dist/cjs/is-message.d.ts

@@ -0,0 +1,22 @@
+import type { MessageType } from "./message-type.js";
+import type { AnyMessage } from "./message.js";
+import { Message } from "./message.js";
+/**
+ * Check whether the given object is any subtype of Message or is a specific
+ * Message by passing the type.
+ *
+ * Just like `instanceof`, `isMessage` narrows the type. The advantage of
+ * `isMessage` is that it compares identity by the message type name, not by
+ * class identity. This makes it robust against the dual package hazard and
+ * similar situations, where the same message is duplicated.
+ *
+ * This function is _mostly_ equivalent to the `instanceof` operator. For
+ * example, `isMessage(foo, MyMessage)` is the same as `foo instanceof MyMessage`,
+ * and `isMessage(foo)` is the same as `foo instanceof Message`. In most cases,
+ * `isMessage` should be preferred over `instanceof`.
+ *
+ * However, due to the fact that `isMessage` does not use class identity, there
+ * are subtle differences between this function and `instanceof`. Notably,
+ * calling `isMessage` on an explicit type of Message will return false.
+ */
+export declare function isMessage<T extends Message<T> = AnyMessage>(arg: unknown, type?: MessageType<T>): arg is T;

package/dist/cjs/is-message.js

@@ -0,0 +1,52 @@
+"use strict";
+// Copyright 2021-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMessage = void 0;
+const message_js_1 = require("./message.js");
+/**
+ * Check whether the given object is any subtype of Message or is a specific
+ * Message by passing the type.
+ *
+ * Just like `instanceof`, `isMessage` narrows the type. The advantage of
+ * `isMessage` is that it compares identity by the message type name, not by
+ * class identity. This makes it robust against the dual package hazard and
+ * similar situations, where the same message is duplicated.
+ *
+ * This function is _mostly_ equivalent to the `instanceof` operator. For
+ * example, `isMessage(foo, MyMessage)` is the same as `foo instanceof MyMessage`,
+ * and `isMessage(foo)` is the same as `foo instanceof Message`. In most cases,
+ * `isMessage` should be preferred over `instanceof`.
+ *
+ * However, due to the fact that `isMessage` does not use class identity, there
+ * are subtle differences between this function and `instanceof`. Notably,
+ * calling `isMessage` on an explicit type of Message will return false.
+ */
+function isMessage(arg, type) {
+    if (arg === null || typeof arg != "object") {
+        return false;
+    }
+    if (!Object.getOwnPropertyNames(message_js_1.Message.prototype).every((m) => m in arg && typeof arg[m] == "function")) {
+        return false;
+    }
+    const actualType = arg.getType();
+    if (actualType === null ||
+        typeof actualType != "function" ||
+        !("typeName" in actualType) ||
+        typeof actualType.typeName != "string") {
+        return false;
+    }
+    return type === undefined ? true : actualType.typeName == type.typeName;
+}
+exports.isMessage = isMessage;

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

@@ -1,7 +1,6 @@
 import type { Message } from "./message.js";
 import type { MessageType } from "./message-type.js";
-import type { ScalarType } from "./field.js";
-import { LongType } from "./field.js";
+import type { ScalarType, LongType } from "./scalar.js";
 import type { IExtensionRegistry, IMessageTypeRegistry } from "./type-registry.js";
 /**
  * JsonFormat is the contract for serializing messages to and from JSON.

package/dist/cjs/message.d.ts

@@ -19,6 +19,7 @@ export interface AnyMessage extends Message<AnyMessage> {
 export declare class Message<T extends Message<T> = AnyMessage> {
     /**
      * Compare with a message of the same type.
+     * Note that this function disregards extensions and unknown fields.
      */
     equals(other: T | PlainMessage<T> | undefined | null): boolean;
     /**

package/dist/cjs/message.js

@@ -24,6 +24,7 @@ exports.Message = void 0;
 class Message {
     /**
      * Compare with a message of the same type.
+     * Note that this function disregards extensions and unknown fields.
      */
     equals(other) {
         return this.getType().runtime.util.equals(this.getType(), this, other);

package/dist/cjs/private/binary-format.d.ts

@@ -0,0 +1,7 @@
+import type { IBinaryWriter } from "../binary-encoding.js";
+import type { BinaryFormat, BinaryWriteOptions } from "../binary-format.js";
+import type { FieldInfo } from "../field.js";
+export declare function makeBinaryFormat(): BinaryFormat;
+export declare function writeMapEntry(writer: IBinaryWriter, options: BinaryWriteOptions, field: FieldInfo & {
+    kind: "map";
+}, key: string, value: any): void;

package/dist/cjs/private/{binary-format-common.js → binary-format.js}

@@ -13,14 +13,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writePacked = exports.writeScalar = exports.writeMessageField = exports.writeMapEntry = exports.makeBinaryFormatCommon = void 0;
+exports.writeMapEntry = exports.makeBinaryFormat = void 0;
 const binary_encoding_js_1 = require("../binary-encoding.js");
-const message_js_1 = require("../message.js");
-const field_js_1 = require("../field.js");
 const field_wrapper_js_1 = require("./field-wrapper.js");
 const scalars_js_1 = require("./scalars.js");
 const assert_js_1 = require("./assert.js");
-/* eslint-disable @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unnecessary-condition, no-case-declarations, prefer-const */
+const reflect_js_1 = require("./reflect.js");
+const scalar_js_1 = require("../scalar.js");
+const is_message_js_1 = require("../is-message.js");
+/* eslint-disable prefer-const,no-case-declarations,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return */
 const unknownFieldsSymbol = Symbol("@bufbuild/protobuf/unknown-fields");
 // Default options for parsing binary data.
 const readDefaults = {
@@ -38,7 +39,7 @@ function makeReadOptions(options) {
 function makeWriteOptions(options) {
     return options ? Object.assign(Object.assign({}, writeDefaults), options) : writeDefaults;
 }
-function makeBinaryFormatCommon() {
+function makeBinaryFormat() {
     return {
         makeReadOptions,
         makeWriteOptions,
@@ -93,9 +94,38 @@ function makeBinaryFormatCommon() {
             }
         },
         readField,
+        writeMessage(message, writer, options) {
+            const type = message.getType();
+            for (const field of type.fields.byNumber()) {
+                if (!(0, reflect_js_1.isFieldSet)(field, message)) {
+                    if (field.req) {
+                        throw new Error(`cannot encode field ${type.typeName}.${field.name} to binary: required field not set`);
+                    }
+                    continue;
+                }
+                const value = field.oneof
+                    ? message[field.oneof.localName].value
+                    : message[field.localName];
+                writeField(field, value, writer, options);
+            }
+            if (options.writeUnknownFields) {
+                this.writeUnknownFields(message, writer);
+            }
+            return writer;
+        },
+        writeField(field, value, writer, options) {
+            // The behavior of our internal function has changed, it does no longer
+            // accept `undefined` values for singular scalar and map.
+            // For backwards-compatibility, we support the old form that is part of
+            // the public API through the interface BinaryFormat.
+            if (value === undefined) {
+                return undefined;
+            }
+            writeField(field, value, writer, options);
+        },
     };
 }
-exports.makeBinaryFormatCommon = makeBinaryFormatCommon;
+exports.makeBinaryFormat = makeBinaryFormat;
 function readField(target, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
 reader, field, wireType, options) {
     let { repeated, localName } = field;
@@ -110,7 +140,7 @@ reader, field, wireType, options) {
     switch (field.kind) {
         case "scalar":
         case "enum":
-            const scalarType = field.kind == "enum" ? field_js_1.ScalarType.INT32 : field.T;
+            const scalarType = field.kind == "enum" ? scalar_js_1.ScalarType.INT32 : field.T;
             let read = readScalar;
             // eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison -- acceptable since it's covered by tests
             if (field.kind == "scalar" && field.L > 0) {
@@ -119,8 +149,8 @@ reader, field, wireType, options) {
             if (repeated) {
                 let arr = target[localName]; // safe to assume presence of array, oneof cannot contain repeated values
                 const isPacked = wireType == binary_encoding_js_1.WireType.LengthDelimited &&
-                    scalarType != field_js_1.ScalarType.STRING &&
-                    scalarType != field_js_1.ScalarType.BYTES;
+                    scalarType != scalar_js_1.ScalarType.STRING &&
+                    scalarType != scalar_js_1.ScalarType.BYTES;
                 if (isPacked) {
                     let e = reader.uint32() + reader.pos;
                     while (reader.pos < e) {
@@ -142,7 +172,7 @@ reader, field, wireType, options) {
                 target[localName].push(readMessageField(reader, new messageType(), options, field));
             }
             else {
-                if (target[localName] instanceof message_js_1.Message) {
+                if ((0, is_message_js_1.isMessage)(target[localName])) {
                     readMessageField(reader, target[localName], options, field);
                 }
                 else {
@@ -165,7 +195,7 @@ reader, field, wireType, options) {
 function readMessageField(reader, message, options, field) {
     const format = message.getType().runtime.bin;
     const delimited = field === null || field === void 0 ? void 0 : field.delimited;
-    format.readMessage(message, reader, delimited ? field === null || field === void 0 ? void 0 : field.no : reader.uint32(), // eslint-disable-line @typescript-eslint/strict-boolean-expressions
+    format.readMessage(message, reader, delimited ? field.no : reader.uint32(), // eslint-disable-line @typescript-eslint/strict-boolean-expressions
     options, delimited);
     return message;
 }
@@ -174,7 +204,7 @@ function readMapEntry(field, reader, options) {
     const length = reader.uint32(), end = reader.pos + length;
     let key, val;
     while (reader.pos < end) {
-        let [fieldNo] = reader.tag();
+        const [fieldNo] = reader.tag();
         switch (fieldNo) {
             case 1:
                 key = readScalar(reader, field.K);
@@ -195,11 +225,7 @@ function readMapEntry(field, reader, options) {
         }
     }
     if (key === undefined) {
-        let keyRaw = (0, scalars_js_1.scalarDefaultValue)(field.K, field_js_1.LongType.BIGINT);
-        key =
-            field.K == field_js_1.ScalarType.BOOL
-                ? keyRaw.toString()
-                : keyRaw;
+        key = (0, scalars_js_1.scalarZeroValue)(field.K, scalar_js_1.LongType.BIGINT);
     }
     if (typeof key != "string" && typeof key != "number") {
         key = key.toString();
@@ -207,10 +233,10 @@ function readMapEntry(field, reader, options) {
     if (val === undefined) {
         switch (field.V.kind) {
             case "scalar":
-                val = (0, scalars_js_1.scalarDefaultValue)(field.V.T, field_js_1.LongType.BIGINT);
+                val = (0, scalars_js_1.scalarZeroValue)(field.V.T, scalar_js_1.LongType.BIGINT);
                 break;
             case "enum":
-                val = 0;
+                val = field.V.T.values[0].no;
                 break;
             case "message":
                 val = new field.V.T();
@@ -228,38 +254,79 @@ function readScalarLTString(reader, type) {
 // Does not use scalarTypeInfo() for better performance.
 function readScalar(reader, type) {
     switch (type) {
-        case field_js_1.ScalarType.STRING:
+        case scalar_js_1.ScalarType.STRING:
             return reader.string();
-        case field_js_1.ScalarType.BOOL:
+        case scalar_js_1.ScalarType.BOOL:
             return reader.bool();
-        case field_js_1.ScalarType.DOUBLE:
+        case scalar_js_1.ScalarType.DOUBLE:
             return reader.double();
-        case field_js_1.ScalarType.FLOAT:
+        case scalar_js_1.ScalarType.FLOAT:
             return reader.float();
-        case field_js_1.ScalarType.INT32:
+        case scalar_js_1.ScalarType.INT32:
             return reader.int32();
-        case field_js_1.ScalarType.INT64:
+        case scalar_js_1.ScalarType.INT64:
             return reader.int64();
-        case field_js_1.ScalarType.UINT64:
+        case scalar_js_1.ScalarType.UINT64:
             return reader.uint64();
-        case field_js_1.ScalarType.FIXED64:
+        case scalar_js_1.ScalarType.FIXED64:
             return reader.fixed64();
-        case field_js_1.ScalarType.BYTES:
+        case scalar_js_1.ScalarType.BYTES:
             return reader.bytes();
-        case field_js_1.ScalarType.FIXED32:
+        case scalar_js_1.ScalarType.FIXED32:
             return reader.fixed32();
-        case field_js_1.ScalarType.SFIXED32:
+        case scalar_js_1.ScalarType.SFIXED32:
             return reader.sfixed32();
-        case field_js_1.ScalarType.SFIXED64:
+        case scalar_js_1.ScalarType.SFIXED64:
             return reader.sfixed64();
-        case field_js_1.ScalarType.SINT64:
+        case scalar_js_1.ScalarType.SINT64:
             return reader.sint64();
-        case field_js_1.ScalarType.UINT32:
+        case scalar_js_1.ScalarType.UINT32:
             return reader.uint32();
-        case field_js_1.ScalarType.SINT32:
+        case scalar_js_1.ScalarType.SINT32:
             return reader.sint32();
     }
 }
+function writeField(field, value, writer, options) {
+    (0, assert_js_1.assert)(value !== undefined);
+    const repeated = field.repeated;
+    switch (field.kind) {
+        case "scalar":
+        case "enum":
+            let scalarType = field.kind == "enum" ? scalar_js_1.ScalarType.INT32 : field.T;
+            if (repeated) {
+                (0, assert_js_1.assert)(Array.isArray(value));
+                if (field.packed) {
+                    writePacked(writer, scalarType, field.no, value);
+                }
+                else {
+                    for (const item of value) {
+                        writeScalar(writer, scalarType, field.no, item);
+                    }
+                }
+            }
+            else {
+                writeScalar(writer, scalarType, field.no, value);
+            }
+            break;
+        case "message":
+            if (repeated) {
+                (0, assert_js_1.assert)(Array.isArray(value));
+                for (const item of value) {
+                    writeMessageField(writer, options, field, item);
+                }
+            }
+            else {
+                writeMessageField(writer, options, field, value);
+            }
+            break;
+        case "map":
+            (0, assert_js_1.assert)(typeof value == "object" && value != null);
+            for (const [key, val] of Object.entries(value)) {
+                writeMapEntry(writer, options, field, key, val);
+            }
+            break;
+    }
+}
 function writeMapEntry(writer, options, field, key, value) {
     writer.tag(field.no, binary_encoding_js_1.WireType.LengthDelimited);
     writer.fork();
@@ -268,29 +335,30 @@ function writeMapEntry(writer, options, field, key, value) {
     let keyValue = key;
     // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- we deliberately handle just the special cases for map keys
     switch (field.K) {
-        case field_js_1.ScalarType.INT32:
-        case field_js_1.ScalarType.FIXED32:
-        case field_js_1.ScalarType.UINT32:
-        case field_js_1.ScalarType.SFIXED32:
-        case field_js_1.ScalarType.SINT32:
+        case scalar_js_1.ScalarType.INT32:
+        case scalar_js_1.ScalarType.FIXED32:
+        case scalar_js_1.ScalarType.UINT32:
+        case scalar_js_1.ScalarType.SFIXED32:
+        case scalar_js_1.ScalarType.SINT32:
             keyValue = Number.parseInt(key);
             break;
-        case field_js_1.ScalarType.BOOL:
+        case scalar_js_1.ScalarType.BOOL:
             (0, assert_js_1.assert)(key == "true" || key == "false");
             keyValue = key == "true";
             break;
     }
     // write key, expecting key field number = 1
-    writeScalar(writer, field.K, 1, keyValue, true);
+    writeScalar(writer, field.K, 1, keyValue);
     // write value, expecting value field number = 2
     switch (field.V.kind) {
         case "scalar":
-            writeScalar(writer, field.V.T, 2, value, true);
+            writeScalar(writer, field.V.T, 2, value);
             break;
         case "enum":
-            writeScalar(writer, field_js_1.ScalarType.INT32, 2, value, true);
+            writeScalar(writer, scalar_js_1.ScalarType.INT32, 2, value);
             break;
         case "message":
+            (0, assert_js_1.assert)(value !== undefined);
             writer.tag(2, binary_encoding_js_1.WireType.LengthDelimited).bytes(value.toBinary(options));
             break;
     }
@@ -301,7 +369,7 @@ exports.writeMapEntry = writeMapEntry;
 function writeMessageField(writer, options, field, value) {
     const message = (0, field_wrapper_js_1.wrapField)(field.T, value);
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
-    if (field === null || field === void 0 ? void 0 : field.delimited)
+    if (field.delimited)
         writer
             .tag(field.no, binary_encoding_js_1.WireType.StartGroup)
             .raw(message.toBinary(options))
@@ -311,23 +379,52 @@ function writeMessageField(writer, options, field, value) {
             .tag(field.no, binary_encoding_js_1.WireType.LengthDelimited)
             .bytes(message.toBinary(options));
 }
-exports.writeMessageField = writeMessageField;
-function writeScalar(writer, type, fieldNo, value, emitIntrinsicDefault) {
-    let [wireType, method, isIntrinsicDefault] = (0, scalars_js_1.scalarTypeInfo)(type, value);
-    if (!isIntrinsicDefault || emitIntrinsicDefault) {
-        writer.tag(fieldNo, wireType)[method](value);
-    }
+function writeScalar(writer, type, fieldNo, value) {
+    (0, assert_js_1.assert)(value !== undefined);
+    let [wireType, method] = scalarTypeInfo(type);
+    writer.tag(fieldNo, wireType)[method](value);
 }
-exports.writeScalar = writeScalar;
 function writePacked(writer, type, fieldNo, value) {
     if (!value.length) {
         return;
     }
     writer.tag(fieldNo, binary_encoding_js_1.WireType.LengthDelimited).fork();
-    let [, method] = (0, scalars_js_1.scalarTypeInfo)(type);
+    let [, method] = scalarTypeInfo(type);
     for (let i = 0; i < value.length; i++) {
         writer[method](value[i]);
     }
     writer.join();
 }
-exports.writePacked = writePacked;
+/**
+ * Get information for writing a scalar value.
+ *
+ * Returns tuple:
+ * [0]: appropriate WireType
+ * [1]: name of the appropriate method of IBinaryWriter
+ * [2]: whether the given value is a default value for proto3 semantics
+ *
+ * If argument `value` is omitted, [2] is always false.
+ */
+// TODO replace call-sites writeScalar() and writePacked(), then remove
+function scalarTypeInfo(type) {
+    let wireType = binary_encoding_js_1.WireType.Varint;
+    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- INT32, UINT32, SINT32 are covered by the defaults
+    switch (type) {
+        case scalar_js_1.ScalarType.BYTES:
+        case scalar_js_1.ScalarType.STRING:
+            wireType = binary_encoding_js_1.WireType.LengthDelimited;
+            break;
+        case scalar_js_1.ScalarType.DOUBLE:
+        case scalar_js_1.ScalarType.FIXED64:
+        case scalar_js_1.ScalarType.SFIXED64:
+            wireType = binary_encoding_js_1.WireType.Bit64;
+            break;
+        case scalar_js_1.ScalarType.FIXED32:
+        case scalar_js_1.ScalarType.SFIXED32:
+        case scalar_js_1.ScalarType.FLOAT:
+            wireType = binary_encoding_js_1.WireType.Bit32;
+            break;
+    }
+    const method = scalar_js_1.ScalarType[type].toLowerCase();
+    return [wireType, method];
+}

package/dist/cjs/private/extensions.js

@@ -59,7 +59,7 @@ function initExtensionField(ext) {
         case "enum":
             return field.T.values[0].no;
         case "scalar":
-            return (0, scalars_js_1.scalarDefaultValue)(field.T, field.L);
+            return (0, scalars_js_1.scalarZeroValue)(field.T, field.L);
         case "message":
             // eslint-disable-next-line no-case-declarations
             const T = field.T, value = new T();

package/dist/cjs/private/feature-set.js

@@ -21,7 +21,7 @@ const proto_base64_js_1 = require("../proto-base64.js");
  */
 function getFeatureSetDefaults(options) {
     return descriptor_pb_js_1.FeatureSetDefaults.fromBinary(proto_base64_js_1.protoBase64.dec(
-    /*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiABKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
+    /*upstream-inject-feature-defaults-start*/ "ChESDAgBEAIYAiADKAEwAhjmBwoREgwIAhABGAEgAigBMAEY5wcKERIMCAEQARgBIAIoATABGOgHIOYHKOgH" /*upstream-inject-feature-defaults-end*/), options);
 }
 /**
  * Create an edition feature resolver with the given feature set defaults, or

package/dist/cjs/private/field-normalize.d.ts

@@ -0,0 +1,9 @@
+import type { FieldListSource } from "./field-list.js";
+import type { FieldInfo } from "../field.js";
+/**
+ * Convert a collection of field info to an array of normalized FieldInfo.
+ *
+ * The argument `packedByDefault` specifies whether fields that do not specify
+ * `packed` should be packed (proto3) or unpacked (proto2).
+ */
+export declare function normalizeFieldInfos(fieldInfos: FieldListSource, packedByDefault: boolean): FieldInfo[];

package/dist/cjs/private/field-normalize.js

@@ -0,0 +1,69 @@
+"use strict";
+// Copyright 2021-2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeFieldInfos = void 0;
+const field_js_1 = require("./field.js");
+const names_js_1 = require("./names.js");
+const scalar_js_1 = require("../scalar.js");
+/**
+ * Convert a collection of field info to an array of normalized FieldInfo.
+ *
+ * The argument `packedByDefault` specifies whether fields that do not specify
+ * `packed` should be packed (proto3) or unpacked (proto2).
+ */
+function normalizeFieldInfos(fieldInfos, packedByDefault) {
+    var _a, _b, _c, _d, _e, _f;
+    const r = [];
+    let o;
+    for (const field of typeof fieldInfos == "function"
+        ? fieldInfos()
+        : fieldInfos) {
+        const f = field;
+        f.localName = (0, names_js_1.localFieldName)(field.name, field.oneof !== undefined);
+        f.jsonName = (_a = field.jsonName) !== null && _a !== void 0 ? _a : (0, names_js_1.fieldJsonName)(field.name);
+        f.repeated = (_b = field.repeated) !== null && _b !== void 0 ? _b : false;
+        if (field.kind == "scalar") {
+            f.L = (_c = field.L) !== null && _c !== void 0 ? _c : scalar_js_1.LongType.BIGINT;
+        }
+        f.delimited = (_d = field.delimited) !== null && _d !== void 0 ? _d : false;
+        f.req = (_e = field.req) !== null && _e !== void 0 ? _e : false;
+        f.opt = (_f = field.opt) !== null && _f !== void 0 ? _f : false;
+        if (field.packed === undefined) {
+            if (packedByDefault) {
+                f.packed =
+                    field.kind == "enum" ||
+                        (field.kind == "scalar" &&
+                            field.T != scalar_js_1.ScalarType.BYTES &&
+                            field.T != scalar_js_1.ScalarType.STRING);
+            }
+            else {
+                f.packed = false;
+            }
+        }
+        // We do not surface options at this time
+        // f.options = field.options ?? emptyReadonlyObject;
+        if (field.oneof !== undefined) {
+            const ooname = typeof field.oneof == "string" ? field.oneof : field.oneof.name;
+            if (!o || o.name != ooname) {
+                o = new field_js_1.InternalOneofInfo(ooname);
+            }
+            f.oneof = o;
+            o.addField(f);
+        }
+        r.push(f);
+    }
+    return r;
+}
+exports.normalizeFieldInfos = normalizeFieldInfos;

package/dist/cjs/private/field-wrapper.d.ts

@@ -1,7 +1,7 @@
 import { Message } from "../message.js";
 import type { MessageType } from "../message-type.js";
 import type { DescExtension, DescField } from "../descriptor-set.js";
-import { ScalarType } from "../field.js";
+import { ScalarType } from "../scalar.js";
 /**
  * A field wrapper unwraps a message to a primitive value that is more
  * ergonomic for use as a message field.

package/dist/cjs/private/field-wrapper.js

@@ -14,14 +14,14 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUnwrappedFieldType = exports.wrapField = void 0;
-const message_js_1 = require("../message.js");
-const field_js_1 = require("../field.js");
+const scalar_js_1 = require("../scalar.js");
+const is_message_js_1 = require("../is-message.js");
 /**
  * Wrap a primitive message field value in its corresponding wrapper
  * message. This function is idempotent.
  */
 function wrapField(type, value) {
-    if (value instanceof message_js_1.Message || !type.fieldWrapper) {
+    if ((0, is_message_js_1.isMessage)(value) || !type.fieldWrapper) {
         return value;
     }
     return type.fieldWrapper.wrapField(value);
@@ -45,13 +45,13 @@ function getUnwrappedFieldType(field) {
 }
 exports.getUnwrappedFieldType = getUnwrappedFieldType;
 const wktWrapperToScalarType = {
-    "google.protobuf.DoubleValue": field_js_1.ScalarType.DOUBLE,
-    "google.protobuf.FloatValue": field_js_1.ScalarType.FLOAT,
-    "google.protobuf.Int64Value": field_js_1.ScalarType.INT64,
-    "google.protobuf.UInt64Value": field_js_1.ScalarType.UINT64,
-    "google.protobuf.Int32Value": field_js_1.ScalarType.INT32,
-    "google.protobuf.UInt32Value": field_js_1.ScalarType.UINT32,
-    "google.protobuf.BoolValue": field_js_1.ScalarType.BOOL,
-    "google.protobuf.StringValue": field_js_1.ScalarType.STRING,
-    "google.protobuf.BytesValue": field_js_1.ScalarType.BYTES,
+    "google.protobuf.DoubleValue": scalar_js_1.ScalarType.DOUBLE,
+    "google.protobuf.FloatValue": scalar_js_1.ScalarType.FLOAT,
+    "google.protobuf.Int64Value": scalar_js_1.ScalarType.INT64,
+    "google.protobuf.UInt64Value": scalar_js_1.ScalarType.UINT64,
+    "google.protobuf.Int32Value": scalar_js_1.ScalarType.INT32,
+    "google.protobuf.UInt32Value": scalar_js_1.ScalarType.UINT32,
+    "google.protobuf.BoolValue": scalar_js_1.ScalarType.BOOL,
+    "google.protobuf.StringValue": scalar_js_1.ScalarType.STRING,
+    "google.protobuf.BytesValue": scalar_js_1.ScalarType.BYTES,
 };