Generate non-grpc implementations for value-type argument containing …

…methods
stephenh · Dec 21, 2023 · 36219d7 · 36219d7
1 parent 87cfd76
commit 36219d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/integration/wrappers-regression/wrappers-regression.ts b/integration/wrappers-regression/wrappers-regression.ts
@@ -33,14 +33,14 @@ export class ClockClientImpl implements Clock {
     return promise.then((data) => Timestamp.decode(_m0.Reader.create(data)));
   }
 
-  NowString(request: StringValue): Promise<StringValue> {
-    const data = StringValue.encode(request).finish();
+  NowString(request: string | undefined): Promise<StringValue> {
+    const data = StringValue.encode({ value: request }).finish();
     const promise = this.rpc.request(this.service, "NowString", data);
     return promise.then((data) => StringValue.decode(_m0.Reader.create(data)));
   }
 
   NowStringStream(request: Observable<StringValue>): Observable<StringValue> {
-    const data = request.pipe(map((request) => StringValue.encode(request).finish()));
+    const data = request.pipe(map((request) => StringValue.encode({ value: request }).finish()));
     const result = this.rpc.bidirectionalStreamingRequest(this.service, "NowStringStream", data);
     return result.pipe(map((data) => StringValue.decode(_m0.Reader.create(data))));
   }

diff --git a/src/generate-services.ts b/src/generate-services.ts
@@ -111,7 +111,8 @@ function generateRegularRpcMethod(ctx: Context, methodDesc: MethodDescriptorProt
   const { options } = ctx;
   const Reader = impFile(ctx.options, "Reader@protobufjs/minimal");
   const rawInputType = rawRequestType(ctx, methodDesc, { keepValueType: true });
-  const inputType = requestType(ctx, methodDesc);
+  const isValueType = valueTypeName(ctx, methodDesc.inputType) !== undefined;
+  const inputType = requestType(ctx, methodDesc, false, !isValueType || methodDesc.clientStreaming);
   const rawOutputType = responseType(ctx, methodDesc, { keepValueType: true });
 
   const params = [
@@ -132,7 +133,8 @@ function generateRegularRpcMethod(ctx: Context, methodDesc: MethodDescriptorProt
     `;
   }
 
-  let encode = code`${rawInputType}.encode(request).finish()`;
+  const inputValue = isValueType ? '{ value: request }' : 'request';
+  let encode = code`${rawInputType}.encode(${inputValue}).finish()`;
   let beforeRequest;
   if (options.rpcBeforeRequest) {
     beforeRequest = code`