coaction 0.1.4 → 0.1.5

package/README.md

@@ -19,7 +19,7 @@ npm install coaction
 ```jsx
 import { create } from 'coaction';
 
-const useStore = create((set, get) => ({
+const useStore = create((set) => ({
   count: 0,
   increment: () => set((state) => state.count++)
 }));

package/dist/coaction.cjs.js

@@ -100,19 +100,25 @@ const handleDraft = (store, internal) => {
   }
 };
 
-const getInitialState = (store, createState) => {
+const getInitialState = (store, createState, internal) => {
   const makeState = fn => {
     // make sure createState is a function
     if (process.env.NODE_ENV !== 'production' && typeof fn !== 'function') {
       throw new Error('createState should be a function');
     }
     let state = fn(store.setState, store.getState, store);
-    if (typeof state === 'function') {
+    // support 3rd party library store like zustand, redux
+    if (state.getState) {
+      state = state.getState();
+      // support 3rd party library store like pinia
+    } else if (typeof state === 'function') {
       state = state();
     }
+    // support bind store like mobx
     if (state[bindSymbol]) {
       const rawState = state[bindSymbol].bind(state);
-      state[bindSymbol].handleStore(store, rawState, state);
+      state[bindSymbol].handleStore(store, rawState, state, internal);
+      delete state[bindSymbol];
       return rawState;
     }
     return state;
@@ -198,7 +204,7 @@ const createSelectorWithArray = createSelectorCreatorWithArray();
 const getRawState = (store, internal, initialState, options) => {
   const rawState = {};
   const handle = (_rawState, _initialState, sliceKey) => {
-    internal.mutableInstance = store.toRaw?.(_initialState);
+    internal.mutableInstance = internal.toMutableRaw?.(_initialState);
     const descriptors = Object.getOwnPropertyDescriptors(_initialState);
     Object.entries(descriptors).forEach(([key, descriptor]) => {
       if (Object.prototype.hasOwnProperty.call(descriptor, 'value')) {
@@ -345,8 +351,8 @@ const getRawState = (store, internal, initialState, options) => {
               done?.(result);
               return result;
             }
-            if (internal.mutableInstance && store.act) {
-              const result = store.act(() => {
+            if (internal.mutableInstance && internal.actMutable) {
+              const result = internal.actMutable(() => {
                 return fn.apply(sliceKey ? store.getState()[sliceKey] : store.getState(), args);
               });
               done?.(result);
@@ -392,8 +398,8 @@ const handleState = (store, internal, options) => {
     const enablePatches = store.transport ?? options.enablePatches;
     if (!enablePatches) {
       if (internal.mutableInstance) {
-        if (store.act) {
-          store.act(() => {
+        if (internal.actMutable) {
+          internal.actMutable(() => {
             fn.apply(null);
           });
           return [];
@@ -413,7 +419,11 @@ const handleState = (store, internal, options) => {
         internal.rootState = internal.backupState;
         throw error;
       }
-      internal.listeners.forEach(listener => listener());
+      if (internal.updateImmutable) {
+        internal.updateImmutable(internal.rootState);
+      } else {
+        internal.listeners.forEach(listener => listener());
+      }
       return [];
     }
     internal.backupState = internal.rootState;
@@ -441,7 +451,11 @@ const handleState = (store, internal, options) => {
     if (finalPatches.patches.length) {
       store.apply(internal.rootState, finalPatches.patches);
       if (!internal.mutableInstance) {
-        internal.listeners.forEach(listener => listener());
+        if (internal.updateImmutable) {
+          internal.updateImmutable(internal.rootState);
+        } else {
+          internal.listeners.forEach(listener => listener());
+        }
       }
     }
     return [internal.rootState, patches, inversePatches];
@@ -593,7 +607,11 @@ const create = (createState, options = {}) => {
     };
     const apply = (state = internal.rootState, patches) => {
       internal.rootState = patches ? mutative.apply(state, patches) : state;
-      internal.listeners.forEach(listener => listener());
+      if (internal.updateImmutable) {
+        internal.updateImmutable(internal.rootState);
+      } else {
+        internal.listeners.forEach(listener => listener());
+      }
     };
     const getPureState = () => internal.rootState;
     const isSliceStore = typeof createState === 'object';
@@ -609,7 +627,7 @@ const create = (createState, options = {}) => {
       getPureState
     });
     applyMiddlewares(store, options.middlewares ?? []);
-    const initialState = getInitialState(store, createState);
+    const initialState = getInitialState(store, createState, internal);
     store.getInitialState = () => initialState;
     internal.rootState = getRawState(store, internal, initialState, options);
     return {

package/dist/coaction.esm.js

@@ -96,19 +96,25 @@ const handleDraft = (store, internal) => {
   }
 };
 
-const getInitialState = (store, createState) => {
+const getInitialState = (store, createState, internal) => {
   const makeState = fn => {
     // make sure createState is a function
     if (process.env.NODE_ENV !== 'production' && typeof fn !== 'function') {
       throw new Error('createState should be a function');
     }
     let state = fn(store.setState, store.getState, store);
-    if (typeof state === 'function') {
+    // support 3rd party library store like zustand, redux
+    if (state.getState) {
+      state = state.getState();
+      // support 3rd party library store like pinia
+    } else if (typeof state === 'function') {
       state = state();
     }
+    // support bind store like mobx
     if (state[bindSymbol]) {
       const rawState = state[bindSymbol].bind(state);
-      state[bindSymbol].handleStore(store, rawState, state);
+      state[bindSymbol].handleStore(store, rawState, state, internal);
+      delete state[bindSymbol];
       return rawState;
     }
     return state;
@@ -194,7 +200,7 @@ const createSelectorWithArray = createSelectorCreatorWithArray();
 const getRawState = (store, internal, initialState, options) => {
   const rawState = {};
   const handle = (_rawState, _initialState, sliceKey) => {
-    internal.mutableInstance = store.toRaw?.(_initialState);
+    internal.mutableInstance = internal.toMutableRaw?.(_initialState);
     const descriptors = Object.getOwnPropertyDescriptors(_initialState);
     Object.entries(descriptors).forEach(([key, descriptor]) => {
       if (Object.prototype.hasOwnProperty.call(descriptor, 'value')) {
@@ -341,8 +347,8 @@ const getRawState = (store, internal, initialState, options) => {
               done?.(result);
               return result;
             }
-            if (internal.mutableInstance && store.act) {
-              const result = store.act(() => {
+            if (internal.mutableInstance && internal.actMutable) {
+              const result = internal.actMutable(() => {
                 return fn.apply(sliceKey ? store.getState()[sliceKey] : store.getState(), args);
               });
               done?.(result);
@@ -388,8 +394,8 @@ const handleState = (store, internal, options) => {
     const enablePatches = store.transport ?? options.enablePatches;
     if (!enablePatches) {
       if (internal.mutableInstance) {
-        if (store.act) {
-          store.act(() => {
+        if (internal.actMutable) {
+          internal.actMutable(() => {
             fn.apply(null);
           });
           return [];
@@ -409,7 +415,11 @@ const handleState = (store, internal, options) => {
         internal.rootState = internal.backupState;
         throw error;
       }
-      internal.listeners.forEach(listener => listener());
+      if (internal.updateImmutable) {
+        internal.updateImmutable(internal.rootState);
+      } else {
+        internal.listeners.forEach(listener => listener());
+      }
       return [];
     }
     internal.backupState = internal.rootState;
@@ -437,7 +447,11 @@ const handleState = (store, internal, options) => {
     if (finalPatches.patches.length) {
       store.apply(internal.rootState, finalPatches.patches);
       if (!internal.mutableInstance) {
-        internal.listeners.forEach(listener => listener());
+        if (internal.updateImmutable) {
+          internal.updateImmutable(internal.rootState);
+        } else {
+          internal.listeners.forEach(listener => listener());
+        }
       }
     }
     return [internal.rootState, patches, inversePatches];
@@ -589,7 +603,11 @@ const create = (createState, options = {}) => {
     };
     const apply$1 = (state = internal.rootState, patches) => {
       internal.rootState = patches ? apply(state, patches) : state;
-      internal.listeners.forEach(listener => listener());
+      if (internal.updateImmutable) {
+        internal.updateImmutable(internal.rootState);
+      } else {
+        internal.listeners.forEach(listener => listener());
+      }
     };
     const getPureState = () => internal.rootState;
     const isSliceStore = typeof createState === 'object';
@@ -605,7 +623,7 @@ const create = (createState, options = {}) => {
       getPureState
     });
     applyMiddlewares(store, options.middlewares ?? []);
-    const initialState = getInitialState(store, createState);
+    const initialState = getInitialState(store, createState, internal);
     store.getInitialState = () => initialState;
     internal.rootState = getRawState(store, internal, initialState, options);
     return {