Skip to content

Commit 60ba8d6

Browse files
committed
Rename remaining defaultMemoize references
1 parent e446d84 commit 60ba8d6

File tree

4 files changed

+76
-74
lines changed

4 files changed

+76
-74
lines changed

CHANGELOG.md

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
# Change log
22

3-
All notable changes to this project will be documented in this file.
3+
Changes in this project are primarily documented in the Github release notes:
4+
5+
- https://github.com/reduxjs/reselect/releases
6+
7+
Changes from v4.0.0 and earlier are documented in this file
8+
49
This project adheres to [Semantic Versioning](http://semver.org/).
510

611
## [v4.0.0](https://github.com/reduxjs/reselect/releases/tag/v4.0.0) - 2018/09/30
712

813
### New Features
914

1015
Exposed selector dependencies (#251)
11-
Use provided memoize function for selectors (#297)
16+
Use provided memoize function for selectors (#297)
1217

1318
### Breaking Changes
1419

15-
Updated TypeScript typings (#274, #315)
20+
Updated TypeScript typings (#274, #315)
1621

1722
## [v3.0.0](https://github.com/reduxjs/reselect/releases/tag/v3.0.0) - 2017/03/24
1823

@@ -28,7 +33,7 @@ For performance reasons, a selector is now not recalculated if its input is equa
2833
#### Example:
2934

3035
```js
31-
import { createSelector } from 'reselect';
36+
import { createSelector } from 'reselect'
3237

3338
const mySelector = createSelector(
3439
state => state.values.filter(val => val < 5),
@@ -38,7 +43,7 @@ const mySelector = createSelector(
3843
}
3944
)
4045

41-
var createSelector = require('./dist/reselect.js').createSelector;
46+
var createSelector = require('./dist/reselect.js').createSelector
4247

4348
const mySelector = createSelector(
4449
state => state.values.filter(val => val < 5),
@@ -48,14 +53,14 @@ const mySelector = createSelector(
4853
}
4954
)
5055

51-
var state1 = {values: [1,2,3,4,5,6,7,8,9]};
52-
console.log(mySelector(state1));
53-
state1.values = [3,4,5,6,7,8,9];
54-
console.log(mySelector(state1));
55-
var state2 = {values: [1,2,3,4,5,6,7,8,9]};
56-
console.log(mySelector(state2));
57-
var state3 = {values: [3,4,5,6,7]};
58-
console.log(mySelector(state3));
56+
var state1 = { values: [1, 2, 3, 4, 5, 6, 7, 8, 9] }
57+
console.log(mySelector(state1))
58+
state1.values = [3, 4, 5, 6, 7, 8, 9]
59+
console.log(mySelector(state1))
60+
var state2 = { values: [1, 2, 3, 4, 5, 6, 7, 8, 9] }
61+
console.log(mySelector(state2))
62+
var state3 = { values: [3, 4, 5, 6, 7] }
63+
console.log(mySelector(state3))
5964
```
6065

6166
#### Output in v2.5.4:
@@ -171,36 +176,36 @@ There is a small chance that this could cause a breaking change in code that con
171176

172177
#### `createStructuredSelector`
173178

174-
`createStructuredSelector` is a convenience function that helps with a common pattern when using Reselect. The selector passed to a connect decorator often just takes other selectors and maps them to keys in an object:
179+
`createStructuredSelector` is a convenience function that helps with a common pattern when using Reselect. The selector passed to a connect decorator often just takes other selectors and maps them to keys in an object:
175180

176181
```js
177-
const mySelectorA = state => state.a;
178-
const mySelectorB = state => state.b;
182+
const mySelectorA = state => state.a
183+
const mySelectorB = state => state.b
179184

180185
const structuredSelector = createSelector(
181-
mySelectorA,
182-
mySelectorB,
183-
mySelectorC,
184-
(a, b, c) => ({
185-
a,
186-
b,
187-
c
188-
})
189-
);
186+
mySelectorA,
187+
mySelectorB,
188+
mySelectorC,
189+
(a, b, c) => ({
190+
a,
191+
b,
192+
c
193+
})
194+
)
190195
```
191196

192197
`createStructuredSelector` takes an object whose properties are input-selectors and returns a structured selector. The structured selector returns an object with the same keys as the `inputSelectors` argument, but with the selectors replaced with their values.
193198

194199
```js
195-
const mySelectorA = state => state.a;
196-
const mySelectorB = state => state.b;
200+
const mySelectorA = state => state.a
201+
const mySelectorB = state => state.b
197202

198203
const structuredSelector = createStructuredSelector({
199204
x: mySelectorA,
200205
y: mySelectorB
201-
});
206+
})
202207

203-
const result = structuredSelector({a: 1, b: 2}); // will produce {x: 1, y: 2}
208+
const result = structuredSelector({ a: 1, b: 2 }) // will produce {x: 1, y: 2}
204209
```
205210

206211
## [v1.0.0](https://github.com/reduxjs/reselect/releases/tag/v1.0.0) - 2015/09/09
@@ -225,22 +230,19 @@ js:next field added to package.json
225230
#### Before
226231

227232
```js
228-
import { isEqual } from 'lodash';
229-
import { createSelectorCreator } from 'reselect';
233+
import { isEqual } from 'lodash'
234+
import { createSelectorCreator } from 'reselect'
230235

231-
const deepEqualsSelectorCreator = createSelectorCreator(isEqual);
236+
const deepEqualsSelectorCreator = createSelectorCreator(isEqual)
232237
```
233238

234239
#### After
235240

236241
```js
237-
import { isEqual } from 'lodash';
238-
import { createSelectorCreator, defaultMemoize } from 'reselect';
242+
import { isEqual } from 'lodash'
243+
import { createSelectorCreator, defaultMemoize } from 'reselect'
239244

240-
const deepEqualsSelectorCreator = createSelectorCreator(
241-
defaultMemoize,
242-
isEqual
243-
);
245+
const deepEqualsSelectorCreator = createSelectorCreator(defaultMemoize, isEqual)
244246
```
245247

246248
### New features
@@ -255,7 +257,7 @@ Selector creators can receive a variadic number of dependencies as well as an ar
255257
const selector = createSelector(
256258
[state => state.a, state => state.b],
257259
(a, b) => a * b
258-
);
260+
)
259261
```
260262

261263
#### After
@@ -265,7 +267,7 @@ const selector = createSelector(
265267
state => state.a,
266268
state => state.b,
267269
(a, b) => a * b
268-
);
270+
)
269271
```
270272

271273
#### Access `ownProps` in Selector
@@ -274,32 +276,32 @@ Selector dependencies can receive a variadic number of parameters allowing a sel
274276

275277
```js
276278
const selector = createSelector(
277-
(state) => state.a,
279+
state => state.a,
278280
(state, props) => state.b * props.c,
279281
(_, props) => props.d,
280282
(a, bc, d) => a + bc + d
281-
);
283+
)
282284
```
283285

284286
#### Configurable Memoize Function
285287

286288
```js
287-
import { createSelectorCreator } from 'reselect';
288-
import memoize from 'lodash.memoize';
289+
import { createSelectorCreator } from 'reselect'
290+
import memoize from 'lodash.memoize'
289291

290-
let called = 0;
291-
const customSelectorCreator = createSelectorCreator(memoize, JSON.stringify);
292+
let called = 0
293+
const customSelectorCreator = createSelectorCreator(memoize, JSON.stringify)
292294
const selector = customSelectorCreator(
293295
state => state.a,
294296
state => state.b,
295297
(a, b) => {
296-
called++;
297-
return a + b;
298+
called++
299+
return a + b
298300
}
299-
);
300-
assert.equal(selector({a: 1, b: 2}), 3);
301-
assert.equal(selector({a: 1, b: 2}), 3);
302-
assert.equal(called, 1);
303-
assert.equal(selector({a: 2, b: 3}), 5);
304-
assert.equal(called, 2);
301+
)
302+
assert.equal(selector({ a: 1, b: 2 }), 3)
303+
assert.equal(selector({ a: 1, b: 2 }), 3)
304+
assert.equal(called, 1)
305+
assert.equal(selector({ a: 2, b: 3 }), 5)
306+
assert.equal(called, 2)
305307
```

test/reselect.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ describe('Customizing selectors', () => {
343343
let memoizer2Calls = 0
344344
let memoizer3Calls = 0
345345

346-
const defaultMemoizeAcceptsFirstArgDirectly = createSelector(
346+
const lruMemoizeAcceptsFirstArgDirectly = createSelector(
347347
(state: StateAB) => state.a,
348348
(state: StateAB) => state.b,
349349
(a, b) => a + b,
@@ -356,12 +356,12 @@ describe('Customizing selectors', () => {
356356
}
357357
)
358358

359-
defaultMemoizeAcceptsFirstArgDirectly({ a: 1, b: 2 })
360-
defaultMemoizeAcceptsFirstArgDirectly({ a: 1, b: 3 })
359+
lruMemoizeAcceptsFirstArgDirectly({ a: 1, b: 2 })
360+
lruMemoizeAcceptsFirstArgDirectly({ a: 1, b: 3 })
361361

362362
expect(memoizer1Calls).toBeGreaterThan(0)
363363

364-
const defaultMemoizeAcceptsArgsAsArray = createSelector(
364+
const lruMemoizeAcceptsArgsAsArray = createSelector(
365365
(state: StateAB) => state.a,
366366
(state: StateAB) => state.b,
367367
(a, b) => a + b,
@@ -376,8 +376,8 @@ describe('Customizing selectors', () => {
376376
}
377377
)
378378

379-
defaultMemoizeAcceptsArgsAsArray({ a: 1, b: 2 })
380-
defaultMemoizeAcceptsArgsAsArray({ a: 1, b: 3 })
379+
lruMemoizeAcceptsArgsAsArray({ a: 1, b: 2 })
380+
lruMemoizeAcceptsArgsAsArray({ a: 1, b: 3 })
381381

382382
expect(memoizer2Calls).toBeGreaterThan(0)
383383

@@ -389,14 +389,14 @@ describe('Customizing selectors', () => {
389389
}
390390
)
391391

392-
const defaultMemoizeAcceptsArgFromCSC = createSelectorWithSeparateArg(
392+
const lruMemoizeAcceptsArgFromCSC = createSelectorWithSeparateArg(
393393
(state: StateAB) => state.a,
394394
(state: StateAB) => state.b,
395395
(a, b) => a + b
396396
)
397397

398-
defaultMemoizeAcceptsArgFromCSC({ a: 1, b: 2 })
399-
defaultMemoizeAcceptsArgFromCSC({ a: 1, b: 3 })
398+
lruMemoizeAcceptsArgFromCSC({ a: 1, b: 2 })
399+
lruMemoizeAcceptsArgFromCSC({ a: 1, b: 3 })
400400

401401
expect(memoizer3Calls).toBeGreaterThan(0)
402402
})

type-tests/argsMemoize.test-d.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,13 +239,13 @@ describe('memoize and argsMemoize', () => {
239239
argsMemoizeOptions: { maxSize: 2 }
240240
}
241241
)
242-
// const createSelectorDefaultMemoize = createSelectorCreator(lruMemoize)
243-
const createSelectorDefaultMemoize = createSelectorCreator({
242+
243+
const createSelectorLruMemoize = createSelectorCreator({
244244
memoize: lruMemoize
245245
})
246246
const selectorWeakMapSeparateInlineArgsWithMemoizeOptions3 =
247247
// @ts-expect-error When argsMemoize is weakMapMemoize, type of argsMemoizeOptions needs to be the same as options args in weakMapMemoize.
248-
createSelectorDefaultMemoize(
248+
createSelectorLruMemoize(
249249
(state: RootState) => state.todos,
250250
// @ts-expect-error
251251
todos => todos.map(t => t.id),
@@ -265,7 +265,7 @@ describe('memoize and argsMemoize', () => {
265265
}
266266
)
267267
const selectorWeakMapSeparateInlineArgsWithMemoizeOptions4 =
268-
createSelectorDefaultMemoize(
268+
createSelectorLruMemoize(
269269
// @ts-expect-error
270270
(state: RootState) => state.todos,
271271
// @ts-expect-error
@@ -279,7 +279,7 @@ describe('memoize and argsMemoize', () => {
279279
)
280280
const selectorWeakMapSeparateInlineArgsWithMemoizeOptions5 =
281281
// @ts-expect-error
282-
createSelectorDefaultMemoize(
282+
createSelectorLruMemoize(
283283
[(state: RootState) => state.todos],
284284
// @ts-expect-error
285285
todos => todos.map(t => t.id),
@@ -291,7 +291,7 @@ describe('memoize and argsMemoize', () => {
291291
}
292292
)
293293
const selectorWeakMapSeparateInlineArgsWithMemoizeOptions6 =
294-
createSelectorDefaultMemoize(
294+
createSelectorLruMemoize(
295295
(state: RootState) => state.todos,
296296
todos => todos.map(t => t.id),
297297
{

typescript_test/argsMemoize.typetest.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,13 @@ function overrideOnlyArgsMemoizeInCreateSelector() {
235235
argsMemoizeOptions: { maxSize: 2 }
236236
}
237237
)
238-
// const createSelectorDefaultMemoize = createSelectorCreator(lruMemoize)
239-
const createSelectorDefaultMemoize = createSelectorCreator({
238+
239+
const createSelectorLruMemoize = createSelectorCreator({
240240
memoize: lruMemoize
241241
})
242242
const selectorWeakMapSeparateInlineArgsWithMemoizeOptions3 =
243243
// @ts-expect-error When argsMemoize is weakMapMemoize, type of argsMemoizeOptions needs to be the same as options args in weakMapMemoize.
244-
createSelectorDefaultMemoize(
244+
createSelectorLruMemoize(
245245
(state: RootState) => state.todos,
246246
// @ts-expect-error
247247
todos => todos.map(t => t.id),
@@ -263,7 +263,7 @@ function overrideOnlyArgsMemoizeInCreateSelector() {
263263

264264
const selectorWeakMapSeparateInlineArgsWithMemoizeOptions5 =
265265
// @ts-expect-error
266-
createSelectorDefaultMemoize(
266+
createSelectorLruMemoize(
267267
[(state: RootState) => state.todos],
268268
// @ts-expect-error
269269
todos => todos.map(t => t.id),
@@ -274,7 +274,7 @@ function overrideOnlyArgsMemoizeInCreateSelector() {
274274
}
275275
)
276276
const selectorWeakMapSeparateInlineArgsWithMemoizeOptions6 =
277-
createSelectorDefaultMemoize(
277+
createSelectorLruMemoize(
278278
(state: RootState) => state.todos,
279279
todos => todos.map(t => t.id),
280280
{

0 commit comments

Comments
 (0)