Small changes applyPatch

Author: Josema

src/api/applyPatchFactory.js

@@ -15,9 +15,8 @@ export default function applyPatchFactory(patchers) {
             ({ patch, target, prop, path }) => {
                 const patch_value = patch[prop]
                 const target_value = target[prop]
-                const had_prop = target.hasOwnProperty(prop)
                 if (
-                    !had_prop ||
+                    !target.hasOwnProperty(prop) ||
                     (patch_value !== target_value &&
                         !(
                             isPlainObject(patch_value) &&
@@ -32,7 +31,6 @@ export default function applyPatchFactory(patchers) {
                                 target,
                                 prop,
                                 old_value,
-                                had_prop,
                                 applyPatch,
                             }),
                         target_value

src/index.js

@@ -6,12 +6,12 @@ import createNodeFactory from './api/createNodeFactory'
 import createStoreFactory from './api/createStoreFactory'
 import applyPatchFactory from './api/applyPatchFactory'
 
-import Function from './types/Function'
 import Primitives from './types/Primitives'
 import Delete from './types/Delete'
 import Replace from './types/Replace'
 import Splice from './types/Splice'
 import Swap from './types/Swap'
+import Function from './types/Function'
 
 function factory() {
     const patchers = []
@@ -30,12 +30,12 @@ function factory() {
         if (isFunction(decode)) decoders.push(decode)
     }
 
-    addType(Function)
     addType(Primitives)
     addType(Delete)
     addType(Replace)
     addType(Splice)
     addType(Swap)
+    addType(Function)
 
     return {
         version,

src/types/Primitives.js

@@ -5,17 +5,10 @@ import Delete from './Delete'
 
 export default function Primitives() {}
 
-Primitives.patch = function ({
-    patch,
-    target,
-    prop,
-    old_value,
-    had_prop,
-    applyPatch,
-}) {
+Primitives.patch = function ({ patch, target, prop, old_value, applyPatch }) {
     const patch_value = patch[prop]
 
-    if (!had_prop) {
+    if (!target.hasOwnProperty(prop)) {
         old_value = new Delete()
     }
 
@@ -34,14 +27,15 @@ Primitives.patch = function ({
             const unpatches = {}
             const length = old_value.length
             for (const key in patch_value) {
-                const had_prop = old_value.hasOwnProperty(key)
                 const patched = applyPatch(old_value[key], patch_value[key])
                 if (
                     old_value[key] !== patched.result ||
                     isPlainObject(patch_value[key])
                 ) {
                     old_value[key] = patched.result
-                    unpatches[key] = had_prop ? patched.unpatch : Delete()
+                    unpatches[key] = old_value.hasOwnProperty(key)
+                        ? patched.unpatch
+                        : Delete()
                 }
             }
             if (old_value.length !== length) {

test/applyPatch.js

@@ -114,6 +114,7 @@ test('13/b', function (t) {
 
     testPatchUnpatch(t, target, patch, expected)
 })
+
 test('13/c (not sure about this case)', function (t) {
     const target = { e: TYPE.Delete() }
     const patch = { a: 1, e: TYPE.Delete() }
@@ -128,7 +129,7 @@ test('14 / https://tools.ietf.org/html/rfc7386 ', function (t) {
     const patch = { a: 'b', c: TYPE.Delete() }
     const expected = { a: 'b' }
 
-    testPatchUnpatch(t, target, patch, expected, false)
+    testPatchUnpatch(t, target, patch, expected)
 })
 
 test('15 / https://tools.ietf.org/html/rfc7386 ', function (t) {
@@ -708,3 +709,19 @@ test('Changing lengh array', function (t) {
     const expected = ['A', undefined]
     testPatchUnpatch(t, target, patch, expected)
 })
+
+test('adding inner arrays', function (t) {
+    const target = { objarr: [0, 1, [false], [[]]] }
+    const patch = { objarr: { 2: [2], 3: { 0: { 0: [3] } } } }
+    const expected = { objarr: [0, 1, [2], [[[3]]]] }
+
+    testPatchUnpatch(t, target, patch, expected)
+})
+
+test('adding inner arrays as top level', function (t) {
+    const target = [0, 1, [false], [[]]]
+    const patch = { length: 5, 2: [2], 3: { 2: 4, 0: { 0: [3] } } }
+    const expected = [0, 1, [2], [[[3]], undefined, 4], undefined]
+
+    testPatchUnpatch(t, target, patch, expected)
+})