braid-text 0.2.7 → 0.2.9

package/index.js

@@ -1,5 +1,5 @@
 
-let { Doc } = require("diamond-types-node")
+let { Doc, OpLog, Branch } = require("diamond-types-node")
 let braidify = require("braid-http").http_server
 let fs = require("fs")
 
@@ -207,8 +207,7 @@ braid_text.serve = async (req, res, options = {}) => {
 }
 
 braid_text.delete = async (key) => {
-    let resource = (typeof key == 'string') ? await get_resource(key) : key
-    await resource.delete_me()
+    await braid_text.put(key, {body: ''})
 }
 
 braid_text.get = async (key, options) => {
@@ -349,15 +348,8 @@ braid_text.put = async (key, options) => {
     let parents = resource.doc.getRemoteVersion().map((x) => x.join("-")).sort()
     let og_parents = options_parents || parents
 
-    function get_len() {
-        let d = dt_get(resource.doc, og_parents)
-        let len = d.len()
-        d.free()
-        return len
-    }
-
     let max_pos = resource.length_cache.get('' + og_parents) ??
-        (v_eq(parents, og_parents) ? resource.doc.len() : get_len())
+        (v_eq(parents, og_parents) ? resource.doc.len() : dt_len(resource.doc, og_parents))
     
     if (body != null) {
         patches = [{
@@ -825,6 +817,27 @@ async function file_sync(key, process_delta, get_init) {
 //////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////
 
+function dt_len(doc, version) {
+    let bytes = doc.toBytes()
+    let oplog = OpLog.fromBytes(bytes)
+    let [_agents, versions, _parentss] = dt_parse([...bytes])
+
+    let frontier = {}
+    version.forEach((x) => frontier[x] = true)
+
+    let local_version = []
+    for (let i = 0; i < versions.length; i++)
+        if (frontier[versions[i].join("-")]) local_version.push(i)
+
+    let b = new Branch()
+    b.merge(oplog, new Uint32Array(local_version))
+    let len = count_code_points(b.get())
+    b.free()
+    
+    oplog.free()
+    return len
+}
+
 function dt_get(doc, version, agent = null) {
     if (dt_get.last_doc) dt_get.last_doc.free()
 

package/package.json

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

package/test.html

@@ -110,31 +110,18 @@ runTest(
     async () => {
         let key = 'test-' + Math.random().toString(36).slice(2)
 
-        let r0 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
-
         await fetch(`/${key}`, {
             method: 'PUT',
-            body: JSON.stringify({a: 5, b: 6}, null, 4)
-        })
-
-        let r1 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
-
-        await fetch(`/${key}`, {
-            method: 'DELETE'
+            body: 'hi'
         })
 
-        let r2 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
+        await fetch(`/${key}`, {method: 'DELETE'})
 
-        await fetch(`/${key}`, {
-            method: 'PUT',
-            body: JSON.stringify({a: 5, b: 7}, null, 4)
-        })
-
-        let r3 = (await (await fetch(`/test.html?check=/${key}`)).json()).result
+        let r = await fetch(`/${key}`)
 
-        return JSON.stringify([r0, r1, r2, r3])
+        return await r.text()
     },
-    JSON.stringify([false, true, false, true])
+    ''
 )
 
 runTest(