Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optional metadata argument #392

Merged
merged 1 commit into from
Nov 28, 2018
Merged

Optional metadata argument #392

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions javascript/net/grpc/web/grpc_generator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,14 @@ void PrintTypescriptFile(Printer* printer, const FileDescriptor* file,
printer->Indent();
printer->Print(vars,
"request: $input_type$,\n"
"metadata: grpcWeb.Metadata) {\n");
"metadata?: grpcWeb.Metadata) {\n");
printer->Print(vars, "return this.client_.serverStreaming(\n");
printer->Indent();
printer->Print(vars,
"this.hostname_ +\n"
" '/$package_dot$$service_name$/$method_name$',\n"
"request,\n"
"metadata,\n"
"metadata || {},\n"
"this.methodInfo$method_name$);\n");
printer->Outdent();
printer->Outdent();
Expand All @@ -511,7 +511,7 @@ void PrintTypescriptFile(Printer* printer, const FileDescriptor* file,
printer->Indent();
printer->Print(vars,
"request: $input_type$,\n"
"metadata: grpcWeb.Metadata,\n"
"metadata?: grpcWeb.Metadata,\n"
"callback: (err: grpcWeb.Error,\n"
" response: $output_type$) => void) {\n");
printer->Print(vars, "return this.client_.rpcCall(\n");
Expand All @@ -520,7 +520,7 @@ void PrintTypescriptFile(Printer* printer, const FileDescriptor* file,
"this.hostname_ +\n"
" '/$package_dot$$service_name$/$method_name$',\n"
"request,\n"
"metadata,\n"
"metadata || {},\n"
"this.methodInfo$method_name$,\n"
"callback);\n");
printer->Outdent();
Expand Down Expand Up @@ -560,7 +560,7 @@ void PrintGrpcWebDtsClientClass(Printer* printer, const FileDescriptor* file, co
printer->Indent();
printer->Print(vars,
"request: $input_type$,\n"
"metadata: grpcWeb.Metadata\n");
"metadata?: grpcWeb.Metadata\n");
printer->Outdent();
printer->Print(vars,
"): grpcWeb.ClientReadableStream<$output_type$>;\n\n");
Expand All @@ -570,7 +570,7 @@ void PrintGrpcWebDtsClientClass(Printer* printer, const FileDescriptor* file, co
printer->Indent();
printer->Print(vars,
"request: $input_type$,\n"
"metadata: grpcWeb.Metadata\n");
"metadata?: grpcWeb.Metadata\n");
printer->Outdent();
printer->Print(vars,
"): Promise<$output_type$>;\n\n");
Expand All @@ -579,7 +579,7 @@ void PrintGrpcWebDtsClientClass(Printer* printer, const FileDescriptor* file, co
printer->Indent();
printer->Print(vars,
"request: $input_type$,\n"
"metadata: grpcWeb.Metadata,\n"
"metadata: grpcWeb.Metadata | undefined,\n"
"callback: (err: grpcWeb.Error,\n"
" response: $output_type$) => void\n");
printer->Outdent();
Expand Down Expand Up @@ -795,7 +795,7 @@ void PrintUnaryCall(Printer* printer, std::map<string, string> vars) {
"/**\n"
" * @param {!proto.$in$} request The\n"
" * request proto\n"
" * @param {!Object<string, string>} metadata User defined\n"
" * @param {Object<string, string>} metadata User defined\n"
" * call metadata\n"
" * @param {function(?grpc.web.Error,"
" ?proto.$out$)}\n"
Expand All @@ -820,7 +820,7 @@ void PrintUnaryCall(Printer* printer, std::map<string, string> vars) {
printer->Print(
vars,
"request,\n"
"metadata,\n"
"metadata || {},\n"
"methodInfo_$service_name$_$method_name$,\n"
"callback);\n");
printer->Outdent();
Expand All @@ -835,7 +835,7 @@ void PrintPromiseUnaryCall(Printer* printer,
"/**\n"
" * @param {!proto.$in$} request The\n"
" * request proto\n"
" * @param {!Object<string, string>} metadata User defined\n"
" * @param {?Object<string, string>} metadata User defined\n"
" * call metadata\n"
" * @return {!Promise<!proto.$out$>}\n"
" * The XHR Node Readable Stream\n"
Expand All @@ -860,7 +860,7 @@ void PrintServerStreamingCall(Printer* printer, std::map<string, string> vars) {
vars,
"/**\n"
" * @param {!proto.$in$} request The request proto\n"
" * @param {!Object<string, string>} metadata User defined\n"
" * @param {?Object<string, string>} metadata User defined\n"
" * call metadata\n"
" * @return {!grpc.web.ClientReadableStream<!proto.$out$>}\n"
" * The XHR Node Readable Stream\n"
Expand Down