V2: Remove ecmascript subpath (#857)

docs/writing_plugins.md

@@ -429,7 +429,7 @@ export const default_host: Extension<ServiceOptions, string> = ...
 Now we can utilize this extension to read custom options in our plugin:
 
 ```ts
-import type { GeneratedFile } from "@bufbuild/protoplugin/ecmascript";
+import type { GeneratedFile } from "@bufbuild/protoplugin";
 import { ServiceOptions, ServiceDesc, hasExtension, getExtension } from "@bufbuild/protobuf";
 import { default_host } from "./customoptions/default_host_pb.js";
 

packages/bundle-size/src/protoc-gen-entrypoints.ts

@@ -16,7 +16,7 @@
 
 import { createEcmaScriptPlugin, runNodeJs } from "@bufbuild/protoplugin";
 import { DescMessage } from "@bufbuild/protobuf";
-import { type Schema } from "@bufbuild/protoplugin/ecmascript";
+import type { Schema } from "@bufbuild/protoplugin";
 import { files, sizes } from "./constants.js";
 
 runNodeJs(

packages/protobuf/src/reflect/names.ts

@@ -65,7 +65,7 @@ const reservedObjectProperties = new Set([
 /**
  * Escapes names that are reserved for ECMAScript built-in object properties.
  *
- * Also see safeIdentifier() from @bufbuild/protoplugin/ecmascript.
+ * Also see safeIdentifier() from @bufbuild/protoplugin.
  */
 export function safeObjectProperty(name: string): string {
   return reservedObjectProperties.has(name) ? name + "$" : name;

packages/protoc-gen-es/src/protoc-gen-es-plugin.ts

@@ -26,7 +26,7 @@ import type {
   Printable,
   Schema,
   Target,
-} from "@bufbuild/protoplugin/ecmascript";
+} from "@bufbuild/protoplugin";
 import { arrayLiteral, fieldTypeScriptType, functionCall } from "./util";
 import { version } from "../package.json";
 

packages/protoc-gen-es/src/util.ts

@@ -19,7 +19,7 @@ import {
 } from "@bufbuild/protobuf";
 import { scalarTypeScriptType } from "@bufbuild/protobuf/reflect";
 import { isWrapperDesc } from "@bufbuild/protobuf/wkt";
-import type { Printable } from "@bufbuild/protoplugin/ecmascript";
+import type { Printable } from "@bufbuild/protoplugin";
 
 export function fieldTypeScriptType(field: DescField | DescExtension): {
   typing: Printable;

packages/protoplugin-example/src/protoc-gen-twirp-es.ts

@@ -14,9 +14,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { createEcmaScriptPlugin, runNodeJs } from "@bufbuild/protoplugin";
+import {
+  createEcmaScriptPlugin,
+  runNodeJs,
+  type Schema,
+  safeIdentifier,
+} from "@bufbuild/protoplugin";
 import { getOption, hasOption } from "@bufbuild/protobuf";
-import { type Schema, safeIdentifier } from "@bufbuild/protoplugin/ecmascript";
 import { default_host } from "./gen/customoptions/default_host_pb.js";
 import { version } from "../package.json";
 

packages/protoplugin-test/src/byo-transpile.test.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { describe, expect, test } from "@jest/globals";
-import type { FileInfo } from "@bufbuild/protoplugin/ecmascript";
+import type { FileInfo } from "@bufbuild/protoplugin";
 import { createTestPluginAndRun } from "./helpers.js";
 
 describe("bring your own transpile", () => {

packages/protoplugin-test/src/custom-options.test.ts

@@ -25,7 +25,7 @@ import {
   type CodeGeneratorRequest,
   CodeGeneratorRequestDesc,
 } from "@bufbuild/protobuf/wkt";
-import type { Schema } from "@bufbuild/protoplugin/ecmascript";
+import type { Schema } from "@bufbuild/protoplugin";
 import { UpstreamProtobuf } from "upstream-protobuf";
 import { compileFile, createTestPluginAndRun } from "./helpers.js";
 import assert from "node:assert";

packages/protoplugin-test/src/file-export-decl.test.ts

@@ -14,7 +14,7 @@
 
 import { describe, expect, test } from "@jest/globals";
 import type { DescEnum, DescMessage } from "@bufbuild/protobuf";
-import type { GeneratedFile } from "@bufbuild/protoplugin/ecmascript";
+import type { GeneratedFile } from "@bufbuild/protoplugin";
 import { createTestPluginAndRun } from "./helpers.js";
 
 describe("GeneratedFile.export", () => {

packages/protoplugin-test/src/file-print.test.ts

@@ -14,8 +14,8 @@
 
 import { describe, expect, test } from "@jest/globals";
 import { protoInt64, ScalarType } from "@bufbuild/protobuf";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
-import { createImportSymbol } from "@bufbuild/protoplugin/ecmascript";
+import type { GeneratedFile, Schema } from "@bufbuild/protoplugin";
+import { createImportSymbol } from "@bufbuild/protoplugin";
 import { createTestPluginAndRun } from "./helpers.js";
 
 describe("GeneratedFile.print", () => {

packages/protoplugin-test/src/file-string.test.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { describe, expect, test } from "@jest/globals";
-import type { GeneratedFile } from "@bufbuild/protoplugin/ecmascript";
+import type { GeneratedFile } from "@bufbuild/protoplugin";
 import { createTestPluginAndRun } from "./helpers.js";
 
 describe("GeneratedFile.string", () => {

packages/protoplugin-test/src/helpers.ts

@@ -21,12 +21,13 @@ import {
   FileDescriptorSetDesc,
 } from "@bufbuild/protobuf/wkt";
 import { fromBinary, createFileRegistry } from "@bufbuild/protobuf";
-import { type Plugin, createEcmaScriptPlugin } from "@bufbuild/protoplugin";
+import { createEcmaScriptPlugin } from "@bufbuild/protoplugin";
 import type {
   GeneratedFile,
   Schema,
   Target,
-} from "@bufbuild/protoplugin/ecmascript";
+  Plugin,
+} from "@bufbuild/protoplugin";
 import { UpstreamProtobuf } from "upstream-protobuf";
 import { expect } from "@jest/globals";
 import assert from "node:assert";
@@ -41,27 +42,27 @@ type CreateTestPluginAndRunOptions<ReturnLinesOfFirstFile extends boolean | unde
     returnLinesOfFirstFile?: ReturnLinesOfFirstFile;
   }
   &
+  {
+    proto: string | Record<string, string>;
+    filesToGenerate?: string[];
+    parameter?: string;
+    name?: PluginInit["name"];
+    version?: PluginInit["version"];
+    parseOption?: PluginInit["parseOption"];
+    minimumEdition?: PluginInit["minimumEdition"];
+    maximumEdition?: PluginInit["maximumEdition"];
+  }
+  &
+  (
     {
-      proto: string | Record<string, string>;
-      filesToGenerate?: string[];
-      parameter?: string;
-      name?: PluginInit["name"];
-      version?: PluginInit["version"];
-      parseOption?: PluginInit["parseOption"];
-      minimumEdition?: PluginInit["minimumEdition"];
-      maximumEdition?: PluginInit["maximumEdition"];
+      generateTs: PluginInit["generateTs"];
+      generateJs?: PluginInit["generateJs"];
+      generateDts?: PluginInit["generateDts"];
+      transpile?: PluginInit["transpile"];
     }
-  &
-    (
-      {
-        generateTs: PluginInit["generateTs"];
-        generateJs?: PluginInit["generateJs"];
-        generateDts?: PluginInit["generateDts"];
-        transpile?: PluginInit["transpile"];
-      }
     |
-      { generateAny: (f: GeneratedFile, schema: Schema, target: Target) => void; }
-    );
+    { generateAny: (f: GeneratedFile, schema: Schema, target: Target) => void; }
+  );
 
 export async function createTestPluginAndRun(
   opt: CreateTestPluginAndRunOptions<false | undefined>,

packages/protoplugin-test/src/import_extension.test.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { describe, expect, test } from "@jest/globals";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type { GeneratedFile, Schema } from "@bufbuild/protoplugin";
 import { createTestPluginAndRun } from "./helpers.js";
 
 describe("import_extension", function () {

packages/protoplugin-test/src/js_import_style.test.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { describe, expect, test } from "@jest/globals";
-import type { Schema } from "@bufbuild/protoplugin/ecmascript";
+import type { Schema } from "@bufbuild/protoplugin";
 import { createTestPluginAndRun } from "./helpers.js";
 
 describe("js_import_style", () => {

packages/protoplugin-test/src/rewrite_imports.test.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import { describe, expect, test } from "@jest/globals";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type { GeneratedFile, Schema } from "@bufbuild/protoplugin";
 import { createTestPluginAndRun } from "./helpers.js";
 
 describe("rewrite_imports", function () {

packages/protoplugin-test/src/safe-identifier.test.ts

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { safeIdentifier } from "@bufbuild/protoplugin/ecmascript";
+import { safeIdentifier } from "@bufbuild/protoplugin";
 import { describe, expect, test } from "@jest/globals";
 
 describe("safeIdentifier", () => {

packages/protoplugin-test/src/target.test.ts

@@ -13,9 +13,12 @@
 // limitations under the License.
 
 import { beforeEach, describe, expect, jest, test } from "@jest/globals";
-import type { FileInfo, Schema } from "@bufbuild/protoplugin/ecmascript";
 import { createTestPluginAndRun } from "./helpers.js";
-import type { createEcmaScriptPlugin } from "@bufbuild/protoplugin";
+import type {
+  createEcmaScriptPlugin,
+  FileInfo,
+  Schema,
+} from "@bufbuild/protoplugin";
 import type { CodeGeneratorResponse } from "@bufbuild/protobuf/wkt";
 
 describe("target", () => {

packages/protoplugin/package.json

@@ -22,17 +22,6 @@
     ".": {
       "import": "./dist/esm/index.js",
       "require": "./dist/cjs/index.js"
-    },
-    "./ecmascript": {
-      "import": "./dist/esm/ecmascript/index.js",
-      "require": "./dist/cjs/ecmascript/index.js"
-    }
-  },
-  "typesVersions": {
-    "*": {
-      "ecmascript": [
-        "./dist/cjs/ecmascript/index.d.ts"
-      ]
     }
   },
   "dependencies": {

packages/protoplugin/src/create-es-plugin.ts

@@ -23,12 +23,12 @@ import {
   CodeGeneratorResponse_Feature,
   CodeGeneratorResponseDesc,
 } from "@bufbuild/protobuf/wkt";
-import { createSchema } from "./ecmascript/schema.js";
-import type { Schema } from "./ecmascript/schema.js";
-import type { FileInfo } from "./ecmascript/generated-file.js";
+import { createSchema } from "./schema.js";
+import type { Schema } from "./schema.js";
+import type { FileInfo } from "./generated-file.js";
 import type { Plugin } from "./plugin.js";
-import { transpile } from "./ecmascript/transpile.js";
-import { parseParameter } from "./ecmascript/parameter.js";
+import { transpile } from "./transpile.js";
+import { parseParameter } from "./parameter.js";
 
 interface PluginInit {
   /**

packages/protoplugin/src/ecmascript/file-preamble.ts → packages/protoplugin/src/file-preamble.ts

@@ -18,7 +18,7 @@ import {
   getPackageComments,
   getSyntaxComments,
   getFeatureOptionStrings,
-} from "../source-code-info.js";
+} from "./source-code-info.js";
 
 export function makeFilePreamble(
   file: DescFile,

packages/protoplugin/src/index.ts

@@ -21,3 +21,11 @@ export {
   getPackageComments,
   getSyntaxComments,
 } from "./source-code-info.js";
+
+export type { Target } from "./target.js";
+export type { Schema } from "./schema.js";
+export type { GeneratedFile, FileInfo } from "./generated-file.js";
+export type { ImportSymbol } from "./import-symbol.js";
+export { createImportSymbol } from "./import-symbol.js";
+export type { Printable } from "./printable.js";
+export { safeIdentifier } from "./safe-identifier.js";

packages/protoplugin/src/ecmascript/jsdoc.ts → packages/protoplugin/src/jsdoc.ts

@@ -17,7 +17,7 @@ import {
   getComments,
   getDeclarationString,
   getFeatureOptionStrings,
-} from "../source-code-info.js";
+} from "./source-code-info.js";
 import { parentTypes } from "@bufbuild/protobuf/reflect";
 
 export function createJsDocTextFromDesc(desc: Exclude<AnyDesc, DescFile>) {

packages/protoplugin/src/ecmascript/parameter.ts → packages/protoplugin/src/parameter.ts

@@ -14,7 +14,7 @@
 
 import type { Target } from "./target.js";
 import type { RewriteImports } from "./import-path.js";
-import { PluginOptionError } from "../error.js";
+import { PluginOptionError } from "./error.js";
 
 export interface ParsedParameter {
   targets: Target[];

packages/protoplugin/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "files": ["src/index.ts", "src/ecmascript/index.ts"],
+  "files": ["src/index.ts"],
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "esModuleInterop": true,