v13.0.0-26 -- distribution files

examples/html-editor/index.js

@@ -1,15 +1,4 @@
-/* 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)
+/* global Y */
 
 // initialize a shared object. This function call returns a promise!
 let y = new Y({
@@ -28,14 +17,17 @@ window.onload = function () {
   window.yXmlType.bindToDom(document.body)
 }
 window.undoManager = new Y.utils.UndoManager(window.yXmlType, {
-  captureTimeout: 500
+  captureTimeout: 0
 })
 
 document.onkeydown = function interceptUndoRedo (e) {
   if (e.keyCode === 90 && e.metaKey) {
+    console.log('uidtaren')
     if (!e.shiftKey) {
+      console.info('Undo!')
       window.undoManager.undo()
     } else {
+      console.info('Redo!')
       window.undoManager.redo()
     }
     e.preventDefault()

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-30",
+  "version": "13.0.0-25",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2808,6 +2808,14 @@
             }
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -2818,14 +2826,6 @@
             "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,6 +4868,15 @@
         "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",
@@ -4889,15 +4898,6 @@
       "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-30",
+  "version": "13.0.0-26",
   "description": "A framework for real-time p2p shared editing on any data",
   "main": "./y.node.js",
   "browser": "./y.js",

rollup.browser.js

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

rollup.node.js

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

rollup.test.js

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

src/Struct/ItemJSON.js

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

src/Struct/Type.js

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

src/Type/YArray.js

@@ -1,6 +1,5 @@
 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'
 
@@ -12,19 +11,15 @@ class YArrayEvent extends YEvent {
 }
 
 export default class YArray extends Type {
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YArrayEvent(this, remote))
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YArrayEvent(this, remote))
   }
   get (pos) {
     let n = this._start
     while (n !== null) {
       if (!n._deleted) {
         if (pos < n._length) {
-          if (n.constructor === ItemJSON || n.constructor === ItemString) {
-            return n._content[pos]
-          } else {
-            return n
-          }
+          return n._content[n._length - pos]
         }
         pos -= n._length
       }

src/Type/YMap.js

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

src/Type/y-xml/YXmlFragment.js

@@ -142,8 +142,8 @@ export default class YXmlFragment extends YArray {
       xml.setDomFilter(f)
     })
   }
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YXmlEvent(this, parentSubs, remote))
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YXmlEvent(this, parentSubs, remote))
   }
   toString () {
     return this.map(xml => xml.toString()).join('')
@@ -255,7 +255,7 @@ export default class YXmlFragment extends YArray {
             }
           })
           for (let dom of diffChildren) {
-            if (dom._yxml != null && dom._yxml !== false) {
+            if (dom._yxml != null) {
               applyChangesFromDom(dom)
             }
           }

src/Type/y-xml/selection.js

@@ -7,7 +7,7 @@ let relativeSelection = null
 
 export let beforeTransactionSelectionFixer
 if (typeof getSelection !== 'undefined') {
-  beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, transaction, remote) {
+  beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, remote) {
     if (!remote) {
       return
     }
@@ -30,7 +30,7 @@ if (typeof getSelection !== 'undefined') {
   beforeTransactionSelectionFixer = function _fakeBeforeTransactionSelectionFixer () {}
 }
 
-export function afterTransactionSelectionFixer (y, transaction, remote) {
+export function afterTransactionSelectionFixer (y, remote) {
   if (relativeSelection === null || !remote) {
     return
   }

src/Type/y-xml/utils.js

@@ -136,32 +136,6 @@ export function applyChangesFromDom (dom) {
 }
 
 export function reflectChangesOnDom (events) {
-  // 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

src/Util/EventHandler.js

@@ -17,7 +17,7 @@ export default class EventHandler {
   removeAllEventListeners () {
     this.eventListeners = []
   }
-  callEventListeners (transaction, event) {
+  callEventListeners (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, transaction) {
+  constructor (y) {
     this.created = new Date()
-    const beforeState = transaction.beforeState
+    const beforeState = y._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 = transaction.deletedStructs
+    this.deletedStructs = y._transaction.deletedStructs
   }
 }
 
@@ -70,12 +70,13 @@ export default class UndoManager {
     this._redoing = false
     const y = scope._y
     this.y = y
-    y.on('afterTransaction', (y, transaction, remote) => {
-      if (!remote && transaction.changedParentTypes.has(scope)) {
-        let reverseOperation = new ReverseOperation(y, transaction)
+    y.on('afterTransaction', (y, remote) => {
+      if (!remote && y._transaction.changedParentTypes.has(scope)) {
+        let reverseOperation = new ReverseOperation(y)
         if (!this._undoing) {
           let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null
           if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {
+            console.log('appending', lastUndoOp, reverseOperation)
             lastUndoOp.created = reverseOperation.created
             lastUndoOp.toState = reverseOperation.toState
             reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs)
@@ -92,6 +93,7 @@ export default class UndoManager {
     })
   }
   undo () {
+    console.log('undoing')
     this._undoing = true
     const performedUndo = applyReverseOperation(this.y, this._scope, this._undoBuffer)
     this._undoing = false

src/Util/YEvent.js

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

src/Y.js

@@ -15,7 +15,6 @@ 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'
@@ -45,8 +44,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)
@@ -54,15 +53,13 @@ export default class Y extends NamedEventHandler {
       console.error(e)
     }
     if (initialCall) {
-      const transaction = this._transaction
-      this._transaction = null
       // emit change events on changed types
-      transaction.changedTypes.forEach(function (subs, type) {
+      this._transaction.changedTypes.forEach(function (subs, type) {
         if (!type._deleted) {
-          type._callObserver(transaction, subs, remote)
+          type._callObserver(subs, remote)
         }
       })
-      transaction.changedParentTypes.forEach(function (events, type) {
+      this._transaction.changedParentTypes.forEach(function (events, type) {
         if (!type._deleted) {
           events = events
             .filter(event =>
@@ -74,11 +71,12 @@ 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(transaction, events)
+          type._deepEventHandler.callEventListeners(events)
         }
       })
       // when all changes & events are processed, emit afterTransaction event
-      this.emit('afterTransaction', this, transaction, remote)
+      this.emit('afterTransaction', this, remote)
+      this._transaction = null
     }
   }
   // fake _start for root properties (y.set('name', type))
@@ -170,9 +168,7 @@ Y.XmlText = YXmlText
 
 Y.utils = {
   BinaryDecoder,
-  UndoManager,
-  getRelativePosition,
-  fromRelativePosition
+  UndoManager
 }
 
 Y.debug = debug

test/y-map.tests.js

@@ -41,8 +41,6 @@ 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)
@@ -50,8 +48,6 @@ 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)
 })
@@ -176,36 +172,31 @@ 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.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
-    })
+  _map1.observe(function (event) {
+    calls++
+    t.compare(event.name, 'deepmap')
+    dmapid = event.target.opContents.deepmap
   })
   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.assert(dmap1._id.equals(dmap2._id))
-  t.assert(dmap1._id.equals(dmap3._id))
-  t.assert(dmap1._id.equals(dmapid))
+  t.compare(dmap1._model, dmap2._model)
+  t.compare(dmap1._model, dmap3._model)
+  t.compare(dmap1._model, dmapid)
   await compareUsers(t, users)
 })
 
@@ -213,10 +204,8 @@ test('observes using observeDeep', async function map12 (t) {
   let { users, map0 } = await initArrays(t, { users: 2 })
   var pathes = []
   var calls = 0
-  map0.observeDeep(function (events) {
-    events.forEach(event => {
-      pathes.push(event.path)
-    })
+  map0.observeDeep(function (event) {
+    pathes.push(event.path)
     calls++
   })
   map0.set('map', new Y.Map())
@@ -226,6 +215,7 @@ 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) {

tests-lib/helper.js

@@ -187,7 +187,7 @@ export async function flushAll (t, users) {
   if (users.length === 0) {
     return
   }
-  await wait(10)
+  await wait(0)
   if (users[0].connector.testRoom != null) {
     // use flushAll method specified in Test Connector
     await users[0].connector.testRoom.flushAll(users)

y.node.js

@@ -1,7 +1,7 @@
 
 /**
  * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-30
+ * @version v13.0.0-26
  * @license MIT
  */
 
@@ -687,6 +687,7 @@ if (!String.fromCodePoint) {
 /*! http://mths.be/codepointat v0.2.0 by @mathias */
 if (!String.prototype.codePointAt) {
 	(function() {
+		'use strict'; // needed to support `apply`/`call` with `undefined`/`null`
 		var defineProperty = (function() {
 			// IE 8 only supports `Object.defineProperty` on DOM elements
 			try {
@@ -1899,7 +1900,7 @@ class EventHandler {
   removeAllEventListeners () {
     this.eventListeners = [];
   }
-  callEventListeners (transaction, event) {
+  callEventListeners (event) {
     for (var i = 0; i < this.eventListeners.length; i++) {
       try {
         const f = this.eventListeners[i];
@@ -1966,9 +1967,9 @@ class Type extends Item {
     }
     return path
   }
-  _callEventHandler (transaction, event) {
-    const changedParentTypes = transaction.changedParentTypes;
-    this._eventHandler.callEventListeners(transaction, event);
+  _callEventHandler (event) {
+    const changedParentTypes = this._y._transaction.changedParentTypes;
+    this._eventHandler.callEventListeners(event);
     let type = this;
     while (type !== this._y) {
       let events = changedParentTypes.get(type);
@@ -2091,13 +2092,7 @@ class ItemJSON extends Item {
     this._content = new Array(len);
     for (let i = 0; i < len; i++) {
       const ctnt = decoder.readVarString();
-      let parsed;
-      if (ctnt === 'undefined') {
-        parsed = undefined;
-      } else {
-        parsed = JSON.parse(ctnt);
-      }
-      this._content[i] = parsed;
+      this._content[i] = JSON.parse(ctnt);
     }
     return missing
   }
@@ -2106,14 +2101,7 @@ class ItemJSON extends Item {
     let len = this._content.length;
     encoder.writeVarUint(len);
     for (let i = 0; i < len; i++) {
-      let encoded;
-      let content = this._content[i];
-      if (content === undefined) {
-        encoded = 'undefined';
-      } else {
-        encoded = JSON.stringify(content);
-      }
-      encoder.writeVarString(encoded);
+      encoder.writeVarString(JSON.stringify(this._content[i]));
     }
   }
   _logString () {
@@ -2134,47 +2122,6 @@ class ItemJSON extends Item {
   }
 }
 
-class ItemString extends Item {
-  constructor () {
-    super();
-    this._content = null;
-  }
-  _copy () {
-    let struct = super._copy();
-    struct._content = this._content;
-    return struct
-  }
-  get _length () {
-    return this._content.length
-  }
-  _fromBinary (y, decoder) {
-    let missing = super._fromBinary(y, decoder);
-    this._content = decoder.readVarString();
-    return missing
-  }
-  _toBinary (encoder) {
-    super._toBinary(encoder);
-    encoder.writeVarString(this._content);
-  }
-  _logString () {
-    const left = this._left !== null ? this._left._lastId : null;
-    const origin = this._origin !== null ? this._origin._lastId : null;
-    return `ItemJSON(id:${logID(this._id)},content:${JSON.stringify(this._content)},left:${logID(left)},origin:${logID(origin)},right:${logID(this._right)},parent:${logID(this._parent)},parentSub:${this._parentSub})`
-  }
-  _splitAt (y, diff) {
-    if (diff === 0) {
-      return this
-    } else if (diff >= this._length) {
-      return this._right
-    }
-    let item = new ItemString();
-    item._content = this._content.slice(diff);
-    this._content = this._content.slice(0, diff);
-    splitHelper(y, this, item, diff);
-    return item
-  }
-}
-
 class YEvent {
   constructor (target) {
     this.target = target;
@@ -2184,15 +2131,15 @@ class YEvent {
     const path = [];
     let type = this.target;
     const y = type._y;
-    while (type !== this.currentTarget && type !== y) {
+    while (type._parent !== this._currentTarget && type._parent !== y) {
       let parent = type._parent;
       if (type._parentSub !== null) {
-        path.unshift(type._parentSub);
+        path.push(type._parentSub);
       } else {
         // parent is array-ish
         for (let [i, child] of parent) {
           if (child === type) {
-            path.unshift(i);
+            path.push(i);
             break
           }
         }
@@ -2211,19 +2158,15 @@ class YArrayEvent extends YEvent {
 }
 
 class YArray extends Type {
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YArrayEvent(this, remote));
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YArrayEvent(this, remote));
   }
   get (pos) {
     let n = this._start;
     while (n !== null) {
       if (!n._deleted) {
         if (pos < n._length) {
-          if (n.constructor === ItemJSON || n.constructor === ItemString) {
-            return n._content[pos]
-          } else {
-            return n
-          }
+          return n._content[n._length - pos]
         }
         pos -= n._length;
       }
@@ -2429,8 +2372,8 @@ class YMapEvent extends YEvent {
 }
 
 class YMap extends Type {
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YMapEvent(this, parentSubs, remote));
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YMapEvent(this, parentSubs, remote));
   }
   toJSON () {
     const map = {};
@@ -2529,6 +2472,47 @@ class YMap extends Type {
   }
 }
 
+class ItemString extends Item {
+  constructor () {
+    super();
+    this._content = null;
+  }
+  _copy () {
+    let struct = super._copy();
+    struct._content = this._content;
+    return struct
+  }
+  get _length () {
+    return this._content.length
+  }
+  _fromBinary (y, decoder) {
+    let missing = super._fromBinary(y, decoder);
+    this._content = decoder.readVarString();
+    return missing
+  }
+  _toBinary (encoder) {
+    super._toBinary(encoder);
+    encoder.writeVarString(this._content);
+  }
+  _logString () {
+    const left = this._left !== null ? this._left._lastId : null;
+    const origin = this._origin !== null ? this._origin._lastId : null;
+    return `ItemJSON(id:${logID(this._id)},content:${JSON.stringify(this._content)},left:${logID(left)},origin:${logID(origin)},right:${logID(this._right)},parent:${logID(this._parent)},parentSub:${this._parentSub})`
+  }
+  _splitAt (y, diff) {
+    if (diff === 0) {
+      return this
+    } else if (diff >= this._length) {
+      return this._right
+    }
+    let item = new ItemString();
+    item._content = this._content.slice(diff);
+    this._content = this._content.slice(0, diff);
+    splitHelper(y, this, item, diff);
+    return item
+  }
+}
+
 class YText extends YArray {
   constructor (string) {
     super();
@@ -2777,32 +2761,6 @@ function applyChangesFromDom (dom) {
 }
 
 function reflectChangesOnDom (events) {
-  // 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;
@@ -2956,7 +2914,7 @@ let relativeSelection = null;
 
 let beforeTransactionSelectionFixer;
 if (typeof getSelection !== 'undefined') {
-  beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, transaction, remote) {
+  beforeTransactionSelectionFixer = function _beforeTransactionSelectionFixer (y, remote) {
     if (!remote) {
       return
     }
@@ -2979,7 +2937,7 @@ if (typeof getSelection !== 'undefined') {
   beforeTransactionSelectionFixer = function _fakeBeforeTransactionSelectionFixer () {};
 }
 
-function afterTransactionSelectionFixer (y, transaction, remote) {
+function afterTransactionSelectionFixer (y, remote) {
   if (relativeSelection === null || !remote) {
     return
   }
@@ -3911,8 +3869,8 @@ class YXmlFragment extends YArray {
       xml.setDomFilter(f);
     });
   }
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YXmlEvent(this, parentSubs, remote));
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YXmlEvent(this, parentSubs, remote));
   }
   toString () {
     return this.map(xml => xml.toString()).join('')
@@ -4024,7 +3982,7 @@ class YXmlFragment extends YArray {
             }
           });
           for (let dom of diffChildren) {
-            if (dom._yxml != null && dom._yxml !== false) {
+            if (dom._yxml != null) {
               applyChangesFromDom(dom);
             }
           }
@@ -4409,16 +4367,16 @@ class NamedEventHandler {
 }
 
 class ReverseOperation {
-  constructor (y, transaction) {
+  constructor (y) {
     this.created = new Date();
-    const beforeState = transaction.beforeState;
+    const beforeState = y._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 = transaction.deletedStructs;
+    this.deletedStructs = y._transaction.deletedStructs;
   }
 }
 
@@ -4478,12 +4436,13 @@ class UndoManager {
     this._redoing = false;
     const y = scope._y;
     this.y = y;
-    y.on('afterTransaction', (y, transaction, remote) => {
-      if (!remote && transaction.changedParentTypes.has(scope)) {
-        let reverseOperation = new ReverseOperation(y, transaction);
+    y.on('afterTransaction', (y, remote) => {
+      if (!remote && y._transaction.changedParentTypes.has(scope)) {
+        let reverseOperation = new ReverseOperation(y);
         if (!this._undoing) {
           let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null;
           if (lastUndoOp !== null && reverseOperation.created - lastUndoOp.created <= options.captureTimeout) {
+            console.log('appending', lastUndoOp, reverseOperation);
             lastUndoOp.created = reverseOperation.created;
             lastUndoOp.toState = reverseOperation.toState;
             reverseOperation.deletedStructs.forEach(lastUndoOp.deletedStructs.add, lastUndoOp.deletedStructs);
@@ -4500,6 +4459,7 @@ class UndoManager {
     });
   }
   undo () {
+    console.log('undoing');
     this._undoing = true;
     const performedUndo = applyReverseOperation(this.y, this._scope, this._undoBuffer);
     this._undoing = false;
@@ -4870,15 +4830,6 @@ function coerce(val) {
 }
 });
 
-var debug_1 = debug$1.coerce;
-var debug_2 = debug$1.disable;
-var debug_3 = debug$1.enable;
-var debug_4 = debug$1.enabled;
-var debug_5 = debug$1.humanize;
-var debug_6 = debug$1.names;
-var debug_7 = debug$1.skips;
-var debug_8 = debug$1.formatters;
-
 var browser = createCommonjsModule(function (module, exports) {
 /**
  * This is the web browser implementation of `debug()`.
@@ -5067,14 +5018,6 @@ function localstorage() {
 }
 });
 
-var browser_1 = browser.log;
-var browser_2 = browser.formatArgs;
-var browser_3 = browser.save;
-var browser_4 = browser.load;
-var browser_5 = browser.useColors;
-var browser_6 = browser.storage;
-var browser_7 = browser.colors;
-
 class AbstractConnector {
   constructor (y, opts) {
     this.y = y;
@@ -5436,8 +5379,8 @@ class Y$1 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);
@@ -5445,15 +5388,13 @@ class Y$1 extends NamedEventHandler {
       console.error(e);
     }
     if (initialCall) {
-      const transaction = this._transaction;
-      this._transaction = null;
       // emit change events on changed types
-      transaction.changedTypes.forEach(function (subs, type) {
+      this._transaction.changedTypes.forEach(function (subs, type) {
         if (!type._deleted) {
-          type._callObserver(transaction, subs, remote);
+          type._callObserver(subs, remote);
         }
       });
-      transaction.changedParentTypes.forEach(function (events, type) {
+      this._transaction.changedParentTypes.forEach(function (events, type) {
         if (!type._deleted) {
           events = events
             .filter(event =>
@@ -5465,11 +5406,12 @@ class Y$1 extends NamedEventHandler {
             });
           // we don't have to check for events.length
           // because there is no way events is empty..
-          type._deepEventHandler.callEventListeners(transaction, events);
+          type._deepEventHandler.callEventListeners(events);
         }
       });
       // when all changes & events are processed, emit afterTransaction event
-      this.emit('afterTransaction', this, transaction, remote);
+      this.emit('afterTransaction', this, remote);
+      this._transaction = null;
     }
   }
   // fake _start for root properties (y.set('name', type))
@@ -5561,9 +5503,7 @@ Y$1.XmlText = YXmlText;
 
 Y$1.utils = {
   BinaryDecoder,
-  UndoManager,
-  getRelativePosition,
-  fromRelativePosition
+  UndoManager
 };
 
 Y$1.debug = browser;

y.test.js

@@ -1,7 +1,7 @@
 (function (global, factory) {
 	typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
 	typeof define === 'function' && define.amd ? define(['exports'], factory) :
-	(factory((global['y-tests'] = {})));
+	(factory((global['y-tests'] = global['y-tests'] || {})));
 }(this, (function (exports) { 'use strict';
 
 class N {
@@ -684,6 +684,7 @@ if (!String.fromCodePoint) {
 /*! http://mths.be/codepointat v0.2.0 by @mathias */
 if (!String.prototype.codePointAt) {
 	(function() {
+		'use strict'; // needed to support `apply`/`call` with `undefined`/`null`
 		var defineProperty = (function() {
 			// IE 8 only supports `Object.defineProperty` on DOM elements
 			try {
@@ -1448,10 +1449,6 @@ function logID (id) {
   }
 }
 
-/**
- * Delete all items in an ID-range
- * TODO: implement getItemCleanStartNode for better performance (only one lookup)
- */
 function deleteItemRange (y, user, clock, range) {
   const createDelete = y.connector._forwardAppliedStructs;
   let item = y.os.getItemCleanStart(new ID(user, clock));
@@ -1556,13 +1553,6 @@ function transactionTypeChanged (y, type, sub) {
   }
 }
 
-/**
- * Helper utility to split an Item (see _splitAt)
- * - copy all properties from a to b
- * - connect a to b
- * - assigns the correct _id
- * - save b to os
- */
 function splitHelper (y, a, b, diff) {
   const aID = a._id;
   b._id = new ID(aID.user, aID.clock + diff);
@@ -1896,7 +1886,7 @@ class EventHandler {
   removeAllEventListeners () {
     this.eventListeners = [];
   }
-  callEventListeners (transaction, event) {
+  callEventListeners (event) {
     for (var i = 0; i < this.eventListeners.length; i++) {
       try {
         const f = this.eventListeners[i];
@@ -1913,7 +1903,6 @@ class EventHandler {
   }
 }
 
-// restructure children as if they were inserted one after another
 function integrateChildren (y, start) {
   let right;
   do {
@@ -1937,35 +1926,9 @@ class Type extends Item {
     this._eventHandler = new EventHandler();
     this._deepEventHandler = new EventHandler();
   }
-  getPathTo (type) {
-    if (type === this) {
-      return []
-    }
-    const path = [];
-    const y = this._y;
-    while (type._parent !== this && this._parent !== y) {
-      let parent = type._parent;
-      if (type._parentSub !== null) {
-        path.push(type._parentSub);
-      } else {
-        // parent is array-ish
-        for (let [i, child] of parent) {
-          if (child === type) {
-            path.push(i);
-            break
-          }
-        }
-      }
-      type = parent;
-    }
-    if (this._parent !== this) {
-      throw new Error('The type is not a child of this node')
-    }
-    return path
-  }
-  _callEventHandler (transaction, event) {
-    const changedParentTypes = transaction.changedParentTypes;
-    this._eventHandler.callEventListeners(transaction, event);
+  _callEventHandler (event) {
+    const changedParentTypes = this._y._transaction.changedParentTypes;
+    this._eventHandler.callEventListeners(event);
     let type = this;
     while (type !== this._y) {
       let events = changedParentTypes.get(type);
@@ -2088,13 +2051,7 @@ class ItemJSON extends Item {
     this._content = new Array(len);
     for (let i = 0; i < len; i++) {
       const ctnt = decoder.readVarString();
-      let parsed;
-      if (ctnt === 'undefined') {
-        parsed = undefined;
-      } else {
-        parsed = JSON.parse(ctnt);
-      }
-      this._content[i] = parsed;
+      this._content[i] = JSON.parse(ctnt);
     }
     return missing
   }
@@ -2103,14 +2060,7 @@ class ItemJSON extends Item {
     let len = this._content.length;
     encoder.writeVarUint(len);
     for (let i = 0; i < len; i++) {
-      let encoded;
-      let content = this._content[i];
-      if (content === undefined) {
-        encoded = 'undefined';
-      } else {
-        encoded = JSON.stringify(content);
-      }
-      encoder.writeVarString(encoded);
+      encoder.writeVarString(JSON.stringify(this._content[i]));
     }
   }
   _logString () {
@@ -2131,72 +2081,36 @@ class ItemJSON extends Item {
   }
 }
 
-class ItemString extends Item {
-  constructor () {
-    super();
-    this._content = null;
-  }
-  _copy () {
-    let struct = super._copy();
-    struct._content = this._content;
-    return struct
-  }
-  get _length () {
-    return this._content.length
-  }
-  _fromBinary (y, decoder) {
-    let missing = super._fromBinary(y, decoder);
-    this._content = decoder.readVarString();
-    return missing
-  }
-  _toBinary (encoder) {
-    super._toBinary(encoder);
-    encoder.writeVarString(this._content);
-  }
-  _logString () {
-    const left = this._left !== null ? this._left._lastId : null;
-    const origin = this._origin !== null ? this._origin._lastId : null;
-    return `ItemJSON(id:${logID(this._id)},content:${JSON.stringify(this._content)},left:${logID(left)},origin:${logID(origin)},right:${logID(this._right)},parent:${logID(this._parent)},parentSub:${this._parentSub})`
-  }
-  _splitAt (y, diff) {
-    if (diff === 0) {
-      return this
-    } else if (diff >= this._length) {
-      return this._right
-    }
-    let item = new ItemString();
-    item._content = this._content.slice(diff);
-    this._content = this._content.slice(0, diff);
-    splitHelper(y, this, item, diff);
-    return item
-  }
-}
-
 class YEvent {
   constructor (target) {
     this.target = target;
-    this.currentTarget = target;
+    this._path = null;
   }
   get path () {
-    const path = [];
-    let type = this.target;
-    const y = type._y;
-    while (type !== this.currentTarget && type !== y) {
-      let parent = type._parent;
-      if (type._parentSub !== null) {
-        path.unshift(type._parentSub);
-      } else {
-        // parent is array-ish
-        for (let [i, child] of parent) {
-          if (child === type) {
-            path.unshift(i);
-            break
+    if (this._path !== null) {
+      return this._path
+    } else {
+      const path = [];
+      let type = this.target;
+      const y = type._y;
+      while (type._parent !== y) {
+        let parent = type._parent;
+        if (type._parentSub !== null) {
+          path.push(type._parentSub);
+        } else {
+          // parent is array-ish
+          for (let [i, child] of parent) {
+            if (child === type) {
+              path.push(i);
+              break
+            }
           }
         }
+        type = parent;
       }
-      type = parent;
+      this._path = path;
+      return path
     }
-    return path
   }
 }
 
@@ -2208,19 +2122,15 @@ class YArrayEvent extends YEvent {
 }
 
 class YArray extends Type {
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YArrayEvent(this, remote));
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YArrayEvent(this, remote));
   }
   get (pos) {
     let n = this._start;
     while (n !== null) {
       if (!n._deleted) {
         if (pos < n._length) {
-          if (n.constructor === ItemJSON || n.constructor === ItemString) {
-            return n._content[pos]
-          } else {
-            return n
-          }
+          return n._content[n._length - pos]
         }
         pos -= n._length;
       }
@@ -2426,8 +2336,8 @@ class YMapEvent extends YEvent {
 }
 
 class YMap extends Type {
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YMapEvent(this, parentSubs, remote));
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YMapEvent(this, parentSubs, remote));
   }
   toJSON () {
     const map = {};
@@ -2526,6 +2436,47 @@ class YMap extends Type {
   }
 }
 
+class ItemString extends Item {
+  constructor () {
+    super();
+    this._content = null;
+  }
+  _copy () {
+    let struct = super._copy();
+    struct._content = this._content;
+    return struct
+  }
+  get _length () {
+    return this._content.length
+  }
+  _fromBinary (y, decoder) {
+    let missing = super._fromBinary(y, decoder);
+    this._content = decoder.readVarString();
+    return missing
+  }
+  _toBinary (encoder) {
+    super._toBinary(encoder);
+    encoder.writeVarString(this._content);
+  }
+  _logString () {
+    const left = this._left !== null ? this._left._lastId : null;
+    const origin = this._origin !== null ? this._origin._lastId : null;
+    return `ItemJSON(id:${logID(this._id)},content:${JSON.stringify(this._content)},left:${logID(left)},origin:${logID(origin)},right:${logID(this._right)},parent:${logID(this._parent)},parentSub:${this._parentSub})`
+  }
+  _splitAt (y, diff) {
+    if (diff === 0) {
+      return this
+    } else if (diff >= this._length) {
+      return this._right
+    }
+    let item = new ItemString();
+    item._content = this._content.slice(diff);
+    this._content = this._content.slice(0, diff);
+    splitHelper(y, this, item, diff);
+    return item
+  }
+}
+
 class YText extends YArray {
   constructor (string) {
     super();
@@ -2774,32 +2725,6 @@ function applyChangesFromDom (dom) {
 }
 
 function reflectChangesOnDom (events) {
-  // 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;
@@ -3908,8 +3833,8 @@ class YXmlFragment extends YArray {
       xml.setDomFilter(f);
     });
   }
-  _callObserver (transaction, parentSubs, remote) {
-    this._callEventHandler(transaction, new YXmlEvent(this, parentSubs, remote));
+  _callObserver (parentSubs, remote) {
+    this._callEventHandler(new YXmlEvent(this, parentSubs, remote));
   }
   toString () {
     return this.map(xml => xml.toString()).join('')
@@ -4021,7 +3946,7 @@ class YXmlFragment extends YArray {
             }
           });
           for (let dom of diffChildren) {
-            if (dom._yxml != null && dom._yxml !== false) {
+            if (dom._yxml != null) {
               applyChangesFromDom(dom);
             }
           }
@@ -4407,7 +4332,6 @@ class NamedEventHandler {
 
 class ReverseOperation {
   constructor (y) {
-    this.created = new Date();
     const beforeState = y._transaction.beforeState;
     this.toState = new ID(y.userID, y.ss.getState(y.userID) - 1);
     if (beforeState.has(y.userID)) {
@@ -4429,45 +4353,8 @@ 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
-}
-
 class UndoManager {
-  constructor (scope, options = {}) {
-    this.options = options;
-    options.captureTimeout = options.captureTimeout == null ? 500 : options.captureTimeout;
+  constructor (scope) {
     this._undoBuffer = [];
     this._redoBuffer = [];
     this._scope = scope;
@@ -4476,17 +4363,10 @@ class UndoManager {
     const y = scope._y;
     this.y = y;
     y.on('afterTransaction', (y, remote) => {
-      if (!remote && y._transaction.changedParentTypes.has(scope)) {
+      if (!remote && (y._transaction.beforeState.has(y.userID) || y._transaction.deletedStructs.size > 0)) {
         let reverseOperation = new ReverseOperation(y);
         if (!this._undoing) {
-          let lastUndoOp = this._undoBuffer.length > 0 ? this._undoBuffer[this._undoBuffer.length - 1] : null;
-          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);
-          } else {
-            this._undoBuffer.push(reverseOperation);
-          }
+          this._undoBuffer.push(reverseOperation);
           if (!this._redoing) {
             this._redoBuffer = [];
           }
@@ -4498,15 +4378,46 @@ class UndoManager {
   }
   undo () {
     this._undoing = true;
-    const performedUndo = applyReverseOperation(this.y, this._scope, this._undoBuffer);
+    this._applyReverseOperation(this._undoBuffer);
     this._undoing = false;
-    return performedUndo
   }
   redo () {
     this._redoing = true;
-    const performedRedo = applyReverseOperation(this.y, this._scope, this._redoBuffer);
+    this._applyReverseOperation(this._redoBuffer);
     this._redoing = false;
-    return performedRedo
+  }
+  _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);
+          }
+        }
+      }
+    });
   }
 }
 
@@ -4534,7 +4445,7 @@ var y = d * 365.25;
  * @api public
  */
 
-var ms = function(val, options) {
+var index = function(val, options) {
   options = options || {};
   var type = typeof val;
   if (type === 'string' && val.length > 0) {
@@ -4676,7 +4587,7 @@ exports.coerce = coerce;
 exports.disable = disable;
 exports.enable = enable;
 exports.enabled = enabled;
-exports.humanize = ms;
+exports.humanize = index;
 
 /**
  * The currently active debug mode names, and names to skip.
@@ -4735,8 +4646,8 @@ function createDebug(namespace) {
 
     // set `diff` timestamp
     var curr = +new Date();
-    var ms$$1 = curr - (prevTime || curr);
-    self.diff = ms$$1;
+    var ms = curr - (prevTime || curr);
+    self.diff = ms;
     self.prev = prevTime;
     self.curr = curr;
     prevTime = curr;
@@ -4755,19 +4666,19 @@ function createDebug(namespace) {
     }
 
     // apply any `formatters` transformations
-    var index = 0;
+    var index$$1 = 0;
     args[0] = args[0].replace(/%([a-zA-Z%])/g, function(match, format) {
       // if we encounter an escaped % then don't increase the array index
       if (match === '%%') return match;
-      index++;
+      index$$1++;
       var formatter = exports.formatters[format];
       if ('function' === typeof formatter) {
-        var val = args[index];
+        var val = args[index$$1];
         match = formatter.call(self, val);
 
         // now we need to remove `args[index]` since it's inlined in the `format`
-        args.splice(index, 1);
-        index--;
+        args.splice(index$$1, 1);
+        index$$1--;
       }
       return match;
     });
@@ -4867,15 +4778,6 @@ function coerce(val) {
 }
 });
 
-var debug_1 = debug$1.coerce;
-var debug_2 = debug$1.disable;
-var debug_3 = debug$1.enable;
-var debug_4 = debug$1.enabled;
-var debug_5 = debug$1.humanize;
-var debug_6 = debug$1.names;
-var debug_7 = debug$1.skips;
-var debug_8 = debug$1.formatters;
-
 var browser = createCommonjsModule(function (module, exports) {
 /**
  * This is the web browser implementation of `debug()`.
@@ -5064,14 +4966,6 @@ function localstorage() {
 }
 });
 
-var browser_1 = browser.log;
-var browser_2 = browser.formatArgs;
-var browser_3 = browser.save;
-var browser_4 = browser.load;
-var browser_5 = browser.useColors;
-var browser_6 = browser.storage;
-var browser_7 = browser.colors;
-
 class AbstractConnector {
   constructor (y, opts) {
     this.y = y;
@@ -5442,34 +5336,25 @@ class Y$2 extends NamedEventHandler {
       console.error(e);
     }
     if (initialCall) {
-      const transaction = this._transaction;
-      this._transaction = null;
       // emit change events on changed types
-      transaction.changedTypes.forEach(function (subs, type) {
+      this._transaction.changedTypes.forEach(function (subs, type) {
         if (!type._deleted) {
-          type._callObserver(transaction, subs, remote);
+          type._callObserver(subs, remote);
         }
       });
-      transaction.changedParentTypes.forEach(function (events, type) {
+      this._transaction.changedParentTypes.forEach(function (events, type) {
         if (!type._deleted) {
-          events = events
-            .filter(event =>
-              !event.target._deleted
-            );
-          events
-            .forEach(event => {
-              event.currentTarget = type;
-            });
+          events = events.filter(event =>
+            !event.target._deleted
+          );
           // we don't have to check for events.length
           // because there is no way events is empty..
-          type._deepEventHandler.callEventListeners(transaction, events);
+          type._deepEventHandler.callEventListeners(events);
         }
       });
-      if (this._transaction === null) {
-        // when all changes & events are processed, emit afterTransaction event
-        // only when there are no more transactions
-        this.emit('afterTransaction', this, remote);
-      }
+      // when all changes & events are processed, emit afterTransaction event
+      this.emit('afterTransaction', this, remote);
+      this._transaction = null;
     }
   }
   // fake _start for root properties (y.set('name', type))
@@ -5561,9 +5446,7 @@ Y$2.XmlText = YXmlText;
 
 Y$2.utils = {
   BinaryDecoder,
-  UndoManager,
-  getRelativePosition,
-  fromRelativePosition
+  UndoManager
 };
 
 Y$2.debug = browser;
@@ -5739,7 +5622,7 @@ if (typeof Y !== 'undefined') {
 }
 
 var chance_1 = createCommonjsModule(function (module, exports) {
-//  Chance.js 1.0.12
+//  Chance.js 1.0.10
 //  http://chancejs.com
 //  (c) 2013 Victor Quinn
 //  Chance may be freely distributed or modified under the MIT license.
@@ -5804,7 +5687,7 @@ var chance_1 = createCommonjsModule(function (module, exports) {
         return this;
     }
 
-    Chance.prototype.VERSION = "1.0.12";
+    Chance.prototype.VERSION = "1.0.10";
 
     // Random helper functions
     function initOptions(options, defaults) {
@@ -6023,16 +5906,6 @@ var chance_1 = createCommonjsModule(function (module, exports) {
 		return integer.toString(16);
     };
 
-    Chance.prototype.letter = function(options) {
-        options = initOptions(options, {casing: 'lower'});
-        var pool = "abcdefghijklmnopqrstuvwxyz";
-        var letter = this.character({pool: pool});
-        if (options.casing === 'upper') {
-            letter = letter.toUpperCase();
-        }
-        return letter;
-    };
-
     /**
      *  Return a random string
      *
@@ -6975,25 +6848,8 @@ var chance_1 = createCommonjsModule(function (module, exports) {
         return this.word({length: options.length}) + '@' + (options.domain || this.domain());
     };
 
-    /**
-     * #Description:
-     * ===============================================
-     * Generate a random Facebook id, aka fbid.
-     *
-     * NOTE: At the moment (Sep 2017), Facebook ids are
-     * "numeric strings" of length 16.
-     * However, Facebook Graph API documentation states that
-     * "it is extremely likely to change over time".
-     * @see https://developers.facebook.com/docs/graph-api/overview/
-     *
-     * #Examples:
-     * ===============================================
-     * chance.fbid() => '1000035231661304'
-     *
-     * @return [string] facebook id
-     */
     Chance.prototype.fbid = function () {
-        return '10000' + this.string({pool: "1234567890", length: 11});
+        return parseInt('10000' + this.natural({max: 100000000000}), 10);
     };
 
     Chance.prototype.google_analytics = function () {
@@ -7834,72 +7690,8 @@ var chance_1 = createCommonjsModule(function (module, exports) {
 
     // -- End Regional
 
-    // -- Music --
-
-    Chance.prototype.note = function(options) {
-      // choices for 'notes' option:
-      // flatKey - chromatic scale with flat notes (default)
-      // sharpKey - chromatic scale with sharp notes
-      // flats - just flat notes
-      // sharps - just sharp notes
-      // naturals - just natural notes
-      // all - naturals, sharps and flats
-      options = initOptions(options, { notes : 'flatKey'});
-      var scales = {
-        naturals: ['C', 'D', 'E', 'F', 'G', 'A', 'B'],
-        flats: ['D♭', 'E♭', 'G♭', 'A♭', 'B♭'],
-        sharps: ['C♯', 'D♯', 'F♯', 'G♯', 'A♯']
-      };
-      scales.all = scales.naturals.concat(scales.flats.concat(scales.sharps));
-      scales.flatKey = scales.naturals.concat(scales.flats);
-      scales.sharpKey = scales.naturals.concat(scales.sharps);
-      return this.pickone(scales[options.notes]);
-    };
-
-    Chance.prototype.midi_note = function(options) {
-      var min = 0;
-      var max = 127;
-      options = initOptions(options, { min : min, max : max });
-      return this.integer({min: options.min, max: options.max});
-    };
-
-    Chance.prototype.chord_quality = function(options) {
-      options = initOptions(options, { jazz: true });
-      var chord_qualities = ['maj', 'min', 'aug', 'dim'];
-      if (options.jazz){
-        chord_qualities = [
-          'maj7',
-          'min7',
-          '7',
-          'sus',
-          'dim',
-          'ø'
-        ];
-      }
-      return this.pickone(chord_qualities);
-    };
-
-    Chance.prototype.chord = function (options) {
-      options = initOptions(options);
-      return this.note(options) + this.chord_quality(options);
-    };
-
-    Chance.prototype.tempo = function (options) {
-      var min = 40;
-      var max = 320;
-      options = initOptions(options, {min: min, max: max});
-      return this.integer({min: options.min, max: options.max});
-    };
-
-    // -- End Music
-
     // -- Miscellaneous --
 
-    // Coin - Flip, flip, flipadelphia
-    Chance.prototype.coin = function(options) {
-      return this.bool() ? "heads" : "tails";
-    };
-
     // Dice - For all the board game geeks out there, myself included ;)
     function diceFn (range) {
         return function () {
@@ -13087,21 +12879,6 @@ var chance_1 = createCommonjsModule(function (module, exports) {
 })();
 });
 
-var chance_2 = chance_1.Chance;
-
-/**
- * Try to merge all items in os with their successors.
- *
- * Some transformations (like delete) fragment items.
- * Item(c: 'ab') + Delete(1,1) + Delete(0, 1) -> Item(c: 'a',deleted);Item(c: 'b',deleted)
- *
- * This functions merges the fragmented nodes together:
- * Item(c: 'a',deleted);Item(c: 'b',deleted) -> Item(c: 'ab', deleted)
- *
- * TODO: The Tree implementation does not support deletions in-spot.
- *       This is why all deletions must be performed after the traversal.
- *
- */
 function defragmentItemContent (y) {
   const os = y.os;
   if (os.length < 2) {
@@ -13293,7 +13070,7 @@ async function flushAll (t, users) {
   if (users.length === 0) {
     return
   }
-  await wait(10);
+  await wait(0);
   if (users[0].connector.testRoom != null) {
     // use flushAll method specified in Test Connector
     await users[0].connector.testRoom.flushAll(users);
@@ -13380,7 +13157,7 @@ async function applyRandomTests (t, mods, iterations) {
   return initInformation
 }
 
-var index$1 = function (str) {
+var index$1$1 = function (str) {
 	return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
 		return '%' + c.charCodeAt(0).toString(16).toUpperCase();
 	});
@@ -13566,7 +13343,7 @@ function parserForArrayFormat(opts) {
 
 function encode(value, opts) {
 	if (opts.encode) {
-		return opts.strict ? index$1(value) : encodeURIComponent(value);
+		return opts.strict ? index$1$1(value) : encodeURIComponent(value);
 	}
 
 	return value;
@@ -13678,7 +13455,7 @@ var stringify = function (obj, opts) {
 	}).join('&') : '';
 };
 
-var index = {
+var index$2 = {
 	extract: extract,
 	parse: parse$1,
 	stringify: stringify
@@ -13693,7 +13470,7 @@ const browserSupport =
 
 function createTestLink (params) {
   if (typeof location !== 'undefined') {
-    var query = index.parse(location.search);
+    var query = index$2.parse(location.search);
     delete query.test;
     delete query.seed;
     delete query.args;
@@ -13703,7 +13480,7 @@ function createTestLink (params) {
         query[name] = params[name];
       }
     }
-    return location.protocol + '//' + location.host + location.pathname + '?' + index.stringify(query) + location.hash
+    return location.protocol + '//' + location.host + location.pathname + '?' + index$2.stringify(query) + location.hash
   }
 }
 
@@ -13714,7 +13491,7 @@ class TestHandler {
     this.repeatingRun = 0;
     this.tests = {};
     if (typeof location !== 'undefined') {
-      this.opts = index.parse(location.search);
+      this.opts = index$2.parse(location.search);
       if (this.opts.case != null) {
         this.opts.case = Number(this.opts.case);
       }
@@ -13855,7 +13632,7 @@ function createCommonjsModule$1(fn, module) {
 	return module = { exports: {} }, fn(module, module.exports), module.exports;
 }
 
-var isBrowser = typeof index !== 'undefined';
+var isBrowser = typeof index$2 !== 'undefined';
 
 var environment = {
 	isBrowser: isBrowser
@@ -15113,7 +14890,7 @@ patchFilter$3.filterName = 'texts';
 var textDeltaReverse = function(delta) {
   var i, l, lines, line, lineTmp, header = null,
     headerRegex = /^@@ +\-(\d+),(\d+) +\+(\d+),(\d+) +@@$/,
-    lineHeader;
+    lineHeader, lineAdd, lineRemove;
   lines = delta.split('\n');
   for (i = 0, l = lines.length; i < l; i++) {
     line = lines[i];
@@ -15121,8 +14898,13 @@ var textDeltaReverse = function(delta) {
     if (lineStart === '@') {
       header = headerRegex.exec(line);
       lineHeader = i;
+      lineAdd = null;
+      lineRemove = null;
+
+      // fix header
       lines[lineHeader] = '@@ -' + header[3] + ',' + header[4] + ' +' + header[1] + ',' + header[2] + ' @@';
     } else if (lineStart === '+') {
+      lineAdd = i;
       lines[i] = '-' + lines[i].slice(1);
       if (lines[i - 1].slice(0, 1) === '+') {
         // swap lines to keep default order (-+)
@@ -15131,6 +14913,7 @@ var textDeltaReverse = function(delta) {
         lines[i - 1] = lineTmp;
       }
     } else if (lineStart === '-') {
+      lineRemove = i;
       lines[i] = '+' + lines[i].slice(1);
     }
   }
@@ -15965,12 +15748,17 @@ class TestCase extends Logger {
 
 var stackframe = createCommonjsModule$1(function (module, exports) {
 (function(root, factory) {
+    'use strict';
+    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js, Rhino, and browsers.
+
+    /* istanbul ignore next */
     if (typeof undefined === 'function' && undefined.amd) {
         undefined('stackframe', [], factory);
     } else {
         module.exports = factory();
     }
 }(commonjsGlobal$1, function() {
+    'use strict';
     function _isNumber(n) {
         return !isNaN(parseFloat(n)) && isFinite(n);
     }
@@ -16072,12 +15860,18 @@ var stackframe = createCommonjsModule$1(function (module, exports) {
 
 var errorStackParser = createCommonjsModule$1(function (module, exports) {
 (function(root, factory) {
+    'use strict';
+    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js, Rhino, and browsers.
+
+    /* istanbul ignore next */
     if (typeof undefined === 'function' && undefined.amd) {
         undefined('error-stack-parser', ['stackframe'], factory);
     } else {
         module.exports = factory(stackframe);
     }
 }(commonjsGlobal$1, function ErrorStackParser(StackFrame) {
+    'use strict';
+
     var FIREFOX_SAFARI_STACK_REGEXP = /(^|@)\S+\:\d+/;
     var CHROME_IE_STACK_REGEXP = /^\s*at .*(\S+\:\d+|\(native\))/m;
     var SAFARI_NATIVE_CODE_REGEXP = /^(eval@)?(\[native code\])?$/;
@@ -16258,6 +16052,10 @@ var errorStackParser = createCommonjsModule$1(function (module, exports) {
 
 var stackGenerator = createCommonjsModule$1(function (module, exports) {
 (function(root, factory) {
+    'use strict';
+    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js, Rhino, and browsers.
+
+    /* istanbul ignore next */
     if (typeof undefined === 'function' && undefined.amd) {
         undefined('stack-generator', ['stackframe'], factory);
     } else {
@@ -18370,12 +18168,24 @@ var sourceMapConsumer = {
 
 var stacktraceGps = createCommonjsModule$1(function (module, exports) {
 (function(root, factory) {
+    'use strict';
+    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js, Rhino, and browsers.
+
+    /* istanbul ignore next */
     if (typeof undefined === 'function' && undefined.amd) {
         undefined('stacktrace-gps', ['source-map', 'stackframe'], factory);
     } else {
         module.exports = factory(sourceMapConsumer, stackframe);
     }
 }(commonjsGlobal$1, function(SourceMap, StackFrame) {
+    'use strict';
+
+    /**
+     * Make a X-Domain request to url and callback.
+     *
+     * @param {String} url
+     * @returns {Promise} with response text if fulfilled
+     */
     function _xdr(url) {
         return new Promise(function(resolve, reject) {
             var req = new XMLHttpRequest();
@@ -18404,8 +18214,8 @@ var stacktraceGps = createCommonjsModule$1(function (module, exports) {
      * @returns {String} original representation of the base64-encoded string.
      */
     function _atob(b64str) {
-        if (typeof index !== 'undefined' && index.atob) {
-            return index.atob(b64str);
+        if (typeof index$2 !== 'undefined' && index$2.atob) {
+            return index$2.atob(b64str);
         } else {
             throw new Error('You must supply a polyfill for window.atob in this environment');
         }
@@ -18693,6 +18503,10 @@ var stacktraceGps = createCommonjsModule$1(function (module, exports) {
 
 var stacktrace = createCommonjsModule$1(function (module, exports) {
 (function(root, factory) {
+    'use strict';
+    // Universal Module Definition (UMD) to support AMD, CommonJS/Node.js, Rhino, and browsers.
+
+    /* istanbul ignore next */
     if (typeof undefined === 'function' && undefined.amd) {
         undefined('stacktrace', ['error-stack-parser', 'stack-generator', 'stacktrace-gps'], factory);
     } else {
@@ -18915,7 +18729,7 @@ var stacktrace = createCommonjsModule$1(function (module, exports) {
 }));
 });
 
-index.stacktrace = stacktrace;
+index$2.stacktrace = stacktrace;
 
 function test (testDescription, ...args) {
   let location = stacktrace.getSync()[1];
@@ -18924,6 +18738,9 @@ function test (testDescription, ...args) {
   testHandler.register(testCase);
 }
 
+
+//# sourceMappingURL=cutest.mjs.map
+
 test('set property', async function xml0 (t) {
   var { users, xml0, xml1 } = await initArrays(t, { users: 2 });
   xml0.setAttribute('height', 10);