@bufbuild/protobuf 1.6.0 → 1.7.0

package/dist/cjs/private/names.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.
@@ -30,7 +30,8 @@ function localName(desc) {
             return localOneofName(desc.name);
         case "enum":
         case "message":
-        case "service": {
+        case "service":
+        case "extension": {
             const pkg = desc.file.proto.package;
             const offset = pkg === undefined ? 0 : pkg.length + 1;
             const name = desc.typeName.substring(offset).replace(/\./g, "_");

package/dist/cjs/private/options-map.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/private/proto-runtime.d.ts

@@ -7,6 +7,8 @@ import type { MessageType } from "../message-type.js";
 import type { FieldListSource } from "./field-list.js";
 import type { EnumObject } from "./enum.js";
 import type { Util } from "./util.js";
+import type { Extension } from "../extension.js";
+import type { ExtensionFieldSource } from "./extensions.js";
 /**
  * A facade that provides serialization and other internal functionality.
  */
@@ -43,5 +45,9 @@ export interface ProtoRuntime {
      * enum, or an enum constructed with makeEnum(), it raises an error.
      */
     getEnumType(enumObject: EnumObject): EnumType;
+    /**
+     * Create an extension at runtime, without generating code.
+     */
+    makeExtension<E extends Message<E> = AnyMessage, V = unknown>(typeName: string, extendee: MessageType<E>, field: ExtensionFieldSource): Extension<E, V>;
 }
 export declare function makeProtoRuntime(syntax: string, json: JsonFormat, bin: BinaryFormat, util: Util): ProtoRuntime;

package/dist/cjs/private/proto-runtime.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeProtoRuntime = void 0;
 const enum_js_1 = require("./enum.js");
 const message_type_js_1 = require("./message-type.js");
+const extensions_js_1 = require("./extensions.js");
 function makeProtoRuntime(syntax, json, bin, util) {
     return {
         syntax,
@@ -28,6 +29,9 @@ function makeProtoRuntime(syntax, json, bin, util) {
         makeEnum: enum_js_1.makeEnum,
         makeEnumType: enum_js_1.makeEnumType,
         getEnumType: enum_js_1.getEnumType,
+        makeExtension(typeName, extendee, field) {
+            return (0, extensions_js_1.makeExtension)(this, typeName, extendee, field);
+        },
     };
 }
 exports.makeProtoRuntime = makeProtoRuntime;

package/dist/cjs/private/reify-wkt.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/private/scalars.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/private/text-format.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/private/util-common.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/private/util.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/proto-base64.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/proto-delimited.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/proto-double.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/proto-int64.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/proto2.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/proto3.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/service-type.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/to-plain-message.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/cjs/type-registry.d.ts

@@ -1,6 +1,7 @@
 import type { MessageType } from "./message-type.js";
 import type { EnumType } from "./enum.js";
 import type { ServiceType } from "./service-type.js";
+import type { Extension } from "./extension.js";
 /**
  * IMessageTypeRegistry provides look-up for message types.
  *
@@ -41,3 +42,16 @@ export interface IServiceTypeRegistry {
      */
     findService(typeName: string): ServiceType | undefined;
 }
+/**
+ * IExtensionRegistry provides look-up for extensions.
+ */
+export interface IExtensionRegistry {
+    /**
+     * Find an extension by the extendee type name and the extension number.
+     */
+    findExtensionFor(extendee: string, no: number): Extension | undefined;
+    /**
+     * Find an extension type by its protobuf type name.
+     */
+    findExtension(typeName: string): Extension | undefined;
+}

package/dist/cjs/type-registry.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/esm/binary-encoding.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.
@@ -315,8 +315,7 @@ export class BinaryReader {
                 this.pos += len;
                 break;
             case WireType.StartGroup:
-                // From descriptor.proto: Group type is deprecated, not supported in proto3.
-                // But we must still be able to parse and treat as unknown.
+                // TODO check for matching field numbers in StartGroup / EndGroup tags
                 let t;
                 while ((t = this.tag()[1]) !== WireType.EndGroup) {
                     this.skip(t);

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

@@ -1,5 +1,6 @@
 import type { Message } from "./message.js";
 import type { IBinaryReader, IBinaryWriter, WireType } from "./binary-encoding.js";
+import type { FieldInfo } from "./field.js";
 /**
  * BinaryFormat is the contract for serializing messages to and from binary
  * data. Implementations may be specific to a proto syntax, and can be
@@ -27,10 +28,26 @@ export interface BinaryFormat {
      * delimitedMessageEncoding is optional for backwards compatibility.
      */
     readMessage(message: Message, reader: IBinaryReader, lengthOrEndTagFieldNo: number, options: BinaryReadOptions, delimitedMessageEncoding?: boolean): void;
+    /**
+     * Parse a field from binary data, and store it in the given target.
+     *
+     * The target must be an initialized message object, with oneof groups,
+     * repeated fields and maps already present.
+     */
+    readField(target: Record<string, any>, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
+    reader: IBinaryReader, field: FieldInfo, wireType: WireType, options: BinaryReadOptions): void;
     /**
      * Serialize a message to binary data.
      */
     writeMessage(message: Message, writer: IBinaryWriter, options: BinaryWriteOptions): void;
+    /**
+     * Serialize a field value to binary data.
+     *
+     * The value must be an array for repeated fields, a record object for map
+     * fields. Only selected oneof fields should be passed to this method.
+     */
+    writeField(field: FieldInfo, value: any, // eslint-disable-line @typescript-eslint/no-explicit-any -- `any` is the best choice for dynamic access
+    writer: IBinaryWriter, options: BinaryWriteOptions): void;
     /**
      * Retrieve the unknown fields for the given message.
      *

package/dist/esm/binary-format.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.

package/dist/esm/codegen-info.d.ts

@@ -1,14 +1,14 @@
 import { reifyWkt } from "./private/reify-wkt.js";
-import type { DescEnum, DescEnumValue, DescField, DescMessage, DescMethod, DescOneof, DescService } from "./descriptor-set";
+import type { DescEnum, DescEnumValue, DescField, DescExtension, DescMessage, DescMethod, DescOneof, DescService } from "./descriptor-set";
 import { LongType, ScalarType } from "./field.js";
 interface CodegenInfo {
     /**
      * Name of the runtime library NPM package.
      */
     readonly packageName: string;
-    readonly localName: (desc: DescEnum | DescEnumValue | DescMessage | DescOneof | DescField | DescService | DescMethod) => string;
+    readonly localName: (desc: DescEnum | DescEnumValue | DescMessage | DescExtension | DescOneof | DescField | DescService | DescMethod) => string;
     readonly symbols: Record<RuntimeSymbolName, RuntimeSymbolInfo>;
-    readonly getUnwrappedFieldType: (field: DescField) => ScalarType | undefined;
+    readonly getUnwrappedFieldType: (field: DescField | DescExtension) => ScalarType | undefined;
     readonly wktSourceFiles: readonly string[];
     readonly scalarDefaultValue: (type: ScalarType, longType: LongType) => any;
     /**
@@ -18,7 +18,7 @@ interface CodegenInfo {
     readonly safeIdentifier: (name: string) => string;
     readonly safeObjectProperty: (name: string) => string;
 }
-type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoDouble" | "protoInt64" | "ScalarType" | "LongType" | "MethodKind" | "MethodIdempotency" | "IMessageTypeRegistry";
+type RuntimeSymbolName = "proto2" | "proto3" | "Message" | "PartialMessage" | "PlainMessage" | "FieldList" | "MessageType" | "Extension" | "BinaryReadOptions" | "BinaryWriteOptions" | "JsonReadOptions" | "JsonWriteOptions" | "JsonValue" | "JsonObject" | "protoDouble" | "protoInt64" | "ScalarType" | "LongType" | "MethodKind" | "MethodIdempotency" | "IMessageTypeRegistry";
 type RuntimeSymbolInfo = {
     typeOnly: boolean;
     publicImportPath: string;

package/dist/esm/codegen-info.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.
@@ -34,6 +34,7 @@ export const codegenInfo = {
         PlainMessage: { typeOnly: true, privateImportPath: "./message.js", publicImportPath: packageName },
         FieldList: { typeOnly: true, privateImportPath: "./field-list.js", publicImportPath: packageName },
         MessageType: { typeOnly: true, privateImportPath: "./message-type.js", publicImportPath: packageName },
+        Extension: { typeOnly: true, privateImportPath: "./extension.js", publicImportPath: packageName },
         BinaryReadOptions: { typeOnly: true, privateImportPath: "./binary-format.js", publicImportPath: packageName },
         BinaryWriteOptions: { typeOnly: true, privateImportPath: "./binary-format.js", publicImportPath: packageName },
         JsonReadOptions: { typeOnly: true, privateImportPath: "./json-format.js", publicImportPath: packageName },

package/dist/esm/create-descriptor-set.d.ts

@@ -20,7 +20,7 @@ interface CreateDescriptorSetOptions {
      *
      * To create a DescriptorSet that provides your language-specific features,
      * you have to provide a google.protobuf.FeatureSetDefaults message in this
-     * option.
+     * option. It can also specify the minimum and maximum supported edition.
      *
      * The defaults can be generated with `protoc` - see the flag
      * `--experimental_edition_defaults_out`.

package/dist/esm/create-descriptor-set.js

@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Buf Technologies, Inc.
+// 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.
@@ -27,27 +27,35 @@ import { createFeatureResolver, featureSetDefaults, } from "./private/feature-se
  * files in topological order.
  */
 export function createDescriptorSet(input, options) {
-    var _a;
     const cart = {
         enums: new Map(),
         messages: new Map(),
         services: new Map(),
         extensions: new Map(),
         mapEntries: new Map(),
-        resolveFeatures: createFeatureResolver((_a = options === null || options === void 0 ? void 0 : options.featureSetDefaults) !== null && _a !== void 0 ? _a : featureSetDefaults),
     };
     const fileDescriptors = input instanceof FileDescriptorSet
         ? input.file
         : input instanceof Uint8Array
             ? FileDescriptorSet.fromBinary(input).file
             : input;
-    const files = fileDescriptors.map((proto) => newFile(proto, cart));
+    const resolverByEdition = new Map();
+    const files = fileDescriptors.map((proto) => {
+        var _a, _b;
+        const edition = (_a = proto.edition) !== null && _a !== void 0 ? _a : parseFileSyntax(proto.syntax, proto.edition).edition;
+        let resolveFeatures = resolverByEdition.get(edition);
+        if (resolveFeatures === undefined) {
+            resolveFeatures = createFeatureResolver((_b = options === null || options === void 0 ? void 0 : options.featureSetDefaults) !== null && _b !== void 0 ? _b : featureSetDefaults, edition);
+            resolverByEdition.set(edition, resolveFeatures);
+        }
+        return newFile(proto, cart, resolveFeatures);
+    });
     return Object.assign({ files }, cart);
 }
 /**
  * Create a descriptor for a file.
  */
-function newFile(proto, cart) {
+function newFile(proto, cart, resolveFeatures) {
     var _a, _b;
     assert(proto.name, `invalid FileDescriptorProto: missing name`);
     const file = Object.assign(Object.assign({ kind: "file", proto, deprecated: (_b = (_a = proto.options) === null || _a === void 0 ? void 0 : _a.deprecated) !== null && _b !== void 0 ? _b : false }, parseFileSyntax(proto.syntax, proto.edition)), { name: proto.name.replace(/\.proto/, ""), enums: [], messages: [], extensions: [], services: [], toString() {
@@ -66,25 +74,25 @@ function newFile(proto, cart) {
         },
         getFeatures() {
             var _a;
-            return cart.resolveFeatures(this.edition, (_a = this.proto.options) === null || _a === void 0 ? void 0 : _a.features);
+            return resolveFeatures((_a = proto.options) === null || _a === void 0 ? void 0 : _a.features);
         } });
     cart.mapEntries.clear(); // map entries are local to the file, we can safely discard
     for (const enumProto of proto.enumType) {
-        addEnum(enumProto, file, undefined, cart);
+        addEnum(enumProto, file, undefined, cart, resolveFeatures);
     }
     for (const messageProto of proto.messageType) {
-        addMessage(messageProto, file, undefined, cart);
+        addMessage(messageProto, file, undefined, cart, resolveFeatures);
     }
     for (const serviceProto of proto.service) {
-        addService(serviceProto, file, cart);
+        addService(serviceProto, file, cart, resolveFeatures);
     }
-    addExtensions(file, cart);
+    addExtensions(file, cart, resolveFeatures);
     for (const mapEntry of cart.mapEntries.values()) {
-        addFields(mapEntry, cart);
+        addFields(mapEntry, cart, resolveFeatures);
     }
     for (const message of file.messages) {
-        addFields(message, cart);
-        addExtensions(message, cart);
+        addFields(message, cart, resolveFeatures);
+        addExtensions(message, cart, resolveFeatures);
     }
     cart.mapEntries.clear(); // map entries are local to the file, we can safely discard
     return file;
@@ -94,23 +102,23 @@ function newFile(proto, cart) {
  * and to our cart.
  * Recurses into nested types.
  */
-function addExtensions(desc, cart) {
+function addExtensions(desc, cart, resolveFeatures) {
     switch (desc.kind) {
         case "file":
             for (const proto of desc.proto.extension) {
-                const ext = newExtension(proto, desc, undefined, cart);
+                const ext = newExtension(proto, desc, undefined, cart, resolveFeatures);
                 desc.extensions.push(ext);
                 cart.extensions.set(ext.typeName, ext);
             }
             break;
         case "message":
             for (const proto of desc.proto.extension) {
-                const ext = newExtension(proto, desc.file, desc, cart);
+                const ext = newExtension(proto, desc.file, desc, cart, resolveFeatures);
                 desc.nestedExtensions.push(ext);
                 cart.extensions.set(ext.typeName, ext);
             }
             for (const message of desc.nestedMessages) {
-                addExtensions(message, cart);
+                addExtensions(message, cart, resolveFeatures);
             }
             break;
     }
@@ -119,12 +127,12 @@ function addExtensions(desc, cart) {
  * Create descriptors for fields and oneof groups, and add them to the message.
  * Recurses into nested types.
  */
-function addFields(message, cart) {
-    const allOneofs = message.proto.oneofDecl.map((proto) => newOneof(proto, message, cart));
+function addFields(message, cart, resolveFeatures) {
+    const allOneofs = message.proto.oneofDecl.map((proto) => newOneof(proto, message, resolveFeatures));
     const oneofsSeen = new Set();
     for (const proto of message.proto.field) {
         const oneof = findOneof(proto, allOneofs);
-        const field = newField(proto, message.file, message, oneof, cart);
+        const field = newField(proto, message.file, message, oneof, cart, resolveFeatures);
         message.fields.push(field);
         if (oneof === undefined) {
             message.members.push(field);
@@ -141,14 +149,14 @@ function addFields(message, cart) {
         message.oneofs.push(oneof);
     }
     for (const child of message.nestedMessages) {
-        addFields(child, cart);
+        addFields(child, cart, resolveFeatures);
     }
 }
 /**
  * Create a descriptor for an enumeration, and add it our cart and to the
  * parent type, if any.
  */
-function addEnum(proto, file, parent, cart) {
+function addEnum(proto, file, parent, cart, resolveFeatures) {
     var _a, _b, _c;
     assert(proto.name, `invalid EnumDescriptorProto: missing name`);
     const desc = {
@@ -178,9 +186,8 @@ function addEnum(proto, file, parent, cart) {
             return findComments(file.proto.sourceCodeInfo, path);
         },
         getFeatures() {
-            var _a, _b, _c;
-            const parentFeatures = (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getFeatures()) !== null && _b !== void 0 ? _b : this.file.getFeatures();
-            return cart.resolveFeatures(this.file.edition, parentFeatures, (_c = this.proto.options) === null || _c === void 0 ? void 0 : _c.features);
+            var _a, _b;
+            return resolveFeatures((_a = parent === null || parent === void 0 ? void 0 : parent.getFeatures()) !== null && _a !== void 0 ? _a : file.getFeatures(), (_b = proto.options) === null || _b === void 0 ? void 0 : _b.features);
         },
     };
     cart.enums.set(desc.typeName, desc);
@@ -216,7 +223,7 @@ function addEnum(proto, file, parent, cart) {
             },
             getFeatures() {
                 var _a;
-                return cart.resolveFeatures(this.parent.file.edition, this.parent.getFeatures(), (_a = this.proto.options) === null || _a === void 0 ? void 0 : _a.features);
+                return resolveFeatures(desc.getFeatures(), (_a = proto.options) === null || _a === void 0 ? void 0 : _a.features);
             },
         });
     });
@@ -226,7 +233,7 @@ function addEnum(proto, file, parent, cart) {
  * Create a descriptor for a message, including nested types, and add it to our
  * cart. Note that this does not create descriptors fields.
  */
-function addMessage(proto, file, parent, cart) {
+function addMessage(proto, file, parent, cart, resolveFeatures) {
     var _a, _b, _c, _d;
     assert(proto.name, `invalid DescriptorProto: missing name`);
     const desc = {
@@ -260,9 +267,8 @@ function addMessage(proto, file, parent, cart) {
             return findComments(file.proto.sourceCodeInfo, path);
         },
         getFeatures() {
-            var _a, _b, _c;
-            const parentFeatures = (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getFeatures()) !== null && _b !== void 0 ? _b : this.file.getFeatures();
-            return cart.resolveFeatures(this.file.edition, parentFeatures, (_c = this.proto.options) === null || _c === void 0 ? void 0 : _c.features);
+            var _a, _b;
+            return resolveFeatures((_a = parent === null || parent === void 0 ? void 0 : parent.getFeatures()) !== null && _a !== void 0 ? _a : file.getFeatures(), (_b = proto.options) === null || _b === void 0 ? void 0 : _b.features);
         },
     };
     if (((_c = proto.options) === null || _c === void 0 ? void 0 : _c.mapEntry) === true) {
@@ -273,17 +279,17 @@ function addMessage(proto, file, parent, cart) {
         cart.messages.set(desc.typeName, desc);
     }
     for (const enumProto of proto.enumType) {
-        addEnum(enumProto, file, desc, cart);
+        addEnum(enumProto, file, desc, cart, resolveFeatures);
     }
     for (const messageProto of proto.nestedType) {
-        addMessage(messageProto, file, desc, cart);
+        addMessage(messageProto, file, desc, cart, resolveFeatures);
     }
 }
 /**
  * Create a descriptor for a service, including methods, and add it to our
  * cart.
  */
-function addService(proto, file, cart) {
+function addService(proto, file, cart, resolveFeatures) {
     var _a, _b;
     assert(proto.name, `invalid ServiceDescriptorProto: missing name`);
     const desc = {
@@ -306,19 +312,19 @@ function addService(proto, file, cart) {
         },
         getFeatures() {
             var _a;
-            return cart.resolveFeatures(this.file.edition, this.file.getFeatures(), (_a = this.proto.options) === null || _a === void 0 ? void 0 : _a.features);
+            return resolveFeatures(file.getFeatures(), (_a = proto.options) === null || _a === void 0 ? void 0 : _a.features);
         },
     };
     file.services.push(desc);
     cart.services.set(desc.typeName, desc);
     for (const methodProto of proto.method) {
-        desc.methods.push(newMethod(methodProto, desc, cart));
+        desc.methods.push(newMethod(methodProto, desc, cart, resolveFeatures));
     }
 }
 /**
  * Create a descriptor for a method.
  */
-function newMethod(proto, parent, cart) {
+function newMethod(proto, parent, cart, resolveFeatures) {
     var _a, _b, _c;
     assert(proto.name, `invalid MethodDescriptorProto: missing name`);
     assert(proto.inputType, `invalid MethodDescriptorProto: missing input_type`);
@@ -377,14 +383,14 @@ function newMethod(proto, parent, cart) {
         },
         getFeatures() {
             var _a;
-            return cart.resolveFeatures(this.parent.file.edition, this.parent.getFeatures(), (_a = this.proto.options) === null || _a === void 0 ? void 0 : _a.features);
+            return resolveFeatures(parent.getFeatures(), (_a = proto.options) === null || _a === void 0 ? void 0 : _a.features);
         },
     };
 }
 /**
  * Create a descriptor for a oneof group.
  */
-function newOneof(proto, parent, cart) {
+function newOneof(proto, parent, resolveFeatures) {
     assert(proto.name, `invalid OneofDescriptorProto: missing name`);
     return {
         kind: "oneof",
@@ -406,14 +412,14 @@ function newOneof(proto, parent, cart) {
         },
         getFeatures() {
             var _a;
-            return cart.resolveFeatures(this.parent.file.edition, this.parent.getFeatures(), (_a = this.proto.options) === null || _a === void 0 ? void 0 : _a.features);
+            return resolveFeatures(parent.getFeatures(), (_a = proto.options) === null || _a === void 0 ? void 0 : _a.features);
         },
     };
 }
 /**
  * Create a descriptor for a field.
  */
-function newField(proto, file, parent, oneof, cart) {
+function newField(proto, file, parent, oneof, cart, resolveFeatures) {
     var _a, _b, _c;
     assert(proto.name, `invalid FieldDescriptorProto: missing name`);
     assert(proto.number, `invalid FieldDescriptorProto: missing number`);
@@ -426,8 +432,8 @@ function newField(proto, file, parent, oneof, cart) {
         parent,
         oneof,
         optional: isOptionalField(proto, file.syntax),
-        packedByDefault: isPackedFieldByDefault(file, proto, cart.resolveFeatures),
-        packed: isPackedField(file, parent, proto, cart.resolveFeatures),
+        packedByDefault: isPackedFieldByDefault(proto, resolveFeatures),
+        packed: isPackedField(file, parent, proto, resolveFeatures),
         jsonName: proto.jsonName === fieldJsonName(proto.name) ? undefined : proto.jsonName,
         scalar: undefined,
         longType: undefined,
@@ -450,7 +456,7 @@ function newField(proto, file, parent, oneof, cart) {
         },
         getFeatures() {
             var _a;
-            return cart.resolveFeatures(file.edition, this.parent.getFeatures(), (_a = this.proto.options) === null || _a === void 0 ? void 0 : _a.features);
+            return resolveFeatures(parent.getFeatures(), (_a = proto.options) === null || _a === void 0 ? void 0 : _a.features);
         },
     };
     const repeated = proto.label === FieldDescriptorProto_Label.REPEATED;
@@ -489,10 +495,10 @@ function newField(proto, file, parent, oneof, cart) {
 /**
  * Create a descriptor for an extension field.
  */
-function newExtension(proto, file, parent, cart) {
+function newExtension(proto, file, parent, cart, resolveFeatures) {
     assert(proto.extendee, `invalid FieldDescriptorProto: missing extendee`);
     const field = newField(proto, file, null, // to safe us many lines of duplicated code, we trick the type system
-    undefined, cart);
+    undefined, cart, resolveFeatures);
     const extendee = cart.messages.get(trimLeadingDot(proto.extendee));
     assert(extendee, `invalid FieldDescriptorProto: extendee ${proto.extendee} not found`);
     return Object.assign(Object.assign({}, field), { kind: "extension", typeName: makeTypeName(proto, parent, file), parent,
@@ -517,8 +523,8 @@ function newExtension(proto, file, parent, cart) {
             return findComments(file.proto.sourceCodeInfo, path);
         },
         getFeatures() {
-            var _a, _b;
-            return cart.resolveFeatures(this.file.edition, ((_a = this.parent) !== null && _a !== void 0 ? _a : this.file).getFeatures(), (_b = this.proto.options) === null || _b === void 0 ? void 0 : _b.features);
+            var _a;
+            return resolveFeatures((parent !== null && parent !== void 0 ? parent : file).getFeatures(), (_a = proto.options) === null || _a === void 0 ? void 0 : _a.features);
         } });
 }
 /**
@@ -674,8 +680,8 @@ function isOptionalField(proto, syntax) {
  * are unpacked by default. With editions, the default is whatever the edition
  * specifies as a default. In edition 2023, fields are packed by default.
  */
-function isPackedFieldByDefault(file, proto, resolveFeatures) {
-    const { repeatedFieldEncoding } = resolveFeatures(file.edition);
+function isPackedFieldByDefault(proto, resolveFeatures) {
+    const { repeatedFieldEncoding } = resolveFeatures();
     if (repeatedFieldEncoding != FeatureSet_RepeatedFieldEncoding.PACKED) {
         return false;
     }
@@ -716,7 +722,7 @@ function isPackedField(file, parent, proto, resolveFeatures) {
                 case Edition.EDITION_PROTO3:
                     return (_d = (_c = proto.options) === null || _c === void 0 ? void 0 : _c.packed) !== null && _d !== void 0 ? _d : true;
                 default: {
-                    const { repeatedFieldEncoding } = resolveFeatures(file.edition, (_e = parent === null || parent === void 0 ? void 0 : parent.getFeatures()) !== null && _e !== void 0 ? _e : file.getFeatures(), (_f = proto.options) === null || _f === void 0 ? void 0 : _f.features);
+                    const { repeatedFieldEncoding } = resolveFeatures((_e = parent === null || parent === void 0 ? void 0 : parent.getFeatures()) !== null && _e !== void 0 ? _e : file.getFeatures(), (_f = proto.options) === null || _f === void 0 ? void 0 : _f.features);
                     return (repeatedFieldEncoding == FeatureSet_RepeatedFieldEncoding.PACKED);
                 }
             }