Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 6014797

Browse files
nlepagenlepage
committed
✨ Slices get
1 parent 95b7717 commit 6014797

File tree

12 files changed

+109
-113
lines changed

12 files changed

+109
-113
lines changed

‎packages/immutadot/src/core/apply.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,42 @@ function apply(fn, { arity = fn.length, fixedArity = false, curried = true, lazy
1414
switch (arity) {
1515
case 0:
1616
case 1:
17-
appliedFn = (obj, path) => nav(toPath(path))(obj).update(fn)
17+
appliedFn = (obj, path) => nav(toPath(path)).update(fn)(obj)
1818
break
1919
case 2:
20-
appliedFn = (obj, path, arg) => nav(toPath(path))(obj).update(
20+
appliedFn = (obj, path, arg) => nav(toPath(path)).update(
2121
value => fn(value, resolveArg(arg, obj)),
22-
)
22+
)(obj)
2323
break
2424
case 3:
25-
appliedFn = (obj, path, arg1, arg2) => nav(toPath(path))(obj).update(
25+
appliedFn = (obj, path, arg1, arg2) => nav(toPath(path)).update(
2626
value => fn(
2727
value,
2828
resolveArg(arg1, obj),
2929
resolveArg(arg2, obj),
3030
),
31-
)
31+
)(obj)
3232
break
3333
case 4:
34-
appliedFn = (obj, path, arg1, arg2, arg3) => nav(toPath(path))(obj).update(
34+
appliedFn = (obj, path, arg1, arg2, arg3) => nav(toPath(path)).update(
3535
value => fn(
3636
value,
3737
resolveArg(arg1, obj),
3838
resolveArg(arg2, obj),
3939
resolveArg(arg3, obj),
4040
),
41-
)
41+
)(obj)
4242
break
4343
}
4444
}
4545

4646
if (!appliedFn) {
47-
appliedFn = (obj, path, ...args) => nav(toPath(path))(obj).update(
47+
appliedFn = (obj, path, ...args) => nav(toPath(path)).update(
4848
value => fn(
4949
value,
5050
...args.map(arg => resolveArg(arg, obj)),
5151
),
52-
)
52+
)(obj)
5353
}
5454

5555
if (curried) {

‎packages/immutadot/src/core/apply.spec.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,6 @@ describe('path.apply', () => {
238238
})
239239
})
240240

241-
it('should throw an explicit error when en empty path is given as parameter', () => {
242-
expect(() => inc({}, '')).toThrowError('path should not be empty')
243-
})
244-
245241
it('should support curried first arg', () => {
246242
immutaTest({
247243
nested: { prop: 5 },

‎packages/immutadot/src/core/get.js‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,17 @@ const isGetter = Symbol('isGetter')
1313
* @since 1.0.0
1414
*/
1515
function get(...args) {
16-
if (args.length >= 2)
17-
return _get(...args)
16+
if (args.length >= 2) return nav(toPath(args[1])).get()(args[0])
1817

19-
const getter = obj => _get(obj, ...args)
18+
const getter = nav(toPath(args[0])).get()
2019
getter[isGetter] = true
2120

2221
return getter
2322
}
2423

25-
function _get(obj, path) {
26-
return nav(toPath(path))(obj).get()
27-
}
28-
2924
function resolveGetter(value, obj) {
3025
if (value && value[isGetter]) return value(obj)
3126
return value
3227
}
3328

34-
// FIXME stop exporting isGetter
35-
export { get, isGetter, resolveGetter }
29+
export { get, resolveGetter }

‎packages/immutadot/src/core/get.spec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('core.get', () => {
1414
expect(get(obj, 'nested2.arr[0].val')).toBe('arrVal1')
1515
})
1616

17-
it('should get multiple props', () => {
17+
it('should get slices of nested props', () => {
1818
expect(get(obj, 'nested2.arr[:].val')).toEqual(['arrVal1', 'arrVal2'])
1919
expect(get(obj, 'nested3[:][:].val')).toEqual([[1, 2], [3, 4]])
2020
})

‎packages/immutadot/src/core/set.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { apply } from './apply'
1010
* @example set({ nested: { prop: 'old' } }, 'nested.prop', 'new') // => { nested: { prop: 'new' } }
1111
* @since 1.0.0
1212
*/
13+
// FIXME do not use apply here ?
1314
const set = apply((_, value) => value, { fixedArity: true })
1415

1516
export { set }

‎packages/immutadot/src/core/unset.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { toPath } from 'immutadot-parser'
1212
* @example unset({ nested: { prop: 'value' } }, 'nested.prop') // => { nested: {} }
1313
* @since 1.0.0
1414
*/
15-
const unset = curry((obj, path) => nav(toPath(path))(obj).unset(), { fixedArity: true })
15+
// FIXME do not use curry here ?
16+
const unset = curry((obj, path) => nav(toPath(path)).unset()(obj), { fixedArity: true })
1617

1718
export { unset }

‎packages/immutadot/src/nav/nav.js‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
import { NavType } from 'immutadot-parser'
2-
import { finalNav } from './finalNav'
3-
import { indexNav } from './indexNav'
4-
import { propNav } from './propNav'
5-
import { propsNav } from './propsNav'
6-
import { sliceNav } from './sliceNav'
7-
8-
export function nav(path) {
9-
if (path.length === 0) throw new TypeError('path should not be empty')
10-
11-
return path.reduceRight((next, [type, value]) => toNav(type)(value, next), finalNav)
12-
}
13-
14-
function toNav(type) {
15-
switch (type) {
16-
case NavType.allProps:
17-
case NavType.list:
18-
return propsNav
19-
case NavType.index: return indexNav
20-
case NavType.prop: return propNav
21-
case NavType.slice: return sliceNav
22-
default: throw TypeError(type)
23-
}
24-
}
1+
export { nav } from '../nav2/nav'

‎packages/immutadot/src/nav/nav.spec.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('nav.nav', () => {
1313
}
1414

1515
function uncurriedInc(obj, path, ...args) {
16-
return nav(toPath(path))(obj).update(v => incV(v, ...args))
16+
return nav(toPath(path)).update(v => incV(v, ...args))(obj)
1717
}
1818

1919
function curriedInc(path, ...args) {
@@ -224,7 +224,7 @@ describe('nav.nav', () => {
224224
})
225225

226226
it('should throw an explicit error when en empty path is given as parameter', () => {
227-
expect(() => inc({}, '')).toThrowError('path should not be empty')
227+
expect(() => inc({}, '')).toThrowError('Path should not be empty')
228228
})
229229

230230
it('should support curried first arg', () => {
@@ -262,22 +262,22 @@ describe('nav.nav', () => {
262262
})
263263

264264
it('should get a nested prop', () => {
265-
expect(nav(toPath('nested.prop'))({ nested: { prop: 'foo' } }).get()).toBe('foo')
265+
expect(nav(toPath('nested.prop')).get()({ nested: { prop: 'foo' } })).toBe('foo')
266266
})
267267

268268
it('should get a list of props', () => {
269-
expect(nav(toPath('nested.{prop1,prop2}'))({ nested: { prop1: 'foo',
270-
prop2: 'bar' } }).get()).toEqual(['foo', 'bar'])
271-
expect(nav(toPath('nested.{*}'))({ nested: { prop1: 'foo',
272-
prop2: 'bar' } }).get()).toEqual(['foo', 'bar'])
269+
expect(nav(toPath('nested.{prop1,prop2}')).get()({ nested: { prop1: 'foo',
270+
prop2: 'bar' } })).toEqual(['foo', 'bar'])
271+
expect(nav(toPath('nested.{*}')).get()({ nested: { prop1: 'foo',
272+
prop2: 'bar' } })).toEqual(['foo', 'bar'])
273273
})
274274

275275
it('should set a nested prop', () => {
276276
immutaTest(
277277
{ nested: { prop: 'foo' } },
278278
['nested.prop'],
279279
(input, [path]) => {
280-
const output = nav(toPath(path))(input).update(() => 'bar')
280+
const output = nav(toPath(path)).update(() => 'bar')(input)
281281
expect(output).toEqual({ nested: { prop: 'bar' } })
282282
return output
283283
},
@@ -289,7 +289,7 @@ describe('nav.nav', () => {
289289
{ nested: { prop: 'foo' } },
290290
['nested.prop'],
291291
(input, [path]) => {
292-
const output = nav(toPath(path))(input).update(value => value.toUpperCase())
292+
const output = nav(toPath(path)).update(value => value.toUpperCase())(input)
293293
expect(output).toEqual({ nested: { prop: 'FOO' } })
294294
return output
295295
},
@@ -301,34 +301,34 @@ describe('nav.nav', () => {
301301
{},
302302
['nested.prop.0', 'nested.prop.1'],
303303
input => {
304-
const output = nav(toPath('nested.prop[1]'))(input).update(() => 'foo')
304+
const output = nav(toPath('nested.prop[1]')).update(() => 'foo')(input)
305305
expect(output).toEqual({ nested: { prop: [undefined, 'foo'] } })
306306
return output
307307
},
308308
)
309309
})
310310

311311
it('should get a slice', () => {
312-
expect(nav(toPath('nested.prop[:].val'))({
312+
expect(nav(toPath('nested.prop[:].val')).get()({
313313
nested: {
314314
prop: [
315315
{ val: 'foo' },
316316
{ val: 'bar' },
317317
],
318318
},
319-
}).get()).toEqual(['foo', 'bar'])
320-
expect(nav(toPath('nested.prop[::-1].val'))({
319+
})).toEqual(['foo', 'bar'])
320+
expect(nav(toPath('nested.prop[::-1].val')).get()({
321321
nested: {
322322
prop: [
323323
{ val: 'foo' },
324324
{ val: 'bar' },
325325
],
326326
},
327-
}).get()).toEqual(['bar', 'foo'])
327+
})).toEqual(['bar', 'foo'])
328328
})
329329

330330
it('should get a negative array index', () => {
331-
expect(nav(toPath('nested.prop[-3]'))({ nested: { prop: [0, 1, 2, 3, 4] } }).get()).toBe(2)
331+
expect(nav(toPath('nested.prop[-3]')).get()({ nested: { prop: [0, 1, 2, 3, 4] } })).toBe(2)
332332
})
333333

334334
it('should update a slice', () => immutaTest(
@@ -343,7 +343,7 @@ describe('nav.nav', () => {
343343
},
344344
['nested.prop.1.val', 'nested.prop.2.val'],
345345
input => {
346-
const output = nav(toPath('nested.prop[-2:].val'))(input).update(value => value.toUpperCase())
346+
const output = nav(toPath('nested.prop[-2:].val')).update(value => value.toUpperCase())(input)
347347
expect(output).toEqual({
348348
nested: {
349349
prop: [

‎packages/immutadot/src/nav2/indexNav.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const unset = (pIndex, next) => () => {
4444
})
4545
}
4646

47-
export const propNav = makeNav({
47+
export const indexNav = makeNav({
4848
update,
4949
get,
5050
unset,

‎packages/immutadot/src/nav2/nav.js‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1+
import { NavType } from 'immutadot-parser'
12
import { finalNav } from './finalNav'
23
import { indexNav } from './indexNav'
34
import { propNav } from './propNav'
45
import { propsNav } from './propsNav'
6+
import { sliceNav } from './sliceNav'
57

68
const navs = {
7-
prop: propNav,
8-
props: propsNav,
9-
index: indexNav,
9+
[NavType.prop]: propNav,
10+
[NavType.list]: propsNav,
11+
[NavType.allProps]: propsNav,
12+
[NavType.index]: indexNav,
13+
[NavType.slice]: sliceNav,
1014
}
1115

1216
const toNav = ([type, params]) => {

0 commit comments

Comments
 (0)