ts-proto 1.121.6 → 1.122.0

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.122.0](https://github.com/stephenh/ts-proto/compare/v1.121.6...v1.122.0) (2022-08-15)
+
+
+### Features
+
+* **Grpc-Web:** Add & export GrpcWebError type ([#593](https://github.com/stephenh/ts-proto/issues/593)) ([645987d](https://github.com/stephenh/ts-proto/commit/645987d023e666290e87086f5a0770c34e2fe978))
+
 ## [1.121.6](https://github.com/stephenh/ts-proto/compare/v1.121.5...v1.121.6) (2022-08-14)
 
 

package/build/generate-grpc-web.js

@@ -188,7 +188,7 @@ function generateGrpcWebImpl(ctx, returnObservable, hasStreamingMethods) {
         chunks.push(createObservableUnaryMethod(ctx));
     }
     else {
-        chunks.push(createPromiseUnaryMethod());
+        chunks.push(createPromiseUnaryMethod(ctx));
     }
     if (hasStreamingMethods) {
         chunks.push(createInvokeMethod(ctx));
@@ -196,7 +196,7 @@ function generateGrpcWebImpl(ctx, returnObservable, hasStreamingMethods) {
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { trim: false });
 }
-function createPromiseUnaryMethod() {
+function createPromiseUnaryMethod(ctx) {
     return (0, ts_poet_1.code) `
     unary<T extends UnaryMethodDefinitionish>(
       methodDesc: T,
@@ -219,9 +219,7 @@ function createPromiseUnaryMethod() {
             if (response.status === grpc.Code.OK) {
               resolve(response.message);
             } else {
-              const err = new Error(response.statusMessage) as any;
-              err.code = response.status;
-              err.metadata = response.trailers;
+              const err = new ${ctx.utils.GrpcWebError}(response.statusMessage, response.status, response.trailers);
               reject(err);
             }
           },
@@ -251,7 +249,8 @@ function createObservableUnaryMethod(ctx) {
           debug: this.options.debug,
           onEnd: (next) => {
             if (next.status !== 0) {
-              observer.error({ code: next.status, message: next.statusMessage });
+              const err = new ${ctx.utils.GrpcWebError}(next.statusMessage, next.status, next.trailers);
+              observer.error(err);
             } else {
               observer.next(next.message as any);
               observer.complete();

package/build/main.js

@@ -221,6 +221,7 @@ function makeUtils(options) {
         ...longs,
         ...makeComparisonUtils(),
         ...makeNiceGrpcServerStreamingMethodResult(),
+        ...makeGrpcWebErrorClass(),
     };
 }
 exports.makeUtils = makeUtils;
@@ -472,6 +473,16 @@ function makeNiceGrpcServerStreamingMethodResult() {
     `);
     return { NiceGrpcServerStreamingMethodResult };
 }
+function makeGrpcWebErrorClass() {
+    const GrpcWebError = (0, ts_poet_1.conditionalOutput)('GrpcWebError', (0, ts_poet_1.code) `
+      export class GrpcWebError extends Error {
+        constructor(message: string, public code: grpc.Code, public metadata: grpc.Metadata) {
+          super(message);
+        }
+      }
+    `);
+    return { GrpcWebError };
+}
 // Create the interface with properties
 function generateInterfaceDeclaration(ctx, fullName, messageDesc, sourceInfo, fullTypeName) {
     var _a;

package/package.json

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