ts-proto 1.167.3 → 1.167.5

package/build/generate-services.js

@@ -342,7 +342,7 @@ function generateRpcType(ctx, hasStreamingMethods) {
         additionalMethods.push((0, ts_poet_1.code) `afterResponse?<T extends { [k in keyof T]: unknown }>(service: string, method: string, response: T): void;`);
     }
     if (options.rpcErrorHandler) {
-        additionalMethods.push((0, ts_poet_1.code) `handleError?(service: string, method: string, error: Error): Error;`);
+        additionalMethods.push((0, ts_poet_1.code) `handleError?(service: string, method: string, error: globalThis.Error): globalThis.Error;`);
     }
     if (hasStreamingMethods) {
         const observable = (0, types_1.observableType)(ctx, true);

package/build/main.js

@@ -374,31 +374,67 @@ function makeByteUtils(options) {
       })();
     `);
     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) {
-          return Uint8Array.from(${globalThis}.Buffer.from(b64, 'base64'));
-        } else {
-          const bin = ${globalThis}.atob(b64);
-          const arr = new Uint8Array(bin.length);
-          for (let i = 0; i < bin.length; ++i) {
-              arr[i] = bin.charCodeAt(i);
+    function getBytesFromBase64Snippet() {
+        const bytesFromBase64NodeSnippet = (0, ts_poet_1.code) `
+      return Uint8Array.from(${globalThis}.Buffer.from(b64, 'base64'));
+    `;
+        const bytesFromBase64BrowserSnippet = (0, ts_poet_1.code) `
+      const bin = ${globalThis}.atob(b64);
+      const arr = new Uint8Array(bin.length);
+      for (let i = 0; i < bin.length; ++i) {
+          arr[i] = bin.charCodeAt(i);
+      }
+      return arr;
+    `;
+        switch (options.env) {
+            case options_1.EnvOption.NODE:
+                return bytesFromBase64NodeSnippet;
+            case options_1.EnvOption.BROWSER:
+                return bytesFromBase64BrowserSnippet;
+            default:
+                return (0, ts_poet_1.code) `
+          if (${globalThis}.Buffer) {
+            ${bytesFromBase64NodeSnippet}
+          } else {
+            ${bytesFromBase64BrowserSnippet}
           }
-          return arr;
+        `;
         }
+    }
+    const bytesFromBase64 = (0, ts_poet_1.conditionalOutput)("bytesFromBase64", (0, ts_poet_1.code) `
+      function bytesFromBase64(b64: string): Uint8Array {
+        ${getBytesFromBase64Snippet()}
       }
     `);
+    function getBase64FromBytesSnippet() {
+        const base64FromBytesNodeSnippet = (0, ts_poet_1.code) `
+      return ${globalThis}.Buffer.from(arr).toString('base64');
+    `;
+        const base64FromBytesBrowserSnippet = (0, ts_poet_1.code) `
+      const bin: string[] = [];
+      arr.forEach((byte) => {
+        bin.push(${globalThis}.String.fromCharCode(byte));
+      });
+      return ${globalThis}.btoa(bin.join(''));
+    `;
+        switch (options.env) {
+            case options_1.EnvOption.NODE:
+                return base64FromBytesNodeSnippet;
+            case options_1.EnvOption.BROWSER:
+                return base64FromBytesBrowserSnippet;
+            default:
+                return (0, ts_poet_1.code) `
+          if (${globalThis}.Buffer) {
+            ${base64FromBytesNodeSnippet}
+          } else {
+            ${base64FromBytesBrowserSnippet}
+          }
+        `;
+        }
+    }
     const base64FromBytes = (0, ts_poet_1.conditionalOutput)("base64FromBytes", (0, ts_poet_1.code) `
       function base64FromBytes(arr: Uint8Array): string {
-        if (${globalThis}.Buffer) {
-          return ${globalThis}.Buffer.from(arr).toString('base64')
-        } else {
-          const bin: string[] = [];
-          arr.forEach((byte) => {
-            bin.push(${globalThis}.String.fromCharCode(byte));
-          });
-          return ${globalThis}.btoa(bin.join(''));
-        }
+        ${getBase64FromBytesSnippet()}
       }
     `);
     return { globalThis, bytesFromBase64, base64FromBytes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.167.3",
+  "version": "1.167.5",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -68,7 +68,7 @@
   "dependencies": {
     "case-anything": "^2.1.13",
     "protobufjs": "^7.2.4",
-    "ts-poet": "^6.5.0",
+    "ts-poet": "^6.7.0",
     "ts-proto-descriptors": "1.15.0"
   },
   "packageManager": "yarn@3.6.0"