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
20 changed files with 30020 additions and 37 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://127.0.0.1:1234',
    url: 'http://192.168.178.81: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/textarea/index.html
+++ b/examples/textarea/index.html
@@ -4,8 +4,7 @@
  <textarea style="width:80%;" rows=40 id="textfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
  <script src="../../y.js"></script>
  <script src="../../../y-array/y-array.js"></script>
-  <script src="../../../y-text/dist/y-text.js"></script>
+  <script src="../../../y-text/y-text.js"></script>
  <script src="../../../y-memory/y-memory.js"></script>
  <script src="../../../y-websockets-client/y-websockets-client.js"></script>
  <script src="./index.js"></script>
 </body>
--- a/examples/textarea/index.js
+++ b/examples/textarea/index.js
@@ -1,8 +1,5 @@
 /* global Y */
 // eslint-disable-next-line
 let search = new URLSearchParams(location.search)
 // initialize a shared object. This function call returns a promise!
 Y({
  db: {
@@ -10,10 +7,9 @@ Y({
  },
  connector: {
    name: 'websockets-client',
-    room: 'Textarea-example',
+    room: 'Textarea-example2',
    // url: '//localhost:1234',
    url: 'https://yjs-v13.herokuapp.com/'
    // options: { transports: ['websocket'], upgrade: false }
  },
  share: {
    textarea: 'Text'
@@ -24,7 +20,4 @@ Y({
  // bind the textarea to a shared text element
  y.share.textarea.bind(document.getElementById('textfield'))
  // thats it..
 }).catch(() => {
  console.log('Something went wrong while creating the instance..')
 })
--- 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-17",
+  "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
@@ -42,6 +42,11 @@ export default function extendConnector (Y/* :any */) {
      if (opts.generateUserId !== false) {
        this.setUserId(Y.utils.generateUserId())
      }
      if (opts.maxBufferLength == null) {
        this.maxBufferLength = -1
      } else {
        this.maxBufferLength = opts.maxBufferLength
      }
    }
    reconnect () {
@@ -197,14 +202,19 @@ export default function extendConnector (Y/* :any */) {
          encoder.writeVarString(self.opts.room)
          encoder.writeVarString('update')
          let ops = self.broadcastOpBuffer
          self.broadcastOpBuffer = []
          let length = ops.length
-          encoder.writeUint32(length)
+          let encoderPosLen = encoder.pos
-          for (var i = 0; i < length; i++) {
+          encoder.writeUint32(0)
          for (var i = 0; i < length && (self.maxBufferLength < 0 || encoder.length < self.maxBufferLength); i++) {
            let op = ops[i]
            Y.Struct[op.struct].binaryEncode(encoder, op)
          }
          encoder.setUint32(encoderPosLen, i)
          self.broadcastOpBuffer = ops.slice(i)
          self.broadcast(encoder.createBuffer())
          if (i !== length) {
            self.whenRemoteResponsive().then(broadcastOperations)
          }
        }
      }
      if (this.broadcastOpBuffer.length === 0) {
@@ -215,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/Encoding.js
+++ b/src/Encoding.js
@@ -8,6 +8,10 @@ export class BinaryEncoder {
    this.data = []
  }
  get length () {
    return this.data.length
  }
  get pos () {
    return this.data.length
  }
--- 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 = {}
@@ -67,7 +112,11 @@ export default function Utils (Y) {
      this._eventListener[name] = listener.filter(e => e !== f)
    }
    emit (name, value) {
-      (this._eventListener[name] || []).forEach(l => l(value))
+      let listener = this._eventListener[name] || []
      if (name === 'error' && listener.length === 0) {
        console.error(value)
      }
      listener.forEach(l => l(value))
    }
    destroy () {
      this._eventListener = null
@@ -853,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/src/y-memory.js
+++ b/src/y-memory.js
@@ -1,4 +1,3 @@
 import extendRBTree from './RedBlackTree'
 export default function extend (Y) {
@@ -48,9 +47,13 @@ export default function extend (Y) {
    }
    transact (makeGen) {
      const t = new Transaction(this)
-      while (makeGen != null) {
+      try {
-        makeGen.call(t)
+        while (makeGen != null) {
-        makeGen = this.getNextRequest()
+          makeGen.call(t)
          makeGen = this.getNextRequest()
        }
      } catch (e) {
        this.y.emit('error', e)
      }
    }
    destroy () {
--- a/test/y-xml.tests.js
+++ b/test/y-xml.tests.js
@@ -224,16 +224,65 @@ test('move element to a different position', async function xml13 (t) {
  await compareUsers(t, users)
 })
 test('filter node', async function xml14 (t) {
  var { users, xml0, xml1 } = await initArrays(t, { users: 3 })
  let dom0 = xml0.getDom()
  let dom1 = xml1.getDom()
  let domFilter = (node, attrs) => {
    if (node.nodeName === 'H1') {
      return null
    } else {
      return attrs
    }
  }
  xml0.setDomFilter(domFilter)
  xml1.setDomFilter(domFilter)
  dom0.append(document.createElement('div'))
  dom0.append(document.createElement('h1'))
  await flushAll(t, users)
  t.assert(dom1.childNodes.length === 1, 'Only one node was not transmitted')
  t.assert(dom1.childNodes[0].nodeName === 'DIV', 'div node was transmitted')
  await compareUsers(t, users)
 })
 test('filter attribute', async function xml15 (t) {
  var { users, xml0, xml1 } = await initArrays(t, { users: 3 })
  let dom0 = xml0.getDom()
  let dom1 = xml1.getDom()
  let domFilter = (node, attrs) => {
    return attrs.filter(name => name !== 'hidden')
  }
  xml0.setDomFilter(domFilter)
  xml1.setDomFilter(domFilter)
  dom0.setAttribute('hidden', 'true')
  dom0.setAttribute('style', 'height: 30px')
  dom0.setAttribute('data-me', '77')
  await flushAll(t, users)
  t.assert(dom0.getAttribute('hidden') === 'true', 'User 0 still has the attribute')
  t.assert(dom1.getAttribute('hidden') == null, 'User 1 did not receive update')
  t.assert(dom1.getAttribute('style') === 'height: 30px', 'User 1 received style update')
  t.assert(dom1.getAttribute('data-me') === '77', 'User 1 received data update')
  await compareUsers(t, users)
 })
 // TODO: move elements
 var xmlTransactions = [
  function attributeChange (t, user, chance) {
    user.share.xml.getDom().setAttribute(chance.word(), chance.word())
  },
  function attributeChangeHidden (t, user, chance) {
    user.share.xml.getDom().setAttribute('hidden', chance.word())
  },
  function insertText (t, user, chance) {
    let dom = user.share.xml.getDom()
    var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
    dom.insertBefore(document.createTextNode(chance.word()), succ)
  },
  function insertHiddenDom (t, user, chance) {
    let dom = user.share.xml.getDom()
    var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
    dom.insertBefore(document.createElement('hidden'), succ)
  },
  function insertDom (t, user, chance) {
    let dom = user.share.xml.getDom()
    var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
@@ -274,30 +323,30 @@ var xmlTransactions = [
  }
 ]
-test('y-xml: Random tests (10)', async function randomXml10 (t) {
+test('y-xml: Random tests (10)', async function xmlRandom10 (t) {
  await applyRandomTests(t, xmlTransactions, 10)
 })
-test('y-xml: Random tests (42)', async function randomXml42 (t) {
+test('y-xml: Random tests (42)', async function xmlRandom42 (t) {
  await applyRandomTests(t, xmlTransactions, 42)
 })
-test('y-xml: Random tests (43)', async function randomXml43 (t) {
+test('y-xml: Random tests (43)', async function xmlRandom43 (t) {
  await applyRandomTests(t, xmlTransactions, 43)
 })
-test('y-xml: Random tests (44)', async function randomXml44 (t) {
+test('y-xml: Random tests (44)', async function xmlRandom44 (t) {
  await applyRandomTests(t, xmlTransactions, 44)
 })
-test('y-xml: Random tests (45)', async function randomXml45 (t) {
+test('y-xml: Random tests (45)', async function xmlRandom45 (t) {
  await applyRandomTests(t, xmlTransactions, 45)
 })
-test('y-xml: Random tests (46)', async function randomXml46 (t) {
+test('y-xml: Random tests (46)', async function xmlRandom46 (t) {
  await applyRandomTests(t, xmlTransactions, 46)
 })
-test('y-xml: Random tests (47)', async function randomXml47 (t) {
+test('y-xml: Random tests (47)', async function xmlRandom47 (t) {
  await applyRandomTests(t, xmlTransactions, 47)
 })
--- a/tests-lib/helper.js
+++ b/tests-lib/helper.js
@@ -2,7 +2,7 @@
 import _Y from '../../yjs/src/y.js'
 import yArray from '../../y-array/src/y-array.js'
-import yText from '../../y-text/src/Text.js'
+import yText from '../../y-text/src/y-text.js'
 import yMap from '../../y-map/src/y-map.js'
 import yXml from '../../y-xml/src/y-xml.js'
 import yTest from './test-connector.js'
@@ -48,11 +48,17 @@ export async function garbageCollectUsers (t, users) {
  await Promise.all(users.map(u => u.db.emptyGarbageCollector()))
 }
-export function attrsToObject (attrs) {
+export function attrsObject (dom) {
  let keys = []
  let yxml = dom.__yxml
  for (let i = 0; i < dom.attributes.length; i++) {
    keys.push(dom.attributes[i].name)
  }
  keys = yxml._domFilter(dom, keys)
  let obj = {}
-  for (var i = 0; i < attrs.length; i++) {
+  for (let i = 0; i < keys.length; i++) {
-    let attr = attrs[i]
+    let key = keys[i]
-    obj[attr.name] = attr.value
+    obj[key] = dom.getAttribute(key)
  }
  return obj
 }
@@ -61,8 +67,10 @@ export function domToJson (dom) {
  if (dom.nodeType === document.TEXT_NODE) {
    return dom.textContent
  } else if (dom.nodeType === document.ELEMENT_NODE) {
-    let attributes = attrsToObject(dom.attributes)
+    let attributes = attrsObject(dom, dom.__yxml)
-    let children = Array.from(dom.childNodes.values()).map(domToJson)
+    let children = Array.from(dom.childNodes.values())
      .filter(d => d.__yxml !== false)
      .map(domToJson)
    return {
      name: dom.nodeName,
      children: children,
@@ -198,6 +206,13 @@ export async function initArrays (t, opts) {
    for (let name in share) {
      result[name + i] = y.share[name]
    }
    y.share.xml.setDomFilter(function (d, attrs) {
      if (d.nodeName === 'HIDDEN') {
        return null
      } else {
        return attrs.filter(a => a !== 'hidden')
      }
    })
  }
  result.array0.delete(0, result.array0.length)
  if (result.users[0].connector.testRoom != null) {
--- a/y.js
+++ b/y.js
--- a/y.js.map
+++ b/y.js.map
--- a/y.node.js
+++ b/y.node.js
--- 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
Kevin Jahns	be537c9f8c	13.0.0-19	2017-09-26 21:53:01 +02:00
Kevin Jahns	4028eee39d	implemented chunked broadcast of updates	2017-09-26 21:52:07 +02:00
Kevin Jahns	0e3e561ec7	13.0.0-18	2017-09-20 11:34:03 +02:00
Kevin Jahns	7df46cb731	Merge branch 'master' of github.com:y-js/yjs	2017-09-20 11:30:24 +02:00
Kevin Jahns	40fb16ef32	catch y-* related errors	2017-09-20 11:29:13 +02:00
Kevin Jahns	ada5d36cd5	add more y-xml tests	2017-09-19 03:16:48 +02:00
Kevin Jahns	f537a43e29	implement tests for dom filter	2017-09-18 22:14:45 +02:00