Merge pull request #13 from improbable-eng/bugfix/orphan-map-message

Fixes #10 - Messages without packages
improbable-eng · Jun 25, 2017 · b2b987f · b2b987f
2 parents 08ac5c8 + ff52eb3
commit b2b987f
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 3 deletions.
diff --git a/src/ExportMap.ts b/src/ExportMap.ts
@@ -39,15 +39,17 @@ export class ExportMap {
       } : undefined,
     };
 
-    const entryName = `${scope ? scope + "." : ""}${message.getName()}`;
+    const packagePrefix = scope ? scope + "." : "";
+
+    const entryName = `${packagePrefix}${message.getName()}`;
     this.messageMap[entryName] = messageEntry;
 
     message.getNestedTypeList().forEach(nested => {
-      this.exportNested(scope + "." + message.getName(), fileDescriptor, nested);
+      this.exportNested(`${packagePrefix}${message.getName()}`, fileDescriptor, nested);
     });
 
     message.getEnumTypeList().forEach(enumType => {
-      const identifier = scope + "." +  message.getName() + "." + enumType.getName();
+      const identifier = `${packagePrefix}${message.getName()}.${enumType.getName()}`;
       this.enumMap[identifier] = {
         pkg: fileDescriptor.getPackage(),
         fileName: fileDescriptor.getName(),

diff --git a/test/proto/orphan.proto b/test/proto/orphan.proto
@@ -1,5 +1,9 @@
 syntax = "proto3";
 
+message OrphanMapMessage {
+  map<string, int64> primitive_ints = 1;
+}
+
 message OrphanMessage {
     string my_string = 1;
     bool my_bool = 2;

diff --git a/test/ts_test/src/maps.ts b/test/ts_test/src/maps.ts
@@ -4,6 +4,7 @@ import {ExternalEnum} from "../generated/othercom/external_enum_pb";
 import {ExternalChildMessage} from "../generated/othercom/external_child_message_pb";
 import InternalEnum = MapMessage.InternalEnum;
 import InternalChildMessage = MapMessage.InternalChildMessage;
+import {OrphanMapMessage} from "../generated/orphan_pb";
 
 describe("maps", () => {
   describe("message maps", () => {
@@ -155,6 +156,30 @@ describe("maps", () => {
     });
   });
 
+  describe("orphan message maps", () => {
+    it("should allow setting and getting map fields of messages without a package", () => {
+      const parentMsg = new OrphanMapMessage();
+      const myMap = parentMsg.getPrimitiveIntsMap();
+      myMap.set("first", 123).set("second", 456);
+
+      assert.strictEqual(parentMsg.getPrimitiveIntsMap().getLength() as number, 2);
+      const firstKey = parentMsg.getPrimitiveIntsMap().keys().next().value;
+      assert.strictEqual(firstKey as string, "first");
+
+      const firstEntry = parentMsg.getPrimitiveIntsMap().entries().next().value;
+      assert.strictEqual(firstEntry[0] as string, "first");
+      assert.strictEqual(firstEntry[1] as number, 123);
+
+      assert.deepEqual(parentMsg.getPrimitiveIntsMap().toObject() as Array<[string, number]>, [
+        ["first", 123],
+        ["second", 456],
+      ]);
+
+      assert.strictEqual(myMap.del("first") as boolean, true);
+      assert.strictEqual(myMap.getLength() as number, 1);
+    });
+  });
+
   describe("toObject", () => {
     it("should have types", () => {
       const parentMsg = new MapMessage();