pinia-react 1.1.1 → 1.2.0

package/dist/index.d.ts

@@ -40,6 +40,10 @@ interface StoreDefinition<Id extends string = string, S extends StateTree = Stat
    * Id of the store. Used by map helpers.
    */
   $id: Id;
+  /**
+   * Return to store for use within non-functional components
+   */
+  $getStore: () => Store<Id, S, G, A>;
 }
 type PiniaPluginContext<Id extends string = string, S extends StateTree = StateTree, G = _GettersTree<S>, A = _ActionsTree> = {
   options: DefineStoreOptions<Id, S, G, A>;

package/dist/index.js

@@ -1,5 +1,5 @@
 import { ReactiveEffect, activeEffect, computed, isReactive, isRef, markRaw, reactive, toRefs, watch } from "@maoism/runtime-core";
-import React, { useCallback, useId, useRef } from "react";
+import { useCallback, useId, useRef, useSyncExternalStore } from "react";
 import { isFunction } from "savage-types";
 import "savage-utils";
 
@@ -93,12 +93,9 @@ function defineStore(id, options) {
 			}
 		};
 		pinia._state.set(id, $state);
-		const store = reactive(Object.assign(baseStore, toRefs($state), Object.keys(actions ?? []).reduce((x, y) => {
-			const key = y;
-			return Object.assign(x, { [key]: function(...args) {
-				return actions[key].call(this, ...args);
-			} });
-		}, {}), Object.keys(getters || {}).reduce((computedGetters, name) => {
+		const store = reactive(Object.assign(baseStore, toRefs($state), Object.keys(actions ?? []).reduce((x, y) => Object.assign(x, { [y]: function(...args) {
+			return actions[y].call(store, ...args);
+		} }), {}), Object.keys(getters || {}).reduce((computedGetters, name) => {
 			computedGetters[name] = markRaw(computed(() => {
 				return getters?.[name].call(store, store);
 			}));
@@ -122,7 +119,8 @@ function defineStore(id, options) {
 		const store = pinia._store.get(id);
 		isSyncListening = true;
 		const _id = useRef([useId()]);
-		const storeSnapshotRef = React.useRef({ ...store });
+		const storeSnapshotRef = useRef({ ...store });
+		const isCollectDep = useRef(false);
 		const subscribe = useCallback((onStoreChange) => {
 			subscribeMap.set(_id.current, onStoreChange);
 			return () => {
@@ -132,24 +130,33 @@ function defineStore(id, options) {
 				effectMap.delete(_id.current);
 			};
 		}, []);
-		React.useSyncExternalStore(subscribe, () => storeSnapshotRef.current, () => ({ ...store }));
+		useSyncExternalStore(subscribe, () => storeSnapshotRef.current, () => ({ ...store }));
 		let effect = effectMap.get(_id.current);
 		if (!effect) {
 			const fn = () => {
 				const onStoreChange = subscribeMap.get(_id.current);
-				onStoreChange?.();
+				if (!isCollectDep.current) {
+					storeSnapshotRef.current = { ...store };
+					onStoreChange?.();
+				}
 			};
 			effect = new ReactiveEffect(fn, noop, () => {
-				storeSnapshotRef.current = { ...store };
 				if (effect?.dirty) effect.run();
 			});
 			activeEffect.value = effect;
+			isCollectDep.current = true;
 			effect.run();
 			effectMap.set(_id.current, effect);
+			isCollectDep.current = false;
 		}
 		return store;
 	}
 	useStore.$id = id;
+	useStore.$getStore = () => {
+		if (!pinia._store.has(id)) createStore();
+		const store = pinia._store.get(id);
+		return store;
+	};
 	return useStore;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinia-react",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "type": "module",
   "homepage": "https://github.com/savageKarl/pinia-react#readme",
   "bugs": {
@@ -30,7 +30,8 @@
     "dev": "tsdown --watch",
     "playground": "vite --config playground/vite.config.ts",
     "test": "vitest",
-    "semantic-release": "semantic-release"
+    "semantic-release": "semantic-release",
+    "format": "pnpm exec biome check --write"
   },
   "keywords": [
     "pinia",