From 7acdb7acf5ff2a784a8cc998c381f2c1bd943c05 Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Fri, 17 May 2024 14:47:41 +0200 Subject: [PATCH] Fix Registry exports --- packages/protobuf-conformance/src/conformance.ts | 2 +- packages/protobuf-test/src/codegenv1/embed.test.ts | 2 +- packages/protobuf-test/src/helpers.ts | 3 +-- packages/protobuf-test/src/json.test.ts | 10 ++++------ .../protobuf-test/src/{reflect => }/registry.test.ts | 6 ++---- packages/protobuf-test/src/wkt/any.test.ts | 3 +-- packages/protobuf/scripts/bootstrap-inject.mjs | 4 ++-- packages/protobuf/src/index.ts | 1 + packages/protobuf/src/reflect/index.ts | 1 - packages/protobuf/src/wkt/any.ts | 2 +- packages/protoplugin-test/src/helpers.ts | 6 ++---- .../src/plugin-edition-support.test.ts | 3 +-- packages/protoplugin/src/create-es-plugin.ts | 4 ++-- packages/protoplugin/src/ecmascript/schema.ts | 4 ++-- 14 files changed, 21 insertions(+), 30 deletions(-) rename packages/protobuf-test/src/{reflect => }/registry.test.ts (99%) diff --git a/packages/protobuf-conformance/src/conformance.ts b/packages/protobuf-conformance/src/conformance.ts index 4169f486a..2abeb88b1 100644 --- a/packages/protobuf-conformance/src/conformance.ts +++ b/packages/protobuf-conformance/src/conformance.ts @@ -22,8 +22,8 @@ import { type MessageShape, toBinary, toJsonString, + createRegistry, } from "@bufbuild/protobuf"; -import { createRegistry } from "@bufbuild/protobuf/reflect"; import { type ConformanceRequest, type ConformanceResponse, diff --git a/packages/protobuf-test/src/codegenv1/embed.test.ts b/packages/protobuf-test/src/codegenv1/embed.test.ts index ad4a8c23a..239720b7a 100644 --- a/packages/protobuf-test/src/codegenv1/embed.test.ts +++ b/packages/protobuf-test/src/codegenv1/embed.test.ts @@ -16,7 +16,7 @@ import { describe, expect, test } from "@jest/globals"; import { compileFile, compileFileDescriptorSet } from "../helpers.js"; import { embedFileDesc } from "@bufbuild/protobuf/codegenv1"; import assert from "node:assert"; -import { createFileRegistry } from "@bufbuild/protobuf/reflect"; +import { createFileRegistry } from "@bufbuild/protobuf"; describe("embedFileDesc()", () => { test("embeds file descriptor", async () => { diff --git a/packages/protobuf-test/src/helpers.ts b/packages/protobuf-test/src/helpers.ts index b0580e668..b36e5cbe3 100644 --- a/packages/protobuf-test/src/helpers.ts +++ b/packages/protobuf-test/src/helpers.ts @@ -13,8 +13,7 @@ // limitations under the License. import { UpstreamProtobuf } from "upstream-protobuf"; -import { createFileRegistry } from "@bufbuild/protobuf/reflect"; -import { fromBinary } from "@bufbuild/protobuf"; +import { fromBinary, createFileRegistry } from "@bufbuild/protobuf"; import type { FileDescriptorSet } from "@bufbuild/protobuf/wkt"; import { FileDescriptorSetDesc } from "@bufbuild/protobuf/wkt"; import assert from "node:assert"; diff --git a/packages/protobuf-test/src/json.test.ts b/packages/protobuf-test/src/json.test.ts index 925cee94b..6e2b54594 100644 --- a/packages/protobuf-test/src/json.test.ts +++ b/packages/protobuf-test/src/json.test.ts @@ -14,6 +14,10 @@ import { describe, expect, test } from "@jest/globals"; import { + type MessageInitShape, + type DescMessage, + type JsonValue, + createRegistry, create, toJson, fromJson, @@ -21,12 +25,6 @@ import { setExtension, getExtension, } from "@bufbuild/protobuf"; -import type { - MessageInitShape, - DescMessage, - JsonValue, -} from "@bufbuild/protobuf"; -import { createRegistry } from "@bufbuild/protobuf/reflect"; import { RepeatedScalarValuesMessageDesc, ScalarValuesMessageDesc, diff --git a/packages/protobuf-test/src/reflect/registry.test.ts b/packages/protobuf-test/src/registry.test.ts similarity index 99% rename from packages/protobuf-test/src/reflect/registry.test.ts rename to packages/protobuf-test/src/registry.test.ts index f0eb622ce..1ad0e0931 100644 --- a/packages/protobuf-test/src/reflect/registry.test.ts +++ b/packages/protobuf-test/src/registry.test.ts @@ -18,9 +18,6 @@ import { type FileRegistry, createFileRegistry, createRegistry, - protoCamelCase, -} from "@bufbuild/protobuf/reflect"; -import { type DescEnum, type DescExtension, type DescFile, @@ -30,6 +27,7 @@ import { LongType, ScalarType, } from "@bufbuild/protobuf"; +import { protoCamelCase } from "@bufbuild/protobuf/reflect"; import { type FileDescriptorSet, Edition, @@ -45,7 +43,7 @@ import { compileMessage, compileMethod, compileService, -} from "../helpers.js"; +} from "./helpers.js"; describe("createRegistry()", function () { let testReg: FileRegistry; diff --git a/packages/protobuf-test/src/wkt/any.test.ts b/packages/protobuf-test/src/wkt/any.test.ts index 653ecc5c8..927f00136 100644 --- a/packages/protobuf-test/src/wkt/any.test.ts +++ b/packages/protobuf-test/src/wkt/any.test.ts @@ -21,8 +21,7 @@ import { ValueDesc, } from "@bufbuild/protobuf/wkt"; import type { Value } from "@bufbuild/protobuf/wkt"; -import { create } from "@bufbuild/protobuf"; -import { createRegistry } from "@bufbuild/protobuf/reflect"; +import { create, createRegistry } from "@bufbuild/protobuf"; describe("google.protobuf.Any", () => { test(`is correctly identifies by message and type name`, () => { diff --git a/packages/protobuf/scripts/bootstrap-inject.mjs b/packages/protobuf/scripts/bootstrap-inject.mjs index fa6ab4c9c..13c0f5a16 100644 --- a/packages/protobuf/scripts/bootstrap-inject.mjs +++ b/packages/protobuf/scripts/bootstrap-inject.mjs @@ -17,8 +17,8 @@ import { join as joinPath } from "node:path"; import assert from "node:assert"; import { stdout, stderr, argv } from "node:process"; import { UpstreamProtobuf } from "upstream-protobuf"; -import { createFileRegistry, reflect } from "@bufbuild/protobuf/reflect"; -import { fromBinary } from "@bufbuild/protobuf"; +import { fromBinary, createFileRegistry } from "@bufbuild/protobuf"; +import { reflect } from "@bufbuild/protobuf/reflect"; import { Edition, FeatureSetDefaultsDesc, diff --git a/packages/protobuf/src/index.ts b/packages/protobuf/src/index.ts index 7152fdbae..4ea8b9e13 100644 --- a/packages/protobuf/src/index.ts +++ b/packages/protobuf/src/index.ts @@ -19,6 +19,7 @@ export * from "./clone.js"; export * from "./descriptors.js"; export * from "./equals.js"; export * from "./fields.js"; +export * from "./registry.js"; export type { JsonValue, JsonObject } from "./json-value.js"; export { toBinary } from "./to-binary.js"; export type { BinaryWriteOptions } from "./to-binary.js"; diff --git a/packages/protobuf/src/reflect/index.ts b/packages/protobuf/src/reflect/index.ts index 804803b97..6c8af678d 100644 --- a/packages/protobuf/src/reflect/index.ts +++ b/packages/protobuf/src/reflect/index.ts @@ -17,6 +17,5 @@ export * from "./names.js"; export * from "./nested-types.js"; export * from "./reflect.js"; export * from "./reflect-types.js"; -export * from "../registry.js"; export * from "./scalar.js"; export { isReflectList, isReflectMap, isReflectMessage } from "./guard.js"; diff --git a/packages/protobuf/src/wkt/any.ts b/packages/protobuf/src/wkt/any.ts index 5e061c63c..a9be02ab8 100644 --- a/packages/protobuf/src/wkt/any.ts +++ b/packages/protobuf/src/wkt/any.ts @@ -16,7 +16,7 @@ import type { Message, MessageShape } from "../types.js"; import type { Any } from "./gen/google/protobuf/any_pb.js"; import { AnyDesc } from "./gen/google/protobuf/any_pb.js"; import type { DescMessage } from "../descriptors.js"; -import type { Registry } from "../reflect/index.js"; +import type { Registry } from "../registry.js"; import { create } from "../create.js"; import { toBinary } from "../to-binary.js"; import { fromBinary, mergeFromBinary } from "../from-binary.js"; diff --git a/packages/protoplugin-test/src/helpers.ts b/packages/protoplugin-test/src/helpers.ts index 39c20b362..fcd404c3a 100644 --- a/packages/protoplugin-test/src/helpers.ts +++ b/packages/protoplugin-test/src/helpers.ts @@ -20,10 +20,8 @@ import { CodeGeneratorRequestDesc, FileDescriptorSetDesc, } from "@bufbuild/protobuf/wkt"; -import { fromBinary } from "@bufbuild/protobuf"; -import { createFileRegistry } from "@bufbuild/protobuf/reflect"; -import type { Plugin } from "@bufbuild/protoplugin"; -import { createEcmaScriptPlugin } from "@bufbuild/protoplugin"; +import { fromBinary, createFileRegistry } from "@bufbuild/protobuf"; +import { type Plugin, createEcmaScriptPlugin } from "@bufbuild/protoplugin"; import type { GeneratedFile, Schema, diff --git a/packages/protoplugin-test/src/plugin-edition-support.test.ts b/packages/protoplugin-test/src/plugin-edition-support.test.ts index 8b37513d0..3909b3477 100644 --- a/packages/protoplugin-test/src/plugin-edition-support.test.ts +++ b/packages/protoplugin-test/src/plugin-edition-support.test.ts @@ -13,7 +13,7 @@ // limitations under the License. import { describe, expect, test } from "@jest/globals"; -import { fromBinary } from "@bufbuild/protobuf"; +import { fromBinary, minimumEdition } from "@bufbuild/protobuf"; import { CodeGeneratorRequestDesc, CodeGeneratorResponse_Feature, @@ -22,7 +22,6 @@ import { import { createTestPluginAndRun } from "./helpers.js"; import { UpstreamProtobuf } from "upstream-protobuf"; import { createEcmaScriptPlugin } from "@bufbuild/protoplugin"; -import { minimumEdition } from "@bufbuild/protobuf/reflect"; import type { SupportedEdition } from "@bufbuild/protobuf"; async function runPlugin( diff --git a/packages/protoplugin/src/create-es-plugin.ts b/packages/protoplugin/src/create-es-plugin.ts index cb08f9f8b..9926f1844 100644 --- a/packages/protoplugin/src/create-es-plugin.ts +++ b/packages/protoplugin/src/create-es-plugin.ts @@ -13,11 +13,11 @@ // limitations under the License. import { create, protoInt64 } from "@bufbuild/protobuf"; -import type { SupportedEdition } from "@bufbuild/protobuf"; import { + type SupportedEdition, minimumEdition as minimumEditionUpstream, maximumEdition as maximumEditionUpstream, -} from "@bufbuild/protobuf/reflect"; +} from "@bufbuild/protobuf"; import type { CodeGeneratorResponse } from "@bufbuild/protobuf/wkt"; import { CodeGeneratorResponse_Feature, diff --git a/packages/protoplugin/src/ecmascript/schema.ts b/packages/protoplugin/src/ecmascript/schema.ts index bcc59df29..e7ae58e0e 100644 --- a/packages/protoplugin/src/ecmascript/schema.ts +++ b/packages/protoplugin/src/ecmascript/schema.ts @@ -19,10 +19,10 @@ import type { DescMessage, DescService, } from "@bufbuild/protobuf"; -import { create } from "@bufbuild/protobuf"; +import { create, createFileRegistry } from "@bufbuild/protobuf"; import type { CodeGeneratorRequest } from "@bufbuild/protobuf/wkt"; import { Edition, FileDescriptorSetDesc } from "@bufbuild/protobuf/wkt"; -import { createFileRegistry, nestedTypes } from "@bufbuild/protobuf/reflect"; +import { nestedTypes } from "@bufbuild/protobuf/reflect"; import type { CreatePreambleFn, FileInfo,