braid-text 0.1.4 → 0.2.1

package/editor.html

@@ -5,7 +5,7 @@
   ></textarea>
 </body>
 <script src="https://braid.org/code/myers-diff1.js"></script>
-<script src="https://unpkg.com/braid-http@~1.0/braid-http-client.js"></script>
+<script src="https://unpkg.com/braid-http@~1.3/braid-http-client.js"></script>
 <script src="/simpleton-client.js"></script>
 <script>
   let simpleton = simpleton_client(location.pathname, {

package/index.js

@@ -148,6 +148,7 @@ braid_text.serve = async (req, res, options = {}) => {
         let ee = null
         try {
             patches = await req.patches()
+            for (let p of patches) p.content = p.content_text
         } catch (e) { ee = e }
         await my_prev_put_p
 
@@ -310,7 +311,7 @@ braid_text.put = async (key, options) => {
         
         let x = JSON.parse(resource.doc.get())
         for (let p of patches)
-            apply_patch(x, p.range, JSON.parse(p.content))
+            apply_patch(x, p.range, p.content === '' ? undefined : JSON.parse(p.content))
 
         return await braid_text.put(key, {
             body: JSON.stringify(x, null, 4)

package/markdown-editor.html

@@ -12,7 +12,7 @@ dom.BODY = -> DIV(WIKI())
     window.statebus_fetch = window.fetch
     window.fetch = window.og_fetch
 </script>
-<script src="https://unpkg.com/braid-http@~1.0/braid-http-client.js"></script>
+<script src="https://unpkg.com/braid-http@~1.3/braid-http-client.js"></script>
 <script>
     window.fetch = window.statebus_fetch
 </script>

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "braid-text",
-  "version": "0.1.4",
+  "version": "0.2.1",
   "description": "Library for collaborative text over http using braid.",
   "author": "Braid Working Group",
   "repository": "braid-org/braidjs",
   "homepage": "https://braid.org",
   "dependencies": {
     "diamond-types-node": "^1.0.2",
-    "braid-http": "^1.0.7"
+    "braid-http": "^1.3.4"
   }
 }

package/simpleton-client.js

@@ -1,4 +1,4 @@
-// requires braid-http@~1.0/braid-http-client.js
+// requires braid-http@~1.3/braid-http-client.js
 // 
 // url: resource endpoint
 //
@@ -41,10 +41,13 @@ function simpleton_client(url, { apply_remote_update, generate_local_diff_update
             if (current_version.length === update.parents.length
                 && current_version.every((v, i) => v === update.parents[i])) {
                 current_version = update.version.sort()
-                update.state = update.body
+                update.state = update.body_text
 
                 if (update.patches) {
-                    for (let p of update.patches) p.range = p.range.match(/\d+/g).map((x) => 1 * x)
+                    for (let p of update.patches) {
+                        p.range = p.range.match(/\d+/g).map((x) => 1 * x)
+                        p.content = p.content_text
+                    }
                     update.patches.sort((a, b) => a.range[0] - b.range[0])
 
                     // convert from code-points to js-indicies

package/test.html

@@ -19,7 +19,7 @@
         background-color: #ffebee;
     }
 </style>
-<script src="https://unpkg.com/braid-http@~1.1/braid-http-client.js"></script>
+<script src="https://unpkg.com/braid-http@~1.3/braid-http-client.js"></script>
 <div id="testContainer"></div>
 <script type=module>
 
@@ -61,6 +61,27 @@ async function runTest(testName, testFunction, expectedResult) {
     }
 }
 
+runTest(
+    "test getting a binary update from a subscription",
+    async () => {
+        return await new Promise(async (done, fail) => {
+            let key = 'test-' + Math.random().toString(36).slice(2)
+
+            await fetch(`/${key}`, {
+                method: 'PUT',
+                body: JSON.stringify({a: 5, b: 6}, null, 4)
+            })
+
+            let r = await braid_fetch(`/${key}`, {
+                subscribe: true
+            })
+
+            r.subscribe(update => done(update.body_text), fail)
+        })
+    },
+    JSON.stringify({a: 5, b: 6}, null, 4)
+)
+
 runTest(
     "test sending a json patch to some json-text",
     async () => {
@@ -115,4 +136,27 @@ runTest(
     JSON.stringify({a: 55, b: 66, c: 7}, null, 4)
 )
 
+runTest(
+    "test deleting something using a json patch",
+    async () => {
+        let key = 'test-' + Math.random().toString(36).slice(2)
+
+        await fetch(`/${key}`, {
+            method: 'PUT',
+            body: JSON.stringify({a: 5, b: 6}, null, 4)
+        })
+
+        await fetch(`/${key}`, {
+            method: 'PUT',
+            headers: { 'Content-Range': 'json a' },
+            body: ''
+        })
+
+        let r = await fetch(`/${key}`)
+
+        return await r.text()
+    },
+    JSON.stringify({b: 6}, null, 4)
+)
+
 </script>

package/test.js

@@ -27,7 +27,7 @@ async function main() {
         og_log(`t = ${t}, seed = ${seed}, best_n = ${best_n} @ ${best_seed}`)
         Math.randomSeed(seed)
 
-        let n = Math.floor(Math.random() * 15) + 5
+        let n = Math.floor(Math.random() * 15)
         console.log(`n = ${n}`)
 
         try {