Add the DescSet type (#745)

bufbuild · Mar 13, 2024 · a57887e · a57887e
1 parent 0b7cee0
commit a57887e
Show file tree

Hide file tree

Showing 15 changed files with 2,840 additions and 1,960 deletions.
diff --git a/packages/protobuf-test/src/descriptor-set.test.ts b/packages/protobuf-test/src/descriptor-set.test.ts
diff --git a/packages/protobuf-test/src/edition-feature-resolver.test.ts b/packages/protobuf-test/src/edition-feature-resolver.test.ts
@@ -22,9 +22,9 @@ import type {
   DescExtension,
   DescMessage,
 } from "@bufbuild/protobuf";
+import { FileDescriptorSet } from "@bufbuild/protobuf";
 import {
   clearField,
-  createDescriptorSet,
   Edition,
   FeatureSet,
   FeatureSet_EnumType,
@@ -40,6 +40,7 @@ import {
   protoInt64,
   ScalarType,
 } from "@bufbuild/protobuf";
+import { createDescFileSet } from "@bufbuild/protobuf/next/reflect";
 
 /**
  * A rough implementation of the edition feature resolution. Does not support
@@ -534,8 +535,10 @@ function unescapeBytesDefaultValue(str: string): Uint8Array | false {
 }
 
 describe("FeatureResolver", function () {
-  const set = createDescriptorSet(readFileSync("./descriptorset.binpb"));
-  const descFeatureSet = set.messages.get(FeatureSet.typeName);
+  const set = createDescFileSet(
+    FileDescriptorSet.fromBinary(readFileSync("./descriptorset.binpb")),
+  );
+  const descFeatureSet = set.getMessage(FeatureSet.typeName);
   assert(descFeatureSet !== undefined);
 
   describe("default features", () => {

diff --git a/packages/protobuf-test/src/jstype.test.ts b/packages/protobuf-test/src/jstype.test.ts
@@ -13,11 +13,12 @@
 // limitations under the License.
 
 import {
-  createDescriptorSet,
   createRegistryFromDescriptors,
+  FileDescriptorSet,
   LongType,
   protoInt64,
 } from "@bufbuild/protobuf";
+import { createDescFileSet } from "@bufbuild/protobuf/next/reflect";
 import { readFileSync } from "fs";
 import { describe, expect, test } from "@jest/globals";
 import {
@@ -187,8 +188,8 @@ describe("createDescriptorSet with jstype", () => {
 });
 
 describe("createRegistryFromDescriptors with jstype", () => {
-  const descriptorSet = createDescriptorSet(
-    readFileSync("./descriptorset.binpb"),
+  const set = createDescFileSet(
+    FileDescriptorSet.fromBinary(readFileSync("./descriptorset.binpb")),
   );
   testAllFieldsLongType("spec.JSTypeOmittedMessage", LongType.BIGINT);
   testAllFieldsLongType("spec.JSTypeStringMessage", LongType.STRING);
@@ -200,7 +201,7 @@ describe("createRegistryFromDescriptors with jstype", () => {
   testAllFieldsLongType("spec.JSTypeProto2NumberMessage", LongType.BIGINT);
 
   function testAllFieldsLongType(messageTypeName: string, longType: LongType) {
-    const mt = descriptorSet.messages.get(messageTypeName);
+    const mt = set.getMessage(messageTypeName);
     assert(mt);
     for (const field of mt.fields) {
       test(`${messageTypeName} field #${field.number}`, () => {

diff --git a/packages/protobuf-test/src/next/helpers.ts b/packages/protobuf-test/src/next/helpers.ts
@@ -14,8 +14,9 @@
 
 import { describe, test } from "@jest/globals";
 import type { DescMessage } from "@bufbuild/protobuf";
-import { createDescriptorSet } from "@bufbuild/protobuf";
+import { FileDescriptorSet } from "@bufbuild/protobuf";
 import { UpstreamProtobuf } from "upstream-protobuf";
+import { createDescFileSet } from "@bufbuild/protobuf/next/reflect";
 
 export function describeGenerated<Desc extends DescMessage>(
   ts: Desc,
@@ -45,19 +46,26 @@ export function testGenerated<Desc extends DescMessage>(
   });
 }
 
+let upstreamProtobuf: UpstreamProtobuf | undefined;
+
+export async function compileFileDescriptorSet(
+  files: Record<string, string>,
+): Promise<FileDescriptorSet> {
+  upstreamProtobuf = upstreamProtobuf ?? new UpstreamProtobuf();
+  const bytes = await upstreamProtobuf.compileToDescriptorSet(files, {
+    includeImports: true,
+    retainOptions: true,
+  });
+  return FileDescriptorSet.fromBinary(bytes);
+}
+
 export async function compileMessage(proto: string): Promise<DescMessage> {
-  const upstream = new UpstreamProtobuf();
-  const setBin = await upstream.compileToDescriptorSet(
-    {
+  const set = createDescFileSet(
+    await compileFileDescriptorSet({
       "input.proto": proto,
-    },
-    {
-      includeImports: true,
-      retainOptions: true,
-    },
+    }),
   );
-  const set = createDescriptorSet(setBin);
-  const file = set.files.find((f) => f.proto.name === "input.proto");
+  const file = set.getFile("input.proto");
   if (file === undefined) {
     throw new Error("missing file descriptor for input.proto");
   }