reactish-state 0.5.1 → 0.5.3

package/dist/cjs/index.js

@@ -29,6 +29,13 @@ 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 +43,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) {
@@ -56,8 +71,7 @@ var selector = function selector() {
 };
 
 var useSnapshot = function useSnapshot(state) {
-  var value = shim.useSyncExternalStore(state.subscribe, state.get, state.get);
-  return value;
+  return shim.useSyncExternalStore(state.subscribe, state.get, state.get);
 };
 
 exports.selector = selector;

package/dist/es/index.js

@@ -1,2 +1,3 @@
-export { selector, state } from './vanilla.js';
-export { useSnapshot } from './react.js';
+export { state } from './vanilla/state.js';
+export { selector } from './vanilla/selector.js';
+export { useSnapshot } from './react/useSnapshot.js';

package/dist/es/{react.js → react/useSnapshot.js}

@@ -1,8 +1,7 @@
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 var useSnapshot = function useSnapshot(state) {
-  var value = useSyncExternalStore(state.subscribe, state.get, state.get);
-  return value;
+  return useSyncExternalStore(state.subscribe, state.get, state.get);
 };
 
 export { useSnapshot };

package/dist/es/vanilla/selector.js

@@ -0,0 +1,41 @@
+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];
+  }
+  var lastIndex = items.length - 1;
+  var selectorFunc = items[lastIndex];
+  items.length = lastIndex;
+  var cache;
+  return {
+    get: function get() {
+      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) {
+        return item.subscribe(listener);
+      });
+      return function () {
+        return unsubscribers.forEach(function (unsubscribe) {
+          return unsubscribe();
+        });
+      };
+    }
+  };
+};
+
+export { selector };

package/dist/es/vanilla/state.js

@@ -0,0 +1,29 @@
+var state = function state(initialValue, actionCreator) {
+  var value = initialValue;
+  var listeners = new Set();
+  function get() {
+    return value;
+  }
+  function set(newValue) {
+    var nextValue = typeof newValue === 'function' ? newValue(value) : newValue;
+    if (!Object.is(value, nextValue)) {
+      value = nextValue;
+      listeners.forEach(function (listener) {
+        listener();
+      });
+    }
+  }
+  return {
+    get: get,
+    set: set,
+    subscribe: function subscribe(listener) {
+      listeners.add(listener);
+      return function () {
+        listeners["delete"](listener);
+      };
+    },
+    actions: actionCreator && actionCreator(set, get)
+  };
+};
+
+export { state };

package/package.json

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

package/types/index.d.ts

@@ -1,2 +1,3 @@
-export { state, selector } from './vanilla';
-export { useSnapshot } from './react';
+export { state } from './vanilla/state';
+export { selector } from './vanilla/selector';
+export { useSnapshot } from './react/useSnapshot';

package/types/{react.d.ts → react/useSnapshot.d.ts}

@@ -1,3 +1,3 @@
-import { Reactish } from './vanilla';
+import type { Reactish } from '../vanilla/common';
 declare const useSnapshot: <T>(state: Reactish<T>) => T;
 export { useSnapshot };

package/types/vanilla/common.d.ts

@@ -0,0 +1,5 @@
+export declare type Listener = () => void;
+export interface Reactish<T> {
+    get: () => T;
+    subscribe: (listener: Listener) => () => void;
+}

package/types/vanilla/selector.d.ts

@@ -0,0 +1,11 @@
+import type { Reactish, Listener } from './common';
+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, T> = (...args: ReactishValueArray<R>) => T;
+declare const selector: <R extends ReactishArray, T>(...items: [...R, SelectorFunc<R, T>]) => {
+    get: () => T;
+    subscribe: (listener: Listener) => () => void;
+};
+export { selector };

package/types/vanilla/state.d.ts

@@ -0,0 +1,9 @@
+import type { Reactish } from './common';
+declare type Setter<T> = (newValue: T | ((value: T) => T)) => void;
+declare type ActionCreator<T, A> = ((set: Setter<T>, get: () => T) => A) | undefined;
+interface State<T, A = unknown, C extends ActionCreator<T, A> = undefined> extends Reactish<T> {
+    set: Setter<T>;
+    actions: C extends undefined ? never : A;
+}
+declare const state: <T, A>(initialValue: T, actionCreator?: ActionCreator<T, A>) => State<T, A, ActionCreator<T, A>>;
+export { state };

package/dist/es/vanilla.js

@@ -1,54 +0,0 @@
-var state = function state(initialValue, actionCreator) {
-  var value = initialValue;
-  var listeners = new Set();
-  function get() {
-    return value;
-  }
-  function set(newValue) {
-    var nextValue = typeof newValue === 'function' ? newValue(value) : newValue;
-    if (!Object.is(value, nextValue)) {
-      value = nextValue;
-      listeners.forEach(function (listener) {
-        listener();
-      });
-    }
-  }
-  return {
-    get: get,
-    set: set,
-    subscribe: function subscribe(listener) {
-      listeners.add(listener);
-      return function () {
-        listeners["delete"](listener);
-      };
-    },
-    actions: actionCreator && actionCreator(set, get)
-  };
-};
-var selector = function selector() {
-  for (var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++) {
-    items[_key] = arguments[_key];
-  }
-  var lastIndex = items.length - 1;
-  var selectorFunc = items[lastIndex];
-  items.length = lastIndex;
-  return {
-    get: function get() {
-      return selectorFunc.apply(void 0, items.map(function (item) {
-        return item.get();
-      }));
-    },
-    subscribe: function subscribe(listener) {
-      var unsubscribers = items.map(function (item) {
-        return item.subscribe(listener);
-      });
-      return function () {
-        return unsubscribers.forEach(function (unsubscribe) {
-          return unsubscribe();
-        });
-      };
-    }
-  };
-};
-
-export { selector, state };

package/types/vanilla.d.ts

@@ -1,22 +0,0 @@
-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) | undefined;
-interface Reactish<T> {
-    get: () => T;
-    subscribe: (listener: Listener) => () => void;
-}
-interface State<T, A = unknown, C extends ActionCreator<T, A> = undefined> extends Reactish<T> {
-    set: Setter<T>;
-    actions: C extends undefined ? never : 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, 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 };