extra-react-store 0.1.2 → 0.1.4

package/README.md

@@ -51,6 +51,8 @@ function increment(state: IState): void {
 
 ## API
 ```ts
+import { Draft } from 'immer'
+
 type StoreContext<State> = React.Context<IStore<State>>
 
 interface IStore<State> {
@@ -58,6 +60,11 @@ interface IStore<State> {
   setState(newState: State): void
   subscribe(fn: (state: State) => void): () => void
 }
+
+type Updater<State> = (...args:
+| [newState: State]
+| [fn: (draft: Draft<State>) => void | State]
+) => void
 ```
 
 ### Store
@@ -82,15 +89,11 @@ function useSelector<State, Value>(
 
 ### useUpdater
 ```ts
-import { Updater } from 'use-immer'
-
 function useUpdater<State>(context: StoreContext<State>): Updater<State>
 ```
 
 ### usePartialUpdater
 ```ts
-import { Updater } from 'use-immer'
-
 function usePartialUpdater<State, PartialState>(
   context: StoreContext<State>
 , extractPartialState: (state: State) => PartialState

package/lib/types.d.ts

@@ -1,7 +1,9 @@
 /// <reference types="react" />
+import { Draft } from 'immer';
 export type StoreContext<State> = React.Context<IStore<State>>;
 export interface IStore<State> {
     getState(): State;
     setState(newState: State): void;
     subscribe(fn: (state: State) => void): () => void;
 }
+export type Updater<State> = (...args: [newState: State] | [fn: (draft: Draft<State>) => void | State]) => void;

package/lib/use-partial-updater.d.ts

@@ -1,3 +1,2 @@
-import { Updater } from 'use-immer';
-import { StoreContext } from './types.js';
+import { StoreContext, Updater } from './types.js';
 export declare function usePartialUpdater<State, PartialState>(context: StoreContext<State>, extractPartialState: (state: State) => PartialState, mergePartialState: (state: State, partialState: PartialState) => State): Updater<PartialState>;

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;AAE/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/lib/use-updater.d.ts

@@ -1,3 +1,2 @@
-import { Updater } from 'use-immer';
-import { StoreContext } from './types.js';
+import { StoreContext, Updater } from './types.js';
 export declare function useUpdater<State>(context: StoreContext<State>): Updater<State>;

package/lib/use-updater.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-updater.js","sourceRoot":"","sources":["../src/use-updater.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE5D,MAAM,UAAU,UAAU,CAAQ,OAA4B;IAC5D,OAAO,iBAAiB,CACtB,OAAO,EACP,KAAK,CAAC,EAAE,CAAC,KAAK,EACd,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CACpB,CAAA;AACH,CAAC"}
+{"version":3,"file":"use-updater.js","sourceRoot":"","sources":["../src/use-updater.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE5D,MAAM,UAAU,UAAU,CAAQ,OAA4B;IAC5D,OAAO,iBAAiB,CACtB,OAAO,EACP,KAAK,CAAC,EAAE,CAAC,KAAK,EACd,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CACpB,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-react-store",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "",
   "keywords": [],
   "files": [
@@ -62,8 +62,7 @@
   },
   "dependencies": {
     "@blackglory/prelude": "^0.3.3",
-    "@blackglory/structures": "^0.13.4",
-    "use-immer": "^0.9.0"
+    "@blackglory/structures": "^0.13.4"
   },
   "peerDependencies": {
     "immer": "^10.0.2",

package/src/types.ts

@@ -1,3 +1,5 @@
+import { Draft } from 'immer'
+
 export type StoreContext<State> = React.Context<IStore<State>>
 
 export interface IStore<State> {
@@ -5,3 +7,8 @@ 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 | State]
+) => void

package/src/use-partial-updater.ts

@@ -1,8 +1,7 @@
 import { useCallback, useContext } from 'react'
-import { Updater } from 'use-immer'
-import { produce } from 'immer'
+import { Draft, produce } from 'immer'
 import { go, isFunction } from '@blackglory/prelude'
-import { StoreContext } from './types.js'
+import { StoreContext, Updater } from './types.js'
 
 export function usePartialUpdater<State, PartialState>(
   context: StoreContext<State>
@@ -11,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
       }
     })
 

package/src/use-updater.ts

@@ -1,5 +1,4 @@
-import { Updater } from 'use-immer'
-import { StoreContext } from './types.js'
+import { StoreContext, Updater } from './types.js'
 import { usePartialUpdater } from './use-partial-updater.js'
 
 export function useUpdater<State>(context: StoreContext<State>): Updater<State> {