ts-proto 1.121.6 → 1.123.1

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.123.1](https://github.com/stephenh/ts-proto/compare/v1.123.0...v1.123.1) (2022-08-27)
+
+
+### Bug Fixes
+
+* Bump ts-poet to use @dprint/typescript. ([#662](https://github.com/stephenh/ts-proto/issues/662)) ([84b64f4](https://github.com/stephenh/ts-proto/commit/84b64f4219f96199e8722678354430fbf00cebba))
+
+# [1.123.0](https://github.com/stephenh/ts-proto/compare/v1.122.0...v1.123.0) (2022-08-27)
+
+
+### Features
+
+* Bump ts-poet for dprint, also use tsx ([#660](https://github.com/stephenh/ts-proto/issues/660)) ([348a465](https://github.com/stephenh/ts-proto/commit/348a4651b42d5ff64fd07e36ef9ca7d7e76f4277))
+
+# [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/README.markdown

@@ -113,6 +113,9 @@ version: v1
 plugins:
   - remote: buf.build/stephenh/plugins/ts-proto
     out: ../gen/ts
+    opt:
+      - outputServices=...
+      - useExactTypes=...    
 ```
 
 # Goals

package/build/case.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.camelCase = exports.capitalize = exports.camelToSnake = exports.snakeToCamel = exports.maybeSnakeToCamel = void 0;
 /** Converts `key` to TS/JS camel-case idiom, unless overridden not to. */
 function maybeSnakeToCamel(key, options) {
-    if (options.snakeToCamel.includes('keys') && key.includes('_')) {
+    if (options.snakeToCamel.includes("keys") && key.includes("_")) {
         return snakeToCamel(key);
     }
     else {
@@ -14,17 +14,17 @@ exports.maybeSnakeToCamel = maybeSnakeToCamel;
 function snakeToCamel(s) {
     const hasLowerCase = !!s.match(/[a-z]/);
     return s
-        .split('_')
+        .split("_")
         .map((word, i) => {
         // If the word is already mixed case, leave the existing case as-is
         word = hasLowerCase ? word : word.toLowerCase();
         return i === 0 ? word : capitalize(word);
     })
-        .join('');
+        .join("");
 }
 exports.snakeToCamel = snakeToCamel;
 function camelToSnake(s) {
-    return s.replace(/\w([A-Z])/g, (m) => m[0] + '_' + m[1]).toUpperCase();
+    return s.replace(/\w([A-Z])/g, (m) => m[0] + "_" + m[1]).toUpperCase();
 }
 exports.camelToSnake = camelToSnake;
 function capitalize(s) {

package/build/encode.js

@@ -10,36 +10,36 @@ function generateEncoder(ctx, typeName) {
     if (!name) {
         return (0, ts_poet_1.code) `${(0, types_1.messageToTypeName)(ctx, typeName, { keepValueType: true })}.encode(value).finish()`;
     }
-    if (name == 'Timestamp') {
-        const TimestampValue = (0, utils_1.impProto)(ctx.options, 'google/protobuf/timestamp', name);
+    if (name == "Timestamp") {
+        const TimestampValue = (0, utils_1.impProto)(ctx.options, "google/protobuf/timestamp", name);
         return (0, ts_poet_1.code) `${TimestampValue}.encode(${ctx.utils.toTimestamp}(value)).finish()`;
     }
-    if (name == 'Struct') {
-        const StructType = (0, utils_1.impProto)(ctx.options, 'google/protobuf/struct', name);
+    if (name == "Struct") {
+        const StructType = (0, utils_1.impProto)(ctx.options, "google/protobuf/struct", name);
         return (0, ts_poet_1.code) `${StructType}.encode(${StructType}.wrap(value)).finish()`;
     }
-    if (name == 'ListValue') {
-        const ListValueType = (0, utils_1.impProto)(ctx.options, 'google/protobuf/struct', name);
+    if (name == "ListValue") {
+        const ListValueType = (0, utils_1.impProto)(ctx.options, "google/protobuf/struct", name);
         return (0, ts_poet_1.code) `${ListValueType}.encode({values: value ?? []}).finish()`;
     }
-    const TypeValue = (0, utils_1.impProto)(ctx.options, 'google/protobuf/wrappers', name);
+    const TypeValue = (0, utils_1.impProto)(ctx.options, "google/protobuf/wrappers", name);
     switch (name) {
-        case 'StringValue':
+        case "StringValue":
             return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? ""}).finish()`;
-        case 'Int32Value':
-        case 'UInt32Value':
-        case 'DoubleValue':
-        case 'FloatValue':
+        case "Int32Value":
+        case "UInt32Value":
+        case "DoubleValue":
+        case "FloatValue":
             return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? 0}).finish()`;
-        case 'Int64Value':
-        case 'UInt64Value':
+        case "Int64Value":
+        case "UInt64Value":
             if (ctx.options.forceLong === options_1.LongOption.LONG) {
                 return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ? value.toNumber(): 0}).finish()`;
             }
             return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? 0 }).finish()`;
-        case 'BoolValue':
+        case "BoolValue":
             return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? false}).finish()`;
-        case 'BytesValue':
+        case "BytesValue":
             return (0, ts_poet_1.code) `${TypeValue}.encode({value: value ?? new Uint8Array()}).finish()`;
     }
     throw new Error(`unknown wrapper type: ${name}`);
@@ -52,15 +52,15 @@ function generateDecoder(ctx, typeName) {
         return (0, ts_poet_1.code) `${(0, types_1.messageToTypeName)(ctx, typeName, { keepValueType: true })}.decode(value)`;
     }
     let TypeValue;
-    if (name == 'Timestamp') {
-        TypeValue = (0, utils_1.impProto)(ctx.options, 'google/protobuf/timestamp', name);
+    if (name == "Timestamp") {
+        TypeValue = (0, utils_1.impProto)(ctx.options, "google/protobuf/timestamp", name);
         return (0, ts_poet_1.code) `${TypeValue}.decode(value)`;
     }
-    if (name == 'Struct' || name == 'ListValue') {
-        TypeValue = (0, utils_1.impProto)(ctx.options, 'google/protobuf/struct', name);
+    if (name == "Struct" || name == "ListValue") {
+        TypeValue = (0, utils_1.impProto)(ctx.options, "google/protobuf/struct", name);
         return (0, ts_poet_1.code) `${TypeValue}.unwrap(${TypeValue}.decode(value))`;
     }
-    TypeValue = (0, utils_1.impProto)(ctx.options, 'google/protobuf/wrappers', name);
+    TypeValue = (0, utils_1.impProto)(ctx.options, "google/protobuf/wrappers", name);
     return (0, ts_poet_1.code) `${TypeValue}.decode(value).value`;
 }
 exports.generateDecoder = generateDecoder;

package/build/enums.js

@@ -5,7 +5,7 @@ const ts_poet_1 = require("ts-poet");
 const utils_1 = require("./utils");
 const case_1 = require("./case");
 const sourceInfo_1 = require("./sourceInfo");
-const UNRECOGNIZED_ENUM_NAME = 'UNRECOGNIZED';
+const UNRECOGNIZED_ENUM_NAME = "UNRECOGNIZED";
 const UNRECOGNIZED_ENUM_VALUE = -1;
 // Output the `enum { Foo, A = 0, B = 1 }`
 function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
@@ -17,9 +17,9 @@ function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
         chunks.push((0, ts_poet_1.code) `export const ${(0, ts_poet_1.def)(fullName)} = {`);
     }
     else {
-        chunks.push((0, ts_poet_1.code) `export ${options.constEnums ? 'const ' : ''}enum ${(0, ts_poet_1.def)(fullName)} {`);
+        chunks.push((0, ts_poet_1.code) `export ${options.constEnums ? "const " : ""}enum ${(0, ts_poet_1.def)(fullName)} {`);
     }
-    const delimiter = options.enumsAsLiterals ? ':' : '=';
+    const delimiter = options.enumsAsLiterals ? ":" : "=";
     enumDesc.value.forEach((valueDesc, index) => {
         var _a;
         const info = sourceInfo.lookup(sourceInfo_1.Fields.enum.value, index);
@@ -49,14 +49,14 @@ function generateEnum(ctx, fullName, enumDesc, sourceInfo) {
         chunks.push((0, ts_poet_1.code) `\n`);
         chunks.push(generateEnumToNumber(ctx, fullName, enumDesc));
     }
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 exports.generateEnum = generateEnum;
 /** Generates a function with a big switch statement to decode JSON -> our enum. */
 function generateEnumFromJson(ctx, fullName, enumDesc) {
     const { options, utils } = ctx;
     const chunks = [];
-    const functionName = (0, case_1.camelCase)(fullName) + 'FromJSON';
+    const functionName = (0, case_1.camelCase)(fullName) + "FromJSON";
     chunks.push((0, ts_poet_1.code) `export function ${(0, ts_poet_1.def)(functionName)}(object: any): ${fullName} {`);
     chunks.push((0, ts_poet_1.code) `switch (object) {`);
     for (const valueDesc of enumDesc.value) {
@@ -83,15 +83,15 @@ function generateEnumFromJson(ctx, fullName, enumDesc) {
     }
     chunks.push((0, ts_poet_1.code) `}`);
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 exports.generateEnumFromJson = generateEnumFromJson;
 /** Generates a function with a big switch statement to encode our enum -> JSON. */
 function generateEnumToJson(ctx, fullName, enumDesc) {
     const { options, utils } = ctx;
     const chunks = [];
-    const functionName = (0, case_1.camelCase)(fullName) + 'ToJSON';
-    chunks.push((0, ts_poet_1.code) `export function ${(0, ts_poet_1.def)(functionName)}(object: ${fullName}): ${ctx.options.useNumericEnumForJson ? 'number' : 'string'} {`);
+    const functionName = (0, case_1.camelCase)(fullName) + "ToJSON";
+    chunks.push((0, ts_poet_1.code) `export function ${(0, ts_poet_1.def)(functionName)}(object: ${fullName}): ${ctx.options.useNumericEnumForJson ? "number" : "string"} {`);
     chunks.push((0, ts_poet_1.code) `switch (object) {`);
     for (const valueDesc of enumDesc.value) {
         if (ctx.options.useNumericEnumForJson) {
@@ -126,14 +126,14 @@ function generateEnumToJson(ctx, fullName, enumDesc) {
     }
     chunks.push((0, ts_poet_1.code) `}`);
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 exports.generateEnumToJson = generateEnumToJson;
 /** Generates a function with a big switch statement to encode our string enum -> int value. */
 function generateEnumToNumber(ctx, fullName, enumDesc) {
     const { options, utils } = ctx;
     const chunks = [];
-    const functionName = (0, case_1.camelCase)(fullName) + 'ToNumber';
+    const functionName = (0, case_1.camelCase)(fullName) + "ToNumber";
     chunks.push((0, ts_poet_1.code) `export function ${(0, ts_poet_1.def)(functionName)}(object: ${fullName}): number {`);
     chunks.push((0, ts_poet_1.code) `switch (object) {`);
     for (const valueDesc of enumDesc.value) {
@@ -155,6 +155,6 @@ function generateEnumToNumber(ctx, fullName, enumDesc) {
     }
     chunks.push((0, ts_poet_1.code) `}`);
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 exports.generateEnumToNumber = generateEnumToNumber;

package/build/generate-generic-service-definition.js

@@ -40,7 +40,7 @@ function generateGenericServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc
       },
     } as const;
   `);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 exports.generateGenericServiceDefinition = generateGenericServiceDefinition;
 function generateMethodDefinition(ctx, methodDesc) {
@@ -69,5 +69,5 @@ function generateMethodOptions(options) {
         }
     }
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }

package/build/generate-grpc-js.js

@@ -6,22 +6,22 @@ const sourceInfo_1 = require("./sourceInfo");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
 const encode_1 = require("./encode");
-const CallOptions = (0, ts_poet_1.imp)('CallOptions@@grpc/grpc-js');
-const ChannelCredentials = (0, ts_poet_1.imp)('ChannelCredentials@@grpc/grpc-js');
-const ChannelOptions = (0, ts_poet_1.imp)('ChannelOptions@@grpc/grpc-js');
-const Client = (0, ts_poet_1.imp)('Client@@grpc/grpc-js');
-const ClientDuplexStream = (0, ts_poet_1.imp)('ClientDuplexStream@@grpc/grpc-js');
-const ClientReadableStream = (0, ts_poet_1.imp)('ClientReadableStream@@grpc/grpc-js');
-const ClientUnaryCall = (0, ts_poet_1.imp)('ClientUnaryCall@@grpc/grpc-js');
-const ClientWritableStream = (0, ts_poet_1.imp)('ClientWritableStream@@grpc/grpc-js');
-const handleBidiStreamingCall = (0, ts_poet_1.imp)('handleBidiStreamingCall@@grpc/grpc-js');
-const handleClientStreamingCall = (0, ts_poet_1.imp)('handleClientStreamingCall@@grpc/grpc-js');
-const handleServerStreamingCall = (0, ts_poet_1.imp)('handleServerStreamingCall@@grpc/grpc-js');
-const handleUnaryCall = (0, ts_poet_1.imp)('handleUnaryCall@@grpc/grpc-js');
-const UntypedServiceImplementation = (0, ts_poet_1.imp)('UntypedServiceImplementation@@grpc/grpc-js');
-const makeGenericClientConstructor = (0, ts_poet_1.imp)('makeGenericClientConstructor@@grpc/grpc-js');
-const Metadata = (0, ts_poet_1.imp)('Metadata@@grpc/grpc-js');
-const ServiceError = (0, ts_poet_1.imp)('ServiceError@@grpc/grpc-js');
+const CallOptions = (0, ts_poet_1.imp)("CallOptions@@grpc/grpc-js");
+const ChannelCredentials = (0, ts_poet_1.imp)("ChannelCredentials@@grpc/grpc-js");
+const ChannelOptions = (0, ts_poet_1.imp)("ChannelOptions@@grpc/grpc-js");
+const Client = (0, ts_poet_1.imp)("Client@@grpc/grpc-js");
+const ClientDuplexStream = (0, ts_poet_1.imp)("ClientDuplexStream@@grpc/grpc-js");
+const ClientReadableStream = (0, ts_poet_1.imp)("ClientReadableStream@@grpc/grpc-js");
+const ClientUnaryCall = (0, ts_poet_1.imp)("ClientUnaryCall@@grpc/grpc-js");
+const ClientWritableStream = (0, ts_poet_1.imp)("ClientWritableStream@@grpc/grpc-js");
+const handleBidiStreamingCall = (0, ts_poet_1.imp)("handleBidiStreamingCall@@grpc/grpc-js");
+const handleClientStreamingCall = (0, ts_poet_1.imp)("handleClientStreamingCall@@grpc/grpc-js");
+const handleServerStreamingCall = (0, ts_poet_1.imp)("handleServerStreamingCall@@grpc/grpc-js");
+const handleUnaryCall = (0, ts_poet_1.imp)("handleUnaryCall@@grpc/grpc-js");
+const UntypedServiceImplementation = (0, ts_poet_1.imp)("UntypedServiceImplementation@@grpc/grpc-js");
+const makeGenericClientConstructor = (0, ts_poet_1.imp)("makeGenericClientConstructor@@grpc/grpc-js");
+const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
+const ServiceError = (0, ts_poet_1.imp)("ServiceError@@grpc/grpc-js");
 /**
  * Generates a service definition and server / client stubs for the
  * `@grpc/grpc-js` library.
@@ -35,7 +35,7 @@ function generateGrpcJsService(ctx, fileDesc, sourceInfo, serviceDesc) {
         chunks.push(generateClientStub(ctx, sourceInfo, serviceDesc));
         chunks.push(generateClientConstructor(fileDesc, serviceDesc));
     }
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n\n" });
 }
 exports.generateGrpcJsService = generateGrpcJsService;
 function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
@@ -76,7 +76,7 @@ function generateServiceDefinition(ctx, fileDesc, sourceInfo, serviceDesc) {
     `);
     }
     chunks.push((0, ts_poet_1.code) `} as const;`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateServerStub(ctx, sourceInfo, serviceDesc) {
     var _a;
@@ -100,7 +100,7 @@ function generateServerStub(ctx, sourceInfo, serviceDesc) {
     `);
     }
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateClientStub(ctx, sourceInfo, serviceDesc) {
     var _a;
@@ -187,7 +187,7 @@ function generateClientStub(ctx, sourceInfo, serviceDesc) {
         }
     }
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateClientConstructor(fileDesc, serviceDesc) {
     return (0, ts_poet_1.code) `

package/build/generate-grpc-web.js

@@ -4,10 +4,10 @@ exports.addGrpcWebMisc = exports.generateGrpcMethodDesc = exports.generateGrpcSe
 const types_1 = require("./types");
 const ts_poet_1 = require("ts-poet");
 const utils_1 = require("./utils");
-const grpc = (0, ts_poet_1.imp)('grpc@@improbable-eng/grpc-web');
-const share = (0, ts_poet_1.imp)('share@rxjs/operators');
-const take = (0, ts_poet_1.imp)('take@rxjs/operators');
-const BrowserHeaders = (0, ts_poet_1.imp)('BrowserHeaders@browser-headers');
+const grpc = (0, ts_poet_1.imp)("grpc@@improbable-eng/grpc-web");
+const share = (0, ts_poet_1.imp)("share@rxjs/operators");
+const take = (0, ts_poet_1.imp)("take@rxjs/operators");
+const BrowserHeaders = (0, ts_poet_1.imp)("BrowserHeaders@browser-headers");
 /** Generates a client that uses the `@improbable-web/grpc-web` library. */
 function generateGrpcClientImpl(ctx, _fileDesc, serviceDesc) {
     const chunks = [];
@@ -33,7 +33,7 @@ function generateGrpcClientImpl(ctx, _fileDesc, serviceDesc) {
         chunks.push(generateRpcMethod(ctx, serviceDesc, methodDesc));
     }
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { trim: false, on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { trim: false, on: "\n" });
 }
 exports.generateGrpcClientImpl = generateGrpcClientImpl;
 /** Creates the RPC methods that client code actually calls. */
@@ -52,7 +52,7 @@ function generateRpcMethod(ctx, serviceDesc, methodDesc) {
     }
   `;
     }
-    const method = methodDesc.serverStreaming ? 'invoke' : 'unary';
+    const method = methodDesc.serverStreaming ? "invoke" : "unary";
     return (0, ts_poet_1.code) `
     ${methodDesc.formattedName}(
       request: ${inputType},
@@ -115,7 +115,7 @@ function generateGrpcMethodDesc(ctx, serviceDesc, methodDesc) {
       methodName: "${methodDesc.name}",
       service: ${serviceDesc.name}Desc,
       requestStream: false,
-      responseStream: ${methodDesc.serverStreaming ? 'true' : 'false'},
+      responseStream: ${methodDesc.serverStreaming ? "true" : "false"},
       requestType: ${requestFn} as any,
       responseType: ${responseFn} as any,
     };
@@ -135,14 +135,14 @@ function addGrpcWebMisc(ctx, hasStreamingMethods) {
     chunks.push((0, ts_poet_1.code) `type UnaryMethodDefinitionish = UnaryMethodDefinitionishR;`);
     chunks.push(generateGrpcWebRpcType(ctx, options.returnObservable, hasStreamingMethods));
     chunks.push(generateGrpcWebImpl(ctx, options.returnObservable, hasStreamingMethods));
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n\n" });
 }
 exports.addGrpcWebMisc = addGrpcWebMisc;
 /** Makes an `Rpc` interface to decouple from the low-level grpc-web `grpc.invoke and grpc.unary`/etc. methods. */
 function generateGrpcWebRpcType(ctx, returnObservable, hasStreamingMethods) {
     const chunks = [];
     chunks.push((0, ts_poet_1.code) `interface Rpc {`);
-    const wrapper = returnObservable ? (0, types_1.observableType)(ctx) : 'Promise';
+    const wrapper = returnObservable ? (0, types_1.observableType)(ctx) : "Promise";
     chunks.push((0, ts_poet_1.code) `
     unary<T extends UnaryMethodDefinitionish>(
       methodDesc: T,
@@ -160,14 +160,14 @@ function generateGrpcWebRpcType(ctx, returnObservable, hasStreamingMethods) {
     `);
     }
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 /** Implements the `Rpc` interface by making calls using the `grpc.unary` method. */
 function generateGrpcWebImpl(ctx, returnObservable, hasStreamingMethods) {
     const options = (0, ts_poet_1.code) `
     {
       transport?: grpc.TransportFactory,
-      ${hasStreamingMethods ? 'streamingTransport?: grpc.TransportFactory,' : ``}
+      ${hasStreamingMethods ? "streamingTransport?: grpc.TransportFactory," : ``}
       debug?: boolean,
       metadata?: grpc.Metadata,
       upStreamRetryCodes?: number[],
@@ -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/generate-nestjs.js

@@ -10,9 +10,9 @@ function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc)
     var _a;
     const { options } = ctx;
     const chunks = [];
-    const Metadata = (0, ts_poet_1.imp)('Metadata@@grpc/grpc-js');
+    const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
     (0, utils_1.maybeAddComment)(sourceInfo, chunks, (_a = serviceDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
-    const t = options.context ? `<${main_1.contextTypeVar}>` : '';
+    const t = options.context ? `<${main_1.contextTypeVar}>` : "";
     chunks.push((0, ts_poet_1.code) `
     export interface ${serviceDesc.name}Controller${t} {
   `);
@@ -28,7 +28,7 @@ function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc)
         params.push((0, ts_poet_1.code) `request: ${(0, types_1.requestType)(ctx, methodDesc)}`);
         // Use metadata as last argument for interface only configuration
         if (options.addGrpcMetadata) {
-            const q = options.addNestjsRestParameter ? '' : '?';
+            const q = options.addNestjsRestParameter ? "" : "?";
             params.push((0, ts_poet_1.code) `metadata${q}: ${Metadata}`);
         }
         if (options.addNestjsRestParameter) {
@@ -51,12 +51,12 @@ function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc)
       `;
         }
         chunks.push((0, ts_poet_1.code) `
-      ${methodDesc.formattedName}(${(0, ts_poet_1.joinCode)(params, { on: ', ' })}): ${returns};
+      ${methodDesc.formattedName}(${(0, ts_poet_1.joinCode)(params, { on: ", " })}): ${returns};
     `);
         if (options.context) {
             const batchMethod = (0, types_1.detectBatchMethod)(ctx, fileDesc, serviceDesc, methodDesc);
             if (batchMethod) {
-                const maybeCtx = options.context ? 'ctx: Context,' : '';
+                const maybeCtx = options.context ? "ctx: Context," : "";
                 chunks.push((0, ts_poet_1.code) `
           ${batchMethod.singleMethodName}(
             ${maybeCtx}
@@ -67,13 +67,13 @@ function generateNestjsServiceController(ctx, fileDesc, sourceInfo, serviceDesc)
         }
     });
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n\n" });
 }
 exports.generateNestjsServiceController = generateNestjsServiceController;
 function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
     const { options } = ctx;
     const chunks = [];
-    const Metadata = (0, ts_poet_1.imp)('Metadata@@grpc/grpc-js');
+    const Metadata = (0, ts_poet_1.imp)("Metadata@@grpc/grpc-js");
     (0, utils_1.maybeAddComment)(sourceInfo, chunks);
     const t = options.context ? `<${main_1.contextTypeVar}>` : ``;
     chunks.push((0, ts_poet_1.code) `
@@ -89,7 +89,7 @@ function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
         params.push((0, ts_poet_1.code) `request: ${(0, types_1.requestType)(ctx, methodDesc)}`);
         // Use metadata as last argument for interface only configuration
         if (options.addGrpcMetadata) {
-            const q = options.addNestjsRestParameter ? '' : '?';
+            const q = options.addNestjsRestParameter ? "" : "?";
             params.push((0, ts_poet_1.code) `metadata${q}: ${Metadata}`);
         }
         if (options.addNestjsRestParameter) {
@@ -101,13 +101,13 @@ function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
         (0, utils_1.maybeAddComment)(info, chunks, (_a = methodDesc.options) === null || _a === void 0 ? void 0 : _a.deprecated);
         chunks.push((0, ts_poet_1.code) `
       ${methodDesc.formattedName}(
-        ${(0, ts_poet_1.joinCode)(params, { on: ',' })}
+        ${(0, ts_poet_1.joinCode)(params, { on: "," })}
       ): ${returns};
     `);
         if (options.context) {
             const batchMethod = (0, types_1.detectBatchMethod)(ctx, fileDesc, serviceDesc, methodDesc);
             if (batchMethod) {
-                const maybeContext = options.context ? `ctx: Context,` : '';
+                const maybeContext = options.context ? `ctx: Context,` : "";
                 chunks.push((0, ts_poet_1.code) `
           ${batchMethod.singleMethodName}(
             ${maybeContext}
@@ -118,13 +118,13 @@ function generateNestjsServiceClient(ctx, fileDesc, sourceInfo, serviceDesc) {
         }
     });
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n\n" });
 }
 exports.generateNestjsServiceClient = generateNestjsServiceClient;
 function generateNestjsGrpcServiceMethodsDecorator(ctx, serviceDesc) {
     const { options } = ctx;
-    const GrpcMethod = (0, ts_poet_1.imp)('GrpcMethod@@nestjs/microservices');
-    const GrpcStreamMethod = (0, ts_poet_1.imp)('GrpcStreamMethod@@nestjs/microservices');
+    const GrpcMethod = (0, ts_poet_1.imp)("GrpcMethod@@nestjs/microservices");
+    const GrpcStreamMethod = (0, ts_poet_1.imp)("GrpcStreamMethod@@nestjs/microservices");
     const grpcMethods = serviceDesc.method
         .filter((m) => !m.clientStreaming)
         .map((m) => {
@@ -142,12 +142,12 @@ function generateNestjsGrpcServiceMethodsDecorator(ctx, serviceDesc) {
     return (0, ts_poet_1.code) `
     export function ${serviceDesc.name}ControllerMethods() {
       return function(constructor: Function) {
-        const grpcMethods: string[] = [${grpcMethods.join(', ')}];
+        const grpcMethods: string[] = [${grpcMethods.join(", ")}];
         for (const method of grpcMethods) {
           const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
           ${GrpcMethod}('${serviceDesc.name}', method)(constructor.prototype[method], method, descriptor);
         }
-        const grpcStreamMethods: string[] = [${grpcStreamMethods.join(', ')}];
+        const grpcStreamMethods: string[] = [${grpcStreamMethods.join(", ")}];
         for (const method of grpcStreamMethods) {
           const descriptor: any = Reflect.getOwnPropertyDescriptor(constructor.prototype, method);
           ${GrpcStreamMethod}('${serviceDesc.name}', method)(constructor.prototype[method], method, descriptor);

package/build/generate-nice-grpc.js

@@ -6,8 +6,8 @@ const case_1 = require("./case");
 const sourceInfo_1 = require("./sourceInfo");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
-const CallOptions = (0, ts_poet_1.imp)('CallOptions@nice-grpc-common');
-const CallContext = (0, ts_poet_1.imp)('CallContext@nice-grpc-common');
+const CallOptions = (0, ts_poet_1.imp)("CallOptions@nice-grpc-common");
+const CallContext = (0, ts_poet_1.imp)("CallContext@nice-grpc-common");
 /**
  * Generates server / client stubs for `nice-grpc` library.
  */
@@ -15,7 +15,7 @@ function generateNiceGrpcService(ctx, fileDesc, sourceInfo, serviceDesc) {
     const chunks = [];
     chunks.push(generateServerStub(ctx, sourceInfo, serviceDesc));
     chunks.push(generateClientStub(ctx, sourceInfo, serviceDesc));
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n\n" });
 }
 exports.generateNiceGrpcService = generateNiceGrpcService;
 function generateServerStub(ctx, sourceInfo, serviceDesc) {
@@ -74,7 +74,7 @@ function generateServerStub(ctx, sourceInfo, serviceDesc) {
         }
     }
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }
 function generateClientStub(ctx, sourceInfo, serviceDesc) {
     var _a;
@@ -131,5 +131,5 @@ function generateClientStub(ctx, sourceInfo, serviceDesc) {
         }
     }
     chunks.push((0, ts_poet_1.code) `}`);
-    return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
+    return (0, ts_poet_1.joinCode)(chunks, { on: "\n" });
 }