@tamagui/use-store 1.50.0 → 1.50.2

package/src/selector.tsx

@@ -2,7 +2,8 @@ import { useEffect, useState } from 'react'
 
 import { isEqualSubsetShallow } from './comparators'
 import { UNWRAP_PROXY } from './constants'
-import { setIsInReaction, trackStoresAccess } from './useStore'
+import { StoreInfo } from './interfaces'
+import { trackStoresAccess } from './useStore'
 
 // TODO i think we can just replace reaction() with this, its not worse in any way
 
@@ -25,46 +26,46 @@ const logUpdate =
       }
     : null
 
-// TODO test this works the same as useSelector
-export function selector(fn: () => any) {
-  let prev = runStoreSelector(fn)
-  let disposeValue: Function | null = null
-  const subscribe = () => {
-    return subscribeToStores([...prev.stores], () => {
-      try {
-        disposeValue?.()
-        setIsInReaction(true)
-        const next = runStoreSelector(fn)
-        if (typeof next.value === 'function') {
-          disposeValue = next.value
-          if (process.env.NODE_ENV === 'development') {
-            logUpdate!(fn, [...next.stores], '(fn)', '(fn)')
-          }
-          return
-        }
-        if (
-          isEqualSubsetShallow(prev.stores, next.stores) &&
-          isEqualSubsetShallow(prev.value, next.value)
-        ) {
-          return
-        }
-        if (process.env.NODE_ENV === 'development') {
-          logUpdate!(fn, [...next.stores], prev.value, next.value)
-        }
-        prev = next
-        dispose()
-        dispose = subscribe()
-      } finally {
-        setIsInReaction(false)
-      }
-    })
-  }
-  let dispose = subscribe()
-  return () => {
-    dispose()
-    disposeValue?.()
-  }
-}
+// // TODO test this works the same as useSelector
+// export function selector(fn: () => any) {
+//   let prev = runStoreSelector(fn)
+//   let disposeValue: Function | null = null
+//   const subscribe = () => {
+//     return subscribeToStores([...prev.storeInfos], () => {
+//       try {
+//         disposeValue?.()
+//         setIsInReaction(true)
+//         const next = runStoreSelector(fn)
+//         if (typeof next.value === 'function') {
+//           disposeValue = next.value
+//           if (process.env.NODE_ENV === 'development') {
+//             logUpdate!(fn, [...next.storeInfos], '(fn)', '(fn)')
+//           }
+//           return
+//         }
+//         if (
+//           isEqualSubsetShallow(prev.stores, next.stores) &&
+//           isEqualSubsetShallow(prev.value, next.value)
+//         ) {
+//           return
+//         }
+//         if (process.env.NODE_ENV === 'development') {
+//           logUpdate!(fn, [...next.stores], prev.value, next.value)
+//         }
+//         prev = next
+//         dispose()
+//         dispose = subscribe()
+//       } finally {
+//         setIsInReaction(false)
+//       }
+//     })
+//   }
+//   let dispose = subscribe()
+//   return () => {
+//     dispose()
+//     disposeValue?.()
+//   }
+// }
 
 export function useSelector<A>(fn: () => A): A {
   const [state, setState] = useState(() => {
@@ -73,26 +74,30 @@ export function useSelector<A>(fn: () => A): A {
 
   useEffect(() => {
     let dispose
-    const unsub = subscribeToStores([...state.stores], () => {
+    const unsub = subscribeToStores([...state.storeInfos], () => {
       dispose?.()
       const next = runStoreSelector(fn)
+
+      const nextStoreInfos = [...next.storeInfos]
+      const prevStoreInfos = [...state.storeInfos]
+
       // return function === return disposable
       if (typeof next.value === 'function') {
         if (process.env.NODE_ENV === 'development') {
-          logUpdate!(fn, [...next.stores], '(fn)', '(fn)')
+          logUpdate!(fn, nextStoreInfos, '(fn)', '(fn)')
         }
         dispose = next.value
         return
       }
       setState((prev) => {
         if (
-          isEqualSubsetShallow(prev.stores, next.stores) &&
+          isEqualSubsetShallow(prevStoreInfos, nextStoreInfos) &&
           isEqualSubsetShallow(prev.value, next.value)
         ) {
           return prev
         }
         if (process.env.NODE_ENV === 'development') {
-          logUpdate!(fn, [...next.stores], prev.value, next.value)
+          logUpdate!(fn, nextStoreInfos, prev.value, next.value)
         }
         return next
       })
@@ -101,25 +106,28 @@ export function useSelector<A>(fn: () => A): A {
       unsub()
       dispose?.()
     }
-  }, [...state.stores])
+  }, [[...state.storeInfos].map((i) => i.uid).join(',')])
 
   return state.value
 }
 
-function runStoreSelector<A>(selector: () => A): { value: A; stores: Set<any> } {
-  const stores = new Set()
-  const dispose = trackStoresAccess((store) => {
-    stores.add(store)
+function runStoreSelector<A>(selector: () => A): {
+  value: A
+  storeInfos: Set<StoreInfo>
+} {
+  const storeInfos = new Set<StoreInfo>()
+  const dispose = trackStoresAccess((storeInfo) => {
+    storeInfos.add(storeInfo)
   })
   const value = selector()
   dispose()
   return {
     value,
-    stores,
+    storeInfos,
   }
 }
 
-function subscribeToStores(stores: any[], onUpdate: () => any) {
+function subscribeToStores(stores: StoreInfo[], onUpdate: () => any) {
   const disposes: Function[] = []
   for (const store of stores) {
     disposes.push(store.subscribe(onUpdate))

package/src/useStore.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from 'react'
+import { useCallback, useRef, useSyncExternalStore } from 'react'
 
 import { isEqualSubsetShallow } from './comparators'
 import { configureOpts } from './configureUseStore'
@@ -10,21 +10,13 @@ import {
   getStoreUid,
   simpleStr,
 } from './helpers'
-import { Selector, StoreInfo, UseStoreOptions } from './interfaces'
-import {
-  SHOULD_DEBUG,
-  Store,
-  StoreTracker,
-  TRIGGER_UPDATE,
-  disableTracking,
-  setDisableStoreTracking,
-} from './Store'
-import { DebugStores, useCurrentComponent } from './useStoreDebug'
+import { Selector, Store, StoreInfo, UseStoreOptions } from './interfaces'
+import { DebugStores, shouldDebug, useCurrentComponent } from './useStoreDebug'
 
 const idFn = (_) => _
 
 // no singleton, just react
-export function useStore<A extends Store<B>, B extends Object>(
+export function useStore<A, B extends Object>(
   StoreKlass: (new (props: B) => A) | (new () => A),
   props?: B | null,
   options: UseStoreOptions<A, any> = defaultOptions
@@ -35,7 +27,7 @@ export function useStore<A extends Store<B>, B extends Object>(
   return useStoreFromInfo(info, selector, options)
 }
 
-export function useStoreDebug<A extends Store<B>, B extends Object>(
+export function useStoreDebug<A, B extends Object>(
   StoreKlass: (new (props: B) => A) | (new () => A),
   props?: B
 ): A {
@@ -43,7 +35,7 @@ export function useStoreDebug<A extends Store<B>, B extends Object>(
 }
 
 // singleton
-export function createStore<A extends Store<B>, B extends Object>(
+export function createStore<A, B extends Object>(
   StoreKlass: new (props: B) => A | (new () => A),
   props?: B,
   options?: UseStoreOptions<A, any>
@@ -56,10 +48,7 @@ export function createStore<A extends Store<B>, B extends Object>(
 // use singleton with react
 // TODO selector support with types...
 
-export function useGlobalStore<A extends Store<B>, B extends Object>(
-  instance: A,
-  debug?: boolean
-): A {
+export function useGlobalStore<A, B extends Object>(instance: A, debug?: boolean): A {
   const store = instance[UNWRAP_PROXY]
   const uid = getStoreUid(store.constructor, store.props)
   const info = cache.get(uid)
@@ -69,11 +58,7 @@ export function useGlobalStore<A extends Store<B>, B extends Object>(
   return useStoreFromInfo(info, undefined, { debug })
 }
 
-export function useGlobalStoreSelector<
-  A extends Store<B>,
-  B extends Object,
-  Selector extends (store: A) => any
->(
+export function useGlobalStoreSelector<A, Selector extends (store: A) => any>(
   instance: A,
   selector: Selector,
   debug?: boolean
@@ -127,7 +112,7 @@ export function useStoreSelector<
   return useStore(StoreKlass, props, { selector }) as any
 }
 
-type StoreAccessTracker = (store: any) => void
+type StoreAccessTracker = (store: StoreInfo) => void
 const storeAccessTrackers = new Set<StoreAccessTracker>()
 export function trackStoresAccess(cb: StoreAccessTracker) {
   storeAccessTrackers.add(cb)
@@ -136,27 +121,38 @@ export function trackStoresAccess(cb: StoreAccessTracker) {
   }
 }
 
-// get non-singleton outside react (weird)
-export function getStore<A extends Store<B>, B extends Object>(
+export function getStore<A, B extends Object>(
   StoreKlass: (new (props: B) => A) | (new () => A),
   props?: B
 ): A {
-  return getOrCreateStoreInfo(StoreKlass, props).store as any
+  return getStoreInfo(StoreKlass, props).store as any
+}
+
+// just like getOrCreateStoreInfo but refuses to create
+export function getStoreInfo(StoreKlass: any, props: any) {
+  return getOrCreateStoreInfo(StoreKlass, props, {
+    refuseCreation: true,
+  })
 }
 
 function getOrCreateStoreInfo(
   StoreKlass: any,
   props: any,
-  options?: UseStoreOptions & { avoidCache?: boolean },
+  options?: UseStoreOptions & { avoidCache?: boolean; refuseCreation?: boolean },
   propsKeyCalculated?: string
 ) {
   const uid = getStoreUid(StoreKlass, propsKeyCalculated ?? props)
   if (!options?.avoidCache && cache.has(uid)) {
     return cache.get(uid)!
   }
+  if (options?.refuseCreation) {
+    throw new Error(`No store exists (${StoreKlass.name}) with props: ${props}`)
+  }
 
   // init
   const storeInstance = new StoreKlass(props!)
+  // add props
+  storeInstance.props = props
 
   const getters = {}
   const actions = {}
@@ -177,22 +173,44 @@ function getOrCreateStoreInfo(
   }
 
   const keyComparators = storeInstance['_comparators']
+  const listeners = new Set<Function>()
+
   const storeInfo = {
+    uid: Math.random(),
     keyComparators,
     storeInstance,
     getters,
     stateKeys,
     actions,
     debug: options?.debug,
+    disableTracking: false,
     gettersState: {
       getCache: new Map<string, any>(),
       depsToGetter: new Map<string, Set<string>>(),
       curGetKeys: new Set<string>(),
       isGetting: false,
     },
-  }
+    listeners,
+    trackers: new Set(),
+    version: 0,
+    subscribe: (onChanged: Function) => {
+      listeners.add(onChanged)
+      return () => {
+        listeners.delete(onChanged)
+      }
+    },
+    triggerUpdate: () => {
+      storeInfo.version = (storeInfo.version + 1) % Number.MAX_SAFE_INTEGER
+      for (const cb of listeners) {
+        cb()
+      }
+    },
+  } satisfies Omit<StoreInfo, 'store'>
 
-  const store = createProxiedStore(storeInfo)
+  const store = createProxiedStore(
+    // we assign store right after and proxiedStore never accesses it until later on
+    storeInfo as any as StoreInfo
+  )
 
   // uses more memory when on
   if (process.env.NODE_ENV === 'development') {
@@ -202,15 +220,15 @@ function getOrCreateStoreInfo(
   // if has a mount function call it
   store.mount?.()
 
-  const value: StoreInfo = {
-    ...storeInfo,
-    store,
-  }
+  // @ts-ignore
+  storeInfo.store = store
+
+  const result = storeInfo as any as StoreInfo
 
   // still set even when avoidCache is true (hmr)
-  cache.set(uid, value)
+  cache.set(uid, result)
 
-  return value
+  return result
 }
 
 export const allStores = {}
@@ -257,7 +275,7 @@ function useStoreFromInfo(
   const getSnapshot = useCallback(() => {
     const curInternal = internal.current!
     const keys = [...(!curInternal.tracked.size ? info.stateKeys : curInternal.tracked)]
-    const nextKeys = `${store._version}${keys.join('')}${userSelector || ''}`
+    const nextKeys = `${info.version}${keys.join('')}${userSelector || ''}`
     const lastKeys = curInternal.lastKeys
 
     // avoid updates
@@ -269,14 +287,14 @@ function useStoreFromInfo(
 
     let snap: any
     // dont track during selector
-    setDisableStoreTracking(store, true)
+    info.disableTracking = true
     const last = curInternal.last
     if (userSelector) {
       snap = userSelector(store)
     } else {
       snap = selectKeys(store, keys)
     }
-    setDisableStoreTracking(store, false)
+    info.disableTracking = false
 
     // this wasn't updating in AnimationsStore
     const isUnchanged =
@@ -300,7 +318,7 @@ function useStoreFromInfo(
   }, [])
 
   // sync by default
-  const state = useSyncExternalStore(store.subscribe, getSnapshot, getSnapshot)
+  const state = useSyncExternalStore(info.subscribe, getSnapshot, getSnapshot)
 
   if (userSelector) {
     return state
@@ -315,6 +333,7 @@ function useStoreFromInfo(
         return curVal
       }
       const keyString = key as string // fine for our uses
+
       if (info.stateKeys.has(keyString) || keyString in info.getters) {
         if (shouldPrintDebug) {
           // rome-ignore lint/nursery/noConsoleLog: <explanation>
@@ -333,14 +352,13 @@ function useStoreFromInfo(
 let setters = new Set<any>()
 const logStack = new Set<Set<any[]> | 'end'>()
 
-function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
+function createProxiedStore(storeInfo: StoreInfo) {
   const { actions, storeInstance, getters, gettersState } = storeInfo
   const { getCache, curGetKeys, depsToGetter } = gettersState
   const constr = storeInstance.constructor
   const shouldDebug = storeInfo.debug ?? DebugStores.has(constr)
 
   let didSet = false
-  let isInAction = false
   const wrappedActions = {}
 
   // pre-setup actions
@@ -364,10 +382,8 @@ function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
       }
       if (process.env.NODE_ENV === 'development' && shouldDebug) {
         // rome-ignore lint/nursery/noConsoleLog: <explanation>
-        console.log('(debug) startAction', key, { isInAction })
+        console.log('(debug) startAction', key)
       }
-      // dumb for now
-      isInAction = true
       res = Reflect.apply(actionFn, proxiedStore, args)
       if (res instanceof Promise) {
         return res.then(finishAction)
@@ -502,9 +518,8 @@ function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
       // rome-ignore lint/nursery/noConsoleLog: <explanation>
       console.log('(debug) finishAction', { didSet })
     }
-    isInAction = false
     if (didSet) {
-      storeInstance[TRIGGER_UPDATE]?.()
+      storeInfo.triggerUpdate()
       didSet = false
     }
     return val
@@ -528,11 +543,11 @@ function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
       if (key === UNWRAP_STORE_INFO) {
         return storeInfo
       }
-      const trackingDisabled = disableTracking.get(storeInstance)
+      const trackingDisabled = storeInfo.disableTracking
       if (!trackingDisabled) {
         if (storeAccessTrackers.size && !storeAccessTrackers.has(storeInstance)) {
           for (const t of storeAccessTrackers) {
-            t(storeInstance)
+            t(storeInfo)
           }
         }
       }
@@ -585,6 +600,7 @@ function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
     set(target, key, value, receiver) {
       const cur = Reflect.get(target, key)
       const res = Reflect.set(target, key, value, receiver)
+
       // only update if changed, simple compare
       if (res && cur !== value) {
         // clear getters cache that rely on this
@@ -593,21 +609,21 @@ function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
         }
         if (shouldDebug) {
           setters.add({ key, value })
-          if (storeInstance[SHOULD_DEBUG]()) {
+          if (getShouldDebug(storeInfo)) {
             // rome-ignore lint/nursery/noConsoleLog: <explanation>
             console.log('(debug) SET', res, key, value)
           }
         }
         if (process.env.NODE_ENV === 'development' && shouldDebug) {
           // rome-ignore lint/nursery/noConsoleLog: <explanation>
-          console.log('SET...', { key, value, isInAction })
+          console.log('SET...', { key, value })
         }
-        if (isInAction) {
-          didSet = true
-        } else {
+
+        if (!isTriggering) {
+          // trigger only once per event loop
           isTriggering = true
-          queueMicrotask(() => {
-            storeInstance[TRIGGER_UPDATE]?.()
+          waitForEventLoop(() => {
+            storeInfo.triggerUpdate()
             isTriggering = false
           })
         }
@@ -617,12 +633,12 @@ function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
   })
 
   function clearGetterCache(setKey: string) {
-    const getters = depsToGetter.get(setKey)
+    const parentGetters = depsToGetter.get(setKey)
     getCache.delete(setKey)
-    if (!getters) {
+    if (!parentGetters) {
       return
     }
-    for (const gk of getters) {
+    for (const gk of parentGetters) {
       getCache.delete(gk)
       if (depsToGetter.has(gk)) {
         clearGetterCache(gk)
@@ -633,6 +649,9 @@ function createProxiedStore(storeInfo: Omit<StoreInfo, 'store' | 'source'>) {
   return proxiedStore
 }
 
+const waitForEventLoop =
+  process.env.NODE_ENV === 'test' ? (cb: Function) => cb() : queueMicrotask
+
 let counter = 0
 
 const passThroughKeys = {
@@ -643,3 +662,18 @@ const passThroughKeys = {
   _listeners: true,
   _enableTracking: true,
 }
+
+export type StoreTracker = {
+  tracked: Set<string>
+  component?: any
+  last?: any
+  lastKeys?: any
+}
+
+function getShouldDebug(storeInfo: StoreInfo) {
+  const info = { storeInstance: storeInfo.store }
+  const trackers = storeInfo.trackers
+  return [...trackers].some(
+    (tracker) => tracker.component && shouldDebug(tracker.component, info)
+  )
+}

package/types/index.d.ts

@@ -3,8 +3,11 @@ export { configureUseStore } from './configureUseStore';
 export * from './interfaces';
 export * from './selector';
 export * from './reaction';
-export * from './Store';
 export { UNWRAP_PROXY } from './constants';
 export * from './comparators';
 export * from './decorators';
+export declare class Store<Props extends Record<string, any>> {
+    props: Props;
+    constructor(props: Props);
+}
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,SAAS,CAAA;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,cAAc,cAAc,CAAA;AAC5B,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,cAAc,eAAe,CAAA;AAC7B,cAAc,cAAc,CAAA;AAG5B,qBAAa,KAAK,CAAC,KAAK,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAC/B,KAAK,EAAE,KAAK;gBAAZ,KAAK,EAAE,KAAK;CAChC"}

package/types/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { Store } from './Store';
+import { StoreTracker } from './useStore';
 export type Selector<A = unknown, B = unknown> = (x: A) => B;
 export type UseStoreSelector<Store, Res> = (store: Store) => Res;
 export type UseStoreOptions<Store = any, SelectorRes = any> = {
@@ -6,7 +6,12 @@ export type UseStoreOptions<Store = any, SelectorRes = any> = {
     selector?: UseStoreSelector<Store, SelectorRes>;
     once?: boolean;
 };
+export interface Store<Props = Record<string, any> | null | undefined> {
+    new (...args: any[]): any;
+    props: Props;
+}
 export type StoreInfo<A = Store> = {
+    uid: number;
     keyComparators?: {
         [key: string]: (a: any, b: any) => boolean;
     };
@@ -24,6 +29,12 @@ export type StoreInfo<A = Store> = {
         curGetKeys: Set<string>;
         isGetting: boolean;
     };
+    listeners: Set<Function>;
+    trackers: Set<StoreTracker>;
+    version: number;
+    subscribe: (onChanged: () => void) => () => void;
+    triggerUpdate: Function;
+    disableTracking: boolean;
 };
 export type UseStoreConfig = {
     logLevel?: 'debug' | 'info' | 'error';

package/types/interfaces.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE/B,MAAM,MAAM,QAAQ,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;AAE5D,MAAM,MAAM,gBAAgB,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,KAAK,GAAG,CAAA;AAChE,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,GAAG,IAAI;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;IAC/C,IAAI,CAAC,EAAE,OAAO,CAAA;CACf,CAAA;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,KAAK,IAAI;IACjC,cAAc,CAAC,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAAO,CAAA;KAC3C,CAAA;IAED,KAAK,EAAE,CAAC,CAAA;IACR,aAAa,EAAE,GAAG,CAAA;IAClB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAA;IAC/B,OAAO,EAAE,GAAG,CAAA;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,YAAY,EAAE;QACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACtC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QACvB,SAAS,EAAE,OAAO,CAAA;KACnB,CAAA;CACF,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAA;CACtC,CAAA"}
+{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../src/interfaces.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEzC,MAAM,MAAM,QAAQ,CAAC,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;AAE5D,MAAM,MAAM,gBAAgB,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,KAAK,GAAG,CAAA;AAChE,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,GAAG,IAAI;IAC5D,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAA;IAC/C,IAAI,CAAC,EAAE,OAAO,CAAA;CACf,CAAA;AAED,MAAM,WAAW,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,GAAG,SAAS;IACnE,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,CAAA;IACzB,KAAK,EAAE,KAAK,CAAA;CACb;AAED,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,KAAK,IAAI;IACjC,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,CAAC,EAAE;QACf,CAAC,GAAG,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAAO,CAAA;KAC3C,CAAA;IAED,KAAK,EAAE,CAAC,CAAA;IACR,aAAa,EAAE,GAAG,CAAA;IAClB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAA;IAC/B,OAAO,EAAE,GAAG,CAAA;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IACtB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,YAAY,EAAE;QACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;QACtC,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;QACvB,SAAS,EAAE,OAAO,CAAA;KACnB,CAAA;IACD,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxB,QAAQ,EAAE,GAAG,CAAC,YAAY,CAAC,CAAA;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,IAAI,KAAK,MAAM,IAAI,CAAA;IAChD,aAAa,EAAE,QAAQ,CAAA;IACvB,eAAe,EAAE,OAAO,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,CAAA;CACtC,CAAA"}

package/types/reaction.d.ts

@@ -1,4 +1,4 @@
-import { Store } from './Store';
-export declare function useReaction<StoreInstance extends Store<any>, Selector extends (a: StoreInstance) => any>(store: StoreInstance, selector: Selector, receiver: Selector extends (a: StoreInstance) => infer Derived ? (a: Derived) => any : unknown, equalityFn?: (a: any, b: any) => boolean, memoArgs?: any[]): () => void;
-export declare function reaction<StoreInstance extends Store<any>, Selector extends (a: StoreInstance) => any>(store: StoreInstance, selector: Selector, receiver: Selector extends (a: StoreInstance) => infer Derived ? (a: Derived) => any : unknown, equalityFn?: (a: any, b: any) => boolean): () => void;
+import { StoreInfo } from './interfaces';
+export declare function useReaction<StoreInstance, Selector extends (a: StoreInstance) => any>(store: StoreInstance, selector: Selector, receiver: Selector extends (a: StoreInstance) => infer Derived ? (a: Derived) => any : unknown, props?: Record<string, any>, equalityFn?: (a: any, b: any) => boolean, memoArgs?: any[]): () => void;
+export declare function reaction<StoreInstance extends StoreInfo, Selector extends (a: StoreInstance) => any>({ store, subscribe }: StoreInstance, selector: Selector, receiver: Selector extends (a: StoreInstance) => infer Derived ? (a: Derived) => any : unknown, equalityFn?: (a: any, b: any) => boolean): () => void;
 //# sourceMappingURL=reaction.d.ts.map

package/types/reaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reaction.d.ts","sourceRoot":"","sources":["../src/reaction.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAS/B,wBAAgB,WAAW,CACzB,aAAa,SAAS,KAAK,CAAC,GAAG,CAAC,EAChC,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,GAAG,EAE1C,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,MAAM,OAAO,GAC1D,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,GACnB,OAAO,EACX,UAAU,GAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAA8B,EAC9D,QAAQ,CAAC,EAAE,GAAG,EAAE,cAGjB;AAED,wBAAgB,QAAQ,CACtB,aAAa,SAAS,KAAK,CAAC,GAAG,CAAC,EAChC,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,GAAG,EAE1C,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,MAAM,OAAO,GAC1D,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,GACnB,OAAO,EACX,UAAU,GAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAA8B,cAyC/D"}
+{"version":3,"file":"reaction.d.ts","sourceRoot":"","sources":["../src/reaction.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAA;AASxC,wBAAgB,WAAW,CAAC,aAAa,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,GAAG,EACnF,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,MAAM,OAAO,GAC1D,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,GACnB,OAAO,EACX,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,UAAU,GAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAA8B,EAC9D,QAAQ,CAAC,EAAE,GAAG,EAAE,cAOjB;AAED,wBAAgB,QAAQ,CACtB,aAAa,SAAS,SAAS,EAC/B,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,GAAG,EAE1C,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,aAAa,EACnC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,SAAS,CAAC,CAAC,EAAE,aAAa,KAAK,MAAM,OAAO,GAC1D,CAAC,CAAC,EAAE,OAAO,KAAK,GAAG,GACnB,OAAO,EACX,UAAU,GAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,OAA8B,cAyC/D"}

package/types/selector.d.ts

@@ -1,3 +1,2 @@
-export declare function selector(fn: () => any): () => void;
 export declare function useSelector<A>(fn: () => A): A;
 //# sourceMappingURL=selector.d.ts.map

package/types/selector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../src/selector.tsx"],"names":[],"mappings":"AA4BA,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,cAsCrC;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAsC7C"}
+{"version":3,"file":"selector.d.ts","sourceRoot":"","sources":["../src/selector.tsx"],"names":[],"mappings":"AAqEA,wBAAgB,WAAW,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CA0C7C"}

package/types/useStore.d.ts

@@ -1,17 +1,23 @@
-import { Selector, UseStoreOptions } from './interfaces';
-import { Store } from './Store';
-export declare function useStore<A extends Store<B>, B extends Object>(StoreKlass: (new (props: B) => A) | (new () => A), props?: B | null, options?: UseStoreOptions<A, any>): A;
-export declare function useStoreDebug<A extends Store<B>, B extends Object>(StoreKlass: (new (props: B) => A) | (new () => A), props?: B): A;
-export declare function createStore<A extends Store<B>, B extends Object>(StoreKlass: new (props: B) => A | (new () => A), props?: B, options?: UseStoreOptions<A, any>): A;
-export declare function useGlobalStore<A extends Store<B>, B extends Object>(instance: A, debug?: boolean): A;
-export declare function useGlobalStoreSelector<A extends Store<B>, B extends Object, Selector extends (store: A) => any>(instance: A, selector: Selector, debug?: boolean): Selector extends (a: A) => infer C ? C : unknown;
+import { Selector, Store, StoreInfo, UseStoreOptions } from './interfaces';
+export declare function useStore<A, B extends Object>(StoreKlass: (new (props: B) => A) | (new () => A), props?: B | null, options?: UseStoreOptions<A, any>): A;
+export declare function useStoreDebug<A, B extends Object>(StoreKlass: (new (props: B) => A) | (new () => A), props?: B): A;
+export declare function createStore<A, B extends Object>(StoreKlass: new (props: B) => A | (new () => A), props?: B, options?: UseStoreOptions<A, any>): A;
+export declare function useGlobalStore<A, B extends Object>(instance: A, debug?: boolean): A;
+export declare function useGlobalStoreSelector<A, Selector extends (store: A) => any>(instance: A, selector: Selector, debug?: boolean): Selector extends (a: A) => infer C ? C : unknown;
 export declare function createUseStore<Props, Store>(StoreKlass: (new (props: Props) => Store) | (new () => Store)): <Res, C extends Selector<Store, Res>, Props_1 extends Object>(props?: Props_1 | undefined, options?: UseStoreOptions) => C extends Selector<any, infer B> ? B extends Object ? B : Store : Store;
 export declare function createUseStoreSelector<A extends Store<Props>, Props extends Object, Selected>(StoreKlass: (new (props: Props) => A) | (new () => A), selector: Selector<A, Selected>): (props?: Props) => Selected;
 export declare function useStoreSelector<A extends Store<B>, B extends Object, S extends Selector<A, any>>(StoreKlass: (new (props: B) => A) | (new () => A), selector: S, props?: B): S extends Selector<any, infer R> ? R : unknown;
-type StoreAccessTracker = (store: any) => void;
+type StoreAccessTracker = (store: StoreInfo) => void;
 export declare function trackStoresAccess(cb: StoreAccessTracker): () => void;
-export declare function getStore<A extends Store<B>, B extends Object>(StoreKlass: (new (props: B) => A) | (new () => A), props?: B): A;
+export declare function getStore<A, B extends Object>(StoreKlass: (new (props: B) => A) | (new () => A), props?: B): A;
+export declare function getStoreInfo(StoreKlass: any, props: any): StoreInfo;
 export declare const allStores: {};
 export declare const setIsInReaction: (val: boolean) => void;
+export type StoreTracker = {
+    tracked: Set<string>;
+    component?: any;
+    last?: any;
+    lastKeys?: any;
+};
 export {};
 //# sourceMappingURL=useStore.d.ts.map