simplify typing with Object.assign

robertpenner · Apr 21, 2018 · 411250f · 411250f
1 parent 4a5da7b
commit 411250f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/nanosignal.es6.ts.js → src/nanosignal.es6.js b/src/nanosignal.es6.ts.js → src/nanosignal.es6.js
diff --git a/src/nanosignal.ts b/src/nanosignal.ts
@@ -30,15 +30,17 @@ export default function createSignal<PAYLOAD, RESULT = void>(
     ? [firstListener]
     : [];
 
-  const signal: Partial<Signal<PAYLOAD, RESULT>> = (payload: PAYLOAD) =>
-    listeners.map((fn) => fn(payload));
+  const signal = Object.assign(
+    (payload: PAYLOAD) => listeners.map((fn) => fn(payload)),
+    {
+      subscribe: (listener: Listener<PAYLOAD, RESULT>) => {
+        listeners = listeners.concat(listener);
+        return () => {
+          listeners = listeners.filter((fn) => fn !== listener);
+        };
+      },
+    },
+  );
 
-  signal.subscribe = (listener) => {
-    listeners = listeners.concat(listener);
-    return () => {
-      listeners = listeners.filter((fn) => fn !== listener);
-    };
-  };
-
-  return signal as Signal<PAYLOAD, RESULT>;
+  return signal;
 }