ts-proto 1.148.0 → 1.148.2

package/build/generate-grpc-web.js

@@ -347,7 +347,10 @@ function createInvokeMethod(ctx) {
             },
           });
           observer.add(() => {
-            if (!observer.closed) return client.close()
+           ${!useAbortSignal
+        ? `return client.close();`
+        : `if (!abortSignal || !abortSignal.aborted) 
+              return client.close();`}
           });
 
           ${maybeAbortSignal}

package/build/generate-services.js

@@ -6,8 +6,6 @@ const types_1 = require("./types");
 const utils_1 = require("./utils");
 const sourceInfo_1 = require("./sourceInfo");
 const main_1 = require("./main");
-const hash = (0, ts_poet_1.imp)("hash*object-hash");
-const dataloader = (0, ts_poet_1.imp)("DataLoader*dataloader");
 /**
  * Generates an interface for `serviceDesc`.
  *
@@ -188,9 +186,12 @@ function generateServiceClientImpl(ctx, fileDesc, serviceDesc) {
 }
 exports.generateServiceClientImpl = generateServiceClientImpl;
 /** We've found a BatchXxx method, create a synthetic GetXxx method that calls it. */
-function generateBatchingRpcMethod(_ctx, batchMethod) {
+function generateBatchingRpcMethod(ctx, batchMethod) {
     const { methodDesc, singleMethodName, inputFieldName, inputType, outputFieldName, outputType, mapType, uniqueIdentifier, } = batchMethod;
     (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
+    const { options } = ctx;
+    const hash = options.esModuleInterop ? (0, ts_poet_1.imp)("hash=object-hash") : (0, ts_poet_1.imp)("hash*object-hash");
+    const dataloader = options.esModuleInterop ? (0, ts_poet_1.imp)("DataLoader=dataloader") : (0, ts_poet_1.imp)("DataLoader*dataloader");
     // Create the `(keys) => ...` lambda we'll pass to the DataLoader constructor
     const lambda = [];
     lambda.push((0, ts_poet_1.code) `
@@ -230,6 +231,9 @@ function generateBatchingRpcMethod(_ctx, batchMethod) {
 /** We're not going to batch, but use DataLoader for per-request caching. */
 function generateCachingRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     (0, utils_1.assertInstanceOf)(methodDesc, utils_1.FormattedMethodDescriptor);
+    const { options } = ctx;
+    const hash = options.esModuleInterop ? (0, ts_poet_1.imp)("hash=object-hash") : (0, ts_poet_1.imp)("hash*object-hash");
+    const dataloader = options.esModuleInterop ? (0, ts_poet_1.imp)("DataLoader=dataloader") : (0, ts_poet_1.imp)("DataLoader*dataloader");
     const inputType = (0, types_1.requestType)(ctx, methodDesc);
     const outputType = (0, types_1.responseType)(ctx, methodDesc);
     const uniqueIdentifier = `${(0, utils_1.maybePrefixPackage)(fileDesc, serviceDesc.name)}.${methodDesc.name}`;

package/package.json

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