v13.0.0-43 -- distribution files

2017-12-21 16:06:44 +01:00
41 changed files with 8210 additions and 7023 deletions
--- a/examples/html-editor/index.html
+++ b/examples/html-editor/index.html
@@ -1,7 +1,10 @@
 <!DOCTYPE html>
 <html>
 </head>
+  <!-- jquery is not required for y-xml. It is just here for convenience, and to test batch operations. -->
+  <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
  <script src="../yjs-dist.js"></script>
+  <script src="./canvasjs.min.js"></script>
  <script src="./index.js"></script>
 </head>
 <body contenteditable="true">
--- a/examples/html-editor/index.js
+++ b/examples/html-editor/index.js
@@ -1,20 +1,77 @@
-/* global Y */
+/* global Y, HTMLElement, customElements, CanvasJS */

 window.onload = function () {
  window.yXmlType.bindToDom(document.body)
+  let mt = document.createElement('magic-table')
+  mt.innerHTML = '<table><tr><th>Amount</th></tr><tr><td>1</td></tr><tr><td>1</td></tr></table>'
+  document.body.append(mt)
 }

-let persistence = null //  new Y.IndexedDBPersistence()
+class MagicTable extends HTMLElement {
+  constructor () {
+    super()
+    this.createShadowRoot()
+  }
+  get _yjsHook () {
+    return 'magic-table'
+  }
+  showTable () {
+    this.shadowRoot.innerHTML = ''
+    this.shadowRoot.append(document.createElement('content'))
+  }
+  showDiagram () {
+    let dataPoints = []
+    this.querySelectorAll('td').forEach(td => {
+      let number = Number(td.textContent)
+      dataPoints.push({
+        x: (dataPoints.length + 1) * 10,
+        y: number,
+        label: '<magic-table> content'
+      })
+    })
+    this.shadowRoot.innerHTML = ''
+    var chart = new CanvasJS.Chart(this.shadowRoot,
+      {
+        title: {
+          text: 'Bar chart'
+        },
+        data: [
+          {
+            type: 'bar',
+
+            dataPoints: dataPoints
+          }
+        ]
+      })
+
+    chart.render()
+
+    // this.shadowRoot.innerHTML = '<p>dtrn</p>'
+  }
+}
+customElements.define('magic-table', MagicTable)
+
+Y.XmlHook.addHook('magic-table', {
+  fillType: function (dom, type) {
+    type.set('table', new Y.XmlElement(dom.querySelector('table')))
+  },
+  createDom: function (type) {
+    const table = type.get('table').getDom()
+    const dom = document.createElement('magic-table')
+    dom.insertBefore(table, null)
+    return dom
+  }
+})

 // initialize a shared object. This function call returns a promise!
 let y = new Y({
  connector: {
    name: 'websockets-client',
    url: 'http://127.0.0.1:1234',
-    room: 'x'
+    room: 'html-editor-example6'
    // maxBufferLength: 100
  }
-}, persistence)
+})
 window.yXml = y
 window.yXmlType = y.define('xml', Y.XmlFragment)
 window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
--- a/examples/package-lock.json
+++ b/examples/package-lock.json
--- a/examples/package.json
+++ b/examples/package.json
@@ -9,15 +9,12 @@
  "author": "Kevin Jahns",
  "license": "MIT",
  "dependencies": {
-    "monaco-editor": "^0.8.3",
-    "rollup": "^0.52.3"
+    "monaco-editor": "^0.8.3"
  },
  "devDependencies": {
    "standard": "^10.0.2"
  },
  "standard": {
-    "ignore": [
-      "bower_components"
-    ]
+    "ignore": ["bower_components"]
  }
 }
--- a/examples/rollup.config.js
+++ b/examples/rollup.config.js
@@ -4,7 +4,7 @@ import commonjs from 'rollup-plugin-commonjs'
 var pkg = require('./package.json')

 export default {
-  input: 'yjs-dist.mjs',
+  input: 'yjs-dist.esm',
  name: 'Y',
  output: {
    file: 'yjs-dist.js',
--- a/examples/yjs-dist.esm
+++ b/examples/yjs-dist.esm
@@ -1,9 +1,7 @@

 import Y from '../src/Y.js'
 import yWebsocketsClient from '../../y-websockets-client/src/y-websockets-client.js'
-import IndexedDBPersistence from '../../y-indexeddb/src/y-indexeddb.js'

 Y.extend(yWebsocketsClient)
-Y.IndexedDBPersistence = IndexedDBPersistence

 export default Y
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "13.0.0-46",
+  "version": "13.0.0-43",
  "description": "A framework for real-time p2p shared editing on any data",
  "main": "./y.node.js",
  "browser": "./y.js",
@@ -65,6 +65,9 @@
    "tag-dist-files": "^0.1.6"
  },
  "dependencies": {
-    "debug": "^2.6.8"
+    "debug": "^2.6.8",
+    "fast-diff": "^1.1.2",
+    "utf-8": "^1.0.0",
+    "utf8": "^2.1.2"
  }
 }
--- a/rollup.test.js
+++ b/rollup.test.js
@@ -3,7 +3,7 @@ import commonjs from 'rollup-plugin-commonjs'
 import multiEntry from 'rollup-plugin-multi-entry'

 export default {
-  input: 'test/index.js',
+  input: 'test/y-xml.tests.js',
  name: 'y-tests',
  sourcemap: true,
  output: {
--- a/src/Binary/Decoder.js
+++ b/src/Binary/Decoder.js
@@ -1,3 +1,4 @@
+import utf8 from 'utf-8'
 import ID from '../Util/ID.js'
 import { default as RootID, RootFakeUserID } from '../Util/RootID.js'

@@ -90,8 +91,7 @@ export default class BinaryDecoder {
    for (let i = 0; i < len; i++) {
      bytes[i] = this.uint8arr[this.pos++]
    }
-    let encodedString = String.fromCodePoint(...bytes)
-    return decodeURIComponent(escape(encodedString))
+    return utf8.getStringFromBytes(bytes)
  }
  /**
   *  Look ahead and read varString without incrementing position
--- a/src/Binary/Encoder.js
+++ b/src/Binary/Encoder.js
@@ -1,3 +1,4 @@
+import utf8 from 'utf-8'
 import { RootFakeUserID } from '../Util/RootID.js'

 const bits7 = 0b1111111
@@ -61,8 +62,7 @@ export default class BinaryEncoder {
  }

  writeVarString (str) {
-    let encodedString = unescape(encodeURIComponent(str))
-    let bytes = encodedString.split('').map(c => c.codePointAt())
+    let bytes = utf8.setBytesFromString(str)
    let len = bytes.length
    this.writeVarUint(len)
    for (let i = 0; i < len; i++) {
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -132,7 +132,6 @@ export default class AbstractConnector {
        f()
      }
      this.whenSyncedListeners = []
-      this.y._setContentReady()
      this.y.emit('synced')
    }
  }
@@ -269,7 +268,7 @@ export default class AbstractConnector {
        if (messageType === 'sync step 2' && senderConn.auth === 'write') {
          readSyncStep2(decoder, encoder, y, senderConn, sender)
        } else if (messageType === 'update' && (skipAuth || senderConn.auth === 'write')) {
-          integrateRemoteStructs(y, decoder)
+          integrateRemoteStructs(decoder, encoder, y, senderConn, sender)
        } else {
          throw new Error('Unable to receive message')
        }
--- a/src/MessageHandler/binaryEncode.js
+++ b/src/MessageHandler/binaryEncode.js
@@ -1,16 +0,0 @@
-import { writeStructs } from './syncStep1.js'
-import { integrateRemoteStructs } from './integrateRemoteStructs.js'
-import { readDeleteSet, writeDeleteSet } from './deleteSet.js'
-import BinaryEncoder from '../Binary/Encoder.js'
-
-export function fromBinary (y, decoder) {
-  integrateRemoteStructs(y, decoder)
-  readDeleteSet(y, decoder)
-}
-
-export function toBinary (y) {
-  let encoder = new BinaryEncoder()
-  writeStructs(y, encoder, new Map())
-  writeDeleteSet(y, encoder)
-  return encoder
-}
--- a/src/MessageHandler/integrateRemoteStructs.js
+++ b/src/MessageHandler/integrateRemoteStructs.js
@@ -65,7 +65,7 @@ export function stringifyStructs (y, decoder, strBuilder) {
  }
 }

-export function integrateRemoteStructs (y, decoder) {
+export function integrateRemoteStructs (decoder, encoder, y) {
  const len = decoder.readUint32()
  for (let i = 0; i < len; i++) {
    let reference = decoder.readVarUint()
--- a/src/MessageHandler/syncStep1.js
+++ b/src/MessageHandler/syncStep1.js
@@ -30,7 +30,7 @@ export function sendSyncStep1 (connector, syncUser) {
  connector.send(syncUser, encoder.createBuffer())
 }

-export function writeStructs (y, encoder, ss) {
+export default function writeStructs (encoder, decoder, y, ss) {
  const lenPos = encoder.pos
  encoder.writeUint32(0)
  let len = 0
@@ -60,7 +60,7 @@ export function readSyncStep1 (decoder, encoder, y, senderConn, sender) {
  encoder.writeVarString('sync step 2')
  encoder.writeVarString(y.connector.authInfo || '')
  const ss = readStateSet(decoder)
-  writeStructs(y, encoder, ss)
+  writeStructs(encoder, decoder, y, ss)
  writeDeleteSet(y, encoder)
  y.connector.send(senderConn.uid, encoder.createBuffer())
  senderConn.receivedSyncStep2 = true
--- a/src/MessageHandler/syncStep2.js
+++ b/src/MessageHandler/syncStep2.js
@@ -22,7 +22,7 @@ export function stringifySyncStep2 (y, decoder, strBuilder) {
 }

 export function readSyncStep2 (decoder, encoder, y, senderConn, sender) {
-  integrateRemoteStructs(y, decoder)
+  integrateRemoteStructs(decoder, encoder, y)
  readDeleteSet(y, decoder)
  y.connector._setSyncedWith(sender)
 }
--- a/src/Persistence.js
+++ b/src/Persistence.js
@@ -1,93 +1,47 @@
-import BinaryEncoder from './Binary/Encoder.js'
-import BinaryDecoder from './Binary/Decoder.js'
-import { toBinary, fromBinary } from './MessageHandler/binaryEncode.js'
-import { integrateRemoteStructs } from './MessageHandler/integrateRemoteStructs.js'
-import { createMutualExclude } from './Util/mutualExclude.js'
+// import BinaryEncoder from './Binary/Encoder.js'

-function getFreshCnf () {
-  let buffer = new BinaryEncoder()
-  buffer.writeUint32(0)
-  return {
-    len: 0,
-    buffer
-  }
-}
-
-export default class AbstractPersistence {
-  constructor (opts) {
-    this.opts = opts
-    this.ys = new Map()
-    this.mutualExclude = createMutualExclude()
-  }
-
-  _init (y) {
-    let cnf = this.ys.get(y)
-    if (cnf === undefined) {
-      cnf = getFreshCnf()
-      this.ys.set(y, cnf)
-      this.init(y)
-      y.on('afterTransaction', (y, transaction) => {
-        let cnf = this.ys.get(y)
-        if (cnf.len > 0) {
-          cnf.buffer.setUint32(0, cnf.len)
-          this.saveUpdate(y, cnf.buffer.createBuffer(), transaction)
-          let _cnf = getFreshCnf()
-          for (let key in _cnf) {
-            cnf[key] = _cnf[key]
-          }
-        }
-      })
+export default function extendPersistence (Y) {
+  class AbstractPersistence {
+    constructor (y, opts) {
+      this.y = y
+      this.opts = opts
+      this.saveOperationsBuffer = []
+      this.log = Y.debug('y:persistence')
    }
-    return this.retrieve(y).then(function () {
-      return Promise.resolve(cnf)
-    })
-  }

-  deinit (y) {
-    this.ys.delete(y)
-  }
+    saveToMessageQueue (binary) {
+      this.log('Room %s: Save message to message queue', this.y.options.connector.room)
+    }

-  destroy () {
-    this.ys = null
-  }
-
-  /* overwrite */
-  saveUpdate (buffer) {
-  }
-
-  /**
-   * Save struct to update buffer.
-   * saveUpdate is called when transaction ends
-   */
-  saveStruct (y, struct) {
-    let cnf = this.ys.get(y)
-    if (cnf !== undefined) {
-      this.mutualExclude(function () {
-        struct._toBinary(cnf.buffer)
-        cnf.len++
+    saveOperations (ops) {
+      ops = ops.map(function (op) {
+        return Y.Struct[op.struct].encode(op)
      })
+      /*
+      const saveOperations = () => {
+        if (this.saveOperationsBuffer.length > 0) {
+          let encoder = new BinaryEncoder()
+          encoder.writeVarString(this.opts.room)
+          encoder.writeVarString('update')
+          let ops = this.saveOperationsBuffer
+          this.saveOperationsBuffer = []
+          let length = ops.length
+          encoder.writeUint32(length)
+          for (var i = 0; i < length; i++) {
+            let op = ops[i]
+            Y.Struct[op.struct].binaryEncode(encoder, op)
+          }
+          this.saveToMessageQueue(encoder.createBuffer())
+        }
+      }
+      */
+      if (this.saveOperationsBuffer.length === 0) {
+        this.saveOperationsBuffer = ops
+      } else {
+        this.saveOperationsBuffer = this.saveOperationsBuffer.concat(ops)
+      }
    }
  }

-  /* overwrite */
-  retrieve (y, model, updates) {
-    this.mutualExclude(function () {
-      y.transact(function () {
-        if (model != null) {
-          fromBinary(y, new BinaryDecoder(new Uint8Array(model)))
-          y._setContentReady()
-        }
-        if (updates != null) {
-          for (let i = 0; i < updates.length; i++) {
-            integrateRemoteStructs(y, new BinaryDecoder(new Uint8Array(updates[i])))
-            y._setContentReady()
-          }
-        }
-      })
-    })
-  }
-  /* overwrite */
-  persist (y) {
-    return toBinary(y).createBuffer()
-  }
+  Y.AbstractPersistence = AbstractPersistence
 }
--- a/src/Struct/Delete.js
+++ b/src/Struct/Delete.js
@@ -7,7 +7,7 @@ import { logID } from '../MessageHandler/messageToString.js'
 * TODO: implement getItemCleanStartNode for better performance (only one lookup)
 */
 export function deleteItemRange (y, user, clock, range) {
-  const createDelete = y.connector !== null && y.connector._forwardAppliedStructs
+  const createDelete = y.connector._forwardAppliedStructs
  let item = y.os.getItemCleanStart(new ID(user, clock))
  if (item !== null) {
    if (!item._deleted) {
@@ -70,12 +70,12 @@ export default class Delete {
      // from remote
      const id = this._targetID
      deleteItemRange(y, id.user, id.clock, this._length)
-    } else if (y.connector !== null) {
+    } else {
      // from local
      y.connector.broadcastStruct(this)
    }
    if (y.persistence !== null) {
-      y.persistence.saveStruct(y, this)
+      y.persistence.saveOperations(this)
    }
  }
  _logString () {
--- a/src/Struct/Item.js
+++ b/src/Struct/Item.js
@@ -87,18 +87,16 @@ export default class Item {
    return this._right
  }
  _delete (y, createDelete = true) {
-    if (!this._deleted) {
-      this._deleted = true
-      y.ds.markDeleted(this._id, this._length)
-      if (createDelete) {
-        let del = new Delete()
-        del._targetID = this._id
-        del._length = this._length
-        del._integrate(y, true)
-      }
-      transactionTypeChanged(y, this._parent, this._parentSub)
-      y._transaction.deletedStructs.add(this)
+    this._deleted = true
+    y.ds.markDeleted(this._id, this._length)
+    if (createDelete) {
+      let del = new Delete()
+      del._targetID = this._id
+      del._length = this._length
+      del._integrate(y, true)
    }
+    transactionTypeChanged(y, this._parent, this._parentSub)
+    y._transaction.deletedStructs.add(this)
  }
  /**
   * This is called right before this struct receives any children.
@@ -218,11 +216,11 @@ export default class Item {
    y.os.put(this)
    transactionTypeChanged(y, parent, parentSub)
    if (this._id.user !== RootFakeUserID) {
-      if (y.connector !== null && (y.connector._forwardAppliedStructs || this._id.user === y.userID)) {
+      if (y.connector._forwardAppliedStructs || this._id.user === y.userID) {
        y.connector.broadcastStruct(this)
      }
      if (y.persistence !== null) {
-        y.persistence.saveStruct(y, this)
+        y.persistence.saveOperations(this)
      }
    }
  }
--- a/src/Type/YMap.js
+++ b/src/Type/YMap.js
@@ -56,7 +56,7 @@ export default class YMap extends Type {
    this._transact(y => {
      const old = this._map.get(key) || null
      if (old !== null) {
-        if (old.constructor === ItemJSON && !old._deleted && old._content[0] === value) {
+        if (old instanceof ItemJSON && old._content[0] === value) {
          // Trying to overwrite with same value
          // break here
          return value
--- a/src/Type/YText.js
+++ b/src/Type/YText.js
@@ -24,9 +24,6 @@ export default class YText extends YArray {
    return strBuilder.join('')
  }
  insert (pos, text) {
-    if (text.length <= 0) {
-      return
-    }
    this._transact(y => {
      let left = null
      let right = this._start
--- a/src/Type/y-xml/YXmlElement.js
+++ b/src/Type/y-xml/YXmlElement.js
@@ -1,3 +1,4 @@
+// import diff from 'fast-diff'
 import { defaultDomFilter } from './utils.js'

 import YMap from '../YMap.js'
@@ -47,11 +48,6 @@ export default class YXmlElement extends YXmlFragment {
      return dom
    }
  }
-  _bindToDom (dom, _document) {
-    _document = _document || document
-    this._dom = dom
-    dom._yxml = this
-  }
  _fromBinary (y, decoder) {
    const missing = super._fromBinary(y, decoder)
    this.nodeName = decoder.readVarString()
--- a/src/Type/y-xml/YXmlFragment.js
+++ b/src/Type/y-xml/YXmlFragment.js
@@ -7,7 +7,7 @@ import YArray from '../YArray.js'
 import YXmlEvent from './YXmlEvent.js'
 import { YXmlText, YXmlHook } from './y-xml'
 import { logID } from '../../MessageHandler/messageToString.js'
-import diff from '../../Util/simpleDiff.js'
+import diff from 'fast-diff'

 function domToYXml (parent, doms, _document) {
  const types = []
@@ -101,11 +101,9 @@ export default class YXmlFragment extends YArray {
        } catch (e) {
          console.error(e)
        }
-        /*
        if (this._domObserver !== null) {
          this._domObserver.takeRecords()
        }
-        */
        token = true
      }
    }
@@ -185,9 +183,6 @@ export default class YXmlFragment extends YArray {
      this._dom._yxml = null
      this._dom = null
    }
-    if (this._beforeTransactionHandler !== undefined) {
-      this._y.off('beforeTransaction', this._beforeTransactionHandler)
-    }
  }
  insertDomElementsAfter (prev, doms, _document) {
    const types = domToYXml(this, doms, _document)
@@ -221,7 +216,9 @@ export default class YXmlFragment extends YArray {
    _document = _document || document
    this._dom = dom
    dom._yxml = this
-    if (this._parent === null) {
+    // TODO: refine this..
+    if ((this.constructor !== YXmlFragment && this._parent !== this._y) || this._parent === null) {
+      // TODO: only top level YXmlFragment can bind. Also allow YXmlElements..
      return
    }
    this._y.on('beforeTransaction', beforeTransactionSelectionFixer)
@@ -278,10 +275,9 @@ export default class YXmlFragment extends YArray {
    })
    // Apply Dom changes on Y.Xml
    if (typeof MutationObserver !== 'undefined') {
-      this._beforeTransactionHandler = () => {
+      this._y.on('beforeTransaction', () => {
        this._domObserverListener(this._domObserver.takeRecords())
-      }
-      this._y.on('beforeTransaction', this._beforeTransactionHandler)
+      })
      this._domObserverListener = mutations => {
        this._mutualExclude(() => {
          this._y.transact(() => {
@@ -295,9 +291,19 @@ export default class YXmlFragment extends YArray {
              }
              switch (mutation.type) {
                case 'characterData':
-                  var change = diff(yxml.toString(), dom.nodeValue)
-                  yxml.delete(change.pos, change.remove)
-                  yxml.insert(change.pos, change.insert)
+                  var diffs = diff(yxml.toString(), dom.nodeValue)
+                  var pos = 0
+                  for (var i = 0; i < diffs.length; i++) {
+                    var d = diffs[i]
+                    if (d[0] === 0) { // EQUAL
+                      pos += d[1].length
+                    } else if (d[0] === -1) { // DELETE
+                      yxml.delete(pos, d[1].length)
+                    } else { // INSERT
+                      yxml.insert(pos, d[1])
+                      pos += d[1].length
+                    }
+                  }
                  break
                case 'attributes':
                  if (yxml.constructor === YXmlFragment) {
@@ -324,9 +330,6 @@ export default class YXmlFragment extends YArray {
              }
            })
            for (let dom of diffChildren) {
-              if (dom.yOnChildrenChanged !== undefined) {
-                dom.yOnChildrenChanged()
-              }
              if (dom._yxml != null && dom._yxml !== false) {
                applyChangesFromDom(dom)
              }
--- a/src/Util/ID.js
+++ b/src/Util/ID.js
@@ -11,10 +11,6 @@ export default class ID {
    return id !== null && id.user === this.user && id.clock === this.clock
  }
  lessThan (id) {
-    if (id.constructor === ID) {
-      return this.user < id.user || (this.user === id.user && this.clock < id.clock)
-    } else {
-      return false
-    }
+    return this.user < id.user || (this.user === id.user && this.clock < id.clock)
  }
 }
--- a/src/Util/NamedEventHandler.js
+++ b/src/Util/NamedEventHandler.js
@@ -27,8 +27,7 @@ export default class NamedEventHandler {
    }
    const listener = this._eventListener.get(name)
    if (listener !== undefined) {
-      listener.on.delete(f)
-      listener.once.delete(f)
+      listener.remove(f)
    }
  }
  emit (name, ...args) {
--- a/src/Util/RootID.js
+++ b/src/Util/RootID.js
@@ -12,10 +12,6 @@ export default class RootID {
    return id !== null && id.user === this.user && id.name === this.name && id.type === this.type
  }
  lessThan (id) {
-    if (id.constructor === RootID) {
-      return this.user < id.user || (this.user === id.user && (this.name < id.name || (this.name === id.name && this.type < id.type)))
-    } else {
-      return true
-    }
+    return this.user < id.user || (this.user === id.user && (this.name < id.name || (this.name === id.name && this.type < id.type)))
  }
 }
--- a/src/Util/mutualExclude.js
+++ b/src/Util/mutualExclude.js
@@ -1,15 +0,0 @@
-
-export function createMutualExclude () {
-  var token = true
-  return function mutualExclude (f) {
-    if (token) {
-      token = false
-      try {
-        f()
-      } catch (e) {
-        console.error(e)
-      }
-      token = true
-    }
-  }
-}
--- a/src/Util/relativePosition.js
+++ b/src/Util/relativePosition.js
@@ -2,31 +2,37 @@ import ID from './ID.js'
 import RootID from './RootID.js'

 export function getRelativePosition (type, offset) {
-  let t = type._start
-  while (t !== null) {
-    if (t._deleted === false) {
-      if (t._length > offset) {
-        return [t._id.user, t._id.clock + offset]
+  if (offset === 0) {
+    return ['startof', type._id.user, type._id.clock || null, type._id.name || null, type._id.type || null]
+  } else {
+    let t = type._start
+    while (t !== null) {
+      if (t._deleted === false) {
+        if (t._length >= offset) {
+          return [t._id.user, t._id.clock + offset - 1]
+        }
+        if (t._right === null) {
+          return [t._id.user, t._id.clock + t._length - 1]
+        }
+        offset -= t._length
      }
-      offset -= t._length
+      t = t._right
    }
-    t = t._right
+    return null
  }
-  return ['endof', type._id.user, type._id.clock || null, type._id.name || null, type._id.type || null]
 }

 export function fromRelativePosition (y, rpos) {
-  if (rpos[0] === 'endof') {
+  if (rpos[0] === 'startof') {
    let id
    if (rpos[3] === null) {
      id = new ID(rpos[1], rpos[2])
    } else {
      id = new RootID(rpos[3], rpos[4])
    }
-    const type = y.os.get(id)
    return {
-      type,
-      offset: type.length
+      type: y.os.get(id),
+      offset: 0
    }
  } else {
    let offset = 0
@@ -36,7 +42,7 @@ export function fromRelativePosition (y, rpos) {
      return null
    }
    if (!struct._deleted) {
-      offset = rpos[1] - struct._id.clock
+      offset = rpos[1] - struct._id.clock + 1
    }
    struct = struct._left
    while (struct !== null) {
--- a/src/Util/simpleDiff.js
+++ b/src/Util/simpleDiff.js
@@ -1,19 +0,0 @@
-
-export default function simpleDiff (a, b) {
-  let left = 0 // number of same characters counting from left
-  let right = 0 // number of same characters counting from right
-  while (left < a.length && left < b.length && a[left] === b[left]) {
-    left++
-  }
-  if (left !== a.length || left !== b.length) {
-    // Only check right if a !== b
-    while (right + left < a.length && right + left < b.length && a[a.length - right - 1] === b[b.length - right - 1]) {
-      right++
-    }
-  }
-  return {
-    pos: left,
-    remove: a.length - left - right,
-    insert: b.slice(left, b.length - right)
-  }
-}
--- a/src/Y.js
+++ b/src/Y.js
@@ -22,44 +22,25 @@ import debug from 'debug'
 import Transaction from './Transaction.js'

 export default class Y extends NamedEventHandler {
-  constructor (room, opts, persistence) {
+  constructor (opts) {
    super()
-    this.room = room
-    if (opts != null) {
-      opts.connector.room = room
-    }
-    this._contentReady = false
    this._opts = opts
-    this.userID = generateUserID()
+    this.userID = opts._userID != null ? opts._userID : generateUserID()
    this.share = {}
    this.ds = new DeleteStore(this)
    this.os = new OperationStore(this)
    this.ss = new StateStore(this)
+    this.connector = new Y[opts.connector.name](this, opts.connector)
+    if (opts.persistence != null) {
+      this.persistence = new Y[opts.persistence.name](this, opts.persistence)
+      this.persistence.retrieveContent()
+    } else {
+      this.persistence = null
+    }
+    this.connected = true
    this._missingStructs = new Map()
    this._readyToIntegrate = []
    this._transaction = null
-    this.connector = null
-    this.connected = false
-    let initConnection = () => {
-      if (opts != null) {
-        this.connector = new Y[opts.connector.name](this, opts.connector)
-        this.connected = true
-        this.emit('connectorReady')
-      }
-    }
-    if (persistence != null) {
-      this.persistence = persistence
-      persistence._init(this).then(initConnection)
-    } else {
-      this.persistence = null
-      initConnection()
-    }
-  }
-  _setContentReady () {
-    if (!this._contentReady) {
-      this._contentReady = true
-      this.emit('content')
-    }
  }
  _beforeChange () {}
  transact (f, remote = false) {
@@ -109,6 +90,9 @@ export default class Y extends NamedEventHandler {
  set _start (start) {
    return null
  }
+  get room () {
+    return this._opts.connector.room
+  }
  define (name, TypeConstructor) {
    let id = new RootID(name, TypeConstructor)
    let type = this.os.get(id)
@@ -139,18 +123,11 @@ export default class Y extends NamedEventHandler {
    }
  }
  destroy () {
-    super.destroy()
    this.share = null
-    if (this.connector != null) {
-      if (this.connector.destroy != null) {
-        this.connector.destroy()
-      } else {
-        this.connector.disconnect()
-      }
-    }
-    if (this.persistence !== null) {
-      this.persistence.deinit(this)
-      this.persistence = null
+    if (this.connector.destroy != null) {
+      this.connector.destroy()
+    } else {
+      this.connector.disconnect()
    }
    this.os = null
    this.ds = null
@@ -178,7 +155,7 @@ Y.extend = function extendYjs () {

 // TODO: The following assignments should be moved to yjs-dist
 Y.AbstractConnector = Connector
-Y.AbstractPersistence = Persistence
+Y.Persisence = Persistence
 Y.Array = YArray
 Y.Map = YMap
 Y.Text = YText
--- a/test/diff.tests.js
+++ b/test/diff.tests.js
@@ -1,29 +0,0 @@
-import { test } from '../node_modules/cutest/cutest.mjs'
-import simpleDiff from '../src/Util/simpleDiff.js'
-import Chance from 'chance'
-
-function runDiffTest (t, a, b, expected) {
-  let result = simpleDiff(a, b)
-  t.compare(result, expected, `Compare "${a}" with "${b}"`)
-}
-
-test('diff tests', async function diff1 (t) {
-  runDiffTest(t, 'abc', 'axc', { pos: 1, remove: 1, insert: 'x' })
-  runDiffTest(t, 'bc', 'xc', { pos: 0, remove: 1, insert: 'x' })
-  runDiffTest(t, 'ab', 'ax', { pos: 1, remove: 1, insert: 'x' })
-  runDiffTest(t, 'b', 'x', { pos: 0, remove: 1, insert: 'x' })
-  runDiffTest(t, '', 'abc', { pos: 0, remove: 0, insert: 'abc' })
-  runDiffTest(t, 'abc', 'xyz', { pos: 0, remove: 3, insert: 'xyz' })
-  runDiffTest(t, 'axz', 'au', { pos: 1, remove: 2, insert: 'u' })
-  runDiffTest(t, 'ax', 'axy', { pos: 2, remove: 0, insert: 'y' })
-})
-
-test('random diff tests', async function randomDiff (t) {
-  const chance = new Chance(t.getSeed() * 1000000000)
-  let a = chance.word()
-  let b = chance.word()
-  let change = simpleDiff(a, b)
-  let arr = Array.from(a)
-  arr.splice(change.pos, change.remove, ...Array.from(change.insert))
-  t.assert(arr.join('') === b, 'Applying change information is correct')
-})
--- a/test/encode-decode.tests.js
+++ b/test/encode-decode.tests.js
@@ -54,9 +54,6 @@ test('varString', async function varString (t) {
  testEncoding(t, writeVarString, readVarString, 'test!')
  testEncoding(t, writeVarString, readVarString, '☺☺☺')
  testEncoding(t, writeVarString, readVarString, '1234')
-  testEncoding(t, writeVarString, readVarString, '쾟')
-  testEncoding(t, writeVarString, readVarString, '龟') // surrogate length 3
-  testEncoding(t, writeVarString, readVarString, '😝') // surrogate length 4
 })

 test('varString random', async function varStringRandom (t) {
--- a/test/index.html
+++ b/test/index.html
@@ -3,6 +3,6 @@
  <head>
  </head>
  <body>
-    <script type="module" src="./index.js"></script>
+    <script type="module" src="./encode-decode.js"></script>
  </body>
 </html>
--- a/test/index.js
+++ b/test/index.js
@@ -1,6 +0,0 @@
-import './red-black-tree.js'
-import './y-array.tests.js'
-import './y-map.tests.js'
-import './y-xml.tests.js'
-import './encode-decode.tests.js'
-import './diff.tests.js'
--- a/tests-lib/helper.js
+++ b/tests-lib/helper.js
@@ -145,7 +145,7 @@ export async function initArrays (t, opts) {
    } else {
      connOpts = Object.assign({ role: 'slave' }, conn)
    }
-    let y = new Y(connOpts.room, {
+    let y = new Y({
      _userID: i, // evil hackery, don't try this at home
      connector: connOpts
    })
--- 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