13.0.8

Rework UndoManager to support changes from other / multiple users
fix wrong type declaration in documentation. fixes #195
2020-05-13 19:29:51 +02:00 · 2020-05-13 19:28:30 +02:00 · 2020-05-11 11:10:38 +02:00 · 2020-05-11 01:46:51 +02:00 · 2020-05-11 01:45:27 +02:00 · 2020-05-08 14:50:53 +02:00
46 changed files with 2252 additions and 3362 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: dmonad
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -0,0 +1,31 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 13.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: npm ci
+    - run: npm run lint
+    - run: npm run test-extensive
+      env:
+        CI: true
--- a/README.md
+++ b/README.md
@@ -15,11 +15,15 @@ suited for even large documents.

 * Demos: [https://github.com/yjs/yjs-demos](https://github.com/yjs/yjs-demos)
 * Discuss: [https://discuss.yjs.dev](https://discuss.yjs.dev)
-* Benchmarks:
+* Benchmark Yjs vs. Automerge:
  [https://github.com/dmonad/crdt-benchmarks](https://github.com/dmonad/crdt-benchmarks)
+* Podcast [**"Yjs Deep Dive into real time collaborative editing solutions":**](https://www.tag1consulting.com/blog/deep-dive-real-time-collaborative-editing-solutions-tagteamtalk-001-0)
+* Podcast [**"Google Docs-style editing in Gutenberg with the YJS framework":**](https://publishpress.com/blog/yjs/)

-:warning: This is the documentation for v13 (still in alpha). For the stable v12
-release checkout the [v12 docs](./README.v12.md) :warning:
+:construction_worker_woman: If you are looking for professional (paid) support to
+build collaborative or distributed applications ping us at
+<yjs@tag1consulting.com>. Otherwise you can find help on our
+[discussion board](https://discuss.yjs.dev).

 ## Table of Contents

@@ -36,12 +40,6 @@ release checkout the [v12 docs](./README.v12.md) :warning:
 * [Miscellaneous](#Miscellaneous)
  * [Typescript Declarations](#Typescript-Declarations)
 * [Yjs CRDT Algorithm](#Yjs-CRDT-Algorithm)
-* [Evaluation](#Evaluation)
-  * [Existing shared editing libraries](#Exisisting-Javascript-Libraries)
-  * [CRDT Algorithms](#CRDT-Algorithms)
-  * [Comparison of CRDT with OT](#Comparing-CRDT-with-OT)
-  * [Comparison of CRDT Algorithms](#Comparing-CRDT-Algorithms)
-  * [Comparison of Yjs with other Implementations](#Comparing-Yjs-with-other-Implementations)
 * [License and Author](#License-and-Author)

 ## Overview
@@ -54,13 +52,10 @@ are implemented in separate modules.

 | Name | Cursors | Binding |  Demo |
 |---|:-:|---|---|
-| [ProseMirror](https://prosemirror.net/) &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; | ✔ | [y-prosemirror](http://github.com/yjs/y-prosemirror) | [demo](https://yjs-demos.now.sh/prosemirror/) |
-| [Quill](https://quilljs.com/) |  | [y-quill](http://github.com/yjs/y-quill) | [demo](https://yjs-demos.now.sh/quill/) |
-| [CodeMirror](https://codemirror.net/) | ✔ | [y-codemirror](http://github.com/yjs/y-codemirror) | [demo](https://yjs-demos.now.sh/codemirror/) |
-| [Monaco](https://microsoft.github.io/monaco-editor/) | ✔ | [y-monaco](http://github.com/yjs/y-monaco) | [demo](https://yjs-demos.now.sh/monaco/) |
-| [Ace](https://ace.c9.io/) | | [y-ace](http://github.com/yjs/y-ace) | [demo](https://yjs-demos.now.sh/ace/) |
-| [Textarea](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/textarea) | | [y-textarea](http://github.com/yjs/y-textarea) | [demo](https://yjs-demos.now.sh/textarea/) |
-| [DOM](https://developer.mozilla.org/en-US/docs/Web/API/Document_Object_Model) | | [y-dom](http://github.com/yjs/y-dom) | [demo](https://yjs-demos.now.sh/dom/) |
+| [ProseMirror](https://prosemirror.net/) &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; | ✔ | [y-prosemirror](http://github.com/yjs/y-prosemirror) | [demo](https://demos.yjs.dev/prosemirror/prosemirror.html) |
+| [Quill](https://quilljs.com/) | ✔ | [y-quill](http://github.com/yjs/y-quill) | [demo](https://demos.yjs.dev/quill/quill.html) |
+| [CodeMirror](https://codemirror.net/) | ✔ | [y-codemirror](http://github.com/yjs/y-codemirror) | [demo](https://demos.yjs.dev/codemirror/codemirror.html) |
+| [Monaco](https://microsoft.github.io/monaco-editor/) | ✔ | [y-monaco](http://github.com/yjs/y-monaco) | [demo](https://demos.yjs.dev/monaco/monaco.html) |

 ### Providers

@@ -70,18 +65,25 @@ manage all that for you and are the perfect starting point for your
 collaborative app.

 <dl>
+  <dt><a href="http://github.com/yjs/y-webrtc">y-webrtc</a></dt>
+  <dd>
+Propagates document updates peer-to-peer using WebRTC. The peers exchange
+signaling data over signaling servers. Publically available signaling servers
+are available. Communication over the signaling servers can be encrypted by
+providing a shared secret, keeping the connection information and the shared
+document private.
+  </dd>
  <dt><a href="http://github.com/yjs/y-websocket">y-websocket</a></dt>
  <dd>
 A module that contains a simple websocket backend and a websocket client that
 connects to that backend. The backend can be extended to persist updates in a
 leveldb database.
  </dd>
-  <dt><a href="http://github.com/yjs/y-mesh">y-mesh</a></dt>
+  <dt><a href="http://github.com/yjs/y-indexeddb">y-indexeddb</a></dt>
  <dd>
-[WIP] Creates a connected graph of webrtc connections with a high
-<a href="https://en.wikipedia.org/wiki/Strength_of_a_graph">strength</a>. It
-requires a signalling server that connects a client to the first peer. But after
-that the network manages itself. It is well suited for large and small networks.
+Efficiently persists document updates to the browsers indexeddb database.
+The document is immediately available and only diffs need to be synced through the
+network provider.
  </dd>
  <dt><a href="http://github.com/yjs/y-dat">y-dat</a></dt>
  <dd>
@@ -97,7 +99,7 @@ hypercores and y-dat listens to changes and applies them to the Yjs document.
 Install Yjs and a provider with your favorite package manager:

 ```sh
-npm i yjs@13.0.0-97 y-websocket@1.0.0-6
+npm i yjs y-websocket
 ```

 Start the y-websocket server:
@@ -235,7 +237,8 @@ or any of its children.
 Copies the <code>[key,value]</code> pairs of this YMap to a new Object.It
 transforms all child types to JSON using their <code>toJSON</code> method.
    </dd>
-    <b><code>forEach(function(key:string,value:object|boolean|Array|string|number|Uint8Array|Y.Type))</code></b>
+    <b><code>forEach(function(value:object|boolean|Array|string|number|Uint8Array|Y.Type,
+ key:string, map: Y.Map))</code></b>
    <dd>
      Execute the provided function once for every key-value pair.
    </dd>
@@ -343,7 +346,7 @@ or any of its children.
 </details>

 <details>
-  <summary><b>YXmlFragment</b></summary>
+  <summary><b>Y.XmlFragment</b></summary>
  <br>
  <p>
    A container that holds an Array of Y.XmlElements.
@@ -460,6 +463,12 @@ const doc = new Y.Doc()
 <dl>
  <b><code>clientID</code></b>
  <dd>A unique id that identifies this client. (readonly)</dd>
+  <b><code>gc</code></b>
+  <dd>
+Whether garbage collection is enabled on this doc instance. Set `doc.gc = false`
+in order to disable gc and be able to restore old content. See https://github.com/yjs/yjs#yjs-crdt-algorithm
+for more information about gc in Yjs.
+  </dd>
  <b><code>transact(function(Transaction):void [, origin:any])</code></b>
  <dd>
 Every change on the shared document happens in a transaction. Observer calls and
@@ -636,7 +645,7 @@ Yjs ships with an Undo/Redo manager for selective undo/redo of of changes on a
 Yjs type. The changes can be optionally scoped to transaction origins.

 ```js
-const ytext = doc.getArray('array')
+const ytext = doc.getText('text')
 const undoManager = new Y.UndoManager(ytext)

 ytext.insert(0, 'abc')
@@ -647,8 +656,8 @@ ytext.toString() // => 'abc'
 ```

 <dl>
-  <b><code>constructor(scope:Y.AbstractType|Array&lt;Y.AbstractType&gt;,
-  [[{captureTimeout:number,trackedOrigins:Set&lt;any&gt;,deleteFilter:function(item):boolean}]])</code></b>
+  <b><code>constructor(scope:Y.AbstractType|Array&lt;Y.AbstractType&gt;
+  [, {captureTimeout:number,trackedOrigins:Set&lt;any&gt;,deleteFilter:function(item):boolean}])</code></b>
  <dd>Accepts either single type as scope or an array of types.</dd>
  <b><code>undo()</code></b>
  <dd></dd>
@@ -670,7 +679,7 @@ undo- or the redo-stack.
    <code>
 on('stack-item-popped', { stackItem: { meta: Map&lt;any,any&gt; }, type: 'undo'
 | 'redo' })
-    </code>  
+    </code>
  </b>
  <dd>
 Register an event that is called when a <code>StackItem</code> is popped from
@@ -688,28 +697,30 @@ StackItem won't be merged.
 // without stopCapturing
 ytext.insert(0, 'a')
 ytext.insert(1, 'b')
-um.undo()
+undoManager.undo()
 ytext.toString() // => '' (note that 'ab' was removed)
 // with stopCapturing
 ytext.insert(0, 'a')
-um.stopCapturing()
+undoManager.stopCapturing()
 ytext.insert(0, 'b')
-um.undo()
+undoManager.undo()
 ytext.toString() // => 'a' (note that only 'b' was removed)
 ```

 #### Example: Specify tracked origins

 Every change on the shared document has an origin. If no origin was specified,
-it defaults to `null`. By specifying `trackedTransactionOrigins` you can
+it defaults to `null`. By specifying `trackedOrigins` you can
 selectively specify which changes should be tracked by `UndoManager`. The
-UndoManager instance is always added to `trackedTransactionOrigins`.
+UndoManager instance is always added to `trackedOrigins`.

 ```js
 class CustomBinding {}

-const ytext = doc.getArray('array')
-const undoManager = new Y.UndoManager(ytext, new Set([42, CustomBinding]))
+const ytext = doc.getText('text')
+const undoManager = new Y.UndoManager(ytext, {
+  trackedOrigins: new Set([42, CustomBinding])
+})

 ytext.insert(0, 'abc')
 undoManager.undo()
@@ -746,8 +757,10 @@ additional meta information like the cursor location or the view on the
 document. You can assign meta-information to Undo-/Redo-StackItems.

 ```js
-const ytext = doc.getArray('array')
-const undoManager = new Y.UndoManager(ytext, new Set([42, CustomBinding]))
+const ytext = doc.getText('text')
+const undoManager = new Y.UndoManager(ytext, {
+  trackedOrigins: new Set([42, CustomBinding])
+})

 undoManager.on('stack-item-added', event => {
  // save the current cursor location on the stack-item
--- a/README.v12.md
+++ b/README.v12.md
@@ -1,305 +0,0 @@
-
-# ![Yjs](https://user-images.githubusercontent.com/5553757/48975307-61efb100-f06d-11e8-9177-ee895e5916e5.png)
-
-Yjs is a framework for offline-first p2p shared editing on structured data like
-text, richtext, json, or XML. It is fairly easy to get started, as Yjs hides
-most of the complexity of concurrent editing. For additional information, demos,
-and tutorials visit [y-js.org](http://y-js.org/).
-
-:warning: Checkout the [v13 docs](./README.md) for the upcoming release :warning:
-
-### Extensions
-Yjs only knows how to resolve conflicts on shared data. You have to choose a ..
-
-* *Connector* - a communication protocol that propagates changes to the clients
-* *Database* - a database to store your changes
-* one or more *Types* - that represent the shared data
-
-Connectors, Databases, and Types are available as modules that extend Yjs. Here
-is a list of the modules we know of:
-
-##### Connectors
-
-|Name            | Description               |
-|----------------|-----------------------------------|
-|[webrtc](https://github.com/y-js/y-webrtc) | Propagate updates Browser2Browser via WebRTC|
-|[websockets](https://github.com/y-js/y-websockets-client) | Set up [a central server](https://github.com/y-js/y-websockets-client), and connect to it via websockets |
-|[xmpp](https://github.com/y-js/y-xmpp) | Propagate updates in a XMPP multi-user-chat room ([XEP-0045](http://xmpp.org/extensions/xep-0045.html))|
-|[ipfs](https://github.com/ipfs-labs/y-ipfs-connector) | Connector for the [Interplanetary File System](https://ipfs.io/)!|
-|[test](https://github.com/y-js/y-test) | A Connector for testing purposes. It is designed to simulate delays that happen in worst case scenarios|
-
-##### Database adapters
-
-|Name            | Description               |
-|----------------|-----------------------------------|
-|[memory](https://github.com/y-js/y-memory) | In-memory storage. |
-|[indexeddb](https://github.com/y-js/y-indexeddb) | Offline storage for the browser |
-|[leveldb](https://github.com/y-js/y-leveldb) | Persistent storage for node apps |
-
-##### Types
-
-| Name     | Description       |
-|----------|-------------------|
-|[map](https://github.com/y-js/y-map) | A shared Map implementation. Maps from text to any stringify-able object |
-|[array](https://github.com/y-js/y-array) | A shared Array implementation |
-|[xml](https://github.com/y-js/y-xml) | An implementation of the DOM. You can create a two way binding to Browser DOM objects |
-|[text](https://github.com/y-js/y-text) | Collaborate on text. Supports two way binding to the [Ace Editor](https://ace.c9.io), [CodeMirror](https://codemirror.net/), [Monaco](https://github.com/Microsoft/monaco-editor), textareas, input elements, and HTML elements (e.g. <*h1*>, or <*p*>) |
-|[richtext](https://github.com/y-js/y-richtext) | Collaborate on rich text. Supports two way binding to the [Quill Rich Text Editor](http://quilljs.com/)|
-
-##### Other
-
-| Name      | Description       |
-|-----------|-------------------|
-|[y-element](http://y-js.org/y-element/) | Yjs Polymer Element |
-
-## Use it!
-Install Yjs, and its modules with [bower](http://bower.io/), or
-[npm](https://www.npmjs.org/package/yjs).
-
-### Bower
-
-```
-bower install --save yjs y-array % add all y-* modules you want to use
-```
-You only need to include the `y.js` file. Yjs is able to automatically require
-missing modules.  
-```
-<script src="./bower_components/yjs/y.js"></script>
-```
-
-### CDN
-
-```
-<script src="https://cdn.jsdelivr.net/npm/yjs@12/dist/y.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-array@10/dist/y-array.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-websockets-client@8/dist/y-websockets-client.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-memory@8/dist/y-memory.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-map@10/dist/y-map.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/y-text@9/dist/y-text.js"></script>
-// ..
-// do the same for all modules you want to use
-```
-
-### Npm
-
-```
-npm install --save yjs % add all y-* modules you want to use
-```
-
-If you don't include via script tag, you have to explicitly include all modules!
-(Same goes for other module systems)
-```
-var Y = require('yjs')
-require('y-array')(Y) // add the y-array type to Yjs
-require('y-websockets-client')(Y)
-require('y-memory')(Y)
-require('y-map')(Y)
-require('y-text')(Y)
-// ..
-// do the same for all modules you want to use
-```
-
-### ES6 Syntax
-
-```
-import Y from 'yjs'
-import yArray from 'y-array'
-import yWebsocketsClient from 'y-webrtc'
-import yMemory from 'y-memory'
-import yMap from 'y-map'
-import yText from 'y-text'
-// ..
-Y.extend(yArray, yWebsocketsClient, yMemory, yArray, yMap, yText /*, .. */)
-```
-
-# Text editing example
-
-Install dependencies
-```
-bower i yjs y-memory y-webrtc y-array y-text
-```
-
-Here is a simple example of a shared textarea
-```HTML
-  <!DOCTYPE html>
-  <html>
-    <body>
-      <script src="./bower_components/yjs/y.js"></script>
-      <!-- Yjs automatically includes all missing dependencies (browser only) -->
-      <script>
-        Y({
-          db: {
-            name: 'memory' // use memory database adapter.
-            // name: 'indexeddb' // use indexeddb database adapter instead for offline apps
-          },
-          connector: {
-            name: 'webrtc', // use webrtc connector
-            // name: 'websockets-client'
-            // name: 'xmpp'
-            room: 'my-room' // clients connecting to the same room share data
-          },
-          sourceDir: './bower_components', // location of the y-* modules (browser only)
-          share: {
-            textarea: 'Text' // y.share.textarea is of type y-text
-          }
-        }).then(function (y) {
-          // The Yjs instance `y` is available
-          // y.share.* contains the shared types
-
-          // Bind `y.share.textarea` to `<textarea/>`
-          y.share.textarea.bind(document.querySelector('textarea'))
-        })
-      </script>
-      <textarea></textarea>
-    </body>
-  </html>
-```
-
-## Get Help & Give Help
-There are some friendly people on [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/y-js/yjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) who are eager to help, and answer questions. Please join!
-
-Report _any_ issues to the
-[Github issue page](https://github.com/y-js/yjs/issues)! I try to fix them very
-soon, if possible.
-
-# API
-
-### Y(options)
-* Y.extend(module1, module2, ..)
-  * Add extensions to Y
-  * `Y.extend(require('y-webrtc'))` has the same semantics as
-    `require('y-webrtc')(Y)`
-* options.db
-  * Will be forwarded to the database adapter. Specify the database adaper on
-    `options.db.name`.
-  * Have a look at the used database adapter repository to see all available
-    options.
-* options.connector
-  * Will be forwarded to the connector adapter. Specify the connector adaper on
-    `options.connector.name`.
-  * All our connectors implement a `room` property. Clients that specify the
-    same room share the same data.
-  * All of our connectors specify an `url` property that defines the connection
-    endpoint of the used connector.
-    * All of our connectors also have a default connection endpoint that you can
-      use for development.
-  * Set `options.connector.generateUserId = true` in order to genenerate a
-    userid, instead of receiving one from the server. This way the `Y(..)` is
-    immediately going to be resolved, without waiting for any confirmation from
-    the server. Use with caution.
-  * Have a look at the used connector repository to see all available options.
-  * *Only if you know what you are doing:* Set
-    `options.connector.preferUntransformed = true` in order receive the shared
-    data untransformed. This is very efficient as the database content is simply
-    copied to this client. This does only work if this client receives content
-    from only one client.
-* options.sourceDir (browser only)
-  * Path where all y-* modules are stored
-  * Defaults to `/bower_components`
-  * Not required when running on `nodejs` / `iojs`
-  * When using nodejs you need to manually extend Yjs:
-```
-var Y = require('yjs')
-// you have to require a db, connector, and *all* types you use!
-require('y-memory')(Y)
-require('y-webrtc')(Y)
-require('y-map')(Y)
-// ..
-```
-* options.share
-  * Specify on `options.share[arbitraryName]` types that are shared among all
-    users.
-  * E.g. Specify `options.share[arbitraryName] = 'Array'` to require y-array and
-    create an y-array type on `y.share[arbitraryName]`.
-  * If userA doesn't specify `options.share[arbitraryName]`, it won't be
-    available for userA.
-  * If userB specifies `options.share[arbitraryName]`, it still won't be
-    available for userA. But all the updates are send from userB to userA.
-  * In contrast to y-map, types on `y.share.*` cannot be overwritten or deleted.
-    Instead, they are merged among all users. This feature is only available on
-    `y.share.*`
-  * Weird behavior: It is supported that two users specify different types with
-    the same property name.
-     E.g. userA specifies `options.share.x = 'Array'`, and userB specifies
-     `options.share.x = 'Text'`. But they only share data if they specified the
-     same type with the same property name
-* options.type (browser only)
-  * Array of modules that Yjs needs to require, before instantiating a shared
-    type.
-  * By default Yjs requires the specified database adapter, the specified
-    connector, and all modules that are used in `options.share.*`
-  * Put all types here that you intend to use, but are not used in y.share.*
-
-### Instantiated Y object (y)
-`Y(options)` returns a promise that is fulfilled when..
-
-* All modules are loaded
-  * The specified database adapter is loaded
-  * The specified connector is loaded
-  * All types are included
-* The connector is initialized, and a unique user id is set (received from the
-  server)
-  * Note: When using y-indexeddb, a retrieved user id is stored on `localStorage`
-
-The promise returns an instance of Y. We denote it with a lower case `y`.
-
-* y.share.*
-  * Instances of the types you specified on options.share.*
-  * y.share.* can only be defined once when you instantiate Y!
-* y.connector is an instance of Y.AbstractConnector
-* y.connector.onUserEvent(function (event) {..})
-  * Observe user events (event.action is either 'userLeft' or 'userJoined')
-* y.connector.whenSynced(listener)
-  * `listener` is executed when y synced with at least one user.
-  * `listener` is not called when no other user is in the same room.
-  * y-websockets-client aways waits to sync with the server
-* y.connector.disconnect()
-  * Force to disconnect this instance from the other instances
-* y.connector.connect()
-  * Try to reconnect to the other instances (needs to be supported by the
-    connector)
-  * Not supported by y-xmpp
-* y.close()
-  * Destroy this object.
-  * Destroys all types (they will throw weird errors if you still use them)
-  * Disconnects from the other instances (via connector)
-  * Returns a promise
-* y.destroy()
-  * calls y.close()
-  * Removes all data from the database
-  * Returns a promise
-* y.db.stopGarbageCollector()
-  * Stop the garbage collector. Call y.db.garbageCollect() to continue garbage
-    collection
-* y.db.gc :: Boolean
-  * Whether gc is turned on
-* y.db.gcTimeout :: Number (defaults to 50000 ms)
-  * Time interval between two garbage collect cycles
-  * It is required that all instances exchanged all messages after two garbage
-    collect cycles (after 100000 ms per default)
-* y.db.userId :: String
-  * The used user id for this client. **Never overwrite this**
-
-### Logging
-Yjs uses [debug](https://github.com/visionmedia/debug) for logging. The flag
-`y*` enables logging for all y-* components. You can selectively remove
-components you are not interested in: E.g. The flag `y*,-y:connector-message`
-will not log the long `y:connector-message` messages.
-
-##### Enable logging in Node.js
-```sh
-DEBUG=y* node app.js
-```
-
-Remove the colors in order to log to a file:
-```sh
-DEBUG_COLORS=0 DEBUG=y* node app.js > log
-```
-
-##### Enable logging in the browser
-```js
-localStorage.debug = 'y*'
-```
-
-## License
-Yjs is licensed under the [MIT License](./LICENSE).
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,23 +1,23 @@
 {
  "name": "yjs",
-  "version": "13.0.0-99",
+  "version": "13.0.8",
  "description": "Shared Editing Library",
-  "main": "./dist/yjs.js",
+  "main": "./dist/yjs.cjs",
  "module": "./dist/yjs.mjs",
+  "types": "./dist/src/index.d.ts",
  "sideEffects": false,
  "scripts": {
-    "test": "npm run dist && PRODUCTION=1 node ./dist/tests.js --repitition-time 50 --production",
-    "test-exhaustive": "npm run lint && npm run dist && node ./dist/tests.js --repitition-time 10000",
-    "dist": "rm -rf dist && rollup -c",
+    "test": "npm run dist && node ./dist/tests.cjs --repitition-time 50",
+    "test-extensive": "npm run lint && npm run dist && node ./dist/tests.cjs --production --repitition-time 10000",
+    "dist": "rm -rf dist && rollup -c && tsc",
    "watch": "rollup -wc",
    "lint": "markdownlint README.md && standard && tsc",
    "docs": "rm -rf docs; jsdoc --configure ./.jsdoc.json --verbose --readme ./README.md --package ./package.json || true",
-    "serve-docs": "npm run docs && serve ./docs/",
-    "preversion": "npm run lint && PRODUCTION=1 npm run dist && npm run docs && node ./dist/tests.js --repitition-time 1000",
-    "postversion": "git push && git push --tags",
-    "debug": "concurrently 'live-server --port=3443 --entry-file=test.html' 'npm run watch'",
-    "trace-deopt": "clear && rollup -c  && node --trace-deopt dist/test.js",
-    "trace-opt": "clear && rollup -c  && node --trace-opt dist/test.js"
+    "serve-docs": "npm run docs && http-server ./docs/",
+    "preversion": "npm run lint && PRODUCTION=1 npm run dist && npm run docs && node ./dist/tests.cjs --repitition-time 1000",
+    "debug": "concurrently 'http-server -o test.html' 'npm run watch'",
+    "trace-deopt": "clear && rollup -c  && node --trace-deopt dist/test.cjs",
+    "trace-opt": "clear && rollup -c  && node --trace-opt dist/test.cjs"
  },
  "files": [
    "dist/*",
@@ -41,7 +41,12 @@
    "url": "https://github.com/yjs/yjs.git"
  },
  "keywords": [
-    "crdt"
+    "Yjs",
+    "CRDT",
+    "offline",
+    "shared editing",
+    "concurrency",
+    "collaboration"
  ],
  "author": "Kevin Jahns",
  "email": "kevin.jahns@protonmail.com",
@@ -51,18 +56,20 @@
  },
  "homepage": "https://yjs.dev",
  "dependencies": {
-    "lib0": "^0.1.1"
+    "lib0": "^0.2.26"
  },
  "devDependencies": {
+    "@rollup/plugin-commonjs": "^11.0.1",
+    "@rollup/plugin-node-resolve": "^7.0.0",
    "concurrently": "^3.6.1",
+    "http-server": "^0.12.1",
    "jsdoc": "^3.6.3",
-    "live-server": "^1.2.1",
-    "rollup": "^1.20.3",
+    "markdownlint-cli": "^0.19.0",
+    "rollup": "^1.30.0",
    "rollup-cli": "^1.0.9",
-    "rollup-plugin-node-resolve": "^4.2.4",
-    "standard": "^11.0.1",
+    "standard": "^14.0.0",
    "tui-jsdoc-template": "^1.2.2",
-    "typescript": "^3.6.2",
-    "y-protocols": "0.0.6"
+    "typescript": "^3.7.5",
+    "y-protocols": "^0.2.3"
  }
 }
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,4 +1,5 @@
-import nodeResolve from 'rollup-plugin-node-resolve'
+import nodeResolve from '@rollup/plugin-node-resolve'
+import commonjs from '@rollup/plugin-commonjs'

 const localImports = process.env.LOCALIMPORTS

@@ -37,23 +38,27 @@ const debugResolve = {

 export default [{
  input: './src/index.js',
-  output: [{
+  output: {
    name: 'Y',
-    file: 'dist/yjs.js',
+    file: 'dist/yjs.cjs',
    format: 'cjs',
    sourcemap: true,
    paths: path => {
      if (/^lib0\//.test(path)) {
-        return `lib0/dist/${path.slice(5)}`
+        return `lib0/dist/${path.slice(5, -3)}.cjs`
      }
      return path
    }
-  }, {
+  },
+  external: id => /^lib0\//.test(id)
+}, {
+  input: './src/index.js',
+  output: {
    name: 'Y',
    file: 'dist/yjs.mjs',
-    format: 'es',
+    format: 'esm',
    sourcemap: true
-  }],
+  },
  external: id => /^lib0\//.test(id)
 }, {
  input: './tests/index.js',
@@ -66,8 +71,24 @@ export default [{
  plugins: [
    debugResolve,
    nodeResolve({
-      sourcemap: true,
      mainFields: ['module', 'browser', 'main']
-    })
+    }),
+    commonjs()
  ]
+}, {
+  input: './tests/index.js',
+  output: {
+    name: 'test',
+    file: 'dist/tests.cjs',
+    format: 'cjs',
+    sourcemap: true
+  },
+  plugins: [
+    debugResolve,
+    nodeResolve({
+      mainFields: ['module', 'main']
+    }),
+    commonjs()
+  ],
+  external: ['isomorphic.js']
 }]
--- a/src/index.js
+++ b/src/index.js
@@ -26,6 +26,7 @@ export {
  ContentType,
  AbstractType,
  RelativePosition,
+  getTypeChildren,
  createRelativePositionFromTypeIndex,
  createRelativePositionFromJSON,
  createAbsolutePositionFromRelativePosition,
@@ -47,12 +48,16 @@ export {
  typeMapGetSnapshot,
  iterateDeletedStructs,
  applyUpdate,
+  readUpdate,
  encodeStateAsUpdate,
  encodeStateVector,
  UndoManager,
  decodeSnapshot,
  encodeSnapshot,
  isDeleted,
+  isParentOf,
  equalSnapshots,
-  PermanentUserData // @TODO experimental
+  PermanentUserData, // @TODO experimental
+  tryGc,
+  transact
 } from './internals.js'
--- a/src/structs/AbstractStruct.js
+++ b/src/structs/AbstractStruct.js
@@ -6,9 +6,6 @@ import {
 import * as encoding from 'lib0/encoding.js' // eslint-disable-line
 import * as error from 'lib0/error.js'

-/**
- * @private
- */
 export class AbstractStruct {
  /**
   * @param {ID} id
@@ -24,6 +21,7 @@ export class AbstractStruct {
    this.length = length
    this.deleted = false
  }
+
  /**
   * Merge this struct with the item to the right.
   * This method is already assuming that `this.id.clock + this.length === this.id.clock`.
@@ -34,15 +32,16 @@ export class AbstractStruct {
  mergeWith (right) {
    return false
  }
+
  /**
   * @param {encoding.Encoder} encoder The encoder to write data to.
   * @param {number} offset
   * @param {number} encodingRef
-   * @private
   */
  write (encoder, offset, encodingRef) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {Transaction} transaction
   */
@@ -51,9 +50,6 @@ export class AbstractStruct {
  }
 }

-/**
- * @private
- */
 export class AbstractStructRef {
  /**
   * @param {ID} id
@@ -69,6 +65,7 @@ export class AbstractStructRef {
     */
    this.id = id
  }
+
  /**
   * @param {Transaction} transaction
   * @return {Array<ID|null>}
@@ -76,6 +73,7 @@ export class AbstractStructRef {
  getMissing (transaction) {
    return this._missing
  }
+
  /**
   * @param {Transaction} transaction
   * @param {StructStore} store
--- a/src/structs/ContentAny.js
+++ b/src/structs/ContentAny.js
@@ -5,9 +5,6 @@ import {
 import * as encoding from 'lib0/encoding.js'
 import * as decoding from 'lib0/decoding.js'

-/**
- * @private
- */
 export class ContentAny {
  /**
   * @param {Array<any>} arr
@@ -18,30 +15,35 @@ export class ContentAny {
     */
    this.arr = arr
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return this.arr.length
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return this.arr
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return true
  }
+
  /**
   * @return {ContentAny}
   */
  copy () {
    return new ContentAny(this.arr)
  }
+
  /**
   * @param {number} offset
   * @return {ContentAny}
@@ -51,6 +53,7 @@ export class ContentAny {
    this.arr = this.arr.slice(0, offset)
    return right
  }
+
  /**
   * @param {ContentAny} right
   * @return {boolean}
@@ -59,6 +62,7 @@ export class ContentAny {
    this.arr = this.arr.concat(right.arr)
    return true
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -84,6 +88,7 @@ export class ContentAny {
      encoding.writeAny(encoder, c)
    }
  }
+
  /**
   * @return {number}
   */
@@ -93,8 +98,6 @@ export class ContentAny {
 }

 /**
- * @private
- *
 * @param {decoding.Decoder} decoder
 * @return {ContentAny}
 */
--- a/src/structs/ContentBinary.js
+++ b/src/structs/ContentBinary.js
@@ -7,9 +7,6 @@ import * as decoding from 'lib0/decoding.js'
 import * as buffer from 'lib0/buffer.js'
 import * as error from 'lib0/error.js'

-/**
- * @private
- */
 export class ContentBinary {
  /**
   * @param {Uint8Array} content
@@ -17,30 +14,35 @@ export class ContentBinary {
  constructor (content) {
    this.content = content
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return 1
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return [this.content]
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return true
  }
+
  /**
   * @return {ContentBinary}
   */
  copy () {
    return new ContentBinary(this.content)
  }
+
  /**
   * @param {number} offset
   * @return {ContentBinary}
@@ -48,6 +50,7 @@ export class ContentBinary {
  splice (offset) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {ContentBinary} right
   * @return {boolean}
@@ -55,6 +58,7 @@ export class ContentBinary {
  mergeWith (right) {
    return false
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -75,6 +79,7 @@ export class ContentBinary {
  write (encoder, offset) {
    encoding.writeVarUint8Array(encoder, this.content)
  }
+
  /**
   * @return {number}
   */
@@ -84,8 +89,6 @@ export class ContentBinary {
 }

 /**
- * @private
- *
 * @param {decoding.Decoder} decoder
 * @return {ContentBinary}
 */
--- a/src/structs/ContentDeleted.js
+++ b/src/structs/ContentDeleted.js
@@ -7,9 +7,6 @@ import {
 import * as encoding from 'lib0/encoding.js'
 import * as decoding from 'lib0/decoding.js'

-/**
- * @private
- */
 export class ContentDeleted {
  /**
   * @param {number} len
@@ -17,30 +14,35 @@ export class ContentDeleted {
  constructor (len) {
    this.len = len
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return this.len
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return []
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return false
  }
+
  /**
   * @return {ContentDeleted}
   */
  copy () {
    return new ContentDeleted(this.len)
  }
+
  /**
   * @param {number} offset
   * @return {ContentDeleted}
@@ -50,6 +52,7 @@ export class ContentDeleted {
    this.len = offset
    return right
  }
+
  /**
   * @param {ContentDeleted} right
   * @return {boolean}
@@ -58,6 +61,7 @@ export class ContentDeleted {
    this.len += right.len
    return true
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -66,6 +70,7 @@ export class ContentDeleted {
    addToDeleteSet(transaction.deleteSet, item.id, this.len)
    item.deleted = true
  }
+
  /**
   * @param {Transaction} transaction
   */
@@ -81,6 +86,7 @@ export class ContentDeleted {
  write (encoder, offset) {
    encoding.writeVarUint(encoder, this.len - offset)
  }
+
  /**
   * @return {number}
   */
--- a/src/structs/ContentEmbed.js
+++ b/src/structs/ContentEmbed.js
@@ -17,30 +17,35 @@ export class ContentEmbed {
  constructor (embed) {
    this.embed = embed
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return 1
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return [this.embed]
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return true
  }
+
  /**
   * @return {ContentEmbed}
   */
  copy () {
    return new ContentEmbed(this.embed)
  }
+
  /**
   * @param {number} offset
   * @return {ContentEmbed}
@@ -48,6 +53,7 @@ export class ContentEmbed {
  splice (offset) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {ContentEmbed} right
   * @return {boolean}
@@ -55,6 +61,7 @@ export class ContentEmbed {
  mergeWith (right) {
    return false
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -75,6 +82,7 @@ export class ContentEmbed {
  write (encoder, offset) {
    encoding.writeVarString(encoder, JSON.stringify(this.embed))
  }
+
  /**
   * @return {number}
   */
--- a/src/structs/ContentFormat.js
+++ b/src/structs/ContentFormat.js
@@ -19,30 +19,35 @@ export class ContentFormat {
    this.key = key
    this.value = value
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return 1
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return []
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return false
  }
+
  /**
   * @return {ContentFormat}
   */
  copy () {
    return new ContentFormat(this.key, this.value)
  }
+
  /**
   * @param {number} offset
   * @return {ContentFormat}
@@ -50,6 +55,7 @@ export class ContentFormat {
  splice (offset) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {ContentFormat} right
   * @return {boolean}
@@ -57,6 +63,7 @@ export class ContentFormat {
  mergeWith (right) {
    return false
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -78,6 +85,7 @@ export class ContentFormat {
    encoding.writeVarString(encoder, this.key)
    encoding.writeVarString(encoder, JSON.stringify(this.value))
  }
+
  /**
   * @return {number}
   */
@@ -87,8 +95,6 @@ export class ContentFormat {
 }

 /**
- * @private
- *
 * @param {decoding.Decoder} decoder
 * @return {ContentFormat}
 */
--- a/src/structs/ContentJSON.js
+++ b/src/structs/ContentJSON.js
@@ -18,30 +18,35 @@ export class ContentJSON {
     */
    this.arr = arr
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return this.arr.length
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return this.arr
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return true
  }
+
  /**
   * @return {ContentJSON}
   */
  copy () {
    return new ContentJSON(this.arr)
  }
+
  /**
   * @param {number} offset
   * @return {ContentJSON}
@@ -51,6 +56,7 @@ export class ContentJSON {
    this.arr = this.arr.slice(0, offset)
    return right
  }
+
  /**
   * @param {ContentJSON} right
   * @return {boolean}
@@ -59,6 +65,7 @@ export class ContentJSON {
    this.arr = this.arr.concat(right.arr)
    return true
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -84,6 +91,7 @@ export class ContentJSON {
      encoding.writeVarString(encoder, c === undefined ? 'undefined' : JSON.stringify(c))
    }
  }
+
  /**
   * @return {number}
   */
--- a/src/structs/ContentString.js
+++ b/src/structs/ContentString.js
@@ -18,30 +18,35 @@ export class ContentString {
     */
    this.str = str
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return this.str.length
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return this.str.split('')
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return true
  }
+
  /**
   * @return {ContentString}
   */
  copy () {
    return new ContentString(this.str)
  }
+
  /**
   * @param {number} offset
   * @return {ContentString}
@@ -51,6 +56,7 @@ export class ContentString {
    this.str = this.str.slice(0, offset)
    return right
  }
+
  /**
   * @param {ContentString} right
   * @return {boolean}
@@ -59,6 +65,7 @@ export class ContentString {
    this.str += right.str
    return true
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -79,6 +86,7 @@ export class ContentString {
  write (encoder, offset) {
    encoding.writeVarString(encoder, offset === 0 ? this.str : this.str.slice(offset))
  }
+
  /**
   * @return {number}
   */
--- a/src/structs/ContentType.js
+++ b/src/structs/ContentType.js
@@ -49,30 +49,35 @@ export class ContentType {
     */
    this.type = type
  }
+
  /**
   * @return {number}
   */
  getLength () {
    return 1
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    return [this.type]
  }
+
  /**
   * @return {boolean}
   */
  isCountable () {
    return true
  }
+
  /**
   * @return {ContentType}
   */
  copy () {
    return new ContentType(this.type._copy())
  }
+
  /**
   * @param {number} offset
   * @return {ContentType}
@@ -80,6 +85,7 @@ export class ContentType {
  splice (offset) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {ContentType} right
   * @return {boolean}
@@ -87,6 +93,7 @@ export class ContentType {
  mergeWith (right) {
    return false
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -94,6 +101,7 @@ export class ContentType {
  integrate (transaction, item) {
    this.type._integrate(transaction.doc, item)
  }
+
  /**
   * @param {Transaction} transaction
   */
@@ -121,6 +129,7 @@ export class ContentType {
    })
    transaction.changed.delete(this.type)
  }
+
  /**
   * @param {StructStore} store
   */
@@ -139,6 +148,7 @@ export class ContentType {
    })
    this.type._map = new Map()
  }
+
  /**
   * @param {encoding.Encoder} encoder
   * @param {number} offset
@@ -146,6 +156,7 @@ export class ContentType {
  write (encoder, offset) {
    this.type._write(encoder)
  }
+
  /**
   * @return {number}
   */
--- a/src/structs/GC.js
+++ b/src/structs/GC.js
@@ -69,6 +69,7 @@ export class GCRef extends AbstractStructRef {
     */
    this.length = decoding.readVarUint(decoder)
  }
+
  /**
   * @param {Transaction} transaction
   * @param {StructStore} store
--- a/src/structs/Item.js
+++ b/src/structs/Item.js
@@ -35,6 +35,8 @@ import * as set from 'lib0/set.js'
 import * as binary from 'lib0/binary.js'

 /**
+ * @todo This should return several items
+ *
 * @param {StructStore} store
 * @param {ID} id
 * @return {{item:Item, diff:number}}
@@ -53,7 +55,7 @@ export const followRedone = (store, id) => {
    item = getItem(store, nextID)
    diff = nextID.clock - item.id.clock
    nextID = item.redone
-  } while (nextID !== null)
+  } while (nextID !== null && item instanceof Item)
  return {
    item, diff
  }
@@ -66,10 +68,11 @@ export const followRedone = (store, id) => {
 * sending it to other peers
 *
 * @param {Item|null} item
+ * @param {boolean} keep
 */
-export const keepItem = item => {
-  while (item !== null && !item.keep) {
-    item.keep = true
+export const keepItem = (item, keep) => {
+  while (item !== null && item.keep !== keep) {
+    item.keep = keep
    item = item.parent._item
  }
 }
@@ -218,7 +221,7 @@ export const redoItem = (transaction, item, redoitems) => {
    item.content.copy()
  )
  item.redone = redoneItem.id
-  keepItem(redoneItem)
+  keepItem(redoneItem, true)
  redoneItem.integrate(transaction)
  return redoneItem
 }
@@ -301,7 +304,6 @@ export class Item extends AbstractStruct {

  /**
   * @param {Transaction} transaction
-   * @private
   */
  integrate (transaction) {
    const store = transaction.doc.store
@@ -400,7 +402,6 @@ export class Item extends AbstractStruct {

  /**
   * Returns the next non-deleted item
-   * @private
   */
  get next () {
    let n = this.right
@@ -412,7 +413,6 @@ export class Item extends AbstractStruct {

  /**
   * Returns the previous non-deleted item
-   * @private
   */
  get prev () {
    let n = this.left
@@ -428,6 +428,7 @@ export class Item extends AbstractStruct {
  get lastId () {
    return createID(this.id.client, this.id.clock + this.length - 1)
  }
+
  /**
   * Try to merge two items
   *
@@ -482,8 +483,6 @@ export class Item extends AbstractStruct {
  /**
   * @param {StructStore} store
   * @param {boolean} parentGCd
-   *
-   * @private
   */
  gc (store, parentGCd) {
    if (!this.deleted) {
@@ -505,8 +504,6 @@ export class Item extends AbstractStruct {
   *
   * @param {encoding.Encoder} encoder The encoder to write data to.
   * @param {number} offset
-   *
-   * @private
   */
  write (encoder, offset) {
    const origin = offset > 0 ? createID(this.id.client, this.id.clock + offset - 1) : this.origin
@@ -576,12 +573,14 @@ export class AbstractContent {
  getLength () {
    throw error.methodUnimplemented()
  }
+
  /**
   * @return {Array<any>}
   */
  getContent () {
    throw error.methodUnimplemented()
  }
+
  /**
   * Should return false if this Item is some kind of meta information
   * (e.g. format information).
@@ -594,12 +593,14 @@ export class AbstractContent {
  isCountable () {
    throw error.methodUnimplemented()
  }
+
  /**
   * @return {AbstractContent}
   */
  copy () {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {number} offset
   * @return {AbstractContent}
@@ -607,6 +608,7 @@ export class AbstractContent {
  splice (offset) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {AbstractContent} right
   * @return {boolean}
@@ -614,6 +616,7 @@ export class AbstractContent {
  mergeWith (right) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {Transaction} transaction
   * @param {Item} item
@@ -621,18 +624,21 @@ export class AbstractContent {
  integrate (transaction, item) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {Transaction} transaction
   */
  delete (transaction) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {StructStore} store
   */
  gc (store) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @param {encoding.Encoder} encoder
   * @param {number} offset
@@ -640,6 +646,7 @@ export class AbstractContent {
  write (encoder, offset) {
    throw error.methodUnimplemented()
  }
+
  /**
   * @return {number}
   */
@@ -707,6 +714,7 @@ export class ItemRef extends AbstractStructRef {
    this.content = readItemContent(decoder, info)
    this.length = this.content.getLength()
  }
+
  /**
   * @param {Transaction} transaction
   * @param {StructStore} store
--- a/src/types/AbstractType.js
+++ b/src/types/AbstractType.js
@@ -19,10 +19,25 @@ import * as iterator from 'lib0/iterator.js'
 import * as error from 'lib0/error.js'
 import * as encoding from 'lib0/encoding.js' // eslint-disable-line

+/**
+ * Accumulate all (list) children of a type and return them as an Array.
+ *
+ * @param {AbstractType<any>} t
+ * @return {Array<Item>}
+ */
+export const getTypeChildren = t => {
+  let s = t._start
+  const arr = []
+  while (s) {
+    arr.push(s)
+    s = s.right
+  }
+  return arr
+}
+
 /**
 * Call event listeners with an event. This will also add an event to all
 * parents (for `.observeDeep` handlers).
- * @private
 *
 * @template EventType
 * @param {AbstractType<EventType>} type
@@ -30,7 +45,7 @@ import * as encoding from 'lib0/encoding.js' // eslint-disable-line
 * @param {EventType} event
 */
 export const callTypeObservers = (type, transaction, event) => {
-  callEventHandlerListeners(type._eH, event, transaction)
+  const changedType = type
  const changedParentTypes = transaction.changedParentTypes
  while (true) {
    // @ts-ignore
@@ -40,6 +55,7 @@ export const callTypeObservers = (type, transaction, event) => {
    }
    type = type._item.parent
  }
+  callEventHandlerListeners(changedType._eH, event, transaction)
 }

 /**
@@ -53,17 +69,14 @@ export class AbstractType {
     */
    this._item = null
    /**
-     * @private
     * @type {Map<string,Item>}
     */
    this._map = new Map()
    /**
-     * @private
     * @type {Item|null}
     */
    this._start = null
    /**
-     * @private
     * @type {Doc|null}
     */
    this.doc = null
@@ -89,7 +102,6 @@ export class AbstractType {
   *
   * @param {Doc} y The Yjs instance
   * @param {Item|null} item
-   * @private
   */
  _integrate (y, item) {
    this.doc = y
@@ -98,7 +110,6 @@ export class AbstractType {

  /**
   * @return {AbstractType<EventType>}
-   * @private
   */
  _copy () {
    throw error.methodUnimplemented()
@@ -106,7 +117,6 @@ export class AbstractType {

  /**
   * @param {encoding.Encoder} encoder
-   * @private
   */
  _write (encoder) { }

@@ -127,8 +137,6 @@ export class AbstractType {
   *
   * @param {Transaction} transaction
   * @param {Set<null|string>} parentSubs Keys changed on this type. `null` if list was modified.
-   *
-   * @private
   */
  _callObserver (transaction, parentSubs) { /* skip if no type is specified */ }

@@ -170,7 +178,7 @@ export class AbstractType {

  /**
   * @abstract
-   * @return {Object | Array | number | string}
+   * @return {any}
   */
  toJSON () {}
 }
@@ -369,7 +377,7 @@ export const typeListInsertGenericsAfter = (transaction, parent, referenceItem,
  let left = referenceItem
  const right = referenceItem === null ? parent._start : referenceItem.right
  /**
-   * @type {Array<Object|Array|number>}
+   * @type {Array<Object|Array<any>|number>}
   */
  let jsonContent = []
  const packJsonContent = () => {
@@ -514,7 +522,7 @@ export const typeMapSet = (transaction, parent, key, value) => {
        content = new ContentAny([value])
        break
      case Uint8Array:
-        content = new ContentBinary(value)
+        content = new ContentBinary(/** @type {Uint8Array} */ (value))
        break
      default:
        if (value instanceof AbstractType) {
@@ -551,7 +559,7 @@ export const typeMapGetAll = (parent) => {
  /**
   * @type {Object<string,any>}
   */
-  let res = {}
+  const res = {}
  for (const [key, value] of parent._map) {
    if (!value.deleted) {
      res[key] = value.content.getContent()[value.length - 1]
--- a/src/types/YArray.js
+++ b/src/types/YArray.js
@@ -51,6 +51,7 @@ export class YArray extends AbstractType {
     */
    this._prelimContent = []
  }
+
  /**
   * Integrate this type into the Yjs instance.
   *
@@ -60,12 +61,10 @@ export class YArray extends AbstractType {
   *
   * @param {Doc} y The Yjs instance
   * @param {Item} item
-   *
-   * @private
   */
  _integrate (y, item) {
    super._integrate(y, item)
-    this.insert(0, /** @type {Array} */ (this._prelimContent))
+    this.insert(0, /** @type {Array<any>} */ (this._prelimContent))
    this._prelimContent = null
  }

@@ -76,13 +75,12 @@ export class YArray extends AbstractType {
  get length () {
    return this._prelimContent === null ? this._length : this._prelimContent.length
  }
+
  /**
   * Creates YArrayEvent and calls observers.
   *
   * @param {Transaction} transaction
   * @param {Set<null|string>} parentSubs Keys changed on this type. `null` if list was modified.
-   *
-   * @private
   */
  _callObserver (transaction, parentSubs) {
    callTypeObservers(this, transaction, new YArrayEvent(this, transaction))
@@ -110,7 +108,7 @@ export class YArray extends AbstractType {
        typeListInsertGenerics(transaction, this, index, content)
      })
    } else {
-      /** @type {Array} */ (this._prelimContent).splice(index, 0, ...content)
+      /** @type {Array<any>} */ (this._prelimContent).splice(index, 0, ...content)
    }
  }

@@ -135,7 +133,7 @@ export class YArray extends AbstractType {
        typeListDelete(transaction, this, index, length)
      })
    } else {
-      /** @type {Array} */ (this._prelimContent).splice(index, length)
+      /** @type {Array<any>} */ (this._prelimContent).splice(index, length)
    }
  }

@@ -198,7 +196,6 @@ export class YArray extends AbstractType {

  /**
   * @param {encoding.Encoder} encoder
-   * @private
   */
  _write (encoder) {
    encoding.writeVarUint(encoder, YArrayRefID)
--- a/src/types/YMap.js
+++ b/src/types/YMap.js
@@ -53,6 +53,7 @@ export class YMap extends AbstractType {
     */
    this._prelimContent = new Map()
  }
+
  /**
   * Integrate this type into the Yjs instance.
   *
@@ -62,12 +63,10 @@ export class YMap extends AbstractType {
   *
   * @param {Doc} y The Yjs instance
   * @param {Item} item
-   *
-   * @private
   */
  _integrate (y, item) {
    super._integrate(y, item)
-    for (let [key, value] of /** @type {Map<string, any>} */ (this._prelimContent)) {
+    for (const [key, value] of /** @type {Map<string, any>} */ (this._prelimContent)) {
      this.set(key, value)
    }
    this._prelimContent = null
@@ -82,8 +81,6 @@ export class YMap extends AbstractType {
   *
   * @param {Transaction} transaction
   * @param {Set<null|string>} parentSubs Keys changed on this type. `null` if list was modified.
-   *
-   * @private
   */
  _callObserver (transaction, parentSubs) {
    callTypeObservers(this, transaction, new YMapEvent(this, transaction, parentSubs))
@@ -99,7 +96,7 @@ export class YMap extends AbstractType {
     * @type {Object<string,T>}
     */
    const map = {}
-    for (let [key, item] of this._map) {
+    for (const [key, item] of this._map) {
      if (!item.deleted) {
        const v = item.content.getContent()[item.length - 1]
        map[key] = v instanceof AbstractType ? v.toJSON() : v
@@ -145,7 +142,7 @@ export class YMap extends AbstractType {
     * @type {Object<string,T>}
     */
    const map = {}
-    for (let [key, item] of this._map) {
+    for (const [key, item] of this._map) {
      if (!item.deleted) {
        f(item.content.getContent()[item.length - 1], key, this)
      }
@@ -214,8 +211,6 @@ export class YMap extends AbstractType {

  /**
   * @param {encoding.Encoder} encoder
-   *
-   * @private
   */
  _write (encoder) {
    encoding.writeVarUint(encoder, YMapRefID)
--- a/src/types/YText.js
+++ b/src/types/YText.js
@@ -14,15 +14,19 @@ import {
  callTypeObservers,
  transact,
  ContentEmbed,
+  GC,
  ContentFormat,
  ContentString,
  splitSnapshotAffectedStructs,
+  iterateDeletedStructs,
+  iterateStructs,
  ID, Doc, Item, Snapshot, Transaction // eslint-disable-line
 } from '../internals.js'

 import * as decoding from 'lib0/decoding.js' // eslint-disable-line
 import * as encoding from 'lib0/encoding.js'
 import * as object from 'lib0/object.js'
+import * as map from 'lib0/map.js'

 /**
 * @param {any} a
@@ -112,10 +116,9 @@ const findNextPosition = (transaction, currentAttributes, left, right, count) =>
 * @function
 */
 const findPosition = (transaction, parent, index) => {
-  let currentAttributes = new Map()
-  let left = null
-  let right = parent._start
-  return findNextPosition(transaction, currentAttributes, left, right, index)
+  const currentAttributes = new Map()
+  const right = parent._start
+  return findNextPosition(transaction, currentAttributes, null, right, index)
 }

 /**
@@ -147,7 +150,7 @@ const insertNegatedAttributes = (transaction, parent, left, right, negatedAttrib
    left = right
    right = right.right
  }
-  for (let [key, val] of negatedAttributes) {
+  for (const [key, val] of negatedAttributes) {
    left = new Item(nextID(transaction), left, left === null ? null : left.lastId, right, right === null ? null : right.id, parent, null, new ContentFormat(key, val))
    left.integrate(transaction)
  }
@@ -214,7 +217,7 @@ const minimizeAttributeChanges = (left, right, currentAttributes, attributes) =>
 const insertAttributes = (transaction, parent, left, right, currentAttributes, attributes) => {
  const negatedAttributes = new Map()
  // insert format-start items
-  for (let key in attributes) {
+  for (const key in attributes) {
    const val = attributes[key]
    const currentVal = currentAttributes.get(key) || null
    if (!equalAttrs(currentVal, val)) {
@@ -241,7 +244,7 @@ const insertAttributes = (transaction, parent, left, right, currentAttributes, a
 * @function
 **/
 const insertText = (transaction, parent, left, right, currentAttributes, text, attributes) => {
-  for (let [key] of currentAttributes) {
+  for (const [key] of currentAttributes) {
    if (attributes[key] === undefined) {
      attributes[key] = null
    }
@@ -251,7 +254,7 @@ const insertText = (transaction, parent, left, right, currentAttributes, text, a
  left = insertPos.left
  right = insertPos.right
  // insert content
-  const content = text.constructor === String ? new ContentString(text) : new ContentEmbed(text)
+  const content = text.constructor === String ? new ContentString(/** @type {string} */ (text)) : new ContentEmbed(text)
  left = new Item(nextID(transaction), left, left === null ? null : left.lastId, right, right === null ? null : right.id, parent, null, content)
  left.integrate(transaction)
  return insertNegatedAttributes(transaction, parent, left, insertPos.right, insertPos.negatedAttributes)
@@ -281,7 +284,7 @@ const formatText = (transaction, parent, left, right, currentAttributes, length,
  while (length > 0 && right !== null) {
    if (!right.deleted) {
      switch (right.content.constructor) {
-        case ContentFormat:
+        case ContentFormat: {
          const { key, value } = /** @type {ContentFormat} */ (right.content)
          const attr = attributes[key]
          if (attr !== undefined) {
@@ -294,6 +297,7 @@ const formatText = (transaction, parent, left, right, currentAttributes, length,
          }
          updateCurrentAttributes(currentAttributes, /** @type {ContentFormat} */ (right.content))
          break
+        }
        case ContentEmbed:
        case ContentString:
          if (length < right.length) {
@@ -320,6 +324,110 @@ const formatText = (transaction, parent, left, right, currentAttributes, length,
  return insertNegatedAttributes(transaction, parent, left, right, negatedAttributes)
 }

+/**
+ * Call this function after string content has been deleted in order to
+ * clean up formatting Items.
+ *
+ * @param {Transaction} transaction
+ * @param {Item} start
+ * @param {Item|null} end exclusive end, automatically iterates to the next Content Item
+ * @param {Map<string,any>} startAttributes
+ * @param {Map<string,any>} endAttributes This attribute is modified!
+ * @return {number} The amount of formatting Items deleted.
+ *
+ * @function
+ */
+const cleanupFormattingGap = (transaction, start, end, startAttributes, endAttributes) => {
+  while (end && end.content.constructor !== ContentString && end.content.constructor !== ContentEmbed) {
+    if (!end.deleted && end.content.constructor === ContentFormat) {
+      updateCurrentAttributes(endAttributes, /** @type {ContentFormat} */ (end.content))
+    }
+    end = end.right
+  }
+  let cleanups = 0
+  while (start !== end) {
+    if (!start.deleted) {
+      const content = start.content
+      switch (content.constructor) {
+        case ContentFormat: {
+          const { key, value } = /** @type {ContentFormat} */ (content)
+          if ((endAttributes.get(key) || null) !== value || (startAttributes.get(key) || null) === value) {
+            // Either this format is overwritten or it is not necessary because the attribute already existed.
+            start.delete(transaction)
+            cleanups++
+          }
+          break
+        }
+      }
+    }
+    start = /** @type {Item} */ (start.right)
+  }
+  return cleanups
+}
+
+/**
+ * @param {Transaction} transaction
+ * @param {Item | null} item
+ */
+const cleanupContextlessFormattingGap = (transaction, item) => {
+  // iterate until item.right is null or content
+  while (item && item.right && (item.right.deleted || (item.right.content.constructor !== ContentString && item.right.content.constructor !== ContentEmbed))) {
+    item = item.right
+  }
+  const attrs = new Set()
+  // iterate back until a content item is found
+  while (item && (item.deleted || (item.content.constructor !== ContentString && item.content.constructor !== ContentEmbed))) {
+    if (!item.deleted && item.content.constructor === ContentFormat) {
+      const key = /** @type {ContentFormat} */ (item.content).key
+      if (attrs.has(key)) {
+        item.delete(transaction)
+      } else {
+        attrs.add(key)
+      }
+    }
+    item = item.left
+  }
+}
+
+/**
+ * This function is experimental and subject to change / be removed.
+ *
+ * Ideally, we don't need this function at all. Formatting attributes should be cleaned up
+ * automatically after each change. This function iterates twice over the complete YText type
+ * and removes unnecessary formatting attributes. This is also helpful for testing.
+ *
+ * This function won't be exported anymore as soon as there is confidence that the YText type works as intended.
+ *
+ * @param {YText} type
+ * @return {number} How many formatting attributes have been cleaned up.
+ */
+export const cleanupYTextFormatting = type => {
+  let res = 0
+  transact(/** @type {Doc} */ (type.doc), transaction => {
+    let start = /** @type {Item} */ (type._start)
+    let end = type._start
+    let startAttributes = map.create()
+    const currentAttributes = map.copy(startAttributes)
+    while (end) {
+      if (end.deleted === false) {
+        switch (end.content.constructor) {
+          case ContentFormat:
+            updateCurrentAttributes(currentAttributes, /** @type {ContentFormat} */ (end.content))
+            break
+          case ContentEmbed:
+          case ContentString:
+            res += cleanupFormattingGap(transaction, start, end, startAttributes, currentAttributes)
+            startAttributes = map.copy(currentAttributes)
+            start = end
+            break
+        }
+      }
+      end = end.right
+    }
+  })
+  return res
+}
+
 /**
 * @param {Transaction} transaction
 * @param {Item|null} left
@@ -332,6 +440,8 @@ const formatText = (transaction, parent, left, right, currentAttributes, length,
 * @function
 */
 const deleteText = (transaction, left, right, currentAttributes, length) => {
+  const startAttrs = map.copy(currentAttributes)
+  const start = right
  while (length > 0 && right !== null) {
    if (right.deleted === false) {
      switch (right.content.constructor) {
@@ -351,6 +461,9 @@ const deleteText = (transaction, left, right, currentAttributes, length) => {
    left = right
    right = right.right
  }
+  if (start) {
+    cleanupFormattingGap(transaction, start, right, startAttrs, map.copy(currentAttributes))
+  }
  return { left, right }
 }

@@ -400,11 +513,11 @@ export class YTextEvent extends YEvent {
  constructor (ytext, transaction) {
    super(ytext, transaction)
    /**
-     * @private
     * @type {Array<DeltaItem>|null}
     */
    this._delta = null
  }
+
  /**
   * Compute the changes in the delta format.
   * A {@link https://quilljs.com/docs/delta/|Quill Delta}) that represents the changes on the document.
@@ -429,7 +542,10 @@ export class YTextEvent extends YEvent {
        /**
         * @type {Object<string,any>}
         */
-        let attributes = {} // counts added or removed new attributes for retain
+        const attributes = {} // counts added or removed new attributes for retain
+        /**
+         * @type {string|object}
+         */
        let insert = ''
        let retain = 0
        let deleteLen = 0
@@ -448,7 +564,7 @@ export class YTextEvent extends YEvent {
                op = { insert }
                if (currentAttributes.size > 0) {
                  op.attributes = {}
-                  for (let [key, value] of currentAttributes) {
+                  for (const [key, value] of currentAttributes) {
                    if (value !== null) {
                      op.attributes[key] = value
                    }
@@ -460,7 +576,7 @@ export class YTextEvent extends YEvent {
                op = { retain }
                if (Object.keys(attributes).length > 0) {
                  op.attributes = {}
-                  for (let key in attributes) {
+                  for (const key in attributes) {
                    op.attributes[key] = attributes[key]
                  }
                }
@@ -518,7 +634,7 @@ export class YTextEvent extends YEvent {
                retain += item.length
              }
              break
-            case ContentFormat:
+            case ContentFormat: {
              const { key, value } = /** @type {ContentFormat} */ (item.content)
              if (this.adds(item)) {
                if (!this.deletes(item)) {
@@ -570,12 +686,13 @@ export class YTextEvent extends YEvent {
                updateCurrentAttributes(currentAttributes, /** @type {ContentFormat} */ (item.content))
              }
              break
+            }
          }
          item = item.right
        }
        addOp()
        while (delta.length > 0) {
-          let lastOp = delta[delta.length - 1]
+          const lastOp = delta[delta.length - 1]
          if (lastOp.retain !== undefined && lastOp.attributes === undefined) {
            // retain delta's if they don't assign attributes
            delta.pop()
@@ -607,11 +724,15 @@ export class YText extends AbstractType {
    /**
     * Array of pending operations on this type
     * @type {Array<function():void>?}
-     * @private
     */
    this._pending = string !== undefined ? [() => this.insert(0, string)] : []
  }

+  /**
+   * Number of characters of this text type.
+   *
+   * @type {number}
+   */
  get length () {
    return this._length
  }
@@ -619,8 +740,6 @@ export class YText extends AbstractType {
  /**
   * @param {Doc} y
   * @param {Item} item
-   *
-   * @private
   */
  _integrate (y, item) {
    super._integrate(y, item)
@@ -641,11 +760,50 @@ export class YText extends AbstractType {
   *
   * @param {Transaction} transaction
   * @param {Set<null|string>} parentSubs Keys changed on this type. `null` if list was modified.
-   *
-   * @private
   */
  _callObserver (transaction, parentSubs) {
-    callTypeObservers(this, transaction, new YTextEvent(this, transaction))
+    const event = new YTextEvent(this, transaction)
+    const doc = transaction.doc
+    // If a remote change happened, we try to cleanup potential formatting duplicates.
+    if (!transaction.local) {
+      // check if another formatting item was inserted
+      let foundFormattingItem = false
+      for (const [client, afterClock] of transaction.afterState) {
+        const clock = transaction.beforeState.get(client) || 0
+        if (afterClock === clock) {
+          continue
+        }
+        iterateStructs(transaction, /** @type {Array<Item|GC>} */ (doc.store.clients.get(client)), clock, afterClock, item => {
+          // @ts-ignore
+          if (!item.deleted && item.content.constructor === ContentFormat) {
+            foundFormattingItem = true
+          }
+        })
+        if (foundFormattingItem) {
+          break
+        }
+      }
+      transact(doc, t => {
+        if (foundFormattingItem) {
+          // If a formatting item was inserted, we simply clean the whole type.
+          // We need to compute currentAttributes for the current position anyway.
+          cleanupYTextFormatting(this)
+        } else {
+          // If no formatting attribute was inserted, we can make due with contextless
+          // formatting cleanups.
+          // Contextless: it is not necessary to compute currentAttributes for the affected position.
+          iterateDeletedStructs(t, transaction.deleteSet, item => {
+            if (item instanceof GC) {
+              return
+            }
+            if (item.parent === this) {
+              cleanupContextlessFormattingGap(t, item)
+            }
+          })
+        }
+      })
+    }
+    callTypeObservers(this, transaction, event)
  }

  /**
@@ -668,6 +826,16 @@ export class YText extends AbstractType {
    return str
  }

+  /**
+   * Returns the unformatted string representation of this YText type.
+   *
+   * @return {string}
+   * @public
+   */
+  toJSON () {
+    return this.toString()
+  }
+
  /**
   * Apply a {@link Delta} on this shared YText type.
   *
@@ -734,7 +902,7 @@ export class YText extends AbstractType {
         */
        const attributes = {}
        let addAttributes = false
-        for (let [key, value] of currentAttributes) {
+        for (const [key, value] of currentAttributes) {
          addAttributes = true
          attributes[key] = value
        }
@@ -761,7 +929,7 @@ export class YText extends AbstractType {
      while (n !== null) {
        if (isVisible(n, snapshot) || (prevSnapshot !== undefined && isVisible(n, prevSnapshot))) {
          switch (n.content.constructor) {
-            case ContentString:
+            case ContentString: {
              const cur = currentAttributes.get('ychange')
              if (snapshot !== undefined && !isVisible(n, snapshot)) {
                if (cur === undefined || cur.user !== n.id.client || cur.state !== 'removed') {
@@ -779,12 +947,25 @@ export class YText extends AbstractType {
              }
              str += /** @type {ContentString} */ (n.content).str
              break
-            case ContentEmbed:
+            }
+            case ContentEmbed: {
              packStr()
-              ops.push({
+              /**
+               * @type {Object<string,any>}
+               */
+              const op = {
                insert: /** @type {ContentEmbed} */ (n.content).embed
-              })
+              }
+              if (currentAttributes.size > 0) {
+                const attrs = /** @type {Object<string,any>} */ ({})
+                op.attributes = attrs
+                for (const [key, value] of currentAttributes) {
+                  attrs[key] = value
+                }
+              }
+              ops.push(op)
              break
+            }
            case ContentFormat:
              if (isVisible(n, snapshot)) {
                packStr()
@@ -820,6 +1001,7 @@ export class YText extends AbstractType {
        const { left, right, currentAttributes } = findPosition(transaction, this, index)
        if (!attributes) {
          attributes = {}
+          // @ts-ignore
          currentAttributes.forEach((v, k) => { attributes[k] = v })
        }
        insertText(transaction, this, left, right, currentAttributes, text, attributes)
@@ -888,10 +1070,13 @@ export class YText extends AbstractType {
   * @public
   */
  format (index, length, attributes) {
+    if (length === 0) {
+      return
+    }
    const y = this.doc
    if (y !== null) {
      transact(y, transaction => {
-        let { left, right, currentAttributes } = findPosition(transaction, this, index)
+        const { left, right, currentAttributes } = findPosition(transaction, this, index)
        if (right === null) {
          return
        }
@@ -904,8 +1089,6 @@ export class YText extends AbstractType {

  /**
   * @param {encoding.Encoder} encoder
-   *
-   * @private
   */
  _write (encoder) {
    encoding.writeVarUint(encoder, YTextRefID)
--- a/src/types/YXmlElement.js
+++ b/src/types/YXmlElement.js
@@ -27,7 +27,6 @@ export class YXmlElement extends YXmlFragment {
    this.nodeName = nodeName
    /**
     * @type {Map<string, any>|null}
-     * @private
     */
    this._prelimAttrs = new Map()
  }
@@ -41,7 +40,6 @@ export class YXmlElement extends YXmlFragment {
   *
   * @param {Doc} y The Yjs instance
   * @param {Item} item
-   * @private
   */
  _integrate (y, item) {
    super._integrate(y, item)
@@ -55,7 +53,6 @@ export class YXmlElement extends YXmlFragment {
   * Creates an Item with the same effect as this Item (without position effect)
   *
   * @return {YXmlElement}
-   * @private
   */
  _copy () {
    return new YXmlElement(this.nodeName)
@@ -74,7 +71,7 @@ export class YXmlElement extends YXmlFragment {
    const attrs = this.getAttributes()
    const stringBuilder = []
    const keys = []
-    for (let key in attrs) {
+    for (const key in attrs) {
      keys.push(key)
    }
    keys.sort()
@@ -140,7 +137,7 @@ export class YXmlElement extends YXmlFragment {
   * Returns all attribute name/value pairs in a JSON Object.
   *
   * @param {Snapshot} [snapshot]
-   * @return {Object} A JSON Object that describes the attributes.
+   * @return {Object<string, any>} A JSON Object that describes the attributes.
   *
   * @public
   */
@@ -165,8 +162,8 @@ export class YXmlElement extends YXmlFragment {
   */
  toDOM (_document = document, hooks = {}, binding) {
    const dom = _document.createElement(this.nodeName)
-    let attrs = this.getAttributes()
-    for (let key in attrs) {
+    const attrs = this.getAttributes()
+    for (const key in attrs) {
      dom.setAttribute(key, attrs[key])
    }
    typeListForEach(this, yxml => {
@@ -184,7 +181,6 @@ export class YXmlElement extends YXmlFragment {
   *
   * This is called when this Item is sent to a remote peer.
   *
-   * @private
   * @param {encoding.Encoder} encoder The encoder to write data to.
   */
  _write (encoder) {
@@ -197,7 +193,6 @@ export class YXmlElement extends YXmlFragment {
 * @param {decoding.Decoder} decoder
 * @return {YXmlElement}
 *
- * @private
 * @function
 */
 export const readYXmlElement = decoder => new YXmlElement(decoding.readVarString(decoder))
--- a/src/types/YXmlFragment.js
+++ b/src/types/YXmlFragment.js
@@ -68,6 +68,7 @@ export class YXmlTreeWalker {
  [Symbol.iterator] () {
    return this
  }
+
  /**
   * Get the next node.
   *
@@ -126,10 +127,10 @@ export class YXmlFragment extends AbstractType {
    super()
    /**
     * @type {Array<any>|null}
-     * @private
     */
    this._prelimContent = []
  }
+
  /**
   * Integrate this type into the Yjs instance.
   *
@@ -139,11 +140,10 @@ export class YXmlFragment extends AbstractType {
   *
   * @param {Doc} y The Yjs instance
   * @param {Item} item
-   * @private
   */
  _integrate (y, item) {
    super._integrate(y, item)
-    this.insert(0, /** @type {Array} */ (this._prelimContent))
+    this.insert(0, /** @type {Array<any>} */ (this._prelimContent))
    this._prelimContent = null
  }

@@ -222,7 +222,6 @@ export class YXmlFragment extends AbstractType {

  /**
   * Creates YXmlEvent and calls observers.
-   * @private
   *
   * @param {Transaction} transaction
   * @param {Set<null|string>} parentSubs Keys changed on this type. `null` if list was modified.
@@ -240,6 +239,9 @@ export class YXmlFragment extends AbstractType {
    return typeListMap(this, xml => xml.toString()).join('')
  }

+  /**
+   * @return {string}
+   */
  toJSON () {
    return this.toString()
  }
@@ -307,6 +309,7 @@ export class YXmlFragment extends AbstractType {
      this._prelimContent.splice(index, length)
    }
  }
+
  /**
   * Transforms this YArray to a JavaScript Array.
   *
@@ -315,13 +318,13 @@ export class YXmlFragment extends AbstractType {
  toArray () {
    return typeListToArray(this)
  }
+
  /**
   * Transform the properties of this type to binary and write it to an
   * BinaryEncoder.
   *
   * This is called when this Item is sent to a remote peer.
   *
-   * @private
   * @param {encoding.Encoder} encoder The encoder to write data to.
   */
  _write (encoder) {
--- a/src/types/YXmlHook.js
+++ b/src/types/YXmlHook.js
@@ -25,8 +25,6 @@ export class YXmlHook extends YMap {

  /**
   * Creates an Item with the same effect as this Item (without position effect)
-   *
-   * @private
   */
  _copy () {
    return new YXmlHook(this.hookName)
@@ -69,8 +67,6 @@ export class YXmlHook extends YMap {
   * This is called when this Item is sent to a remote peer.
   *
   * @param {encoding.Encoder} encoder The encoder to write data to.
-   *
-   * @private
   */
  _write (encoder) {
    super._write(encoder)
--- a/src/types/YXmlText.js
+++ b/src/types/YXmlText.js
@@ -12,6 +12,7 @@ export class YXmlText extends YText {
  _copy () {
    return new YXmlText()
  }
+
  /**
   * Creates a Dom Element that mirrors this YXmlText.
   *
@@ -39,9 +40,9 @@ export class YXmlText extends YText {
    // @ts-ignore
    return this.toDelta().map(delta => {
      const nestedNodes = []
-      for (let nodeName in delta.attributes) {
+      for (const nodeName in delta.attributes) {
        const attrs = []
-        for (let key in delta.attributes[nodeName]) {
+        for (const key in delta.attributes[nodeName]) {
          attrs.push({ key, value: delta.attributes[nodeName][key] })
        }
        // sort attributes to get a unique order
@@ -56,7 +57,7 @@ export class YXmlText extends YText {
        const node = nestedNodes[i]
        str += `<${node.nodeName}`
        for (let j = 0; j < node.attrs.length; j++) {
-          const attr = node.attrs[i]
+          const attr = node.attrs[j]
          str += ` ${attr.key}="${attr.value}"`
        }
        str += '>'
@@ -69,14 +70,15 @@ export class YXmlText extends YText {
    }).join('')
  }

+  /**
+   * @return {string}
+   */
  toJSON () {
    return this.toString()
  }

  /**
   * @param {encoding.Encoder} encoder
-   *
-   * @private
   */
  _write (encoder) {
    encoding.writeVarUint(encoder, YXmlTextRefID)
--- a/src/utils/DeleteSet.js
+++ b/src/utils/DeleteSet.js
@@ -42,7 +42,6 @@ export class DeleteSet {
  constructor () {
    /**
     * @type {Map<number,Array<DeleteItem>>}
-     * @private
     */
    this.clients = new Map()
  }
--- a/src/utils/Doc.js
+++ b/src/utils/Doc.js
@@ -17,18 +17,23 @@ import { Observable } from 'lib0/observable.js'
 import * as random from 'lib0/random.js'
 import * as map from 'lib0/map.js'

+export const generateNewClientId = random.uint32
+
 /**
 * A Yjs instance handles the state of shared data.
 * @extends Observable<string>
 */
 export class Doc extends Observable {
  /**
-   * @param {Object|undefined} conf configuration
+   * @param {Object} conf configuration
+   * @param {boolean} [conf.gc] Disable garbage collection (default: gc=true)
+   * @param {function(Item):boolean} [conf.gcFilter] Will be called before an Item is garbage collected. Return false to keep the Item.
   */
-  constructor (conf = {}) {
+  constructor ({ gc = true, gcFilter = () => true } = {}) {
    super()
-    this.gc = conf.gc || true
-    this.clientID = random.uint32()
+    this.gc = gc
+    this.gcFilter = gcFilter
+    this.clientID = generateNewClientId()
    /**
     * @type {Map<string, AbstractType<YEvent>>}
     */
@@ -36,15 +41,14 @@ export class Doc extends Observable {
    this.store = new StructStore()
    /**
     * @type {Transaction | null}
-     * @private
     */
    this._transaction = null
    /**
     * @type {Array<Transaction>}
-     * @private
     */
    this._transactionCleanups = []
  }
+
  /**
   * Changes that happen inside of a transaction are bundled. This means that
   * the observer fires _after_ the transaction is finished and that all changes
@@ -59,6 +63,7 @@ export class Doc extends Observable {
  transact (f, origin = null) {
    transact(this, f, origin)
  }
+
  /**
   * Define a shared data type.
   *
@@ -100,6 +105,7 @@ export class Doc extends Observable {
        t._map = type._map
        type._map.forEach(/** @param {Item?} n */ n => {
          for (; n !== null; n = n.left) {
+            // @ts-ignore
            n.parent = t
          }
        })
@@ -117,6 +123,7 @@ export class Doc extends Observable {
    }
    return type
  }
+
  /**
   * @template T
   * @param {string} name
@@ -128,6 +135,7 @@ export class Doc extends Observable {
    // @ts-ignore
    return this.get(name, YArray)
  }
+
  /**
   * @param {string} name
   * @return {YText}
@@ -138,6 +146,7 @@ export class Doc extends Observable {
    // @ts-ignore
    return this.get(name, YText)
  }
+
  /**
   * @param {string} name
   * @return {YMap<any>}
@@ -148,6 +157,7 @@ export class Doc extends Observable {
    // @ts-ignore
    return this.get(name, YMap)
  }
+
  /**
   * @param {string} name
   * @return {YXmlFragment}
@@ -158,15 +168,15 @@ export class Doc extends Observable {
    // @ts-ignore
    return this.get(name, YXmlFragment)
  }
+
  /**
   * Emit `destroy` event and unregister all event handlers.
-   *
-   * @protected
   */
  destroy () {
    this.emit('destroyed', [true])
    super.destroy()
  }
+
  /**
   * @param {string} eventName
   * @param {function} f
@@ -174,6 +184,7 @@ export class Doc extends Observable {
  on (eventName, f) {
    super.on(eventName, f)
  }
+
  /**
   * @param {string} eventName
   * @param {function} f
--- a/src/utils/ID.js
+++ b/src/utils/ID.js
@@ -81,7 +81,7 @@ export const readID = decoder =>
 */
 export const findRootTypeKey = type => {
  // @ts-ignore _y must be defined, otherwise unexpected case
-  for (let [key, value] of type.doc.share) {
+  for (const [key, value] of type.doc.share) {
    if (value === type) {
      return key
    }
--- a/src/utils/PermanentUserData.js
+++ b/src/utils/PermanentUserData.js
@@ -15,15 +15,14 @@ import { mergeDeleteSets, isDeleted } from './DeleteSet.js'
 export class PermanentUserData {
  /**
   * @param {Doc} doc
-   * @param {string} key
+   * @param {YMap<any>} [storeType]
   */
-  constructor (doc, key = 'users') {
-    const users = doc.getMap(key)
+  constructor (doc, storeType = doc.getMap('users')) {
    /**
     * @type {Map<string,DeleteSet>}
     */
    const dss = new Map()
-    this.yusers = users
+    this.yusers = storeType
    this.doc = doc
    /**
     * Maps from clientid to userDescription
@@ -59,20 +58,23 @@ export class PermanentUserData {
      ids.forEach(addClientId)
    }
    // observe users
-    users.observe(event => {
+    storeType.observe(event => {
      event.keysChanged.forEach(userDescription =>
-        initUser(users.get(userDescription), userDescription)
+        initUser(storeType.get(userDescription), userDescription)
      )
    })
    // add intial data
-    users.forEach(initUser)
+    storeType.forEach(initUser)
  }
+
  /**
   * @param {Doc} doc
   * @param {number} clientid
   * @param {string} userDescription
+   * @param {Object} [conf]
+   * @param {function(Transaction, DeleteSet):boolean} [conf.filter]
   */
-  setUserMapping (doc, clientid, userDescription) {
+  setUserMapping (doc, clientid, userDescription, { filter = () => true } = {}) {
    const users = this.yusers
    let user = users.get(userDescription)
    if (!user) {
@@ -83,35 +85,40 @@ export class PermanentUserData {
    }
    user.get('ids').push([clientid])
    users.observe(event => {
-      const userOverwrite = users.get(userDescription)
-      if (userOverwrite !== user) {
-        // user was overwritten, port all data over to the next user object
-        // @todo Experiment with Y.Sets here
-        user = userOverwrite
-        // @todo iterate over old type
-        this.clients.forEach((_userDescription, clientid) => {
-          if (userDescription === _userDescription) {
-            user.get('ids').push([clientid])
+      setTimeout(() => {
+        const userOverwrite = users.get(userDescription)
+        if (userOverwrite !== user) {
+          // user was overwritten, port all data over to the next user object
+          // @todo Experiment with Y.Sets here
+          user = userOverwrite
+          // @todo iterate over old type
+          this.clients.forEach((_userDescription, clientid) => {
+            if (userDescription === _userDescription) {
+              user.get('ids').push([clientid])
+            }
+          })
+          const encoder = encoding.createEncoder()
+          const ds = this.dss.get(userDescription)
+          if (ds) {
+            writeDeleteSet(encoder, ds)
+            user.get('ds').push([encoding.toUint8Array(encoder)])
          }
-        })
-        const encoder = encoding.createEncoder()
-        const ds = this.dss.get(userDescription)
-        if (ds) {
-          writeDeleteSet(encoder, ds)
-          user.get('ds').push([encoding.toUint8Array(encoder)])
        }
-      }
+      }, 0)
    })
    doc.on('afterTransaction', /** @param {Transaction} transaction */ transaction => {
-      const yds = user.get('ds')
-      const ds = transaction.deleteSet
-      if (transaction.local && ds.clients.size > 0) {
-        const encoder = encoding.createEncoder()
-        writeDeleteSet(encoder, ds)
-        yds.push([encoding.toUint8Array(encoder)])
-      }
+      setTimeout(() => {
+        const yds = user.get('ds')
+        const ds = transaction.deleteSet
+        if (transaction.local && ds.clients.size > 0 && filter(transaction, ds)) {
+          const encoder = encoding.createEncoder()
+          writeDeleteSet(encoder, ds)
+          yds.push([encoding.toUint8Array(encoder)])
+        }
+      })
    })
  }
+
  /**
   * @param {number} clientid
   * @return {any}
@@ -119,6 +126,7 @@ export class PermanentUserData {
  getUserByClientId (clientid) {
    return this.clients.get(clientid) || null
  }
+
  /**
   * @param {ID} id
   * @return {string | null}
--- a/src/utils/RelativePosition.js
+++ b/src/utils/RelativePosition.js
@@ -63,7 +63,7 @@ export class RelativePosition {
 }

 /**
- * @param {Object} json
+ * @param {any} json
 * @return {RelativePosition}
 *
 * @function
--- a/src/utils/Snapshot.js
+++ b/src/utils/Snapshot.js
@@ -28,13 +28,11 @@ export class Snapshot {
  constructor (ds, sv) {
    /**
     * @type {DeleteSet}
-     * @private
     */
    this.ds = ds
    /**
     * State Map
     * @type {Map<number,number>}
-     * @private
     */
    this.sv = sv
  }
--- a/src/utils/StructStore.js
+++ b/src/utils/StructStore.js
@@ -13,7 +13,6 @@ export class StructStore {
  constructor () {
    /**
     * @type {Map<number,Array<GC|Item>>}
-     * @private
     */
    this.clients = new Map()
    /**
@@ -23,19 +22,16 @@ export class StructStore {
     * slow in Chrome for arrays with more than 100k elements
     * @see tryResumePendingStructRefs
     * @type {Map<number,{i:number,refs:Array<GCRef|ItemRef>}>}
-     * @private
     */
    this.pendingClientsStructRefs = new Map()
    /**
     * Stack of pending structs waiting for struct dependencies
     * Maximum length of stack is structReaders.size
     * @type {Array<GCRef|ItemRef>}
-     * @private
     */
    this.pendingStack = []
    /**
     * @type {Array<decoding.Decoder>}
-     * @private
     */
    this.pendingDeleteReaders = []
  }
@@ -185,7 +181,7 @@ export const getItem = (store, id) => find(store, id)
 */
 export const findIndexCleanStart = (transaction, structs, clock) => {
  const index = findIndexSS(structs, clock)
-  let struct = structs[index]
+  const struct = structs[index]
  if (struct.id.clock < clock && struct instanceof Item) {
    structs.splice(index + 1, 0, splitItem(transaction, struct, clock - struct.id.clock))
    return index + 1
--- a/src/utils/Transaction.js
+++ b/src/utils/Transaction.js
@@ -10,13 +10,16 @@ import {
  findIndexSS,
  callEventHandlerListeners,
  Item,
-  ID, AbstractType, AbstractStruct, YEvent, Doc // eslint-disable-line
+  generateNewClientId,
+  StructStore, ID, AbstractType, AbstractStruct, YEvent, Doc // eslint-disable-line
 } from '../internals.js'

 import * as encoding from 'lib0/encoding.js'
 import * as map from 'lib0/map.js'
 import * as math from 'lib0/math.js'
 import * as set from 'lib0/set.js'
+import * as logging from 'lib0/logging.js'
+import { callAll } from 'lib0/function.js'

 /**
 * A transaction is created for every change on the Yjs model. It is possible
@@ -72,7 +75,7 @@ export class Transaction {
    /**
     * All types that were directly modified (property added or child
     * inserted/deleted). New types are not included in this Set.
-     * Maps from type to parentSubs (`item._parentSub = null` for YArray)
+     * Maps from type to parentSubs (`item.parentSub = null` for YArray)
     * @type {Map<AbstractType<YEvent>,Set<String|null>>}
     */
    this.changed = new Map()
@@ -84,7 +87,6 @@ export class Transaction {
    this.changedParentTypes = new Map()
    /**
     * @type {Set<ID>}
-     * @private
     */
    this._mergeStructs = new Set()
    /**
@@ -144,6 +146,196 @@ export const addChangedTypeToTransaction = (transaction, type, parentSub) => {
  }
 }

+/**
+ * @param {Array<AbstractStruct>} structs
+ * @param {number} pos
+ */
+const tryToMergeWithLeft = (structs, pos) => {
+  const left = structs[pos - 1]
+  const right = structs[pos]
+  if (left.deleted === right.deleted && left.constructor === right.constructor) {
+    if (left.mergeWith(right)) {
+      structs.splice(pos, 1)
+      if (right instanceof Item && right.parentSub !== null && right.parent._map.get(right.parentSub) === right) {
+        right.parent._map.set(right.parentSub, /** @type {Item} */ (left))
+      }
+    }
+  }
+}
+
+/**
+ * @param {DeleteSet} ds
+ * @param {StructStore} store
+ * @param {function(Item):boolean} gcFilter
+ */
+const tryGcDeleteSet = (ds, store, gcFilter) => {
+  for (const [client, deleteItems] of ds.clients) {
+    const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
+    for (let di = deleteItems.length - 1; di >= 0; di--) {
+      const deleteItem = deleteItems[di]
+      const endDeleteItemClock = deleteItem.clock + deleteItem.len
+      for (
+        let si = findIndexSS(structs, deleteItem.clock), struct = structs[si];
+        si < structs.length && struct.id.clock < endDeleteItemClock;
+        struct = structs[++si]
+      ) {
+        const struct = structs[si]
+        if (deleteItem.clock + deleteItem.len <= struct.id.clock) {
+          break
+        }
+        if (struct instanceof Item && struct.deleted && !struct.keep && gcFilter(struct)) {
+          struct.gc(store, false)
+        }
+      }
+    }
+  }
+}
+
+/**
+ * @param {DeleteSet} ds
+ * @param {StructStore} store
+ */
+const tryMergeDeleteSet = (ds, store) => {
+  // try to merge deleted / gc'd items
+  // merge from right to left for better efficiecy and so we don't miss any merge targets
+  for (const [client, deleteItems] of ds.clients) {
+    const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
+    for (let di = deleteItems.length - 1; di >= 0; di--) {
+      const deleteItem = deleteItems[di]
+      // start with merging the item next to the last deleted item
+      const mostRightIndexToCheck = math.min(structs.length - 1, 1 + findIndexSS(structs, deleteItem.clock + deleteItem.len - 1))
+      for (
+        let si = mostRightIndexToCheck, struct = structs[si];
+        si > 0 && struct.id.clock >= deleteItem.clock;
+        struct = structs[--si]
+      ) {
+        tryToMergeWithLeft(structs, si)
+      }
+    }
+  }
+}
+
+/**
+ * @param {DeleteSet} ds
+ * @param {StructStore} store
+ * @param {function(Item):boolean} gcFilter
+ */
+export const tryGc = (ds, store, gcFilter) => {
+  tryGcDeleteSet(ds, store, gcFilter)
+  tryMergeDeleteSet(ds, store)
+}
+
+/**
+ * @param {Array<Transaction>} transactionCleanups
+ * @param {number} i
+ */
+const cleanupTransactions = (transactionCleanups, i) => {
+  if (i < transactionCleanups.length) {
+    const transaction = transactionCleanups[i]
+    const doc = transaction.doc
+    const store = doc.store
+    const ds = transaction.deleteSet
+    try {
+      sortAndMergeDeleteSet(ds)
+      transaction.afterState = getStateVector(transaction.doc.store)
+      doc._transaction = null
+      doc.emit('beforeObserverCalls', [transaction, doc])
+      /**
+       * An array of event callbacks.
+       *
+       * Each callback is called even if the other ones throw errors.
+       *
+       * @type {Array<function():void>}
+       */
+      const fs = []
+      // observe events on changed types
+      transaction.changed.forEach((subs, itemtype) =>
+        fs.push(() => {
+          if (itemtype._item === null || !itemtype._item.deleted) {
+            itemtype._callObserver(transaction, subs)
+          }
+        })
+      )
+      fs.push(() => {
+        // deep observe events
+        transaction.changedParentTypes.forEach((events, type) =>
+          fs.push(() => {
+            // We need to think about the possibility that the user transforms the
+            // Y.Doc in the event.
+            if (type._item === null || !type._item.deleted) {
+              events = events
+                .filter(event =>
+                  event.target._item === null || !event.target._item.deleted
+                )
+              events
+                .forEach(event => {
+                  event.currentTarget = type
+                })
+              // We don't need to check for events.length
+              // because we know it has at least one element
+              callEventHandlerListeners(type._dEH, events, transaction)
+            }
+          })
+        )
+        fs.push(() => doc.emit('afterTransaction', [transaction, doc]))
+      })
+      callAll(fs, [])
+    } finally {
+      // Replace deleted items with ItemDeleted / GC.
+      // This is where content is actually remove from the Yjs Doc.
+      if (doc.gc) {
+        tryGcDeleteSet(ds, store, doc.gcFilter)
+      }
+      tryMergeDeleteSet(ds, store)
+
+      // on all affected store.clients props, try to merge
+      for (const [client, clock] of transaction.afterState) {
+        const beforeClock = transaction.beforeState.get(client) || 0
+        if (beforeClock !== clock) {
+          const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
+          // we iterate from right to left so we can safely remove entries
+          const firstChangePos = math.max(findIndexSS(structs, beforeClock), 1)
+          for (let i = structs.length - 1; i >= firstChangePos; i--) {
+            tryToMergeWithLeft(structs, i)
+          }
+        }
+      }
+      // try to merge mergeStructs
+      // @todo: it makes more sense to transform mergeStructs to a DS, sort it, and merge from right to left
+      //        but at the moment DS does not handle duplicates
+      for (const mid of transaction._mergeStructs) {
+        const client = mid.client
+        const clock = mid.clock
+        const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
+        const replacedStructPos = findIndexSS(structs, clock)
+        if (replacedStructPos + 1 < structs.length) {
+          tryToMergeWithLeft(structs, replacedStructPos + 1)
+        }
+        if (replacedStructPos > 0) {
+          tryToMergeWithLeft(structs, replacedStructPos)
+        }
+      }
+      if (!transaction.local && transaction.afterState.get(doc.clientID) !== transaction.beforeState.get(doc.clientID)) {
+        doc.clientID = generateNewClientId()
+        logging.print(logging.ORANGE, logging.BOLD, '[yjs] ', logging.UNBOLD, logging.RED, 'Changed the client-id because another client seems to be using it.')
+      }
+      // @todo Merge all the transactions into one and provide send the data as a single update message
+      doc.emit('afterTransactionCleanup', [transaction, doc])
+      if (doc._observers.has('update')) {
+        const updateMessage = computeUpdateMessageFromTransaction(transaction)
+        if (updateMessage !== null) {
+          doc.emit('update', [encoding.toUint8Array(updateMessage), transaction.origin, doc])
+        }
+      }
+      if (transactionCleanups.length <= i + 1) {
+        doc._transactionCleanups = []
+      } else {
+        cleanupTransactions(transactionCleanups, i + 1)
+      }
+    }
+  }
+}
+
 /**
 * Implements the functionality of `y.transact(()=>{..})`
 *
@@ -151,7 +343,6 @@ export const addChangedTypeToTransaction = (transaction, type, parentSub) => {
 * @param {function(Transaction):void} f
 * @param {any} [origin=true]
 *
- * @private
 * @function
 */
 export const transact = (doc, f, origin = null, local = true) => {
@@ -169,134 +360,13 @@ export const transact = (doc, f, origin = null, local = true) => {
    if (initialCall && transactionCleanups[0] === doc._transaction) {
      // The first transaction ended, now process observer calls.
      // Observer call may create new transactions for which we need to call the observers and do cleanup.
-      // We don't want to nest these calls, so we execute these calls one after another
-      for (let i = 0; i < transactionCleanups.length; i++) {
-        const transaction = transactionCleanups[i]
-        const store = transaction.doc.store
-        const ds = transaction.deleteSet
-        sortAndMergeDeleteSet(ds)
-        transaction.afterState = getStateVector(transaction.doc.store)
-        doc._transaction = null
-        doc.emit('beforeObserverCalls', [transaction, doc])
-        // emit change events on changed types
-        transaction.changed.forEach((subs, itemtype) => {
-          if (itemtype._item === null || !itemtype._item.deleted) {
-            itemtype._callObserver(transaction, subs)
-          }
-        })
-        transaction.changedParentTypes.forEach((events, type) => {
-          // We need to think about the possibility that the user transforms the
-          // Y.Doc in the event.
-          if (type._item === null || !type._item.deleted) {
-            events = events
-              .filter(event =>
-                event.target._item === null || !event.target._item.deleted
-              )
-            events
-              .forEach(event => {
-                event.currentTarget = type
-              })
-            // We don't need to check for events.length
-            // because we know it has at least one element
-            callEventHandlerListeners(type._dEH, events, transaction)
-          }
-        })
-        doc.emit('afterTransaction', [transaction, doc])
-        /**
-         * @param {Array<AbstractStruct>} structs
-         * @param {number} pos
-         */
-        const tryToMergeWithLeft = (structs, pos) => {
-          const left = structs[pos - 1]
-          const right = structs[pos]
-          if (left.deleted === right.deleted && left.constructor === right.constructor) {
-            if (left.mergeWith(right)) {
-              structs.splice(pos, 1)
-              if (right instanceof Item && right.parentSub !== null && right.parent._map.get(right.parentSub) === right) {
-                right.parent._map.set(right.parentSub, /** @type {Item} */ (left))
-              }
-            }
-          }
-        }
-        // Replace deleted items with ItemDeleted / GC.
-        // This is where content is actually remove from the Yjs Doc.
-        if (doc.gc) {
-          for (const [client, deleteItems] of ds.clients) {
-            const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
-            for (let di = deleteItems.length - 1; di >= 0; di--) {
-              const deleteItem = deleteItems[di]
-              const endDeleteItemClock = deleteItem.clock + deleteItem.len
-              for (
-                let si = findIndexSS(structs, deleteItem.clock), struct = structs[si];
-                si < structs.length && struct.id.clock < endDeleteItemClock;
-                struct = structs[++si]
-              ) {
-                const struct = structs[si]
-                if (deleteItem.clock + deleteItem.len <= struct.id.clock) {
-                  break
-                }
-                if (struct instanceof Item && struct.deleted && !struct.keep) {
-                  struct.gc(store, false)
-                }
-              }
-            }
-          }
-        }
-        // try to merge deleted / gc'd items
-        // merge from right to left for better efficiecy and so we don't miss any merge targets
-        for (const [client, deleteItems] of ds.clients) {
-          const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
-          for (let di = deleteItems.length - 1; di >= 0; di--) {
-            const deleteItem = deleteItems[di]
-            // start with merging the item next to the last deleted item
-            const mostRightIndexToCheck = math.min(structs.length - 1, 1 + findIndexSS(structs, deleteItem.clock + deleteItem.len - 1))
-            for (
-              let si = mostRightIndexToCheck, struct = structs[si];
-              si > 0 && struct.id.clock >= deleteItem.clock;
-              struct = structs[--si]
-            ) {
-              tryToMergeWithLeft(structs, si)
-            }
-          }
-        }
-
-        // on all affected store.clients props, try to merge
-        for (const [client, clock] of transaction.afterState) {
-          const beforeClock = transaction.beforeState.get(client) || 0
-          if (beforeClock !== clock) {
-            const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
-            // we iterate from right to left so we can safely remove entries
-            const firstChangePos = math.max(findIndexSS(structs, beforeClock), 1)
-            for (let i = structs.length - 1; i >= firstChangePos; i--) {
-              tryToMergeWithLeft(structs, i)
-            }
-          }
-        }
-        // try to merge mergeStructs
-        // @todo: it makes more sense to transform mergeStructs to a DS, sort it, and merge from right to left
-        //        but at the moment DS does not handle duplicates
-        for (const mid of transaction._mergeStructs) {
-          const client = mid.client
-          const clock = mid.clock
-          const structs = /** @type {Array<AbstractStruct>} */ (store.clients.get(client))
-          const replacedStructPos = findIndexSS(structs, clock)
-          if (replacedStructPos + 1 < structs.length) {
-            tryToMergeWithLeft(structs, replacedStructPos + 1)
-          }
-          if (replacedStructPos > 0) {
-            tryToMergeWithLeft(structs, replacedStructPos)
-          }
-        }
-        // @todo Merge all the transactions into one and provide send the data as a single update message
-        doc.emit('afterTransactionCleanup', [transaction, doc])
-        if (doc._observers.has('update')) {
-          const updateMessage = computeUpdateMessageFromTransaction(transaction)
-          if (updateMessage !== null) {
-            doc.emit('update', [encoding.toUint8Array(updateMessage), transaction.origin, doc])
-          }
-        }
-      }
-      doc._transactionCleanups = []
+      // We don't want to nest these calls, so we execute these calls one after
+      // another.
+      // Also we need to ensure that all cleanups are called, even if the
+      // observes throw errors.
+      // This file is full of hacky try {} finally {} blocks to ensure that an
+      // event can throw errors and also that the cleanup is called.
+      cleanupTransactions(transactionCleanups, 0)
    }
  }
 }
--- a/src/utils/UndoManager.js
+++ b/src/utils/UndoManager.js
@@ -9,6 +9,7 @@ import {
  createID,
  followRedone,
  getItemCleanStart,
+  getState,
  Transaction, Doc, Item, GC, DeleteSet, AbstractType // eslint-disable-line
 } from '../internals.js'

@@ -18,13 +19,13 @@ import { Observable } from 'lib0/observable.js'
 class StackItem {
  /**
   * @param {DeleteSet} ds
-   * @param {number} start clock start of the local client
-   * @param {number} len
+   * @param {Map<number,number>} beforeState
+   * @param {Map<number,number>} afterState
   */
-  constructor (ds, start, len) {
+  constructor (ds, beforeState, afterState) {
    this.ds = ds
-    this.start = start
-    this.len = len
+    this.beforeState = beforeState
+    this.afterState = afterState
    /**
     * Use this to save and restore metadata like selection range
     */
@@ -50,36 +51,64 @@ const popStackItem = (undoManager, stack, eventType) => {
    while (stack.length > 0 && result === null) {
      const store = doc.store
      const stackItem = /** @type {StackItem} */ (stack.pop())
+      /**
+       * @type {Set<Item>}
+       */
      const itemsToRedo = new Set()
-      let performedChange = false
-      iterateDeletedStructs(transaction, stackItem.ds, struct => {
-        if (struct instanceof Item && scope.some(type => isParentOf(type, struct))) {
-          itemsToRedo.add(struct)
-        }
-      })
-      itemsToRedo.forEach(item => {
-        performedChange = redoItem(transaction, item, itemsToRedo) !== null || performedChange
-      })
-      const structs = /** @type {Array<GC|Item>} */ (store.clients.get(doc.clientID))
      /**
       * @type {Array<Item>}
       */
      const itemsToDelete = []
-      iterateStructs(transaction, structs, stackItem.start, stackItem.len, struct => {
-        if (struct instanceof Item && !struct.deleted && scope.some(type => isParentOf(type, /** @type {Item} */ (struct)))) {
-          if (struct.redone !== null) {
-            let { item, diff } = followRedone(store, struct.id)
-            if (diff > 0) {
-              item = getItemCleanStart(transaction, createID(item.id.client, item.id.clock + diff))
-            }
-            if (item.length > stackItem.len) {
-              getItemCleanStart(transaction, createID(item.id.client, item.id.clock + stackItem.len))
-            }
-            struct = item
+      let performedChange = false
+      stackItem.afterState.forEach((endClock, client) => {
+        const startClock = stackItem.beforeState.get(client) || 0
+        const len = endClock - startClock
+        // @todo iterateStructs should not need the structs parameter
+        const structs = /** @type {Array<GC|Item>} */ (store.clients.get(client))
+        if (startClock !== endClock) {
+          // make sure structs don't overlap with the range of created operations [stackItem.start, stackItem.start + stackItem.end)
+          // this must be executed before deleted structs are iterated.
+          getItemCleanStart(transaction, createID(client, startClock))
+          if (endClock < getState(doc.store, client)) {
+            getItemCleanStart(transaction, createID(client, endClock))
          }
-          itemsToDelete.push(struct)
+          iterateStructs(transaction, structs, startClock, len, struct => {
+            if (struct instanceof Item) {
+              if (struct.redone !== null) {
+                let { item, diff } = followRedone(store, struct.id)
+                if (diff > 0) {
+                  item = getItemCleanStart(transaction, createID(item.id.client, item.id.clock + diff))
+                }
+                if (item.length > len) {
+                  getItemCleanStart(transaction, createID(item.id.client, endClock))
+                }
+                struct = item
+              }
+              if (!struct.deleted && scope.some(type => isParentOf(type, /** @type {Item} */ (struct)))) {
+                itemsToDelete.push(struct)
+              }
+            }
+          })
        }
      })
+      iterateDeletedStructs(transaction, stackItem.ds, struct => {
+        const id = struct.id
+        const clock = id.clock
+        const client = id.client
+        const startClock = stackItem.beforeState.get(client) || 0
+        const endClock = stackItem.afterState.get(client) || 0
+        if (
+          struct instanceof Item &&
+          scope.some(type => isParentOf(type, struct)) &&
+          // Never redo structs in [stackItem.start, stackItem.start + stackItem.end) because they were created and deleted in the same capture interval.
+          !(clock >= startClock && clock < endClock)
+        ) {
+          itemsToRedo.add(struct)
+        }
+      })
+      itemsToRedo.forEach(struct => {
+        performedChange = redoItem(transaction, struct, itemsToRedo) !== null || performedChange
+      })
      // We want to delete in reverse order so that children are deleted before
      // parents, so we have more information available when items are filtered.
      for (let i = itemsToDelete.length - 1; i >= 0; i--) {
@@ -111,9 +140,9 @@ const popStackItem = (undoManager, stack, eventType) => {
 /**
 * Fires 'stack-item-added' event when a stack item was added to either the undo- or
 * the redo-stack. You may store additional stack information via the
- * metadata property on `event.stackItem.metadata` (it is a `Map` of metadata properties).
+ * metadata property on `event.stackItem.meta` (it is a `Map` of metadata properties).
 * Fires 'stack-item-popped' event when a stack item was popped from either the
- * undo- or the redo-stack. You may restore the saved stack information from `event.stackItem.metadata`.
+ * undo- or the redo-stack. You may restore the saved stack information from `event.stackItem.meta`.
 *
 * @extends {Observable<'stack-item-added'|'stack-item-popped'>}
 */
@@ -162,17 +191,17 @@ export class UndoManager extends Observable {
        // neither undoing nor redoing: delete redoStack
        this.redoStack = []
      }
-      const beforeState = transaction.beforeState.get(this.doc.clientID) || 0
-      const afterState = transaction.afterState.get(this.doc.clientID) || 0
+      const beforeState = transaction.beforeState
+      const afterState = transaction.afterState
      const now = time.getUnixTime()
      if (now - this.lastChange < captureTimeout && stack.length > 0 && !undoing && !redoing) {
        // append change to last stack op
        const lastOp = stack[stack.length - 1]
        lastOp.ds = mergeDeleteSets([lastOp.ds, transaction.deleteSet])
-        lastOp.len = afterState - lastOp.start
+        lastOp.afterState = afterState
      } else {
        // create a new stack op
-        stack.push(new StackItem(transaction.deleteSet, beforeState, afterState - beforeState))
+        stack.push(new StackItem(transaction.deleteSet, beforeState, afterState))
      }
      if (!undoing && !redoing) {
        this.lastChange = now
@@ -180,13 +209,32 @@ export class UndoManager extends Observable {
      // make sure that deleted structs are not gc'd
      iterateDeletedStructs(transaction, transaction.deleteSet, /** @param {Item|GC} item */ item => {
        if (item instanceof Item && this.scope.some(type => isParentOf(type, item))) {
-          keepItem(item)
+          keepItem(item, true)
        }
      })
      this.emit('stack-item-added', [{ stackItem: stack[stack.length - 1], origin: transaction.origin, type: undoing ? 'redo' : 'undo' }, this])
    })
  }

+  clear () {
+    this.doc.transact(transaction => {
+      /**
+       * @param {StackItem} stackItem
+       */
+      const clearItem = stackItem => {
+        iterateDeletedStructs(transaction, stackItem.ds, item => {
+          if (item instanceof Item && this.scope.some(type => isParentOf(type, item))) {
+            keepItem(item, false)
+          }
+        })
+      }
+      this.undoStack.forEach(clearItem)
+      this.redoStack.forEach(clearItem)
+    })
+    this.undoStack = []
+    this.redoStack = []
+  }
+
  /**
   * UndoManager merges Undo-StackItem if they are created within time-gap
   * smaller than `options.captureTimeout`. Call `um.stopCapturing()` so that the next
--- a/src/utils/YEvent.js
+++ b/src/utils/YEvent.js
@@ -56,6 +56,8 @@ export class YEvent {
  /**
   * Check if a struct is deleted by this event.
   *
+   * In contrast to change.deleted, this method also returns true if the struct was added and then deleted.
+   *
   * @param {AbstractStruct} struct
   * @return {boolean}
   */
@@ -66,6 +68,8 @@ export class YEvent {
  /**
   * Check if a struct is added by this event.
   *
+   * In contrast to change.deleted, this method also returns true if the struct was added and then deleted.
+   *
   * @param {AbstractStruct} struct
   * @return {boolean}
   */
@@ -106,7 +110,7 @@ export class YEvent {
        }
        for (let item = target._start; item !== null; item = item.right) {
          if (item.deleted) {
-            if (this.deletes(item)) {
+            if (this.deletes(item) && !this.adds(item)) {
              if (lastOp === null || lastOp.delete === undefined) {
                packOp()
                lastOp = { delete: 0 }
@@ -177,7 +181,7 @@ export class YEvent {
      })
      this._changes = changes
    }
-    return changes
+    return /** @type {any} */ (changes)
  }
 }

--- a/tests/consistency.tests.js
+++ b/tests/consistency.tests.js
@@ -0,0 +1,19 @@
+
+import * as Y from '../src/index.js'
+import * as t from 'lib0/testing.js'
+
+/**
+ * Client id should be changed when an instance receives updates from another client using the same client id.
+ *
+ * @param {t.TestCase} tc
+ */
+export const testClientIdDuplicateChange = tc => {
+  const doc1 = new Y.Doc()
+  doc1.clientID = 0
+  const doc2 = new Y.Doc()
+  doc2.clientID = 0
+  t.assert(doc2.clientID === doc1.clientID)
+  doc1.getArray('a').insert(0, [1, 2])
+  Y.applyUpdate(doc2, Y.encodeStateAsUpdate(doc1))
+  t.assert(doc2.clientID !== doc1.clientID)
+}
--- a/tests/index.js
+++ b/tests/index.js
@@ -5,6 +5,7 @@ import * as text from './y-text.tests.js'
 import * as xml from './y-xml.tests.js'
 import * as encoding from './encoding.tests.js'
 import * as undoredo from './undo-redo.tests.js'
+import * as consistency from './consistency.tests.js'

 import { runTests } from 'lib0/testing.js'
 import { isBrowser, isNode } from 'lib0/environment.js'
@@ -14,7 +15,7 @@ if (isBrowser) {
  log.createVConsole(document.body)
 }
 runTests({
-  map, array, text, xml, encoding, undoredo
+  map, array, text, xml, consistency, encoding, undoredo
 }).then(success => {
  /* istanbul ignore next */
  if (isNode) {
--- a/tests/testHelper.js
+++ b/tests/testHelper.js
@@ -12,6 +12,7 @@ import * as prng from 'lib0/prng.js'
 import * as encoding from 'lib0/encoding.js'
 import * as decoding from 'lib0/decoding.js'
 import * as syncProtocol from 'y-protocols/sync.js'
+import * as object from 'lib0/object.js'
 export * from '../src/internals.js'

 /**
@@ -55,6 +56,7 @@ export class TestYInstance extends Doc {
    })
    this.connect()
  }
+
  /**
   * Disconnect from TestConnector.
   */
@@ -62,6 +64,7 @@ export class TestYInstance extends Doc {
    this.receiving = new Map()
    this.tc.onlineConns.delete(this)
  }
+
  /**
   * Append yourself to the list of known Y instances in testconnector.
   * Also initiate sync with all clients.
@@ -83,6 +86,7 @@ export class TestYInstance extends Doc {
      })
    }
  }
+
  /**
   * Receive a message from another client. This message is only appended to the list of receiving messages.
   * TestConnector decides when this client actually reads this message.
@@ -124,6 +128,7 @@ export class TestConnector {
     */
    this.prng = gen
  }
+
  /**
   * Create a new Y instance and add it to the list of connections
   * @param {number} clientID
@@ -131,6 +136,7 @@ export class TestConnector {
  createY (clientID) {
    return new TestYInstance(this, clientID)
  }
+
  /**
   * Choose random connection and flush a random message from a random sender.
   *
@@ -162,6 +168,7 @@ export class TestConnector {
    }
    return false
  }
+
  /**
   * @return {boolean} True iff this function actually flushed something
   */
@@ -172,16 +179,20 @@ export class TestConnector {
    }
    return didSomething
  }
+
  reconnectAll () {
    this.allConns.forEach(conn => conn.connect())
  }
+
  disconnectAll () {
    this.allConns.forEach(conn => conn.disconnect())
  }
+
  syncAll () {
    this.reconnectAll()
    this.flushAllMessages()
  }
+
  /**
   * @return {boolean} Whether it was possible to disconnect a randon connection.
   */
@@ -192,6 +203,7 @@ export class TestConnector {
    prng.oneOf(this.prng, Array.from(this.onlineConns)).disconnect()
    return true
  }
+
  /**
   * @return {boolean} Whether it was possible to reconnect a random connection.
   */
@@ -270,12 +282,12 @@ export const compare = users => {
  // Test Map iterator
  const ymapkeys = Array.from(users[0].getMap('map').keys())
  t.assert(ymapkeys.length === Object.keys(userMapValues[0]).length)
-  ymapkeys.forEach(key => t.assert(userMapValues[0].hasOwnProperty(key)))
+  ymapkeys.forEach(key => t.assert(object.hasProperty(userMapValues[0], key)))
  /**
   * @type {Object<string,any>}
   */
  const mapRes = {}
-  for (let [k, v] of users[0].getMap('map')) {
+  for (const [k, v] of users[0].getMap('map')) {
    mapRes[k] = v instanceof Y.AbstractType ? v.toJSON() : v
  }
  t.compare(userMapValues[0], mapRes)
--- a/tests/undo-redo.tests.js
+++ b/tests/undo-redo.tests.js
@@ -13,6 +13,23 @@ import * as t from 'lib0/testing.js'
 export const testUndoText = tc => {
  const { testConnector, text0, text1 } = init(tc, { users: 3 })
  const undoManager = new UndoManager(text0)
+
+  // items that are added & deleted in the same transaction won't be undo
+  text0.insert(0, 'test')
+  text0.delete(0, 4)
+  undoManager.undo()
+  t.assert(text0.toString() === '')
+
+  // follow redone items
+  text0.insert(0, 'a')
+  undoManager.stopCapturing()
+  text0.delete(0, 1)
+  undoManager.stopCapturing()
+  undoManager.undo()
+  t.assert(text0.toString() === 'a')
+  undoManager.undo()
+  t.assert(text0.toString() === '')
+
  text0.insert(0, 'abc')
  text1.insert(0, 'xyz')
  testConnector.syncAll()
@@ -52,11 +69,11 @@ export const testUndoMap = tc => {
  const subType = new Y.Map()
  map0.set('a', subType)
  subType.set('x', 42)
-  t.compare(map0.toJSON(), /** @type {any} */ ({ 'a': { x: 42 } }))
+  t.compare(map0.toJSON(), /** @type {any} */ ({ a: { x: 42 } }))
  undoManager.undo()
  t.assert(map0.get('a') === 1)
  undoManager.redo()
-  t.compare(map0.toJSON(), /** @type {any} */ ({ 'a': { x: 42 } }))
+  t.compare(map0.toJSON(), /** @type {any} */ ({ a: { x: 42 } }))
  testConnector.syncAll()
  // if content is overwritten by another user, undo operations should be skipped
  map1.set('a', 44)
@@ -65,6 +82,15 @@ export const testUndoMap = tc => {
  t.assert(map0.get('a') === 44)
  undoManager.redo()
  t.assert(map0.get('a') === 44)
+
+  // test setting value multiple times
+  map0.set('b', 'initial')
+  undoManager.stopCapturing()
+  map0.set('b', 'val1')
+  map0.set('b', 'val2')
+  undoManager.stopCapturing()
+  undoManager.undo()
+  t.assert(map0.get('b') === 'initial')
 }

 /**
--- a/tests/y-array.tests.js
+++ b/tests/y-array.tests.js
@@ -207,7 +207,7 @@ export const testChangeEvent = tc => {
  const newArr = new Y.Array()
  array0.insert(0, [newArr, 4, 'dtrn'])
  t.assert(changes !== null && changes.added.size === 2 && changes.deleted.size === 0)
-  t.compare(changes.delta, [{insert: [newArr, 4, 'dtrn']}])
+  t.compare(changes.delta, [{ insert: [newArr, 4, 'dtrn'] }])
  changes = null
  array0.delete(0, 2)
  t.assert(changes !== null && changes.added.size === 0 && changes.deleted.size === 2)
@@ -227,7 +227,7 @@ export const testInsertAndDeleteEventsForTypes2 = tc => {
  /**
   * @type {Array<Object<string,any>>}
   */
-  let events = []
+  const events = []
  array0.observe(e => {
    events.push(e)
  })
@@ -318,7 +318,7 @@ export const testIteratingArrayContainingTypes = tc => {
    arr.push([map])
  }
  let cnt = 0
-  for (let item of arr) {
+  for (const item of arr) {
    t.assert(item.get('value') === cnt++, 'value is correct')
  }
  y.destroy()
--- a/tests/y-map.tests.js
+++ b/tests/y-map.tests.js
@@ -66,7 +66,7 @@ export const testGetAndSetOfMapProperty = tc => {

  testConnector.flushAllMessages()

-  for (let user of users) {
+  for (const user of users) {
    const u = user.getMap('map')
    t.compare(u.get('stuff'), 'stuffy')
    t.assert(u.get('undefined') === undefined, 'undefined')
@@ -108,7 +108,7 @@ export const testGetAndSetOfMapPropertySyncs = tc => {
  map0.set('stuff', 'stuffy')
  t.compare(map0.get('stuff'), 'stuffy')
  testConnector.flushAllMessages()
-  for (let user of users) {
+  for (const user of users) {
    var u = user.getMap('map')
    t.compare(u.get('stuff'), 'stuffy')
  }
@@ -123,7 +123,7 @@ export const testGetAndSetOfMapPropertyWithConflict = tc => {
  map0.set('stuff', 'c0')
  map1.set('stuff', 'c1')
  testConnector.flushAllMessages()
-  for (let user of users) {
+  for (const user of users) {
    var u = user.getMap('map')
    t.compare(u.get('stuff'), 'c1')
  }
@@ -139,7 +139,7 @@ export const testGetAndSetAndDeleteOfMapProperty = tc => {
  map1.set('stuff', 'c1')
  map1.delete('stuff')
  testConnector.flushAllMessages()
-  for (let user of users) {
+  for (const user of users) {
    var u = user.getMap('map')
    t.assert(u.get('stuff') === undefined)
  }
@@ -156,7 +156,7 @@ export const testGetAndSetOfMapPropertyWithThreeConflicts = tc => {
  map1.set('stuff', 'c2')
  map2.set('stuff', 'c3')
  testConnector.flushAllMessages()
-  for (let user of users) {
+  for (const user of users) {
    var u = user.getMap('map')
    t.compare(u.get('stuff'), 'c3')
  }
@@ -179,7 +179,7 @@ export const testGetAndSetAndDeleteOfMapPropertyWithThreeConflicts = tc => {
  map3.set('stuff', 'c3')
  map3.delete('stuff')
  testConnector.flushAllMessages()
-  for (let user of users) {
+  for (const user of users) {
    var u = user.getMap('map')
    t.assert(u.get('stuff') === undefined)
  }
@@ -340,6 +340,56 @@ export const testChangeEvent = tc => {
  compare(users)
 }

+/**
+ * @param {t.TestCase} tc
+ */
+export const testYmapEventExceptionsShouldCompleteTransaction = tc => {
+  const doc = new Y.Doc()
+  const map = doc.getMap('map')
+
+  let updateCalled = false
+  let throwingObserverCalled = false
+  let throwingDeepObserverCalled = false
+  doc.on('update', () => {
+    updateCalled = true
+  })
+
+  const throwingObserver = () => {
+    throwingObserverCalled = true
+    throw new Error('Failure')
+  }
+
+  const throwingDeepObserver = () => {
+    throwingDeepObserverCalled = true
+    throw new Error('Failure')
+  }
+
+  map.observe(throwingObserver)
+  map.observeDeep(throwingDeepObserver)
+
+  t.fails(() => {
+    map.set('y', '2')
+  })
+
+  t.assert(updateCalled)
+  t.assert(throwingObserverCalled)
+  t.assert(throwingDeepObserverCalled)
+
+  // check if it works again
+  updateCalled = false
+  throwingObserverCalled = false
+  throwingDeepObserverCalled = false
+  t.fails(() => {
+    map.set('z', '3')
+  })
+
+  t.assert(updateCalled)
+  t.assert(throwingObserverCalled)
+  t.assert(throwingDeepObserverCalled)
+
+  t.assert(map.get('z') === '3')
+}
+
 /**
 * @param {t.TestCase} tc
 */
@@ -380,12 +430,12 @@ export const testYmapEventHasCorrectValueWhenSettingAPrimitiveFromOtherUser = tc
 */
 const mapTransactions = [
  function set (user, gen) {
-    let key = prng.oneOf(gen, ['one', 'two'])
+    const key = prng.oneOf(gen, ['one', 'two'])
    var value = prng.utf16String(gen)
    user.getMap('map').set(key, value)
  },
  function setType (user, gen) {
-    let key = prng.oneOf(gen, ['one', 'two'])
+    const key = prng.oneOf(gen, ['one', 'two'])
    var type = prng.oneOf(gen, [new Y.Array(), new Y.Map()])
    user.getMap('map').set(key, type)
    if (type instanceof Y.Array) {
@@ -395,7 +445,7 @@ const mapTransactions = [
    }
  },
  function _delete (user, gen) {
-    let key = prng.oneOf(gen, ['one', 'two'])
+    const key = prng.oneOf(gen, ['one', 'two'])
    user.getMap('map').delete(key)
  }
 ]
--- a/tests/y-text.tests.js
+++ b/tests/y-text.tests.js
@@ -1,5 +1,8 @@
 import * as Y from './testHelper.js'
 import * as t from 'lib0/testing.js'
+import * as prng from 'lib0/prng.js'
+import * as math from 'lib0/math.js'
+
 const { init, compare } = Y

 /**
@@ -81,10 +84,10 @@ export const testBasicFormat = tc => {
 export const testGetDeltaWithEmbeds = tc => {
  const { text0 } = init(tc, { users: 1 })
  text0.applyDelta([{
-    insert: {linebreak: 's'}
+    insert: { linebreak: 's' }
  }])
  t.compare(text0.toDelta(), [{
-    insert: {linebreak: 's'}
+    insert: { linebreak: 's' }
  }])
 }

@@ -127,7 +130,7 @@ export const testSnapshot = tc => {
      delete v.attributes.ychange.user
    }
  })
-  t.compare(state2Diff, [{insert: 'a'}, {insert: 'x', attributes: {ychange: { type: 'added' }}}, {insert: 'b', attributes: {ychange: { type: 'removed' }}}, { insert: 'cd' }])
+  t.compare(state2Diff, [{ insert: 'a' }, { insert: 'x', attributes: { ychange: { type: 'added' } } }, { insert: 'b', attributes: { ychange: { type: 'removed' } } }, { insert: 'cd' }])
 }

 /**
@@ -149,3 +152,220 @@ export const testSnapshotDeleteAfter = tc => {
  const state1 = text0.toDelta(snapshot1)
  t.compare(state1, [{ insert: 'abcd' }])
 }
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testToJson = tc => {
+  const { text0 } = init(tc, { users: 1 })
+  text0.insert(0, 'abc', { bold: true })
+  t.assert(text0.toJSON() === 'abc', 'toJSON returns the unformatted text')
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testToDeltaEmbedAttributes = tc => {
+  const { text0 } = init(tc, { users: 1 })
+  text0.insert(0, 'ab', { bold: true })
+  text0.insertEmbed(1, { image: 'imageSrc.png' }, { width: 100 })
+  const delta0 = text0.toDelta()
+  t.compare(delta0, [{ insert: 'a', attributes: { bold: true } }, { insert: { image: 'imageSrc.png' }, attributes: { width: 100 } }, { insert: 'b', attributes: { bold: true } }])
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testToDeltaEmbedNoAttributes = tc => {
+  const { text0 } = init(tc, { users: 1 })
+  text0.insert(0, 'ab', { bold: true })
+  text0.insertEmbed(1, { image: 'imageSrc.png' })
+  const delta0 = text0.toDelta()
+  t.compare(delta0, [{ insert: 'a', attributes: { bold: true } }, { insert: { image: 'imageSrc.png' } }, { insert: 'b', attributes: { bold: true } }], 'toDelta does not set attributes key when no attributes are present')
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testFormattingRemoved = tc => {
+  const { text0 } = init(tc, { users: 1 })
+  text0.insert(0, 'ab', { bold: true })
+  text0.delete(0, 2)
+  t.assert(Y.getTypeChildren(text0).length === 1)
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testFormattingRemovedInMidText = tc => {
+  const { text0 } = init(tc, { users: 1 })
+  text0.insert(0, '1234')
+  text0.insert(2, 'ab', { bold: true })
+  text0.delete(2, 2)
+  t.assert(Y.getTypeChildren(text0).length === 3)
+}
+
+// RANDOM TESTS
+
+let charCounter = 0
+
+const marks = [
+  { bold: true },
+  { italic: true },
+  { italic: true, color: '#888' }
+]
+
+const marksChoices = [
+  undefined,
+  ...marks
+]
+
+/**
+ * @type Array<function(any,prng.PRNG):void>
+ */
+const qChanges = [
+  /**
+   * @param {Y.Doc} y
+   * @param {prng.PRNG} gen
+   */
+  (y, gen) => { // insert text
+    const ytext = y.getText('text')
+    const insertPos = prng.int32(gen, 0, ytext.toString().length)
+    const attrs = prng.oneOf(gen, marksChoices)
+    const text = charCounter++ + prng.word(gen)
+    ytext.insert(insertPos, text, attrs)
+  },
+  /**
+   * @param {Y.Doc} y
+   * @param {prng.PRNG} gen
+   */
+  (y, gen) => { // insert embed
+    const ytext = y.getText('text')
+    const insertPos = prng.int32(gen, 0, ytext.toString().length)
+    ytext.insertEmbed(insertPos, { image: 'https://user-images.githubusercontent.com/5553757/48975307-61efb100-f06d-11e8-9177-ee895e5916e5.png' })
+  },
+  /**
+   * @param {Y.Doc} y
+   * @param {prng.PRNG} gen
+   */
+  (y, gen) => { // delete text
+    const ytext = y.getText('text')
+    const contentLen = ytext.toString().length
+    const insertPos = prng.int32(gen, 0, contentLen)
+    const overwrite = math.min(prng.int32(gen, 0, contentLen - insertPos), 2)
+    ytext.delete(insertPos, overwrite)
+  },
+  /**
+   * @param {Y.Doc} y
+   * @param {prng.PRNG} gen
+   */
+  (y, gen) => { // format text
+    const ytext = y.getText('text')
+    const contentLen = ytext.toString().length
+    const insertPos = prng.int32(gen, 0, contentLen)
+    const overwrite = math.min(prng.int32(gen, 0, contentLen - insertPos), 2)
+    const format = prng.oneOf(gen, marks)
+    ytext.format(insertPos, overwrite, format)
+  },
+  /**
+   * @param {Y.Doc} y
+   * @param {prng.PRNG} gen
+   */
+  (y, gen) => { // insert codeblock
+    const ytext = y.getText('text')
+    const insertPos = prng.int32(gen, 0, ytext.toString().length)
+    const text = charCounter++ + prng.word(gen)
+    const ops = []
+    if (insertPos > 0) {
+      ops.push({ retain: insertPos })
+    }
+    ops.push({ insert: text }, { insert: '\n', format: { 'code-block': true } })
+    ytext.applyDelta(ops)
+  }
+]
+
+/**
+ * @param {any} result
+ */
+const checkResult = result => {
+  for (let i = 1; i < result.testObjects.length; i++) {
+    const p1 = result.users[i].getText('text').toDelta()
+    const p2 = result.users[i].getText('text').toDelta()
+    t.compare(p1, p2)
+  }
+  // Uncomment this to find formatting-cleanup issues
+  // const cleanups = Y.cleanupYTextFormatting(result.users[0].getText('text'))
+  // t.assert(cleanups === 0)
+  return result
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges1 = tc => {
+  const { users } = checkResult(Y.applyRandomTests(tc, qChanges, 1))
+  const cleanups = Y.cleanupYTextFormatting(users[0].getText('text'))
+  t.assert(cleanups === 0)
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges2 = tc => {
+  const { users } = checkResult(Y.applyRandomTests(tc, qChanges, 2))
+  const cleanups = Y.cleanupYTextFormatting(users[0].getText('text'))
+  t.assert(cleanups === 0)
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges2Repeat = tc => {
+  for (let i = 0; i < 1000; i++) {
+    const { users } = checkResult(Y.applyRandomTests(tc, qChanges, 2))
+    const cleanups = Y.cleanupYTextFormatting(users[0].getText('text'))
+    t.assert(cleanups === 0)
+  }
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges3 = tc => {
+  checkResult(Y.applyRandomTests(tc, qChanges, 3))
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges30 = tc => {
+  checkResult(Y.applyRandomTests(tc, qChanges, 30))
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges40 = tc => {
+  checkResult(Y.applyRandomTests(tc, qChanges, 40))
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges70 = tc => {
+  checkResult(Y.applyRandomTests(tc, qChanges, 70))
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges100 = tc => {
+  checkResult(Y.applyRandomTests(tc, qChanges, 100))
+}
+
+/**
+ * @param {t.TestCase} tc
+ */
+export const testRepeatGenerateQuillChanges300 = tc => {
+  checkResult(Y.applyRandomTests(tc, qChanges, 300))
+}
--- a/tests/y-xml.tests.js
+++ b/tests/y-xml.tests.js
@@ -60,13 +60,13 @@ export const testEvents = tc => {
 */
 export const testTreewalker = tc => {
  const { users, xml0 } = init(tc, { users: 3 })
-  let paragraph1 = new Y.XmlElement('p')
-  let paragraph2 = new Y.XmlElement('p')
-  let text1 = new Y.XmlText('init')
-  let text2 = new Y.XmlText('text')
+  const paragraph1 = new Y.XmlElement('p')
+  const paragraph2 = new Y.XmlElement('p')
+  const text1 = new Y.XmlText('init')
+  const text2 = new Y.XmlText('text')
  paragraph1.insert(0, [text1, text2])
  xml0.insert(0, [paragraph1, paragraph2, new Y.XmlElement('img')])
-  let allParagraphs = xml0.querySelectorAll('p')
+  const allParagraphs = xml0.querySelectorAll('p')
  t.assert(allParagraphs.length === 2, 'found exactly two paragraphs')
  t.assert(allParagraphs[0] === paragraph1, 'querySelectorAll found paragraph1')
  t.assert(allParagraphs[1] === paragraph2, 'querySelectorAll found paragraph2')
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,15 +6,15 @@
    "allowJs": true,                       /* Allow javascript files to be compiled. */
    "checkJs": true,                       /* Report errors in .js files. */
    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    // "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    "declaration": true,                   /* Generates corresponding '.d.ts' file. */
    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
-    // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    // "outDir": "./build",                        /* Redirect output structure to the directory. */
-    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "outFile": "./dist/yjs.js",                       /* Concatenate and emit output to single file. */
+    "outDir": "./dist",                        /* Redirect output structure to the directory. */
+    "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
    // "composite": true,                     /* Enable project compilation */
    // "removeComments": true,                /* Do not emit comments to output. */
-    "noEmit": true,                        /* Do not emit outputs. */
+    // "noEmit": true,                        /* Do not emit outputs. */
    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
@@ -22,6 +22,7 @@
    /* Strict Type-Checking Options */
    "strict": true,                           /* Enable all strict type-checking options. */
    "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    "emitDeclarationOnly": true,
    // "strictNullChecks": true,              /* Enable strict null checks. */
    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
@@ -56,9 +57,8 @@
    /* Experimental Options */
    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
-    "maxNodeModuleJsDepth": 5,
+    // "maxNodeModuleJsDepth": 0,
    // "types": ["./src/utils/typedefs.js"]
  },
-  "include": ["./src/**/*", "./tests/**/*"],
-  "exclude": ["../lib0/**/*", "node_modules/**/*", "dist", "dist/**/*.js"]
+  "include": ["./src/**/*.js", "./tests/**/*.js"]
 }
Author	SHA1	Message	Date
Kevin Jahns	772bb87d5c	13.0.8	2020-05-13 19:29:51 +02:00
Kevin Jahns	dab172fa1d	Rework UndoManager to support changes from other / multiple users	2020-05-13 19:28:30 +02:00
Kevin Jahns	a70c5112cd	fix wrong type declaration in documentation. fixes #195	2020-05-11 11:10:38 +02:00
Kevin Jahns	7cb423c046	13.0.7	2020-05-11 01:46:51 +02:00
Kevin Jahns	4547b35641	cleanup formatting attributes	2020-05-11 01:45:27 +02:00
Kevin Jahns	4c87f9a021	13.0.6	2020-05-08 14:50:53 +02:00
Kevin Jahns	4b08c67e06	bump lib0 to fix critical encoding issue in safari	2020-05-08 14:49:50 +02:00
Kevin Jahns	9f5bc9ddfe	change client id when duplicate content is detected	2020-05-03 16:10:58 +02:00
Kevin Jahns	b399ffa765	add gc information to API docs	2020-04-26 13:24:18 +02:00
Kevin Jahns	180f4667c1	Readme correction: UndoManager accepts options	2020-04-17 02:02:09 +02:00
Kevin Jahns	9455373611	Merge branch 'master' of github.com:yjs/yjs	2020-04-15 20:50:29 +02:00
Kevin Jahns	aa804d89c0	update now.sh links	2020-04-15 19:52:34 +02:00
Kevin Jahns	3ef51a5d1a	run test-exhaustive	2020-04-03 12:11:25 +02:00
Kevin Jahns	e61089c659	npm ci before workflow start	2020-04-03 12:09:13 +02:00
Kevin Jahns	97625cf29b	fix workflow	2020-04-03 12:05:43 +02:00
Kevin Jahns	a5dc6c27aa	Setup github workflow	2020-04-03 12:02:37 +02:00
Kevin Jahns	26a51bafc9	13.0.5	2020-04-02 01:05:04 +02:00
Kevin Jahns	f40e09d156	type fixes for breaking typescript@3.8.* release	2020-04-02 01:03:30 +02:00
Kevin Jahns	81650bc8f6	Merge branch 'gived-ISNIT0/187'	2020-04-01 23:44:40 +02:00
Kevin Jahns	c87caafeb6	lint & refactor PR #187	2020-04-01 23:39:27 +02:00
Kevin Jahns	195b26d90f	Merge branch 'ISNIT0/187' of https://github.com/gived/yjs into gived-ISNIT0/187	2020-04-01 14:05:18 +02:00
Kevin Jahns	7e0189ca84	Merge branch 'master' of github.com:yjs/yjs	2020-04-01 14:04:45 +02:00
Kevin Jahns	192706f2a8	update readme	2020-04-01 14:04:41 +02:00
Joe Reeve	a4ce8ae07d	🐛 fix for #187	2020-03-31 16:06:28 +01:00
Kevin Jahns	e04a980af1	Merge pull request #184 from yjs/readme-cleanup remove deadlinks	2020-03-21 21:50:43 +01:00
Nik Graf	47d40eb6b0	remove deadlinks	2020-03-21 15:51:39 +01:00
Kevin Jahns	fc4a39cc7d	Merge pull request #182 from LucasGenoud/patch-1 Update lib0 to latest version	2020-02-27 18:13:22 +01:00
LucasGenoud	44e1fd9f14	Update lib0 to latest version	2020-02-27 10:51:21 +01:00
Kevin Jahns	02cc5a215f	bump lib0	2020-02-19 09:49:54 -06:00
Kevin Jahns	d1e8d50c43	13.0.4	2020-02-12 10:53:56 +01:00
Kevin Jahns	18bb2d0719	fix imports in esm bundle	2020-02-12 10:52:51 +01:00
Kevin Jahns	45df311dd7	13.0.3	2020-02-12 10:38:28 +01:00
Kevin Jahns	62888b4004	bundle yjs as a module to prevent declaration issues from circular dependencies	2020-02-12 10:37:22 +01:00
Kevin Jahns	76c389dba0	13.0.2	2020-02-03 12:23:39 +01:00
Kevin Jahns	78fa98c000	add type definition for YText.length	2020-02-03 12:22:35 +01:00
Kevin Jahns	e9f9e08450	13.0.1	2020-01-27 03:43:45 +01:00
Kevin Jahns	e3c59b0aa7	more options to gc data (undomanager.clear and tryGc)	2020-01-27 03:42:32 +01:00
Kevin Jahns	705dce7838	add y-indexeddb section	2020-01-23 22:49:04 +01:00
Kevin Jahns	0fb55981ba	13.0.0	2020-01-23 21:53:02 +01:00
Kevin Jahns	89378e29ae	publish stable Yjs release 🎆	2020-01-23 21:51:26 +01:00
Kevin Jahns	cce35270ec	typescript typingis!!! fixes #180	2020-01-23 21:45:56 +01:00
Kevin Jahns	d78180bf97	make opts optional in PermanentUserData	2020-01-23 18:05:12 +01:00
Kevin Jahns	0ab415de3e	13.0.0-108	2020-01-23 05:01:05 +01:00
Kevin Jahns	ff3969caeb	dedupe npm	2020-01-23 05:00:11 +01:00
Kevin Jahns	c82cc9f8d6	lint	2020-01-23 04:59:17 +01:00
Kevin Jahns	ef5c71bd8b	PermanentUserData fixes	2020-01-23 04:58:02 +01:00
Kevin Jahns	bd6be3d23b	13.0.0-107	2020-01-22 16:45:48 +01:00
Kevin Jahns	0e6deab9c9	type toJSON returns	2020-01-22 16:44:30 +01:00
Kevin Jahns	6cd9e2be32	lint	2020-01-22 16:42:16 +01:00
Kevin Jahns	ac8dab1e88	Merge pull request #179 from garth/text-tojson basic Y.Text toJSON returns {unformatted:string}	2020-01-22 16:19:01 +01:00
Garth Williams	38ed725c2c	basic Y.Text toJSON returns unformatted string This avoids text nodes in nested structures returning undefined when toJSON is called by a parent.	2020-01-22 13:34:13 +01:00
Kevin Jahns	a210bad25e	update keywords	2020-01-19 00:43:23 +01:00
Kevin Jahns	6929a4f0f8	13.0.0-106	2020-01-14 05:16:43 +01:00
Kevin Jahns	52dacfa5f2	update package-lock	2020-01-14 05:15:36 +01:00
Kevin Jahns	27efe86f9c	isParentOf	2020-01-14 05:13:51 +01:00
Kevin Jahns	882b9055c7	fix localimports path ending	2020-01-14 02:36:29 +01:00
Kevin Jahns	e089089413	fix debug resolve	2020-01-13 17:03:56 +01:00
Kevin Jahns	197932752e	13.0.0-105	2020-01-13 14:55:05 +01:00
Kevin Jahns	f0b2bdaf34	revert to classic cjs module	2020-01-13 14:54:07 +01:00
Kevin Jahns	b96362c0f1	use correct module script	2020-01-13 07:55:58 +01:00
Kevin Jahns	67f241cd7a	13.0.0-104	2020-01-13 07:48:47 +01:00
Kevin Jahns	c8af0bebf7	fix preversion script	2020-01-13 07:47:43 +01:00
Kevin Jahns	4f35e799a6	update to lib0@.2	2020-01-13 07:41:31 +01:00
Kevin Jahns	eb2a52dd26	update README with podcast links, consulting info, and y-webrtc	2019-12-11 13:26:46 +01:00
Kevin Jahns	189b1068ae	13.0.0-103	2019-12-10 20:52:20 +01:00
Kevin Jahns	7a3b60a5d7	add markdownlint-cli as dep	2019-12-10 20:51:07 +01:00
Kevin Jahns	99f06fc093	bump lib0 for improved encoding performance	2019-12-10 20:46:58 +01:00
Kevin Jahns	22917bca19	fix gc & proper options typings for Y.Doc, fixes #176	2019-12-10 17:51:49 +01:00
Kevin Jahns	7f0e25dcba	permanent user store writes updates in separate transaction	2019-12-10 17:18:57 +01:00
Kevin Jahns	d90c9b1cb2	bump lib0 for faster text encoding	2019-12-10 00:26:28 +01:00
Kevin Jahns	c426055f17	spelling	2019-12-10 00:19:02 +01:00
Kevin Jahns	18c9010b63	Merge branch 'master' of github.com:y-js/yjs	2019-11-26 13:02:49 +01:00
Kevin Jahns	c3edac62ef	doc typo	2019-11-26 13:02:43 +01:00
Kevin Jahns	755de18fd5	Create Funding.yml	2019-11-07 14:41:50 +01:00
Kevin Jahns	641dc25076	13.0.0-102	2019-10-25 23:47:23 +02:00
Kevin Jahns	1d58ea785f	Merge branch 'master' of github.com:yjs/yjs	2019-10-25 23:45:50 +02:00
Kevin Jahns	f53dff5043	delay errors in observe callbacks to throw after cleanup is done	2019-10-25 23:44:09 +02:00
Kevin Jahns	74d1a31f49	Merge pull request #174 from boschDev/master Fix attrs loop in yXmlText	2019-10-15 17:19:30 +02:00
Roeland Bosch	d1063ab70b	Fix attrs loop in yXmlText	2019-10-15 17:07:20 +02:00
Kevin Jahns	f4c919d9ec	13.0.0-101	2019-10-08 18:33:50 +02:00
Kevin Jahns	aeb23dbaa9	follow redone items to prevent some undo-redo issues. Fixes #162	2019-10-08 18:31:56 +02:00
Kevin Jahns	6d4f0c0cdd	13.0.0-100	2019-10-08 17:40:32 +02:00
Kevin Jahns	303138f309	sanitize items before undoing. fixes #165	2019-10-08 17:36:00 +02:00
Kevin Jahns	ad373a3dce	Merge pull request #172 from istvank/patch-1 Fixing Y.Map's documentation of forEach	2019-10-05 20:09:53 +02:00
István Koren	2150fa58f2	Fixing Y.Map's documentation of forEach fixes #171 As always, it's an honor to submit a PR! 🐒 There was also a missing dot in the Y.XmlFragment title.	2019-10-05 15:14:30 +02:00
Kevin Jahns	ece4841b5c	update stackItem.meta doc	2019-10-03 22:06:07 +02:00
Kevin Jahns	8103220c05	Merge branch 'master' of github.com:yjs/yjs	2019-09-30 11:10:13 +02:00
Kevin Jahns	66d500f08d	YEvent: consider case that item was added & removed in the same transaction	2019-09-30 11:10:03 +02:00
Kevin Jahns	5f8e7c7ba7	Merge pull request #169 from yjs/improve-readme update quill cursors support	2019-09-23 11:22:51 +02:00
Nik Graf	7b8eee6b25	update quill cursors support	2019-09-23 11:22:24 +02:00