grpc
/
grpc-web
mirror of https://github.com/grpc/grpc-web.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Protobuf .d.ts typings for .proto files without package 

Fixes #939
This commit is contained in:
Yannic Bonenberger 2020-08-28 14:03:46 +02:00 committed by Stanley Cheung
parent 69a16b6033
commit fecfe1cef4
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
javascript/net/grpc/web/grpc_generator.cc
View File

@ -367,11 +367,13 @@ string JSElementType(const FieldDescriptor *desc, const FileDescriptor *file) {
case FieldDescriptor::TYPE_ENUM: case FieldDescriptor::TYPE_ENUM:
if (desc->enum_type()->file() == file) { if (desc->enum_type()->file() == file) {
// [for protobuf .d.ts files only] Do not add the module prefix for
// local messages.
string enum_name = string enum_name =
StripPrefixString( StripPrefixString(
desc->enum_type()->full_name(), desc->enum_type()->full_name(),
desc->enum_type()->file()->package()); desc->enum_type()->file()->package());
return enum_name.substr(1); return StripPrefixString(enum_name, ".");
} }
return ModuleAlias(desc->enum_type()->file()->name()) return ModuleAlias(desc->enum_type()->file()->name())
+ StripPrefixString( + StripPrefixString(

10
packages/grpc-web/test/protos/test01.proto
View File

@ -5,5 +5,15 @@ message MessageOuter {
int32 value = 1; int32 value = 1;
} }
enum EnumInner {
DEFAULT = 0;
}
repeated MessageInner someProp = 1; repeated MessageInner someProp = 1;
EnumOuter someEnum = 2;
EnumInner anotherEnum = 3;
}
enum EnumOuter {
DEFAULT = 0;
} }