@bufbuild/protobuf 1.5.0 → 1.6.0

package/dist/cjs/binary-encoding.d.ts

@@ -25,13 +25,12 @@ export declare enum WireType {
      */
     LengthDelimited = 2,
     /**
-     * Used for groups
-     * @deprecated
+     * Start of a tag-delimited aggregate, such as a proto2 group, or a message
+     * in editions with message_encoding = DELIMITED.
      */
     StartGroup = 3,
     /**
-     * Used for groups
-     * @deprecated
+     * End of a tag-delimited aggregate.
      */
     EndGroup = 4,
     /**

package/dist/cjs/binary-encoding.js

@@ -46,13 +46,12 @@ var WireType;
      */
     WireType[WireType["LengthDelimited"] = 2] = "LengthDelimited";
     /**
-     * Used for groups
-     * @deprecated
+     * Start of a tag-delimited aggregate, such as a proto2 group, or a message
+     * in editions with message_encoding = DELIMITED.
      */
     WireType[WireType["StartGroup"] = 3] = "StartGroup";
     /**
-     * Used for groups
-     * @deprecated
+     * End of a tag-delimited aggregate.
      */
     WireType[WireType["EndGroup"] = 4] = "EndGroup";
     /**

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

@@ -16,8 +16,17 @@ export interface BinaryFormat {
     makeWriteOptions(options?: Partial<BinaryWriteOptions>): Readonly<BinaryWriteOptions>;
     /**
      * Parse a message from binary data, merging fields.
+     *
+     * Supports two message encodings:
+     * - length-prefixed: delimitedMessageEncoding is false or omitted, and
+     *   lengthOrEndTagFieldNo is the expected length of the message in the reader.
+     * - delimited: delimitedMessageEncoding is true, and lengthOrEndTagFieldNo is
+     *   the field number in a tag with wire type end-group signalling the end of
+     *   the message in the reader.
+     *
+     * delimitedMessageEncoding is optional for backwards compatibility.
      */
-    readMessage(message: Message, reader: IBinaryReader, length: number, options: BinaryReadOptions): void;
+    readMessage(message: Message, reader: IBinaryReader, lengthOrEndTagFieldNo: number, options: BinaryReadOptions, delimitedMessageEncoding?: boolean): void;
     /**
      * Serialize a message to binary data.
      */

package/dist/cjs/create-registry-from-desc.js

@@ -234,6 +234,7 @@ function makeMessageFieldInfo(field, resolver) {
         name: field.name,
         jsonName: field.jsonName,
         T: messageType,
+        delimited: field.proto.type == descriptor_pb_js_1.FieldDescriptorProto_Type.GROUP,
     };
     if (field.repeated) {
         return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined });

package/dist/cjs/field.d.ts

@@ -23,6 +23,7 @@ import type { MessageType } from "./message-type.js";
  *
  * - "oneof": If the field is member of a oneof group.
  * - "default": Only proto2: An explicit default value.
+ * - "delimited": Only proto2: Use the tag-delimited group encoding.
  */
 export type FieldInfo = fiRules<fiScalar> | fiRules<fiEnum> | fiRules<fiMessage> | fiRules<fiMap>;
 /**
@@ -46,6 +47,7 @@ export interface OneofInfo {
     readonly packed: false;
     readonly opt: false;
     readonly default: undefined;
+    readonly delimited?: undefined;
     readonly fields: readonly FieldInfo[];
     /**
      * Return field information by local name.
@@ -119,6 +121,13 @@ interface fiScalar extends fiShared {
      * Only proto2: An explicit default value.
      */
     readonly default: number | boolean | string | bigint | Uint8Array | undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: undefined;
 }
 interface fiMessage extends fiShared {
     readonly kind: "message";
@@ -138,6 +147,13 @@ interface fiMessage extends fiShared {
      * An explicit default value (only proto2). Never set for messages.
      */
     readonly default: undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: boolean;
 }
 interface fiEnum extends fiShared {
     readonly kind: "enum";
@@ -163,6 +179,13 @@ interface fiEnum extends fiShared {
      * Only proto2: An explicit default value.
      */
     readonly default: number | undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: undefined;
 }
 interface fiMap extends fiShared {
     readonly kind: "map";
@@ -199,6 +222,13 @@ interface fiMap extends fiShared {
      * An explicit default value (only proto2). Never set for maps.
      */
     readonly default: undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: undefined;
 }
 type fiRules<T> = Omit<T, "oneof" | "repeat" | "repeated" | "packed" | "opt"> & ({
     readonly repeated: false;
@@ -221,7 +251,7 @@ type fiRules<T> = Omit<T, "oneof" | "repeat" | "repeated" | "packed" | "opt"> &
     readonly opt: false;
     readonly oneof: OneofInfo;
 });
-type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "jsonName" | "localName" | "oneof" | "repeat" | "repeated" | "packed" | "opt" | "default" | "L"> & ({
+type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "jsonName" | "localName" | "oneof" | "repeat" | "repeated" | "packed" | "opt" | "default" | "L" | "delimited"> & ({
     readonly jsonName?: string;
     readonly repeated?: false;
     readonly packed?: false;
@@ -229,6 +259,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof?: undefined;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 } | {
     readonly jsonName?: string;
     readonly repeated?: false;
@@ -237,6 +268,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof?: undefined;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 } | {
     readonly jsonName?: string;
     readonly repeated?: boolean;
@@ -245,6 +277,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof?: undefined;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 } | {
     readonly jsonName?: string;
     readonly repeated?: false;
@@ -253,6 +286,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof: string;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 });
 /**
  * Scalar value types. This is a subset of field types declared by protobuf
@@ -273,7 +307,7 @@ export declare enum ScalarType {
     UINT32 = 13,
     SFIXED32 = 15,
     SFIXED64 = 16,
-    SINT32 = 17,
+    SINT32 = 17,// Uses ZigZag encoding.
     SINT64 = 18
 }
 /**

package/dist/cjs/google/protobuf/descriptor_pb.js

@@ -21,7 +21,7 @@ exports.GeneratedCodeInfo_Annotation_Semantic = exports.GeneratedCodeInfo_Annota
 // The messages in this file describe the definitions found in .proto files.
 // A valid .proto file can be translated directly to a FileDescriptorProto
 // without any other information (e.g. without reading its imports).
-// @generated by protoc-gen-es v1.5.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.6.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/descriptor.proto (package google.protobuf, syntax proto2)
 /* eslint-disable */
 const proto2_js_1 = require("../../proto2.js");

package/dist/cjs/google/protobuf/struct_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListValue = exports.Value = exports.Struct = exports.NullValue = void 0;
-// @generated by protoc-gen-es v1.5.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.6.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

package/dist/cjs/google/protobuf/type_pb.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Option = exports.EnumValue = exports.Enum = exports.Field_Cardinality = exports.Field_Kind = exports.Field = exports.Type = exports.Syntax = void 0;
-// @generated by protoc-gen-es v1.5.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.6.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 const proto3_js_1 = require("../../proto3.js");

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

@@ -2,12 +2,13 @@ import type { IBinaryReader, IBinaryWriter } from "../binary-encoding.js";
 import type { BinaryFormat, BinaryWriteOptions } from "../binary-format.js";
 import type { FieldInfo } from "../field.js";
 import { ScalarType } from "../field.js";
-import type { MessageType } from "../message-type.js";
 export declare function makeBinaryFormatCommon(): Omit<BinaryFormat, "writeMessage">;
 export declare function readScalarLTString(reader: IBinaryReader, type: ScalarType): any;
 export declare function writeMapEntry(writer: IBinaryWriter, options: BinaryWriteOptions, field: FieldInfo & {
     kind: "map";
 }, key: any, value: any): void;
-export declare function writeMessageField(writer: IBinaryWriter, options: BinaryWriteOptions, type: MessageType, fieldNo: number, value: any): void;
+export declare function writeMessageField(writer: IBinaryWriter, options: BinaryWriteOptions, field: FieldInfo & {
+    kind: "message";
+}, value: any): void;
 export declare function writeScalar(writer: IBinaryWriter, type: ScalarType, fieldNo: number, value: any, emitIntrinsicDefault: boolean): void;
 export declare function writePacked(writer: IBinaryWriter, type: ScalarType, fieldNo: number, value: any[]): void;

package/dist/cjs/private/binary-format-common.js

@@ -65,11 +65,19 @@ function makeBinaryFormatCommon() {
             }
             m[unknownFieldsSymbol].push({ no, wireType, data });
         },
-        readMessage(message, reader, length, options) {
+        readMessage(message, reader, lengthOrEndTagFieldNo, options, delimitedMessageEncoding) {
             const type = message.getType();
-            const end = length === undefined ? reader.len : reader.pos + length;
+            // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+            const end = delimitedMessageEncoding
+                ? reader.len
+                : reader.pos + lengthOrEndTagFieldNo;
+            let fieldNo, wireType;
             while (reader.pos < end) {
-                const [fieldNo, wireType] = reader.tag(), field = type.fields.find(fieldNo);
+                [fieldNo, wireType] = reader.tag();
+                if (wireType == binary_encoding_js_1.WireType.EndGroup) {
+                    break;
+                }
+                const field = type.fields.find(fieldNo);
                 if (!field) {
                     const data = reader.skip(wireType);
                     if (options.readUnknownFields) {
@@ -117,14 +125,14 @@ function makeBinaryFormatCommon() {
                         const messageType = field.T;
                         if (repeated) {
                             // safe to assume presence of array, oneof cannot contain repeated values
-                            target[localName].push(readMessageField(reader, new messageType(), options));
+                            target[localName].push(readMessageField(reader, new messageType(), options, field));
                         }
                         else {
                             if (target[localName] instanceof message_js_1.Message) {
-                                readMessageField(reader, target[localName], options);
+                                readMessageField(reader, target[localName], options, field);
                             }
                             else {
-                                target[localName] = readMessageField(reader, new messageType(), options);
+                                target[localName] = readMessageField(reader, new messageType(), options, field);
                                 if (messageType.fieldWrapper &&
                                     !field.oneof &&
                                     !field.repeated) {
@@ -140,15 +148,21 @@ function makeBinaryFormatCommon() {
                         break;
                 }
             }
+            if (delimitedMessageEncoding && // eslint-disable-line @typescript-eslint/strict-boolean-expressions
+                (wireType != binary_encoding_js_1.WireType.EndGroup || fieldNo !== lengthOrEndTagFieldNo)) {
+                throw new Error(`invalid end group tag`);
+            }
         },
     };
 }
 exports.makeBinaryFormatCommon = makeBinaryFormatCommon;
 // Read a message, avoiding MessageType.fromBinary() to re-use the
 // BinaryReadOptions and the IBinaryReader.
-function readMessageField(reader, message, options) {
+function readMessageField(reader, message, options, field) {
     const format = message.getType().runtime.bin;
-    format.readMessage(message, reader, reader.uint32(), options);
+    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
+    options, delimited);
     return message;
 }
 // Read a map field, expecting key field = 1, value field = 2
@@ -170,7 +184,7 @@ function readMapEntry(field, reader, options) {
                         val = reader.int32();
                         break;
                     case "message":
-                        val = readMessageField(reader, new field.V.T(), options);
+                        val = readMessageField(reader, new field.V.T(), options, undefined);
                         break;
                 }
                 break;
@@ -274,18 +288,25 @@ function writeMapEntry(writer, options, field, key, value) {
             writeScalar(writer, field_js_1.ScalarType.INT32, 2, value, true);
             break;
         case "message":
-            writeMessageField(writer, options, field.V.T, 2, value);
+            writer.tag(2, binary_encoding_js_1.WireType.LengthDelimited).bytes(value.toBinary(options));
             break;
     }
     writer.join();
 }
 exports.writeMapEntry = writeMapEntry;
-function writeMessageField(writer, options, type, fieldNo, value) {
+function writeMessageField(writer, options, field, value) {
     if (value !== undefined) {
-        const message = (0, field_wrapper_js_1.wrapField)(type, value);
-        writer
-            .tag(fieldNo, binary_encoding_js_1.WireType.LengthDelimited)
-            .bytes(message.toBinary(options));
+        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)
+            writer
+                .tag(field.no, binary_encoding_js_1.WireType.StartGroup)
+                .raw(message.toBinary(options))
+                .tag(field.no, binary_encoding_js_1.WireType.EndGroup);
+        else
+            writer
+                .tag(field.no, binary_encoding_js_1.WireType.LengthDelimited)
+                .bytes(message.toBinary(options));
     }
 }
 exports.writeMessageField = writeMessageField;

package/dist/cjs/private/binary-format-proto2.js

@@ -65,11 +65,11 @@ function makeBinaryFormatProto2() {
                         case "message":
                             if (repeated) {
                                 for (const item of value) {
-                                    (0, binary_format_common_js_1.writeMessageField)(writer, options, field.T, field.no, item);
+                                    (0, binary_format_common_js_1.writeMessageField)(writer, options, field, item);
                                 }
                             }
                             else {
-                                (0, binary_format_common_js_1.writeMessageField)(writer, options, field.T, field.no, value);
+                                (0, binary_format_common_js_1.writeMessageField)(writer, options, field, value);
                             }
                             break;
                         case "map":

package/dist/cjs/private/binary-format-proto3.js

@@ -56,11 +56,11 @@ function makeBinaryFormatProto3() {
                     case "message":
                         if (repeated) {
                             for (const item of value) {
-                                (0, binary_format_common_js_1.writeMessageField)(writer, options, field.T, field.no, item);
+                                (0, binary_format_common_js_1.writeMessageField)(writer, options, field, item);
                             }
                         }
                         else {
-                            (0, binary_format_common_js_1.writeMessageField)(writer, options, field.T, field.no, value);
+                            (0, binary_format_common_js_1.writeMessageField)(writer, options, field, value);
                         }
                         break;
                     case "map":

package/dist/cjs/proto-delimited.js

@@ -23,8 +23,9 @@ var __await = (this && this.__await) || function (v) { return this instanceof __
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
     function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
     function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
     function fulfill(value) { resume("next", value); }

package/dist/cjs/proto2.js

@@ -57,7 +57,7 @@ exports.proto2 = (0, proto_runtime_js_1.makeProtoRuntime)("proto2", (0, json_for
     } }));
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function normalizeFieldInfosProto2(fieldInfos) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const r = [];
     let o;
     for (const field of typeof fieldInfos == "function"
@@ -70,8 +70,6 @@ function normalizeFieldInfosProto2(fieldInfos) {
         if (field.kind == "scalar") {
             f.L = (_c = field.L) !== null && _c !== void 0 ? _c : field_js_2.LongType.BIGINT;
         }
-        // In contrast to proto3, repeated fields are unpacked except when explicitly specified.
-        f.packed = (_d = field.packed) !== null && _d !== void 0 ? _d : false;
         // We do not surface options at this time
         // f.options = field.options ?? emptyReadonlyObject;
         if (field.oneof !== undefined) {
@@ -82,6 +80,12 @@ function normalizeFieldInfosProto2(fieldInfos) {
             f.oneof = o;
             o.addField(f);
         }
+        // proto2 specific:
+        if (field.kind == "message") {
+            f.delimited = (_d = field.delimited) !== null && _d !== void 0 ? _d : false;
+        }
+        // In contrast to proto3, repeated fields are unpacked except when explicitly specified.
+        f.packed = (_e = field.packed) !== null && _e !== void 0 ? _e : false;
         r.push(f);
     }
     return r;

package/dist/cjs/proto3.js

@@ -73,16 +73,6 @@ function normalizeFieldInfosProto3(fieldInfos) {
         if (field.kind == "scalar") {
             f.L = (_c = field.L) !== null && _c !== void 0 ? _c : field_js_1.LongType.BIGINT;
         }
-        // From the proto3 language guide:
-        // > In proto3, repeated fields of scalar numeric types are packed by default.
-        // This information is incomplete - according to the conformance tests, BOOL
-        // and ENUM are packed by default as well. This means only STRING and BYTES
-        // are not packed by default, which makes sense because they are length-delimited.
-        f.packed =
-            (_d = field.packed) !== null && _d !== void 0 ? _d : (field.kind == "enum" ||
-                (field.kind == "scalar" &&
-                    field.T != field_js_1.ScalarType.BYTES &&
-                    field.T != field_js_1.ScalarType.STRING));
         // We do not surface options at this time
         // f.options = field.options ?? emptyReadonlyObject;
         if (field.oneof !== undefined) {
@@ -93,6 +83,20 @@ function normalizeFieldInfosProto3(fieldInfos) {
             f.oneof = o;
             o.addField(f);
         }
+        // proto3 specific:
+        if (field.kind == "message") {
+            f.delimited = false;
+        }
+        // From the proto3 language guide:
+        // > In proto3, repeated fields of scalar numeric types are packed by default.
+        // This information is incomplete - according to the conformance tests, BOOL
+        // and ENUM are packed by default as well. This means only STRING and BYTES
+        // are not packed by default, which makes sense because they are length-delimited.
+        f.packed =
+            (_d = field.packed) !== null && _d !== void 0 ? _d : (field.kind == "enum" ||
+                (field.kind == "scalar" &&
+                    field.T != field_js_1.ScalarType.BYTES &&
+                    field.T != field_js_1.ScalarType.STRING));
         r.push(f);
     }
     return r;

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

@@ -25,13 +25,12 @@ export declare enum WireType {
      */
     LengthDelimited = 2,
     /**
-     * Used for groups
-     * @deprecated
+     * Start of a tag-delimited aggregate, such as a proto2 group, or a message
+     * in editions with message_encoding = DELIMITED.
      */
     StartGroup = 3,
     /**
-     * Used for groups
-     * @deprecated
+     * End of a tag-delimited aggregate.
      */
     EndGroup = 4,
     /**

package/dist/esm/binary-encoding.js

@@ -43,13 +43,12 @@ export var WireType;
      */
     WireType[WireType["LengthDelimited"] = 2] = "LengthDelimited";
     /**
-     * Used for groups
-     * @deprecated
+     * Start of a tag-delimited aggregate, such as a proto2 group, or a message
+     * in editions with message_encoding = DELIMITED.
      */
     WireType[WireType["StartGroup"] = 3] = "StartGroup";
     /**
-     * Used for groups
-     * @deprecated
+     * End of a tag-delimited aggregate.
      */
     WireType[WireType["EndGroup"] = 4] = "EndGroup";
     /**

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

@@ -16,8 +16,17 @@ export interface BinaryFormat {
     makeWriteOptions(options?: Partial<BinaryWriteOptions>): Readonly<BinaryWriteOptions>;
     /**
      * Parse a message from binary data, merging fields.
+     *
+     * Supports two message encodings:
+     * - length-prefixed: delimitedMessageEncoding is false or omitted, and
+     *   lengthOrEndTagFieldNo is the expected length of the message in the reader.
+     * - delimited: delimitedMessageEncoding is true, and lengthOrEndTagFieldNo is
+     *   the field number in a tag with wire type end-group signalling the end of
+     *   the message in the reader.
+     *
+     * delimitedMessageEncoding is optional for backwards compatibility.
      */
-    readMessage(message: Message, reader: IBinaryReader, length: number, options: BinaryReadOptions): void;
+    readMessage(message: Message, reader: IBinaryReader, lengthOrEndTagFieldNo: number, options: BinaryReadOptions, delimitedMessageEncoding?: boolean): void;
     /**
      * Serialize a message to binary data.
      */

package/dist/esm/create-registry-from-desc.js

@@ -24,7 +24,7 @@ import { FieldMask } from "./google/protobuf/field_mask_pb.js";
 import { ListValue, NullValue, Struct, Value, } from "./google/protobuf/struct_pb.js";
 import { getEnumType } from "./private/enum.js";
 import { BoolValue, BytesValue, DoubleValue, FloatValue, Int32Value, Int64Value, StringValue, UInt32Value, UInt64Value, } from "./google/protobuf/wrappers_pb.js";
-import { FileDescriptorSet } from "./google/protobuf/descriptor_pb.js";
+import { FieldDescriptorProto_Type, FileDescriptorSet, } from "./google/protobuf/descriptor_pb.js";
 import { createDescriptorSet } from "./create-descriptor-set.js";
 // well-known message types with specialized JSON representation
 const wkMessages = [
@@ -230,6 +230,7 @@ function makeMessageFieldInfo(field, resolver) {
         name: field.name,
         jsonName: field.jsonName,
         T: messageType,
+        delimited: field.proto.type == FieldDescriptorProto_Type.GROUP,
     };
     if (field.repeated) {
         return Object.assign(Object.assign({}, base), { repeated: true, packed: field.packed, oneof: undefined });

package/dist/esm/field.d.ts

@@ -23,6 +23,7 @@ import type { MessageType } from "./message-type.js";
  *
  * - "oneof": If the field is member of a oneof group.
  * - "default": Only proto2: An explicit default value.
+ * - "delimited": Only proto2: Use the tag-delimited group encoding.
  */
 export type FieldInfo = fiRules<fiScalar> | fiRules<fiEnum> | fiRules<fiMessage> | fiRules<fiMap>;
 /**
@@ -46,6 +47,7 @@ export interface OneofInfo {
     readonly packed: false;
     readonly opt: false;
     readonly default: undefined;
+    readonly delimited?: undefined;
     readonly fields: readonly FieldInfo[];
     /**
      * Return field information by local name.
@@ -119,6 +121,13 @@ interface fiScalar extends fiShared {
      * Only proto2: An explicit default value.
      */
     readonly default: number | boolean | string | bigint | Uint8Array | undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: undefined;
 }
 interface fiMessage extends fiShared {
     readonly kind: "message";
@@ -138,6 +147,13 @@ interface fiMessage extends fiShared {
      * An explicit default value (only proto2). Never set for messages.
      */
     readonly default: undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: boolean;
 }
 interface fiEnum extends fiShared {
     readonly kind: "enum";
@@ -163,6 +179,13 @@ interface fiEnum extends fiShared {
      * Only proto2: An explicit default value.
      */
     readonly default: number | undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: undefined;
 }
 interface fiMap extends fiShared {
     readonly kind: "map";
@@ -199,6 +222,13 @@ interface fiMap extends fiShared {
      * An explicit default value (only proto2). Never set for maps.
      */
     readonly default: undefined;
+    /**
+     * Serialize this message with the delimited format, also known as group
+     * encoding, as opposed to the standard length prefix.
+     *
+     * Only valid for message fields.
+     */
+    readonly delimited?: undefined;
 }
 type fiRules<T> = Omit<T, "oneof" | "repeat" | "repeated" | "packed" | "opt"> & ({
     readonly repeated: false;
@@ -221,7 +251,7 @@ type fiRules<T> = Omit<T, "oneof" | "repeat" | "repeated" | "packed" | "opt"> &
     readonly opt: false;
     readonly oneof: OneofInfo;
 });
-type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "jsonName" | "localName" | "oneof" | "repeat" | "repeated" | "packed" | "opt" | "default" | "L"> & ({
+type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "jsonName" | "localName" | "oneof" | "repeat" | "repeated" | "packed" | "opt" | "default" | "L" | "delimited"> & ({
     readonly jsonName?: string;
     readonly repeated?: false;
     readonly packed?: false;
@@ -229,6 +259,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof?: undefined;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 } | {
     readonly jsonName?: string;
     readonly repeated?: false;
@@ -237,6 +268,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof?: undefined;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 } | {
     readonly jsonName?: string;
     readonly repeated?: boolean;
@@ -245,6 +277,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof?: undefined;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 } | {
     readonly jsonName?: string;
     readonly repeated?: false;
@@ -253,6 +286,7 @@ type fiPartialRules<T extends fiScalar | fiMap | fiEnum | fiMessage> = Omit<T, "
     readonly oneof: string;
     default?: T["default"];
     L?: LongType;
+    delimited?: boolean;
 });
 /**
  * Scalar value types. This is a subset of field types declared by protobuf
@@ -273,7 +307,7 @@ export declare enum ScalarType {
     UINT32 = 13,
     SFIXED32 = 15,
     SFIXED64 = 16,
-    SINT32 = 17,
+    SINT32 = 17,// Uses ZigZag encoding.
     SINT64 = 18
 }
 /**

package/dist/esm/google/protobuf/descriptor_pb.js

@@ -18,7 +18,7 @@
 // The messages in this file describe the definitions found in .proto files.
 // A valid .proto file can be translated directly to a FileDescriptorProto
 // without any other information (e.g. without reading its imports).
-// @generated by protoc-gen-es v1.5.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.6.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/descriptor.proto (package google.protobuf, syntax proto2)
 /* eslint-disable */
 import { proto2 } from "../../proto2.js";

package/dist/esm/google/protobuf/struct_pb.js

@@ -11,7 +11,7 @@
 // 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.
-// @generated by protoc-gen-es v1.5.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.6.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/struct.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/google/protobuf/type_pb.js

@@ -11,7 +11,7 @@
 // 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.
-// @generated by protoc-gen-es v1.5.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
+// @generated by protoc-gen-es v1.6.0 with parameter "bootstrap_wkt=true,ts_nocheck=false,target=ts"
 // @generated from file google/protobuf/type.proto (package google.protobuf, syntax proto3)
 /* eslint-disable */
 import { proto3 } from "../../proto3.js";

package/dist/esm/private/binary-format-common.d.ts

@@ -2,12 +2,13 @@ import type { IBinaryReader, IBinaryWriter } from "../binary-encoding.js";
 import type { BinaryFormat, BinaryWriteOptions } from "../binary-format.js";
 import type { FieldInfo } from "../field.js";
 import { ScalarType } from "../field.js";
-import type { MessageType } from "../message-type.js";
 export declare function makeBinaryFormatCommon(): Omit<BinaryFormat, "writeMessage">;
 export declare function readScalarLTString(reader: IBinaryReader, type: ScalarType): any;
 export declare function writeMapEntry(writer: IBinaryWriter, options: BinaryWriteOptions, field: FieldInfo & {
     kind: "map";
 }, key: any, value: any): void;
-export declare function writeMessageField(writer: IBinaryWriter, options: BinaryWriteOptions, type: MessageType, fieldNo: number, value: any): void;
+export declare function writeMessageField(writer: IBinaryWriter, options: BinaryWriteOptions, field: FieldInfo & {
+    kind: "message";
+}, value: any): void;
 export declare function writeScalar(writer: IBinaryWriter, type: ScalarType, fieldNo: number, value: any, emitIntrinsicDefault: boolean): void;
 export declare function writePacked(writer: IBinaryWriter, type: ScalarType, fieldNo: number, value: any[]): void;

package/dist/esm/private/binary-format-common.js

@@ -62,11 +62,19 @@ export function makeBinaryFormatCommon() {
             }
             m[unknownFieldsSymbol].push({ no, wireType, data });
         },
-        readMessage(message, reader, length, options) {
+        readMessage(message, reader, lengthOrEndTagFieldNo, options, delimitedMessageEncoding) {
             const type = message.getType();
-            const end = length === undefined ? reader.len : reader.pos + length;
+            // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+            const end = delimitedMessageEncoding
+                ? reader.len
+                : reader.pos + lengthOrEndTagFieldNo;
+            let fieldNo, wireType;
             while (reader.pos < end) {
-                const [fieldNo, wireType] = reader.tag(), field = type.fields.find(fieldNo);
+                [fieldNo, wireType] = reader.tag();
+                if (wireType == WireType.EndGroup) {
+                    break;
+                }
+                const field = type.fields.find(fieldNo);
                 if (!field) {
                     const data = reader.skip(wireType);
                     if (options.readUnknownFields) {
@@ -114,14 +122,14 @@ export function makeBinaryFormatCommon() {
                         const messageType = field.T;
                         if (repeated) {
                             // safe to assume presence of array, oneof cannot contain repeated values
-                            target[localName].push(readMessageField(reader, new messageType(), options));
+                            target[localName].push(readMessageField(reader, new messageType(), options, field));
                         }
                         else {
                             if (target[localName] instanceof Message) {
-                                readMessageField(reader, target[localName], options);
+                                readMessageField(reader, target[localName], options, field);
                             }
                             else {
-                                target[localName] = readMessageField(reader, new messageType(), options);
+                                target[localName] = readMessageField(reader, new messageType(), options, field);
                                 if (messageType.fieldWrapper &&
                                     !field.oneof &&
                                     !field.repeated) {
@@ -137,14 +145,20 @@ export function makeBinaryFormatCommon() {
                         break;
                 }
             }
+            if (delimitedMessageEncoding && // eslint-disable-line @typescript-eslint/strict-boolean-expressions
+                (wireType != WireType.EndGroup || fieldNo !== lengthOrEndTagFieldNo)) {
+                throw new Error(`invalid end group tag`);
+            }
         },
     };
 }
 // Read a message, avoiding MessageType.fromBinary() to re-use the
 // BinaryReadOptions and the IBinaryReader.
-function readMessageField(reader, message, options) {
+function readMessageField(reader, message, options, field) {
     const format = message.getType().runtime.bin;
-    format.readMessage(message, reader, reader.uint32(), options);
+    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
+    options, delimited);
     return message;
 }
 // Read a map field, expecting key field = 1, value field = 2
@@ -166,7 +180,7 @@ function readMapEntry(field, reader, options) {
                         val = reader.int32();
                         break;
                     case "message":
-                        val = readMessageField(reader, new field.V.T(), options);
+                        val = readMessageField(reader, new field.V.T(), options, undefined);
                         break;
                 }
                 break;
@@ -269,17 +283,24 @@ export function writeMapEntry(writer, options, field, key, value) {
             writeScalar(writer, ScalarType.INT32, 2, value, true);
             break;
         case "message":
-            writeMessageField(writer, options, field.V.T, 2, value);
+            writer.tag(2, WireType.LengthDelimited).bytes(value.toBinary(options));
             break;
     }
     writer.join();
 }
-export function writeMessageField(writer, options, type, fieldNo, value) {
+export function writeMessageField(writer, options, field, value) {
     if (value !== undefined) {
-        const message = wrapField(type, value);
-        writer
-            .tag(fieldNo, WireType.LengthDelimited)
-            .bytes(message.toBinary(options));
+        const message = wrapField(field.T, value);
+        // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
+        if (field === null || field === void 0 ? void 0 : field.delimited)
+            writer
+                .tag(field.no, WireType.StartGroup)
+                .raw(message.toBinary(options))
+                .tag(field.no, WireType.EndGroup);
+        else
+            writer
+                .tag(field.no, WireType.LengthDelimited)
+                .bytes(message.toBinary(options));
     }
 }
 export function writeScalar(writer, type, fieldNo, value, emitIntrinsicDefault) {

package/dist/esm/private/binary-format-proto2.js

@@ -62,11 +62,11 @@ export function makeBinaryFormatProto2() {
                         case "message":
                             if (repeated) {
                                 for (const item of value) {
-                                    writeMessageField(writer, options, field.T, field.no, item);
+                                    writeMessageField(writer, options, field, item);
                                 }
                             }
                             else {
-                                writeMessageField(writer, options, field.T, field.no, value);
+                                writeMessageField(writer, options, field, value);
                             }
                             break;
                         case "map":

package/dist/esm/private/binary-format-proto3.js

@@ -53,11 +53,11 @@ export function makeBinaryFormatProto3() {
                     case "message":
                         if (repeated) {
                             for (const item of value) {
-                                writeMessageField(writer, options, field.T, field.no, item);
+                                writeMessageField(writer, options, field, item);
                             }
                         }
                         else {
-                            writeMessageField(writer, options, field.T, field.no, value);
+                            writeMessageField(writer, options, field, value);
                         }
                         break;
                     case "map":

package/dist/esm/proto-delimited.js

@@ -22,8 +22,9 @@ var __await = (this && this.__await) || function (v) { return this instanceof __
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
+    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
     function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
     function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
     function fulfill(value) { resume("next", value); }

package/dist/esm/proto2.js

@@ -54,7 +54,7 @@ export const proto2 = makeProtoRuntime("proto2", makeJsonFormatProto2(), makeBin
     } }));
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument */
 function normalizeFieldInfosProto2(fieldInfos) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const r = [];
     let o;
     for (const field of typeof fieldInfos == "function"
@@ -67,8 +67,6 @@ function normalizeFieldInfosProto2(fieldInfos) {
         if (field.kind == "scalar") {
             f.L = (_c = field.L) !== null && _c !== void 0 ? _c : LongType.BIGINT;
         }
-        // In contrast to proto3, repeated fields are unpacked except when explicitly specified.
-        f.packed = (_d = field.packed) !== null && _d !== void 0 ? _d : false;
         // We do not surface options at this time
         // f.options = field.options ?? emptyReadonlyObject;
         if (field.oneof !== undefined) {
@@ -79,6 +77,12 @@ function normalizeFieldInfosProto2(fieldInfos) {
             f.oneof = o;
             o.addField(f);
         }
+        // proto2 specific:
+        if (field.kind == "message") {
+            f.delimited = (_d = field.delimited) !== null && _d !== void 0 ? _d : false;
+        }
+        // In contrast to proto3, repeated fields are unpacked except when explicitly specified.
+        f.packed = (_e = field.packed) !== null && _e !== void 0 ? _e : false;
         r.push(f);
     }
     return r;

package/dist/esm/proto3.js

@@ -70,16 +70,6 @@ function normalizeFieldInfosProto3(fieldInfos) {
         if (field.kind == "scalar") {
             f.L = (_c = field.L) !== null && _c !== void 0 ? _c : LongType.BIGINT;
         }
-        // From the proto3 language guide:
-        // > In proto3, repeated fields of scalar numeric types are packed by default.
-        // This information is incomplete - according to the conformance tests, BOOL
-        // and ENUM are packed by default as well. This means only STRING and BYTES
-        // are not packed by default, which makes sense because they are length-delimited.
-        f.packed =
-            (_d = field.packed) !== null && _d !== void 0 ? _d : (field.kind == "enum" ||
-                (field.kind == "scalar" &&
-                    field.T != ScalarType.BYTES &&
-                    field.T != ScalarType.STRING));
         // We do not surface options at this time
         // f.options = field.options ?? emptyReadonlyObject;
         if (field.oneof !== undefined) {
@@ -90,6 +80,20 @@ function normalizeFieldInfosProto3(fieldInfos) {
             f.oneof = o;
             o.addField(f);
         }
+        // proto3 specific:
+        if (field.kind == "message") {
+            f.delimited = false;
+        }
+        // From the proto3 language guide:
+        // > In proto3, repeated fields of scalar numeric types are packed by default.
+        // This information is incomplete - according to the conformance tests, BOOL
+        // and ENUM are packed by default as well. This means only STRING and BYTES
+        // are not packed by default, which makes sense because they are length-delimited.
+        f.packed =
+            (_d = field.packed) !== null && _d !== void 0 ? _d : (field.kind == "enum" ||
+                (field.kind == "scalar" &&
+                    field.T != ScalarType.BYTES &&
+                    field.T != ScalarType.STRING));
         r.push(f);
     }
     return r;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of Protocol Buffers in TypeScript, suitable for web browsers and Node.js.",
   "repository": {
@@ -25,9 +25,13 @@
   "main": "./dist/cjs/index.js",
   "exports": {
     ".": {
+      "node": {
+        "import": "./dist/proxy/index.js",
+        "require": "./dist/cjs/index.js"
+      },
       "module": "./dist/esm/index.js",
-      "require": "./dist/cjs/index.js",
-      "import": "./dist/proxy/index.js"
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
     }
   },
   "devDependencies": {