Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions modules/store/spec/selector.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,23 @@ describe('Selectors', () => {
expect(projectFn).toHaveBeenCalledWith(countOne, countTwo);
});

it('should call the projector function only when the value of a dependent selector change', () => {
const firstState = { first: 'state', unchanged: 'state' };
const secondState = { second: 'state', unchanged: 'state' };
const neverChangingSelector = jasmine
.createSpy('unchangedSelector')
.and.callFake((state: any) => {
return state.unchanged;
});
const projectFn = jasmine.createSpy('projectionFn');
const selector = createSelector(neverChangingSelector, projectFn);

selector(firstState);
selector(secondState);

expect(projectFn).toHaveBeenCalledTimes(1);
});

it('should memoize the function', () => {
const firstState = { first: 'state' };
const secondState = { second: 'state' };
Expand Down
13 changes: 9 additions & 4 deletions modules/store/src/selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,24 @@ export function createSelector(...args: any[]): Selector<any, any> {
selector.release && typeof selector.release === 'function'
);

const { memoized, reset } = memoize(function(state: any) {
const memoizedProjector = memoize(function(...selectors: any[]) {
return projector.apply(null, selectors);
});

const memoizedState = memoize(function(state: any) {
const args = selectors.map(fn => fn(state));

return projector.apply(null, args);
return memoizedProjector.memoized.apply(null, args);
});

function release() {
reset();
memoizedState.reset();
memoizedProjector.reset();

memoizedSelectors.forEach(selector => selector.release());
}

return Object.assign(memoized, { release });
return Object.assign(memoizedState.memoized, { release });
}

export function createFeatureSelector<T>(
Expand Down