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

Support for proto files without packages #185

Merged
merged 1 commit into from
May 15, 2018
Merged

Support for proto files without packages #185

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
21 changes: 12 additions & 9 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 @@ -141,7 +141,7 @@ void PrintServiceConstructor(Printer* printer,
" * @struct\n"
" * @final\n"
" */\n"
"proto.$package$.$service_name$Client =\n"
"proto.$package_dot$$service_name$Client =\n"
" function(hostname, credentials, options) {\n"
" /**\n"
" * @private @const {!grpc.web.$mode$ClientBase} The client\n"
Expand Down Expand Up @@ -209,7 +209,7 @@ void PrintUnaryCall(Printer* printer, std::map<string, string> vars) {
" * @return {!grpc.web.ClientReadableStream<!proto.$out$>|undefined}\n"
" * The XHR Node Readable Stream\n"
" */\n"
"proto.$package$.$service_name$Client.prototype.$js_method_name$ =\n");
"proto.$package_dot$$service_name$Client.prototype.$js_method_name$ =\n");
printer->Indent();
printer->Print(vars,
" function(request, metadata, callback) {\n"
Expand All @@ -219,9 +219,9 @@ void PrintUnaryCall(Printer* printer, std::map<string, string> vars) {
if (vars["mode"] == GetModeVar(Mode::OP) ||
vars["mode"] == GetModeVar(Mode::OPJSPB)) {
printer->Print(vars,
"'/$$rpc/$package$.$service_name$/$method_name$',\n");
"'/$$rpc/$package_dot$$service_name$/$method_name$',\n");
} else {
printer->Print(vars, "'/$package$.$service_name$/$method_name$',\n");
printer->Print(vars, "'/$package_dot$$service_name$/$method_name$',\n");
}
printer->Print(
vars,
Expand All @@ -246,7 +246,7 @@ void PrintServerStreamingCall(Printer* printer, std::map<string, string> vars) {
" * @return {!grpc.web.ClientReadableStream<!proto.$out$>}\n"
" * The XHR Node Readable Stream\n"
" */\n"
"proto.$package$.$service_name$Client.prototype.$js_method_name$ =\n");
"proto.$package_dot$$service_name$Client.prototype.$js_method_name$ =\n");
printer->Indent();
printer->Print(
" function(request, metadata) {\n"
Expand All @@ -256,9 +256,9 @@ void PrintServerStreamingCall(Printer* printer, std::map<string, string> vars) {
if (vars["mode"] == GetModeVar(Mode::OP) ||
vars["mode"] == GetModeVar(Mode::OPJSPB)) {
printer->Print(vars,
"'/$$rpc/$package$.$service_name$/$method_name$',\n");
"'/$$rpc/$package_dot$$service_name$/$method_name$',\n");
} else {
printer->Print(vars, "'/$package$.$service_name$/$method_name$',\n");
printer->Print(vars, "'/$package_dot$$service_name$/$method_name$',\n");
}
printer->Print(
vars,
Expand Down Expand Up @@ -308,7 +308,10 @@ class GrpcCodeGenerator : public CodeGenerator {
}

std::map<string, string> vars;
vars["package"] = file->package();
std::string package = file->package();
vars["package"] = package;
vars["package_dot"] = package.size() > 0 ? package + '.' : "";

if (mode == "binary") {
vars["mode"] = GetModeVar(Mode::OP);
} else if (mode == "base64") {
Expand All @@ -334,7 +337,7 @@ class GrpcCodeGenerator : public CodeGenerator {
vars["service_name"] = service->name();
printer.Print(
vars,
"goog.provide('proto.$package$.$service_name$Client');\n");
"goog.provide('proto.$package_dot$$service_name$Client');\n");
}
printer.Print("\n");

Expand Down