as-model 0.1.23 → 0.1.25

package/dist/index.js

@@ -369,8 +369,11 @@
         type: null,
         method: null
       };
-      temporaryDispatches.forEach(function(call) {
-        call(initializedAction);
+      temporaryDispatches.forEach(function(d) {
+        if (!d.accessible) {
+          return;
+        }
+        d.dispatch(initializedAction);
       });
     }
     var dispatch = function dispatch2(action) {
@@ -392,7 +395,15 @@
       }
       var notifyAction = function notifyAction2(act) {
         var errors = [];
-        var dispatchCallbacks = dispatches.map(simpleErrorProcess(errors));
+        var dispatchWrap = simpleErrorProcess(errors);
+        var dispatchCallbacks = dispatches.map(function(d) {
+          return dispatchWrap(function dispatchCallback(ac) {
+            if (!d.accessible) {
+              return;
+            }
+            d.dispatch(ac);
+          });
+        });
         defaultNotifyImplement(dispatchCallbacks, act);
         if (!errors.length) {
           return {
@@ -511,7 +522,9 @@
     function subscribe(dispatchFn) {
       var dispatches = updater.dispatches, temporaryDispatches = updater.temporaryDispatches, isControlled = updater.controlled;
       var copied = _to_consumable_array(dispatches).concat(_to_consumable_array(temporaryDispatches));
-      var exist = copied.indexOf(dispatchFn) >= 0;
+      var exist = copied.some(function(d) {
+        return d.dispatch === dispatchFn;
+      });
       if (exist) {
         return updater.mutate(function(u) {
           return _object_spread_props(_object_spread({}, u), {
@@ -519,11 +532,15 @@
           });
         });
       }
+      var dispatcher = {
+        dispatch: dispatchFn,
+        accessible: true
+      };
       if (isControlled) {
         return updater.mutate(function(u) {
           return _object_spread_props(_object_spread({}, u), {
             dispatches: [
-              dispatchFn
+              dispatcher
             ],
             isDestroyed: false
           });
@@ -532,7 +549,7 @@
       return updater.mutate(function(u, effect) {
         var tds = u.temporaryDispatches, ds = u.dispatches;
         var nextTds = _to_consumable_array(tds).concat([
-          dispatchFn
+          dispatcher
         ]);
         if (u.dispatching) {
           return _object_spread_props(_object_spread({}, u), {
@@ -550,7 +567,7 @@
             method: null
           };
           nextTds.forEach(function(td) {
-            td(initializedAction);
+            td.dispatch(initializedAction);
           });
         });
         return _object_spread_props(_object_spread({}, u), {
@@ -560,19 +577,23 @@
         });
       });
     }
-    return function tunnel(dispatcher) {
+    return function tunnel(dispatchFn) {
       function disconnect() {
         updater.mutate(function(u) {
           var ds = u.dispatches, tds = u.temporaryDispatches;
+          var found = _to_consumable_array(ds).concat(_to_consumable_array(tds)).find(function(d) {
+            return d.dispatch === dispatchFn;
+          });
+          if (!found) {
+            return u;
+          }
+          found.accessible = false;
           var nextDs = ds.filter(function(d) {
-            return d !== dispatcher;
+            return d !== found;
           });
           var nextTds = tds.filter(function(d) {
-            return d !== dispatcher;
+            return d !== found;
           });
-          if (ds.length === nextDs.length && tds.length === nextTds.length) {
-            return u;
-          }
           return _object_spread_props(_object_spread({}, u), {
             dispatches: nextDs,
             temporaryDispatches: nextTds
@@ -581,7 +602,7 @@
       }
       return {
         connect: function connect() {
-          subscribe(dispatcher);
+          subscribe(dispatchFn);
         },
         disconnect: function disconnect1() {
           disconnect();
@@ -613,7 +634,7 @@
           var controlledState = hasInitialState && !hasState ? args.initialState : state;
           var instance = model2(controlledState);
           return _object_spread_props(_object_spread({}, u), {
-            state,
+            state: controlledState,
             instance,
             model: model2
           });
@@ -630,7 +651,7 @@
           var initializedUpdater = createInitializedUpdater(u, middleWare);
           return _object_spread(_object_spread_props(_object_spread({}, u), {
             model: model2,
-            state,
+            state: initialState,
             instance: instance1,
             initialized: true,
             token
@@ -901,23 +922,20 @@
           dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher(action);
           return;
         }
-        var current = extractInstance(store.updater);
+        var storeInstance = extractInstance(store.updater);
         var keys = Object.keys(collection);
-        var currentCollectionEntries = keys.map(function(key) {
-          var field2 = current[key];
-          if (cacheIdentify.field(field2)) {
-            return [
-              key,
-              field2.get()
-            ];
+        if (!keys.length) {
+          return;
+        }
+        var hasChange = keys.some(function(key) {
+          var field2 = storeInstance[key];
+          var collectedField = collection[key];
+          if (cacheIdentify.field(field2) && cacheIdentify.field(collectedField)) {
+            return field2.get() !== collectedField.get();
           }
-          return [
-            key,
-            field2
-          ];
+          return field2 !== collectedField;
         });
-        var currentCollection = Object.fromEntries(currentCollectionEntries);
-        if (!shallowEqual(collection, currentCollection)) {
+        if (hasChange) {
           dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher(action);
         }
       };
@@ -939,11 +957,12 @@
           signalStore.collection = signalStore.collection || {};
           signalStore.collection[key] = val;
         };
-        var getInstance = function getInstance2() {
-          return extractInstance(store.updater, collectUsedFields);
+        var getInstance = function getInstance2(options) {
+          var cutOff = (options !== null && options !== void 0 ? options : {}).cutOff;
+          return extractInstance(store.updater, cutOff ? void 0 : collectUsedFields);
         };
-        var signal = function signal2() {
-          return getInstance();
+        var signal = function signal2(options) {
+          return getInstance(options);
         };
         signal.startStatistics = function startStatistics() {
           signalStore.started = true;

package/esm/store/enhance/signal.js

@@ -1,5 +1,4 @@
 import { cacheIdentify, extractInstance } from "../instance";
-import { shallowEqual } from "../../tools";
 function createSignal(store) {
   const signalStore = {
     collection: null,
@@ -17,17 +16,20 @@ function createSignal(store) {
         dispatcher == null ? void 0 : dispatcher(action);
         return;
       }
-      const current = extractInstance(store.updater);
+      const storeInstance = extractInstance(store.updater);
       const keys = Object.keys(collection);
-      const currentCollectionEntries = keys.map((key) => {
-        const field = current[key];
-        if (cacheIdentify.field(field)) {
-          return [key, field.get()];
+      if (!keys.length) {
+        return;
+      }
+      const hasChange = keys.some((key) => {
+        const field = storeInstance[key];
+        const collectedField = collection[key];
+        if (cacheIdentify.field(field) && cacheIdentify.field(collectedField)) {
+          return field.get() !== collectedField.get();
         }
-        return [key, field];
+        return field !== collectedField;
       });
-      const currentCollection = Object.fromEntries(currentCollectionEntries);
-      if (!shallowEqual(collection, currentCollection)) {
+      if (hasChange) {
         dispatcher == null ? void 0 : dispatcher(action);
       }
     };
@@ -49,11 +51,15 @@ function createSignal(store) {
         signalStore.collection = signalStore.collection || {};
         signalStore.collection[key] = val;
       };
-      const getInstance = function getInstance2() {
-        return extractInstance(store.updater, collectUsedFields);
+      const getInstance = function getInstance2(options) {
+        const { cutOff } = options != null ? options : {};
+        return extractInstance(
+          store.updater,
+          cutOff ? void 0 : collectUsedFields
+        );
       };
-      const signal = function signal2() {
-        return getInstance();
+      const signal = function signal2(options) {
+        return getInstance(options);
       };
       signal.startStatistics = function startStatistics() {
         signalStore.started = true;

package/esm/updater/index.js

@@ -48,7 +48,7 @@ function createUpdateFn(updater, middleWare) {
       if (u.controlled) {
         const controlledState = hasInitialState && !hasState ? args.initialState : state;
         const instance = model(controlledState);
-        return __spreadProps(__spreadValues({}, u), { state, instance, model });
+        return __spreadProps(__spreadValues({}, u), { state: controlledState, instance, model });
       }
       if (u.isDestroyed) {
         return u;
@@ -64,7 +64,7 @@ function createUpdateFn(updater, middleWare) {
         const initializedUpdater = createInitializedUpdater(u, middleWare);
         return __spreadValues(__spreadProps(__spreadValues({}, u), {
           model,
-          state,
+          state: initialState,
           instance,
           initialized: true,
           token

package/esm/updater/notifier.js

@@ -76,8 +76,11 @@ function generateNotifier(updater, middleWare) {
       type: null,
       method: null
     };
-    temporaryDispatches.forEach((call) => {
-      call(initializedAction);
+    temporaryDispatches.forEach((d) => {
+      if (!d.accessible) {
+        return;
+      }
+      d.dispatch(initializedAction);
     });
   }
   const dispatch = function dispatch2(action) {
@@ -95,7 +98,15 @@ function generateNotifier(updater, middleWare) {
     }
     const notifyAction = function notifyAction2(act) {
       const errors = [];
-      const dispatchCallbacks = dispatches.map(simpleErrorProcess(errors));
+      const dispatchWrap = simpleErrorProcess(errors);
+      const dispatchCallbacks = dispatches.map((d) => {
+        return dispatchWrap(function dispatchCallback(ac) {
+          if (!d.accessible) {
+            return;
+          }
+          d.dispatch(ac);
+        });
+      });
       defaultNotifyImplement(dispatchCallbacks, act);
       if (!errors.length) {
         return { errors: void 0 };

package/esm/updater/tunnel.js

@@ -65,19 +65,20 @@ function generateTunnelCreator(updater) {
       controlled: isControlled
     } = updater;
     const copied = [...dispatches, ...temporaryDispatches];
-    const exist = copied.indexOf(dispatchFn) >= 0;
+    const exist = copied.some((d) => d.dispatch === dispatchFn);
     if (exist) {
       return updater.mutate((u) => __spreadProps(__spreadValues({}, u), { isDestroyed: false }));
     }
+    const dispatcher = { dispatch: dispatchFn, accessible: true };
     if (isControlled) {
       return updater.mutate((u) => __spreadProps(__spreadValues({}, u), {
-        dispatches: [dispatchFn],
+        dispatches: [dispatcher],
         isDestroyed: false
       }));
     }
     return updater.mutate((u, effect) => {
       const { temporaryDispatches: tds, dispatches: ds } = u;
-      const nextTds = [...tds, dispatchFn];
+      const nextTds = [...tds, dispatcher];
       if (u.dispatching) {
         return __spreadProps(__spreadValues({}, u), {
           temporaryDispatches: nextTds,
@@ -94,7 +95,7 @@ function generateTunnelCreator(updater) {
           method: null
         };
         nextTds.forEach((td) => {
-          td(initializedAction);
+          td.dispatch(initializedAction);
         });
       });
       return __spreadProps(__spreadValues({}, u), {
@@ -104,15 +105,17 @@ function generateTunnelCreator(updater) {
       });
     });
   }
-  return function tunnel(dispatcher) {
+  return function tunnel(dispatchFn) {
     function disconnect() {
       updater.mutate((u) => {
         const { dispatches: ds, temporaryDispatches: tds } = u;
-        const nextDs = ds.filter((d) => d !== dispatcher);
-        const nextTds = tds.filter((d) => d !== dispatcher);
-        if (ds.length === nextDs.length && tds.length === nextTds.length) {
+        const found = [...ds, ...tds].find((d) => d.dispatch === dispatchFn);
+        if (!found) {
           return u;
         }
+        found.accessible = false;
+        const nextDs = ds.filter((d) => d !== found);
+        const nextTds = tds.filter((d) => d !== found);
         return __spreadProps(__spreadValues({}, u), {
           dispatches: nextDs,
           temporaryDispatches: nextTds
@@ -121,7 +124,7 @@ function generateTunnelCreator(updater) {
     }
     return {
       connect() {
-        subscribe(dispatcher);
+        subscribe(dispatchFn);
       },
       disconnect() {
         disconnect();

package/index.d.ts

@@ -200,6 +200,10 @@ export declare interface model {
 
 /** createSignal * */
 
+export interface SignalOptions {
+  cutOff?: boolean;
+}
+
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 declare interface SignalStore<
   S = any,
@@ -209,7 +213,7 @@ declare interface SignalStore<
   getToken: () => Token;
   subscribe: (dispatcher: Dispatch) => () => void;
   getSignal: () => {
-    (): T;
+    (options?: SignalOptions): T;
     startStatistics: () => void;
     stopStatistics: () => void;
     subscribe: (dispatcher: Dispatch) => () => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "as-model",
-  "version": "0.1.23",
+  "version": "0.1.25",
   "description": "This is a model state management tool",
   "license": "MIT",
   "author": "Jimmy.Harding",
@@ -26,7 +26,6 @@
   },
   "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",
@@ -34,6 +33,9 @@
     "@babel/preset-env": "^7.27.2",
     "@babel/preset-typescript": "^7.27.1",
     "@babel/runtime": "^7.27.6",
+    "@pmnps/plugin-publish": "4.5.0",
+    "@types/jest": "^29.5.14",
+    "babel-jest": "29.7.0",
     "esbuild": "^0.25.0",
     "esbuild-plugin-es5": "2.1.1",
     "eslint": "^8.49.0",
@@ -48,16 +50,14 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-unused-imports": "^2.0.0",
     "eslint-webpack-plugin": "^4.0.1",
+    "jest": "29.7.0",
+    "jest-environment-jsdom": "29.7.0",
+    "pmnps": "^4.5.3",
     "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"
+    "typescript": "^4.9.5"
   },
   "keywords": [
     "model",