ts-proto 1.118.0 → 1.121.0

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.121.0](https://github.com/stephenh/ts-proto/compare/v1.120.0...v1.121.0) (2022-07-28)
+
+
+### Features
+
+* Add use-numeric-enum-json option. ([#625](https://github.com/stephenh/ts-proto/issues/625)) ([cd53d8c](https://github.com/stephenh/ts-proto/commit/cd53d8cacd6b4b8fa6517242020b216dd18eebdf))
+
+# [1.120.0](https://github.com/stephenh/ts-proto/compare/v1.119.0...v1.120.0) (2022-07-21)
+
+
+### Features
+
+* add meta-data to stream error ([#620](https://github.com/stephenh/ts-proto/issues/620)) ([b68f301](https://github.com/stephenh/ts-proto/commit/b68f301b5fb4222a3fce676a7e5036cf00e77e11))
+
+# [1.119.0](https://github.com/stephenh/ts-proto/compare/v1.118.0...v1.119.0) (2022-07-21)
+
+
+### Features
+
+* support grpc-web client straming ([#617](https://github.com/stephenh/ts-proto/issues/617)) ([d3e7f1f](https://github.com/stephenh/ts-proto/commit/d3e7f1f4aac12db87c54d6357e557a351c96a2ca))
+
 # [1.118.0](https://github.com/stephenh/ts-proto/compare/v1.117.1...v1.118.0) (2022-07-19)
 
 

package/README.markdown

@@ -99,6 +99,13 @@ plugins:
     path: ../node_modules/ts-proto/protoc-gen-ts_proto
 ```
 
+To prevent `buf push` from reading irrelevent `.proto` files, configure `buf.yaml` like so:
+
+```yaml
+build:
+  excludes: [node_modules]
+```
+
 You can also use the official plugin published to the Buf Registry.
 
 ```yaml
@@ -428,6 +435,8 @@ Generated code will be placed in the Gradle build directory.
   Requires `onlyTypes=true`. Implies `useDate=string` and `stringEnums=true`. This option is to generate types that can be directly used with marshalling/unmarshalling Protobuf messages serialized as JSON.  
   You may also want to set `useOptionals=all`, as gRPC gateways are not required to send default value for scalar values.
 
+- With '--ts_proto_opt=useNumericEnumForJson=true`, the JSON converter (`toJSON`) will encode enum values as int, rather than a string literal.
+
 ### NestJS Support
 
 We have a great way of working together with [nestjs](https://docs.nestjs.com/microservices/grpc). `ts-proto` generates `interfaces` and `decorators` for you controller, client. For more information see the [nestjs readme](NESTJS.markdown).

package/build/enums.js

@@ -91,17 +91,31 @@ 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}): string {`);
+    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) {
-        chunks.push((0, ts_poet_1.code) `case ${fullName}.${valueDesc.name}: return "${valueDesc.name}";`);
+        if (ctx.options.useNumericEnumForJson) {
+            chunks.push((0, ts_poet_1.code) `case ${fullName}.${valueDesc.name}: return ${valueDesc.number};`);
+        }
+        else {
+            chunks.push((0, ts_poet_1.code) `case ${fullName}.${valueDesc.name}: return "${valueDesc.name}";`);
+        }
     }
     if (options.unrecognizedEnum) {
         chunks.push((0, ts_poet_1.code) `
-      case ${fullName}.${UNRECOGNIZED_ENUM_NAME}:
+      case ${fullName}.${UNRECOGNIZED_ENUM_NAME}:`);
+        if (ctx.options.useNumericEnumForJson) {
+            chunks.push((0, ts_poet_1.code) `
+      default:
+        return ${UNRECOGNIZED_ENUM_VALUE};
+    `);
+        }
+        else {
+            chunks.push((0, ts_poet_1.code) `
       default:
         return "${UNRECOGNIZED_ENUM_NAME}";
     `);
+        }
     }
     else {
         // We use globalThis to avoid conflicts on protobuf types named `Error`.

package/build/generate-grpc-web.js

@@ -18,7 +18,7 @@ function generateGrpcClientImpl(ctx, _fileDesc, serviceDesc) {
     // Create the constructor(rpc: Rpc)
     chunks.push((0, ts_poet_1.code) `
     private readonly rpc: Rpc;
-    
+
     constructor(rpc: Rpc) {
   `);
     chunks.push((0, ts_poet_1.code) `this.rpc = rpc;`);
@@ -46,9 +46,11 @@ function generateRpcMethod(ctx, serviceDesc, methodDesc) {
         return (0, ts_poet_1.code) `
     ${methodDesc.formattedName}(
       request: ${inputType},
-      metadata?: grpc.Metadata,
-    ): ${returns} {
-      throw new Error('ts-proto does not yet support client streaming!');
+      options?: {
+        metadata?: grpc.Metadata,
+        rpcOptions?: grpc.RpcOptions,
+    }): ${returns} {
+      return this.rpc.stream(${methodDescName(serviceDesc, methodDesc)}, request, options?.metadata, options?.rpcOptions)
     }
   `;
     }
@@ -83,7 +85,7 @@ exports.generateGrpcServiceDesc = generateGrpcServiceDesc;
  * implementation.
  */
 function generateGrpcMethodDesc(ctx, serviceDesc, methodDesc) {
-    const inputType = (0, types_1.requestType)(ctx, methodDesc);
+    const inputType = (0, types_1.rawRequestType)(ctx, methodDesc);
     const outputType = (0, types_1.responseType)(ctx, methodDesc);
     // grpc-web expects this to be a class, but the ts-proto messages are just interfaces.
     //
@@ -109,13 +111,15 @@ function generateGrpcMethodDesc(ctx, serviceDesc, methodDesc) {
     deserializeBinary(data: Uint8Array) {
       return { ...${outputType}.decode(data), toObject() { return this; } };
     }
-  }`;
+}`;
+    const streaming = methodDesc.clientStreaming || methodDesc.serverStreaming;
+    const methodDef = streaming ? 'MethodDefinitionish' : 'UnaryMethodDefinitionish';
     return (0, ts_poet_1.code) `
-    export const ${methodDescName(serviceDesc, methodDesc)}: UnaryMethodDefinitionish = {
+    export const ${methodDescName(serviceDesc, methodDesc)}: ${methodDef} = {
       methodName: "${methodDesc.name}",
       service: ${serviceDesc.name}Desc,
-      requestStream: false,
-      responseStream: ${methodDesc.serverStreaming ? 'true' : 'false'},
+      requestStream: ${methodDesc.clientStreaming ? true : false},
+      responseStream: ${methodDesc.serverStreaming ? true : false},
       requestType: ${requestFn} as any,
       responseType: ${responseFn} as any,
     };
@@ -133,6 +137,10 @@ function addGrpcWebMisc(ctx, hasStreamingMethods) {
     interface UnaryMethodDefinitionishR extends ${grpc}.UnaryMethodDefinition<any, any> { requestStream: any; responseStream: any; }
   `);
     chunks.push((0, ts_poet_1.code) `type UnaryMethodDefinitionish = UnaryMethodDefinitionishR;`);
+    chunks.push((0, ts_poet_1.code) `
+    interface MethodDefinitionishR extends ${grpc}.MethodDefinition<any, any> { requestStream: any; responseStream: any; }
+`);
+    chunks.push((0, ts_poet_1.code) `type MethodDefinitionish = MethodDefinitionishR;`);
     chunks.push(generateGrpcWebRpcType(ctx, options.returnObservable, hasStreamingMethods));
     chunks.push(generateGrpcWebImpl(ctx, options.returnObservable, hasStreamingMethods));
     return (0, ts_poet_1.joinCode)(chunks, { on: '\n\n' });
@@ -156,8 +164,14 @@ function generateGrpcWebRpcType(ctx, returnObservable, hasStreamingMethods) {
         methodDesc: T,
         request: any,
         metadata: grpc.Metadata | undefined,
-      ): ${(0, types_1.observableType)(ctx)}<any>;
-    `);
+      ): ${(0, types_1.observableType)(ctx)}<any>;`);
+        chunks.push((0, ts_poet_1.code) `
+  stream<T extends MethodDefinitionish>(
+    methodDesc: T,
+    request: ${(0, types_1.observableType)(ctx)}<any>,
+    metadata: grpc.Metadata | undefined,
+    rpcOptions: grpc.RpcOptions | undefined
+  ): ${(0, types_1.observableType)(ctx)}<any>;`);
     }
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { on: '\n' });
@@ -178,7 +192,7 @@ function generateGrpcWebImpl(ctx, returnObservable, hasStreamingMethods) {
     export class GrpcWebImpl {
       private host: string;
       private options: ${options};
-      
+
       constructor(host: string, options: ${options}) {
         this.host = host;
         this.options = options;
@@ -192,6 +206,7 @@ function generateGrpcWebImpl(ctx, returnObservable, hasStreamingMethods) {
     }
     if (hasStreamingMethods) {
         chunks.push(createInvokeMethod(ctx));
+        chunks.push(createStreamMethod(ctx));
     }
     chunks.push((0, ts_poet_1.code) `}`);
     return (0, ts_poet_1.joinCode)(chunks, { trim: false });
@@ -259,7 +274,7 @@ function createObservableUnaryMethod(ctx) {
           },
         });
       }).pipe(${take}(1));
-    } 
+    }
   `;
 }
 function createInvokeMethod(ctx) {
@@ -285,13 +300,16 @@ function createInvokeMethod(ctx) {
             metadata: maybeCombinedMetadata,
             debug: this.options.debug,
             onMessage: (next) => observer.next(next),
-            onEnd: (code: ${grpc}.Code, message: string) => {
+            onEnd: (code: ${grpc}.Code, message: string, trailers: ${grpc}.Metadata) => {
               if (code === 0) {
                 observer.complete();
               } else if (upStreamCodes.includes(code)) {
                 setTimeout(upStream, DEFAULT_TIMEOUT_TIME);
               } else {
-                observer.error(new Error(\`Error \${code} \${message}\`));
+                const err = new Error(message) as any;
+                err.code = code;
+                err.metadata = trailers;
+                observer.error(err);
               }
             },
           });
@@ -302,3 +320,50 @@ function createInvokeMethod(ctx) {
     }
   `;
 }
+function createStreamMethod(ctx) {
+    return (0, ts_poet_1.code) `
+  stream<T extends MethodDefinitionish>(
+    methodDesc: T,
+    _request: ${(0, types_1.observableType)(ctx)}<any>,
+    metadata: ${grpc}.Metadata | undefined,
+    rpcOptions: ${grpc}.RpcOptions | undefined
+  ): ${(0, types_1.observableType)(ctx)}<any> {
+    const defaultOptions = {
+      host: this.host,
+      debug: rpcOptions?.debug || this.options.debug,
+      transport: rpcOptions?.transport || this.options.streamingTransport || this.options.transport,
+    }
+
+    let started = false;
+    const client = ${grpc}.client(methodDesc, defaultOptions);
+
+    const subscription = _request.subscribe((_req: any) => {
+      const request = { ..._req, ...methodDesc.requestType };
+      if (!started) {
+        client.start(metadata);
+        started = true;
+      }
+      client.send(request);
+    })
+
+    subscription.add(() => {
+      client.finishSend();
+    })
+
+    return new Observable((observer) => {
+      client.onEnd((code: ${grpc}.Code, message: string, trailers: ${grpc}.Metadata) => {
+        subscription.unsubscribe();
+        if (code === 0) {
+          observer.complete();
+        } else {
+          observer.error(new Error(\`Error \${code} \${message}\`));
+        }
+      })
+      client.onMessage((res: any) => {
+        observer.next(res);
+      })
+      observer.add(() => client.close())
+    }).pipe(share());
+  }
+`;
+}

package/build/generate-services.js

@@ -42,7 +42,14 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
         // Use metadata as last argument for interface only configuration
         if (options.outputClientImpl === 'grpc-web') {
             // We have to use grpc.Metadata where grpc will come from @improbable-eng
-            params.push((0, ts_poet_1.code) `metadata?: grpc.Metadata`);
+            if (methodDesc.clientStreaming) {
+                params.push((0, ts_poet_1.code) `options?: {
+          metadata?: grpc.Metadata,
+          rpcOptions?: grpc.RpcOptions}`);
+            }
+            else {
+                params.push((0, ts_poet_1.code) `metadata?: grpc.Metadata`);
+            }
         }
         else if (options.addGrpcMetadata) {
             const Metadata = (0, ts_poet_1.imp)('Metadata@@grpc/grpc-js');

package/build/main.js

@@ -115,7 +115,6 @@ function generateFile(ctx, fileDesc) {
             }
         }, options);
     }
-    let hasServerStreamingMethods = false;
     let hasStreamingMethods = false;
     (0, visit_1.visitServices)(fileDesc, sourceInfo, (serviceDesc, sInfo) => {
         if (options.nestJs) {
@@ -155,12 +154,7 @@ function generateFile(ctx, fileDesc) {
                         chunks.push((0, generate_grpc_web_1.generateGrpcClientImpl)(ctx, fileDesc, serviceDesc));
                         chunks.push((0, generate_grpc_web_1.generateGrpcServiceDesc)(fileDesc, serviceDesc));
                         serviceDesc.method.forEach((method) => {
-                            if (!method.clientStreaming) {
-                                chunks.push((0, generate_grpc_web_1.generateGrpcMethodDesc)(ctx, serviceDesc, method));
-                            }
-                            if (method.serverStreaming) {
-                                hasServerStreamingMethods = true;
-                            }
+                            chunks.push((0, generate_grpc_web_1.generateGrpcMethodDesc)(ctx, serviceDesc, method));
                         });
                     }
                 }
@@ -179,7 +173,7 @@ function generateFile(ctx, fileDesc) {
             chunks.push((0, generate_services_1.generateRpcType)(ctx, hasStreamingMethods));
         }
         else if (options.outputClientImpl === 'grpc-web') {
-            chunks.push((0, generate_grpc_web_1.addGrpcWebMisc)(ctx, hasServerStreamingMethods));
+            chunks.push((0, generate_grpc_web_1.addGrpcWebMisc)(ctx, hasStreamingMethods));
         }
     }
     if (options.context) {
@@ -1487,7 +1481,11 @@ function generateWrap(ctx, fullProtoTypeName, fieldNames) {
     }
     if ((0, types_1.isFieldMaskTypeName)(fullProtoTypeName)) {
         chunks.push((0, ts_poet_1.code) `wrap(paths: string[]): FieldMask {
-      return {paths: paths};
+      const result = createBaseFieldMask();
+
+      result.paths = paths;
+
+      return result;
     }`);
     }
     return chunks;

package/build/options.js

@@ -70,6 +70,7 @@ function defaultOptions() {
         unknownFields: false,
         usePrototypeForDefaults: false,
         useJsonWireFormat: false,
+        useNumericEnumForJson: false,
     };
 }
 exports.defaultOptions = defaultOptions;

package/build/types.js

@@ -641,7 +641,7 @@ function responseObservable(ctx, methodDesc) {
 exports.responseObservable = responseObservable;
 function responsePromiseOrObservable(ctx, methodDesc) {
     const { options } = ctx;
-    if (options.returnObservable || methodDesc.serverStreaming) {
+    if (options.returnObservable || methodDesc.serverStreaming || methodDesc.clientStreaming) {
         return responseObservable(ctx, methodDesc);
     }
     return responsePromise(ctx, methodDesc);

package/package.json

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