Add registry in callback before publish

Author: canmingir

src/Event.js

@@ -11,13 +11,10 @@ const subscribe = (type, callback) => {
     subscriptions[type] = {};
   }
 
-  subscriptions[type][id] = callback;
-
-  let last = messages.get(type);
-
   const registry = {
     id,
     type,
+    callback,
     unsubscribe: () => {
       console.debug("react-event", "unsubscribe", type, id);
       delete subscriptions[type][id];
@@ -28,6 +25,10 @@ const subscribe = (type, callback) => {
     },
   };
 
+  subscriptions[type][id] = registry;
+
+  let last = messages.get(type);
+
   if (last) {
     callback(last, registry);
   }
@@ -40,8 +41,10 @@ const publish = (type, payload) => {
   messages.set(type, payload);
 
   Object.keys(subscriptions[type] || {}).forEach((key) => {
+    const registry = subscriptions[type][key];
+
     setTimeout(() => {
-      subscriptions[type][key](payload);
+      registry.callback(payload, registry);
     }, 0);
   });
 };

src/test/event.test.js

@@ -61,17 +61,35 @@ describe("react-event", () => {
     expect(lastPublishedEvent).toEqual({ data: "test payload" });
   });
 
-  it("returns registry in callback", () => {
+  it("returns registry in callback", (done) => {
     publish("CALLBACK_REGISTRY_EVENT", { data: "test payload" });
 
     subscribe("CALLBACK_REGISTRY_EVENT", (result, registry) => {
+      expect(result).toMatchObject({ data: "test payload" });
       expect(registry).toMatchObject({
         id: expect.any(String),
         type: "CALLBACK_REGISTRY_EVENT",
+        callback: expect.any(Function),
         unsubscribe: expect.any(Function),
       });
 
       registry.unsubscribe();
     });
+
+    subscribe("CALLBACK_REGISTRY_EVENT_2", (result, registry) => {
+      expect(result).toMatchObject({ data: "test payload 2" });
+      expect(registry).toMatchObject({
+        id: expect.any(String),
+        type: "CALLBACK_REGISTRY_EVENT_2",
+        callback: expect.any(Function),
+        unsubscribe: expect.any(Function),
+      });
+
+      registry.unsubscribe();
+
+      done();
+    });
+
+    publish("CALLBACK_REGISTRY_EVENT_2", { data: "test payload 2" });
   });
 });