@bufbuild/protoc-gen-es 1.6.0 → 1.7.0

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bufbuild/protoc-gen-es",
-    "version": "1.6.0",
+    "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.6.0",
-        "@bufbuild/protoplugin": "1.6.0"
+        "@bufbuild/protobuf": "^1.7.0",
+        "@bufbuild/protoplugin": "1.7.0"
     },
     "peerDependencies": {
-        "@bufbuild/protobuf": "1.6.0"
+        "@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,7 +26,10 @@ 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;
@@ -86,7 +89,9 @@ 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) {
@@ -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,7 +27,10 @@ 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;
@@ -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,7 +28,10 @@ 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;
@@ -110,7 +113,9 @@ 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) {
@@ -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.6.0",
+  "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.6.0",
-    "@bufbuild/protoplugin": "1.6.0"
+    "@bufbuild/protobuf": "^1.7.0",
+    "@bufbuild/protoplugin": "1.7.0"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "1.6.0"
+    "@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,
@@ -40,7 +41,10 @@ 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
   }
 }
 
@@ -109,7 +113,9 @@ 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
@@ -142,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,
@@ -42,7 +47,10 @@ 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
   }
 }
 
@@ -100,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":
@@ -162,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,
@@ -30,7 +31,7 @@ import {
   localName,
   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) {
@@ -43,7 +44,10 @@ 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
   }
 }
 
@@ -134,7 +138,9 @@ 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
@@ -172,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);