@bufbuild/protoc-gen-es 0.1.0 → 0.2.0

package/README.md

@@ -1,14 +1,7 @@
 # @bufbuild/protoc-gen-es
 
-This package provides the code generator plugin `protoc-gen-es`. The code it 
-generates depends on [@bufbuild/protobuf](https://www.npmjs.com/package/@bufbuild/protobuf).
-
-## Protocol Buffers for ECMAScript
-
-A complete implementation of [Protocol Buffers](https://developers.google.com/protocol-buffers) 
-in TypeScript, suitable for web browsers and Node.js.  
-
-For example, the following definition:
+The code generator for Protocol Buffers for ECMAScript. For example, the 
+following definition:
 
 ```protobuf
 message Person {
@@ -31,45 +24,92 @@ pete = Person.fromBinary(bytes);
 pete = Person.fromJsonString('{"name": "pete", "id": 123}');
 ```
 
-Learn more at [github.com/bufbuild/protobuf-es](https://github.com/bufbuild/protobuf-es).
+Learn more about the project at [github.com/bufbuild/protobuf-es](https://github.com/bufbuild/protobuf-es).
 
 
 ## Installation
 
-### With npm
+`protoc-gen-es` is a code generator plugin for Protocol Buffer compilers,
+like [buf](https://github.com/bufbuild/buf) and [protoc](https://github.com/protocolbuffers/protobuf/releases).
+It generates base types - messages and enumerations - from your Protocol Buffer 
+schema. The generated code requires the runtime library [@bufbuild/protobuf](https://www.npmjs.com/package/@bufbuild/protobuf).
+
+To install the plugin and the runtime library, run:
 
 ```shell
-npm install @bufbuild/protoc-gen-es
+npm install --save-dev @bufbuild/protoc-gen-es
+npm install @bufbuild/protobuf
 ```
 
-This will install the code generator plugin in `node_modules/.bin/protoc-gen-es`. 
-Note that npm does not add the executable to your `$PATH`. You can do so with:
+We use peer dependencies to ensure that code generator and runtime library are
+compatible with each other. Note that yarn and pnpm only emit a warning in this case.
 
-```shell
-PATH=$PATH:$(pwd)/node_modules/.bin
+
+## Generating code
+
+### With buf
+
+Add a new configuration file `buf.gen.yaml`:
+
+```yaml
+# buf.gen.yaml defines a local generation template.
+# For details, see https://docs.buf.build/configuration/v1/buf-gen-yaml
+version: v1
+plugins:
+  # This will invoke protoc-gen-es and write output to src/gen
+  - name: es
+    out: src/gen
+    opt: target=ts
 ```
 
-### With yarn
+Add the following script to your `package.json`:
 
-```shell
-yarn add @bufbuild/protoc-gen-es
+```json
+{
+  "name": "your-package",
+  "version": "1.0.0",
+  "scripts": {
+    "generate": "buf generate"
+  },
+  // ...
+}
 ```
 
-Note that yarn v2 does not use a `node_modules` directory anymore. To find the path 
-where yarn stores the executable, run `yarn bin protoc-gen-es` (it is "unplugged" 
-automatically).
+To generate code for all protobuf files within your project, simply run:
 
-You can always confirm successful installation with:
-```shell
-protoc-gen-es --version
+```bash
+npm run generate
+```
+
+Note that `buf` can generate from various [inputs](https://docs.buf.build/reference/inputs),
+not just local protobuf files. 
+
+
+### With protoc
+
+```bash
+PATH=$PATH:$(pwd)/node_modules/.bin \
+  protoc -I . \
+  --es_out src/gen \
+  --es_opt target=ts \
+  a.proto b.proto c.proto
 ```
 
+Note that we are adding `node_modules/.bin` to the `$PATH`, so that the protocol
+buffer compiler can find them. This happens automatically with npm scripts.
+
+Since yarn v2 and above does not use a `node_modules` directory, you need to 
+change the variable a bit:
+
+```bash
+PATH=$(dirname $(yarn bin protoc-gen-es)):$PATH
+```
 
 ## Plugin options
 
 ### `target`
 
-This option controls whether the plugin generates JavaScript, TypeScript, 
+This option controls whether the plugin generates JavaScript, TypeScript,
 or TypeScript declaration files.
 
 Possible values:
@@ -84,3 +124,11 @@ By default, we generate JavaScript and TypeScript declaration files, which
 produces the smallest code size. If you prefer to generate TypeScript, use
 `target=ts`.
 
+### `keep_empty_files=true`
+
+By default, [protoc-gen-es](https://www.npmjs.com/package/@bufbuild/protoc-gen-es) 
+(and all other plugins based on [@bufbuild/protoplugin](https://www.npmjs.com/package/@bufbuild/protoplugin)) 
+omit empty files from the plugin output. This option disables pruning of 
+empty files, to allow for smooth interoperation with Bazel and similar 
+tooling that requires all output files to be declared ahead of time.
+Unless you use Bazel, it is very unlikely that you need this option.

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bufbuild/protoc-gen-es",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "Protocol Buffers code generator for ECMAScript",
     "license": "Apache-2.0",
     "repository": {
@@ -20,10 +20,10 @@
     },
     "preferUnplugged": true,
     "dependencies": {
-        "@bufbuild/protoplugin": "0.1.0"
+        "@bufbuild/protoplugin": "0.2.0"
     },
     "peerDependencies": {
-        "@bufbuild/protobuf": "0.1.0"
+        "@bufbuild/protobuf": "0.2.0"
     },
     "peerDependenciesMeta": {
         "@bufbuild/protobuf": {

package/dist/cjs/src/declaration.js

@@ -13,15 +13,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.declaration = void 0;
+exports.generateDts = void 0;
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
 const match_wkt_js_1 = require("./match-wkt.js");
-exports.declaration = {
-    target: "dts",
-    extension: "_pb.d.ts",
-    generateEnum,
-    generateMessage,
-};
+function generateDts(schema) {
+    for (const file of schema.files) {
+        const f = schema.generateFile(file.name + "_pb.d.ts");
+        f.preamble(file);
+        for (const enumeration of file.enums) {
+            generateEnum(schema, f, enumeration);
+        }
+        for (const message of file.messages) {
+            generateMessage(schema, f, message);
+        }
+        // We do not generate anything for services, and we do not support extensions at this time
+    }
+}
+exports.generateDts = generateDts;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     f.print((0, ecmascript_1.makeJsDoc)(enumeration));

package/dist/cjs/src/javascript.js

@@ -13,16 +13,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFieldInfo = exports.javascript = void 0;
+exports.generateFieldInfo = exports.generateJs = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
 const match_wkt_js_1 = require("./match-wkt.js");
-exports.javascript = {
-    target: "js",
-    extension: "_pb.js",
-    generateEnum,
-    generateMessage,
-};
+function generateJs(schema) {
+    for (const file of schema.files) {
+        const f = schema.generateFile(file.name + "_pb.js");
+        f.preamble(file);
+        for (const enumeration of file.enums) {
+            generateEnum(schema, f, enumeration);
+        }
+        for (const message of file.messages) {
+            generateMessage(schema, f, message);
+        }
+        // We do not generate anything for services, and we do not support extensions at this time
+    }
+}
+exports.generateJs = generateJs;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     const protoN = schema.runtime[enumeration.file.syntax];
@@ -88,11 +96,11 @@ function generateFieldInfo(schema, f, field) {
     if (field.jsonName !== undefined) {
         e.push(`jsonName: "`, field.jsonName, `", `);
     }
-    switch (field.kind) {
-        case "scalar_field":
+    switch (field.fieldKind) {
+        case "scalar":
             e.push(`kind: "scalar", T: `, field.scalar, ` /* ScalarType.`, protobuf_1.ScalarType[field.scalar], ` */, `);
             break;
-        case "map_field":
+        case "map":
             e.push(`kind: "map", K: `, field.mapKey, ` /* ScalarType.`, protobuf_1.ScalarType[field.mapKey], ` */, `);
             switch (field.mapValue.kind) {
                 case "scalar":
@@ -106,10 +114,10 @@ function generateFieldInfo(schema, f, field) {
                     break;
             }
             break;
-        case "message_field":
+        case "message":
             e.push(`kind: "message", T: `, field.message, `, `);
             break;
-        case "enum_field":
+        case "enum":
             e.push(`kind: "enum", T: `, protoN, `.getEnumType(`, field.enum, `), `);
             break;
     }

package/dist/cjs/src/match-wkt.js

@@ -19,10 +19,10 @@ function matchWkt(message) {
     switch (message.typeName) {
         case "google.protobuf.Any": {
             const typeUrl = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.STRING);
             const value = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.BYTES);
             if (typeUrl && value) {
                 return {
@@ -35,10 +35,10 @@ function matchWkt(message) {
         }
         case "google.protobuf.Timestamp": {
             const seconds = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.INT64);
             const nanos = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.INT32);
             if (seconds && nanos) {
                 return {
@@ -51,10 +51,10 @@ function matchWkt(message) {
         }
         case "google.protobuf.Duration": {
             const seconds = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.INT64);
             const nanos = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.INT32);
             if (seconds && nanos) {
                 return {
@@ -67,7 +67,7 @@ function matchWkt(message) {
         }
         case "google.protobuf.Struct": {
             const fields = message.fields.find((f) => f.number == 1 && !f.repeated);
-            if ((fields === null || fields === void 0 ? void 0 : fields.kind) !== "map_field" ||
+            if ((fields === null || fields === void 0 ? void 0 : fields.fieldKind) !== "map" ||
                 fields.mapValue.kind !== "message" ||
                 fields.mapValue.message.typeName !== "google.protobuf.Value") {
                 break;
@@ -77,29 +77,29 @@ function matchWkt(message) {
         case "google.protobuf.Value": {
             const kind = message.oneofs.find((o) => o.name === "kind");
             const nullValue = message.fields.find((f) => f.number == 1 && f.oneof === kind);
-            if ((nullValue === null || nullValue === void 0 ? void 0 : nullValue.kind) !== "enum_field" ||
+            if ((nullValue === null || nullValue === void 0 ? void 0 : nullValue.fieldKind) !== "enum" ||
                 nullValue.enum.typeName !== "google.protobuf.NullValue") {
                 return undefined;
             }
             const numberValue = message.fields.find((f) => f.number == 2 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.DOUBLE &&
                 f.oneof === kind);
             const stringValue = message.fields.find((f) => f.number == 3 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.STRING &&
                 f.oneof === kind);
             const boolValue = message.fields.find((f) => f.number == 4 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.BOOL &&
                 f.oneof === kind);
             const structValue = message.fields.find((f) => f.number == 5 && f.oneof === kind);
-            if ((structValue === null || structValue === void 0 ? void 0 : structValue.kind) !== "message_field" ||
+            if ((structValue === null || structValue === void 0 ? void 0 : structValue.fieldKind) !== "message" ||
                 structValue.message.typeName !== "google.protobuf.Struct") {
                 return undefined;
             }
             const listValue = message.fields.find((f) => f.number == 6 && f.oneof === kind);
-            if ((listValue === null || listValue === void 0 ? void 0 : listValue.kind) !== "message_field" ||
+            if ((listValue === null || listValue === void 0 ? void 0 : listValue.fieldKind) !== "message" ||
                 listValue.message.typeName !== "google.protobuf.ListValue") {
                 return undefined;
             }
@@ -119,7 +119,7 @@ function matchWkt(message) {
         }
         case "google.protobuf.ListValue": {
             const values = message.fields.find((f) => f.number == 1 && f.repeated);
-            if ((values === null || values === void 0 ? void 0 : values.kind) != "message_field" ||
+            if ((values === null || values === void 0 ? void 0 : values.fieldKind) != "message" ||
                 values.message.typeName !== "google.protobuf.Value") {
                 break;
             }
@@ -127,7 +127,7 @@ function matchWkt(message) {
         }
         case "google.protobuf.FieldMask": {
             const paths = message.fields.find((f) => f.number == 1 &&
-                f.kind == "scalar_field" &&
+                f.fieldKind == "scalar" &&
                 f.scalar === protobuf_1.ScalarType.STRING &&
                 f.repeated);
             if (paths) {
@@ -148,7 +148,7 @@ function matchWkt(message) {
             if (!value) {
                 break;
             }
-            if (value.kind !== "scalar_field") {
+            if (value.fieldKind !== "scalar") {
                 break;
             }
             return { typeName: message.typeName, value };

package/dist/cjs/src/protoc-gen-es-plugin.js

@@ -17,24 +17,12 @@ exports.protocGenEs = void 0;
 const protoplugin_1 = require("@bufbuild/protoplugin");
 const typescript_js_1 = require("./typescript.js");
 const javascript_js_1 = require("./javascript.js");
-const declaration_1 = require("./declaration");
+const declaration_js_1 = require("./declaration.js");
 const package_json_1 = require("../package.json");
 exports.protocGenEs = (0, protoplugin_1.createEcmaScriptPlugin)({
     name: "protoc-gen-es",
     version: `v${String(package_json_1.version)}`,
-}, (schema) => {
-    const targets = [typescript_js_1.typescript, javascript_js_1.javascript, declaration_1.declaration].filter((gen) => schema.targets.includes(gen.target));
-    for (const target of targets) {
-        for (const file of schema.files) {
-            const f = schema.generateFile(file.name + target.extension);
-            f.preamble(file);
-            for (const enumeration of file.enums) {
-                target.generateEnum(schema, f, enumeration);
-            }
-            for (const message of file.messages) {
-                target.generateMessage(schema, f, message);
-            }
-            // We do not generate anything for services, and we do not support extensions at this time
-        }
-    }
+    generateTs: typescript_js_1.generateTs,
+    generateJs: javascript_js_1.generateJs,
+    generateDts: declaration_js_1.generateDts,
 });

package/dist/cjs/src/typescript.js

@@ -13,18 +13,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typescript = void 0;
+exports.generateTs = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
 const match_wkt_js_1 = require("./match-wkt.js");
 const javascript_js_1 = require("./javascript.js");
 const ecmascript_2 = require("@bufbuild/protoplugin/ecmascript");
-exports.typescript = {
-    target: "ts",
-    extension: "_pb.ts",
-    generateEnum,
-    generateMessage,
-};
+function generateTs(schema) {
+    for (const file of schema.files) {
+        const f = schema.generateFile(file.name + "_pb.ts");
+        f.preamble(file);
+        for (const enumeration of file.enums) {
+            generateEnum(schema, f, enumeration);
+        }
+        for (const message of file.messages) {
+            generateMessage(schema, f, message);
+        }
+        // We do not generate anything for services, and we do not support extensions at this time
+    }
+}
+exports.generateTs = generateTs;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     const protoN = schema.runtime[enumeration.file.syntax];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoc-gen-es",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Protocol Buffers code generator for ECMAScript",
   "license": "Apache-2.0",
   "repository": {
@@ -20,10 +20,10 @@
   },
   "preferUnplugged": true,
   "dependencies": {
-    "@bufbuild/protoplugin": "0.1.0"
+    "@bufbuild/protoplugin": "0.2.0"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "0.1.0"
+    "@bufbuild/protobuf": "0.2.0"
   },
   "peerDependenciesMeta": {
     "@bufbuild/protobuf": {

package/src/declaration.ts

@@ -18,7 +18,11 @@ import type {
   DescMessage,
   DescOneof,
 } from "@bufbuild/protobuf";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type {
+  GeneratedFile,
+  Printable,
+  Schema,
+} from "@bufbuild/protoplugin/ecmascript";
 import {
   getFieldTyping,
   literalString,
@@ -27,12 +31,19 @@ import {
 } from "@bufbuild/protoplugin/ecmascript";
 import { matchWkt } from "./match-wkt.js";
 
-export const declaration = {
-  target: "dts",
-  extension: "_pb.d.ts",
-  generateEnum,
-  generateMessage,
-} as const;
+export function generateDts(schema: Schema) {
+  for (const file of schema.files) {
+    const f = schema.generateFile(file.name + "_pb.d.ts");
+    f.preamble(file);
+    for (const enumeration of file.enums) {
+      generateEnum(schema, f, enumeration);
+    }
+    for (const message of file.messages) {
+      generateMessage(schema, f, message);
+    }
+    // We do not generate anything for services, and we do not support extensions at this time
+  }
+}
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
@@ -120,7 +131,7 @@ function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
 
 function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
   f.print(makeJsDoc(field, "  "));
-  const e: Parameters<typeof f.print> = [];
+  const e: Printable = [];
   e.push("  ", localName(field));
   const { typing, optional } = getFieldTyping(field, f);
   if (optional) {

package/src/javascript.ts

@@ -14,7 +14,11 @@
 
 import type { DescEnum, DescField, DescMessage } from "@bufbuild/protobuf";
 import { proto2, proto3, ScalarType } from "@bufbuild/protobuf";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type {
+  GeneratedFile,
+  Printable,
+  Schema,
+} from "@bufbuild/protoplugin/ecmascript";
 import {
   getFieldExplicitDefaultValue,
   literalString,
@@ -23,12 +27,19 @@ import {
 } from "@bufbuild/protoplugin/ecmascript";
 import { matchWkt } from "./match-wkt.js";
 
-export const javascript = {
-  target: "js",
-  extension: "_pb.js",
-  generateEnum,
-  generateMessage,
-} as const;
+export function generateJs(schema: Schema) {
+  for (const file of schema.files) {
+    const f = schema.generateFile(file.name + "_pb.js");
+    f.preamble(file);
+    for (const enumeration of file.enums) {
+      generateEnum(schema, f, enumeration);
+    }
+    for (const message of file.messages) {
+      generateMessage(schema, f, message);
+    }
+    // We do not generate anything for services, and we do not support extensions at this time
+  }
+}
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
@@ -90,16 +101,16 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
 // prettier-ignore
 export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescField) {
   const protoN = schema.runtime[field.parent.file.syntax];
-  const e: Parameters<typeof f.print> = [];
+  const e: Printable = [];
   e.push("    { no: ", field.number, `, name: "`, field.name, `", `);
   if (field.jsonName !== undefined) {
     e.push(`jsonName: "`, field.jsonName, `", `);
   }
-  switch (field.kind) {
-    case "scalar_field":
+  switch (field.fieldKind) {
+    case "scalar":
       e.push(`kind: "scalar", T: `, field.scalar, ` /* ScalarType.`, ScalarType[field.scalar], ` */, `);
       break;
-    case "map_field":
+    case "map":
       e.push(`kind: "map", K: `, field.mapKey, ` /* ScalarType.`, ScalarType[field.mapKey], ` */, `);
       switch (field.mapValue.kind) {
         case "scalar":
@@ -113,10 +124,10 @@ export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescF
           break;
       }
       break;
-    case "message_field":
+    case "message":
       e.push(`kind: "message", T: `, field.message, `, `);
       break;
-    case "enum_field":
+    case "enum":
       e.push(`kind: "enum", T: `, protoN, `.getEnumType(`, field.enum, `), `);
       break;
   }

package/src/match-wkt.ts

@@ -37,21 +37,21 @@ type DescWkt =
     }
   | {
       typeName: "google.protobuf.Struct";
-      fields: DescField & { kind: "map_field" };
+      fields: DescField & { fieldKind: "map" };
     }
   | {
       typeName: "google.protobuf.Value";
       kind: DescOneof;
-      nullValue: DescField & { kind: "enum_field" };
+      nullValue: DescField & { fieldKind: "enum" };
       numberValue: DescField;
       stringValue: DescField;
       boolValue: DescField;
-      structValue: DescField & { kind: "message_field" };
-      listValue: DescField & { kind: "message_field" };
+      structValue: DescField & { fieldKind: "message" };
+      listValue: DescField & { fieldKind: "message" };
     }
   | {
       typeName: "google.protobuf.ListValue";
-      values: DescField & { kind: "message_field" };
+      values: DescField & { fieldKind: "message" };
     }
   | {
       typeName: "google.protobuf.FieldMask";
@@ -59,39 +59,39 @@ type DescWkt =
     }
   | {
       typeName: "google.protobuf.DoubleValue";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.FloatValue";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.Int64Value";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.UInt64Value";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.Int32Value";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.UInt32Value";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.BoolValue";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.StringValue";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     }
   | {
       typeName: "google.protobuf.BytesValue";
-      value: DescField & { kind: "scalar_field" };
+      value: DescField & { fieldKind: "scalar" };
     };
 
 export function matchWkt(message: DescMessage): DescWkt | undefined {
@@ -100,13 +100,13 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
       const typeUrl = message.fields.find(
         (f) =>
           f.number == 1 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.STRING
       );
       const value = message.fields.find(
         (f) =>
           f.number == 2 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.BYTES
       );
       if (typeUrl && value) {
@@ -122,13 +122,13 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
       const seconds = message.fields.find(
         (f) =>
           f.number == 1 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.INT64
       );
       const nanos = message.fields.find(
         (f) =>
           f.number == 2 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.INT32
       );
       if (seconds && nanos) {
@@ -144,13 +144,13 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
       const seconds = message.fields.find(
         (f) =>
           f.number == 1 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.INT64
       );
       const nanos = message.fields.find(
         (f) =>
           f.number == 2 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.INT32
       );
       if (seconds && nanos) {
@@ -165,7 +165,7 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
     case "google.protobuf.Struct": {
       const fields = message.fields.find((f) => f.number == 1 && !f.repeated);
       if (
-        fields?.kind !== "map_field" ||
+        fields?.fieldKind !== "map" ||
         fields.mapValue.kind !== "message" ||
         fields.mapValue.message.typeName !== "google.protobuf.Value"
       ) {
@@ -179,7 +179,7 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
         (f) => f.number == 1 && f.oneof === kind
       );
       if (
-        nullValue?.kind !== "enum_field" ||
+        nullValue?.fieldKind !== "enum" ||
         nullValue.enum.typeName !== "google.protobuf.NullValue"
       ) {
         return undefined;
@@ -187,21 +187,21 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
       const numberValue = message.fields.find(
         (f) =>
           f.number == 2 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.DOUBLE &&
           f.oneof === kind
       );
       const stringValue = message.fields.find(
         (f) =>
           f.number == 3 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.STRING &&
           f.oneof === kind
       );
       const boolValue = message.fields.find(
         (f) =>
           f.number == 4 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.BOOL &&
           f.oneof === kind
       );
@@ -209,7 +209,7 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
         (f) => f.number == 5 && f.oneof === kind
       );
       if (
-        structValue?.kind !== "message_field" ||
+        structValue?.fieldKind !== "message" ||
         structValue.message.typeName !== "google.protobuf.Struct"
       ) {
         return undefined;
@@ -218,7 +218,7 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
         (f) => f.number == 6 && f.oneof === kind
       );
       if (
-        listValue?.kind !== "message_field" ||
+        listValue?.fieldKind !== "message" ||
         listValue.message.typeName !== "google.protobuf.ListValue"
       ) {
         return undefined;
@@ -240,7 +240,7 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
     case "google.protobuf.ListValue": {
       const values = message.fields.find((f) => f.number == 1 && f.repeated);
       if (
-        values?.kind != "message_field" ||
+        values?.fieldKind != "message" ||
         values.message.typeName !== "google.protobuf.Value"
       ) {
         break;
@@ -251,7 +251,7 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
       const paths = message.fields.find(
         (f) =>
           f.number == 1 &&
-          f.kind == "scalar_field" &&
+          f.fieldKind == "scalar" &&
           f.scalar === ScalarType.STRING &&
           f.repeated
       );
@@ -275,7 +275,7 @@ export function matchWkt(message: DescMessage): DescWkt | undefined {
       if (!value) {
         break;
       }
-      if (value.kind !== "scalar_field") {
+      if (value.fieldKind !== "scalar") {
         break;
       }
       return { typeName: message.typeName, value };

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

@@ -13,32 +13,15 @@
 // limitations under the License.
 
 import { createEcmaScriptPlugin } from "@bufbuild/protoplugin";
-import { typescript } from "./typescript.js";
-import { javascript } from "./javascript.js";
-import { declaration } from "./declaration";
+import { generateTs } from "./typescript.js";
+import { generateJs } from "./javascript.js";
+import { generateDts } from "./declaration.js";
 import { version } from "../package.json";
 
-export const protocGenEs = createEcmaScriptPlugin(
-  {
-    name: "protoc-gen-es",
-    version: `v${String(version)}`,
-  },
-  (schema) => {
-    const targets = [typescript, javascript, declaration].filter((gen) =>
-      schema.targets.includes(gen.target)
-    );
-    for (const target of targets) {
-      for (const file of schema.files) {
-        const f = schema.generateFile(file.name + target.extension);
-        f.preamble(file);
-        for (const enumeration of file.enums) {
-          target.generateEnum(schema, f, enumeration);
-        }
-        for (const message of file.messages) {
-          target.generateMessage(schema, f, message);
-        }
-        // We do not generate anything for services, and we do not support extensions at this time
-      }
-    }
-  }
-);
+export const protocGenEs = createEcmaScriptPlugin({
+  name: "protoc-gen-es",
+  version: `v${String(version)}`,
+  generateTs,
+  generateJs,
+  generateDts,
+});

package/src/typescript.ts

@@ -19,7 +19,11 @@ import type {
   DescOneof,
 } from "@bufbuild/protobuf";
 import { ScalarType } from "@bufbuild/protobuf";
-import type { GeneratedFile, Schema } from "@bufbuild/protoplugin/ecmascript";
+import type {
+  GeneratedFile,
+  Printable,
+  Schema,
+} from "@bufbuild/protoplugin/ecmascript";
 import {
   localName,
   getFieldIntrinsicDefaultValue,
@@ -30,12 +34,19 @@ import { matchWkt } from "./match-wkt.js";
 import { generateFieldInfo } from "./javascript.js";
 import { literalString } from "@bufbuild/protoplugin/ecmascript";
 
-export const typescript = {
-  target: "ts",
-  extension: "_pb.ts",
-  generateEnum,
-  generateMessage,
-} as const;
+export function generateTs(schema: Schema) {
+  for (const file of schema.files) {
+    const f = schema.generateFile(file.name + "_pb.ts");
+    f.preamble(file);
+    for (const enumeration of file.enums) {
+      generateEnum(schema, f, enumeration);
+    }
+    for (const message of file.messages) {
+      generateMessage(schema, f, message);
+    }
+    // We do not generate anything for services, and we do not support extensions at this time
+  }
+}
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
@@ -145,7 +156,7 @@ function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
 
 function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
   f.print(makeJsDoc(field, "  "));
-  const e: Parameters<typeof f.print> = [];
+  const e: Printable = [];
   e.push("  ", localName(field));
   const { defaultValue, typingInferrable } =
     getFieldIntrinsicDefaultValue(field);