Fix shape of data events

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ampt-data-mock",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

src/__tests__/dataEvents.spec.ts

@@ -1,26 +1,22 @@
 import { data, reset } from "../data";
 
+import { handledEvent } from "../helpers";
+
 describe("data events", () => {
   afterEach(reset);
 
   it("Should listen to all events", () => {
     const spy = jest.fn();
     data.on("*", spy);
     data.set("FOO:1", { id: "1" });
-    expect(spy).toHaveBeenCalledWith({
-      name: "created",
-      item: { id: "1" },
-    });
+    expect(spy).toHaveBeenCalledWith(handledEvent("created", { id: "1" }));
   });
 
   it("Should listen to created events", () => {
     const spy = jest.fn();
     data.on("created", spy);
     data.set("FOO:1", { id: "1" });
-    expect(spy).toHaveBeenCalledWith({
-      name: "created",
-      item: { id: "1" },
-    });
+    expect(spy).toHaveBeenCalledWith(handledEvent("created", { id: "1" }));
   });
 
   it("Should not emit created events to update listeners", () => {
@@ -36,11 +32,9 @@ describe("data events", () => {
     data.set("FOO:1", { id: "1" });
     data.set("FOO:1", { id: "2" });
 
-    expect(spy).toHaveBeenCalledWith({
-      name: "updated",
-      previous: { id: "1" },
-      item: { id: "2" },
-    });
+    expect(spy).toHaveBeenCalledWith(
+      handledEvent("updated", { id: "2" }, { id: "1" })
+    );
   });
 
   it("Should listen to deleted events", () => {
@@ -49,10 +43,9 @@ describe("data events", () => {
     data.set("FOO:1", { id: "1" });
     data.remove("FOO:1");
 
-    expect(spy).toHaveBeenLastCalledWith({
-      name: "deleted",
-      previous: { id: "1" },
-    });
+    expect(spy).toHaveBeenLastCalledWith(
+      handledEvent("deleted", null, { id: "1" })
+    );
   });
 
   it("Should listen for specific paths", () => {
@@ -62,7 +55,8 @@ describe("data events", () => {
 
     expect(spy).toHaveBeenCalledWith({
       name: "created",
-      item: { id: "1" },
+      item: { value: { id: "1" } },
+      previous: {},
     });
   });
 
@@ -71,9 +65,6 @@ describe("data events", () => {
     data.on("*:FOO:BAR:1", spy);
     data.set("FOO:BAR:1", { id: "1" });
 
-    expect(spy).toHaveBeenCalledWith({
-      name: "created",
-      item: { id: "1" },
-    });
+    expect(spy).toHaveBeenCalledWith(handledEvent("created", { id: "1" }));
   });
 });

src/data.ts

@@ -68,7 +68,17 @@ const emitToSubscribers = (eventType: string, path: string, data: any) => {
       return false;
     })
     .forEach((subscriber) => {
-      store.subscriptions[subscriber].forEach((fn) => fn(data));
+      store.subscriptions[subscriber].forEach((fn) =>
+        fn({
+          item: {
+            value: data.item,
+          },
+          previous: {
+            value: data.previous,
+          },
+          name: data.name,
+        })
+      );
     });
 };
 

src/helpers.ts

@@ -0,0 +1,19 @@
+interface IHandledEvent {
+  name: string;
+  value: any;
+  previousValue: any;
+}
+
+export const handledEvent = (
+  name: string,
+  value?: any,
+  previousValue?: any
+) => {
+  return {
+    name,
+    item: { value: value || undefined },
+    previous: {
+      value: previousValue || undefined,
+    },
+  };
+};

src/index.ts

@@ -1,2 +1,3 @@
 export * from "./data";
 export * from "./events";
+export * from "./helpers";