ts-proto 1.110.0 → 1.110.3

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [1.110.3](https://github.com/stephenh/ts-proto/compare/v1.110.2...v1.110.3) (2022-04-08)
+
+
+### Bug Fixes
+
+* regression in being able to return a Date as a GRPC return value ([#534](https://github.com/stephenh/ts-proto/issues/534)) ([22b76ec](https://github.com/stephenh/ts-proto/commit/22b76eccfc0d26309aab9e454de31ef020595be8))
+
+## [1.110.2](https://github.com/stephenh/ts-proto/compare/v1.110.1...v1.110.2) (2022-03-27)
+
+
+### Bug Fixes
+
+* **Grpc-Web:** Fix compilation failure when a service definition contains a client streaming call. ([#535](https://github.com/stephenh/ts-proto/issues/535)) ([0c83892](https://github.com/stephenh/ts-proto/commit/0c83892693d5755c9fe848b442b5e666192103ab))
+
+## [1.110.1](https://github.com/stephenh/ts-proto/compare/v1.110.0...v1.110.1) (2022-03-25)
+
+
+### Bug Fixes
+
+* Use a module star import for protobuf types. ([#540](https://github.com/stephenh/ts-proto/issues/540)) ([f5b7700](https://github.com/stephenh/ts-proto/commit/f5b770083dffe72338beb4a09432a2a917760eae))
+
 # [1.110.0](https://github.com/stephenh/ts-proto/compare/v1.109.1...v1.110.0) (2022-03-15)
 
 

package/build/generate-grpc-web.js

@@ -28,31 +28,40 @@ function generateGrpcClientImpl(ctx, fileDesc, serviceDesc) {
         utils_1.assertInstanceOf(methodDesc, utils_1.FormattedMethodDescriptor);
         chunks.push(ts_poet_1.code `this.${methodDesc.formattedName} = this.${methodDesc.formattedName}.bind(this);`);
     }
-    chunks.push(ts_poet_1.code `}\n`);
+    chunks.push(ts_poet_1.code `}`);
     // Create a method for each FooService method
     for (const methodDesc of serviceDesc.method) {
         chunks.push(generateRpcMethod(ctx, serviceDesc, methodDesc));
     }
     chunks.push(ts_poet_1.code `}`);
-    return ts_poet_1.joinCode(chunks, { trim: false });
+    return ts_poet_1.joinCode(chunks, { trim: false, on: '\n' });
 }
 exports.generateGrpcClientImpl = generateGrpcClientImpl;
 /** Creates the RPC methods that client code actually calls. */
 function generateRpcMethod(ctx, serviceDesc, methodDesc) {
     utils_1.assertInstanceOf(methodDesc, utils_1.FormattedMethodDescriptor);
-    const { options, utils } = ctx;
-    const inputType = types_1.requestType(ctx, methodDesc);
-    const partialInputType = ts_poet_1.code `${utils.DeepPartial}<${inputType}>`;
+    const requestMessage = types_1.rawRequestType(ctx, methodDesc);
+    const inputType = types_1.requestType(ctx, methodDesc, true);
     const returns = types_1.responsePromiseOrObservable(ctx, methodDesc);
+    if (methodDesc.clientStreaming) {
+        return ts_poet_1.code `
+    ${methodDesc.formattedName}(
+      request: ${inputType},
+      metadata?: grpc.Metadata,
+    ): ${returns} {
+      throw new Error('ts-proto does not yet support client streaming!');
+    }
+  `;
+    }
     const method = methodDesc.serverStreaming ? 'invoke' : 'unary';
     return ts_poet_1.code `
     ${methodDesc.formattedName}(
-      request: ${partialInputType},
+      request: ${inputType},
       metadata?: grpc.Metadata,
     ): ${returns} {
       return this.rpc.${method}(
         ${methodDescName(serviceDesc, methodDesc)},
-        ${inputType}.fromPartial(request),
+        ${requestMessage}.fromPartial(request),
         metadata,
       );
     }

package/build/generate-services.js

@@ -35,12 +35,10 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
         if (options.context) {
             params.push(ts_poet_1.code `ctx: Context`);
         }
-        let inputType = types_1.requestType(ctx, methodDesc);
         // the grpc-web clients auto-`fromPartial` the input before handing off to grpc-web's
         // serde runtime, so it's okay to accept partial results from the client
-        if (options.outputClientImpl === 'grpc-web') {
-            inputType = ts_poet_1.code `${utils.DeepPartial}<${inputType}>`;
-        }
+        const partialInput = options.outputClientImpl === 'grpc-web';
+        const inputType = types_1.requestType(ctx, methodDesc, partialInput);
         params.push(ts_poet_1.code `request: ${inputType}`);
         // Use metadata as last argument for interface only configuration
         if (options.outputClientImpl === 'grpc-web') {
@@ -77,15 +75,19 @@ function generateService(ctx, fileDesc, sourceInfo, serviceDesc) {
 exports.generateService = generateService;
 function generateRegularRpcMethod(ctx, fileDesc, serviceDesc, methodDesc) {
     utils_1.assertInstanceOf(methodDesc, utils_1.FormattedMethodDescriptor);
-    const { options } = ctx;
+    const { options, utils } = ctx;
     const Reader = ts_poet_1.imp('Reader@protobufjs/minimal');
     const rawInputType = types_1.rawRequestType(ctx, methodDesc);
     const inputType = types_1.requestType(ctx, methodDesc);
     const outputType = types_1.responseType(ctx, methodDesc);
+    const rawOutputType = types_1.responseType(ctx, methodDesc, { keepValueType: true });
     const params = [...(options.context ? [ts_poet_1.code `ctx: Context`] : []), ts_poet_1.code `request: ${inputType}`];
     const maybeCtx = options.context ? 'ctx,' : '';
     let encode = ts_poet_1.code `${rawInputType}.encode(request).finish()`;
     let decode = ts_poet_1.code `data => ${outputType}.decode(new ${Reader}(data))`;
+    if (options.useDate && rawOutputType.toString().includes('Timestamp')) {
+        decode = ts_poet_1.code `data => ${utils.fromTimestamp}(${rawOutputType}.decode(new ${Reader}(data)))`;
+    }
     if (methodDesc.clientStreaming) {
         encode = ts_poet_1.code `request.pipe(${ts_poet_1.imp('map@rxjs/operators')}(request => ${encode}))`;
     }

package/build/main.js

@@ -138,7 +138,9 @@ function generateFile(ctx, fileDesc) {
                         chunks.push(generate_grpc_web_1.generateGrpcClientImpl(ctx, fileDesc, serviceDesc));
                         chunks.push(generate_grpc_web_1.generateGrpcServiceDesc(fileDesc, serviceDesc));
                         serviceDesc.method.forEach((method) => {
-                            chunks.push(generate_grpc_web_1.generateGrpcMethodDesc(ctx, serviceDesc, method));
+                            if (!method.clientStreaming) {
+                                chunks.push(generate_grpc_web_1.generateGrpcMethodDesc(ctx, serviceDesc, method));
+                            }
                             if (method.serverStreaming) {
                                 hasServerStreamingMethods = true;
                             }

package/build/options.js

@@ -141,11 +141,6 @@ function parseParameter(parameter) {
     return options;
 }
 function getTsPoetOpts(options) {
-    if (options.esModuleInterop) {
-        return { forceDefaultImport: ['protobufjs/minimal'] };
-    }
-    else {
-        return {};
-    }
+    return { forceModuleImport: ['protobufjs/minimal'] };
 }
 exports.getTsPoetOpts = getTsPoetOpts;

package/build/types.js

@@ -601,16 +601,19 @@ function rawRequestType(ctx, methodDesc) {
     return messageToTypeName(ctx, methodDesc.inputType);
 }
 exports.rawRequestType = rawRequestType;
-function requestType(ctx, methodDesc) {
+function requestType(ctx, methodDesc, partial = false) {
     let typeName = rawRequestType(ctx, methodDesc);
+    if (partial) {
+        typeName = ts_poet_1.code `${ctx.utils.DeepPartial}<${typeName}>`;
+    }
     if (methodDesc.clientStreaming) {
         return ts_poet_1.code `${ts_poet_1.imp('Observable@rxjs')}<${typeName}>`;
     }
     return typeName;
 }
 exports.requestType = requestType;
-function responseType(ctx, methodDesc) {
-    return messageToTypeName(ctx, methodDesc.outputType, { keepValueType: true });
+function responseType(ctx, methodDesc, typeOptions = {}) {
+    return messageToTypeName(ctx, methodDesc.outputType, typeOptions);
 }
 exports.responseType = responseType;
 function responsePromise(ctx, methodDesc) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.110.0",
+  "version": "1.110.3",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",
@@ -64,7 +64,7 @@
     "dataloader": "^1.4.0",
     "object-hash": "^1.3.1",
     "protobufjs": "^6.8.8",
-    "ts-poet": "^4.10.0",
+    "ts-poet": "^4.11.0",
     "ts-proto-descriptors": "1.6.0"
   }
 }