v13.0.0-34 -- distribution files

examples/html-editor/index.js

@@ -1,4 +1,15 @@
-/* global Y */
+/* global Y, HTMLElement, customElements */
+
+class MagicTable extends HTMLElement {
+  constructor () {
+    super()
+    var shadow = this.attachShadow({mode: 'open'})
+    setTimeout(() => {
+      shadow.append(this.childNodes[0])
+    }, 1000)
+  }
+}
+customElements.define('magic-table', MagicTable)
 
 // initialize a shared object. This function call returns a promise!
 let y = new Y({
@@ -17,16 +28,14 @@ window.onload = function () {
   window.yXmlType.bindToDom(document.body)
 }
 window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
-  captureTimeout: 1000
+  captureTimeout: 500
 })
 
 document.onkeydown = function interceptUndoRedo (e) {
-  if (e.keyCode === 90 && e.ctrlKey) {
+  if (e.keyCode === 90 && e.metaKey) {
     if (!e.shiftKey) {
-      console.info('Undo!')
       window.undoManager.undo()
     } else {
-      console.info('Redo!')
       window.undoManager.redo()
     }
     e.preventDefault()

examples/monaco/index.html

@@ -14,10 +14,7 @@
       }
     </style>
     <script src="../bower_components/yjs/y.js"></script>
-    <script src="../bower_components/y-array/y-array.js"></script>
-    <script src="../bower_components/y-text/y-text.js"></script>
     <script src="../bower_components/y-websockets-client/y-websockets-client.js"></script>
-    <script src="../bower_components/y-memory/y-memory.js"></script>
     <script src="../node_modules/monaco-editor/min/vs/loader.js"></script>
     <script src="./index.js"></script>
   </body>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-25",
+  "version": "13.0.0-32",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2808,14 +2808,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -2826,6 +2818,14 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -4868,15 +4868,6 @@
         "duplexer": "0.1.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -4898,6 +4889,15 @@
       "resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.0.tgz",
       "integrity": "sha1-aybpvTr8qnvjtCabUm3huCAArHg="
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-25",
+  "version": "13.0.0-34",
   "description": "A framework for real-time p2p shared editing on any data",
   "main": "./y.node.js",
   "browser": "./y.js",
@@ -15,7 +15,8 @@
     "postpublish": "tag-dist-files --overwrite-existing-tag"
   },
   "files": [
-    "y.*"
+    "y.*",
+    "src/*"
   ],
   "standard": {
     "ignore": [

rollup.browser.js

@@ -5,9 +5,13 @@ import commonjs from 'rollup-plugin-commonjs'
 var pkg = require('./package.json')
 
 export default {
-  entry: 'src/Y.js',
-  moduleName: 'Y',
-  format: 'umd',
+  input: 'src/Y.js',
+  name: 'Y',
+  sourcemap: true,
+  output: {
+    file: 'y.js',
+    format: 'umd'
+  },
   plugins: [
     nodeResolve({
       main: true,
@@ -32,8 +36,6 @@ export default {
       }
     })
   ],
-  dest: 'y.js',
-  sourceMap: true,
   banner: `
 /**
  * ${pkg.name} - ${pkg.description}

rollup.node.js

@@ -3,9 +3,13 @@ import commonjs from 'rollup-plugin-commonjs'
 var pkg = require('./package.json')
 
 export default {
-  entry: 'src/y-dist.cjs.js',
-  moduleName: 'Y',
-  format: 'cjs',
+  input: 'src/y-dist.cjs.js',
+  nameame: 'Y',
+  sourcemap: true,
+  output: {
+    file: 'y.node.js',
+    format: 'cjs'
+  },
   plugins: [
     nodeResolve({
       main: true,
@@ -14,8 +18,6 @@ export default {
     }),
     commonjs()
   ],
-  dest: 'y.node.js',
-  sourceMap: true,
   banner: `
 /**
  * ${pkg.name} - ${pkg.description}

rollup.test.js

@@ -3,9 +3,13 @@ import commonjs from 'rollup-plugin-commonjs'
 import multiEntry from 'rollup-plugin-multi-entry'
 
 export default {
-  entry: 'test/y-xml.tests.js',
-  moduleName: 'y-tests',
-  format: 'umd',
+  input: 'test/y-xml.tests.js',
+  name: 'y-tests',
+  sourcemap: true,
+  output: {
+    file: 'y.test.js',
+    format: 'umd'
+  },
   plugins: [
     nodeResolve({
       main: true,
@@ -14,7 +18,5 @@ export default {
     }),
     commonjs(),
     multiEntry()
-  ],
-  dest: 'y.test.js',
-  sourceMap: true
+  ]
 }

src/Struct/ItemJSON.js

@@ -20,7 +20,13 @@ export default class ItemJSON extends Item {
     this._content = new Array(len)
     for (let i = 0; i < len; i++) {
       const ctnt = decoder.readVarString()
-      this._content[i] = JSON.parse(ctnt)
+      let parsed
+      if (ctnt === 'undefined') {
+        parsed = undefined
+      } else {
+        parsed = JSON.parse(ctnt)
+      }
+      this._content[i] = parsed
     }
     return missing
   }
@@ -29,7 +35,14 @@ export default class ItemJSON extends Item {
     let len = this._content.length
     encoder.writeVarUint(len)
     for (let i = 0; i < len; i++) {
-      encoder.writeVarString(JSON.stringify(this._content[i]))
+      let encoded
+      let content = this._content[i]
+      if (content === undefined) {
+        encoded = 'undefined'
+      } else {
+        encoded = JSON.stringify(content)
+      }
+      encoder.writeVarString(encoded)
     }
   }
   _logString () {

src/Struct/Type.js

@@ -65,9 +65,9 @@ export default class Type extends Item {
     }
     return path
   }
-  _callEventHandler (event) {
-    const changedParentTypes = this._y._transaction.changedParentTypes
-    this._eventHandler.callEventListeners(event)
+  _callEventHandler (transaction, event) {
+    const changedParentTypes = transaction.changedParentTypes
+    this._eventHandler.callEventListeners(transaction, event)
     let type = this
     while (type !== this._y) {
       let events = changedParentTypes.get(type)

src/Type/YArray.js

@@ -1,5 +1,6 @@
 import Type from '../Struct/Type.js'
 import ItemJSON from '../Struct/ItemJSON.js'
+import ItemString from '../Struct/ItemString.js'
 import { logID } from '../MessageHandler/messageToString.js'
 import YEvent from '../Util/YEvent.js'
 
@@ -11,15 +12,19 @@ class YArrayEvent extends YEvent {
 }
 
 export default class YArray extends Type {
-  _callObserver (parentSubs, remote) {
-    this._callEventHandler(new YArrayEvent(this, remote))
+  _callObserver (transaction, parentSubs, remote) {
+    this._callEventHandler(transaction, new YArrayEvent(this, remote))
   }
   get (pos) {
     let n = this._start
     while (n !== null) {
       if (!n._deleted) {
         if (pos < n._length) {
-          return n._content[n._length - pos]
+          if (n.constructor === ItemJSON || n.constructor === ItemString) {
+            return n._content[pos]
+          } else {
+            return n
+          }
         }
         pos -= n._length
       }

src/Type/YMap.js

@@ -13,8 +13,8 @@ class YMapEvent extends YEvent {
 }
 
 export default class YMap extends Type {
-  _callObserver (parentSubs, remote) {
-    this._callEventHandler(new YMapEvent(this, parentSubs, remote))
+  _callObserver (transaction, parentSubs, remote) {
+    this._callEventHandler(transaction, new YMapEvent(this, parentSubs, remote))
   }
   toJSON () {
     const map = {}

src/Type/y-xml/YXmlElement.js

@@ -5,7 +5,7 @@ import YMap from '../YMap.js'
 import YXmlFragment from './YXmlFragment.js'
 
 export default class YXmlElement extends YXmlFragment {
-  constructor (arg1, arg2) {
+  constructor (arg1, arg2, _document) {
     super()
     this.nodeName = null
     this._scrollElement = null
@@ -13,7 +13,7 @@ export default class YXmlElement extends YXmlFragment {
       this.nodeName = arg1.toUpperCase()
     } else if (arg1 != null && arg1.nodeType != null && arg1.nodeType === arg1.ELEMENT_NODE) {
       this.nodeName = arg1.nodeName
-      this._setDom(arg1)
+      this._setDom(arg1, _document)
     } else {
       this.nodeName = 'UNDEFINED'
     }
@@ -26,28 +26,25 @@ export default class YXmlElement extends YXmlFragment {
     struct.nodeName = this.nodeName
     return struct
   }
-  _setDom (dom) {
+  _setDom (dom, _document) {
     if (this._dom != null) {
       throw new Error('Only call this method if you know what you are doing ;)')
     } else if (dom._yxml != null) { // TODO do i need to check this? - no.. but for dev purps..
       throw new Error('Already bound to an YXml type')
     } else {
-      this._dom = dom
-      dom._yxml = this
       // tag is already set in constructor
       // set attributes
-      let attrNames = []
+      let attributes = new Map()
       for (let i = 0; i < dom.attributes.length; i++) {
-        attrNames.push(dom.attributes[i].name)
+        let attr = dom.attributes[i]
+        attributes.set(attr.name, attr.value)
       }
-      attrNames = this._domFilter(dom, attrNames)
-      for (let i = 0; i < attrNames.length; i++) {
-        let attrName = attrNames[i]
-        let attrValue = dom.getAttribute(attrName)
-        this.setAttribute(attrName, attrValue)
-      }
-      this.insertDomElements(0, Array.prototype.slice.call(dom.childNodes))
-      this._bindToDom(dom)
+      attributes = this._domFilter(dom, attributes)
+      attributes.forEach((value, name) => {
+        this.setAttribute(name, value)
+      })
+      this.insertDomElements(0, Array.prototype.slice.call(dom.childNodes), _document)
+      this._bindToDom(dom, _document)
       return dom
     }
   }
@@ -106,7 +103,9 @@ export default class YXmlElement extends YXmlFragment {
   getAttributes () {
     const obj = {}
     for (let [key, value] of this._map) {
-      obj[key] = value._content[0]
+      if (!value._deleted) {
+        obj[key] = value._content[0]
+      }
     }
     return obj
   }
@@ -115,7 +114,6 @@ export default class YXmlElement extends YXmlFragment {
     let dom = this._dom
     if (dom == null) {
       dom = _document.createElement(this.nodeName)
-      this._dom = dom
       dom._yxml = this
       let attrs = this.getAttributes()
       for (let key in attrs) {
@@ -124,7 +122,7 @@ export default class YXmlElement extends YXmlFragment {
       this.forEach(yxml => {
         dom.appendChild(yxml.getDom(_document))
       })
-      this._bindToDom(dom)
+      this._bindToDom(dom, _document)
     }
     return dom
   }

src/Type/y-xml/YXmlFragment.js

@@ -9,18 +9,18 @@ import YXmlEvent from './YXmlEvent.js'
 import { logID } from '../../MessageHandler/messageToString.js'
 import diff from 'fast-diff'
 
-function domToYXml (parent, doms) {
+function domToYXml (parent, doms, _document) {
   const types = []
   doms.forEach(d => {
     if (d._yxml != null && d._yxml !== false) {
       d._yxml._unbindFromDom()
     }
-    if (parent._domFilter(d, []) !== null) {
+    if (parent._domFilter(d.nodeName, new Map()) !== null) {
       let type
       if (d.nodeType === d.TEXT_NODE) {
         type = new YXmlText(d)
       } else if (d.nodeType === d.ELEMENT_NODE) {
-        type = new YXmlFragment._YXmlElement(d, parent._domFilter)
+        type = new YXmlFragment._YXmlElement(d, parent._domFilter, _document)
       } else {
         throw new Error('Unsupported node!')
       }
@@ -98,7 +98,9 @@ export default class YXmlFragment extends YArray {
         } catch (e) {
           console.error(e)
         }
-        this._domObserver.takeRecords()
+        if (this._domObserver !== null) {
+          this._domObserver.takeRecords()
+        }
         token = true
       }
     }
@@ -142,8 +144,8 @@ export default class YXmlFragment extends YArray {
       xml.setDomFilter(f)
     })
   }
-  _callObserver (parentSubs, remote) {
-    this._callEventHandler(new YXmlEvent(this, parentSubs, remote))
+  _callObserver (transaction, parentSubs, remote) {
+    this._callEventHandler(transaction, new YXmlEvent(this, parentSubs, remote))
   }
   toString () {
     return this.map(xml => xml.toString()).join('')
@@ -162,113 +164,167 @@ export default class YXmlFragment extends YArray {
       this._dom = null
     }
   }
-  insertDomElementsAfter (prev, doms) {
-    const types = domToYXml(this, doms)
+  insertDomElementsAfter (prev, doms, _document) {
+    const types = domToYXml(this, doms, _document)
     this.insertAfter(prev, types)
     return types
   }
-  insertDomElements (pos, doms) {
-    const types = domToYXml(this, doms)
+  insertDomElements (pos, doms, _document) {
+    const types = domToYXml(this, doms, _document)
     this.insert(pos, types)
     return types
   }
   getDom () {
     return this._dom
   }
-  bindToDom (dom) {
+  bindToDom (dom, _document) {
     if (this._dom != null) {
       this._unbindFromDom()
     }
     if (dom._yxml != null) {
       dom._yxml._unbindFromDom()
     }
-    if (MutationObserver == null) {
-      throw new Error('Not able to bind to a DOM element, because MutationObserver is not available!')
-    }
     dom.innerHTML = ''
-    this._dom = dom
-    dom._yxml = this
     this.forEach(t => {
-      dom.insertBefore(t.getDom(), null)
+      dom.insertBefore(t.getDom(_document), null)
     })
-    this._bindToDom(dom)
+    this._bindToDom(dom, _document)
   }
   // binds to a dom element
   // Only call if dom and YXml are isomorph
-  _bindToDom (dom) {
-    if (this._parent === null || this._parent._dom != null || typeof MutationObserver === 'undefined') {
-      // only bind if parent did not already bind
+  _bindToDom (dom, _document) {
+    _document = _document || document
+    this._dom = dom
+    dom._yxml = this
+    // 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', () => {
-      this._domObserverListener(this._domObserver.takeRecords())
-    })
     this._y.on('beforeTransaction', beforeTransactionSelectionFixer)
     this._y.on('afterTransaction', afterTransactionSelectionFixer)
-    // Apply Y.Xml events to dom
-    this.observeDeep(reflectChangesOnDom.bind(this))
-    // Apply Dom changes on Y.Xml
-    this._domObserverListener = mutations => {
-      this._mutualExclude(() => {
-        this._y.transact(() => {
-          let diffChildren = new Set()
-          mutations.forEach(mutation => {
-            const dom = mutation.target
-            const yxml = dom._yxml
-            if (yxml == null) {
-              // dom element is filtered
-              return
-            }
-            switch (mutation.type) {
-              case 'characterData':
-                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':
-                let name = mutation.attributeName
-                // check if filter accepts attribute
-                if (this._domFilter(dom, [name]).length > 0 && this.constructor !== YXmlFragment) {
-                  var val = dom.getAttribute(name)
-                  if (yxml.getAttribute(name) !== val) {
-                    if (val == null) {
-                      yxml.removeAttribute(name)
-                    } else {
-                      yxml.setAttribute(name, val)
-                    }
-                  }
-                }
-                break
-              case 'childList':
-                diffChildren.add(mutation.target)
-                break
-            }
-          })
-          for (let dom of diffChildren) {
-            if (dom._yxml != null) {
-              applyChangesFromDom(dom)
-            }
+    const applyFilter = (type) => {
+      if (type._deleted) {
+        return
+      }
+      // check if type is a child of this
+      let isChild = false
+      let p = type
+      while (p !== this._y) {
+        if (p === this) {
+          isChild = true
+          break
+        }
+        p = p._parent
+      }
+      if (!isChild) {
+        return
+      }
+      // filter attributes
+      let attributes = new Map()
+      if (type.getAttributes !== undefined) {
+        let attrs = type.getAttributes()
+        for (let key in attrs) {
+          attributes.set(key, attrs[key])
+        }
+      }
+      let result = this._domFilter(type.nodeName, new Map(attributes))
+      if (result === null) {
+        type._delete(this._y)
+      } else {
+        attributes.forEach((value, key) => {
+          if (!result.has(key)) {
+            type.removeAttribute(key)
           }
         })
+      }
+    }
+    this._y.on('beforeObserverCalls', function (y, transaction) {
+      // apply dom filter to new and changed types
+      transaction.changedTypes.forEach(function (subs, type) {
+        if (subs.size > 1 || !subs.has(null)) {
+          // only apply changes on attributes
+          applyFilter(type)
+        }
+      })
+      transaction.newTypes.forEach(applyFilter)
+    })
+    // Apply Y.Xml events to dom
+    this.observeDeep(events => {
+      reflectChangesOnDom.call(this, events, _document)
+    })
+    // Apply Dom changes on Y.Xml
+    if (typeof MutationObserver !== 'undefined') {
+      this._y.on('beforeTransaction', () => {
+        this._domObserverListener(this._domObserver.takeRecords())
+      })
+      this._domObserverListener = mutations => {
+        this._mutualExclude(() => {
+          this._y.transact(() => {
+            let diffChildren = new Set()
+            mutations.forEach(mutation => {
+              const dom = mutation.target
+              const yxml = dom._yxml
+              if (yxml == null) {
+                // dom element is filtered
+                return
+              }
+              switch (mutation.type) {
+                case 'characterData':
+                  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) {
+                    break
+                  }
+                  let name = mutation.attributeName
+                  let val = dom.getAttribute(name)
+                  // check if filter accepts attribute
+                  let attributes = new Map()
+                  attributes.set(name, val)
+                  if (this._domFilter(dom.nodeName, attributes).size > 0 && yxml.constructor !== YXmlFragment) {
+                    if (yxml.getAttribute(name) !== val) {
+                      if (val == null) {
+                        yxml.removeAttribute(name)
+                      } else {
+                        yxml.setAttribute(name, val)
+                      }
+                    }
+                  }
+                  break
+                case 'childList':
+                  diffChildren.add(mutation.target)
+                  break
+              }
+            })
+            for (let dom of diffChildren) {
+              if (dom._yxml != null && dom._yxml !== false) {
+                applyChangesFromDom(dom)
+              }
+            }
+          })
+        })
+      }
+      this._domObserver = new MutationObserver(this._domObserverListener)
+      this._domObserver.observe(dom, {
+        childList: true,
+        attributes: true,
+        characterData: true,
+        subtree: true
       })
     }
-    this._domObserver = new MutationObserver(this._domObserverListener)
-    this._domObserver.observe(dom, {
-      childList: true,
-      attributes: true,
-      characterData: true,
-      subtree: true
-    })
     return dom
   }
   _logString () {

src/Type/y-xml/selection.js

@@ -7,7 +7,7 @@ let relativeSelection = null
 
 export let beforeTransactionSelectionFixer
 if (typeof getSelection !== 'undefined') {
-  beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, remote) {
+  beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, transaction, remote) {
     if (!remote) {
       return
     }
@@ -30,7 +30,7 @@ if (typeof getSelection !== 'undefined') {
   beforeTransactionSelectionFixer = function _fakeBeforeTransactionSelectionFixer () {}
 }
 
-export function afterTransactionSelectionFixer (y, remote) {
+export function afterTransactionSelectionFixer (y, transaction, remote) {
   if (relativeSelection === null || !remote) {
     return
   }
@@ -46,17 +46,25 @@ export function afterTransactionSelectionFixer (y, remote) {
   if (from !== null) {
     let sel = fromRelativePosition(fromY, from)
     if (sel !== null) {
-      shouldUpdate = true
-      anchorNode = sel.type.getDom()
-      anchorOffset = sel.offset
+      let node = sel.type.getDom()
+      let offset = sel.offset
+      if (node !== anchorNode || offset !== anchorOffset) {
+        anchorNode = node
+        anchorOffset = offset
+        shouldUpdate = true
+      }
     }
   }
   if (to !== null) {
     let sel = fromRelativePosition(toY, to)
     if (sel !== null) {
-      focusNode = sel.type.getDom()
-      focusOffset = sel.offset
-      shouldUpdate = true
+      let node = sel.type.getDom()
+      let offset = sel.offset
+      if (node !== focusNode || offset !== focusOffset) {
+        focusNode = node
+        focusOffset = offset
+        shouldUpdate = true
+      }
     }
   }
   if (shouldUpdate) {

src/Type/y-xml/utils.js

@@ -135,7 +135,33 @@ export function applyChangesFromDom (dom) {
   }
 }
 
-export function reflectChangesOnDom (events) {
+export function reflectChangesOnDom (events, _document) {
+  // Make sure that no filtered attributes are applied to the structure
+  // if they were, delete them
+  /*
+  events.forEach(event => {
+    const target = event.target
+    if (event.attributesChanged === undefined) {
+      // event.target is Y.XmlText
+      return
+    }
+    const keys = this._domFilter(target.nodeName, Array.from(event.attributesChanged))
+    if (keys === null) {
+      target._delete()
+    } else {
+      const removeKeys = new Set() // is a copy of event.attributesChanged
+      event.attributesChanged.forEach(key => { removeKeys.add(key) })
+      keys.forEach(key => {
+        // remove all accepted keys from removeKeys
+        removeKeys.delete(key)
+      })
+      // remove the filtered attribute
+      removeKeys.forEach(key => {
+        target.removeAttribute(key)
+      })
+    }
+  })
+  */
   this._mutualExclude(() => {
     events.forEach(event => {
       const yxml = event.target
@@ -157,9 +183,9 @@ export function reflectChangesOnDom (events) {
           })
           if (event.childListChanged) {
             // create fragment of undeleted nodes
-            const fragment = document.createDocumentFragment()
+            const fragment = _document.createDocumentFragment()
             yxml.forEach(function (t) {
-              fragment.append(t.getDom())
+              fragment.appendChild(t.getDom(_document))
             })
             // remove remainding nodes
             let lastChild = dom.lastChild
@@ -168,7 +194,7 @@ export function reflectChangesOnDom (events) {
               lastChild = dom.lastChild
             }
             // insert fragment of undeleted nodes
-            dom.append(fragment)
+            dom.appendChild(fragment)
           }
         }
         /* TODO: smartscrolling

src/Util/EventHandler.js

@@ -17,7 +17,7 @@ export default class EventHandler {
   removeAllEventListeners () {
     this.eventListeners = []
   }
-  callEventListeners (event) {
+  callEventListeners (transaction, event) {
     for (var i = 0; i < this.eventListeners.length; i++) {
       try {
         const f = this.eventListeners[i]

src/Util/UndoManager.js

@@ -1,16 +1,16 @@
 import ID from './ID.js'
 
 class ReverseOperation {
-  constructor (y) {
+  constructor (y, transaction) {
     this.created = new Date()
-    const beforeState = y._transaction.beforeState
+    const beforeState = transaction.beforeState
     this.toState = new ID(y.userID, y.ss.getState(y.userID) - 1)
     if (beforeState.has(y.userID)) {
       this.fromState = new ID(y.userID, beforeState.get(y.userID))
     } else {
       this.fromState = this.toState
     }
-    this.deletedStructs = y._transaction.deletedStructs
+    this.deletedStructs = transaction.deletedStructs
   }
 }
 
@@ -24,10 +24,45 @@ function isStructInScope (y, struct, scope) {
   return false
 }
 
+function applyReverseOperation (y, scope, reverseBuffer) {
+  let performedUndo = false
+  y.transact(() => {
+    while (!performedUndo && reverseBuffer.length > 0) {
+      let undoOp = reverseBuffer.pop()
+      // make sure that it is possible to iterate {from}-{to}
+      y.os.getItemCleanStart(undoOp.fromState)
+      y.os.getItemCleanEnd(undoOp.toState)
+      y.os.iterate(undoOp.fromState, undoOp.toState, op => {
+        if (!op._deleted && isStructInScope(y, op, scope)) {
+          performedUndo = true
+          op._delete(y)
+        }
+      })
+      for (let op of undoOp.deletedStructs) {
+        if (
+          isStructInScope(y, op, scope) &&
+          op._parent !== y &&
+          !op._parent._deleted &&
+          (
+            op._parent._id.user !== y.userID ||
+            op._parent._id.clock < undoOp.fromState.clock ||
+            op._parent._id.clock > undoOp.fromState.clock
+          )
+        ) {
+          performedUndo = true
+          op = op._copy(undoOp.deletedStructs)
+          op._integrate(y)
+        }
+      }
+    }
+  })
+  return performedUndo
+}
+
 export default class UndoManager {
   constructor (scope, options = {}) {
     this.options = options
-    options.captureTimeout = options.captureTimeout || 0
+    options.captureTimeout = options.captureTimeout == null ? 500 : options.captureTimeout
     this._undoBuffer = []
     this._redoBuffer = []
     this._scope = scope
@@ -35,13 +70,12 @@ export default class UndoManager {
     this._redoing = false
     const y = scope._y
     this.y = y
-    y.on('afterTransaction', (y, remote) => {
-      if (!remote && (y._transaction.beforeState.has(y.userID) || y._transaction.deletedStructs.size > 0)) {
-        let reverseOperation = new ReverseOperation(y)
+    y.on('afterTransaction', (y, transaction, remote) => {
+      if (!remote && transaction.changedParentTypes.has(scope)) {
+        let reverseOperation = new ReverseOperation(y, transaction)
         if (!this._undoing) {
           let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null
-          if (lastUndoOp !== null && lastUndoOp.created - reverseOperation.created <= options.captureTimeout) {
-            console.log('appending', lastUndoOp, reverseOperation)
+          if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {
             lastUndoOp.created = reverseOperation.created
             lastUndoOp.toState = reverseOperation.toState
             reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs)
@@ -58,47 +92,15 @@ export default class UndoManager {
     })
   }
   undo () {
-    console.log('undoing')
     this._undoing = true
-    this._applyReverseOperation(this._undoBuffer)
+    const performedUndo = applyReverseOperation(this.y, this._scope, this._undoBuffer)
     this._undoing = false
+    return performedUndo
   }
   redo () {
     this._redoing = true
-    this._applyReverseOperation(this._redoBuffer)
+    const performedRedo = applyReverseOperation(this.y, this._scope, this._redoBuffer)
     this._redoing = false
-  }
-  _applyReverseOperation (reverseBuffer) {
-    this.y.transact(() => {
-      let performedUndo = false
-      while (!performedUndo && reverseBuffer.length > 0) {
-        let undoOp = reverseBuffer.pop()
-        // make sure that it is possible to iterate {from}-{to}
-        this.y.os.getItemCleanStart(undoOp.fromState)
-        this.y.os.getItemCleanEnd(undoOp.toState)
-        this.y.os.iterate(undoOp.fromState, undoOp.toState, op => {
-          if (!op._deleted && isStructInScope(this.y, op, this._scope)) {
-            performedUndo = true
-            op._delete(this.y)
-          }
-        })
-        for (let op of undoOp.deletedStructs) {
-          if (
-            isStructInScope(this.y, op, this._scope) &&
-            op._parent !== this.y &&
-            !op._parent._deleted &&
-            (
-              op._parent._id.user !== this.y.userID ||
-              op._parent._id.clock < undoOp.fromState.clock ||
-              op._parent._id.clock > undoOp.fromState.clock
-            )
-          ) {
-            performedUndo = true
-            op = op._copy(undoOp.deletedStructs)
-            op._integrate(this.y)
-          }
-        }
-      }
-    })
+    return performedRedo
   }
 }

src/Util/YEvent.js

@@ -8,15 +8,15 @@ export default class YEvent {
     const path = []
     let type = this.target
     const y = type._y
-    while (type._parent !== this._currentTarget && type._parent !== y) {
+    while (type !== this.currentTarget && type !== y) {
       let parent = type._parent
       if (type._parentSub !== null) {
-        path.push(type._parentSub)
+        path.unshift(type._parentSub)
       } else {
         // parent is array-ish
         for (let [i, child] of parent) {
           if (child === type) {
-            path.push(i)
+            path.unshift(i)
             break
           }
         }

src/Y.js

@@ -15,6 +15,7 @@ import YMap from './Type/YMap.js'
 import YText from './Type/YText.js'
 import { YXmlFragment, YXmlElement, YXmlText } from './Type/y-xml/y-xml.js'
 import BinaryDecoder from './Binary/Decoder.js'
+import { getRelativePosition, fromRelativePosition } from './Util/relativePosition.js'
 
 import debug from 'debug'
 import Transaction from './Transaction.js'
@@ -44,8 +45,8 @@ export default class Y extends NamedEventHandler {
   transact (f, remote = false) {
     let initialCall = this._transaction === null
     if (initialCall) {
-      this.emit('beforeTransaction', this, remote)
       this._transaction = new Transaction(this)
+      this.emit('beforeTransaction', this, this._transaction, remote)
     }
     try {
       f(this)
@@ -53,13 +54,16 @@ export default class Y extends NamedEventHandler {
       console.error(e)
     }
     if (initialCall) {
+      this.emit('beforeObserverCalls', this, this._transaction, remote)
+      const transaction = this._transaction
+      this._transaction = null
       // emit change events on changed types
-      this._transaction.changedTypes.forEach(function (subs, type) {
+      transaction.changedTypes.forEach(function (subs, type) {
         if (!type._deleted) {
-          type._callObserver(subs, remote)
+          type._callObserver(transaction, subs, remote)
         }
       })
-      this._transaction.changedParentTypes.forEach(function (events, type) {
+      transaction.changedParentTypes.forEach(function (events, type) {
         if (!type._deleted) {
           events = events
             .filter(event =>
@@ -71,12 +75,11 @@ export default class Y extends NamedEventHandler {
             })
           // we don't have to check for events.length
           // because there is no way events is empty..
-          type._deepEventHandler.callEventListeners(events)
+          type._deepEventHandler.callEventListeners(transaction, events)
         }
       })
       // when all changes & events are processed, emit afterTransaction event
-      this.emit('afterTransaction', this, remote)
-      this._transaction = null
+      this.emit('afterTransaction', this, transaction, remote)
     }
   }
   // fake _start for root properties (y.set('name', type))
@@ -92,17 +95,10 @@ export default class Y extends NamedEventHandler {
   define (name, TypeConstructor) {
     let id = new RootID(name, TypeConstructor)
     let type = this.os.get(id)
-    if (type === null) {
-      type = new TypeConstructor()
-      type._id = id
-      type._parent = this
-      type._integrate(this)
-      if (this.share[name] !== undefined) {
-        throw new Error('Type is already defined with a different constructor!')
-      }
-    }
     if (this.share[name] === undefined) {
       this.share[name] = type
+    } else if (this.share[name] !== type) {
+      throw new Error('Type is already defined with a different constructor')
     }
     return type
   }
@@ -168,7 +164,9 @@ Y.XmlText = YXmlText
 
 Y.utils = {
   BinaryDecoder,
-  UndoManager
+  UndoManager,
+  getRelativePosition,
+  fromRelativePosition
 }
 
 Y.debug = debug

test/y-map.tests.js

@@ -41,6 +41,8 @@ test('basic map tests', async function map0 (t) {
 test('Basic get&set of Map property (converge via sync)', async function map1 (t) {
   let { users, map0 } = await initArrays(t, { users: 2 })
   map0.set('stuff', 'stuffy')
+  map0.set('undefined', undefined)
+  map0.set('null', null)
   t.compare(map0.get('stuff'), 'stuffy')
 
   await flushAll(t, users)
@@ -48,6 +50,8 @@ test('Basic get&set of Map property (converge via sync)', async function map1 (t
   for (let user of users) {
     var u = user.get('map', Y.Map)
     t.compare(u.get('stuff'), 'stuffy')
+    t.assert(u.get('undefined') === undefined, 'undefined')
+    t.compare(u.get('null'), null, 'null')
   }
   await compareUsers(t, users)
 })
@@ -172,31 +176,36 @@ test('observePath properties', async function map10 (t) {
 })
 */
 
-/* TODO: reimplement observeDeep
 test('observe deep properties', async function map11 (t) {
   let { users, map1, map2, map3 } = await initArrays(t, { users: 4 })
   var _map1 = map1.set('map', new Y.Map())
   var calls = 0
   var dmapid
-  _map1.observe(function (event) {
-    calls++
-    t.compare(event.name, 'deepmap')
-    dmapid = event.target.opContents.deepmap
+  map1.observeDeep(function (events) {
+    events.forEach(event => {
+      calls++
+      t.assert(event.keysChanged.has('deepmap'))
+      t.assert(event.path.length === 1)
+      t.assert(event.path[0] === 'map')
+      dmapid = event.target.get('deepmap')._id
+    })
   })
   await flushAll(t, users)
+  await flushAll(t, users)
   var _map3 = map3.get('map')
   _map3.set('deepmap', new Y.Map())
   await flushAll(t, users)
   var _map2 = map2.get('map')
   _map2.set('deepmap', new Y.Map())
   await flushAll(t, users)
+  await flushAll(t, users)
   var dmap1 = _map1.get('deepmap')
   var dmap2 = _map2.get('deepmap')
   var dmap3 = _map3.get('deepmap')
   t.assert(calls > 0)
-  t.compare(dmap1._model, dmap2._model)
-  t.compare(dmap1._model, dmap3._model)
-  t.compare(dmap1._model, dmapid)
+  t.assert(dmap1._id.equals(dmap2._id))
+  t.assert(dmap1._id.equals(dmap3._id))
+  t.assert(dmap1._id.equals(dmapid))
   await compareUsers(t, users)
 })
 
@@ -204,8 +213,10 @@ test('observes using observeDeep', async function map12 (t) {
   let { users, map0 } = await initArrays(t, { users: 2 })
   var pathes = []
   var calls = 0
-  map0.observeDeep(function (event) {
-    pathes.push(event.path)
+  map0.observeDeep(function (events) {
+    events.forEach(event => {
+      pathes.push(event.path)
+    })
     calls++
   })
   map0.set('map', new Y.Map())
@@ -215,7 +226,6 @@ test('observes using observeDeep', async function map12 (t) {
   t.compare(pathes, [[], ['map'], ['map', 'array']])
   await compareUsers(t, users)
 })
-*/
 
 /* TODO: Test events in Y.Map
 function compareEvent (t, is, should) {

test/y-xml.tests.js

@@ -230,8 +230,8 @@ 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') {
+  let domFilter = (nodeName, attrs) => {
+    if (nodeName === 'H1') {
       return null
     } else {
       return attrs
@@ -251,8 +251,9 @@ 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')
+  let domFilter = (nodeName, attrs) => {
+    attrs.delete('hidden')
+    return attrs
   }
   xml0.setDomFilter(domFilter)
   xml1.setDomFilter(domFilter)
@@ -303,6 +304,51 @@ test('treeWalker', async function xml17 (t) {
   await compareUsers(t, users)
 })
 
+/**
+ * The expected behavior is that changes on your own dom (e.g. malicious attributes) persist.
+ * Yjs should just ignore them, never propagate those attributes.
+ * Incoming changes that contain malicious attributes should be deleted.
+ */
+test('Filtering remote changes', async function xmlFilteringRemote (t) {
+  var { users, xml0, xml1 } = await initArrays(t, { users: 3 })
+  xml0.setDomFilter(function (nodeName, attributes) {
+    attributes.delete('malicious')
+    if (nodeName === 'HIDEME') {
+      return null
+    } else if (attributes.has('isHidden')) {
+      return null
+    } else {
+      return attributes
+    }
+  })
+  // make sure that dom filters are active
+  // TODO: do not rely on .getDom for domFilters
+  xml0.getDom()
+  xml1.getDom()
+  let paragraph = new Y.XmlElement('p')
+  let hideMe = new Y.XmlElement('hideMe')
+  let span = new Y.XmlElement('span')
+  span.setAttribute('malicious', 'alert("give me money")')
+  let tag = new Y.XmlElement('tag')
+  tag.setAttribute('isHidden', 'true')
+  paragraph.insert(0, [hideMe, span, tag])
+  xml0.insert(0, [paragraph])
+  let tag2 = new Y.XmlElement('tag')
+  tag2.setAttribute('isHidden', 'true')
+  paragraph.insert(0, [tag2])
+  await flushAll(t, users)
+  // check dom
+  paragraph.getDom().setAttribute('malicious', 'true')
+  span.getDom().setAttribute('malicious', 'true')
+  console.log(xml0.toString())
+  // check incoming attributes
+  xml1.get(0).get(0).setAttribute('malicious', 'true')
+  xml1.insert(0, [new Y.XmlElement('hideMe')])
+  await flushAll(t, users)
+
+  await compareUsers(t, users)
+})
+
 // TODO: move elements
 var xmlTransactions = [
   function attributeChange (t, user, chance) {

tests-lib/helper.js

@@ -153,12 +153,12 @@ export async function initArrays (t, opts) {
     result['array' + i] = y.define('array', Y.Array)
     result['map' + i] = y.define('map', Y.Map)
     result['xml' + i] = y.define('xml', Y.XmlElement)
-    y.get('xml', Y.Xml).setDomFilter(function (d, attrs) {
-      if (d.nodeName === 'HIDDEN') {
+    y.get('xml').setDomFilter(function (nodeName, attrs) {
+      if (nodeName === 'HIDDEN') {
         return null
-      } else {
-        return attrs.filter(a => a !== 'hidden')
       }
+      attrs.delete('hidden')
+      return attrs
     })
     y.on('afterTransaction', function () {
       for (let missing of y._missingStructs.values()) {
@@ -187,7 +187,7 @@ export async function flushAll (t, users) {
   if (users.length === 0) {
     return
   }
-  await wait(0)
+  await wait(10)
   if (users[0].connector.testRoom != null) {
     // use flushAll method specified in Test Connector
     await users[0].connector.testRoom.flushAll(users)