reactish-state 0.5.0 → 0.5.2

package/dist/cjs/index.js

@@ -29,6 +29,12 @@ var state = function state(initialValue, actionCreator) {
     actions: actionCreator && actionCreator(set, get)
   };
 };
+var isEqual = function isEqual(args1, args2) {
+  for (var i = 0; i < args1.length; i++) {
+    if (!Object.is(args1[i], args2[i])) return false;
+  }
+  return true;
+};
 var selector = function selector() {
   for (var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++) {
     items[_key] = arguments[_key];
@@ -36,11 +42,19 @@ var selector = function selector() {
   var lastIndex = items.length - 1;
   var selectorFunc = items[lastIndex];
   items.length = lastIndex;
+  var cache;
   return {
     get: function get() {
-      return selectorFunc.apply(void 0, items.map(function (item) {
+      var args = items.map(function (item) {
         return item.get();
-      }));
+      });
+      if (cache && isEqual(args, cache.args)) return cache.ret;
+      var ret = selectorFunc.apply(void 0, args);
+      cache = {
+        args: args,
+        ret: ret
+      };
+      return ret;
     },
     subscribe: function subscribe(listener) {
       var unsubscribers = items.map(function (item) {

package/dist/es/vanilla.js

@@ -25,6 +25,12 @@ var state = function state(initialValue, actionCreator) {
     actions: actionCreator && actionCreator(set, get)
   };
 };
+var isEqual = function isEqual(args1, args2) {
+  for (var i = 0; i < args1.length; i++) {
+    if (!Object.is(args1[i], args2[i])) return false;
+  }
+  return true;
+};
 var selector = function selector() {
   for (var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++) {
     items[_key] = arguments[_key];
@@ -32,11 +38,19 @@ var selector = function selector() {
   var lastIndex = items.length - 1;
   var selectorFunc = items[lastIndex];
   items.length = lastIndex;
+  var cache;
   return {
     get: function get() {
-      return selectorFunc.apply(void 0, items.map(function (item) {
+      var args = items.map(function (item) {
         return item.get();
-      }));
+      });
+      if (cache && isEqual(args, cache.args)) return cache.ret;
+      var ret = selectorFunc.apply(void 0, args);
+      cache = {
+        args: args,
+        ret: ret
+      };
+      return ret;
     },
     subscribe: function subscribe(listener) {
       var unsubscribers = items.map(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactish-state",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "",
   "author": "Zheng Song",
   "license": "MIT",

package/types/vanilla.d.ts

@@ -1,22 +1,22 @@
 declare type Listener = () => void;
 declare type Setter<T> = (newValue: T | ((value: T) => T)) => void;
-declare type ActionCreator<T, A> = (set: Setter<T>, get: () => T) => A;
+declare type ActionCreator<T, A> = ((set: Setter<T>, get: () => T) => A) | undefined;
 interface Reactish<T> {
     get: () => T;
     subscribe: (listener: Listener) => () => void;
 }
-interface State<T, A = unknown> extends Reactish<T> {
+interface State<T, A = unknown, C extends ActionCreator<T, A> = undefined> extends Reactish<T> {
     set: Setter<T>;
-    actions?: A;
+    actions: C extends undefined ? never : A;
 }
-declare const state: <T, A>(initialValue: T, actionCreator?: ActionCreator<T, A>) => State<T, A>;
+declare const state: <T, A>(initialValue: T, actionCreator?: ActionCreator<T, A>) => State<T, A, ActionCreator<T, A>>;
 declare type ReactishArray = Reactish<unknown>[];
 declare type ReactishValueArray<R extends ReactishArray> = {
     [index in keyof R]: ReturnType<R[index]['get']>;
 };
-declare type SelectorFunc<R extends ReactishArray, V> = (...args: ReactishValueArray<R>) => V;
-declare const selector: <R extends ReactishArray, V>(...items: [...R, SelectorFunc<R, V>]) => {
-    get: () => V;
+declare type SelectorFunc<R extends ReactishArray, T> = (...args: ReactishValueArray<R>) => T;
+declare const selector: <R extends ReactishArray, T>(...items: [...R, SelectorFunc<R, T>]) => {
+    get: () => T;
     subscribe: (listener: Listener) => () => void;
 };
 export { Reactish, state, selector };