From b1f5af46a00de7990439fb574a5ed5be2c4173b0 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 26 Apr 2018 22:07:52 -0400 Subject: [PATCH 1/2] Data: Cache selector results by state via WeakMap --- data/index.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/data/index.js b/data/index.js index 61cce6b182fb5b..b1a45dc2918991 100644 --- a/data/index.js +++ b/data/index.js @@ -116,7 +116,26 @@ export { combineReducers }; */ export function registerSelectors( reducerKey, newSelectors ) { const store = stores[ reducerKey ]; - const createStateSelector = ( selector ) => ( ...args ) => selector( store.getState(), ...args ); + + const cacheByState = new WeakMap(); + + const createStateSelector = ( selector, selectorName ) => ( ...args ) => { + const state = store.getState(); + + let cache = cacheByState.get( state ); + if ( ! cache ) { + cache = new EquivalentKeyMap(); + cacheByState.set( state, cache ); + } + + const key = { [ selectorName ]: args }; + if ( ! cache.has( key ) ) { + cache.set( key, selector( state, ...args ) ); + } + + return cache.get( key ); + }; + selectors[ reducerKey ] = mapValues( newSelectors, createStateSelector ); } From 624d7b13f1d9f254401c74e088f73af5c4e452f9 Mon Sep 17 00:00:00 2001 From: Andrew Duthie Date: Thu, 26 Apr 2018 22:11:09 -0400 Subject: [PATCH 2/2] Data: Track arguments distinctly by selector name --- data/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/index.js b/data/index.js index b1a45dc2918991..a7703d07890238 100644 --- a/data/index.js +++ b/data/index.js @@ -128,7 +128,7 @@ export function registerSelectors( reducerKey, newSelectors ) { cacheByState.set( state, cache ); } - const key = { [ selectorName ]: args }; + const key = [ selectorName, args ]; if ( ! cache.has( key ) ) { cache.set( key, selector( state, ...args ) ); }