braid-text 0.2.22 → 0.2.23

package/index.js

@@ -334,7 +334,8 @@ braid_text.put = async (key, options) => {
         // make sure we have all these parents
         for (let p of options_parents) {
             let P = decode_version(p)
-            if (P[1] > (resource.actor_seqs[P[0]] ?? -1)) throw new Error(`${MISSING_PARENT_VERSION}: ${p}`)
+            if (!resource.actor_seqs[P[0]]?.has(P[1]))
+                throw new Error(`${MISSING_PARENT_VERSION}: ${p}`)
         }
     }
 
@@ -378,7 +379,7 @@ braid_text.put = async (key, options) => {
         max_pos))
 
     // validate version: make sure we haven't seen it already
-    if (v[1] <= (resource.actor_seqs[v[0]] ?? -1)) {
+    if (resource.actor_seqs[v[0]]?.has(v[1])) {
 
         if (!options.validate_already_seen_versions) return
 
@@ -439,7 +440,8 @@ braid_text.put = async (key, options) => {
         // we already have this version, so nothing left to do
         return
     }
-    resource.actor_seqs[v[0]] = v[1]
+    if (!resource.actor_seqs[v[0]]) resource.actor_seqs[v[0]] = new RangeSet()
+    resource.actor_seqs[v[0]].add_range(v[1] + 1 - change_count, v[1])
 
     // reduce the version sequence by the number of char-edits
     v = `${v[0]}-${v[1] + 1 - change_count}`
@@ -580,28 +582,6 @@ braid_text.put = async (key, options) => {
     await resource.db_delta(resource.doc.getPatchSince(v_before))
 }
 
-braid_text.revert = async (key, version) => {
-    var resource = (typeof key == 'string') ? await get_resource(key) : key
-
-    // revert dt
-    var old_doc = resource.doc
-    resource.doc = dt_get(resource.doc, null, null, version)
-    old_doc.free()
-
-    for (let v of version) {
-        var [actor, seq] = decode_version(v)
-        if ((resource.actor_seqs[actor] ?? -1) > seq - 1) {
-            if (seq > 0) resource.actor_seqs[actor] = seq - 1
-            else delete resource.actor_seqs[actor]
-        }
-    }
-
-    resource.val = resource.doc.get()
-
-    // save it
-    await resource.db_delta()
-}
-
 braid_text.list = async () => {
     try {
         if (braid_text.db_folder) {
@@ -645,7 +625,8 @@ async function get_resource(key) {
         let max_version = resource.doc.getLocalVersion().reduce((a, b) => Math.max(a, b), -1)
         for (let i = 0; i <= max_version; i++) {
             let v = resource.doc.localToRemoteVersion([i])[0]
-            resource.actor_seqs[v[0]] = Math.max(v[1], resource.actor_seqs[v[0]] ?? -1)
+            if (!resource.actor_seqs[v[0]]) resource.actor_seqs[v[0]] = new RangeSet()
+            resource.actor_seqs[v[0]].add_range(v[1], v[1])
         }
 
         resource.val = resource.doc.get()
@@ -1772,6 +1753,52 @@ function apply_patch(obj, range, content) {
     }
 }
 
+class RangeSet {
+    constructor() {
+        this.ranges = []
+    }
+
+    add_range(low_inclusive, high_inclusive) {
+        if (low_inclusive > high_inclusive) return
+
+        const startIndex = this._bs(mid => this.ranges[mid][1] >= low_inclusive - 1, this.ranges.length, true)
+        const endIndex = this._bs(mid => this.ranges[mid][0] <= high_inclusive + 1, -1, false)
+
+        if (startIndex > endIndex) {
+            this.ranges.splice(startIndex, 0, [low_inclusive, high_inclusive])
+        } else {
+            const mergedLow = Math.min(low_inclusive, this.ranges[startIndex][0])
+            const mergedHigh = Math.max(high_inclusive, this.ranges[endIndex][1])
+            const removeCount = endIndex - startIndex + 1
+            this.ranges.splice(startIndex, removeCount, [mergedLow, mergedHigh])
+        }
+    }
+
+    has(x) {
+        var index = this._bs(mid => this.ranges[mid][0] <= x, -1, false)
+        return index !== -1 && x <= this.ranges[index][1]
+    }
+
+    _bs(condition, defaultR, moveLeft) {
+        let low = 0
+        let high = this.ranges.length - 1
+        let result = defaultR
+        
+        while (low <= high) {
+            const mid = Math.floor((low + high) / 2)
+            if (condition(mid)) {
+                result = mid
+                if (moveLeft) high = mid - 1
+                else low = mid + 1
+            } else {
+                if (moveLeft) low = mid + 1
+                else high = mid - 1
+            }
+        }
+        return result
+    }
+}
+
 braid_text.get_resource = get_resource
 
 braid_text.encode_filename = encode_filename

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "braid-text",
-  "version": "0.2.22",
+  "version": "0.2.23",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braid-text",

package/test/test.js

@@ -12,25 +12,15 @@ process.on("uncaughtException", (x) =>
 
 braid_text.db_folder = null
 
-async function test_revert() {
+async function test_db() {
     braid_text.db_folder = './braid-text-db'
     var key = Math.random().toString(36).slice(2)
     await braid_text.put(key, {version: ['a-0'], body: 'A'})
-    await braid_text.put(key, {version: ['a-1'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'B'}]})
-    await braid_text.revert(key, ['a-1'])
+    await braid_text.put(key, {version: ['a-2'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'B'}]})
     delete braid_text.cache[key]
     var {version, body} = await braid_text.get(key, {})
-    if (version[0] != 'a-0') throw new Error('revert error: wrong version')
-    if (body != 'A') throw new Error('revert error: wrong text')
 
-    await braid_text.put(key, {version: ['b-0'], parents: ['a-0'], patches: [{range: '[1:1]', content: 'C'}]})
-    if ('AC' !== await braid_text.get(key)) throw new Error('revert error: wrong text')
-    await braid_text.revert(key, ['b-0'])
-    if ('A' !== await braid_text.get(key)) throw new Error('revert error: wrong text')
-    delete braid_text.cache[key]
-    var {version, body} = await braid_text.get(key, {})
-    if (version[0] != 'a-0') throw new Error('revert error: wrong version')
-    if (body != 'A') throw new Error('revert error: wrong text')
+    if (body != 'AB') throw new Error('db error')
 
     braid_text.db_folder = null
 }
@@ -41,7 +31,7 @@ async function main() {
     let base = Math.floor(Math.random() * 10000000)
     let st = Date.now()
 
-    await test_revert()
+    await test_db()
 
     let og_log = console.log
     console.log = () => {}
@@ -96,14 +86,6 @@ async function main() {
                     await braid_text.put(key, y)
                     y.validate_already_seen_versions = true
                     await braid_text.put(key, y)
-
-                    // test revert
-                    var range = x.range.match(/\d+/g).map((x) => parseInt(x))
-                    var change_count = [...x.content].length + range[1] - range[0]
-                    await braid_text.revert(key, [`${actor}-${seq + 1 - change_count}`])
-                    var new_text = await braid_text.get(key)
-                    if (old_text !== new_text) throw new Error('revert failed!')
-                    await braid_text.put(key, y)
                 }
             }
             await dt_to_braid(doc, 'doc')
@@ -134,16 +116,7 @@ async function main() {
                 await braid_text.get('middle_doc', {peer: 'sim', subscribe: async update => {
                     if (first_time) {
                         first_time = false
-                        if (update.body !== await braid_text.get('middle_doc')) fail(new Error('test 2'))
-
-                        var x = await braid_text.get('middle_doc', {})
-                        await braid_text.put('middle_doc', {peer: 'sim', version: ['sim-0'], parents: x.version, patches: [{content: 'A', range: '[0:0]'}]})
-                        await braid_text.put('middle_doc', {peer: 'other', merge_type: 'dt', version: ['other-0'], parents: [], patches: [{content: 'B', range: '[0:0]'}]})
-                        await braid_text.put('middle_doc', {peer: 'sim', version: ['sim-1'], parents: ['sim-0'], patches: [{content: 'b', range: '[0:0]'}]})
-                        await braid_text.put('middle_doc', {peer: 'sim', version: ['sim-2'], parents: ['sim-1'], patches: [{content: 'c', range: '[0:0]'}]})
-                        await braid_text.revert('middle_doc', ['sim-0'])
-                        await braid_text.revert('middle_doc', ['other-0'])
-
+                        if (update.body !== await braid_text.get('middle_doc')) fail(new Error('simpleton fail'))
                         done()
                     }
                 }})