ts-proto 1.136.0 → 1.137.0

package/build/main.js

@@ -225,7 +225,7 @@ function makeUtils(options) {
         ...longs,
         ...makeComparisonUtils(),
         ...makeNiceGrpcServerStreamingMethodResult(),
-        ...makeGrpcWebErrorClass(),
+        ...makeGrpcWebErrorClass(bytes),
     };
 }
 exports.makeUtils = makeUtils;
@@ -286,6 +286,11 @@ function makeLongUtils(options, bytes) {
         return long.toString();
       }
     `);
+    const longToBigint = (0, ts_poet_1.conditionalOutput)("longToBigint", (0, ts_poet_1.code) `
+      function longToBigint(long: ${Long}) {
+        return BigInt(long.toString());
+      }
+    `);
     const longToNumber = (0, ts_poet_1.conditionalOutput)("longToNumber", (0, ts_poet_1.code) `
       function longToNumber(long: ${Long}): number {
         if (long.gt(Number.MAX_SAFE_INTEGER)) {
@@ -294,14 +299,14 @@ function makeLongUtils(options, bytes) {
         return long.toNumber();
       }
     `);
-    return { numberToLong, longToNumber, longToString, Long };
+    return { numberToLong, longToNumber, longToString, longToBigint, Long };
 }
 function makeByteUtils() {
-    const globalThis = (0, ts_poet_1.conditionalOutput)("globalThis", (0, ts_poet_1.code) `
+    const globalThis = (0, ts_poet_1.conditionalOutput)("tsProtoGlobalThis", (0, ts_poet_1.code) `
       declare var self: any | undefined;
       declare var window: any | undefined;
       declare var global: any | undefined;
-      var globalThis: any = (() => {
+      var tsProtoGlobalThis: any = (() => {
         if (typeof globalThis !== "undefined") return globalThis;
         if (typeof self !== "undefined") return self;
         if (typeof window !== "undefined") return window;
@@ -409,6 +414,10 @@ function makeTimestampMethods(options, longs) {
         toNumberCode = "t.seconds.toNumber()";
         seconds = (0, ts_poet_1.code) `${longs.numberToLong}(date.getTime() / 1_000)`;
     }
+    else if (options.forceLong === options_1.LongOption.BIGINT) {
+        toNumberCode = "Number(t.seconds.toString())";
+        seconds = (0, ts_poet_1.code) `BigInt(Math.trunc(date.getTime() / 1_000))`;
+    }
     else if (options.forceLong === options_1.LongOption.STRING) {
         toNumberCode = "Number(t.seconds)";
         // Must discard the fractional piece here
@@ -492,9 +501,9 @@ function makeNiceGrpcServerStreamingMethodResult() {
     `);
     return { NiceGrpcServerStreamingMethodResult };
 }
-function makeGrpcWebErrorClass() {
+function makeGrpcWebErrorClass(bytes) {
     const GrpcWebError = (0, ts_poet_1.conditionalOutput)("GrpcWebError", (0, ts_poet_1.code) `
-      export class GrpcWebError extends globalThis.Error {
+      export class GrpcWebError extends ${bytes.globalThis}.Error {
         constructor(message: string, public code: grpc.Code, public metadata: grpc.Metadata) {
           super(message);
         }
@@ -655,6 +664,9 @@ function generateDecode(ctx, fullName, messageDesc) {
                 else if (options.forceLong === options_1.LongOption.STRING) {
                     readSnippet = (0, ts_poet_1.code) `${utils.longToString}(${readSnippet} as Long)`;
                 }
+                else if (options.forceLong === options_1.LongOption.BIGINT) {
+                    readSnippet = (0, ts_poet_1.code) `${utils.longToBigint}(${readSnippet} as Long)`;
+                }
                 else {
                     readSnippet = (0, ts_poet_1.code) `${utils.longToNumber}(${readSnippet} as Long)`;
                 }
@@ -781,6 +793,10 @@ function generateEncode(ctx, fullName, messageDesc) {
             const toNumber = (0, types_1.getEnumMethod)(ctx, field.typeName, "ToNumber");
             writeSnippet = (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${toNumber}(${place}))`;
         }
+        else if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT) {
+            const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
+            writeSnippet = (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place}.toString())`;
+        }
         else if ((0, types_1.isScalar)(field) || (0, types_1.isEnum)(field)) {
             const tag = ((field.number << 3) | (0, types_1.basicWireType)(field.type)) >>> 0;
             writeSnippet = (place) => (0, ts_poet_1.code) `writer.uint32(${tag}).${(0, types_1.toReaderCall)(field)}(${place})`;
@@ -1015,6 +1031,9 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                     const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, field, { keepValueType: true }).toCodeString());
                     return (0, ts_poet_1.code) `${cstr}.fromValue(${from})`;
                 }
+                else if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT) {
+                    return (0, ts_poet_1.code) `BigInt(${from})`;
+                }
                 else {
                     const cstr = (0, case_1.capitalize)((0, types_1.basicTypeName)(ctx, field, { keepValueType: true }).toCodeString());
                     return (0, ts_poet_1.code) `${cstr}(${from})`;
@@ -1045,6 +1064,9 @@ function generateFromJson(ctx, fullName, fullTypeName, messageDesc) {
                 if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.LONG) {
                     return (0, ts_poet_1.code) `${(0, case_1.capitalize)(valueType.toCodeString())}.fromValue(${from})`;
                 }
+                else if ((0, types_1.isLongValueType)(field) && options.forceLong === options_1.LongOption.BIGINT) {
+                    return (0, ts_poet_1.code) `BigInt(${from})`;
+                }
                 else if ((0, types_1.isBytesValueType)(field)) {
                     return (0, ts_poet_1.code) `new ${(0, case_1.capitalize)(valueType.toCodeString())}(${from})`;
                 }
@@ -1267,6 +1289,9 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 else if ((0, types_1.isLong)(valueType) && options.forceLong === options_1.LongOption.LONG) {
                     return (0, ts_poet_1.code) `${from}.toString()`;
                 }
+                else if ((0, types_1.isLong)(valueType) && options.forceLong === options_1.LongOption.BIGINT) {
+                    return (0, ts_poet_1.code) `${from}.toString()`;
+                }
                 else if ((0, types_1.isWholeNumber)(valueType) && !((0, types_1.isLong)(valueType) && options.forceLong === options_1.LongOption.STRING)) {
                     return (0, ts_poet_1.code) `Math.round(${from})`;
                 }
@@ -1304,6 +1329,9 @@ function generateToJson(ctx, fullName, fullProtobufTypeName, messageDesc) {
                 const v = (0, types_1.isWithinOneOf)(field) ? "undefined" : (0, types_1.defaultValue)(ctx, field);
                 return (0, ts_poet_1.code) `(${from} || ${v}).toString()`;
             }
+            else if ((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.BIGINT) {
+                return (0, ts_poet_1.code) `${from}.toString()`;
+            }
             else if ((0, types_1.isWholeNumber)(field) && !((0, types_1.isLong)(field) && options.forceLong === options_1.LongOption.STRING)) {
                 return (0, ts_poet_1.code) `Math.round(${from})`;
             }
@@ -1512,11 +1540,15 @@ function generateFromPartial(ctx, fullName, messageDesc) {
 function generateWrap(ctx, fullProtoTypeName, fieldNames) {
     const chunks = [];
     if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
+        let setStatement = "struct.fields[key] = object[key];";
+        if (ctx.options.useMapType) {
+            setStatement = "struct.fields.set(key, object[key]);";
+        }
         chunks.push((0, ts_poet_1.code) `wrap(object: {[key: string]: any} | undefined): Struct {
       const struct = createBaseStruct();
       if (object !== undefined) {
         Object.keys(object).forEach(key => {
-          struct.fields[key] = object[key];
+          ${setStatement}
         });
       }
       return struct;
@@ -1593,13 +1625,24 @@ function generateWrap(ctx, fullProtoTypeName, fieldNames) {
 function generateUnwrap(ctx, fullProtoTypeName, fieldNames) {
     const chunks = [];
     if ((0, types_1.isStructTypeName)(fullProtoTypeName)) {
-        chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
-      const object: { [key: string]: any } = {};
-      Object.keys(message.fields).forEach(key => {
-        object[key] = message.fields[key];
-      });
-      return object;
-    }`);
+        if (ctx.options.useMapType) {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
+        const object: { [key: string]: any } = {};
+        [...message.fields.keys()].forEach((key) => {
+          object[key] = message.fields.get(key);
+        });
+        return object;
+      }`);
+        }
+        else {
+            chunks.push((0, ts_poet_1.code) `unwrap(message: Struct): {[key: string]: any} {
+        const object: { [key: string]: any } = {};
+        Object.keys(message.fields).forEach(key => {
+          object[key] = message.fields[key];     
+        });
+        return object;
+      }`);
+        }
     }
     if ((0, types_1.isAnyValueTypeName)(fullProtoTypeName)) {
         if (ctx.options.oneof === options_1.OneofOption.UNIONS) {
@@ -1619,25 +1662,25 @@ function generateUnwrap(ctx, fullProtoTypeName, fieldNames) {
         } else {
           return undefined;
         }
-    }`);
+      }`);
         }
         else {
             chunks.push((0, ts_poet_1.code) `unwrap(message: Value): string | number | boolean | Object | null | Array<any> | undefined {
-      if (message?.${fieldNames.stringValue} !== undefined) {
-        return message.${fieldNames.stringValue};
-      } else if (message?.${fieldNames.numberValue} !== undefined) {
-        return message.${fieldNames.numberValue};
-      } else if (message?.${fieldNames.boolValue} !== undefined) {
-        return message.${fieldNames.boolValue};
-      } else if (message?.${fieldNames.structValue} !== undefined) {
-        return message.${fieldNames.structValue};
-      } else if (message?.${fieldNames.listValue} !== undefined) {
-          return message.${fieldNames.listValue};
-      } else if (message?.${fieldNames.nullValue} !== undefined) {
-        return null;
-      }
-      return undefined;
-    }`);
+        if (message?.${fieldNames.stringValue} !== undefined) {
+          return message.${fieldNames.stringValue};
+        } else if (message?.${fieldNames.numberValue} !== undefined) {
+          return message.${fieldNames.numberValue};
+        } else if (message?.${fieldNames.boolValue} !== undefined) {
+          return message.${fieldNames.boolValue};
+        } else if (message?.${fieldNames.structValue} !== undefined) {
+          return message.${fieldNames.structValue};
+        } else if (message?.${fieldNames.listValue} !== undefined) {
+            return message.${fieldNames.listValue};
+        } else if (message?.${fieldNames.nullValue} !== undefined) {
+          return null;
+        }
+        return undefined;
+      }`);
         }
     }
     if ((0, types_1.isListValueTypeName)(fullProtoTypeName)) {

package/build/options.js

@@ -6,6 +6,7 @@ var LongOption;
     LongOption["NUMBER"] = "number";
     LongOption["LONG"] = "long";
     LongOption["STRING"] = "string";
+    LongOption["BIGINT"] = "bigint";
 })(LongOption = exports.LongOption || (exports.LongOption = {}));
 var DateOption;
 (function (DateOption) {

package/build/types.js

@@ -192,6 +192,9 @@ function defaultValue(ctx, field) {
             else if (options.forceLong === options_1.LongOption.STRING) {
                 return '"0"';
             }
+            else if (options.forceLong === options_1.LongOption.BIGINT) {
+                return 'BigInt("0")';
+            }
             else {
                 return 0;
             }
@@ -204,6 +207,9 @@ function defaultValue(ctx, field) {
             else if (options.forceLong === options_1.LongOption.STRING) {
                 return '"0"';
             }
+            else if (options.forceLong === options_1.LongOption.BIGINT) {
+                return 'BigInt("0")';
+            }
             else {
                 return 0;
             }
@@ -263,6 +269,9 @@ function notDefaultCheck(ctx, field, messageOptions, place) {
             else if (options.forceLong === options_1.LongOption.STRING) {
                 return (0, ts_poet_1.code) `${maybeNotUndefinedAnd} ${place} !== "0"`;
             }
+            else if (options.forceLong === options_1.LongOption.BIGINT) {
+                return (0, ts_poet_1.code) `${maybeNotUndefinedAnd} ${place} !== BigInt("0")`;
+            }
             else {
                 return (0, ts_poet_1.code) `${maybeNotUndefinedAnd} ${place} !== 0`;
             }
@@ -508,6 +517,9 @@ function longTypeName(ctx) {
     else if (options.forceLong === options_1.LongOption.STRING) {
         return (0, ts_poet_1.code) `string`;
     }
+    else if (options.forceLong === options_1.LongOption.BIGINT) {
+        return (0, ts_poet_1.code) `bigint`;
+    }
     else {
         return (0, ts_poet_1.code) `number`;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.136.0",
+  "version": "1.137.0",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",