Skip to content

Commit 4d3591f

Browse files
JosemaJosema
committed
Passing all tests
1 parent 4017b9b commit 4d3591f

File tree

5 files changed

+92
-83
lines changed

5 files changed

+92
-83
lines changed

‎src/api/applyPatchFactory.js‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,6 @@ export default function applyPatchFactory(patchers) {
99
const patch_root = { '': patch } // a trick to allow top level patches
1010
const unpatch_root = { '': {} }
1111

12-
function registerMutation(path, object, prop, old_value) {
13-
// console.log(path, object, prop, old_value)
14-
setDeep(unpatch_root, path.slice(0), old_value)
15-
mutations.push({
16-
old_value,
17-
object,
18-
prop,
19-
path: path.slice(1),
20-
})
21-
}
22-
2312
forEachObject(
2413
patch_root,
2514
target_root,
@@ -30,7 +19,10 @@ export default function applyPatchFactory(patchers) {
3019
if (
3120
!had_prop ||
3221
(patch_value !== target_value &&
33-
!(isPlainObject(patch_value) && isPlain(target_value)))
22+
!(
23+
isPlainObject(patch_value) &&
24+
isPlainObject(target_value)
25+
))
3426
) {
3527
// Applying patches
3628
const old_value = patchers.reduce(
@@ -39,19 +31,22 @@ export default function applyPatchFactory(patchers) {
3931
patch,
4032
target,
4133
prop,
42-
path,
4334
old_value,
4435
had_prop,
45-
unpatch_root,
4636
applyPatch,
47-
registerMutation,
4837
}),
4938
target_value
5039
)
5140

5241
// We register the mutation if old_value is different to the new value
5342
if (target[prop] !== old_value) {
54-
registerMutation(path, target, prop, old_value)
43+
setDeep(unpatch_root, path.slice(0), old_value)
44+
mutations.push({
45+
old_value,
46+
object: target,
47+
prop,
48+
path: path.slice(1),
49+
})
5550
}
5651

5752
return false // we don't go deeper

‎src/types/Delete.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function Delete() {
88
}
99
}
1010

11-
Delete.patch = function ({ patch, target, prop, old_value, had_prop }) {
11+
Delete.patch = function ({ patch, target, prop, old_value }) {
1212
if (patch[prop] instanceof Delete || patch[prop] === Delete) {
1313
delete target[prop]
1414
}

‎src/types/Primitives.js‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,39 +10,51 @@ Primitives.patch = function ({
1010
target,
1111
prop,
1212
old_value,
13-
path,
1413
had_prop,
15-
unpatch_root,
1614
applyPatch,
17-
registerMutation,
1815
}) {
1916
const patch_value = patch[prop]
2017

2118
if (!had_prop) {
22-
if (isArray(target)) {
23-
const path_length = path.slice(0, path.length - 1).concat('length')
24-
// console.log(
25-
// path_length.join('.'),
26-
// unpatch_root,
27-
// getDeep(unpatch_root, path_length.slice(0))
28-
// )
29-
if (!getDeep(unpatch_root, path_length.slice(0))) {
30-
registerMutation(path_length, target, 'length', target.length)
31-
}
32-
} else {
33-
old_value = new Delete()
34-
}
35-
}
36-
37-
if (isPlainObject(patch_value)) {
38-
// console.log({ path, had_prop, target })
39-
target[prop] = applyPatch({}, patch_value).result
19+
old_value = new Delete()
4020
}
4121

4222
// New array
43-
else if (isArray(patch_value)) {
23+
if (isArray(patch_value)) {
4424
target[prop] = merge([], patch_value)
45-
return isPlainObject(old_value) ? Replace(old_value) : old_value
25+
if (isPlainObject(old_value)) {
26+
old_value = Replace(old_value)
27+
}
28+
}
29+
30+
// Object as patch
31+
else if (isPlainObject(patch_value)) {
32+
// Mutating array internaly
33+
if (isArray(old_value)) {
34+
const unpatches = {}
35+
const length = old_value.length
36+
for (const key in patch_value) {
37+
const had_prop = old_value.hasOwnProperty(key)
38+
const patched = applyPatch(old_value[key], patch_value[key])
39+
if (
40+
old_value[key] !== patched.result ||
41+
isPlainObject(patch_value[key])
42+
) {
43+
old_value[key] = patched.result
44+
unpatches[key] = had_prop ? patched.unpatch : Delete()
45+
}
46+
}
47+
if (old_value.length !== length) {
48+
unpatches.length = length
49+
}
50+
51+
return unpatches
52+
}
53+
54+
// New object
55+
else {
56+
target[prop] = applyPatch({}, patch_value).result
57+
}
4658
}
4759

4860
// Any other
@@ -52,11 +64,3 @@ Primitives.patch = function ({
5264

5365
return old_value
5466
}
55-
56-
function getDeep(object, path) {
57-
if (path.length === 0) {
58-
return true
59-
}
60-
const prop = path.shift()
61-
return object.hasOwnProperty(prop) ? getDeep(object[prop], path) : false
62-
}

‎test/applyPatch.js‎

Lines changed: 44 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ test('14 / https://tools.ietf.org/html/rfc7386 ', function (t) {
128128
const patch = { a: 'b', c: TYPE.Delete() }
129129
const expected = { a: 'b' }
130130

131-
testPatchUnpatch(t, target, patch, expected)
131+
testPatchUnpatch(t, target, patch, expected, false)
132132
})
133133

134134
test('15 / https://tools.ietf.org/html/rfc7386 ', function (t) {
@@ -392,7 +392,7 @@ test('from object to array', function (t) {
392392
const patch = { objarr: [0, 1] }
393393
const expected = { objarr: [0, 1] }
394394

395-
testPatchUnpatch(t, target, patch, expected)
395+
const { unpatch } = testPatchUnpatch(t, target, patch, expected)
396396
})
397397

398398
test('from array to object', function (t) {
@@ -403,38 +403,6 @@ test('from array to object', function (t) {
403403
testPatchUnpatch(t, target, patch, expected)
404404
})
405405

406-
test('changing length of array', function (t) {
407-
const target = { objarr: [0, 1] }
408-
const patch = { objarr: { length: 4 } }
409-
const expected = { objarr: [0, 1, undefined, undefined] }
410-
411-
testPatchUnpatch(t, target, patch, expected)
412-
})
413-
414-
test('adding item to array ', function (t) {
415-
const target = { objarr: [0, 1] }
416-
const patch = { objarr: { 3: { hello: 'world' } } }
417-
const expected = { objarr: [0, 1, undefined, { hello: 'world' }] }
418-
419-
testPatchUnpatch(t, target, patch, expected)
420-
})
421-
422-
test('adding multiple item to array ', function (t) {
423-
const target = { objarr: [0, 1] }
424-
const patch = { objarr: { 3: 3, 5: 5 } }
425-
const expected = { objarr: [0, 1, undefined, 3, undefined, 5] }
426-
427-
testPatchUnpatch(t, target, patch, expected)
428-
})
429-
430-
test.skip('editing lenght of array and also adding extra values', function (t) {
431-
const target = { objarr: [0, 1] }
432-
const patch = { objarr: { 3: 3, length: 5 } }
433-
const expected = { objarr: [0, 1, undefined, 3, undefined] }
434-
435-
testPatchUnpatch(t, target, patch, expected)
436-
})
437-
438406
test('should assign `null` values', function (t) {
439407
const target = { value: false }
440408
const patch = { value: null }
@@ -601,6 +569,48 @@ test('checking different types and mutating multiple deep values', function (t)
601569
t.is(mutations.length, 30)
602570
})
603571

572+
// Inner arrays
573+
// Inner arrays
574+
// Inner arrays
575+
// Inner arrays
576+
// Inner arrays
577+
// Inner arrays
578+
// Inner arrays
579+
// Inner arrays
580+
// Inner arrays
581+
582+
test('changing length of array', function (t) {
583+
const target = { objarr: [0, 1] }
584+
const patch = { objarr: { length: 4 } }
585+
const expected = { objarr: [0, 1, undefined, undefined] }
586+
587+
testPatchUnpatch(t, target, patch, expected)
588+
})
589+
590+
test('adding item to array ', function (t) {
591+
const target = { objarr: [0, 1] }
592+
const patch = { objarr: { 3: { hello: 'world' } } }
593+
const expected = { objarr: [0, 1, undefined, { hello: 'world' }] }
594+
595+
testPatchUnpatch(t, target, patch, expected)
596+
})
597+
598+
test('adding multiple item to array ', function (t) {
599+
const target = { objarr: [0, 1] }
600+
const patch = { objarr: { 3: 3, 5: 5 } }
601+
const expected = { objarr: [0, 1, undefined, 3, undefined, 5] }
602+
603+
testPatchUnpatch(t, target, patch, expected)
604+
})
605+
606+
test('editing length of array and also adding extra values', function (t) {
607+
const target = { objarr: [0, 1] }
608+
const patch = { objarr: { 3: 3, length: 5 } }
609+
const expected = { objarr: [0, 1, undefined, 3, undefined] }
610+
611+
testPatchUnpatch(t, target, patch, expected)
612+
})
613+
604614
test('Inner plain array', function (t) {
605615
const target = [{ b: false }]
606616
const patch = { 0: { b: true } }

‎test/utils.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function testPatchUnpatch(t, target, patch, expected, reverse = true) {
4949
t.deepEqual(target, expected)
5050
if (reverse) {
5151
const output2 = applyPatch(target, unpatch)
52-
t.deepEqual(output2.result, cloned)
52+
t.deepEqual(output2.result, cloned, '(Unpatching)')
5353
}
5454
return { unpatch, mutations, result }
5555
}

0 commit comments

Comments
 (0)