From a04c04ea3d044cb1bf4241820c8e03a9bb6bdd78 Mon Sep 17 00:00:00 2001
From: ShirShintel <shirsh@wix.com>
Date: Sun, 3 Nov 2024 15:29:30 +0200
Subject: [PATCH 1/4] Clear memoized for state while defering notifications

---
 src/appHost.tsx                |  6 +++++-
 src/throttledStore.tsx         |  9 ++++++---
 test/connectWithShell.spec.tsx | 14 ++++++++++++++
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/appHost.tsx b/src/appHost.tsx
index 703144e..2550e5f 100644
--- a/src/appHost.tsx
+++ b/src/appHost.tsx
@@ -129,6 +129,7 @@ export function createAppHost(initialEntryPointsOrPackages: EntryPointOrPackage[
     let isInstallingEntryPoints: boolean = false
     let isStoreSubscribersNotifyInProgress = false
     let isObserversNotifyInProgress = false
+    let isDeferringNotifications = false
     const entryPointsInstallationEndCallbacks: Map<string, () => void> = new Map()
 
     verifyLayersUniqueness(options.layers)
@@ -665,6 +666,9 @@ miss: ${memoizedWithMissHit.miss}
                 },
                 notifyObserversIsRunning => {
                     isObserversNotifyInProgress = notifyObserversIsRunning
+                },
+                deferNotifications => {
+                    isDeferringNotifications = deferNotifications
                 }
             )
             store.subscribe(() => {
@@ -675,7 +679,7 @@ miss: ${memoizedWithMissHit.miss}
             })
             store.syncSubscribe(() => {
                 shouldFlushMemoization = true
-                if (isStoreSubscribersNotifyInProgress || isObserversNotifyInProgress) {
+                if (isStoreSubscribersNotifyInProgress || isObserversNotifyInProgress || isDeferringNotifications) {
                     shouldFlushMemoization = false
                     flushMemoizedForState()
                 }
diff --git a/src/throttledStore.tsx b/src/throttledStore.tsx
index bb57a94..bb71701 100644
--- a/src/throttledStore.tsx
+++ b/src/throttledStore.tsx
@@ -47,7 +47,7 @@ export interface StateContribution<TState = {}, TAction extends AnyAction = AnyA
 export interface ThrottledStore<T = any> extends Store<T> {
     hasPendingSubscribers(): boolean
     flush(config?: { excecutionType: 'scheduled' | 'immediate' | 'default' }): void
-    deferSubscriberNotifications<K>(action: () => K | Promise<K>): Promise<K>
+    deferSubscriberNotifications<K>(action: () => K | Promise<K>, shouldClearMemoizedForState?: boolean): Promise<K>
 }
 
 export interface PrivateThrottledStore<T = any> extends ThrottledStore<T> {
@@ -157,7 +157,8 @@ export const createThrottledStore = (
     requestAnimationFrame: Window['requestAnimationFrame'],
     cancelAnimationFrame: Window['cancelAnimationFrame'],
     updateIsSubscriptionNotifyInProgress: (isSubscriptionNotifyInProgress: boolean) => void,
-    updateIsObserversNotifyInProgress: (isObserversNotifyInProgress: boolean) => void
+    updateIsObserversNotifyInProgress: (isObserversNotifyInProgress: boolean) => void,
+    updateIsDeferringNotifications: (isDeferringNotifications: boolean) => void
 ): PrivateThrottledStore => {
     let pendingBroadcastNotification = false
     let pendingObservableNotifications: Set<AnyPrivateObservableState> | undefined
@@ -279,17 +280,19 @@ export const createThrottledStore = (
         observableNotify: onObservableNotify,
         resetPendingNotifications: resetAllPendingNotifications,
         hasPendingSubscribers: () => pendingBroadcastNotification,
-        deferSubscriberNotifications: async action => {
+        deferSubscriberNotifications: async (action, shouldClearMemoizedForState) => {
             if (isDeferrringNotifications) {
                 return action()
             }
             try {
                 executePendingActions()
                 isDeferrringNotifications = true
+                shouldClearMemoizedForState && updateIsDeferringNotifications(isDeferrringNotifications)
                 const functionResult = await action()
                 return functionResult
             } finally {
                 isDeferrringNotifications = false
+                shouldClearMemoizedForState && updateIsDeferringNotifications(isDeferrringNotifications)
                 executePendingActions()
             }
         }
diff --git a/test/connectWithShell.spec.tsx b/test/connectWithShell.spec.tsx
index ed2915f..d1eb155 100644
--- a/test/connectWithShell.spec.tsx
+++ b/test/connectWithShell.spec.tsx
@@ -937,6 +937,20 @@ describe('connectWithShell-useCases', () => {
         expect(renderSpy).toHaveBeenCalledTimes(2)
     })
 
+    it('should clear state memoization on every state update when deferring subscriber notifications', async () => {
+        const { host, shell } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
+        let numberOfCalls = 0
+        const originalFn = jest.fn(() => ++numberOfCalls)
+        const memoizedFn = shell.memoizeForState(originalFn, () => '*') as _.MemoizedFunction
+        const clearCacheSpy = jest.spyOn(memoizedFn.cache, 'clear')
+
+        await host.getStore().deferSubscriberNotifications(() => {
+            host.getStore().dispatch({ type: 'MOCK' })
+        }, true)
+
+        expect(clearCacheSpy).toHaveBeenCalledTimes(1)
+    })
+
     it('should not mount connected component on props update', () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
         const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)

From 874082f192dc1c419ec79bae664214db983ba597 Mon Sep 17 00:00:00 2001
From: ShirShintel <shirsh@wix.com>
Date: Sun, 3 Nov 2024 16:56:57 +0200
Subject: [PATCH 2/4] add one more test

---
 test/connectWithShell.spec.tsx | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/connectWithShell.spec.tsx b/test/connectWithShell.spec.tsx
index d1eb155..16b4ca9 100644
--- a/test/connectWithShell.spec.tsx
+++ b/test/connectWithShell.spec.tsx
@@ -937,7 +937,7 @@ describe('connectWithShell-useCases', () => {
         expect(renderSpy).toHaveBeenCalledTimes(2)
     })
 
-    it('should clear state memoization on every state update when deferring subscriber notifications', async () => {
+    it('should clear state memoization on dispatch when deferring notifications and setting shouldClearMemoizedForState', async () => {
         const { host, shell } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
         let numberOfCalls = 0
         const originalFn = jest.fn(() => ++numberOfCalls)
@@ -951,6 +951,20 @@ describe('connectWithShell-useCases', () => {
         expect(clearCacheSpy).toHaveBeenCalledTimes(1)
     })
 
+    it('should not clear state memoization on dispatch when deferring notifications without setting shouldClearMemoizedForState', async () => {
+        const { host, shell } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
+        let numberOfCalls = 0
+        const originalFn = jest.fn(() => ++numberOfCalls)
+        const memoizedFn = shell.memoizeForState(originalFn, () => '*') as _.MemoizedFunction
+        const clearCacheSpy = jest.spyOn(memoizedFn.cache, 'clear')
+
+        await host.getStore().deferSubscriberNotifications(() => {
+            host.getStore().dispatch({ type: 'MOCK' })
+        })
+
+        expect(clearCacheSpy).toHaveBeenCalledTimes(0)
+    })
+
     it('should not mount connected component on props update', () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
         const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)

From 46ffc11d6b1d1789399ca67896c766c2975f5bba Mon Sep 17 00:00:00 2001
From: ShirShintel <shirsh@wix.com>
Date: Mon, 4 Nov 2024 13:59:21 +0200
Subject: [PATCH 3/4] rename

---
 src/appHost.tsx        | 8 ++++----
 src/throttledStore.tsx | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/appHost.tsx b/src/appHost.tsx
index 2550e5f..0f30ca1 100644
--- a/src/appHost.tsx
+++ b/src/appHost.tsx
@@ -129,7 +129,7 @@ export function createAppHost(initialEntryPointsOrPackages: EntryPointOrPackage[
     let isInstallingEntryPoints: boolean = false
     let isStoreSubscribersNotifyInProgress = false
     let isObserversNotifyInProgress = false
-    let isDeferringNotifications = false
+    let shouldFlushMemoizationSync = false
     const entryPointsInstallationEndCallbacks: Map<string, () => void> = new Map()
 
     verifyLayersUniqueness(options.layers)
@@ -667,8 +667,8 @@ miss: ${memoizedWithMissHit.miss}
                 notifyObserversIsRunning => {
                     isObserversNotifyInProgress = notifyObserversIsRunning
                 },
-                deferNotifications => {
-                    isDeferringNotifications = deferNotifications
+                updateShouldFlushMemoizationSync => {
+                    shouldFlushMemoizationSync = updateShouldFlushMemoizationSync
                 }
             )
             store.subscribe(() => {
@@ -679,7 +679,7 @@ miss: ${memoizedWithMissHit.miss}
             })
             store.syncSubscribe(() => {
                 shouldFlushMemoization = true
-                if (isStoreSubscribersNotifyInProgress || isObserversNotifyInProgress || isDeferringNotifications) {
+                if (isStoreSubscribersNotifyInProgress || isObserversNotifyInProgress || shouldFlushMemoizationSync) {
                     shouldFlushMemoization = false
                     flushMemoizedForState()
                 }
diff --git a/src/throttledStore.tsx b/src/throttledStore.tsx
index bb71701..147aec7 100644
--- a/src/throttledStore.tsx
+++ b/src/throttledStore.tsx
@@ -158,7 +158,7 @@ export const createThrottledStore = (
     cancelAnimationFrame: Window['cancelAnimationFrame'],
     updateIsSubscriptionNotifyInProgress: (isSubscriptionNotifyInProgress: boolean) => void,
     updateIsObserversNotifyInProgress: (isObserversNotifyInProgress: boolean) => void,
-    updateIsDeferringNotifications: (isDeferringNotifications: boolean) => void
+    updateShouldFlushMemoizationSync: (shouldFlushMemoizationSync: boolean) => void
 ): PrivateThrottledStore => {
     let pendingBroadcastNotification = false
     let pendingObservableNotifications: Set<AnyPrivateObservableState> | undefined
@@ -287,12 +287,12 @@ export const createThrottledStore = (
             try {
                 executePendingActions()
                 isDeferrringNotifications = true
-                shouldClearMemoizedForState && updateIsDeferringNotifications(isDeferrringNotifications)
+                shouldClearMemoizedForState && updateShouldFlushMemoizationSync(isDeferrringNotifications)
                 const functionResult = await action()
                 return functionResult
             } finally {
                 isDeferrringNotifications = false
-                shouldClearMemoizedForState && updateIsDeferringNotifications(isDeferrringNotifications)
+                shouldClearMemoizedForState && updateShouldFlushMemoizationSync(isDeferrringNotifications)
                 executePendingActions()
             }
         }

From c7155b6a6040cf93c42dad8098a8e7fd33738bf8 Mon Sep 17 00:00:00 2001
From: ShirShintel <shirsh@wix.com>
Date: Wed, 6 Nov 2024 10:04:37 +0200
Subject: [PATCH 4/4] rename

---
 src/throttledStore.tsx         |  14 ++---
 test/connectWithShell.spec.tsx | 104 +++++++++++++++++++++++----------
 2 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/src/throttledStore.tsx b/src/throttledStore.tsx
index 147aec7..40db6d7 100644
--- a/src/throttledStore.tsx
+++ b/src/throttledStore.tsx
@@ -1,8 +1,8 @@
-import { Reducer, createStore, Store, ReducersMapObject, combineReducers, AnyAction, Dispatch, Action, Unsubscribe } from 'redux'
+import _ from 'lodash'
+import { Action, AnyAction, Dispatch, Reducer, ReducersMapObject, Store, Unsubscribe, combineReducers, createStore } from 'redux'
 import { devToolsEnhancer } from 'redux-devtools-extension'
+import { AppHost, ExtensionSlot, ObservableState, ReducersMapObjectContributor, Shell, SlotKey, StateObserver } from './API'
 import { AppHostServicesProvider } from './appHostServices'
-import _ from 'lodash'
-import { AppHost, ExtensionSlot, ReducersMapObjectContributor, ObservableState, StateObserver, Shell, SlotKey } from './API'
 import { contributeInstalledShellsState } from './installedShellsState'
 import { interceptAnyObject } from './interceptAnyObject'
 import { invokeSlotCallbacks } from './invokeSlotCallbacks'
@@ -47,7 +47,7 @@ export interface StateContribution<TState = {}, TAction extends AnyAction = AnyA
 export interface ThrottledStore<T = any> extends Store<T> {
     hasPendingSubscribers(): boolean
     flush(config?: { excecutionType: 'scheduled' | 'immediate' | 'default' }): void
-    deferSubscriberNotifications<K>(action: () => K | Promise<K>, shouldClearMemoizedForState?: boolean): Promise<K>
+    deferSubscriberNotifications<K>(action: () => K | Promise<K>, shouldDispatchClearCache?: boolean): Promise<K>
 }
 
 export interface PrivateThrottledStore<T = any> extends ThrottledStore<T> {
@@ -280,19 +280,19 @@ export const createThrottledStore = (
         observableNotify: onObservableNotify,
         resetPendingNotifications: resetAllPendingNotifications,
         hasPendingSubscribers: () => pendingBroadcastNotification,
-        deferSubscriberNotifications: async (action, shouldClearMemoizedForState) => {
+        deferSubscriberNotifications: async (action, shouldDispatchClearCache) => {
             if (isDeferrringNotifications) {
                 return action()
             }
             try {
                 executePendingActions()
                 isDeferrringNotifications = true
-                shouldClearMemoizedForState && updateShouldFlushMemoizationSync(isDeferrringNotifications)
+                shouldDispatchClearCache && updateShouldFlushMemoizationSync(isDeferrringNotifications)
                 const functionResult = await action()
                 return functionResult
             } finally {
                 isDeferrringNotifications = false
-                shouldClearMemoizedForState && updateShouldFlushMemoizationSync(isDeferrringNotifications)
+                shouldDispatchClearCache && updateShouldFlushMemoizationSync(isDeferrringNotifications)
                 executePendingActions()
             }
         }
diff --git a/test/connectWithShell.spec.tsx b/test/connectWithShell.spec.tsx
index 16b4ca9..7ceb6d5 100644
--- a/test/connectWithShell.spec.tsx
+++ b/test/connectWithShell.spec.tsx
@@ -1,22 +1,22 @@
 import _ from 'lodash'
 import React, { FunctionComponent, ReactElement, useEffect } from 'react'
 
-import { AppHost, EntryPoint, Shell, SlotKey, ObservableState, AnySlotKey } from '../src/API'
+import { act, create, ReactTestInstance, ReactTestRenderer } from 'react-test-renderer'
+import { AnyAction } from 'redux'
+import { ObservedSelectorsMap, observeWithShell } from '../src'
+import { AnySlotKey, AppHost, EntryPoint, ObservableState, Shell, SlotKey } from '../src/API'
 import {
+    collectAllTexts,
+    connectWithShell,
+    connectWithShellAndObserve,
     createAppHost,
     mockPackage,
     mockShellStateKey,
     MockState,
     renderInHost,
-    connectWithShell,
-    connectWithShellAndObserve,
-    withThrowOnError,
     TOGGLE_MOCK_VALUE,
-    collectAllTexts
+    withThrowOnError
 } from '../testKit'
-import { ReactTestRenderer, act, create, ReactTestInstance } from 'react-test-renderer'
-import { AnyAction } from 'redux'
-import { ObservedSelectorsMap, observeWithShell } from '../src'
 
 interface MockPackageState {
     [mockShellStateKey]: MockState
@@ -59,7 +59,9 @@ describe('connectWithShell', () => {
         const PureComp = ({ shellName }: { shellName: string }) => <div>{shellName}</div>
         const mapStateToProps = (s: Shell) => ({ shellName: s.name })
 
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { parentWrapper } = renderInShellContext(<ConnectedComp />)
         expect(collectAllTexts(parentWrapper)).toContain(mockPackage.name)
@@ -128,7 +130,9 @@ describe('connectWithShell', () => {
             return <div onClick={func}>{JSON.stringify(obj)}</div>
         }
 
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
 
@@ -382,7 +386,9 @@ describe('connectWithShell', () => {
             // Assert - outer component re-rendered and passed new ownProps to inner component
             expect(mapStateOuterCompSpy).toHaveBeenCalledTimes(2)
             expect(outerComponentRenderSpy).toHaveBeenCalledTimes(2)
-            expect(innerCompShouldComponentUpdateSpy).toHaveBeenCalledWith({ num: 2 })
+            expect(innerCompShouldComponentUpdateSpy).toHaveBeenCalledWith({
+                num: 2
+            })
 
             // Assert - should not trigger mapDispatchToProps or re-render of inner component even though it's ownProps have changed
             expect(mapDispatchInnerCompSpy).toHaveBeenCalledTimes(1)
@@ -497,7 +503,9 @@ describe('connectWithShell', () => {
             MockPackageState,
             PureCompWithChildrenOwnProps,
             PureCompWithChildrenStateProps
-        >(mapStateToProps, undefined, getBoundShell(), { allowOutOfEntryPoint: true })(PureCompWithChildren)
+        >(mapStateToProps, undefined, getBoundShell(), {
+            allowOutOfEntryPoint: true
+        })(PureCompWithChildren)
 
         const { testKit } = renderInShellContext(
             <ConnectedUnboundCompWithChildren id="A">
@@ -521,7 +529,9 @@ describe('connectWithShell', () => {
             }
         })
         const PureComp: FunctionComponent<{}> = () => <div className="TEST-PURE-COMP">TEST</div>
-        const ConnectedComp = connectWithShell(undefined, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(undefined, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         // act
         const { testKit } = renderInHost(<ConnectedComp />, host, shell)
@@ -542,7 +552,9 @@ describe('connectWithShell', () => {
             }
         })
         const PureComp: FunctionComponent<{}> = () => <div className="TEST-PURE-COMP">TEST</div>
-        const ConnectedComp = connectWithShell(undefined, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(undefined, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         // act
 
@@ -572,7 +584,9 @@ describe('connectWithShell', () => {
         const PureComp: FunctionComponent<{}> = () => (
             <TestAspectContext.Consumer>{aspect => <div className="TEST-PURE-COMP">{aspect.theNumber}</div>}</TestAspectContext.Consumer>
         )
-        const ConnectedComp = connectWithShell(undefined, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(undefined, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         // act
 
@@ -601,7 +615,10 @@ describe('connectWithShell-useCases', () => {
     interface SecondStateAPI {
         getValueTwo(): string
     }
-    const SecondStateAPI: SlotKey<SecondStateAPI> = { name: 'TWO_API', public: true }
+    const SecondStateAPI: SlotKey<SecondStateAPI> = {
+        name: 'TWO_API',
+        public: true
+    }
 
     interface FirstObservableAPI {
         observables: { three: ObservableState<FirstObservableSelectors> }
@@ -609,7 +626,10 @@ describe('connectWithShell-useCases', () => {
     interface FirstObservableSelectors {
         getValueThree(): string
     }
-    const FirstObservableAPI: SlotKey<FirstObservableAPI> = { name: 'THREE_API', public: true }
+    const FirstObservableAPI: SlotKey<FirstObservableAPI> = {
+        name: 'THREE_API',
+        public: true
+    }
 
     interface SecondObservableAPI {
         observables: { four: ObservableState<SecondObservableSelectors> }
@@ -617,7 +637,10 @@ describe('connectWithShell-useCases', () => {
     interface SecondObservableSelectors {
         getValueFour(): string
     }
-    const SecondObservableAPI: SlotKey<SecondObservableAPI> = { name: 'FOUR_API', public: true }
+    const SecondObservableAPI: SlotKey<SecondObservableAPI> = {
+        name: 'FOUR_API',
+        public: true
+    }
 
     const entryPointWithState: EntryPoint = {
         name: 'ONE',
@@ -791,7 +814,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should not notify subscribers when deferring notifications', async () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -819,7 +844,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should not have pending subscribers when starting to defer notifications', async () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -839,7 +866,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should notify subscribers of state changes before deferring notifications', async () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -857,7 +886,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should notify after action failed while deferring notifications', async () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -884,7 +915,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should flush while deferring notifications if immediate flush was called during that action', async () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -906,7 +939,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should support nested defered notification actions', async () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -937,7 +972,7 @@ describe('connectWithShell-useCases', () => {
         expect(renderSpy).toHaveBeenCalledTimes(2)
     })
 
-    it('should clear state memoization on dispatch when deferring notifications and setting shouldClearMemoizedForState', async () => {
+    it('should clear state memoization on dispatch when deferring notifications and setting shouldDispatchClearCache', async () => {
         const { host, shell } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
         let numberOfCalls = 0
         const originalFn = jest.fn(() => ++numberOfCalls)
@@ -951,7 +986,7 @@ describe('connectWithShell-useCases', () => {
         expect(clearCacheSpy).toHaveBeenCalledTimes(1)
     })
 
-    it('should not clear state memoization on dispatch when deferring notifications without setting shouldClearMemoizedForState', async () => {
+    it('should not clear state memoization on dispatch when deferring notifications without setting shouldDispatchClearCache', async () => {
         const { host, shell } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
         let numberOfCalls = 0
         const originalFn = jest.fn(() => ++numberOfCalls)
@@ -967,7 +1002,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should not mount connected component on props update', () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
             throw new Error('Connected component failed to render')
@@ -984,7 +1021,9 @@ describe('connectWithShell-useCases', () => {
 
     it('should update component on change in regular state', () => {
         const { host, shell, renderInShellContext } = createMocks(entryPointWithState, [entryPointSecondStateWithAPI])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -1023,7 +1062,9 @@ describe('connectWithShell-useCases', () => {
             entryPointSecondStateWithAPI,
             entryPointFirstObservable
         ])
-        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, { allowOutOfEntryPoint: true })(PureComp)
+        const ConnectedComp = connectWithShell(mapStateToProps, undefined, shell, {
+            allowOutOfEntryPoint: true
+        })(PureComp)
 
         const { testKit } = renderInShellContext(<ConnectedComp />)
         if (!testKit) {
@@ -1238,7 +1279,10 @@ describe('observeWithShellPureComponent', () => {
         getStringValue(): string
         getNumberValue(): number
     }
-    const ObservableAPI: SlotKey<ObservableAPI> = { name: 'OBSERVABLE_API', public: true }
+    const ObservableAPI: SlotKey<ObservableAPI> = {
+        name: 'OBSERVABLE_API',
+        public: true
+    }
     interface ActualObservableState {
         stringValue: string
         numberValue: number