ts-proto 1.147.1 → 1.147.3

package/README.markdown

@@ -78,7 +78,7 @@ It will also generate client implementations of `PingService`; currently [Twirp]
 - `npm install ts-proto`
 - `protoc --plugin=./node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=. ./simple.proto`
   - (Note that the output parameter name, `ts_proto_out`, is named based on the suffix of the plugin's name, i.e. "ts_proto" suffix in the `--plugin=./node_modules/.bin/protoc-gen-ts_proto` parameter becomes the `_out` prefix, per `protoc`'s CLI conventions.)
-  - On Windows, use `protoc --plugin=protoc-gen-ts_proto=.\node_modules\.bin\protoc-gen-ts_proto.cmd --ts_proto_out=. ./simple.proto` (see [#93](https://github.com/stephenh/ts-proto/issues/93))
+  - On Windows, use `protoc --plugin=protoc-gen-ts_proto=".\\node_modules\\.bin\\protoc-gen-ts_proto.cmd" --ts_proto_out=. ./simple.proto` (see [#93](https://github.com/stephenh/ts-proto/issues/93))
   - Ensure you're using a modern `protoc`, i.e. the original `protoc` `3.0.0` doesn't support the `_opt` flag
 
 This will generate `*.ts` source files for the given `*.proto` types.
@@ -110,7 +110,7 @@ You can also use the official plugin published to the Buf Registry.
 ```yaml
 version: v1
 plugins:
-  - remote: buf.build/stephenh/plugins/ts-proto
+  - plugin: buf.build/community/stephenh-ts-proto
     out: ../gen/ts
     opt:
       - outputServices=...

package/build/generate-grpc-web.js

@@ -214,12 +214,10 @@ function createPromiseUnaryMethod(ctx) {
     const { useAbortSignal } = options;
     const maybeAbortSignal = useAbortSignal
         ? `
-      const abortHandler = () => {
+      if (abortSignal) abortSignal.addEventListener("abort", () => {
         client.close();
-        reject(new Error("Aborted"));
-      }
-
-      if (abortSignal) abortSignal.addEventListener("abort", abortHandler);`
+        reject(abortSignal.reason);
+      });`
         : "";
     return (0, ts_poet_1.code) `
     unary<T extends UnaryMethodDefinitionish>(
@@ -260,11 +258,10 @@ function createObservableUnaryMethod(ctx) {
     const { useAbortSignal } = options;
     const maybeAbortSignal = useAbortSignal
         ? `
-      const abortHandler = () => {
-        observer.error("Aborted");
+      if (abortSignal) abortSignal.addEventListener("abort", () => {
+        observer.error(abortSignal.reason);
         client.close();
-      };
-      if (abortSignal) abortSignal.addEventListener("abort", abortHandler);`
+      });`
         : "";
     return (0, ts_poet_1.code) `
     unary<T extends UnaryMethodDefinitionish>(
@@ -308,11 +305,10 @@ function createInvokeMethod(ctx) {
     const { useAbortSignal } = options;
     const maybeAbortSignal = useAbortSignal
         ? `
-      const abortHandler = () => {
-        observer.error("Aborted");
+      if (abortSignal) abortSignal.addEventListener("abort", () => {
+        observer.error(abortSignal.reason);
         client.close();
-      };
-      if (abortSignal) abortSignal.addEventListener("abort", abortHandler);`
+      });`
         : "";
     return (0, ts_poet_1.code) `
     invoke<T extends UnaryMethodDefinitionish>(

package/build/generate-services.js

@@ -278,7 +278,7 @@ function generateRpcType(ctx, hasStreamingMethods) {
     const maybeAbortSignalParam = options.useAbortSignal ? "abortSignal?: AbortSignal," : "";
     const methods = [[(0, ts_poet_1.code) `request`, (0, ts_poet_1.code) `Uint8Array`, (0, ts_poet_1.code) `Promise<Uint8Array>`]];
     if (hasStreamingMethods) {
-        const observable = (0, types_1.observableType)(ctx);
+        const observable = (0, types_1.observableType)(ctx, true);
         methods.push([(0, ts_poet_1.code) `clientStreamingRequest`, (0, ts_poet_1.code) `${observable}<Uint8Array>`, (0, ts_poet_1.code) `Promise<Uint8Array>`]);
         methods.push([(0, ts_poet_1.code) `serverStreamingRequest`, (0, ts_poet_1.code) `Uint8Array`, (0, ts_poet_1.code) `${observable}<Uint8Array>`]);
         methods.push([

package/build/main.js

@@ -507,15 +507,15 @@ function makeTimestampMethods(options, longs) {
     const fromTimestamp = (0, ts_poet_1.conditionalOutput)("fromTimestamp", options.useDate === options_1.DateOption.STRING
         ? (0, ts_poet_1.code) `
           function fromTimestamp(t: ${Timestamp}): string {
-            let millis = ${toNumberCode} * 1_000;
-            millis += t.nanos / 1_000_000;
+            let millis = (${toNumberCode} || 0) * 1_000;
+            millis += (t.nanos || 0) / 1_000_000;
             return new Date(millis).toISOString();
           }
         `
         : (0, ts_poet_1.code) `
           function fromTimestamp(t: ${Timestamp}): Date {
-            let millis = ${toNumberCode} * 1_000;
-            millis += t.nanos / 1_000_000;
+            let millis = (${toNumberCode} || 0) * 1_000;
+            millis += (t.nanos || 0) / 1_000_000;
             return new Date(millis);
           }
         `);

package/build/types.js

@@ -639,11 +639,16 @@ function rawRequestType(ctx, methodDesc, typeOptions = {}) {
     return messageToTypeName(ctx, methodDesc.inputType, typeOptions);
 }
 exports.rawRequestType = rawRequestType;
-function observableType(ctx) {
+function observableType(ctx, asType = false) {
     if (ctx.options.useAsyncIterable) {
         return (0, ts_poet_1.code) `AsyncIterable`;
     }
-    return (0, ts_poet_1.code) `${(0, ts_poet_1.imp)("Observable@rxjs")}`;
+    else if (asType) {
+        return (0, ts_poet_1.code) `${(0, ts_poet_1.imp)("t:Observable@rxjs")}`;
+    }
+    else {
+        return (0, ts_poet_1.code) `${(0, ts_poet_1.imp)("Observable@rxjs")}`;
+    }
 }
 exports.observableType = observableType;
 function requestType(ctx, methodDesc, partial = false) {

package/package.json

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