braid-text 0.2.2 → 0.2.4

package/index.js

@@ -487,6 +487,7 @@ braid_text.put = async (key, options) => {
     }
 
     for (let b of bytes) resource.doc.mergeBytes(b)
+    resource.val = resource.doc.get()
 
     resource.need_defrag = true
 
@@ -589,8 +590,6 @@ braid_text.put = async (key, options) => {
     }
 
     await resource.db_delta(resource.doc.getPatchSince(v_before))
-
-    resource.val = resource.doc.get()
 }
 
 braid_text.list = async () => {
@@ -866,17 +865,28 @@ function dt_get(doc, version, agent = null) {
             ) {
                 for (; i < I; i++) {
                     let version = versions[i].join("-")
-                    if (!after_versions[version]) new_doc.mergeBytes(
+                    if (after_versions[version]) continue
+                    let og_i = i
+                    let content = []
+                    if (op_run.content?.[i - base_i]) content.push(op_run.content[i - base_i])
+                    if (!!op_run.content === op_run.fwd)
+                        while (i + 1 < I && !after_versions[versions[i + 1].join("-")]) {
+                            i++
+                            if (op_run.content?.[i - base_i]) content.push(op_run.content[i - base_i])
+                        }
+                    content = content.length ? content.join("") : null
+
+                    new_doc.mergeBytes(
                         dt_create_bytes(
                             version,
-                            parentss[i].map((x) => x.join("-")),
+                            parentss[og_i].map((x) => x.join("-")),
                             op_run.fwd ?
                                 (op_run.content ?
-                                    op_run.start + (i - base_i) :
+                                    op_run.start + (og_i - base_i) :
                                     op_run.start) :
                                 op_run.end - 1 - (i - base_i),
-                            op_run.content?.[i - base_i] != null ? 0 : 1,
-                            op_run.content?.[i - base_i]
+                            op_run.content ? 0 : i - og_i + 1,
+                            content
                         )
                     )
                 }
@@ -1569,7 +1579,7 @@ function decode_filename(encodedFilename) {
 function validate_version_array(x) {
     if (!Array.isArray(x)) throw new Error(`invalid version array: not an array`)
     x.sort()
-    for (xx of x) validate_actor_seq(xx)
+    for (var xx of x) validate_actor_seq(xx)
 }
 
 function validate_actor_seq(x) {

package/package.json

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

package/test.js

@@ -16,6 +16,7 @@ async function main() {
     let best_seed = NaN
     let best_n = Infinity
     let base = Math.floor(Math.random() * 10000000)
+    let st = Date.now()
 
     let og_log = console.log
     console.log = () => {}
@@ -113,6 +114,7 @@ async function main() {
         }
     }
     og_log(`best_seed = ${best_seed}, best_n = ${best_n}`)
+    og_log(`time = ${Date.now() - st}`)
 }
 
 function make_random_edit(doc) {