ffff

Author: sonnyp

index.js

@@ -31,3 +31,4 @@ module.exports.unpack = require('./lib/unpack')
 
 // Utilities
 module.exports.concat = require('./lib/concat')
+module.exports.rebase = require('./lib/rebase')

lib/rebase.js

@@ -8,25 +8,31 @@ var decode = ooPointer.decode
 function createContext (op) {
   var context = undefined
   var path = decode(op.path)
-  return {} // fix edge cases!!
-  // console.log(path)
+  return Object.create(null) // fix edge cases!!
 }
 
-function rebase(patch) {
+module.exports = function rebase(patch) {
   if (patch.length < 2) return patch
 
-  var ctx = createContext(patch[0])
+  var changes = Object.create(null)
+  // var ctx = createContext(patch[0])
 
   for (var i = 0, l = patch.length; i < l; i++) {
+    var op = patch[i]
+    if (op.op === 'remove') {
+      for (var p in changes) {
+        if (p.indexOf(op.path) === 0) {
+          delete changes[p]
+        }
+      }
+    } else {
+      changes[op.path] = op
+    }
+  }
 
-    rebase[patch[i].path] = [patch[i].op, patch[i].value]
+  var rebased = []
+  for (var k in changes) {
+    rebased.push(changes[k])
   }
+  return rebased
 }
-
-var patch = [
-  {op: "add", value: "bar", path: "/foo/machin"},
-  {op: "remove", path: "/foo"}
-]
-
-console.log(rebase(patch))
-

test/rebase.js

@@ -0,0 +1,16 @@
+'use strict'
+
+import assert from 'assert'
+import rebase from '../lib/rebase'
+// need a json8/assert module
+const tests = require('./rebase_tests.json')
+
+describe('rebase', () => {
+  tests.forEach((test) => {
+    describe(test.description, () => {
+      it('passes', () => { // BDD lulz
+        assert.deepEqual(rebase(test.patch), test.expected)
+      })
+    })
+  })
+})

test/rebase_tests.json

@@ -0,0 +1,23 @@
+[
+  {
+    "description": "empty patch",
+    "patch": [],
+    "expected": []
+  },
+  {
+    "description": "add then remove at same path",
+    "patch": [
+      {"path": "/foo", "op": "add", "value": "bar"},
+      {"path": "/foo", "op": "remove"}
+    ],
+    "expected": []
+  },
+  {
+    "description": "add child value then remove parent",
+    "patch": [
+      {"path": "/foo/bar", "op": "add", "value": "bar"},
+      {"path": "/foo", "op": "remove"}
+    ],
+    "expected": []
+  }
+]