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

Fixes #939
grpc · Aug 30, 2020 · 5a63476 · 5a63476
1 parent 0c56ed1
commit 5a63476
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/javascript/net/grpc/web/grpc_generator.cc b/javascript/net/grpc/web/grpc_generator.cc
@@ -367,11 +367,13 @@ string JSElementType(const FieldDescriptor *desc, const FileDescriptor *file) {
 
     case FieldDescriptor::TYPE_ENUM:
       if (desc->enum_type()->file() == file) {
+        // [for protobuf .d.ts files only] Do not add the module prefix for
+        // local messages.
         string enum_name =
             StripPrefixString(
                 desc->enum_type()->full_name(),
                 desc->enum_type()->file()->package());
-        return enum_name.substr(1);
+        return StripPrefixString(enum_name, ".");
       }
       return ModuleAlias(desc->enum_type()->file()->name())
           + StripPrefixString(

diff --git a/packages/grpc-web/test/protos/test01.proto b/packages/grpc-web/test/protos/test01.proto
@@ -5,5 +5,15 @@ message MessageOuter {
     int32 value = 1;
   }
 
+  enum EnumInner {
+    DEFAULT = 0;
+  }
+
   repeated MessageInner someProp = 1;
+  EnumOuter someEnum = 2;
+  EnumInner anotherEnum = 3;
+}
+
+enum EnumOuter {
+  DEFAULT = 0;
 }