@bufbuild/protoc-gen-es 1.8.0 → 1.9.0

package/dist/cjs/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@bufbuild/protoc-gen-es",
-    "version": "1.8.0",
+    "version": "1.9.0",
     "description": "Protocol Buffers code generator for ECMAScript",
     "license": "Apache-2.0",
     "repository": {
@@ -16,15 +16,15 @@
     },
     "scripts": {
         "clean": "rm -rf ./dist/cjs/*",
-        "build": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs"
+        "build": "../../node_modules/typescript/bin/tsc --project tsconfig.json --outDir ./dist/cjs"
     },
     "preferUnplugged": true,
     "dependencies": {
-        "@bufbuild/protobuf": "^1.8.0",
-        "@bufbuild/protoplugin": "1.8.0"
+        "@bufbuild/protobuf": "^1.9.0",
+        "@bufbuild/protoplugin": "1.9.0"
     },
     "peerDependencies": {
-        "@bufbuild/protobuf": "1.8.0"
+        "@bufbuild/protobuf": "1.9.0"
     },
     "peerDependenciesMeta": {
         "@bufbuild/protobuf": {

package/dist/cjs/src/declaration.js

@@ -37,7 +37,7 @@ exports.generateDts = generateDts;
 // prettier-ignore
 function generateEnum(schema, f, enumeration) {
     f.print(f.jsDoc(enumeration));
-    f.print("export declare enum ", enumeration, " {");
+    f.print(f.exportDecl("declare enum", (0, ecmascript_1.localName)(enumeration)), " {");
     for (const value of enumeration.values) {
         if (enumeration.values.indexOf(value) > 0) {
             f.print();
@@ -52,8 +52,9 @@ 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;
+    const m = (0, ecmascript_1.localName)(message);
     f.print(f.jsDoc(message));
-    f.print("export declare class ", message, " extends ", Message, "<", message, "> {");
+    f.print(f.exportDecl("declare class", m), " extends ", Message, "<", m, "> {");
     for (const member of message.members) {
         switch (member.kind) {
             case "oneof":
@@ -65,7 +66,7 @@ function generateMessage(schema, f, message) {
         }
         f.print();
     }
-    f.print("  constructor(data?: ", PartialMessage, "<", message, ">);");
+    f.print("  constructor(data?: ", PartialMessage, "<", m, ">);");
     f.print();
     generateWktMethods(schema, f, message);
     f.print("  static readonly runtime: typeof ", protoN, ";");
@@ -75,13 +76,13 @@ function generateMessage(schema, f, message) {
     //f.print("  static readonly options: { readonly [extensionName: string]: ", rt.JsonValue, " } = {};")
     f.print();
     generateWktStaticMethods(schema, f, message);
-    f.print("  static fromBinary(bytes: Uint8Array, options?: Partial<", BinaryReadOptions, ">): ", message, ";");
+    f.print("  static fromBinary(bytes: Uint8Array, options?: Partial<", BinaryReadOptions, ">): ", m, ";");
     f.print();
-    f.print("  static fromJson(jsonValue: ", JsonValue, ", options?: Partial<", JsonReadOptions, ">): ", message, ";");
+    f.print("  static fromJson(jsonValue: ", JsonValue, ", options?: Partial<", JsonReadOptions, ">): ", m, ";");
     f.print();
-    f.print("  static fromJsonString(jsonString: string, options?: Partial<", JsonReadOptions, ">): ", message, ";");
+    f.print("  static fromJsonString(jsonString: string, options?: Partial<", JsonReadOptions, ">): ", m, ";");
     f.print();
-    f.print("  static equals(a: ", message, " | ", PlainMessage, "<", message, "> | undefined, b: ", message, " | ", PlainMessage, "<", message, "> | undefined): boolean;");
+    f.print("  static equals(a: ", m, " | ", PlainMessage, "<", m, "> | undefined, b: ", m, " | ", PlainMessage, "<", m, "> | undefined): boolean;");
     f.print("}");
     f.print();
     for (const nestedEnum of message.nestedEnums) {
@@ -125,8 +126,9 @@ function generateField(schema, f, field) {
 // prettier-ignore
 function generateExtension(schema, f, ext) {
     const { typing } = (0, util_js_1.getFieldTypeInfo)(ext);
+    const e = f.import(ext.extendee).toTypeOnly();
     f.print(f.jsDoc(ext));
-    f.print(f.exportDecl("declare const", ext), ": ", schema.runtime.Extension, "<", ext.extendee, ", ", typing, ">;");
+    f.print(f.exportDecl("declare const", (0, ecmascript_1.localName)(ext)), ": ", schema.runtime.Extension, "<", e, ", ", typing, ">;");
     f.print();
 }
 // prettier-ignore

package/dist/cjs/src/javascript.js

@@ -43,15 +43,12 @@ function generateEnum(schema, f, enumeration) {
     f.print(f.exportDecl("const", enumeration), " = /*@__PURE__*/ ", protoN, ".makeEnum(");
     f.print(`  "`, enumeration.typeName, `",`);
     f.print(`  [`);
-    if (enumeration.sharedPrefix === undefined) {
-        for (const value of enumeration.values) {
+    for (const value of enumeration.values) {
+        if ((0, ecmascript_1.localName)(value) === 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: ", f.string(value.name), ", localName: ", f.string(localName), "},");
+        else {
+            f.print("    {no: ", value.number, ", name: ", f.string(value.name), ", localName: ", f.string((0, ecmascript_1.localName)(value)), "},");
         }
     }
     f.print(`  ],`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoc-gen-es",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Protocol Buffers code generator for ECMAScript",
   "license": "Apache-2.0",
   "repository": {
@@ -16,15 +16,15 @@
   },
   "scripts": {
     "clean": "rm -rf ./dist/cjs/*",
-    "build": "../../node_modules/typescript/bin/tsc --project tsconfig.json --module commonjs --outDir ./dist/cjs"
+    "build": "../../node_modules/typescript/bin/tsc --project tsconfig.json --outDir ./dist/cjs"
   },
   "preferUnplugged": true,
   "dependencies": {
-    "@bufbuild/protobuf": "^1.8.0",
-    "@bufbuild/protoplugin": "1.8.0"
+    "@bufbuild/protobuf": "^1.9.0",
+    "@bufbuild/protoplugin": "1.9.0"
   },
   "peerDependencies": {
-    "@bufbuild/protobuf": "1.8.0"
+    "@bufbuild/protobuf": "1.9.0"
   },
   "peerDependenciesMeta": {
     "@bufbuild/protobuf": {

package/src/declaration.ts

@@ -48,7 +48,7 @@ export function generateDts(schema: Schema) {
 // prettier-ignore
 function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
   f.print(f.jsDoc(enumeration));
-  f.print("export declare enum ", enumeration, " {");
+  f.print(f.exportDecl("declare enum", localName(enumeration)), " {");
   for (const value of enumeration.values) {
     if (enumeration.values.indexOf(value) > 0) {
       f.print();
@@ -72,8 +72,9 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
     JsonReadOptions,
     JsonValue
   } = schema.runtime;
+  const m = localName(message);
   f.print(f.jsDoc(message));
-  f.print("export declare class ", message, " extends ", Message, "<", message, "> {");
+  f.print(f.exportDecl("declare class", m), " extends ", Message, "<", m, "> {");
   for (const member of message.members) {
     switch (member.kind) {
       case "oneof":
@@ -85,7 +86,7 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
     }
     f.print();
   }
-  f.print("  constructor(data?: ", PartialMessage, "<", message, ">);");
+  f.print("  constructor(data?: ", PartialMessage, "<", m, ">);");
   f.print();
   generateWktMethods(schema, f, message);
   f.print("  static readonly runtime: typeof ", protoN, ";");
@@ -95,13 +96,13 @@ function generateMessage(schema: Schema, f: GeneratedFile, message: DescMessage)
   //f.print("  static readonly options: { readonly [extensionName: string]: ", rt.JsonValue, " } = {};")
   f.print();
   generateWktStaticMethods(schema, f, message);
-  f.print("  static fromBinary(bytes: Uint8Array, options?: Partial<", BinaryReadOptions, ">): ", message, ";")
+  f.print("  static fromBinary(bytes: Uint8Array, options?: Partial<", BinaryReadOptions, ">): ", m, ";")
   f.print()
-  f.print("  static fromJson(jsonValue: ", JsonValue, ", options?: Partial<", JsonReadOptions, ">): ", message, ";")
+  f.print("  static fromJson(jsonValue: ", JsonValue, ", options?: Partial<", JsonReadOptions, ">): ", m, ";")
   f.print()
-  f.print("  static fromJsonString(jsonString: string, options?: Partial<", JsonReadOptions, ">): ", message, ";")
+  f.print("  static fromJsonString(jsonString: string, options?: Partial<", JsonReadOptions, ">): ", m, ";")
   f.print()
-  f.print("  static equals(a: ", message, " | ", PlainMessage, "<", message, "> | undefined, b: ", message, " | ", PlainMessage, "<", message, "> | undefined): boolean;")
+  f.print("  static equals(a: ", m, " | ", PlainMessage, "<", m, "> | undefined, b: ", m, " | ", PlainMessage, "<", m, "> | undefined): boolean;")
   f.print("}")
   f.print()
   for (const nestedEnum of message.nestedEnums) {
@@ -151,8 +152,9 @@ function generateExtension(
   ext: DescExtension,
 ) {
   const { typing } = getFieldTypeInfo(ext);
+  const e = f.import(ext.extendee).toTypeOnly();
   f.print(f.jsDoc(ext));
-  f.print(f.exportDecl("declare const", ext), ": ", schema.runtime.Extension, "<", ext.extendee, ", ", typing, ">;");
+  f.print(f.exportDecl("declare const", localName(ext)), ": ", schema.runtime.Extension, "<", e, ", ", typing, ">;");
   f.print();
 }
 

package/src/javascript.ts

@@ -59,14 +59,11 @@ function generateEnum(schema: Schema, f: GeneratedFile, enumeration: DescEnum) {
   f.print(f.exportDecl("const", enumeration), " = /*@__PURE__*/ ", protoN, ".makeEnum(")
   f.print(`  "`, enumeration.typeName, `",`)
   f.print(`  [`)
-  if (enumeration.sharedPrefix === undefined) {
-    for (const value of enumeration.values) {
+  for (const value of enumeration.values) {
+    if (localName(value) === 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: ", f.string(value.name), ", localName: ", f.string(localName), "},")
+    } else {
+      f.print("    {no: ", value.number, ", name: ", f.string(value.name), ", localName: ", f.string(localName(value)), "},")
     }
   }
   f.print(`  ],`)

package/tsconfig.json

@@ -2,6 +2,11 @@
   "files": ["src/protoc-gen-es-plugin.ts"],
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "resolveJsonModule": true
+    // We import the plugin's version number from package.json
+    "resolveJsonModule": true,
+    // This package is CommonJS
+    "verbatimModuleSyntax": false,
+    "module": "CommonJS",
+    "moduleResolution": "Node10"
   }
 }