ts-proto 1.158.1 → 1.159.1

package/README.markdown

@@ -289,6 +289,10 @@ Generated code will be placed in the Gradle build directory.
 
 ### Supported options
 
+- With `--ts_proto_opt=globalThisPolyfill=true`, ts-proto will include a polyfill for globalThis.
+
+  Defaults to `false`, i.e. we assume `globalThis` is available.
+
 - With `--ts_proto_opt=context=true`, the services will have a Go-style `ctx` parameter, which is useful for tracing/logging/etc. if you're not using node's `async_hooks` api due to performance reasons.
 
 - With `--ts_proto_opt=forceLong=long`, all 64-bit numbers will be parsed as instances of `Long` (using the [long](https://www.npmjs.com/package/long) library).

package/build/main.js

@@ -273,7 +273,7 @@ function generateFile(ctx, fileDesc) {
 exports.generateFile = generateFile;
 /** These are runtime utility methods used by the generated code. */
 function makeUtils(options) {
-    const bytes = makeByteUtils();
+    const bytes = makeByteUtils(options);
     const longs = makeLongUtils(options, bytes);
     return {
         ...bytes,
@@ -354,12 +354,12 @@ function makeLongUtils(options, bytes) {
     `);
     return { numberToLong, longToNumber, longToString, longToBigint, Long };
 }
-function makeByteUtils() {
-    const globalThis = (0, ts_poet_1.conditionalOutput)("tsProtoGlobalThis", (0, ts_poet_1.code) `
+function makeByteUtils(options) {
+    const globalThisPolyfill = (0, ts_poet_1.conditionalOutput)("gt", (0, ts_poet_1.code) `
       declare const self: any | undefined;
       declare const window: any | undefined;
       declare const global: any | undefined;
-      const tsProtoGlobalThis: any = (() => {
+      const gt: any = (() => {
         if (typeof globalThis !== "undefined") return globalThis;
         if (typeof self !== "undefined") return self;
         if (typeof window !== "undefined") return window;
@@ -367,6 +367,7 @@ function makeByteUtils() {
         throw "Unable to locate global object";
       })();
     `);
+    const globalThis = options.globalThisPolyfill ? globalThisPolyfill : (0, ts_poet_1.conditionalOutput)("globalThis", (0, ts_poet_1.code) ``);
     const bytesFromBase64 = (0, ts_poet_1.conditionalOutput)("bytesFromBase64", (0, ts_poet_1.code) `
       function bytesFromBase64(b64: string): Uint8Array {
         if (${globalThis}.Buffer) {
@@ -1994,6 +1995,9 @@ function convertFromObjectKey(ctx, messageDesc, field, variableName) {
             return (0, ts_poet_1.code) `${ctx.utils.globalThis}.Number(${variableName})`;
         }
     }
+    else if (keyField.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL) {
+        return (0, ts_poet_1.code) `${ctx.utils.globalThis}.Boolean(${variableName})`;
+    }
     else {
         return (0, ts_poet_1.code) `${ctx.utils.globalThis}.Number(${variableName})`;
     }
@@ -2014,6 +2018,9 @@ function convertToObjectKey(ctx, messageDesc, field, variableName) {
             return (0, ts_poet_1.code) `${variableName}`;
         }
     }
+    else if (keyField.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL) {
+        return (0, ts_poet_1.code) `${ctx.utils.globalThis}.String(${variableName})`;
+    }
     else {
         return (0, ts_poet_1.code) `${variableName}`;
     }

package/build/options.js

@@ -38,6 +38,7 @@ function defaultOptions() {
         context: false,
         snakeToCamel: ["json", "keys"],
         emitDefaultValues: [],
+        globalThisPolyfill: false,
         forceLong: LongOption.NUMBER,
         useOptionals: "none",
         useDate: DateOption.DATE,

package/build/types.js

@@ -642,7 +642,8 @@ function shouldGenerateJSMapType(ctx, message, field) {
     if (!mapType) {
         return false;
     }
-    return isLong(mapType.keyField) && ctx.options.forceLong === options_1.LongOption.LONG;
+    return (mapType.keyField.type === ts_proto_descriptors_1.FieldDescriptorProto_Type.TYPE_BOOL ||
+        (isLong(mapType.keyField) && ctx.options.forceLong === options_1.LongOption.LONG));
 }
 exports.shouldGenerateJSMapType = shouldGenerateJSMapType;
 function detectMapType(ctx, messageDesc, fieldDesc) {

package/package.json

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