WIP A bunch of useSelector tests actually pass somehow

Author: markerikson

jest.config.js

@@ -51,8 +51,8 @@ const nextEntryConfig = {
 module.exports = {
   projects: [
     tsStandardConfig,
-    rnConfig,
-    standardReact17Config,
-    nextEntryConfig,
+    //rnConfig,
+    //standardReact17Config,
+    //nextEntryConfig,
   ],
 }

src/components/Context.ts

@@ -3,6 +3,7 @@ import type { Context } from 'react'
 import type { Action, AnyAction, Store } from 'redux'
 import type { Subscription } from '../utils/Subscription'
 import type { CheckFrequency } from '../hooks/useSelector'
+import type { Node } from '../utils/autotracking/tracking'
 
 export interface ReactReduxContextValue<
   SS = any,
@@ -13,6 +14,7 @@ export interface ReactReduxContextValue<
   getServerState?: () => SS
   stabilityCheck: CheckFrequency
   noopCheck: CheckFrequency
+  trackingNode: Node<Record<string, unknown>>
 }
 
 const ContextKey = Symbol.for(`react-redux-context-${ReactVersion}`)

src/components/Provider.tsx

@@ -6,6 +6,7 @@ import { createSubscription } from '../utils/Subscription'
 import { useIsomorphicLayoutEffect } from '../utils/useIsomorphicLayoutEffect'
 import type { Action, AnyAction, Store } from 'redux'
 import type { CheckFrequency } from '../hooks/useSelector'
+import { createNode, updateNode } from '../utils/autotracking/proxy'
 
 export interface ProviderProps<A extends Action = AnyAction, S = unknown> {
   /**
@@ -42,14 +43,21 @@ function Provider<A extends Action = AnyAction, S = unknown>({
   stabilityCheck = 'once',
   noopCheck = 'once',
 }: ProviderProps<A, S>) {
-  const contextValue = useMemo(() => {
-    const subscription = createSubscription(store)
+  const contextValue: ReactReduxContextValue = useMemo(() => {
+    const trackingNode = createNode(store.getState() as any)
+    //console.log('Created tracking node: ', trackingNode)
+    const subscription = createSubscription(
+      store as any,
+      undefined,
+      trackingNode
+    )
     return {
-      store,
+      store: store as any,
       subscription,
       getServerState: serverState ? () => serverState : undefined,
       stabilityCheck,
       noopCheck,
+      trackingNode,
     }
   }, [store, serverState, stabilityCheck, noopCheck])
 

src/hooks/useSelector.ts

@@ -1,4 +1,4 @@
-import { useCallback, useDebugValue, useRef } from 'react'
+import { useCallback, useDebugValue, useMemo, useRef } from 'react'
 
 import {
   createReduxContextHook,
@@ -8,6 +8,8 @@ import { ReactReduxContext } from '../components/Context'
 import type { EqualityFn, NoInfer } from '../types'
 import type { uSESWS } from '../utils/useSyncExternalStore'
 import { notInitialized } from '../utils/useSyncExternalStore'
+import { useIsomorphicLayoutEffect } from '../utils/useIsomorphicLayoutEffect'
+import { createCache } from '../utils/autotracking/autotracking'
 
 export type CheckFrequency = 'never' | 'once' | 'always'
 
@@ -80,6 +82,7 @@ export function createSelectorHook(context = ReactReduxContext): UseSelector {
       getServerState,
       stabilityCheck: globalStabilityCheck,
       noopCheck: globalNoopCheck,
+      trackingNode,
     } = useReduxContext()!
 
     const firstRun = useRef(true)
@@ -136,11 +139,44 @@ export function createSelectorHook(context = ReactReduxContext): UseSelector {
       [selector, globalStabilityCheck, stabilityCheck]
     )
 
+    const latestWrappedSelectorRef = useRef(wrappedSelector)
+
+    console.log(
+      'Writing latest selector. Same reference? ',
+      wrappedSelector === latestWrappedSelectorRef.current
+    )
+    latestWrappedSelectorRef.current = wrappedSelector
+
+    const cache = useMemo(() => {
+      const cache = createCache(() => {
+        console.log('Wrapper cache called: ', store.getState())
+        return latestWrappedSelectorRef.current(trackingNode.proxy as TState)
+      })
+      return cache
+    }, [trackingNode])
+
+    const subscribeToStore = useMemo(() => {
+      const subscribeToStore = (onStoreChange: () => void) => {
+        const wrappedOnStoreChange = () => {
+          // console.log('wrappedOnStoreChange')
+          return onStoreChange()
+        }
+        // console.log('Subscribing to store with tracking')
+        return subscription.addNestedSub(wrappedOnStoreChange, {
+          trigger: 'tracked',
+          cache,
+        })
+      }
+      return subscribeToStore
+    }, [subscription])
+
     const selectedState = useSyncExternalStoreWithSelector(
-      subscription.addNestedSub,
+      //subscription.addNestedSub,
+      subscribeToStore,
       store.getState,
+      //() => trackingNode.proxy as TState,
       getServerState || store.getState,
-      wrappedSelector,
+      cache.getValue,
       equalityFn
     )
 

src/utils/Subscription.ts

@@ -1,4 +1,13 @@
+import type { Store } from 'redux'
 import { getBatch } from './batch'
+import type { Node } from './autotracking/tracking'
+
+import {
+  createCache,
+  TrackingCache,
+  $REVISION,
+} from './autotracking/autotracking'
+import { updateNode } from './autotracking/proxy'
 
 // encapsulates the subscription logic for connecting a component to the redux store, as
 // well as nesting subscriptions of descendant components, so that we can ensure the
@@ -10,6 +19,9 @@ type Listener = {
   callback: VoidFunc
   next: Listener | null
   prev: Listener | null
+  trigger: 'always' | 'tracked'
+  selectorCache?: TrackingCache
+  subscriberCache?: TrackingCache
 }
 
 function createListenerCollection() {
@@ -24,10 +36,29 @@ function createListenerCollection() {
     },
 
     notify() {
+      //console.log('Notifying subscribers')
       batch(() => {
         let listener = first
         while (listener) {
-          listener.callback()
+          //console.log('Listener: ', listener)
+          if (listener.trigger == 'tracked') {
+            if (listener.selectorCache!.needsRecalculation()) {
+              console.log('Calling subscriber due to recalc need')
+              // console.log(
+              //   'Calling subscriber due to recalc. Revision before: ',
+              //   $REVISION
+              // )
+              listener.callback()
+              //console.log('Revision after: ', $REVISION)
+            } else {
+              console.log(
+                'Skipping subscriber, no recalc: ',
+                listener.selectorCache
+              )
+            }
+          } else {
+            listener.callback()
+          }
           listener = listener.next
         }
       })
@@ -43,13 +74,29 @@ function createListenerCollection() {
       return listeners
     },
 
-    subscribe(callback: () => void) {
+    subscribe(
+      callback: () => void,
+      options: AddNestedSubOptions = { trigger: 'always' }
+    ) {
       let isSubscribed = true
 
+      //console.log('Adding listener: ', options.trigger)
+
       let listener: Listener = (last = {
         callback,
         next: null,
         prev: last,
+        trigger: options.trigger,
+        selectorCache:
+          options.trigger === 'tracked' ? options.cache! : undefined,
+        // subscriberCache:
+        //   options.trigger === 'tracked'
+        //     ? createCache(() => {
+        //         console.log('Calling subscriberCache')
+        //         listener.selectorCache!.get()
+        //         callback()
+        //       })
+        //     : undefined,
       })
 
       if (listener.prev) {
@@ -79,13 +126,18 @@ function createListenerCollection() {
 
 type ListenerCollection = ReturnType<typeof createListenerCollection>
 
+interface AddNestedSubOptions {
+  trigger: 'always' | 'tracked'
+  cache?: TrackingCache
+}
+
 export interface Subscription {
-  addNestedSub: (listener: VoidFunc) => VoidFunc
+  addNestedSub: (listener: VoidFunc, options?: AddNestedSubOptions) => VoidFunc
   notifyNestedSubs: VoidFunc
   handleChangeWrapper: VoidFunc
   isSubscribed: () => boolean
   onStateChange?: VoidFunc | null
-  trySubscribe: VoidFunc
+  trySubscribe: (options?: AddNestedSubOptions) => void
   tryUnsubscribe: VoidFunc
   getListeners: () => ListenerCollection
 }
@@ -95,16 +147,28 @@ const nullListeners = {
   get: () => [],
 } as unknown as ListenerCollection
 
-export function createSubscription(store: any, parentSub?: Subscription) {
+export function createSubscription(
+  store: Store,
+  parentSub?: Subscription,
+  trackingNode?: Node<any>
+) {
   let unsubscribe: VoidFunc | undefined
   let listeners: ListenerCollection = nullListeners
 
-  function addNestedSub(listener: () => void) {
-    trySubscribe()
-    return listeners.subscribe(listener)
+  function addNestedSub(
+    listener: () => void,
+    options: AddNestedSubOptions = { trigger: 'always' }
+  ) {
+    //console.log('addNestedSub: ', options)
+    trySubscribe(options)
+    return listeners.subscribe(listener, options)
   }
 
   function notifyNestedSubs() {
+    if (store && trackingNode) {
+      //console.log('Updating node in notifyNestedSubs')
+      updateNode(trackingNode, store.getState())
+    }
     listeners.notify()
   }
 
@@ -118,10 +182,11 @@ export function createSubscription(store: any, parentSub?: Subscription) {
     return Boolean(unsubscribe)
   }
 
-  function trySubscribe() {
+  function trySubscribe(options: AddNestedSubOptions = { trigger: 'always' }) {
     if (!unsubscribe) {
+      //console.log('trySubscribe, parentSub: ', parentSub)
       unsubscribe = parentSub
-        ? parentSub.addNestedSub(handleChangeWrapper)
+        ? parentSub.addNestedSub(handleChangeWrapper, options)
         : store.subscribe(handleChangeWrapper)
 
       listeners = createListenerCollection()