v13.0.0-22 -- distribution files

13.0.0-22
add indexeddb example
2017-10-07 00:46:32 +02:00 · 2017-10-07 00:42:06 +02:00 · 2017-10-07 00:40:34 +02:00 · 2017-10-07 00:39:26 +02:00 · 2017-10-02 15:52:11 +02:00 · 2017-10-02 15:50:56 +02:00
14 changed files with 1199 additions and 511 deletions
--- a/examples/html-editor/index.js
+++ b/examples/html-editor/index.js
@@ -7,9 +7,9 @@ Y({
  },
  connector: {
    name: 'websockets-client',
-    // url: 'http://127.0.0.1:1234',
-    url: 'http://192.168.178.81:1234',
+    url: 'http://127.0.0.1:1234',
    room: 'html-editor-example6'
+    // maxBufferLength: 100
  },
  share: {
    xml: 'XmlFragment()' // y.share.xml is of type Y.Xml with tagname "p"
--- a/examples/indexeddb/index.html
+++ b/examples/indexeddb/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+  </head>
+  <body>
+    <div id="codeMirrorContainer"></div>
+    <script src="../bower_components/codemirror/lib/codemirror.js"></script>
+    <script src="../bower_components/codemirror/mode/javascript/javascript.js"></script>
+    <link rel="stylesheet" href="../bower_components/codemirror/lib/codemirror.css">
+    <style>
+      .CodeMirror {
+        position: fixed;
+        top: 0;
+        left: 0;
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+    <script type="module" src="./index.js"></script>
+  </body>
+</html>
--- a/examples/indexeddb/index.js
+++ b/examples/indexeddb/index.js
@@ -0,0 +1,24 @@
+/* global Y, CodeMirror */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    room: 'codemirror-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    codemirror: 'Text' // y.share.codemirror is of type Y.Text
+  }
+}).then(function (y) {
+  window.yCodeMirror = y
+
+  var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
+    mode: 'javascript',
+    lineNumbers: true
+  })
+  y.share.codemirror.bindCodeMirror(editor)
+})
--- a/examples/yjs-dist.esm
+++ b/examples/yjs-dist.esm
@@ -3,7 +3,7 @@ import Y from '../src/y.js'
 import yArray from '../../y-array/src/y-array.js'
 import yIndexedDB from '../../y-indexeddb/src/y-indexeddb.js'
 import yMap from '../../y-map/src/y-map.js'
-import yText from '../../y-text/src/Text.js'
+import yText from '../../y-text/src/y-text.js'
 import yXml from '../../y-xml/src/y-xml.js'
 import yWebsocketsClient from '../../y-websockets-client/src/y-websockets-client.js'

--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "13.0.0-17",
+  "version": "13.0.0-22",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "13.0.0-19",
+  "version": "13.0.0-22",
  "description": "A framework for real-time p2p shared editing on any data",
  "main": "./y.node.js",
  "browser": "./y.js",
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -213,7 +213,7 @@ export default function extendConnector (Y/* :any */) {
          self.broadcastOpBuffer = ops.slice(i)
          self.broadcast(encoder.createBuffer())
          if (i !== length) {
-            setTimeout(broadcastOperations, 100)
+            self.whenRemoteResponsive().then(broadcastOperations)
          }
        }
      }
@@ -225,6 +225,20 @@ export default function extendConnector (Y/* :any */) {
      }
    }

+    /*
+     * Somehow check the responsiveness of the remote clients/server
+     * Default behavior:
+     *   Wait 100ms before broadcasting the next batch of operations
+     *
+     * Only used when maxBufferLength is set
+     *
+     */
+    whenRemoteResponsive () {
+      return new Promise(function (resolve) {
+        setTimeout(resolve, 100)
+      })
+    }
+
    /*
      You received a raw message, and you know that it is intended for Yjs. Then call this function.
    */
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -49,6 +49,51 @@ export default function Utils (Y) {
    }
  }

+  Y.utils.getRelativePosition = function (type, offset) {
+    if (type == null) {
+      return null
+    } else {
+      if (type._content.length <= offset) {
+        return ['endof', type._model[0], type._model[1]]
+      } else {
+        return type._content[offset].id
+      }
+    }
+  }
+
+  Y.utils.fromRelativePosition = function (y, id) {
+    var offset = 0
+    var op
+    if (id[0] === 'endof') {
+      id = y.db.os.find(id.slice(1)).end
+      op = y.db.os.findNodeWithUpperBound(id).val
+      if (!op.deleted) {
+        offset = op.content != null ? op.content.length : 1
+      }
+    } else {
+      op = y.db.os.findNodeWithUpperBound(id).val
+      if (!op.deleted) {
+        offset = id[1] - op.id[1]
+      }
+    }
+
+    var type = y.db.getType(op.parent)
+    if (type == null || y.db.os.find(op.parent).deleted) {
+      return null
+    }
+
+    while (op.left != null) {
+      op = y.db.os.findNodeWithUpperBound(op.left).val
+      if (!op.deleted) {
+        offset += op.content != null ? op.content.length : 1
+      }
+    }
+    return {
+      type: type,
+      offset: offset
+    }
+  }
+
  class NamedEventHandler {
    constructor () {
      this._eventListener = {}
@@ -857,4 +902,34 @@ export default function Utils (Y) {
    }
    return args
  }
+
+  Y.utils.writeObjectToYMap = function writeObjectToYMap (object, type) {
+    for (var key in object) {
+      var val = object[key]
+      if (Array.isArray(val)) {
+        type.set(key, Y.Array)
+        Y.utils.writeArrayToYArray(val, type.get(key))
+      } else if (typeof val === 'object') {
+        type.set(key, Y.Map)
+        Y.utils.writeObjectToYMap(val, type.get(key))
+      } else {
+        type.set(key, val)
+      }
+    }
+  }
+
+  Y.utils.writeArrayToYArray = function writeArrayToYArray (array, type) {
+    for (var i = array.length - 1; i >= 0; i--) {
+      var val = array[i]
+      if (Array.isArray(val)) {
+        type.insert(0, [Y.Array])
+        Y.utils.writeArrayToYArray(val, type.get(0))
+      } else if (typeof val === 'object') {
+        type.insert(0, [Y.Map])
+        Y.utils.writeObjectToYMap(val, type.get(0))
+      } else {
+        type.insert(0, [val])
+      }
+    }
+  }
 }
--- a/y.js
+++ b/y.js
--- a/y.js.map
+++ b/y.js.map
--- a/y.node.js
+++ b/y.node.js
@@ -1,7 +1,7 @@

 /**
 * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-19
+ * @version v13.0.0-22
 * @license MIT
 */

@@ -841,7 +841,7 @@ function extendConnector (Y/* :any */) {
          self.broadcastOpBuffer = ops.slice(i);
          self.broadcast(encoder.createBuffer());
          if (i !== length) {
-            setTimeout(broadcastOperations, 100);
+            self.whenRemoteResponsive().then(broadcastOperations);
          }
        }
      }
@@ -853,6 +853,20 @@ function extendConnector (Y/* :any */) {
      }
    }

+    /*
+     * Somehow check the responsiveness of the remote clients/server
+     * Default behavior:
+     *   Wait 100ms before broadcasting the next batch of operations
+     *
+     * Only used when maxBufferLength is set
+     *
+     */
+    whenRemoteResponsive () {
+      return new Promise(function (resolve) {
+        setTimeout(resolve, 100);
+      })
+    }
+
    /*
      You received a raw message, and you know that it is intended for Yjs. Then call this function.
    */
@@ -3448,6 +3462,51 @@ function Utils (Y) {
    }
  };

+  Y.utils.getRelativePosition = function (type, offset) {
+    if (type == null) {
+      return null
+    } else {
+      if (type._content.length <= offset) {
+        return ['endof', type._model[0], type._model[1]]
+      } else {
+        return type._content[offset].id
+      }
+    }
+  };
+
+  Y.utils.fromRelativePosition = function (y, id) {
+    var offset = 0;
+    var op;
+    if (id[0] === 'endof') {
+      id = y.db.os.find(id.slice(1)).end;
+      op = y.db.os.findNodeWithUpperBound(id).val;
+      if (!op.deleted) {
+        offset = op.content != null ? op.content.length : 1;
+      }
+    } else {
+      op = y.db.os.findNodeWithUpperBound(id).val;
+      if (!op.deleted) {
+        offset = id[1] - op.id[1];
+      }
+    }
+
+    var type = y.db.getType(op.parent);
+    if (type == null || y.db.os.find(op.parent).deleted) {
+      return null
+    }
+
+    while (op.left != null) {
+      op = y.db.os.findNodeWithUpperBound(op.left).val;
+      if (!op.deleted) {
+        offset += op.content != null ? op.content.length : 1;
+      }
+    }
+    return {
+      type: type,
+      offset: offset
+    }
+  };
+
  class NamedEventHandler {
    constructor () {
      this._eventListener = {};
@@ -4256,6 +4315,36 @@ function Utils (Y) {
    }
    return args
  };
+
+  Y.utils.writeObjectToYMap = function writeObjectToYMap (object, type) {
+    for (var key in object) {
+      var val = object[key];
+      if (Array.isArray(val)) {
+        type.set(key, Y.Array);
+        Y.utils.writeArrayToYArray(val, type.get(key));
+      } else if (typeof val === 'object') {
+        type.set(key, Y.Map);
+        Y.utils.writeObjectToYMap(val, type.get(key));
+      } else {
+        type.set(key, val);
+      }
+    }
+  };
+
+  Y.utils.writeArrayToYArray = function writeArrayToYArray (array, type) {
+    for (var i = array.length - 1; i >= 0; i--) {
+      var val = array[i];
+      if (Array.isArray(val)) {
+        type.insert(0, [Y.Array]);
+        Y.utils.writeArrayToYArray(val, type.get(0));
+      } else if (typeof val === 'object') {
+        type.insert(0, [Y.Map]);
+        Y.utils.writeObjectToYMap(val, type.get(0));
+      } else {
+        type.insert(0, [val]);
+      }
+    }
+  };
 }

 function extendRBTree (Y) {
--- a/y.node.js.map
+++ b/y.node.js.map
--- a/y.test.js
+++ b/y.test.js
--- a/y.test.js.map
+++ b/y.test.js.map
Author	SHA1	Message	Date
Kevin Jahns	e6badf98a2	v13.0.0-22 -- distribution files	2017-10-07 00:46:32 +02:00
Kevin Jahns	d9ee67d2f3	13.0.0-22	2017-10-07 00:42:06 +02:00
Kevin Jahns	791f6c12f0	add indexeddb example	2017-10-07 00:40:34 +02:00
Kevin Jahns	23d019c244	add writeObjectToYMap and writeArrayToYArray helper utilities	2017-10-07 00:39:26 +02:00
Kevin Jahns	c8ca80d15f	13.0.0-21	2017-10-02 15:52:11 +02:00
Kevin Jahns	be282c8338	fix lint	2017-10-02 15:50:56 +02:00
Kevin Jahns	829a094c6d	check for responsiveness when maxBufferSize is set	2017-10-02 15:45:23 +02:00
Kevin Jahns	725273167e	13.0.0-20	2017-09-29 22:34:18 +02:00
Kevin Jahns	581264c5e3	implement relative position helper	2017-09-29 22:33:28 +02:00