@bufbuild/protobuf 1.5.1 → 1.7.0

package/dist/cjs/binary-encoding.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.
@@ -319,8 +319,7 @@ 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/cjs/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/cjs/binary-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/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/cjs/codegen-info.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.
@@ -36,6 +36,7 @@ exports.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/cjs/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/cjs/create-descriptor-set.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,28 +30,36 @@ const feature_set_js_1 = require("./private/feature-set.js");
  * files in topological order.
  */
 function createDescriptorSet(input, options) {
-    var _a;
     const cart = {
         enums: new Map(),
         messages: new Map(),
         services: new Map(),
         extensions: new Map(),
         mapEntries: new Map(),
-        resolveFeatures: (0, feature_set_js_1.createFeatureResolver)((_a = options === null || options === void 0 ? void 0 : options.featureSetDefaults) !== null && _a !== void 0 ? _a : feature_set_js_1.featureSetDefaults),
     };
     const fileDescriptors = input instanceof descriptor_pb_js_1.FileDescriptorSet
         ? input.file
         : input instanceof Uint8Array
             ? descriptor_pb_js_1.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 = (0, feature_set_js_1.createFeatureResolver)((_b = options === null || options === void 0 ? void 0 : options.featureSetDefaults) !== null && _b !== void 0 ? _b : feature_set_js_1.featureSetDefaults, edition);
+            resolverByEdition.set(edition, resolveFeatures);
+        }
+        return newFile(proto, cart, resolveFeatures);
+    });
     return Object.assign({ files }, cart);
 }
 exports.createDescriptorSet = createDescriptorSet;
 /**
  * Create a descriptor for a file.
  */
-function newFile(proto, cart) {
+function newFile(proto, cart, resolveFeatures) {
     var _a, _b;
     (0, assert_js_1.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() {
@@ -70,25 +78,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;
@@ -98,23 +106,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;
     }
@@ -123,12 +131,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);
@@ -145,14 +153,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;
     (0, assert_js_1.assert)(proto.name, `invalid EnumDescriptorProto: missing name`);
     const desc = {
@@ -182,9 +190,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);
@@ -220,7 +227,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);
             },
         });
     });
@@ -230,7 +237,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;
     (0, assert_js_1.assert)(proto.name, `invalid DescriptorProto: missing name`);
     const desc = {
@@ -264,9 +271,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) {
@@ -277,17 +283,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;
     (0, assert_js_1.assert)(proto.name, `invalid ServiceDescriptorProto: missing name`);
     const desc = {
@@ -310,19 +316,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;
     (0, assert_js_1.assert)(proto.name, `invalid MethodDescriptorProto: missing name`);
     (0, assert_js_1.assert)(proto.inputType, `invalid MethodDescriptorProto: missing input_type`);
@@ -381,14 +387,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) {
     (0, assert_js_1.assert)(proto.name, `invalid OneofDescriptorProto: missing name`);
     return {
         kind: "oneof",
@@ -410,14 +416,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;
     (0, assert_js_1.assert)(proto.name, `invalid FieldDescriptorProto: missing name`);
     (0, assert_js_1.assert)(proto.number, `invalid FieldDescriptorProto: missing number`);
@@ -430,8 +436,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 === (0, names_js_1.fieldJsonName)(proto.name) ? undefined : proto.jsonName,
         scalar: undefined,
         longType: undefined,
@@ -454,7 +460,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 === descriptor_pb_js_1.FieldDescriptorProto_Label.REPEATED;
@@ -493,10 +499,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) {
     (0, assert_js_1.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));
     (0, assert_js_1.assert)(extendee, `invalid FieldDescriptorProto: extendee ${proto.extendee} not found`);
     return Object.assign(Object.assign({}, field), { kind: "extension", typeName: makeTypeName(proto, parent, file), parent,
@@ -521,8 +527,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);
         } });
 }
 /**
@@ -678,8 +684,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 != descriptor_pb_js_1.FeatureSet_RepeatedFieldEncoding.PACKED) {
         return false;
     }
@@ -720,7 +726,7 @@ function isPackedField(file, parent, proto, resolveFeatures) {
                 case descriptor_pb_js_1.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 == descriptor_pb_js_1.FeatureSet_RepeatedFieldEncoding.PACKED);
                 }
             }

package/dist/cjs/create-registry-from-desc.d.ts

@@ -1,4 +1,4 @@
-import type { IEnumTypeRegistry, IMessageTypeRegistry, IServiceTypeRegistry } from "./type-registry.js";
+import type { IEnumTypeRegistry, IExtensionRegistry, IMessageTypeRegistry, IServiceTypeRegistry } from "./type-registry.js";
 import { FileDescriptorSet } from "./google/protobuf/descriptor_pb.js";
 import type { DescriptorSet } from "./descriptor-set.js";
 /**
@@ -12,4 +12,4 @@ import type { DescriptorSet } from "./descriptor-set.js";
  * By default, all well-known types with a specialized JSON representation
  * are replaced with their generated counterpart in this package.
  */
-export declare function createRegistryFromDescriptors(input: DescriptorSet | FileDescriptorSet | Uint8Array, replaceWkt?: boolean): IMessageTypeRegistry & IEnumTypeRegistry & IServiceTypeRegistry;
+export declare function createRegistryFromDescriptors(input: DescriptorSet | FileDescriptorSet | Uint8Array, replaceWkt?: boolean): IMessageTypeRegistry & IEnumTypeRegistry & IExtensionRegistry & IServiceTypeRegistry;

package/dist/cjs/create-registry-from-desc.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.
@@ -67,15 +67,17 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
     const set = input instanceof Uint8Array || input instanceof descriptor_pb_js_1.FileDescriptorSet
         ? (0, create_descriptor_set_js_1.createDescriptorSet)(input)
         : input;
-    const enums = {};
-    const messages = {};
+    const enums = new Map();
+    const messages = new Map();
+    const extensions = new Map();
+    const extensionsByExtendee = new Map();
     const services = {};
     if (replaceWkt) {
         for (const mt of wkMessages) {
-            messages[mt.typeName] = mt;
+            messages.set(mt.typeName, mt);
         }
         for (const et of wkEnums) {
-            enums[et.typeName] = et;
+            enums.set(et.typeName, et);
         }
     }
     return {
@@ -83,7 +85,7 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
          * May raise an error on invalid descriptors.
          */
         findEnum(typeName) {
-            const existing = enums[typeName];
+            const existing = enums.get(typeName);
             if (existing) {
                 return existing;
             }
@@ -97,14 +99,14 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
                 name: u.name,
                 localName: (0, names_js_1.localName)(u),
             })), {});
-            enums[typeName] = type;
+            enums.set(typeName, type);
             return type;
         },
         /**
          * May raise an error on invalid descriptors.
          */
         findMessage(typeName) {
-            const existing = messages[typeName];
+            const existing = messages.get(typeName);
             if (existing) {
                 return existing;
             }
@@ -117,7 +119,7 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
             const type = runtime.makeMessageType(typeName, () => fields, {
                 localName: (0, names_js_1.localName)(desc),
             });
-            messages[typeName] = type;
+            messages.set(typeName, type);
             for (const field of desc.fields) {
                 const fieldInfo = makeFieldInfo(field, this);
                 fields.push(fieldInfo);
@@ -157,12 +159,54 @@ function createRegistryFromDescriptors(input, replaceWkt = true) {
                 methods,
             });
         },
+        /**
+         * May raise an error on invalid descriptors.
+         */
+        findExtensionFor(typeName, no) {
+            var _a;
+            if (!set.messages.has(typeName)) {
+                return undefined;
+            }
+            let extensionsByNo = extensionsByExtendee.get(typeName);
+            if (!extensionsByNo) {
+                // maintain a lookup for extension desc by number
+                extensionsByNo = new Map();
+                extensionsByExtendee.set(typeName, extensionsByNo);
+                for (const desc of set.extensions.values()) {
+                    if (desc.extendee.typeName == typeName) {
+                        extensionsByNo.set(desc.number, desc);
+                    }
+                }
+            }
+            const desc = (_a = extensionsByExtendee.get(typeName)) === null || _a === void 0 ? void 0 : _a.get(no);
+            return desc ? this.findExtension(desc.typeName) : undefined;
+        },
+        /**
+         * May raise an error on invalid descriptors.
+         */
+        findExtension(typeName) {
+            const existing = extensions.get(typeName);
+            if (existing) {
+                return existing;
+            }
+            const desc = set.extensions.get(typeName);
+            if (!desc) {
+                return undefined;
+            }
+            const extendee = this.findMessage(desc.extendee.typeName);
+            (0, assert_js_1.assert)(extendee, `message "${desc.extendee.typeName}" for ${desc.toString()} not found`);
+            const runtime = desc.file.syntax == "proto3" ? proto3_js_1.proto3 : proto2_js_1.proto2;
+            const ext = runtime.makeExtension(typeName, extendee, makeFieldInfo(desc, this));
+            extensions.set(typeName, ext);
+            return ext;
+        },
     };
 }
 exports.createRegistryFromDescriptors = createRegistryFromDescriptors;
 function makeFieldInfo(desc, resolver) {
     switch (desc.fieldKind) {
         case "map":
+            (0, assert_js_1.assert)(desc.kind == "field"); // maps are not allowed for extensions
             return makeMapFieldInfo(desc, resolver);
         case "message":
             return makeMessageFieldInfo(desc, resolver);

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

@@ -1,8 +1,9 @@
 import type { MessageType } from "./message-type.js";
 import type { EnumType } from "./enum.js";
 import type { ServiceType } from "./service-type.js";
-import type { IMessageTypeRegistry, IEnumTypeRegistry, IServiceTypeRegistry } from "./type-registry.js";
+import type { IEnumTypeRegistry, IExtensionRegistry, IMessageTypeRegistry, IServiceTypeRegistry } from "./type-registry.js";
+import type { Extension } from "./extension.js";
 /**
  * Create a new registry from the given types.
  */
-export declare function createRegistry(...types: Array<MessageType | EnumType | ServiceType>): IMessageTypeRegistry & IEnumTypeRegistry & IServiceTypeRegistry;
+export declare function createRegistry(...types: Array<MessageType | EnumType | ServiceType | Extension>): IMessageTypeRegistry & IEnumTypeRegistry & IExtensionRegistry & IServiceTypeRegistry;