Merge pull request #28 from bbqsrc/fix/implicit-package

Fix generating nested enums in proto files with no package
agreatfool · Sep 19, 2018 · a272dae · a272dae
2 parents 7aa1f5c + 56a7182
commit a272dae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/build/lib/ExportMap.js b/build/lib/ExportMap.js
diff --git a/build/lib/ExportMap.js.map b/build/lib/ExportMap.js.map
diff --git a/src/lib/ExportMap.ts b/src/lib/ExportMap.ts
@@ -43,11 +43,11 @@ export class ExportMap {
         this.messageMap[entryName] = messageEntry;
 
         message.getNestedTypeList().forEach(nested => {
-            this.exportNested(scope + "." + message.getName(), fileDescriptor, nested);
+            this.exportNested(entryName, fileDescriptor, nested);
         });
 
         message.getEnumTypeList().forEach(enumType => {
-            const identifier = scope + "." + message.getName() + "." + enumType.getName();
+            const identifier = entryName + "." + enumType.getName();
             this.enumMap[identifier] = {
                 pkg: fileDescriptor.getPackage(),
                 fileName: fileDescriptor.getName(),
@@ -63,7 +63,8 @@ export class ExportMap {
         });
 
         fileDescriptor.getEnumTypeList().forEach(enumType => {
-            this.enumMap[scope + "." + enumType.getName()] = {
+            const entryName = `${scope ? scope + "." : ""}${enumType.getName()}`;
+            this.enumMap[entryName] = {
                 pkg: fileDescriptor.getPackage(),
                 fileName: fileDescriptor.getName(),
                 enumOptions: enumType.getOptions(),