braid-text 0.2.16 → 0.2.18

package/index.js

@@ -577,6 +577,37 @@ braid_text.put = async (key, options) => {
     await resource.db_delta(resource.doc.getPatchSince(v_before))
 }
 
+// currently version must be an array with exactly one element, e.g. ["abc-1"]
+braid_text.revert = async (key, version) => {
+    var resource = (typeof key == 'string') ? await get_resource(key) : key
+
+    var [actor, seq] = decode_version(version[0])
+
+    // get version without actor-seq,
+    // and update actor_seqs
+    var v = []
+    for (var [a, s] of Object.entries(resource.actor_seqs)) {
+        if (a !== actor) v.push(`${a}-${s}`)
+        else {
+            if (s < seq) return // nothing to do
+            else if (seq > 0) {
+                v.push(`${a}-${seq - 1}`)
+                resource.actor_seqs[actor] = seq - 1
+            } else delete resource.actor_seqs[actor]
+        }
+    }
+
+    // revert dt
+    var old_doc = resource.doc
+    resource.doc = dt_get(resource.doc, v)
+    old_doc.free()
+
+    resource.val = resource.doc.get()
+
+    // save it
+    await resource.db_delta()
+}
+
 braid_text.list = async () => {
     try {
         if (braid_text.db_folder) {
@@ -742,7 +773,8 @@ async function file_sync(key, process_delta, get_init) {
     return {
         change: async (bytes) => {
             await (chain = chain.then(async () => {
-                currentSize += bytes.length + 4 // we account for the extra 4 bytes for uint32
+                if (!bytes) currentSize = threshold
+                else currentSize += bytes.length + 4 // we account for the extra 4 bytes for uint32
                 const filename = `${braid_text.db_folder}/${encoded}.${currentNumber}`
                 if (currentSize < threshold) {
                     if (braid_text.verbose) console.log(`appending to db..`)
@@ -1742,4 +1774,6 @@ braid_text.dt_get_patches = dt_get_patches
 braid_text.dt_parse = dt_parse
 braid_text.dt_create_bytes = dt_create_bytes
 
+braid_text.decode_version = decode_version
+
 module.exports = braid_text

package/package.json

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

package/test/test.js

@@ -12,18 +12,43 @@ process.on("uncaughtException", (x) =>
 
 braid_text.db_folder = null
 
+async function test_revert() {
+    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'])
+    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')
+
+    braid_text.db_folder = null
+}
+
 async function main() {
     let best_seed = NaN
     let best_n = Infinity
     let base = Math.floor(Math.random() * 10000000)
     let st = Date.now()
 
+    await test_revert()
+
     let og_log = console.log
     console.log = () => {}
     for (let t = 0; t < 10000; t++) {
         let seed = base + t
     // for (let t = 0; t < 1; t++) {
-    //     let seed = 7630348
+    //     let seed = 7375800
 
         og_log(`t = ${t}, seed = ${seed}, best_n = ${best_n} @ ${best_seed}`)
         Math.randomSeed(seed)
@@ -53,6 +78,11 @@ async function main() {
             let dt_to_braid = async (doc, key) => {
                 await braid_text.get(key, {})
                 for (let x of dt_get_patches(doc)) {
+                    var resource = await braid_text.get_resource(key)
+                    var [actor, seq] = braid_text.decode_version(x.version)
+                    var pre_seq = resource.actor_seqs[actor]
+                    var old_text = await braid_text.get(key)
+
                     console.log(`x = `, x)
                     let y = {
                         merge_type: 'dt',
@@ -67,6 +97,12 @@ async function main() {
                     await braid_text.put(key, y)
                     y.validate_already_seen_versions = true
                     await braid_text.put(key, y)
+
+                    // test revert
+                    await braid_text.revert(key, [`${actor}-${(pre_seq ?? -1) + 1}`])
+                    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')
@@ -135,6 +171,9 @@ function make_random_edit(doc) {
     }
     base_seq++
 
+    // try skipping some seqs.. to see if it breaks..
+    base_seq += Math.floor(Math.random() * 5)
+
     console.log({agents, versions, include_versions})
 
     let parent_doc = dt_get(doc, include_versions)
@@ -196,12 +235,6 @@ function getRandomCharacter() {
     return characters[randomIndex];
 }
 
-function decode_version(v) {
-    let m = v.match(/^(.*)-(\d+)$/s)
-    if (!m) throw new Error(`invalid actor-seq version: ${v}`)
-    return [m[1], parseInt(m[2])]
-}
-
 /////////
 
 // the next two functions added by me