From 4d862dc216450f8ead1426d1ed9465dcd9af73e9 Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Sun, 1 Dec 2019 14:47:14 +0100
Subject: [PATCH 01/18] Implement new action creator logic

---
 devtools.js  |  2 +-
 package.json |  3 ++-
 src/index.js | 16 +++++-----------
 src/util.js  |  5 +++--
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/devtools.js b/devtools.js
index 6c6b2f1..28fec49 100644
--- a/devtools.js
+++ b/devtools.js
@@ -19,7 +19,7 @@ module.exports = function unistoreDevTools(store) {
 		});
 		store.devtools.init(store.getState());
 		store.subscribe(function (state, action) {
-			var actionName = action && action.name || 'setState';
+			var actionName = action && (action.name || action.type) || 'setState';
 
 			if (!ignoreState) {
 				store.devtools.send(actionName, state);
diff --git a/package.json b/package.json
index 60f688e..c5d27b0 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
   "eslintConfig": {
     "extends": "eslint-config-developit",
     "rules": {
-      "prefer-rest-params": 0
+      "prefer-rest-params": 0,
+      "prefer-spread": 0
     }
   },
   "bundlesize": [
diff --git a/src/index.js b/src/index.js
index 4df2006..ffb9e63 100644
--- a/src/index.js
+++ b/src/index.js
@@ -52,17 +52,11 @@ export default function createStore(state) {
 			function apply(result) {
 				setState(result, false, action);
 			}
-
-			// Note: perf tests verifying this implementation: https://esbench.com/bench/5a295e6299634800a0349500
-			return function() {
-				let args = [state];
-				for (let i=0; i<arguments.length; i++) args.push(arguments[i]);
-				let ret = action.apply(this, args);
-				if (ret!=null) {
-					if (ret.then) return ret.then(apply);
-					return apply(ret);
-				}
-			};
+			let ret = (action.action || action)(state, this);
+			if (ret != null) {
+				if (ret.then) return ret.then(apply);
+				return apply(ret);
+			}
 		},
 
 		/**
diff --git a/src/util.js b/src/util.js
index 7050423..69593d7 100644
--- a/src/util.js
+++ b/src/util.js
@@ -1,9 +1,10 @@
 // Bind an object/factory of actions to the store and wrap them.
 export function mapActions(actions, store) {
-	if (typeof actions==='function') actions = actions(store);
 	let mapped = {};
 	for (let i in actions) {
-		mapped[i] = store.action(actions[i]);
+		mapped[i] = function () {
+			return store.action(actions[i].apply(actions, arguments));
+		};
 	}
 	return mapped;
 }

From 7214734a50ea662627e165cd9fed3946daba87e1 Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Sun, 1 Dec 2019 14:54:48 +0100
Subject: [PATCH 02/18] Update tests to work with new action creators

---
 test/preact/builds.test.js | 6 +++---
 test/react/builds.test.js  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/preact/builds.test.js b/test/preact/builds.test.js
index 7928df7..f2de43d 100644
--- a/test/preact/builds.test.js
+++ b/test/preact/builds.test.js
@@ -27,8 +27,8 @@ describe('build: default', () => {
 	describe('smoke test (preact)', () => {
 		it('should render', done => {
 			const { Provider, connect } = preact;
-			const actions = ({ getState, setState }) => ({
-				incrementTwice(state) {
+			const actions = {
+				incrementTwice: () => (state, { getState, setState }) => {
 					setState({ count: state.count + 1 });
 					return new Promise(r =>
 						setTimeout(() => {
@@ -36,7 +36,7 @@ describe('build: default', () => {
 						}, 20)
 					);
 				}
-			});
+			};
 			const App = connect('count', actions)(({ count, incrementTwice }) => (
 				<button onClick={incrementTwice}>count: {count}</button>
 			));
diff --git a/test/react/builds.test.js b/test/react/builds.test.js
index 099bd68..27b9a34 100644
--- a/test/react/builds.test.js
+++ b/test/react/builds.test.js
@@ -33,8 +33,8 @@ describe('build: default', () => {
 	describe('smoke test (react)', () => {
 		it('should render', done => {
 			const { Provider, connect } = react;
-			const actions = ({ getState, setState }) => ({
-				incrementTwice(state) {
+			const actions = {
+				incrementTwice: () => (state, { getState, setState }) => {
 					setState({ count: state.count + 1 });
 					return new Promise(r =>
 						setTimeout(() => {
@@ -42,7 +42,7 @@ describe('build: default', () => {
 						}, 20)
 					);
 				}
-			});
+			};
 			const App = connect('count', actions)(({ count, incrementTwice }) => (
 				<button id="some_button" onClick={incrementTwice}>
 					count: {count}

From 5e058170f6fbe18d323cd25520544304539639d1 Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Sun, 1 Dec 2019 17:13:21 +0100
Subject: [PATCH 03/18] Update types to match new action logic

---
 index.d.ts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 98f9353..8ec4836 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -5,11 +5,15 @@
 
 export type Listener<K> = (state: K, action?: Action<K>) => void;
 export type Unsubscribe = () => void;
-export type Action<K> = (state: K, ...args: any[]) => void;
-export type BoundAction = (...args: any[]) => void;
+export type ActionFn<K> = (state: K, store: Store<K>) => Promise<Partial<K>> | Partial<K> | void;
+export interface ActionObject<K> {
+  type: string;
+  action: ActionFn<K>;
+}
+export type Action<K> = ActionObject<K> | ActionFn<K>
 
 export interface Store<K> {
-	action(action: Action<K>): BoundAction;
+	action(action: Action<K>): Promise<void> | void;
 	setState<U extends keyof K>(update: Pick<K, U>, overwrite?: boolean, action?: Action<K>): void;
 	subscribe(f: Listener<K>): Unsubscribe;
 	unsubscribe(f: Listener<K>): void;
@@ -18,12 +22,10 @@ export interface Store<K> {
 
 export default function createStore<K>(state?: K): Store<K>;
 
-export type ActionFn<K> = (state: K, ...args: any[]) => Promise<Partial<K>> | Partial<K> | void;
-
 export interface ActionMap<K> {
-	[actionName: string]: ActionFn<K>;
+	[actionName: string]: ActionCreator<K>;
 }
 
-export type ActionCreator<K> = (store: Store<K>) => ActionMap<K>;
+export type ActionCreator<K> = (...args: any[]) => Action<K>;
 
 export type StateMapper<T, K, I> = (state: K, props: T) => I;

From 5f629f7a30437bd8f90a07f7a101e64a0e5fc3d9 Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Sun, 1 Dec 2019 17:14:15 +0100
Subject: [PATCH 04/18] Pass update object to listeners

---
 index.d.ts   | 2 +-
 src/index.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 8ec4836..3dee759 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -3,7 +3,7 @@
 // K - Store state
 // I - Injected props to wrapped component
 
-export type Listener<K> = (state: K, action?: Action<K>) => void;
+export type Listener<K> = (state: K, action?: Action<K>, update?: Partial<K>) => void;
 export type Unsubscribe = () => void;
 export type ActionFn<K> = (state: K, store: Store<K>) => Promise<Partial<K>> | Partial<K> | void;
 export interface ActionObject<K> {
diff --git a/src/index.js b/src/index.js
index ffb9e63..44b9290 100644
--- a/src/index.js
+++ b/src/index.js
@@ -31,7 +31,7 @@ export default function createStore(state) {
 	function setState(update, overwrite, action) {
 		state = overwrite ? update : assign(assign({}, state), update);
 		let currentListeners = listeners;
-		for (let i=0; i<currentListeners.length; i++) currentListeners[i](state, action);
+		for (let i=0; i<currentListeners.length; i++) currentListeners[i](state, action, update);
 	}
 
 	/**

From c90747d1d97b83a98e38dc02041b8d3f03181af7 Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Sun, 1 Dec 2019 17:14:56 +0100
Subject: [PATCH 05/18] Pass update object to devtools on action

---
 devtools.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/devtools.js b/devtools.js
index 28fec49..325886e 100644
--- a/devtools.js
+++ b/devtools.js
@@ -18,11 +18,11 @@ module.exports = function unistoreDevTools(store) {
 			}
 		});
 		store.devtools.init(store.getState());
-		store.subscribe(function (state, action) {
+		store.subscribe(function (state, action, update) {
 			var actionName = action && (action.name || action.type) || 'setState';
 
 			if (!ignoreState) {
-				store.devtools.send(actionName, state);
+				store.devtools.send({ type: actionName, update: update }, state);
 			} else {
 				ignoreState = false;
 			}

From 9f22c9cca5872c89153fd17c4f64de061ea265dc Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Sun, 1 Dec 2019 17:16:05 +0100
Subject: [PATCH 06/18] Differentiate between unnamed actions and direct
 setState calls in devtools

---
 devtools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools.js b/devtools.js
index 325886e..79a6a7c 100644
--- a/devtools.js
+++ b/devtools.js
@@ -19,7 +19,7 @@ module.exports = function unistoreDevTools(store) {
 		});
 		store.devtools.init(store.getState());
 		store.subscribe(function (state, action, update) {
-			var actionName = action && (action.name || action.type) || 'setState';
+			var actionName = action ? action.name || action.type || 'Unnamed' : 'setState';
 
 			if (!ignoreState) {
 				store.devtools.send({ type: actionName, update: update }, state);

From 3b1e5b9ff06e673020d596c899754586c5057890 Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Sun, 1 Dec 2019 19:37:38 +0100
Subject: [PATCH 07/18] Update tests to handle update argument in listeners

---
 test/unistore.test.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/unistore.test.js b/test/unistore.test.js
index 7bc3a40..35214f0 100644
--- a/test/unistore.test.js
+++ b/test/unistore.test.js
@@ -36,15 +36,17 @@ describe('createStore()', () => {
 		let rval = store.subscribe(sub1);
 		expect(rval).toBeInstanceOf(Function);
 
-		store.setState({ a: 'b' });
-		expect(sub1).toBeCalledWith(store.getState(), action);
+		let update1 = { a: 'b' };
+		store.setState(update1);
+		expect(sub1).toBeCalledWith(store.getState(), action, update1);
 
 		store.subscribe(sub2);
-		store.setState({ c: 'd' });
+		let update2 = { c: 'd' };
+		store.setState(update2);
 
 		expect(sub1).toHaveBeenCalledTimes(2);
-		expect(sub1).toHaveBeenLastCalledWith(store.getState(), action);
-		expect(sub2).toBeCalledWith(store.getState(), action);
+		expect(sub1).toHaveBeenLastCalledWith(store.getState(), action, update2);
+		expect(sub2).toBeCalledWith(store.getState(), action, update2);
 	});
 
 	it('should unsubscribe', () => {

From e856053acabdb4a6c59276f975798f9256e0e1fd Mon Sep 17 00:00:00 2001
From: Linus Miller <lohfu@lohfu.io>
Date: Mon, 2 Dec 2019 18:45:59 +0100
Subject: [PATCH 08/18] Prefer action.type over action.name

---
 devtools.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools.js b/devtools.js
index 79a6a7c..6ba13f8 100644
--- a/devtools.js
+++ b/devtools.js
@@ -19,7 +19,7 @@ module.exports = function unistoreDevTools(store) {
 		});
 		store.devtools.init(store.getState());
 		store.subscribe(function (state, action, update) {
-			var actionName = action ? action.name || action.type || 'Unnamed' : 'setState';
+			var actionName = action ? action.type || action.name || 'Unnamed' : 'setState';
 
 			if (!ignoreState) {
 				store.devtools.send({ type: actionName, update: update }, state);

From 91ad7198c0524df2ae2460d43c538742081b2c84 Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Sun, 5 Apr 2020 17:39:04 +0200
Subject: [PATCH 09/18] Pass store.getState and store.action to action
 functions

---
 src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.js b/src/index.js
index 44b9290..cb718ea 100644
--- a/src/index.js
+++ b/src/index.js
@@ -52,7 +52,7 @@ export default function createStore(state) {
 			function apply(result) {
 				setState(result, false, action);
 			}
-			let ret = (action.action || action)(state, this);
+			let ret = (action.action || action)(this.getState, this.action);
 			if (ret != null) {
 				if (ret.then) return ret.then(apply);
 				return apply(ret);

From 203dc79ef32bcf83ab7e649cadbad9c49da974c6 Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Sun, 5 Apr 2020 17:46:56 +0200
Subject: [PATCH 10/18] Split Action type into separate AsyncAction and
 SyncAction

---
 index.d.ts | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 3dee759..33ce986 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -5,12 +5,26 @@
 
 export type Listener<K> = (state: K, action?: Action<K>, update?: Partial<K>) => void;
 export type Unsubscribe = () => void;
-export type ActionFn<K> = (state: K, store: Store<K>) => Promise<Partial<K>> | Partial<K> | void;
-export interface ActionObject<K> {
+
+export type AsyncActionFn<K> = (getState: () => K, action: (action: Action<K>) => Promise<void> | void) => Promise<Partial<K> | void>;
+export type SyncActionFn<K> = (getState: () => K, action: (action: Action<K>) => Promise<void> | void) => Partial<K> | void;
+export type ActionFn<K> = AsyncActionFn<K> | SyncActionFn<K>;
+
+export type AsyncActionObject<K> = {
+  type: string;
+  action: AsyncActionFn<K>;
+}
+export type SyncActionObject<K> = {
   type: string;
-  action: ActionFn<K>;
+  action: SyncActionFn<K>;
 }
-export type Action<K> = ActionObject<K> | ActionFn<K>
+export type ActionObject<K> = AsyncActionObject<K> | SyncActionObject<K>;
+
+export type Action<K> = ActionObject<K> | ActionFn<K>;
+
+export type AsyncActionCreator<K> = (...args: any[]) => AsyncActionFn<K> | AsyncActionObject<K>;
+export type SyncActionCreator<K> = (...args: any[]) => SyncActionFn<K> | SyncActionObject<K>;
+export type ActionCreator<K> = AsyncActionCreator<K> | SyncActionCreator<K>;
 
 export interface Store<K> {
 	action(action: Action<K>): Promise<void> | void;
@@ -26,6 +40,4 @@ export interface ActionMap<K> {
 	[actionName: string]: ActionCreator<K>;
 }
 
-export type ActionCreator<K> = (...args: any[]) => Action<K>;
-
 export type StateMapper<T, K, I> = (state: K, props: T) => I;

From a682ffd2a9ab46b6ae1129b9ae3a77b92390b57c Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Sun, 5 Apr 2020 17:57:57 +0200
Subject: [PATCH 11/18] Update Action and MappedAction object types

---
 index.d.ts  | 13 +++++++++----
 preact.d.ts |  8 ++++----
 react.d.ts  |  9 +++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/index.d.ts b/index.d.ts
index 33ce986..faf27ba 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -26,6 +26,15 @@ export type AsyncActionCreator<K> = (...args: any[]) => AsyncActionFn<K> | Async
 export type SyncActionCreator<K> = (...args: any[]) => SyncActionFn<K> | SyncActionObject<K>;
 export type ActionCreator<K> = AsyncActionCreator<K> | SyncActionCreator<K>;
 
+export type ActionCreatorsObject<K> = {
+  [actionCreator: string]: ActionCreator<K>
+}
+
+export type MappedActionCreators<A> = {
+  [P in keyof A]: A[P] extends AsyncActionCreator<any> ? (...args: any[]) => Promise<void> : (...args: any[]) => void
+}
+
+
 export interface Store<K> {
 	action(action: Action<K>): Promise<void> | void;
 	setState<U extends keyof K>(update: Pick<K, U>, overwrite?: boolean, action?: Action<K>): void;
@@ -36,8 +45,4 @@ export interface Store<K> {
 
 export default function createStore<K>(state?: K): Store<K>;
 
-export interface ActionMap<K> {
-	[actionName: string]: ActionCreator<K>;
-}
-
 export type StateMapper<T, K, I> = (state: K, props: T) => I;
diff --git a/preact.d.ts b/preact.d.ts
index 6fc65f0..5c2d03c 100644
--- a/preact.d.ts
+++ b/preact.d.ts
@@ -5,13 +5,13 @@
 
 declare module 'unistore/preact' {
 	import * as Preact from 'preact';
-	import { ActionCreator, StateMapper, Store } from 'unistore';
+	import { StateMapper, Store, ActionCreatorsObject, MappedActionCreators  } from 'unistore';
 
-	export function connect<T, S, K, I>(
+	export function connect<T, S, K, I, A extends ActionCreatorsObject<K>>(
 		mapStateToProps: string | Array<string> | StateMapper<T, K, I>,
-		actions?: ActionCreator<K> | object
+		actions?: A,
 	): (
-		Child: Preact.ComponentConstructor<T & I, S> | Preact.AnyComponent<T & I, S>
+		Child: Preact.ComponentConstructor<T & I & MappedActionCreators<A>, S> | Preact.AnyComponent<T & I & MappedActionCreators<A>, S>
 	) => Preact.ComponentConstructor<T | T & I, S>;
 
 	export interface ProviderProps<T> {
diff --git a/react.d.ts b/react.d.ts
index 1c95355..2449fe5 100644
--- a/react.d.ts
+++ b/react.d.ts
@@ -2,16 +2,17 @@
 // S - Wrapped component state
 // K - Store state
 // I - Injected props to wrapped component
+// A - actions
 
 declare module 'unistore/react' {
 	import * as React from 'react';
-	import { ActionCreator, StateMapper, Store } from 'unistore';
+	import { StateMapper, Store, ActionCreatorsObject, MappedActionCreators  } from 'unistore';
 
-	export function connect<T, S, K, I>(
+	export function connect<T, S, K, I, A extends ActionCreatorsObject<K>>(
 		mapStateToProps: string | Array<string> | StateMapper<T, K, I>,
-		actions?: ActionCreator<K> | object
+		actions?: A,
 	): (
-		Child: ((props: T & I) => React.ReactNode) | React.ComponentClass<T & I, S> | React.FC<T & I>
+		Child: ((props: T & I & MappedActionCreators<A>) => React.ReactNode) | React.ComponentClass<T & I & MappedActionCreators<A>, S> | React.FC<T & I & MappedActionCreators<A>>
 	) => React.ComponentClass<T | T & I, S> | React.FC<T | T & I>;
 
 	export interface ProviderProps<T> {

From 49c4f8785be28e2f58199cc61440caeef420eba8 Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Sun, 5 Apr 2020 19:56:19 +0200
Subject: [PATCH 12/18] Allow null mapStateToProps

---
 preact.d.ts | 2 +-
 react.d.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/preact.d.ts b/preact.d.ts
index 5c2d03c..fac8225 100644
--- a/preact.d.ts
+++ b/preact.d.ts
@@ -8,7 +8,7 @@ declare module 'unistore/preact' {
 	import { StateMapper, Store, ActionCreatorsObject, MappedActionCreators  } from 'unistore';
 
 	export function connect<T, S, K, I, A extends ActionCreatorsObject<K>>(
-		mapStateToProps: string | Array<string> | StateMapper<T, K, I>,
+		mapStateToProps: string | Array<string> | StateMapper<T, K, I> | null,
 		actions?: A,
 	): (
 		Child: Preact.ComponentConstructor<T & I & MappedActionCreators<A>, S> | Preact.AnyComponent<T & I & MappedActionCreators<A>, S>
diff --git a/react.d.ts b/react.d.ts
index 2449fe5..1c01818 100644
--- a/react.d.ts
+++ b/react.d.ts
@@ -9,7 +9,7 @@ declare module 'unistore/react' {
 	import { StateMapper, Store, ActionCreatorsObject, MappedActionCreators  } from 'unistore';
 
 	export function connect<T, S, K, I, A extends ActionCreatorsObject<K>>(
-		mapStateToProps: string | Array<string> | StateMapper<T, K, I>,
+		mapStateToProps: string | Array<string> | StateMapper<T, K, I> | null,
 		actions?: A,
 	): (
 		Child: ((props: T & I & MappedActionCreators<A>) => React.ReactNode) | React.ComponentClass<T & I & MappedActionCreators<A>, S> | React.FC<T & I & MappedActionCreators<A>>

From 4dc3fde41558ddba0f1491eb87deac9476196cb2 Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Sun, 5 Apr 2020 19:58:27 +0200
Subject: [PATCH 13/18] Use correct type letter for store state

---
 preact.d.ts | 8 ++++----
 react.d.ts  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/preact.d.ts b/preact.d.ts
index fac8225..cf3bd5b 100644
--- a/preact.d.ts
+++ b/preact.d.ts
@@ -14,11 +14,11 @@ declare module 'unistore/preact' {
 		Child: Preact.ComponentConstructor<T & I & MappedActionCreators<A>, S> | Preact.AnyComponent<T & I & MappedActionCreators<A>, S>
 	) => Preact.ComponentConstructor<T | T & I, S>;
 
-	export interface ProviderProps<T> {
-		store: Store<T>;
+	export interface ProviderProps<K> {
+		store: Store<K>;
 	}
 
-	export class Provider<T> extends Preact.Component<ProviderProps<T>> {
-		render(props: ProviderProps<T>): Preact.JSX.Element;
+	export class Provider<K> extends Preact.Component<ProviderProps<K>> {
+		render(props: ProviderProps<K>): Preact.JSX.Element;
 	}
 }
diff --git a/react.d.ts b/react.d.ts
index 1c01818..41137f2 100644
--- a/react.d.ts
+++ b/react.d.ts
@@ -15,11 +15,11 @@ declare module 'unistore/react' {
 		Child: ((props: T & I & MappedActionCreators<A>) => React.ReactNode) | React.ComponentClass<T & I & MappedActionCreators<A>, S> | React.FC<T & I & MappedActionCreators<A>>
 	) => React.ComponentClass<T | T & I, S> | React.FC<T | T & I>;
 
-	export interface ProviderProps<T> {
-		store: Store<T>;
+	export interface ProviderProps<K> {
+		store: Store<K>;
 	}
 
-	export class Provider<T> extends React.Component<ProviderProps<T>, {}> {
+	export class Provider<K> extends React.Component<ProviderProps<K>, {}> {
 		render(): React.ReactNode;
 	}
 

From c24628295486deebc575c3ea97764efc503bfd45 Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Mon, 6 Apr 2020 18:15:19 +0200
Subject: [PATCH 14/18] Rename store.action to store.dispatch

---
 README.md    | 2 +-
 index.d.ts   | 2 +-
 src/index.js | 4 ++--
 src/util.js  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f307157..35a8aed 100644
--- a/README.md
+++ b/README.md
@@ -207,7 +207,7 @@ Returns **[store](#store)**
 
 An observable state container, returned from [createStore](#createstore)
 
-##### action
+##### dispatch
 
 Create a bound copy of the given action function.
 The bound returned function invokes action() and persists the result back to the store.
diff --git a/index.d.ts b/index.d.ts
index faf27ba..a81ede6 100644
--- a/index.d.ts
+++ b/index.d.ts
@@ -36,7 +36,7 @@ export type MappedActionCreators<A> = {
 
 
 export interface Store<K> {
-	action(action: Action<K>): Promise<void> | void;
+	dispatch(action: Action<K>): Promise<void> | void;
 	setState<U extends keyof K>(update: Pick<K, U>, overwrite?: boolean, action?: Action<K>): void;
 	subscribe(f: Listener<K>): Unsubscribe;
 	unsubscribe(f: Listener<K>): void;
diff --git a/src/index.js b/src/index.js
index cb718ea..71fd2eb 100644
--- a/src/index.js
+++ b/src/index.js
@@ -48,11 +48,11 @@ export default function createStore(state) {
 		 * @param {Function} action	An action of the form `action(state, ...args) -> stateUpdate`
 		 * @returns {Function} boundAction()
 		 */
-		action(action) {
+		dispatch(action) {
 			function apply(result) {
 				setState(result, false, action);
 			}
-			let ret = (action.action || action)(this.getState, this.action);
+			let ret = (action.action || action)(this.getState, this.dispatch);
 			if (ret != null) {
 				if (ret.then) return ret.then(apply);
 				return apply(ret);
diff --git a/src/util.js b/src/util.js
index 69593d7..3ab9535 100644
--- a/src/util.js
+++ b/src/util.js
@@ -3,7 +3,7 @@ export function mapActions(actions, store) {
 	let mapped = {};
 	for (let i in actions) {
 		mapped[i] = function () {
-			return store.action(actions[i].apply(actions, arguments));
+			return store.dispatch(actions[i].apply(actions, arguments));
 		};
 	}
 	return mapped;

From f38838996bb7da4af53937dd3f2b5043bb34c129 Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Mon, 6 Apr 2020 18:18:10 +0200
Subject: [PATCH 15/18] Move out dispatch and getState to fix this reference
 errors

---
 src/index.js | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/index.js b/src/index.js
index 71fd2eb..f6976b4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -28,6 +28,21 @@ export default function createStore(state) {
 		listeners = out;
 	}
 
+	function dispatch(action) {
+		function apply(result) {
+			setState(result, false, action);
+		}
+		let ret = (action.action || action)(getState, dispatch);
+		if (ret != null) {
+			if (ret.then) return ret.then(apply);
+			return apply(ret);
+		}
+	}
+
+	function getState() {
+		return state;
+	}
+
 	function setState(update, overwrite, action) {
 		state = overwrite ? update : assign(assign({}, state), update);
 		let currentListeners = listeners;
@@ -48,16 +63,7 @@ export default function createStore(state) {
 		 * @param {Function} action	An action of the form `action(state, ...args) -> stateUpdate`
 		 * @returns {Function} boundAction()
 		 */
-		dispatch(action) {
-			function apply(result) {
-				setState(result, false, action);
-			}
-			let ret = (action.action || action)(this.getState, this.dispatch);
-			if (ret != null) {
-				if (ret.then) return ret.then(apply);
-				return apply(ret);
-			}
-		},
+		dispatch,
 
 		/**
 		 * Apply a partial state object to the current state, invoking registered listeners.
@@ -87,8 +93,6 @@ export default function createStore(state) {
 		 * Retrieve the current state object.
 		 * @returns {Object} state
 		 */
-		getState() {
-			return state;
-		}
+		getState
 	};
 }

From f53452e7446e1a0de641775acd680c852fd0c2fb Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Mon, 6 Apr 2020 18:23:20 +0200
Subject: [PATCH 16/18] Update tests to pass new logic

---
 test/preact/builds.test.js | 4 ++--
 test/react/builds.test.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/preact/builds.test.js b/test/preact/builds.test.js
index f2de43d..fecc282 100644
--- a/test/preact/builds.test.js
+++ b/test/preact/builds.test.js
@@ -28,8 +28,8 @@ describe('build: default', () => {
 		it('should render', done => {
 			const { Provider, connect } = preact;
 			const actions = {
-				incrementTwice: () => (state, { getState, setState }) => {
-					setState({ count: state.count + 1 });
+				incrementTwice: () => (getState, dispatch) => {
+					dispatch(() => ({ count: getState().count + 1 }));
 					return new Promise(r =>
 						setTimeout(() => {
 							r({ count: getState().count + 1 });
diff --git a/test/react/builds.test.js b/test/react/builds.test.js
index 27b9a34..1a2e7ae 100644
--- a/test/react/builds.test.js
+++ b/test/react/builds.test.js
@@ -34,8 +34,8 @@ describe('build: default', () => {
 		it('should render', done => {
 			const { Provider, connect } = react;
 			const actions = {
-				incrementTwice: () => (state, { getState, setState }) => {
-					setState({ count: state.count + 1 });
+				incrementTwice: () => (getState, dispatch) => {
+          dispatch(() => ({ count: getState().count + 1 }))
 					return new Promise(r =>
 						setTimeout(() => {
 							r({ count: getState().count + 1 });

From 4361a8319f3e7ac2eb71b3a92e529bf4148d40ae Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Tue, 7 Apr 2020 15:36:22 +0200
Subject: [PATCH 17/18] Print state properties that have changed in unnamed
 actions and setState

---
 devtools.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/devtools.js b/devtools.js
index 6ba13f8..a182a05 100644
--- a/devtools.js
+++ b/devtools.js
@@ -19,7 +19,11 @@ module.exports = function unistoreDevTools(store) {
 		});
 		store.devtools.init(store.getState());
 		store.subscribe(function (state, action, update) {
-			var actionName = action ? action.type || action.name || 'Unnamed' : 'setState';
+			var actionName = action
+				? action.type ||
+				  action.name ||
+				  'N/A (' + (Object.keys(update).join(', ') || 'none') + ')'
+				: 'setState (' + (Object.keys(update).join(', ') || 'none') + ')';
 
 			if (!ignoreState) {
 				store.devtools.send({ type: actionName, update: update }, state);

From ac1f2caab584068d6cd0aebf4118dcdb1a033a70 Mon Sep 17 00:00:00 2001
From: Linus Miller <linus.miller@bitmill.io>
Date: Thu, 16 Apr 2020 18:21:55 +0200
Subject: [PATCH 18/18] Set update to empty object if not supplied

---
 devtools.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devtools.js b/devtools.js
index a182a05..e39e54d 100644
--- a/devtools.js
+++ b/devtools.js
@@ -19,6 +19,7 @@ module.exports = function unistoreDevTools(store) {
 		});
 		store.devtools.init(store.getState());
 		store.subscribe(function (state, action, update) {
+			update = update || {};
 			var actionName = action
 				? action.type ||
 				  action.name ||