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

package/dist/cjs/reflect/registry.js

@@ -19,6 +19,7 @@ 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");
 /**
  * Create a registry from the given inputs.
  *
@@ -205,8 +206,6 @@ const TYPE_BYTES = 12;
 const TYPE_ENUM = 14;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Label.LABEL_REPEATED: const $name: FieldDescriptorProto_Label.$localName = $number;
 const LABEL_REPEATED = 3;
-// bootstrap-inject google.protobuf.FieldDescriptorProto.Label.LABEL_OPTIONAL: const $name: FieldDescriptorProto_Label.$localName = $number;
-const LABEL_OPTIONAL = 1;
 // bootstrap-inject google.protobuf.FieldDescriptorProto.Label.LABEL_REQUIRED: const $name: FieldDescriptorProto_Label.$localName = $number;
 const LABEL_REQUIRED = 2;
 // bootstrap-inject google.protobuf.FieldOptions.JSType.JS_STRING: const $name: FieldOptions_JSType.$localName = $number;
@@ -215,6 +214,8 @@ const JS_STRING = 1;
 const IDEMPOTENCY_UNKNOWN = 0;
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.EXPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
 const EXPLICIT = 1;
+// bootstrap-inject google.protobuf.FeatureSet.FieldPresence.IMPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
+const IMPLICIT = 2;
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.LEGACY_REQUIRED: const $name: FeatureSet_FieldPresence.$localName = $number;
 const LEGACY_REQUIRED = 3;
 // bootstrap-inject google.protobuf.FeatureSet.RepeatedFieldEncoding.PACKED: const $name: FeatureSet_RepeatedFieldEncoding.$localName = $number;
@@ -225,7 +226,7 @@ const DELIMITED = 2;
 const OPEN = 1;
 // prettier-ignore
 // bootstrap-inject defaults: EDITION_PROTO2 to EDITION_2023: export const minimumEdition: SupportedEdition = $minimumEdition, maximumEdition: SupportedEdition = $maximumEdition;
-// generated from protoc v27.0-rc1
+// generated from protoc v27.0-rc2
 exports.minimumEdition = 998, exports.maximumEdition = 1000;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -266,7 +267,7 @@ function addFile(proto, reg) {
         proto,
         deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
         edition: getFileEdition(proto),
-        name: proto.name.replace(/\.proto/, ""),
+        name: proto.name.replace(/\.proto$/, ""),
         dependencies: findFileDependencies(proto, reg),
         enums: [],
         messages: [],
@@ -274,7 +275,7 @@ function addFile(proto, reg) {
         services: [],
         toString() {
             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions -- we asserted above
-            return `file ${this.proto.name}`;
+            return `file ${proto.name}`;
         },
     };
     const mapEntriesStore = new Map();
@@ -345,6 +346,7 @@ function addFields(message, reg, mapEntries) {
         const oneof = findOneof(proto, allOneofs);
         const field = newField(proto, message, reg, oneof, mapEntries);
         message.fields.push(field);
+        message.field[field.localName] = field;
         if (oneof === undefined) {
             message.members.push(field);
         }
@@ -369,6 +371,7 @@ function addFields(message, reg, mapEntries) {
  */
 function addEnum(proto, file, parent, reg) {
     var _a, _b, _c;
+    const sharedPrefix = findEnumSharedPrefix(proto.name, proto.value);
     const desc = {
         kind: "enum",
         proto,
@@ -379,7 +382,7 @@ function addEnum(proto, file, parent, reg) {
         name: proto.name,
         typeName: makeTypeName(proto, parent, file),
         values: [],
-        sharedPrefix: findEnumSharedPrefix(proto.name, proto.value.map((v) => v.name)),
+        sharedPrefix,
         toString() {
             return `enum ${this.typeName}`;
         },
@@ -388,12 +391,14 @@ function addEnum(proto, file, parent, reg) {
     reg.add(desc);
     proto.value.forEach((proto) => {
         var _a, _b;
+        const name = proto.name;
         desc.values.push({
             kind: "enum_value",
             proto,
             deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
             parent: desc,
             name: proto.name,
+            localName: (0, names_js_1.safeObjectProperty)(sharedPrefix == undefined ? name : name.substring(sharedPrefix.length)),
             number: proto.number,
             toString() {
                 return `enum value ${desc.typeName}.${this.name}`;
@@ -417,6 +422,7 @@ function addMessage(proto, file, parent, reg, mapEntries) {
         name: proto.name,
         typeName: makeTypeName(proto, parent, file),
         fields: [],
+        field: {},
         oneofs: [],
         members: [],
         nestedEnums: [],
@@ -493,6 +499,9 @@ function newMethod(proto, parent, reg) {
         deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
         parent,
         name,
+        localName: (0, names_js_1.safeObjectProperty)(name.length
+            ? (0, names_js_1.safeObjectProperty)(name[0].toLowerCase() + name.substring(1))
+            : name),
         methodKind,
         input,
         output,
@@ -513,6 +522,7 @@ function newOneof(proto, parent) {
         parent,
         fields: [],
         name: proto.name,
+        localName: (0, names_js_1.safeObjectProperty)((0, names_js_1.protoCamelCase)(proto.name)),
         toString() {
             return `oneof ${parent.typeName}.${this.name}`;
         },
@@ -520,7 +530,9 @@ function newOneof(proto, parent) {
 }
 function newField(proto, parentOrFile, reg, oneof, mapEntries) {
     var _a, _b, _c;
+    const isExtension = mapEntries === undefined;
     const field = {
+        kind: "field",
         proto,
         deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false,
         name: proto.name,
@@ -528,8 +540,16 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         scalar: undefined,
         message: undefined,
         enum: undefined,
+        presence: getFieldPresence(proto, oneof, isExtension, parentOrFile),
+        listKind: undefined,
+        mapKind: undefined,
+        mapKey: undefined,
+        delimitedEncoding: undefined,
+        packed: undefined,
+        longType: undefined,
+        getDefaultValue: undefined,
     };
-    if (mapEntries === undefined) {
+    if (isExtension) {
         // extension field
         const file = parentOrFile.kind == "file" ? parentOrFile : parentOrFile.file;
         const parent = parentOrFile.kind == "file" ? undefined : parentOrFile;
@@ -549,9 +569,11 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
         // regular field
         const parent = parentOrFile;
         (0, assert_js_1.assert)(parent.kind == "message");
-        field.kind = "field";
         field.parent = parent;
         field.oneof = oneof;
+        field.localName = oneof
+            ? (0, names_js_1.protoCamelCase)(proto.name)
+            : (0, names_js_1.safeObjectProperty)((0, names_js_1.protoCamelCase)(proto.name));
         field.jsonName = proto.jsonName;
         field.toString = () => `field ${parent.typeName}.${proto.name}`;
     }
@@ -572,7 +594,7 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
             (0, assert_js_1.assert)(keyField.scalar != scalar_js_1.ScalarType.BYTES &&
                 keyField.scalar != scalar_js_1.ScalarType.FLOAT &&
                 keyField.scalar != scalar_js_1.ScalarType.DOUBLE);
-            const valueField = mapEntry.fields.find((f) => f.proto.number === 2);
+            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;
@@ -642,8 +664,6 @@ function newField(proto, parentOrFile, reg, oneof, mapEntries) {
             break;
         }
     }
-    field.presence = getFieldPresence(proto, oneof, parentOrFile);
-    field.optional = isOptionalField(field);
     return field;
 }
 /**
@@ -682,13 +702,13 @@ function findFileDependencies(proto, reg) {
  * Finds a prefix shared by enum values, for example `my_enum_` for
  * `enum MyEnum {MY_ENUM_A=0; MY_ENUM_B=1;}`.
  */
-function findEnumSharedPrefix(enumName, valueNames) {
+function findEnumSharedPrefix(enumName, values) {
     const prefix = camelToSnakeCase(enumName) + "_";
-    for (const name of valueNames) {
-        if (!name.toLowerCase().startsWith(prefix)) {
+    for (const value of values) {
+        if (!value.name.toLowerCase().startsWith(prefix)) {
             return undefined;
         }
-        const shortName = name.substring(prefix.length);
+        const shortName = value.name.substring(prefix.length);
         if (shortName.length == 0) {
             return undefined;
         }
@@ -760,39 +780,28 @@ function findOneof(proto, allOneofs) {
  * Presence of the field.
  * See https://protobuf.dev/programming-guides/field_presence/
  */
-function getFieldPresence(proto, oneof, parent) {
+function getFieldPresence(proto, oneof, isExtension, parent) {
     if (proto.label == LABEL_REQUIRED) {
         // proto2 required is LEGACY_REQUIRED
         return LEGACY_REQUIRED;
     }
-    const { edition } = parent.kind == "message" ? parent.file : parent;
-    if (edition == EDITION_PROTO3) {
-        // proto3 oneof and optional are explicit
-        if (oneof != undefined || proto.proto3Optional) {
-            return EXPLICIT;
-        }
-        // proto3 singular message is explicit
-        const singularMessage = proto.label != LABEL_REPEATED && proto.type == TYPE_MESSAGE;
-        if (singularMessage) {
-            return EXPLICIT;
-        }
+    if (proto.label == LABEL_REPEATED) {
+        // repeated fields (including maps) do not track presence
+        return IMPLICIT;
     }
-    // also resolves proto2/proto3 defaults
-    return resolveFeature("fieldPresence", { proto, parent });
-}
-/**
- * Did the user use the `optional` keyword?
- */
-function isOptionalField(field) {
-    const edition = (field.kind == "extension" ? field.file : field.parent.file)
-        .edition;
-    if (edition == EDITION_PROTO2) {
-        return !field.oneof && field.proto.label == LABEL_OPTIONAL;
+    if (!!oneof || proto.proto3Optional) {
+        // oneof is always explicit
+        return EXPLICIT;
     }
-    if (edition == EDITION_PROTO3) {
-        return field.proto.proto3Optional;
+    if (proto.type == TYPE_MESSAGE) {
+        // singular message field cannot be implicit
+        return EXPLICIT;
     }
-    return false;
+    if (isExtension) {
+        // extensions always track presence
+        return EXPLICIT;
+    }
+    return resolveFeature("fieldPresence", { proto, parent });
 }
 /**
  * Pack this repeated field?

package/dist/cjs/reflect/unsafe.js

@@ -14,7 +14,6 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unsafeSetMapEntry = exports.unsafeAddListItem = exports.unsafeClear = exports.unsafeSet = exports.unsafeGet = exports.unsafeIsSetExplicit = exports.unsafeIsSet = exports.unsafeOneofCase = exports.unsafeLocal = void 0;
-const names_js_1 = require("./names.js");
 const scalar_js_1 = require("./scalar.js");
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.IMPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
 const IMPLICIT = 2;
@@ -26,11 +25,11 @@ exports.unsafeLocal = Symbol.for("reflect unsafe local");
  */
 function unsafeOneofCase(target, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
 oneof) {
-    const c = target[(0, names_js_1.localName)(oneof)].case;
+    const c = target[oneof.localName].case;
     if (c === undefined) {
         return c;
     }
-    return oneof.fields.find((f) => (0, names_js_1.localName)(f) === c);
+    return oneof.fields.find((f) => f.localName === c);
 }
 exports.unsafeOneofCase = unsafeOneofCase;
 /**
@@ -40,28 +39,28 @@ exports.unsafeOneofCase = unsafeOneofCase;
  */
 function unsafeIsSet(target, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
 field) {
-    const name = (0, names_js_1.localName)(field);
+    const name = field.localName;
     if (field.oneof) {
-        return target[(0, names_js_1.localName)(field.oneof)].case === name; // eslint-disable-line @typescript-eslint/no-unsafe-member-access
+        return target[field.oneof.localName].case === name; // eslint-disable-line @typescript-eslint/no-unsafe-member-access
     }
+    if (field.presence != IMPLICIT) {
+        // Fields with explicit presence have properties on the prototype chain
+        // for default / zero values (except for proto3).
+        return (target[name] !== undefined &&
+            Object.prototype.hasOwnProperty.call(target, name));
+    }
+    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
     switch (field.fieldKind) {
-        case "message":
-            return target[name] !== undefined;
         case "list":
             return target[name].length > 0;
         case "map":
             return Object.keys(target[name]).length > 0; // eslint-disable-line @typescript-eslint/no-unsafe-argument
-        default:
-            if (field.presence == IMPLICIT) {
-                if (field.fieldKind == "enum") {
-                    return target[name] !== field.enum.values[0].number;
-                }
-                return !(0, scalar_js_1.isScalarZeroValue)(field.scalar, target[name]);
-            }
-            // EXPLICIT and LEGACY_REQUIRED
-            return (target[name] !== undefined &&
-                Object.prototype.hasOwnProperty.call(target, name));
+        case "scalar":
+            return !(0, scalar_js_1.isScalarZeroValue)(field.scalar, target[name]);
+        case "enum":
+            return target[name] !== field.enum.values[0].number;
     }
+    throw new Error("message field with implicit presence");
 }
 exports.unsafeIsSet = unsafeIsSet;
 /**
@@ -81,15 +80,14 @@ exports.unsafeIsSetExplicit = unsafeIsSetExplicit;
  * @private
  */
 function unsafeGet(target, field) {
-    const name = (0, names_js_1.localName)(field);
     if (field.oneof) {
-        const oneof = target[(0, names_js_1.localName)(field.oneof)];
-        if (oneof.case === name) {
+        const oneof = target[field.oneof.localName];
+        if (oneof.case === field.localName) {
             return oneof.value;
         }
         return undefined;
     }
-    return target[name];
+    return target[field.localName];
 }
 exports.unsafeGet = unsafeGet;
 /**
@@ -98,15 +96,14 @@ exports.unsafeGet = unsafeGet;
  * @private
  */
 function unsafeSet(target, field, value) {
-    const name = (0, names_js_1.localName)(field);
     if (field.oneof) {
-        target[(0, names_js_1.localName)(field.oneof)] = {
-            case: name,
+        target[field.oneof.localName] = {
+            case: field.localName,
             value: value,
         };
     }
     else {
-        target[name] = value;
+        target[field.localName] = value;
     }
 }
 exports.unsafeSet = unsafeSet;
@@ -117,14 +114,21 @@ exports.unsafeSet = unsafeSet;
  */
 function unsafeClear(target, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
 field) {
-    const name = (0, names_js_1.localName)(field);
+    const name = field.localName;
     if (field.oneof) {
-        const oneofLocalName = (0, names_js_1.localName)(field.oneof);
+        const oneofLocalName = field.oneof.localName;
         if (target[oneofLocalName].case === name) {
             target[oneofLocalName] = { case: undefined };
         }
     }
+    else if (field.presence != IMPLICIT) {
+        // Fields with explicit presence have properties on the prototype chain
+        // for default / zero values (except for proto3). By deleting their own
+        // property, the field is reset.
+        delete target[name];
+    }
     else {
+        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
         switch (field.fieldKind) {
             case "map":
                 target[name] = {};
@@ -132,19 +136,12 @@ field) {
             case "list":
                 target[name] = [];
                 break;
-            case "message":
-                delete target[name];
+            case "enum":
+                target[name] = field.enum.values[0].number;
+                break;
+            case "scalar":
+                target[name] = (0, scalar_js_1.scalarZeroValue)(field.scalar, field.longType);
                 break;
-            default:
-                if (field.presence == IMPLICIT) {
-                    target[name] =
-                        field.fieldKind == "enum"
-                            ? field.enum.values[0].number
-                            : (0, scalar_js_1.scalarZeroValue)(field.scalar, field.longType);
-                }
-                else {
-                    delete target[name];
-                }
         }
     }
 }
@@ -155,8 +152,7 @@ exports.unsafeClear = unsafeClear;
  * @private
  */
 function unsafeAddListItem(target, field, value) {
-    const name = (0, names_js_1.localName)(field);
-    target[name].push(value);
+    target[field.localName].push(value);
 }
 exports.unsafeAddListItem = unsafeAddListItem;
 /**
@@ -165,7 +161,6 @@ exports.unsafeAddListItem = unsafeAddListItem;
  * @private
  */
 function unsafeSetMapEntry(target, field, key, value) {
-    const name = (0, names_js_1.localName)(field);
-    target[name][key] = value;
+    target[field.localName][key] = value;
 }
 exports.unsafeSetMapEntry = unsafeSetMapEntry;

package/dist/cjs/to-binary.js

@@ -34,9 +34,7 @@ function writeFields(writer, opts, msg) {
     var _a;
     for (const f of msg.sortedFields) {
         if (!msg.isSet(f)) {
-            if (f.fieldKind != "map" &&
-                f.fieldKind != "list" &&
-                f.presence == LEGACY_REQUIRED) {
+            if (f.presence == LEGACY_REQUIRED) {
                 throw new Error(`cannot encode field ${msg.desc.typeName}.${f.name} to binary: required field not set`);
             }
             continue;

package/dist/cjs/to-json.js

@@ -24,8 +24,8 @@ const index_js_2 = require("./wire/index.js");
 const extensions_js_1 = require("./extensions.js");
 // bootstrap-inject google.protobuf.FeatureSet.FieldPresence.LEGACY_REQUIRED: const $name: FeatureSet_FieldPresence.$localName = $number;
 const LEGACY_REQUIRED = 3;
-// bootstrap-inject google.protobuf.FieldDescriptorProto.Label.LABEL_OPTIONAL: const $name: FieldDescriptorProto_Label.$localName = $number;
-const LABEL_OPTIONAL = 1;
+// bootstrap-inject google.protobuf.FeatureSet.FieldPresence.IMPLICIT: const $name: FeatureSet_FieldPresence.$localName = $number;
+const IMPLICIT = 2;
 // Default options for serializing to JSON.
 const jsonWriteDefaults = {
     emitDefaultValues: false,
@@ -60,15 +60,11 @@ function reflectToJson(msg, opts) {
     const json = {};
     for (const f of msg.sortedFields) {
         if (!msg.isSet(f)) {
-            if (f.fieldKind != "map" &&
-                f.fieldKind != "list" &&
-                f.presence == LEGACY_REQUIRED) {
+            if (f.presence == LEGACY_REQUIRED) {
                 throw new Error(`cannot encode field ${msg.desc.typeName}.${f.name} to binary: required field not set`);
             }
-            if (!opts.emitDefaultValues) {
-                continue;
-            }
-            if (!canEmitFieldDefaultValue(f)) {
+            if (!opts.emitDefaultValues || f.presence !== IMPLICIT) {
+                // Fields with implicit presence omit zero values (e.g. empty string) by default
                 continue;
             }
         }
@@ -90,8 +86,8 @@ function reflectToJson(msg, opts) {
                 continue;
             }
             const value = (0, extensions_js_1.getExtension)(msg.message, extension);
-            const [, field] = (0, extensions_js_1.createExtensionContainer)(extension);
-            const jsonValue = fieldToJson(field, value, opts);
+            const [container, field] = (0, extensions_js_1.createExtensionContainer)(extension, value);
+            const jsonValue = fieldToJson(field, container.get(field), opts);
             if (jsonValue !== undefined) {
                 json[extension.jsonName] = jsonValue;
             }
@@ -219,22 +215,6 @@ function scalarToJson(type, value) {
             return (0, index_js_2.base64Encode)(value);
     }
 }
-// Decide whether an unset field should be emitted with JSON write option `emitDefaultValues`
-function canEmitFieldDefaultValue(field) {
-    switch (true) {
-        // oneof fields are never emitted
-        case field.oneof !== undefined:
-        // singular message field are allowed to emit JSON null, but we do not
-        // eslint-disable-next-line no-fallthrough
-        case field.fieldKind === "message":
-        // the field uses explicit presence, so we cannot emit a zero value
-        // eslint-disable-next-line no-fallthrough
-        case field.proto.label === LABEL_OPTIONAL:
-            return false;
-        default:
-            return true;
-    }
-}
 function jsonName(f, opts) {
     return opts.useProtoFieldName ? f.name : f.jsonName;
 }

package/dist/cjs/wire/base64-encoding.js

@@ -42,10 +42,10 @@ function base64Decode(base64Str) {
         b = table[base64Str.charCodeAt(i)];
         if (b === undefined) {
             switch (base64Str[i]) {
-                // @ts-ignore TS7029: Fallthrough case in switch
+                // @ts-expect-error TS7029: Fallthrough case in switch
                 case "=":
                     groupPos = 0; // reset state when padding found
-                // @ts-ignore TS7029: Fallthrough case in switch
+                // eslint-disable-next-line no-fallthrough
                 case "\n":
                 case "\r":
                 case "\t":

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

@@ -170,10 +170,12 @@ export declare class BinaryReader {
      */
     tag(): [number, WireType];
     /**
-     * Skip one element on the wire and return the skipped data.
-     * Supports WireType.StartGroup since v2.0.0-alpha.23.
+     * Skip one element and return the skipped data.
+     *
+     * When skipping StartGroup, provide the tags field number to check for
+     * matching field number in the EndGroup tag.
      */
-    skip(wireType: WireType): Uint8Array;
+    skip(wireType: WireType, fieldNo?: number): Uint8Array;
     protected varint64: () => [number, number];
     /**
      * Throws error if position in byte array is out of range.

package/dist/cjs/wire/binary-encoding.js

@@ -295,10 +295,12 @@ class BinaryReader {
         return [fieldNo, wireType];
     }
     /**
-     * Skip one element on the wire and return the skipped data.
-     * Supports WireType.StartGroup since v2.0.0-alpha.23.
+     * Skip one element and return the skipped data.
+     *
+     * When skipping StartGroup, provide the tags field number to check for
+     * matching field number in the EndGroup tag.
      */
-    skip(wireType) {
+    skip(wireType, fieldNo) {
         let start = this.pos;
         switch (wireType) {
             case WireType.Varint:
@@ -307,11 +309,10 @@ class BinaryReader {
                 }
                 break;
             // eslint-disable-next-line
-            // @ts-ignore TS7029: Fallthrough case in switch
+            // @ts-expect-error TS7029: Fallthrough case in switch
             case WireType.Bit64:
                 this.pos += 4;
-            // eslint-disable-next-line
-            // @ts-ignore TS7029: Fallthrough case in switch
+            // eslint-disable-next-line no-fallthrough
             case WireType.Bit32:
                 this.pos += 4;
                 break;
@@ -320,10 +321,15 @@ class BinaryReader {
                 this.pos += len;
                 break;
             case WireType.StartGroup:
-                // TODO check for matching field numbers in StartGroup / EndGroup tags
-                let t;
-                while ((t = this.tag()[1]) !== WireType.EndGroup) {
-                    this.skip(t);
+                for (;;) {
+                    const [fn, wt] = this.tag();
+                    if (wt === WireType.EndGroup) {
+                        if (fieldNo !== undefined && fn !== fieldNo) {
+                            throw new Error("invalid end group tag");
+                        }
+                        break;
+                    }
+                    this.skip(wt, fn);
                 }
                 break;
             default:

package/dist/cjs/wkt/gen/google/protobuf/any_pb.d.ts

@@ -1,5 +1,8 @@
 import type { GenDescFile, GenDescMessage } from "../../../../codegenv1/types.js";
 import type { Message } from "../../../../types.js";
+/**
+ * Describes the file google/protobuf/any.proto.
+ */
 export declare const fileDesc_google_protobuf_any: GenDescFile;
 /**
  * `Any` contains an arbitrary serialized protocol buffer message along with a
@@ -133,4 +136,8 @@ export type Any = Message<"google.protobuf.Any"> & {
      */
     value: Uint8Array;
 };
+/**
+ * Describes the message google.protobuf.Any.
+ * Use `create(AnyDesc)` to create a new message.
+ */
 export declare const AnyDesc: GenDescMessage<Any>;

package/dist/cjs/wkt/gen/google/protobuf/any_pb.js

@@ -16,7 +16,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnyDesc = exports.fileDesc_google_protobuf_any = void 0;
 const file_js_1 = require("../../../../codegenv1/file.js");
 const message_js_1 = require("../../../../codegenv1/message.js");
+/**
+ * Describes the file google/protobuf/any.proto.
+ */
 exports.fileDesc_google_protobuf_any = (0, file_js_1.fileDesc)("Chlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvEg9nb29nbGUucHJvdG9idWYiJgoDQW55EhAKCHR5cGVfdXJsGAEgASgJEg0KBXZhbHVlGAIgASgMQnYKE2NvbS5nb29nbGUucHJvdG9idWZCCEFueVByb3RvUAFaLGdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL2FueXBiogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM");
-// Describes the message google.protobuf.Any.
-// Use `create(AnyDesc)` to create a new Any.
+/**
+ * Describes the message google.protobuf.Any.
+ * Use `create(AnyDesc)` to create a new message.
+ */
 exports.AnyDesc = (0, message_js_1.messageDesc)(exports.fileDesc_google_protobuf_any, 0);

package/dist/cjs/wkt/gen/google/protobuf/api_pb.d.ts

@@ -2,6 +2,9 @@ import type { GenDescFile, GenDescMessage } from "../../../../codegenv1/types.js
 import type { SourceContext } from "./source_context_pb.js";
 import type { Option, Syntax } from "./type_pb.js";
 import type { Message } from "../../../../types.js";
+/**
+ * Describes the file google/protobuf/api.proto.
+ */
 export declare const fileDesc_google_protobuf_api: GenDescFile;
 /**
  * Api is a light-weight descriptor for an API Interface.
@@ -81,6 +84,10 @@ export type Api = Message<"google.protobuf.Api"> & {
      */
     syntax: Syntax;
 };
+/**
+ * Describes the message google.protobuf.Api.
+ * Use `create(ApiDesc)` to create a new message.
+ */
 export declare const ApiDesc: GenDescMessage<Api>;
 /**
  * Method represents a method of an API interface.
@@ -131,6 +138,10 @@ export type Method = Message<"google.protobuf.Method"> & {
      */
     syntax: Syntax;
 };
+/**
+ * Describes the message google.protobuf.Method.
+ * Use `create(MethodDesc)` to create a new message.
+ */
 export declare const MethodDesc: GenDescMessage<Method>;
 /**
  * Declares an API Interface to be included in this interface. The including
@@ -229,4 +240,8 @@ export type Mixin = Message<"google.protobuf.Mixin"> & {
      */
     root: string;
 };
+/**
+ * Describes the message google.protobuf.Mixin.
+ * Use `create(MixinDesc)` to create a new message.
+ */
 export declare const MixinDesc: GenDescMessage<Mixin>;