define-zustand 0.1.0 → 1.0.1

package/dist/index.d.ts

@@ -8,16 +8,16 @@ export interface insideActionsType<S> {
 }
 export type actionsType<S, OptionAction, InsideActions = unknown> = (getState: () => S, actions: insideActionsType<S> & InsideActions, store: StoreApi<S>) => OptionAction;
 export type defGetterStateType<S> = Record<string, (state: S) => any>;
+export type ExtraGetterState<S, G extends defGetterStateType<S>> = {
+    [key in keyof G]: ReturnType<G[key]>;
+};
 export interface optionsType<S, G, OptionAction> {
     state: () => S;
     getter: G;
     actions: actionsType<S, OptionAction>;
 }
-export type ExtraGetterStateType<S, G extends defGetterStateType<S>> = {
-    [key in keyof G]: ReturnType<G[key]>;
-};
-export default function defineZustand<S extends Record<string, any>, G extends defGetterStateType<S>, OptionActions extends Record<string, any>>(options: optionsType<S, G, OptionActions>): import("zustand").UseBoundStore<ZStoreApi<Omit<S & ExtraGetterStateType<S, G>, "reset" | "setState" | "subscribe" | keyof OptionActions> & {
+export declare function define<S extends Record<string, any>, G extends defGetterStateType<S>, OptionActions extends Record<string, any>>(options: optionsType<S, G, OptionActions>): import("zustand").UseBoundStore<ZStoreApi<Omit<S & ExtraGetterState<S, G>, "reset" | "setState" | "subscribe" | keyof OptionActions> & {
     reset: () => void;
     setState: (updater: Partial<S> | ((state: S) => void), replace?: boolean) => void;
-    subscribe: (listener: (state: S & ExtraGetterStateType<S, G>, prevState: S & ExtraGetterStateType<S, G>) => void) => () => void;
+    subscribe: (listener: (state: S & ExtraGetterState<S, G>, prevState: S & ExtraGetterState<S, G>) => void) => () => void;
 } & OptionActions>>;

package/dist/index.js

@@ -1,9 +1,9 @@
 import { create } from 'zustand';
 import { combine } from 'zustand/middleware';
 import { produce } from 'immer';
-import { forEach, isEqual, size } from 'lodash-es';
+import { keys, isEqualWith, omit, some, forEach } from 'lodash-es';
 
-function defineZustand(options) {
+function define(options) {
   function createDefState() {
     const state = options.state();
     forEach(options.getter, (getter, k) => {
@@ -15,17 +15,13 @@ function defineZustand(options) {
     // getterListener
     // ----------------------------------------------------------------------
     store.subscribe((state, prevState) => {
-      let equalledLen = 0;
-      const newGetterState = {};
-      forEach(options.getter, (getter, k) => {
-        const value = getter(state);
-        if (isEqual(value, prevState[k])) {
-          equalledLen += 1;
-        } else {
+      const getterKeys = keys(options.getter);
+      const isUpdate = isEqualWith(omit(state, getterKeys), omit(prevState, getterKeys), (current, prev) => some(current, (v, k) => v !== prev[k]));
+      if (isUpdate) {
+        const newGetterState = {};
+        forEach(options.getter, (getter, k) => {
           newGetterState[k] = getter(state);
-        }
-      });
-      if (size(options.getter) > equalledLen) {
+        });
         set(newGetterState);
       }
     });
@@ -50,4 +46,4 @@ function defineZustand(options) {
   }));
 }
 
-export { defineZustand as default };
+export { define };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "define-zustand",
-  "version": "0.1.0",
+  "version": "1.0.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",