ts-proto 1.167.2 → 1.167.4

package/build/generate-services.js

@@ -98,11 +98,11 @@ function generateRegularRpcMethod(ctx, methodDesc) {
     }
     let encode = (0, ts_poet_1.code) `${rawInputType}.encode(request).finish()`;
     let beforeRequest;
-    if (options.rpcBeforeRequest) {
-        beforeRequest = (0, ts_poet_1.code) `
-    if (this.rpc.beforeRequest) {
-      this.rpc.beforeRequest(this.service, "${methodDesc.name}", request);
-    }`;
+    if (options.rpcBeforeRequest && !methodDesc.clientStreaming) {
+        beforeRequest = generateBeforeRequest(methodDesc.name);
+    }
+    else if (methodDesc.clientStreaming && options.rpcBeforeRequest) {
+        encode = (0, ts_poet_1.code) `{const encodedRequest = ${encode}; ${generateBeforeRequest(methodDesc.name, "encodedRequest")}; return encodedRequest}`;
     }
     let decode = (0, ts_poet_1.code) `${rawOutputType}.decode(${Reader}.create(data))`;
     if (options.rpcAfterResponse) {
@@ -162,28 +162,35 @@ function generateRegularRpcMethod(ctx, methodDesc) {
     }
   `;
 }
+function generateBeforeRequest(methodName, requestVariableName = "request") {
+    return (0, ts_poet_1.code) `
+    if (this.rpc.beforeRequest) {
+      this.rpc.beforeRequest(this.service, "${methodName}", ${requestVariableName});
+    }`;
+}
 function createDefaultServiceReturn(ctx, methodDesc, decode, errorHandler) {
     const { options } = ctx;
     const rawOutputType = (0, types_1.responseType)(ctx, methodDesc, { keepValueType: true });
+    const returnStatement = (0, utils_1.arrowFunction)("data", decode, !options.rpcAfterResponse);
     if (options.returnObservable || methodDesc.serverStreaming) {
         if (options.useAsyncIterable) {
             return (0, ts_poet_1.code) `${rawOutputType}.decodeTransform(result)`;
         }
         else {
-            return (0, ts_poet_1.code) `result.pipe(${(0, ts_poet_1.imp)("map@rxjs/operators")}(data => ${decode}))`;
+            if (errorHandler) {
+                const tc = (0, utils_1.arrowFunction)("data", (0, utils_1.tryCatchBlock)(decode, (0, ts_poet_1.code) `throw error`), !options.rpcAfterResponse);
+                return (0, ts_poet_1.code) `result.pipe(${(0, ts_poet_1.imp)("map@rxjs/operators")}(${tc}))`;
+            }
+            return (0, ts_poet_1.code) `result.pipe(${(0, ts_poet_1.imp)("map@rxjs/operators")}(${returnStatement}))`;
         }
     }
     if (errorHandler) {
-        let tryBlock = decode;
         if (!options.rpcAfterResponse) {
-            tryBlock = (0, ts_poet_1.code) `return ${decode}`;
+            decode = (0, ts_poet_1.code) `return ${decode}`;
         }
-        return (0, ts_poet_1.code) `promise.then(data => { ${(0, utils_1.tryCatchBlock)(tryBlock, (0, ts_poet_1.code) `return Promise.reject(error);`)}}).catch((error) => { ${errorHandler} })`;
-    }
-    else if (options.rpcAfterResponse) {
-        return (0, ts_poet_1.code) `promise.then(data => { ${decode} } )`;
+        return (0, ts_poet_1.code) `promise.then(${(0, utils_1.arrowFunction)("data", (0, utils_1.tryCatchBlock)(decode, (0, ts_poet_1.code) `return Promise.reject(error);`), false)}).catch(${(0, utils_1.arrowFunction)("error", errorHandler, false)})`;
     }
-    return (0, ts_poet_1.code) `promise.then(data => ${decode})`;
+    return (0, ts_poet_1.code) `promise.then(${returnStatement})`;
 }
 function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
     const { options } = ctx;
@@ -335,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/build/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tryCatchBlock = exports.impProto = exports.impFile = exports.getPropertyAccessor = exports.safeAccessor = exports.getFieldName = exports.getFieldJsonName = exports.FormattedMethodDescriptor = exports.assertInstanceOf = exports.maybePrefixPackage = exports.prefixDisableLinter = exports.maybeAddComment = exports.upperFirst = exports.lowerFirst = exports.singular = exports.fail = exports.readToBuffer = exports.generateIndexFiles = exports.protoFilesToGenerate = void 0;
+exports.arrowFunction = exports.tryCatchBlock = exports.impProto = exports.impFile = exports.getPropertyAccessor = exports.safeAccessor = exports.getFieldName = exports.getFieldJsonName = exports.FormattedMethodDescriptor = exports.assertInstanceOf = exports.maybePrefixPackage = exports.prefixDisableLinter = exports.maybeAddComment = exports.upperFirst = exports.lowerFirst = exports.singular = exports.fail = exports.readToBuffer = exports.generateIndexFiles = exports.protoFilesToGenerate = void 0;
 const path = require("path");
 const ts_poet_1 = require("ts-poet");
 const options_1 = require("./options");
@@ -254,3 +254,10 @@ function tryCatchBlock(tryBlock, handleErrorBlock) {
   }`;
 }
 exports.tryCatchBlock = tryCatchBlock;
+function arrowFunction(params, body, isOneLine = true) {
+    if (isOneLine) {
+        return (0, ts_poet_1.code) `(${params}) => ${body}`;
+    }
+    return (0, ts_poet_1.code) `(${params}) => { ${body} }`;
+}
+exports.arrowFunction = arrowFunction;

package/package.json

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