update.

Author: MrWangJustToDo

package.json

@@ -33,7 +33,7 @@
     "@shikijs/twoslash": "^1.22.2",
     "@shikijs/vitepress-twoslash": "^1.22.2",
     "@swc/core": "^1.10.15",
-    "@types/lodash": "^4.17.15",
+    "@types/lodash": "^4.17.17",
     "@types/node": "^22.13.1",
     "@types/react": "^18.2.79",
     "@types/react-dom": "^18.2.25",
@@ -53,6 +53,6 @@
     "typescript": "^5.3.3",
     "vitepress": "^1.3.4",
     "vue": "^3.5.16",
-    "zustand": "^5.0.0"
+    "zustand": "^5.0.5"
   }
 }

packages/r-store/index.d.ts

@@ -1,8 +1,47 @@
 import type { DeepReadonly } from '@vue/reactivity';
 import type { ReactElement } from 'react';
+import { ReactiveEffect } from '@vue/reactivity';
 import type { ReactNode } from 'react';
 import type { UnwrapNestedRefs } from '@vue/reactivity';
 
+export declare class Controller<T = any> {
+    readonly _getState: () => T;
+    readonly _compare: (prev: T, next: T) => boolean;
+    readonly _lifeCycle: LifeCycle;
+    readonly _namespace?: string;
+    readonly _onUpdate?: () => void;
+    readonly _listeners: Set<() => void>;
+    readonly _list: Set<Controller>;
+    _getStateSafe: () => T;
+    _effect: ReactiveEffect<T>;
+    _state: T;
+    _devState: any;
+    _devCompare: any;
+    _devSelector: any;
+    _devActions: any;
+    _devWithDeep: any;
+    _devWithStable: any;
+    _devVersion: string;
+    _devReduxOptions: any;
+    _devPersistOptions: any;
+    _devType: any;
+    _devResult: any;
+    _devRunCount: number;
+    _updateCount: number;
+    _isActive: boolean;
+    constructor(_getState: () => T, _compare: (prev: T, next: T) => boolean, _lifeCycle: LifeCycle, _list: Set<Controller>, _namespace?: string, _onUpdate?: () => void);
+    notify: () => void;
+    _scheduler: () => void;
+    subscribe: (listener: () => void) => () => boolean;
+    getState: () => number;
+    getEffect: () => ReactiveEffect<T>;
+    getSelectorState: () => T;
+    getLifeCycle: () => LifeCycle;
+    run(): void;
+    stop(): void;
+    setActive(d: boolean): void;
+}
+
 /**
  * @public
  *
@@ -237,6 +276,8 @@ export declare type Creator<T extends Record<string, unknown>> = () => T;
  */
 export declare const getBatch: () => (cb: () => void) => void;
 
+export declare function getCurrentController(): Controller | null;
+
 /**
  * @public
  */

packages/r-store/package.json

@@ -60,13 +60,13 @@
   "dependencies": {
     "@vue/reactivity": "~3.5.16",
     "@vue/shared": "~3.5.16",
-    "use-sync-external-store": "^1.4.0"
+    "use-sync-external-store": "^1.5.0"
   },
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.49.2",
+    "@microsoft/api-extractor": "^7.52.8",
     "@redux-devtools/extension": "^3.3.0",
     "@types/use-sync-external-store": "^0.0.6"
   }

packages/r-store/src/index.ts

@@ -2,6 +2,8 @@ export { onBeforeMount, onBeforeUpdate, onBeforeUnmount, onMounted, onUpdated, o
 
 export { withActions, withPersist, withNamespace, withDeepSelector, withSelectorOptions } from "./state/middleware";
 
+export { getCurrentController, Controller } from "./shared/controller";
+
 export * from "./store/createStoreWithComponent";
 
 export * from "./store/createStore";

packages/r-store/src/shared/controller.ts

@@ -6,6 +6,12 @@ import { queueJob } from "./queue";
 
 import type { LifeCycle } from "./lifeCycle";
 
+let currentController: Controller | null = null;
+
+export function getCurrentController(): Controller | null {
+  return currentController;
+}
+
 class ControllerEffect<T = any> extends ReactiveEffect<T> {
   _devVersion: string;
 
@@ -53,10 +59,6 @@ const catchError = <T>(cb: () => T, instance: Controller) => {
   };
 };
 
-// TODO
-/**
- * @internal
- */
 export class Controller<T = any> {
   readonly _listeners = new Set<() => void>();
 
@@ -150,8 +152,15 @@ export class Controller<T = any> {
   };
 
   _scheduler = () => {
+    const p = getCurrentController();
+
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    currentController = this;
+
     const newState = this._effect.run();
 
+    currentController = p;
+
     if (!this._isActive) return;
 
     const isSame = this._compare(this._state, newState);
@@ -193,7 +202,14 @@ export class Controller<T = any> {
 
   // TODO move into constructor function?
   run() {
+    const p = getCurrentController();
+
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    currentController = this;
+
     this._state = this._effect.run();
+    
+    currentController = p;
   }
 
   stop() {

packages/r-store/src/shared/dev.ts

@@ -2,7 +2,7 @@
 import { isPromise } from "@vue/shared";
 
 import { Controller } from "./controller";
-import { InternalNameSpace, isServer } from "./env";
+import { InternalNameSpace } from "./env";
 import { createLifeCycle } from "./lifeCycle";
 import { traverse, traverseShallow } from "./tools";
 
@@ -33,56 +33,6 @@ export const checkHasKey = (key: string) => {
   return key in namespaceMap;
 };
 
-if (__DEV__ && !isServer) {
-  try {
-    globalThis["@reactivity-store"] = globalThis["@reactivity-store"] || new WeakMap();
-  } catch {
-    void 0;
-  }
-}
-
-/**
- * @internal
- */
-export const setDevController = (controller: Controller, state: any) => {
-  if (__DEV__ && !isServer) {
-    if (!globalThis["@reactivity-store"]) return;
-    try {
-      const set = (globalThis["@reactivity-store"]?.get?.(state) || new Set()) as Set<Controller>;
-
-      set.add(controller);
-
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      set.name = controller._namespace || set?.name;
-
-      globalThis["@reactivity-store"]?.set?.(state, set);
-    } catch {
-      void 0;
-    }
-  }
-};
-
-/**
- * @internal
- */
-export const delDevController = (controller: Controller, state: any) => {
-  if (__DEV__ && !isServer) {
-    if (!globalThis["@reactivity-store"]) return;
-    try {
-      const set = globalThis["@reactivity-store"]?.get?.(state) as Set<Controller>;
-
-      set?.delete?.(controller);
-
-      if (set.size === 0) {
-        globalThis["@reactivity-store"]?.delete?.(state);
-      }
-    } catch {
-      void 0;
-    }
-  }
-};
-
 // cache state which has connect to devtool
 const devToolMap: Record<string, any> = {};
 
@@ -132,14 +82,10 @@ export const connectDevTool = (
 
       globalDevTools = devTools;
 
-      const existState = devToolMap[name];
-
       const existController = devController[name];
 
       if (existController) {
         existController.stop();
-
-        delDevController(existController, existState);
       }
 
       devToolMap[name] = readonlyState;
@@ -179,8 +125,6 @@ export const connectDevTool = (
 
       controller.run();
 
-      setDevController(controller, readonlyState);
-
       const obj = { ...devToolMap };
 
       devTools.init(obj);

packages/r-store/src/shared/hook.ts

@@ -6,7 +6,7 @@ import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useSyncExternalStore } from "use-sync-external-store/shim/index.js";
 
 import { Controller } from "./controller";
-import { delDevController, delNamespace, setDevController, setNamespaceMap } from "./dev";
+import { delNamespace, setNamespaceMap } from "./dev";
 import { InternalNameSpace, isServer } from "./env";
 import { traverse, traverseShallow } from "./tools";
 
@@ -173,14 +173,6 @@ export const createHook = <T extends Record<string, unknown>, C extends Record<s
         ControllerInstance._devState = initialState;
 
         ControllerInstance._devResult = ref.current;
-
-        useEffect(() => {
-          setDevController(ControllerInstance, readonlyState);
-
-          return () => {
-            delDevController(ControllerInstance, readonlyState);
-          };
-        }, [ControllerInstance]);
       }
 
       useEffect(() => {
@@ -275,16 +267,7 @@ export const createHook = <T extends Record<string, unknown>, C extends Record<s
 
     controller.run();
 
-    if (__DEV__) {
-      setDevController(controller, initialState);
-    }
-
-    return () => {
-      if (__DEV__) {
-        delDevController(controller, initialState);
-      }
-      controller.stop();
-    };
+    return () => controller.stop();
   };
 
   typedUseSelector.getIsActive = () => active;

packages/r-store/src/state/middleware/withPersist.ts

@@ -1,9 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-function-type */
-import { reactive, readonly, toRaw } from "@vue/reactivity";
+import { reactive, toRaw } from "@vue/reactivity";
 import { isPromise } from "@vue/shared";
 
 import { Controller } from "../../shared/controller";
-import { setDevController } from "../../shared/dev";
 import { InternalNameSpace, isServer } from "../../shared/env";
 import { createLifeCycle } from "../../shared/lifeCycle";
 import { checkHasReactive, traverse, traverseShallow } from "../../shared/tools";
@@ -155,11 +154,7 @@ export function withPersist<T extends Record<string, unknown>, P extends Record<
 
         ControllerInstance.run();
 
-        const readonlyState = readonly(toRaw(re) as object);
-
         if (__DEV__) {
-          setDevController(ControllerInstance, readonlyState);
-
           ControllerInstance._devPersistOptions = options;
         }