@bufbuild/protoc-gen-es 1.5.1 → 1.7.0

package/README.md

@@ -98,12 +98,25 @@ By default, [protoc-gen-es](https://www.npmjs.com/package/@bufbuild/protoc-gen-e
 uses a `.js` file extensions in import paths, even in TypeScript files.
 
 This is unintuitive, but necessary for [ECMAScript modules in Node.js](https://www.typescriptlang.org/docs/handbook/esm-node.html).
-Unfortunately, not all bundlers and tools have caught up yet, and Deno 
-requires `.ts`. With this plugin option, you can replace `.js` extensions 
+Unfortunately, not all bundlers and tools have caught up yet, and Deno
+requires `.ts`. With this plugin option, you can replace `.js` extensions
 in import paths with the given value. For example, set
 
-- `import_extension=none` to remove the `.js` extension
-- `import_extension=.ts` to replace the `.js` extension with `.ts`
+- `import_extension=none` to remove the `.js` extension.
+- `import_extension=.ts` to replace the `.js` extension with `.ts`.
+
+### `js_import_style`
+
+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))
+generate ECMAScript `import` and `export` statements. For use cases where 
+CommonJS is difficult to avoid, this option can be used to generate CommonJS 
+`require()` calls.
+
+Possible values:
+- `js_import_style=module` generate ECMAScript `import` / `export` statements - 
+  the default behavior.
+- `js_import_style=legacy_commonjs` generate CommonJS `require()` calls.
 
 
 ### `keep_empty_files=true`

package/dist/cjs/package.json

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

package/dist/cjs/src/declaration.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.
@@ -26,19 +26,22 @@ function generateDts(schema) {
         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
+        for (const extension of file.extensions) {
+            generateExtension(schema, f, extension);
+        }
+        // We do not generate anything for services
     }
 }
 exports.generateDts = generateDts;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
-    f.print((0, ecmascript_1.makeJsDoc)(enumeration));
+    f.print(f.jsDoc(enumeration));
     f.print("export declare enum ", enumeration, " {");
     for (const value of enumeration.values) {
         if (enumeration.values.indexOf(value) > 0) {
             f.print();
         }
-        f.print((0, ecmascript_1.makeJsDoc)(value, "  "));
+        f.print(f.jsDoc(value, "  "));
         f.print("  ", (0, ecmascript_1.localName)(value), " = ", value.number, ",");
     }
     f.print("}");
@@ -48,7 +51,7 @@ function generateEnum(schema, f, enumeration) {
 function generateMessage(schema, f, message) {
     const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, message.file);
     const { PartialMessage, FieldList, Message, PlainMessage, BinaryReadOptions, JsonReadOptions, JsonValue } = schema.runtime;
-    f.print((0, ecmascript_1.makeJsDoc)(message));
+    f.print(f.jsDoc(message));
     f.print("export declare class ", message, " extends ", Message, "<", message, "> {");
     for (const member of message.members) {
         switch (member.kind) {
@@ -65,7 +68,7 @@ function generateMessage(schema, f, message) {
     f.print();
     generateWktMethods(schema, f, message);
     f.print("  static readonly runtime: typeof ", protoN, ";");
-    f.print('  static readonly typeName = ', (0, ecmascript_1.literalString)(message.typeName), ';');
+    f.print('  static readonly typeName = ', f.string(message.typeName), ';');
     f.print("  static readonly fields: ", FieldList, ";");
     // In case we start supporting options, we have to surface them here
     //f.print("  static readonly options: { readonly [extensionName: string]: ", rt.JsonValue, " } = {};")
@@ -86,17 +89,19 @@ function generateMessage(schema, f, message) {
     for (const nestedMessage of message.nestedMessages) {
         generateMessage(schema, f, nestedMessage);
     }
-    // We do not support extensions at this time
+    for (const nestedExtension of message.nestedExtensions) {
+        generateExtension(schema, f, nestedExtension);
+    }
 }
 // prettier-ignore
 function generateOneof(schema, f, oneof) {
-    f.print((0, ecmascript_1.makeJsDoc)(oneof, "  "));
+    f.print(f.jsDoc(oneof, "  "));
     f.print("  ", (0, ecmascript_1.localName)(oneof), ": {");
     for (const field of oneof.fields) {
         if (oneof.fields.indexOf(field) > 0) {
             f.print(`  } | {`);
         }
-        f.print((0, ecmascript_1.makeJsDoc)(field, "    "));
+        f.print(f.jsDoc(field, "    "));
         const { typing } = (0, ecmascript_1.getFieldTyping)(field, f);
         f.print(`    value: `, typing, `;`);
         f.print(`    case: "`, (0, ecmascript_1.localName)(field), `";`);
@@ -104,7 +109,7 @@ function generateOneof(schema, f, oneof) {
     f.print(`  } | { case: undefined; value?: undefined };`);
 }
 function generateField(schema, f, field) {
-    f.print((0, ecmascript_1.makeJsDoc)(field, "  "));
+    f.print(f.jsDoc(field, "  "));
     const e = [];
     e.push("  ", (0, ecmascript_1.localName)(field));
     const { typing, optional } = (0, ecmascript_1.getFieldTyping)(field, f);
@@ -118,6 +123,13 @@ function generateField(schema, f, field) {
     f.print(e);
 }
 // prettier-ignore
+function generateExtension(schema, f, ext) {
+    const { typing } = (0, ecmascript_1.getFieldTyping)(ext, f);
+    f.print(f.jsDoc(ext));
+    f.print(f.exportDecl("declare const", ext), ": ", schema.runtime.Extension, "<", ext.extendee, ", ", typing, ">;");
+    f.print();
+}
+// prettier-ignore
 function generateWktMethods(schema, f, message) {
     const ref = (0, ecmascript_1.reifyWkt)(message);
     if (ref === undefined) {

package/dist/cjs/src/editions.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/src/javascript.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.
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateFieldInfo = exports.generateJs = void 0;
+exports.getFieldInfoLiteral = exports.generateFieldInfo = exports.generateJs = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
 const editions_js_1 = require("./editions.js");
@@ -27,26 +27,29 @@ function generateJs(schema) {
         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
+        for (const extension of file.extensions) {
+            generateExtension(schema, f, extension);
+        }
+        // We do not generate anything for services
     }
 }
 exports.generateJs = generateJs;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, enumeration.file);
-    f.print((0, ecmascript_1.makeJsDoc)(enumeration));
-    f.print("export const ", enumeration, " = ", protoN, ".makeEnum(");
+    f.print(f.jsDoc(enumeration));
+    f.print(f.exportDecl("const", enumeration), " = ", protoN, ".makeEnum(");
     f.print(`  "`, enumeration.typeName, `",`);
     f.print(`  [`);
     if (enumeration.sharedPrefix === undefined) {
         for (const value of enumeration.values) {
-            f.print("    {no: ", value.number, ", name: ", (0, ecmascript_1.literalString)(value.name), "},");
+            f.print("    {no: ", value.number, ", name: ", f.string(value.name), "},");
         }
     }
     else {
         for (const value of enumeration.values) {
             const localName = value.name.substring(enumeration.sharedPrefix.length);
-            f.print("    {no: ", value.number, ", name: ", (0, ecmascript_1.literalString)(value.name), ", localName: ", (0, ecmascript_1.literalString)(localName), "},");
+            f.print("    {no: ", value.number, ", name: ", f.string(value.name), ", localName: ", f.string(localName), "},");
         }
     }
     f.print(`  ],`);
@@ -56,9 +59,9 @@ function generateEnum(schema, f, enumeration) {
 // prettier-ignore
 function generateMessage(schema, f, message) {
     const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, message.file);
-    f.print((0, ecmascript_1.makeJsDoc)(message));
-    f.print("export const ", message, " = ", protoN, ".makeMessageType(");
-    f.print(`  `, (0, ecmascript_1.literalString)(message.typeName), `,`);
+    f.print(f.jsDoc(message));
+    f.print(f.exportDecl("const", message), " = ", protoN, ".makeMessageType(");
+    f.print(`  `, f.string(message.typeName), `,`);
     if (message.fields.length == 0) {
         f.print("  [],");
     }
@@ -74,7 +77,7 @@ function generateMessage(schema, f, message) {
             .makeMessageType(message.typeName, []).name;
     if (needsLocalName) {
         // local name is not inferrable from the type name, we need to provide it
-        f.print(`  {localName: `, (0, ecmascript_1.literalString)((0, ecmascript_1.localName)(message)), `},`);
+        f.print(`  {localName: `, f.string((0, ecmascript_1.localName)(message)), `},`);
     }
     f.print(");");
     f.print();
@@ -86,15 +89,25 @@ function generateMessage(schema, f, message) {
     for (const nestedMessage of message.nestedMessages) {
         generateMessage(schema, f, nestedMessage);
     }
-    // We do not support extensions at this time
+    for (const nestedExtension of message.nestedExtensions) {
+        generateExtension(schema, f, nestedExtension);
+    }
 }
 // prettier-ignore
 function generateFieldInfo(schema, f, field) {
-    const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, field.parent.file);
+    f.print("    ", getFieldInfoLiteral(schema, field), ",");
+}
+exports.generateFieldInfo = generateFieldInfo;
+// prettier-ignore
+function getFieldInfoLiteral(schema, field) {
+    const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, field.kind == "extension" ? field.file : field.parent.file);
     const e = [];
-    e.push("    { no: ", field.number, `, name: "`, field.name, `", `);
-    if (field.jsonName !== undefined) {
-        e.push(`jsonName: "`, field.jsonName, `", `);
+    e.push("{ no: ", field.number, `, `);
+    if (field.kind == "field") {
+        e.push(`name: "`, field.name, `", `);
+        if (field.jsonName !== undefined) {
+            e.push(`jsonName: "`, field.jsonName, `", `);
+        }
     }
     switch (field.fieldKind) {
         case "scalar":
@@ -147,10 +160,26 @@ function generateFieldInfo(schema, f, field) {
     if (typeof lastE == "string" && lastE.endsWith(", ")) {
         e[e.length - 1] = lastE.substring(0, lastE.length - 2);
     }
-    e.push(" },");
-    f.print(...e);
+    e.push(" }");
+    return e;
+}
+exports.getFieldInfoLiteral = getFieldInfoLiteral;
+// prettier-ignore
+function generateExtension(schema, f, ext) {
+    const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, ext.file);
+    f.print(f.jsDoc(ext));
+    f.print(f.exportDecl("const", ext), " = ", protoN, ".makeExtension(");
+    f.print("  ", f.string(ext.typeName), ", ");
+    f.print("  ", ext.extendee, ", ");
+    if (ext.fieldKind == "scalar") {
+        f.print("  ", getFieldInfoLiteral(schema, ext), ",");
+    }
+    else {
+        f.print("  () => (", getFieldInfoLiteral(schema, ext), "),");
+    }
+    f.print(");");
+    f.print();
 }
-exports.generateFieldInfo = generateFieldInfo;
 // prettier-ignore
 function generateWktMethods(schema, f, message) {
     var _a;

package/dist/cjs/src/protoc-gen-es-plugin.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/src/typescript.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.
@@ -28,20 +28,23 @@ function generateTs(schema) {
         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
+        for (const extension of file.extensions) {
+            generateExtension(schema, f, extension);
+        }
+        // We do not generate anything for services
     }
 }
 exports.generateTs = generateTs;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, enumeration.file);
-    f.print((0, ecmascript_1.makeJsDoc)(enumeration));
-    f.print("export enum ", enumeration, " {");
+    f.print(f.jsDoc(enumeration));
+    f.print(f.exportDecl("enum", enumeration), " {");
     for (const value of enumeration.values) {
         if (enumeration.values.indexOf(value) > 0) {
             f.print();
         }
-        f.print((0, ecmascript_1.makeJsDoc)(value, "  "));
+        f.print(f.jsDoc(value, "  "));
         f.print("  ", (0, ecmascript_1.localName)(value), " = ", value.number, ",");
     }
     f.print("}");
@@ -57,8 +60,8 @@ function generateEnum(schema, f, enumeration) {
 function generateMessage(schema, f, message) {
     const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, message.file);
     const { PartialMessage, FieldList, Message, PlainMessage, BinaryReadOptions, JsonReadOptions, JsonValue } = schema.runtime;
-    f.print((0, ecmascript_1.makeJsDoc)(message));
-    f.print("export class ", message, " extends ", Message, "<", message, "> {");
+    f.print(f.jsDoc(message));
+    f.print(f.exportDecl("class", message), " extends ", Message, "<", message, "> {");
     for (const member of message.members) {
         switch (member.kind) {
             case "oneof":
@@ -77,7 +80,7 @@ function generateMessage(schema, f, message) {
     f.print();
     generateWktMethods(schema, f, message);
     f.print("  static readonly runtime: typeof ", protoN, " = ", protoN, ";");
-    f.print('  static readonly typeName = ', (0, ecmascript_1.literalString)(message.typeName), ';');
+    f.print('  static readonly typeName = ', f.string(message.typeName), ';');
     f.print("  static readonly fields: ", FieldList, " = ", protoN, ".util.newFieldList(() => [");
     for (const field of message.fields) {
         (0, javascript_js_1.generateFieldInfo)(schema, f, field);
@@ -110,17 +113,19 @@ function generateMessage(schema, f, message) {
     for (const nestedMessage of message.nestedMessages) {
         generateMessage(schema, f, nestedMessage);
     }
-    // We do not support extensions at this time
+    for (const nestedExtension of message.nestedExtensions) {
+        generateExtension(schema, f, nestedExtension);
+    }
 }
 // prettier-ignore
 function generateOneof(schema, f, oneof) {
-    f.print((0, ecmascript_1.makeJsDoc)(oneof, "  "));
+    f.print(f.jsDoc(oneof, "  "));
     f.print("  ", (0, ecmascript_1.localName)(oneof), ": {");
     for (const field of oneof.fields) {
         if (oneof.fields.indexOf(field) > 0) {
             f.print(`  } | {`);
         }
-        f.print((0, ecmascript_1.makeJsDoc)(field, "    "));
+        f.print(f.jsDoc(field, "    "));
         const { typing } = (0, ecmascript_1.getFieldTyping)(field, f);
         f.print(`    value: `, typing, `;`);
         f.print(`    case: "`, (0, ecmascript_1.localName)(field), `";`);
@@ -128,7 +133,7 @@ function generateOneof(schema, f, oneof) {
     f.print(`  } | { case: undefined; value?: undefined } = { case: undefined };`);
 }
 function generateField(schema, f, field) {
-    f.print((0, ecmascript_1.makeJsDoc)(field, "  "));
+    f.print(f.jsDoc(field, "  "));
     const e = [];
     e.push("  ", (0, ecmascript_1.localName)(field));
     const { defaultValue, typingInferrable } = (0, ecmascript_1.getFieldIntrinsicDefaultValue)(field);
@@ -146,6 +151,23 @@ function generateField(schema, f, field) {
     f.print(e);
 }
 // prettier-ignore
+function generateExtension(schema, f, ext) {
+    const protoN = (0, editions_js_1.getNonEditionRuntime)(schema, ext.file);
+    const { typing } = (0, ecmascript_1.getFieldTyping)(ext, f);
+    f.print(f.jsDoc(ext));
+    f.print(f.exportDecl("const", ext), " = ", protoN, ".makeExtension<", ext.extendee, ", ", typing, ">(");
+    f.print("  ", f.string(ext.typeName), ", ");
+    f.print("  ", ext.extendee, ", ");
+    if (ext.fieldKind == "scalar") {
+        f.print("  ", (0, javascript_js_1.getFieldInfoLiteral)(schema, ext), ",");
+    }
+    else {
+        f.print("  () => (", (0, javascript_js_1.getFieldInfoLiteral)(schema, ext), "),");
+    }
+    f.print(");");
+    f.print();
+}
+// prettier-ignore
 function generateWktMethods(schema, f, message) {
     var _a;
     const ref = (0, ecmascript_1.reifyWkt)(message);

package/package.json

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

package/src/declaration.ts

@@ -1,4 +1,4 @@
-// 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.
@@ -18,6 +18,7 @@ import type {
   DescMessage,
   DescOneof,
 } from "@bufbuild/protobuf";
+import { DescExtension } from "@bufbuild/protobuf";
 import type {
   GeneratedFile,
   Printable,
@@ -25,9 +26,7 @@ import type {
 } from "@bufbuild/protoplugin/ecmascript";
 import {
   getFieldTyping,
-  literalString,
   localName,
-  makeJsDoc,
   reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
 import { getNonEditionRuntime } from "./editions.js";
@@ -42,19 +41,22 @@ export function generateDts(schema: Schema) {
     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
+    for (const extension of file.extensions) {
+      generateExtension(schema, f, extension);
+    }
+    // We do not generate anything for services
   }
 }
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
-  f.print(makeJsDoc(enumeration));
+  f.print(f.jsDoc(enumeration));
   f.print("export declare enum ", enumeration, " {");
   for (const value of enumeration.values) {
     if (enumeration.values.indexOf(value) > 0) {
       f.print();
     }
-    f.print(makeJsDoc(value, "  "));
+    f.print(f.jsDoc(value, "  "));
     f.print("  ", localName(value), " = ", value.number, ",");
   }
   f.print("}");
@@ -73,7 +75,7 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
     JsonReadOptions,
     JsonValue
   } = schema.runtime;
-  f.print(makeJsDoc(message));
+  f.print(f.jsDoc(message));
   f.print("export declare class ", message, " extends ", Message, "<", message, "> {");
   for (const member of message.members) {
     switch (member.kind) {
@@ -90,7 +92,7 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
   f.print();
   generateWktMethods(schema, f, message);
   f.print("  static readonly runtime: typeof ", protoN, ";");
-  f.print('  static readonly typeName = ', literalString(message.typeName), ';');
+  f.print('  static readonly typeName = ', f.string(message.typeName), ';');
   f.print("  static readonly fields: ", FieldList, ";");
   // In case we start supporting options, we have to surface them here
   //f.print("  static readonly options: { readonly [extensionName: string]: ", rt.JsonValue, " } = {};")
@@ -111,18 +113,20 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
   for (const nestedMessage of message.nestedMessages) {
     generateMessage(schema, f, nestedMessage);
   }
-  // We do not support extensions at this time
+  for (const nestedExtension of message.nestedExtensions) {
+    generateExtension(schema, f, nestedExtension);
+  }
 }
 
 // prettier-ignore
 function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
-  f.print(makeJsDoc(oneof, "  "));
+  f.print(f.jsDoc(oneof, "  "));
   f.print("  ", localName(oneof), ": {");
   for (const field of oneof.fields) {
     if (oneof.fields.indexOf(field) > 0) {
       f.print(`  } | {`);
     }
-    f.print(makeJsDoc(field, "    "));
+    f.print(f.jsDoc(field, "    "));
     const { typing } = getFieldTyping(field, f);
     f.print(`    value: `, typing, `;`);
     f.print(`    case: "`, localName(field), `";`);
@@ -131,7 +135,7 @@ function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
 }
 
 function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
-  f.print(makeJsDoc(field, "  "));
+  f.print(f.jsDoc(field, "  "));
   const e: Printable = [];
   e.push("  ", localName(field));
   const { typing, optional } = getFieldTyping(field, f);
@@ -144,6 +148,18 @@ function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
   f.print(e);
 }
 
+// prettier-ignore
+function generateExtension(
+  schema: Schema,
+  f: GeneratedFile,
+  ext: DescExtension,
+) {
+  const { typing } = getFieldTyping(ext, f);
+  f.print(f.jsDoc(ext));
+  f.print(f.exportDecl("declare const", ext), ": ", schema.runtime.Extension, "<", ext.extendee, ", ", typing, ">;");
+  f.print();
+}
+
 // prettier-ignore
 function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
   const ref = reifyWkt(message);

package/src/editions.ts

@@ -1,4 +1,4 @@
-// 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/src/javascript.ts

@@ -1,4 +1,4 @@
-// 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.
@@ -12,7 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import type { DescEnum, DescField, DescMessage } from "@bufbuild/protobuf";
+import type {
+  DescEnum,
+  DescExtension,
+  DescField,
+  DescMessage,
+} from "@bufbuild/protobuf";
 import {
   FieldDescriptorProto_Type,
   LongType,
@@ -27,9 +32,7 @@ import type {
 } from "@bufbuild/protoplugin/ecmascript";
 import {
   getFieldExplicitDefaultValue,
-  literalString,
   localName,
-  makeJsDoc,
   reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
 import { getNonEditionRuntime } from "./editions.js";
@@ -44,25 +47,28 @@ export function generateJs(schema: Schema) {
     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
+    for (const extension of file.extensions) {
+      generateExtension(schema, f, extension);
+    }
+    // We do not generate anything for services
   }
 }
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
   const protoN = getNonEditionRuntime(schema, enumeration.file);
-  f.print(makeJsDoc(enumeration));
-  f.print("export const ", enumeration, " = ", protoN, ".makeEnum(")
+  f.print(f.jsDoc(enumeration));
+  f.print(f.exportDecl("const", enumeration), " = ", protoN, ".makeEnum(")
   f.print(`  "`, enumeration.typeName, `",`)
   f.print(`  [`)
   if (enumeration.sharedPrefix === undefined) {
     for (const value of enumeration.values) {
-      f.print("    {no: ", value.number, ", name: ", literalString(value.name), "},")
+      f.print("    {no: ", value.number, ", name: ", f.string(value.name), "},")
     }
   } else {
     for (const value of enumeration.values) {
       const localName = value.name.substring(enumeration.sharedPrefix.length);
-      f.print("    {no: ", value.number, ", name: ", literalString(value.name), ", localName: ", literalString(localName), "},")
+      f.print("    {no: ", value.number, ", name: ", f.string(value.name), ", localName: ", f.string(localName), "},")
     }
   }
   f.print(`  ],`)
@@ -73,9 +79,9 @@ function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
 // prettier-ignore
 function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage) {
   const protoN = getNonEditionRuntime(schema, message.file);
-  f.print(makeJsDoc(message));
-  f.print("export const ", message, " = ", protoN, ".makeMessageType(")
-  f.print(`  `, literalString(message.typeName), `,`)
+  f.print(f.jsDoc(message));
+  f.print(f.exportDecl("const", message), " = ", protoN, ".makeMessageType(")
+  f.print(`  `, f.string(message.typeName), `,`)
   if (message.fields.length == 0) {
     f.print("  [],")
   } else {
@@ -90,7 +96,7 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
       .makeMessageType(message.typeName, []).name;
   if (needsLocalName) {
     // local name is not inferrable from the type name, we need to provide it
-    f.print(`  {localName: `, literalString(localName(message)), `},`)
+    f.print(`  {localName: `, f.string(localName(message)), `},`)
   }
   f.print(");")
   f.print()
@@ -102,22 +108,32 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
   for (const nestedMessage of message.nestedMessages) {
     generateMessage(schema, f, nestedMessage);
   }
-  // We do not support extensions at this time
+  for (const nestedExtension of message.nestedExtensions) {
+    generateExtension(schema, f, nestedExtension);
+  }
+}
+
+// prettier-ignore
+export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescField | DescExtension) {
+  f.print("    ", getFieldInfoLiteral(schema, field), ",");
 }
 
 // prettier-ignore
-export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescField) {
-  const protoN = getNonEditionRuntime(schema, field.parent.file);
+export function getFieldInfoLiteral(schema: Schema, field: DescField | DescExtension): Printable {
+  const protoN = getNonEditionRuntime(schema, field.kind == "extension" ? field.file : field.parent.file);
   const e: Printable = [];
-  e.push("    { no: ", field.number, `, name: "`, field.name, `", `);
-  if (field.jsonName !== undefined) {
-    e.push(`jsonName: "`, field.jsonName, `", `);
+  e.push("{ no: ", field.number, `, `);
+  if (field.kind == "field") {
+    e.push(`name: "`, field.name, `", `);
+    if (field.jsonName !== undefined) {
+      e.push(`jsonName: "`, field.jsonName, `", `);
+    }
   }
   switch (field.fieldKind) {
     case "scalar":
       e.push(`kind: "scalar", T: `, field.scalar, ` /* ScalarType.`, ScalarType[field.scalar], ` */, `);
       if (field.longType != LongType.BIGINT) {
-          e.push(`L: `, field.longType, ` /* LongType.`, LongType[field.longType], ` */, `);
+        e.push(`L: `, field.longType, ` /* LongType.`, LongType[field.longType], ` */, `);
       }
       break;
     case "map":
@@ -164,8 +180,28 @@ export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescF
   if (typeof lastE == "string" && lastE.endsWith(", ")) {
     e[e.length - 1] = lastE.substring(0, lastE.length - 2);
   }
-  e.push(" },");
-  f.print(...e);
+  e.push(" }");
+  return e;
+}
+
+// prettier-ignore
+function generateExtension(
+  schema: Schema,
+  f: GeneratedFile,
+  ext: DescExtension,
+) {
+  const protoN = getNonEditionRuntime(schema, ext.file);
+  f.print(f.jsDoc(ext));
+  f.print(f.exportDecl("const", ext), " = ", protoN, ".makeExtension(");
+  f.print("  ", f.string(ext.typeName), ", ");
+  f.print("  ", ext.extendee, ", ");
+  if (ext.fieldKind == "scalar") {
+    f.print("  ", getFieldInfoLiteral(schema, ext), ",");
+  } else {
+    f.print("  () => (", getFieldInfoLiteral(schema, ext), "),");
+  }
+  f.print(");");
+  f.print();
 }
 
 // prettier-ignore

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

@@ -1,4 +1,4 @@
-// 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/src/typescript.ts

@@ -1,4 +1,4 @@
-// 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.
@@ -14,6 +14,7 @@
 
 import type {
   DescEnum,
+  DescExtension,
   DescField,
   DescMessage,
   DescOneof,
@@ -27,12 +28,10 @@ import type {
 import {
   getFieldIntrinsicDefaultValue,
   getFieldTyping,
-  literalString,
   localName,
-  makeJsDoc,
   reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
-import { generateFieldInfo } from "./javascript.js";
+import { generateFieldInfo, getFieldInfoLiteral } from "./javascript.js";
 import { getNonEditionRuntime } from "./editions.js";
 
 export function generateTs(schema: Schema) {
@@ -45,20 +44,23 @@ export function generateTs(schema: Schema) {
     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
+    for (const extension of file.extensions) {
+      generateExtension(schema, f, extension);
+    }
+    // We do not generate anything for services
   }
 }
 
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
   const protoN = getNonEditionRuntime(schema, enumeration.file);
-  f.print(makeJsDoc(enumeration));
-  f.print("export enum ", enumeration, " {");
+  f.print(f.jsDoc(enumeration));
+  f.print(f.exportDecl("enum", enumeration), " {");
   for (const value of enumeration.values) {
     if (enumeration.values.indexOf(value) > 0) {
       f.print();
     }
-    f.print(makeJsDoc(value, "  "));
+    f.print(f.jsDoc(value, "  "));
     f.print("  ", localName(value), " = ", value.number, ",");
   }
   f.print("}");
@@ -83,8 +85,8 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
     JsonReadOptions,
     JsonValue
   } = schema.runtime;
-  f.print(makeJsDoc(message));
-  f.print("export class ", message, " extends ", Message, "<", message, "> {");
+  f.print(f.jsDoc(message));
+  f.print(f.exportDecl("class", message), " extends ", Message, "<", message, "> {");
   for (const member of message.members) {
     switch (member.kind) {
       case "oneof":
@@ -103,7 +105,7 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
   f.print();
   generateWktMethods(schema, f, message);
   f.print("  static readonly runtime: typeof ", protoN, " = ", protoN, ";");
-  f.print('  static readonly typeName = ', literalString(message.typeName), ';');
+  f.print('  static readonly typeName = ', f.string(message.typeName), ';');
   f.print("  static readonly fields: ", FieldList, " = ", protoN, ".util.newFieldList(() => [");
   for (const field of message.fields) {
     generateFieldInfo(schema, f, field);
@@ -136,18 +138,20 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
   for (const nestedMessage of message.nestedMessages) {
     generateMessage(schema, f, nestedMessage);
   }
-  // We do not support extensions at this time
+  for (const nestedExtension of message.nestedExtensions) {
+    generateExtension(schema, f, nestedExtension);
+  }
 }
 
 // prettier-ignore
 function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
-  f.print(makeJsDoc(oneof, "  "));
+  f.print(f.jsDoc(oneof, "  "));
   f.print("  ", localName(oneof), ": {");
   for (const field of oneof.fields) {
     if (oneof.fields.indexOf(field) > 0) {
       f.print(`  } | {`);
     }
-    f.print(makeJsDoc(field, "    "));
+    f.print(f.jsDoc(field, "    "));
     const { typing } = getFieldTyping(field, f);
     f.print(`    value: `, typing, `;`);
     f.print(`    case: "`, localName(field), `";`);
@@ -156,7 +160,7 @@ function generateOneof(schema: Schema, f: GeneratedFile, oneof: DescOneof) {
 }
 
 function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
-  f.print(makeJsDoc(field, "  "));
+  f.print(f.jsDoc(field, "  "));
   const e: Printable = [];
   e.push("  ", localName(field));
   const { defaultValue, typingInferrable } =
@@ -174,6 +178,27 @@ function generateField(schema: Schema, f: GeneratedFile, field: DescField) {
   f.print(e);
 }
 
+// prettier-ignore
+function generateExtension(
+  schema: Schema,
+  f: GeneratedFile,
+  ext: DescExtension,
+) {
+  const protoN = getNonEditionRuntime(schema, ext.file);
+  const { typing } = getFieldTyping(ext, f);
+  f.print(f.jsDoc(ext));
+  f.print(f.exportDecl("const", ext), " = ", protoN, ".makeExtension<", ext.extendee, ", ", typing, ">(");
+  f.print("  ", f.string(ext.typeName), ", ");
+  f.print("  ", ext.extendee, ", ");
+  if (ext.fieldKind == "scalar") {
+    f.print("  ", getFieldInfoLiteral(schema, ext), ",");
+  } else {
+    f.print("  () => (", getFieldInfoLiteral(schema, ext), "),");
+  }
+  f.print(");");
+  f.print();
+}
+
 // prettier-ignore
 function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessage) {
   const ref = reifyWkt(message);