as-model 0.1.19 → 0.1.21

package/README.md

@@ -1,483 +1,483 @@
-[![npm][npm-image]][npm-url]
-[![NPM downloads][npm-downloads-image]][npm-url]
-[![standard][standard-image]][standard-url]
-
-[npm-image]: https://img.shields.io/npm/v/as-model.svg?style=flat-square
-[npm-url]: https://www.npmjs.com/package/as-model
-[standard-image]: https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square
-[standard-url]: http://npm.im/standard
-[npm-downloads-image]: https://img.shields.io/npm/dm/as-model.svg?style=flat-square
-
-
-# as-model
-
-This is a simple state management library with model coding style for javascript/typescript.
-
-## Code first
-
-Create a model function:
-
-```js
-// model.js
-// A parameter for model state.
-export function counting(state){
-    // Define instance object for outside usage.
-    return {
-        // Define properties for instance.
-        count: state,
-        symbol: !state? '': (state > 0? '+' : '-'),
-        // Create action methods for changing state.
-        increase:()=> state + 1,
-        decrease:()=> state - 1,
-        add(...additions){
-            return additions.reduce((result, current)=>{
-                return result + current;
-            }, state);
-        }
-    };
-}
-```
-
-Create store:
-
-```js
-// store.js
-import {counting} from './model';
-import {createStore} from 'as-model';
-
-// Create and initialize a model store.
-const store = createStore(counting, 0); 
-// Get instance and call action methods to change state.
-store.getInstance().increase();
-// Get new properties from instance.
-console.log(store.getInstance().count); // 1
-store.getInstance().add(2,3);
-console.log(store.getInstance().count); // 6
-```
-
-Create multiple stores:
-
-```js
-import {counting} from './model';
-import {createKey, createStores} from 'as-model';
-
-// Create model key with initial state.
-const countingKey0 = createKey(counting, 0);
-const countingKey1 = createKey(counting, 1); 
-
-// Use model keys as templates to create multiple stores.
-const stores = createStores(countingKey0, countingKey1);
-// Find store by model key
-const store0 = stores.find(countingKey0);
-store0?.getInstance().increase();
-console.log(store0?.getInstance().count); // 1
-```
-
-Model key is a template for creating multiple stores, and it is also an identifier to find the rightstore from multiple stores.
-
-Use **model** API to create store or key.
-
-```js
-import {counting} from './model';
-import {model} from 'as-model';
-
-const store = model(counting).createStore(0);
-const key = model(counting).createKey(0);
-......
-```
-
-In typescript develop environment, `model` API can do a type check for making sure the model action method returns a correct type.
-
-```js
-// ts
-import {model} from 'as-model';
-
-// The model api ensures every action method returns a same type value with model state.
-const counting = model((state: number)=>{
-    return {
-        count: state,
-        increase:()=>state + 1 + '', // type error, should be number, but returns string.
-        decrease:()=>state - 1,
-        add(...additions: number[]){
-            return additions.reduce((result, current)=>{
-                return result + current;
-            }, state);
-        }
-    };
-});
-
-const store = counting.createStore(0);
-const key = counting.createKey(0);
-......
-```
-
-Sync store
-
-```js
-import {counting} from './model';
-import {model} from 'as-model';
-
-const store = model(counting).createStore(0);
-const {getInstance} = store;
-// Subscribe the state changes.
-const unsubscribe = store.subscribe((action)=>{
-    console.log(store.getInstance());
-});
-getInstance().increase(); // output: {count: 1}
-// Destroy subscription.
-unsubscribe();
-```
-
-Want to use async operations?
-
-```js
-import {counting} from './model';
-import {model, createSelector} from 'as-model';
-
-const store = model(counting).select((getInstance)=>{
-    const instance = getInstance();
-    return {
-        ...instance,
-        async delayIncrease(){
-            const ok = await new Promise((resolve)=>{
-                setTimeout(()=>{
-                    resolve(true);
-                },200);
-            });
-            if(ok){
-                getInstance().increase();
-            }
-        }
-    }
-}).createStore(0);
-const {subscribe, select} = createSelector(store);
-const unsubscribe = subscribe();
-// When use select with no parameter,
-// select method finds default selector for reproducing result 
-const {delayIncrease} = select();
-await delayIncrease();
-select().count // 1
-```
-
-Sync store with state in react hooks:
-
-```js
-import {model, createStores} from 'as-model';
-import {
-    createContext, 
-    useRef, 
-    useState, 
-    useEffect, 
-    useContext
-} from 'react';
-
-// Local state management
-function useModel(modelFn, defaultState){
-    // Use ref to persist the store object.
-    const storeRef = useRef(model(modelFn).createStore(defaultState));
-    const store = storeRef.current;
-    // Set store instance as an initial state for useState.
-    const [state, setState] = useState(store.getInstance());
-
-    useEffect(()=>{
-        // Subscribe the state changes.
-        const unsubscribe = store.subscribe((action)=>{
-            setState(store.getInstance());
-        });
-        // Destroy subscription when component unmounts.
-        return unsubscribe;
-    }, []);
-
-    return state;
-}
-
-function App(){
-    const {
-        count, 
-        increase
-    } = useModel(counting, 0);
-}
-
-// global static state management
-function useModelStore(store){
-    const [state, setState] = useState(store.getInstance());
-
-    useEffect(()=>{
-        const unsubscribe = store.subscribe((action)=>{
-            setState(store.getInstance());
-        });
-        return unsubscribe;
-    }, []);
-
-    return state;
-}
-
-const store = model(counting).createStore({state: 0});
-
-function App(){
-    const {
-        count, 
-        increase
-    } = useModelStore(store);
-}
-
-// global dynamic state management
-const ModelContext = createContext(null);
-
-function create(...keys){
-    return {
-        provide(Component){
-            return function Provider(props){
-                // Create and persist multiple stores in Component, that makes different elements from this Component carry different stores.
-                const storesRef = useRef(createStores(...keys));
-                const stores = storesRef.current;
-                // Use Context to provide multiple stores to all the children.
-                return (
-                    <ModelContext.Provider value={stores}>
-                        <Component {...props} />
-                    </ModelContext.Provider>
-                );
-            }
-        }
-    }
-}
-
-function useModelKey(key){
-    const stores = useContext(ModelContext);
-    if(stores==null){
-        throw new Error('ModelContext is not provided');
-    }
-    // Use model key to find the right store.
-    const store = stores.find(key);
-    if(store==null){
-        throw new Error('Can not find store by model key');
-    }
-    const [state, setState] = useState(store.getInstance());
-
-    useEffect(()=>{
-        const unsubscribe = store.subscribe((action)=>{
-            setState(store.getInstance());
-        });
-        return unsubscribe;
-    }, []);
-
-    return state;
-}
-
-const countingKey = model(counting).createKey(0);
-
-const App = create(countingKey).provide(function App(){
-    const {
-        count, 
-        increase
-    } = useModelKey(countingKey);  
-});
-```
-
-## Install
-
-```
-npm install as-model
-```
-
-## Simplify API
-
-### createStore
-
-```js
-function createStore(modelFnOrKey, initialState?):store
-```
-
-#### parameters
-
-* modelFnOrKey - a model function accepts a state parameter and returns an object with action methods, or a model key of model function.
-* initialState - the initial state of the model.
-
-#### return
-
-A store object with model key and methods. The store object has `getInstance` method to get the instance of the model; `subscribe` method to subscribe the state changes; `update` method to update the store with new model function and initial state; `destroy` method to destroy the store.
-
-**store** structure:
-
-```js
-{
-    getInstance: ()=>instance,
-    subscribe: (listener)=>unsubscribe,
-    key: modelKey,
-    destroy: ()=>void
-    update: (
-        data:{
-            model?:modelFn, 
-            initialState?: any
-        }
-    )=>void
-}
-```
-
-### createKey
-
-```js
-function createKey(modelFn, initialState?):key
-```
-
-#### parameters
-
-* modelFn - a model function accepts a state parameter and returns an object with action methods.
-* initialState - the initial state of the model.
-
-#### return
-
-A model key function with `createStore` method to create a store with the model key.
-
-**key** structure:
-
-```js
-{
-    createStore: (initialState?)=>store
-}
-```
-
-### createStores
-
-```js
-function createStores(...keys):stores
-```
-
-#### parameters
-
-* keys - multiple model keys of model functions.
-
-#### return
-
-Multiple stores created by the model keys.
-
-**stores** structure:
-
-```js
-{
-    find: (key)=>store,
-    destroy: ()=>void
-}
-```
-
-### createSignal
-
-```js
-function createSignal(store):SignalStore
-```
-
-#### parameters
-
-* store - a store object created by `createStore` method.
-
-#### return
-
-Signal store object with `subscribe` method to subscribe the state changes, and `getSignal` method to get the signal callback function.
-
-**signalAPI** structure:
-
-```js
-{
-    subscribe: (listener)=>unsubscribe,
-    getSignal: ()=>signal,
-    key: modelKey,
-}
-```
-
-The signal function returns a real time instance from store. Only when the properties picked from real time instance are changed, the subscribed listener can receive an action notification.
-
-### createSelector
-
-```js
-function createSelector(store, opts?:SelectorOptions):SelectorStore
-```
-
-#### parameters
-
-* store - a store object created by `createStore` method.
-* opts - (Optional) an object config to optimize createSelector.
-  
- ```js
-  {
-    // When the selector is drived to reproduce a new data,
-    // it compares if the result is different with the previous one,
-    // if the camparing result is true, it represents no differ happens,
-    // the subscribed callback will not be called.  
-    equality?: (current: T, next: T) => boolean;
-  }
- ```
-
- #### return
-
- Selector store object with `subscribe` method to subscribe the state changes, and `select` method for reselecting instance.
-
- ```js
- {
-    subscribe: (listener)=>unsubscribe,
-    select: (selector?:(getInstance:()=>Instance)=>)=>any,
-    key: modelKey,
- }
- ```
-
-
-### model
-
-```js
-function model(modelFn):modelAPI
-```
-
-#### parameters
-
-* modelFn - a model function accepts a state parameter and returns an object with action methods.
-
-#### return
-
-Model api object with `createStore`, `createKey` methods to create store, key for the model function, and `select` method to set a default selector function (Use `createSelector(store).select()` to select the default one). 
-
-**modelAPI** structure:
-
-```js
-{
-    createStore: (initialState?)=> store,
-    createKey: (initialState?)=> key,
-    select: (
-      selector:(getInstance:()=>Instance)=>Record<string, any>|Array<any>
-    )=>modelApI 
-}
-```
-
-### config
-
-```js
-function config(options):configAPI
-```
-
-#### parameters
-
-* options - (Optional) an object with the following properties:
-  * batchNotify - (Optional) a callback function to batch notify the listeners, for example: `unstable_batchedUpdates` from react-dom.
-  * controlled - (Optional) a boolean state to tell as-model use controlled mode to output instance changes.
-  * middleWares - (Optional) a middleWare array for reproducing state or ignore actions.
-
-#### return
-
-All apis above except `createSignal` and `createSelector` API.
-
-```js
-{
-    createStore: (modelFnOrKey, initialState?)=>store,
-    createKey: (modelFn, initialState?)=>key,
-    createStores: (...keys)=>stores,
-    model: (modelFn)=>modelAPI
-}
-```
-
-## Browser Support 
-
-```
-chrome: '>=91',
-edge: '>=91',
-firefox: '=>90',
-safari: '>=15'
-```
-
+[![npm][npm-image]][npm-url]
+[![NPM downloads][npm-downloads-image]][npm-url]
+[![standard][standard-image]][standard-url]
+
+[npm-image]: https://img.shields.io/npm/v/as-model.svg?style=flat-square
+[npm-url]: https://www.npmjs.com/package/as-model
+[standard-image]: https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square
+[standard-url]: http://npm.im/standard
+[npm-downloads-image]: https://img.shields.io/npm/dm/as-model.svg?style=flat-square
+
+
+# as-model
+
+This is a simple state management library with model coding style for javascript/typescript.
+
+## Code first
+
+Create a model function:
+
+```js
+// model.js
+// A parameter for model state.
+export function counting(state){
+    // Define instance object for outside usage.
+    return {
+        // Define properties for instance.
+        count: state,
+        symbol: !state? '': (state > 0? '+' : '-'),
+        // Create action methods for changing state.
+        increase:()=> state + 1,
+        decrease:()=> state - 1,
+        add(...additions){
+            return additions.reduce((result, current)=>{
+                return result + current;
+            }, state);
+        }
+    };
+}
+```
+
+Create store:
+
+```js
+// store.js
+import {counting} from './model';
+import {createStore} from 'as-model';
+
+// Create and initialize a model store.
+const store = createStore(counting, 0); 
+// Get instance and call action methods to change state.
+store.getInstance().increase();
+// Get new properties from instance.
+console.log(store.getInstance().count); // 1
+store.getInstance().add(2,3);
+console.log(store.getInstance().count); // 6
+```
+
+Create multiple stores:
+
+```js
+import {counting} from './model';
+import {createKey, createStores} from 'as-model';
+
+// Create model key with initial state.
+const countingKey0 = createKey(counting, 0);
+const countingKey1 = createKey(counting, 1); 
+
+// Use model keys as templates to create multiple stores.
+const stores = createStores(countingKey0, countingKey1);
+// Find store by model key
+const store0 = stores.find(countingKey0);
+store0?.getInstance().increase();
+console.log(store0?.getInstance().count); // 1
+```
+
+Model key is a template for creating multiple stores, and it is also an identifier to find the rightstore from multiple stores.
+
+Use **model** API to create store or key.
+
+```js
+import {counting} from './model';
+import {model} from 'as-model';
+
+const store = model(counting).createStore(0);
+const key = model(counting).createKey(0);
+......
+```
+
+In typescript develop environment, `model` API can do a type check for making sure the model action method returns a correct type.
+
+```js
+// ts
+import {model} from 'as-model';
+
+// The model api ensures every action method returns a same type value with model state.
+const counting = model((state: number)=>{
+    return {
+        count: state,
+        increase:()=>state + 1 + '', // type error, should be number, but returns string.
+        decrease:()=>state - 1,
+        add(...additions: number[]){
+            return additions.reduce((result, current)=>{
+                return result + current;
+            }, state);
+        }
+    };
+});
+
+const store = counting.createStore(0);
+const key = counting.createKey(0);
+......
+```
+
+Sync store
+
+```js
+import {counting} from './model';
+import {model} from 'as-model';
+
+const store = model(counting).createStore(0);
+const {getInstance} = store;
+// Subscribe the state changes.
+const unsubscribe = store.subscribe((action)=>{
+    console.log(store.getInstance());
+});
+getInstance().increase(); // output: {count: 1}
+// Destroy subscription.
+unsubscribe();
+```
+
+Want to use async operations?
+
+```js
+import {counting} from './model';
+import {model, createSelector} from 'as-model';
+
+const store = model(counting).select((getInstance)=>{
+    const instance = getInstance();
+    return {
+        ...instance,
+        async delayIncrease(){
+            const ok = await new Promise((resolve)=>{
+                setTimeout(()=>{
+                    resolve(true);
+                },200);
+            });
+            if(ok){
+                getInstance().increase();
+            }
+        }
+    }
+}).createStore(0);
+const {subscribe, select} = createSelector(store);
+const unsubscribe = subscribe();
+// When use select with no parameter,
+// select method finds default selector for reproducing result 
+const {delayIncrease} = select();
+await delayIncrease();
+select().count // 1
+```
+
+Sync store with state in react hooks:
+
+```js
+import {model, createStores} from 'as-model';
+import {
+    createContext, 
+    useRef, 
+    useState, 
+    useEffect, 
+    useContext
+} from 'react';
+
+// Local state management
+function useModel(modelFn, defaultState){
+    // Use ref to persist the store object.
+    const storeRef = useRef(model(modelFn).createStore(defaultState));
+    const store = storeRef.current;
+    // Set store instance as an initial state for useState.
+    const [state, setState] = useState(store.getInstance());
+
+    useEffect(()=>{
+        // Subscribe the state changes.
+        const unsubscribe = store.subscribe((action)=>{
+            setState(store.getInstance());
+        });
+        // Destroy subscription when component unmounts.
+        return unsubscribe;
+    }, []);
+
+    return state;
+}
+
+function App(){
+    const {
+        count, 
+        increase
+    } = useModel(counting, 0);
+}
+
+// global static state management
+function useModelStore(store){
+    const [state, setState] = useState(store.getInstance());
+
+    useEffect(()=>{
+        const unsubscribe = store.subscribe((action)=>{
+            setState(store.getInstance());
+        });
+        return unsubscribe;
+    }, []);
+
+    return state;
+}
+
+const store = model(counting).createStore({state: 0});
+
+function App(){
+    const {
+        count, 
+        increase
+    } = useModelStore(store);
+}
+
+// global dynamic state management
+const ModelContext = createContext(null);
+
+function create(...keys){
+    return {
+        provide(Component){
+            return function Provider(props){
+                // Create and persist multiple stores in Component, that makes different elements from this Component carry different stores.
+                const storesRef = useRef(createStores(...keys));
+                const stores = storesRef.current;
+                // Use Context to provide multiple stores to all the children.
+                return (
+                    <ModelContext.Provider value={stores}>
+                        <Component {...props} />
+                    </ModelContext.Provider>
+                );
+            }
+        }
+    }
+}
+
+function useModelKey(key){
+    const stores = useContext(ModelContext);
+    if(stores==null){
+        throw new Error('ModelContext is not provided');
+    }
+    // Use model key to find the right store.
+    const store = stores.find(key);
+    if(store==null){
+        throw new Error('Can not find store by model key');
+    }
+    const [state, setState] = useState(store.getInstance());
+
+    useEffect(()=>{
+        const unsubscribe = store.subscribe((action)=>{
+            setState(store.getInstance());
+        });
+        return unsubscribe;
+    }, []);
+
+    return state;
+}
+
+const countingKey = model(counting).createKey(0);
+
+const App = create(countingKey).provide(function App(){
+    const {
+        count, 
+        increase
+    } = useModelKey(countingKey);  
+});
+```
+
+## Install
+
+```
+npm install as-model
+```
+
+## Simplify API
+
+### createStore
+
+```js
+function createStore(modelFnOrKey, initialState?):store
+```
+
+#### parameters
+
+* modelFnOrKey - a model function accepts a state parameter and returns an object with action methods, or a model key of model function.
+* initialState - the initial state of the model.
+
+#### return
+
+A store object with model key and methods. The store object has `getInstance` method to get the instance of the model; `subscribe` method to subscribe the state changes; `update` method to update the store with new model function and initial state; `destroy` method to destroy the store.
+
+**store** structure:
+
+```js
+{
+    getInstance: ()=>instance,
+    subscribe: (listener)=>unsubscribe,
+    key: modelKey,
+    destroy: ()=>void
+    update: (
+        data:{
+            model?:modelFn, 
+            initialState?: any
+        }
+    )=>void
+}
+```
+
+### createKey
+
+```js
+function createKey(modelFn, initialState?):key
+```
+
+#### parameters
+
+* modelFn - a model function accepts a state parameter and returns an object with action methods.
+* initialState - the initial state of the model.
+
+#### return
+
+A model key function with `createStore` method to create a store with the model key.
+
+**key** structure:
+
+```js
+{
+    createStore: (initialState?)=>store
+}
+```
+
+### createStores
+
+```js
+function createStores(...keys):stores
+```
+
+#### parameters
+
+* keys - multiple model keys of model functions.
+
+#### return
+
+Multiple stores created by the model keys.
+
+**stores** structure:
+
+```js
+{
+    find: (key)=>store,
+    destroy: ()=>void
+}
+```
+
+### createSignal
+
+```js
+function createSignal(store):SignalStore
+```
+
+#### parameters
+
+* store - a store object created by `createStore` method.
+
+#### return
+
+Signal store object with `subscribe` method to subscribe the state changes, and `getSignal` method to get the signal callback function.
+
+**signalAPI** structure:
+
+```js
+{
+    subscribe: (listener)=>unsubscribe,
+    getSignal: ()=>signal,
+    key: modelKey,
+}
+```
+
+The signal function returns a real time instance from store. Only when the properties picked from real time instance are changed, the subscribed listener can receive an action notification.
+
+### createSelector
+
+```js
+function createSelector(store, opts?:SelectorOptions):SelectorStore
+```
+
+#### parameters
+
+* store - a store object created by `createStore` method.
+* opts - (Optional) an object config to optimize createSelector.
+  
+ ```js
+  {
+    // When the selector is drived to reproduce a new data,
+    // it compares if the result is different with the previous one,
+    // if the camparing result is true, it represents no differ happens,
+    // the subscribed callback will not be called.  
+    equality?: (current: T, next: T) => boolean;
+  }
+ ```
+
+ #### return
+
+ Selector store object with `subscribe` method to subscribe the state changes, and `select` method for reselecting instance.
+
+ ```js
+ {
+    subscribe: (listener)=>unsubscribe,
+    select: (selector?:(getInstance:()=>Instance)=>)=>any,
+    key: modelKey,
+ }
+ ```
+
+
+### model
+
+```js
+function model(modelFn):modelAPI
+```
+
+#### parameters
+
+* modelFn - a model function accepts a state parameter and returns an object with action methods.
+
+#### return
+
+Model api object with `createStore`, `createKey` methods to create store, key for the model function, and `select` method to set a default selector function (Use `createSelector(store).select()` to select the default one). 
+
+**modelAPI** structure:
+
+```js
+{
+    createStore: (initialState?)=> store,
+    createKey: (initialState?)=> key,
+    select: (
+      selector:(getInstance:()=>Instance)=>Record<string, any>|Array<any>
+    )=>modelApI 
+}
+```
+
+### config
+
+```js
+function config(options):configAPI
+```
+
+#### parameters
+
+* options - (Optional) an object with the following properties:
+  * batchNotify - (Optional) a callback function to batch notify the listeners, for example: `unstable_batchedUpdates` from react-dom.
+  * controlled - (Optional) a boolean state to tell as-model use controlled mode to output instance changes.
+  * middleWares - (Optional) a middleWare array for reproducing state or ignore actions.
+
+#### return
+
+All apis above except `createSignal` and `createSelector` API.
+
+```js
+{
+    createStore: (modelFnOrKey, initialState?)=>store,
+    createKey: (modelFn, initialState?)=>key,
+    createStores: (...keys)=>stores,
+    model: (modelFn)=>modelAPI
+}
+```
+
+## Browser Support 
+
+```
+chrome: '>=91',
+edge: '>=91',
+firefox: '=>90',
+safari: '>=15'
+```
+

package/dist/index.js

@@ -604,7 +604,10 @@
       updater.mutate(function(u, effect) {
         var _args_model;
         var model2 = (_args_model = args.model) !== null && _args_model !== void 0 ? _args_model : u.model;
-        var state = "state" in args ? args.state : u.state;
+        var hasState = Object.prototype.hasOwnProperty.call(args, "state");
+        var hasInitialState = Object.prototype.hasOwnProperty.call(args, "initialState");
+        var state = hasState ? args.state : u.state;
+        var isInitialize = !u.initialized || hasInitialState;
         var token = createToken();
         if (u.controlled) {
           var instance = model2(state);
@@ -620,8 +623,9 @@
         if (!u.initialized && !("state" in args)) {
           throw new Error("The updater has not been initialized, it should be updated with a state for initializing.");
         }
-        if (!u.initialized) {
-          var instance1 = model2(state);
+        if (isInitialize) {
+          var initialState = hasInitialState ? args.initialState : state;
+          var instance1 = model2(initialState);
           var initializedUpdater = createInitializedUpdater(u, middleWare);
           return _object_spread(_object_spread_props(_object_spread({}, u), {
             model: model2,
@@ -634,22 +638,18 @@
         if (Object.is(u.model, model2) && Object.is(u.state, state)) {
           return u;
         }
-        var instance2 = model2(state);
         effect(function(up) {
           up.notify({
             type: null,
             method: null,
             prevInstance: u.instance,
-            instance: instance2,
+            instance: u.instance,
             prevState: u.state,
             state
           });
         });
         return _object_spread_props(_object_spread({}, u), {
-          state,
           model: model2,
-          instance: instance2,
-          token,
           initialized: true,
           cacheFields: {},
           cacheMethods: {}
@@ -1198,7 +1198,7 @@
       getInstance,
       update: function update(args) {
         var updateArgs = args !== null && args !== void 0 ? args : {};
-        if ("key" in updateArgs && updateArgs.key) {
+        if (updateArgs.key) {
           var updatingKey = updateArgs.key, updatingModel = updateArgs.model, rest = _object_without_properties(updateArgs, [
             "key",
             "model"
@@ -1209,7 +1209,7 @@
           store.key = updatingKey;
           return;
         }
-        if ("model" in updateArgs && updateArgs.model) {
+        if (updateArgs.model) {
           var updatingKey1 = updateArgs.key, updatingModel1 = updateArgs.model, rest1 = _object_without_properties(updateArgs, [
             "key",
             "model"

package/esm/store/index.js

@@ -103,13 +103,13 @@ function createStore(modelLike, config = {}) {
     getInstance,
     update(args) {
       const updateArgs = args != null ? args : {};
-      if ("key" in updateArgs && updateArgs.key) {
+      if (updateArgs.key) {
         const _a = updateArgs, { key: updatingKey, model: updatingModel } = _a, rest = __objRest(_a, ["key", "model"]);
         updater.update(__spreadProps(__spreadValues({}, rest), { model: updatingKey.source }));
         store.key = updatingKey;
         return;
       }
-      if ("model" in updateArgs && updateArgs.model) {
+      if (updateArgs.model) {
         const _b = updateArgs, { key: updatingKey, model: updatingModel } = _b, rest = __objRest(_b, ["key", "model"]);
         updater.update(__spreadProps(__spreadValues({}, rest), { model: updatingModel }));
         store.key = createPrimaryKey(updatingModel, config);

package/esm/updater/index.js

@@ -37,11 +37,17 @@ function createUpdateFn(updater, middleWare) {
     updater.mutate((u, effect) => {
       var _a;
       const model = (_a = args.model) != null ? _a : u.model;
-      const state = "state" in args ? args.state : u.state;
+      const hasState = Object.prototype.hasOwnProperty.call(args, "state");
+      const hasInitialState = Object.prototype.hasOwnProperty.call(
+        args,
+        "initialState"
+      );
+      const state = hasState ? args.state : u.state;
+      const isInitialize = !u.initialized || hasInitialState;
       const token = createToken();
       if (u.controlled) {
-        const instance2 = model(state);
-        return __spreadProps(__spreadValues({}, u), { state, instance: instance2, model });
+        const instance = model(state);
+        return __spreadProps(__spreadValues({}, u), { state, instance, model });
       }
       if (u.isDestroyed) {
         return u;
@@ -51,13 +57,14 @@ function createUpdateFn(updater, middleWare) {
           "The updater has not been initialized, it should be updated with a state for initializing."
         );
       }
-      if (!u.initialized) {
-        const instance2 = model(state);
+      if (isInitialize) {
+        const initialState = hasInitialState ? args.initialState : state;
+        const instance = model(initialState);
         const initializedUpdater = createInitializedUpdater(u, middleWare);
         return __spreadValues(__spreadProps(__spreadValues({}, u), {
           model,
           state,
-          instance: instance2,
+          instance,
           initialized: true,
           token
         }), initializedUpdater);
@@ -65,22 +72,18 @@ function createUpdateFn(updater, middleWare) {
       if (Object.is(u.model, model) && Object.is(u.state, state)) {
         return u;
       }
-      const instance = model(state);
       effect((up) => {
         up.notify({
           type: null,
           method: null,
           prevInstance: u.instance,
-          instance,
+          instance: u.instance,
           prevState: u.state,
           state
         });
       });
       return __spreadProps(__spreadValues({}, u), {
-        state,
         model,
-        instance,
-        token,
         initialized: true,
         cacheFields: {},
         cacheMethods: {}

package/index.d.ts

@@ -100,7 +100,12 @@ export declare interface Store<
   subscribe: (dispatcher: Dispatch) => () => void;
   getToken: () => Token;
   getInstance: () => T;
-  update: (args?: { model?: Model<S, T>; initialState?: S; state?: S }) => void;
+  update: (args?: {
+    model?: Model<S, T>;
+    key?: Key<S, T, R>;
+    initialState?: S;
+    state?: S;
+  }) => void;
   destroy: () => void;
   payload: <P>(
     callback?: (payload: P | undefined) => P | undefined

package/package.json

@@ -1,68 +1,68 @@
-{
-  "private": false,
-  "name": "as-model",
-  "version": "0.1.19",
-  "description": "This is a model state management tool",
-  "license": "MIT",
-  "author": "Jimmy.Harding",
-  "homepage": "https://github.com/filefoxper/a-model",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/filefoxper/a-model"
-  },
-  "main": "dist/index.js",
-  "module": "esm/index.js",
-  "files": [
-    "dist",
-    "esm",
-    "index.d.ts"
-  ],
-  "scripts": {
-    "build": "node ./build.js",
-    "docs": "docsify serve ./docs",
-    "lint": "eslint src --fix --ext .ts,.tsx ",
-    "lint-init": "eslint --init",
-    "test": "jest --coverage"
-  },
-  "typings": "index.d.ts",
-  "devDependencies": {
-    "@types/jest": "^29.5.14",
-    "@babel/cli": "^7.27.2",
-    "@babel/core": "^7.27.4",
-    "@babel/eslint-parser": "^7.27.5",
-    "@babel/plugin-transform-runtime": "^7.27.4",
-    "@babel/preset-env": "^7.27.2",
-    "@babel/preset-typescript": "^7.27.1",
-    "@babel/runtime": "^7.27.6",
-    "esbuild": "^0.25.0",
-    "esbuild-plugin-es5": "2.1.1",
-    "eslint": "^8.49.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-import-resolver-typescript": "^3.6.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
-    "eslint-webpack-plugin": "^4.0.1",
-    "prettier": "^3.0.3",
-    "prettier-eslint": "^15.0.1",
-    "prettier-eslint-cli": "^7.1.0",
-    "typescript": "^4.9.5",
-    "babel-jest": "29.7.0",
-    "jest": "29.7.0",
-    "jest-environment-jsdom": "29.7.0",
-    "ts-node": "^10.8.1",
-    "pmnps": "^4.5.3",
-    "@pmnps/plugin-publish": "4.5.0"
-  },
-  "keywords": [
-    "model",
-    "state",
-    "state-management",
-    "typescript"
-  ]
-}
+{
+  "private": false,
+  "name": "as-model",
+  "version": "0.1.21",
+  "description": "This is a model state management tool",
+  "license": "MIT",
+  "author": "Jimmy.Harding",
+  "homepage": "https://github.com/filefoxper/a-model",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/filefoxper/a-model"
+  },
+  "main": "dist/index.js",
+  "module": "esm/index.js",
+  "files": [
+    "dist",
+    "esm",
+    "index.d.ts"
+  ],
+  "scripts": {
+    "build": "node ./build.js",
+    "docs": "docsify serve ./docs",
+    "lint": "eslint src --fix --ext .ts,.tsx ",
+    "lint-init": "eslint --init",
+    "test": "jest --coverage"
+  },
+  "typings": "index.d.ts",
+  "devDependencies": {
+    "@types/jest": "^29.5.14",
+    "@babel/cli": "^7.27.2",
+    "@babel/core": "^7.27.4",
+    "@babel/eslint-parser": "^7.27.5",
+    "@babel/plugin-transform-runtime": "^7.27.4",
+    "@babel/preset-env": "^7.27.2",
+    "@babel/preset-typescript": "^7.27.1",
+    "@babel/runtime": "^7.27.6",
+    "esbuild": "^0.25.0",
+    "esbuild-plugin-es5": "2.1.1",
+    "eslint": "^8.49.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-import-resolver-typescript": "^3.6.0",
+    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-jsx-a11y": "^6.7.1",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-react": "^7.33.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint-webpack-plugin": "^4.0.1",
+    "prettier": "^3.0.3",
+    "prettier-eslint": "^15.0.1",
+    "prettier-eslint-cli": "^7.1.0",
+    "typescript": "^4.9.5",
+    "babel-jest": "29.7.0",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "ts-node": "^10.8.1",
+    "pmnps": "^4.5.3",
+    "@pmnps/plugin-publish": "4.5.0"
+  },
+  "keywords": [
+    "model",
+    "state",
+    "state-management",
+    "typescript"
+  ]
+}