@bufbuild/protoc-gen-es 1.3.3 → 1.4.0

package/dist/cjs/package.json

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

package/dist/cjs/src/javascript.js

@@ -98,6 +98,9 @@ function generateFieldInfo(schema, f, field) {
     switch (field.fieldKind) {
         case "scalar":
             e.push(`kind: "scalar", T: `, field.scalar, ` /* ScalarType.`, protobuf_1.ScalarType[field.scalar], ` */, `);
+            if (field.longType != protobuf_1.LongType.BIGINT) {
+                e.push(`L: `, field.longType, ` /* LongType.`, protobuf_1.LongType[field.longType], ` */, `);
+            }
             break;
         case "map":
             e.push(`kind: "map", K: `, field.mapKey, ` /* ScalarType.`, protobuf_1.ScalarType[field.mapKey], ` */, `);

package/dist/cjs/src/typescript.js

@@ -17,7 +17,6 @@ exports.generateTs = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const ecmascript_1 = require("@bufbuild/protoplugin/ecmascript");
 const javascript_js_1 = require("./javascript.js");
-const ecmascript_2 = require("@bufbuild/protoplugin/ecmascript");
 function generateTs(schema) {
     for (const file of schema.files) {
         const f = schema.generateFile(file.name + "_pb.ts");
@@ -77,7 +76,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_2.literalString)(message.typeName), ';');
+    f.print('  static readonly typeName = ', (0, ecmascript_1.literalString)(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);
@@ -152,7 +151,7 @@ function generateWktMethods(schema, f, message) {
     if (ref === undefined) {
         return;
     }
-    const { Message, JsonValue, JsonReadOptions, JsonWriteOptions, JsonObject, MessageType, IMessageTypeRegistry, ScalarType: rtScalarType, protoInt64, } = schema.runtime;
+    const { Message, JsonValue, JsonReadOptions, JsonWriteOptions, JsonObject, MessageType, IMessageTypeRegistry, ScalarType: rtScalarType, LongType: rtLongType, protoInt64, } = schema.runtime;
     const protoN = schema.runtime[message.file.syntax];
     switch (ref.typeName) {
         case "google.protobuf.Any":
@@ -272,7 +271,12 @@ function generateWktMethods(schema, f, message) {
             f.print(`    if (ms < Date.parse("0001-01-01T00:00:00Z") || ms > Date.parse("9999-12-31T23:59:59Z")) {`);
             f.print("      throw new Error(`cannot decode message ", message.typeName, " from JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);");
             f.print("    }");
-            f.print("    this.", (0, ecmascript_1.localName)(ref.seconds), " = ", protoInt64, ".parse(ms / 1000);");
+            if (ref.seconds.longType === protobuf_1.LongType.STRING) {
+                f.print("    this.", (0, ecmascript_1.localName)(ref.seconds), " = ", protoInt64, ".parse(ms / 1000).toString();");
+            }
+            else {
+                f.print("    this.", (0, ecmascript_1.localName)(ref.seconds), " = ", protoInt64, ".parse(ms / 1000);");
+            }
             f.print("    this.", (0, ecmascript_1.localName)(ref.nanos), " = 0;");
             f.print("    if (matches[7]) {");
             f.print(`      this.`, (0, ecmascript_1.localName)(ref.nanos), ` = (parseInt("1" + matches[7] + "0".repeat(9 - matches[7].length)) - 1000000000);`);
@@ -320,7 +324,12 @@ function generateWktMethods(schema, f, message) {
             f.print("    if (longSeconds > 315576000000 || longSeconds < -315576000000) {");
             f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON: ${", protoN, ".json.debug(json)}`);");
             f.print("    }");
-            f.print("    this.", (0, ecmascript_1.localName)(ref.seconds), " = ", protoInt64, ".parse(longSeconds);");
+            if (ref.seconds.longType === protobuf_1.LongType.STRING) {
+                f.print("    this.", (0, ecmascript_1.localName)(ref.seconds), " = ", protoInt64, ".parse(longSeconds).toString();");
+            }
+            else {
+                f.print("    this.", (0, ecmascript_1.localName)(ref.seconds), " = ", protoInt64, ".parse(longSeconds);");
+            }
             f.print(`    if (typeof match[2] == "string") {`);
             f.print(`      const nanosStr = match[2] + "0".repeat(9 - match[2].length);`);
             f.print("      this.", (0, ecmascript_1.localName)(ref.nanos), " = parseInt(nanosStr);");
@@ -345,7 +354,7 @@ function generateWktMethods(schema, f, message) {
             f.print("        nanosStr = nanosStr.substring(0, 6);");
             f.print(`      }`);
             f.print(`      text += "." + nanosStr;`);
-            f.print("      if (this.", (0, ecmascript_1.localName)(ref.nanos), " < 0 && this.", (0, ecmascript_1.localName)(ref.seconds), " === ", protoInt64, ".zero) {");
+            f.print("      if (this.", (0, ecmascript_1.localName)(ref.nanos), " < 0 && Number(this.", (0, ecmascript_1.localName)(ref.seconds), ") == 0) {");
             f.print(`          text = "-" + text;`);
             f.print(`      }`);
             f.print("    }");
@@ -516,7 +525,12 @@ function generateWktMethods(schema, f, message) {
             f.print();
             f.print("  override fromJson(json: ", JsonValue, ", options?: Partial<", JsonReadOptions, ">): this {");
             f.print("    try {");
-            f.print("      this.value = ", protoN, ".json.readScalar(", rtScalarType, ".", protobuf_1.ScalarType[ref.value.scalar], ", json);");
+            if (ref.value.longType === protobuf_1.LongType.STRING) {
+                f.print("      this.value = ", protoN, ".json.readScalar(", rtScalarType, ".", protobuf_1.ScalarType[ref.value.scalar], ", json, ", rtLongType, ".", protobuf_1.LongType[ref.value.longType], ");");
+            }
+            else {
+                f.print("      this.value = ", protoN, ".json.readScalar(", rtScalarType, ".", protobuf_1.ScalarType[ref.value.scalar], ", json);");
+            }
             f.print("    } catch (e) {");
             f.print("      let m = `cannot decode message ", message.typeName, " from JSON\"`;");
             f.print("      if (e instanceof Error && e.message.length > 0) {");
@@ -554,7 +568,12 @@ function generateWktStaticMethods(schema, f, message) {
             f.print("  static fromDate(date: Date): ", message, " {");
             f.print("    const ms = date.getTime();");
             f.print("    return new ", message, "({");
-            f.print("      ", (0, ecmascript_1.localName)(ref.seconds), ": ", protoInt64, ".parse(Math.floor(ms / 1000)),");
+            if (ref.seconds.longType === protobuf_1.LongType.STRING) {
+                f.print("      ", (0, ecmascript_1.localName)(ref.seconds), ": ", protoInt64, ".parse(Math.floor(ms / 1000)).toString(),");
+            }
+            else {
+                f.print("      ", (0, ecmascript_1.localName)(ref.seconds), ": ", protoInt64, ".parse(Math.floor(ms / 1000)),");
+            }
             f.print("      ", (0, ecmascript_1.localName)(ref.nanos), ": (ms % 1000) * 1000000,");
             f.print("    });");
             f.print("  }");

package/package.json

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

package/src/javascript.ts

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 import type { DescEnum, DescField, DescMessage } from "@bufbuild/protobuf";
-import { proto2, proto3, ScalarType } from "@bufbuild/protobuf";
+import { LongType, proto2, proto3, ScalarType } from "@bufbuild/protobuf";
 import type {
   GeneratedFile,
   Printable,
@@ -109,6 +109,9 @@ export function generateFieldInfo(schema: Schema, f: GeneratedFile, field: DescF
   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], ` */, `);
+      }
       break;
     case "map":
       e.push(`kind: "map", K: `, field.mapKey, ` /* ScalarType.`, ScalarType[field.mapKey], ` */, `);

package/src/typescript.ts

@@ -18,21 +18,21 @@ import type {
   DescMessage,
   DescOneof,
 } from "@bufbuild/protobuf";
-import { ScalarType } from "@bufbuild/protobuf";
+import { LongType, ScalarType } from "@bufbuild/protobuf";
 import type {
   GeneratedFile,
   Printable,
   Schema,
 } from "@bufbuild/protoplugin/ecmascript";
 import {
-  localName,
   getFieldIntrinsicDefaultValue,
   getFieldTyping,
+  literalString,
+  localName,
   makeJsDoc,
   reifyWkt,
 } from "@bufbuild/protoplugin/ecmascript";
 import { generateFieldInfo } from "./javascript.js";
-import { literalString } from "@bufbuild/protoplugin/ecmascript";
 
 export function generateTs(schema: Schema) {
   for (const file of schema.files) {
@@ -188,6 +188,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
     MessageType,
     IMessageTypeRegistry,
     ScalarType: rtScalarType,
+    LongType: rtLongType,
     protoInt64,
   } = schema.runtime;
   const protoN = schema.runtime[message.file.syntax];
@@ -309,7 +310,11 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print(`    if (ms < Date.parse("0001-01-01T00:00:00Z") || ms > Date.parse("9999-12-31T23:59:59Z")) {`);
       f.print("      throw new Error(`cannot decode message ", message.typeName, " from JSON: must be from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59Z inclusive`);");
       f.print("    }");
-      f.print("    this.", localName(ref.seconds), " = ", protoInt64, ".parse(ms / 1000);");
+      if (ref.seconds.longType === LongType.STRING) {
+        f.print("    this.", localName(ref.seconds), " = ", protoInt64, ".parse(ms / 1000).toString();");
+      } else {
+        f.print("    this.", localName(ref.seconds), " = ", protoInt64, ".parse(ms / 1000);");
+      }
       f.print("    this.", localName(ref.nanos), " = 0;");
       f.print("    if (matches[7]) {");
       f.print(`      this.`, localName(ref.nanos), ` = (parseInt("1" + matches[7] + "0".repeat(9 - matches[7].length)) - 1000000000);` );
@@ -357,7 +362,11 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print("    if (longSeconds > 315576000000 || longSeconds < -315576000000) {")
       f.print("      throw new Error(`cannot decode ", message.typeName, " from JSON: ${", protoN, ".json.debug(json)}`);")
       f.print("    }")
-      f.print("    this.", localName(ref.seconds), " = ", protoInt64, ".parse(longSeconds);")
+      if (ref.seconds.longType === LongType.STRING) {
+        f.print("    this.", localName(ref.seconds), " = ", protoInt64, ".parse(longSeconds).toString();")
+      } else {
+        f.print("    this.", localName(ref.seconds), " = ", protoInt64, ".parse(longSeconds);")
+      }
       f.print(`    if (typeof match[2] == "string") {`)
       f.print(`      const nanosStr = match[2] + "0".repeat(9 - match[2].length);`)
       f.print("      this.", localName(ref.nanos), " = parseInt(nanosStr);")
@@ -382,7 +391,7 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print("        nanosStr = nanosStr.substring(0, 6);")
       f.print(`      }`)
       f.print(`      text += "." + nanosStr;`)
-      f.print("      if (this.", localName(ref.nanos), " < 0 && this.", localName(ref.seconds), " === ", protoInt64, ".zero) {");
+      f.print("      if (this.", localName(ref.nanos), " < 0 && Number(this.", localName(ref.seconds), ") == 0) {");
       f.print(`          text = "-" + text;`);
       f.print(`      }`);
       f.print("    }")
@@ -553,7 +562,11 @@ function generateWktMethods(schema: Schema, f: GeneratedFile, message: DescMessa
       f.print()
       f.print("  override fromJson(json: ", JsonValue, ", options?: Partial<", JsonReadOptions, ">): this {")
       f.print("    try {")
-      f.print("      this.value = ", protoN, ".json.readScalar(", rtScalarType, ".", ScalarType[ref.value.scalar], ", json);")
+      if (ref.value.longType === LongType.STRING) {
+        f.print("      this.value = ", protoN, ".json.readScalar(", rtScalarType, ".", ScalarType[ref.value.scalar], ", json, ", rtLongType, ".", LongType[ref.value.longType] ,");")
+      } else {
+        f.print("      this.value = ", protoN, ".json.readScalar(", rtScalarType, ".", ScalarType[ref.value.scalar], ", json);")
+      }
       f.print("    } catch (e) {")
       f.print("      let m = `cannot decode message ", message.typeName, " from JSON\"`;")
       f.print("      if (e instanceof Error && e.message.length > 0) {")
@@ -594,7 +607,11 @@ function generateWktStaticMethods(schema: Schema, f: GeneratedFile, message: Des
       f.print("  static fromDate(date: Date): ", message, " {")
       f.print("    const ms = date.getTime();")
       f.print("    return new ", message, "({")
-      f.print("      ", localName(ref.seconds), ": ", protoInt64, ".parse(Math.floor(ms / 1000)),")
+      if (ref.seconds.longType === LongType.STRING) {
+        f.print("      ", localName(ref.seconds), ": ", protoInt64, ".parse(Math.floor(ms / 1000)).toString(),")
+      } else {
+        f.print("      ", localName(ref.seconds), ": ", protoInt64, ".parse(Math.floor(ms / 1000)),")
+      }
       f.print("      ", localName(ref.nanos), ": (ms % 1000) * 1000000,")
       f.print("    });")
       f.print("  }")