Make ServiceError optionally null (#116)

* Make ServiceError optionally null * Unwrap optional error in tests
improbable-eng · Sep 24, 2018 · 8ca48fe · 8ca48fe
1 parent 67e0c93
commit 8ca48fe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/examples/generated/proto/examplecom/simple_service_pb_service.d.ts b/examples/generated/proto/examplecom/simple_service_pb_service.d.ts
diff --git a/examples/generated/proto/orphan_pb_service.d.ts b/examples/generated/proto/orphan_pb_service.d.ts
diff --git a/src/service/grpcweb.ts b/src/service/grpcweb.ts
@@ -509,11 +509,11 @@ function printUnaryStubMethodTypes(printer: CodePrinter, method: RPCMethodDescri
              .printLn(`${method.nameAsCamelCase}(`)
       .indent().printLn(`requestMessage: ${method.requestType},`)
                .printLn(`metadata: grpc.Metadata,`)
-               .printLn(`callback: (error: ServiceError, responseMessage: ${method.responseType}|null) => void`)
+               .printLn(`callback: (error: ServiceError|null, responseMessage: ${method.responseType}|null) => void`)
     .dedent().printLn(`): void;`)
              .printLn(`${method.nameAsCamelCase}(`)
       .indent().printLn(`requestMessage: ${method.requestType},`)
-               .printLn(`callback: (error: ServiceError, responseMessage: ${method.responseType}|null) => void`)
+               .printLn(`callback: (error: ServiceError|null, responseMessage: ${method.responseType}|null) => void`)
     .dedent().printLn(`): void;`);
 }
 

diff --git a/test/integration/service/grpcweb.ts b/test/integration/service/grpcweb.ts
@@ -166,9 +166,9 @@ describe("service/grpc-web", () => {
               assert.ok(error !== null && typeof error === "object", "should yield an error");
               assert.ok(response === null, "should yield null instead of a response");
 
-              assert.equal(error.message, "some internal error", "should expose the grpc error message (.message)");
-              assert.equal(error.code, 13, "should expose the grpc status code (.code)");
-              assert.ok(error.metadata instanceof grpc.Metadata, "should expose the trailing response metadata (.metadata)");
+              assert.equal(error!.message, "some internal error", "should expose the grpc error message (.message)");
+              assert.equal(error!.code, 13, "should expose the grpc status code (.code)");
+              assert.ok(error!.metadata instanceof grpc.Metadata, "should expose the trailing response metadata (.metadata)");
               done();
             });
       });