extra-react-store 0.1.3 → 0.1.4

package/README.md

@@ -63,7 +63,7 @@ interface IStore<State> {
 
 type Updater<State> = (...args:
 | [newState: State]
-| [fn: (draft: Draft<State>) => void]
+| [fn: (draft: Draft<State>) => void | State]
 ) => void
 ```
 

package/lib/types.d.ts

@@ -6,4 +6,4 @@ export interface IStore<State> {
     setState(newState: State): void;
     subscribe(fn: (state: State) => void): () => void;
 }
-export type Updater<State> = (...args: [newState: State] | [fn: (draft: Draft<State>) => void]) => void;
+export type Updater<State> = (...args: [newState: State] | [fn: (draft: Draft<State>) => void | State]) => void;

package/lib/use-partial-updater.js

@@ -3,16 +3,17 @@ import { produce } from 'immer';
 import { go, isFunction } from '@blackglory/prelude';
 export function usePartialUpdater(context, extractPartialState, mergePartialState) {
     const store = useContext(context);
-    const updater = useCallback(newStateOrFn => {
+    const updater = useCallback(newPartialStateOrFn => {
         const oldState = store.getState();
         const newPartialState = go(() => {
-            if (isFunction(newStateOrFn)) {
-                const fn = newStateOrFn;
-                return produce(extractPartialState(oldState), fn);
+            if (isFunction(newPartialStateOrFn)) {
+                const fn = newPartialStateOrFn;
+                const newPartialState = produce(extractPartialState(oldState), fn);
+                return newPartialState;
             }
             else {
-                const newState = newStateOrFn;
-                return newState;
+                const newPartialState = newPartialStateOrFn;
+                return newPartialState;
             }
         });
         store.setState(mergePartialState(oldState, newPartialState));

package/lib/use-partial-updater.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-partial-updater.js","sourceRoot":"","sources":["../src/use-partial-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGpD,MAAM,UAAU,iBAAiB,CAC/B,OAA4B,EAC5B,mBAAmD,EACnD,iBAAsE;IAEtE,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAEjC,MAAM,OAAO,GAA0B,WAAW,CAAC,YAAY,CAAC,EAAE;QAChE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEjC,MAAM,eAAe,GAAiB,EAAE,CAAC,GAAG,EAAE;YAC5C,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE;gBAC5B,MAAM,EAAE,GAAG,YAAY,CAAA;gBACvB,OAAO,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC,CAAA;aAClD;iBAAM;gBACL,MAAM,QAAQ,GAAG,YAAY,CAAA;gBAC7B,OAAO,QAAQ,CAAA;aAChB;QACH,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA;IAC9D,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAEnD,OAAO,OAAO,CAAA;AAChB,CAAC"}
+{"version":3,"file":"use-partial-updater.js","sourceRoot":"","sources":["../src/use-partial-updater.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAC/C,OAAO,EAAS,OAAO,EAAE,MAAM,OAAO,CAAA;AACtC,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGpD,MAAM,UAAU,iBAAiB,CAC/B,OAA4B,EAC5B,mBAAmD,EACnD,iBAAsE;IAEtE,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;IAEjC,MAAM,OAAO,GAA0B,WAAW,CAAC,mBAAmB,CAAC,EAAE;QACvE,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAA;QAEjC,MAAM,eAAe,GAAiB,EAAE,CAAC,GAAG,EAAE;YAC5C,IAAI,UAAU,CAAC,mBAAmB,CAAC,EAAE;gBACnC,MAAM,EAAE,GAAG,mBAAmB,CAAA;gBAC9B,MAAM,eAAe,GAAG,OAAO,CAC7B,mBAAmB,CAAC,QAAQ,CAAC,EAE7B,EAAE,CACH,CAAA;gBACD,OAAO,eAAe,CAAA;aACvB;iBAAM;gBACL,MAAM,eAAe,GAAG,mBAAmB,CAAA;gBAC3C,OAAO,eAAe,CAAA;aACvB;QACH,CAAC,CAAC,CAAA;QAEF,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA;IAC9D,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAEnD,OAAO,OAAO,CAAA;AAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-react-store",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "",
   "keywords": [],
   "files": [

package/src/types.ts

@@ -10,5 +10,5 @@ export interface IStore<State> {
 
 export type Updater<State> = (...args:
 | [newState: State]
-| [fn: (draft: Draft<State>) => void]
+| [fn: (draft: Draft<State>) => void | State]
 ) => void

package/src/use-partial-updater.ts

@@ -1,5 +1,5 @@
 import { useCallback, useContext } from 'react'
-import { produce } from 'immer'
+import { Draft, produce } from 'immer'
 import { go, isFunction } from '@blackglory/prelude'
 import { StoreContext, Updater } from './types.js'
 
@@ -10,16 +10,21 @@ export function usePartialUpdater<State, PartialState>(
 ): Updater<PartialState> {
   const store = useContext(context)
 
-  const updater: Updater<PartialState> = useCallback(newStateOrFn => {
+  const updater: Updater<PartialState> = useCallback(newPartialStateOrFn => {
     const oldState = store.getState()
 
     const newPartialState: PartialState = go(() => {
-      if (isFunction(newStateOrFn)) {
-        const fn = newStateOrFn
-        return produce(extractPartialState(oldState), fn)
+      if (isFunction(newPartialStateOrFn)) {
+        const fn = newPartialStateOrFn
+        const newPartialState = produce<PartialState, Draft<PartialState>>(
+          extractPartialState(oldState)
+          // @ts-ignore
+        , fn
+        )
+        return newPartialState
       } else {
-        const newState = newStateOrFn
-        return newState
+        const newPartialState = newPartialStateOrFn
+        return newPartialState
       }
     })