fix: Fix generating wrong web-rpc implementation for wrapper-type met…

…hod arg (#978) * Fix generating wrong web-rpc implementation for wrapper-type method arguments * Improve grpc-web tests to cover wrapper-containing rpc definitions * Fix proto/rpc method naming misprint * Add changed example.ts. --------- Co-authored-by: Stephen Haberman <[email protected]>
stephenh · Dec 20, 2023 · 063fd29 · 063fd29
1 parent 850324a
commit 063fd29
Show file tree

Hide file tree

Showing 5 changed files with 694 additions and 2 deletions.
diff --git a/integration/grpc-web/example.bin b/integration/grpc-web/example.bin
diff --git a/integration/grpc-web/example.proto b/integration/grpc-web/example.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-
+import "google/protobuf/wrappers.proto";
 package rpx;
 
 service DashState {
@@ -40,6 +40,7 @@ service DashAPICreds {
   rpc Create(DashAPICredsCreateReq) returns (DashCred);
   rpc Update(DashAPICredsUpdateReq) returns (DashCred);
   rpc Delete(DashAPICredsDeleteReq) returns (DashCred);
+  rpc Uppercase(google.protobuf.StringValue) returns (google.protobuf.StringValue);
 }
 
 message DashCred {

diff --git a/integration/grpc-web/example.ts b/integration/grpc-web/example.ts
@@ -4,6 +4,7 @@ import { BrowserHeaders } from "browser-headers";
 import * as _m0 from "protobufjs/minimal";
 import { Observable } from "rxjs";
 import { share } from "rxjs/operators";
+import { StringValue } from "./google/protobuf/wrappers";
 
 export const protobufPackage = "rpx";
 
@@ -826,6 +827,7 @@ export interface DashAPICreds {
   Create(request: DeepPartial<DashAPICredsCreateReq>, metadata?: grpc.Metadata): Promise<DashCred>;
   Update(request: DeepPartial<DashAPICredsUpdateReq>, metadata?: grpc.Metadata): Promise<DashCred>;
   Delete(request: DeepPartial<DashAPICredsDeleteReq>, metadata?: grpc.Metadata): Promise<DashCred>;
+  Uppercase(request: DeepPartial<StringValue>, metadata?: grpc.Metadata): Promise<StringValue>;
 }
 
 export class DashAPICredsClientImpl implements DashAPICreds {
@@ -836,6 +838,7 @@ export class DashAPICredsClientImpl implements DashAPICreds {
     this.Create = this.Create.bind(this);
     this.Update = this.Update.bind(this);
     this.Delete = this.Delete.bind(this);
+    this.Uppercase = this.Uppercase.bind(this);
   }
 
   Create(request: DeepPartial<DashAPICredsCreateReq>, metadata?: grpc.Metadata): Promise<DashCred> {
@@ -849,6 +852,10 @@ export class DashAPICredsClientImpl implements DashAPICreds {
   Delete(request: DeepPartial<DashAPICredsDeleteReq>, metadata?: grpc.Metadata): Promise<DashCred> {
     return this.rpc.unary(DashAPICredsDeleteDesc, DashAPICredsDeleteReq.fromPartial(request), metadata);
   }
+
+  Uppercase(request: DeepPartial<StringValue>, metadata?: grpc.Metadata): Promise<StringValue> {
+    return this.rpc.unary(DashAPICredsUppercaseDesc, StringValue.fromPartial(request), metadata);
+  }
 }
 
 export const DashAPICredsDesc = { serviceName: "rpx.DashAPICreds" };
@@ -922,6 +929,29 @@ export const DashAPICredsDeleteDesc: UnaryMethodDefinitionish = {
   } as any,
 };
 
+export const DashAPICredsUppercaseDesc: UnaryMethodDefinitionish = {
+  methodName: "Uppercase",
+  service: DashAPICredsDesc,
+  requestStream: false,
+  responseStream: false,
+  requestType: {
+    serializeBinary() {
+      return StringValue.encode(this).finish();
+    },
+  } as any,
+  responseType: {
+    deserializeBinary(data: Uint8Array) {
+      const value = StringValue.decode(data);
+      return {
+        ...value,
+        toObject() {
+          return value;
+        },
+      };
+    },
+  } as any,
+};
+
 interface UnaryMethodDefinitionishR extends grpc.UnaryMethodDefinition<any, any> {
   requestStream: any;
   responseStream: any;