v13.0.0-46 -- distribution files

examples/html-editor/index.js

@@ -4,14 +4,14 @@ window.onload = function () {
   window.yXmlType.bindToDom(document.body)
 }
 
-const persistence = new Y.IndexedDB()
+let persistence = null //  new Y.IndexedDBPersistence()
 
 // initialize a shared object. This function call returns a promise!
-let y = new Y('htmleditor', {
+let y = new Y({
   connector: {
     name: 'websockets-client',
     url: 'http://127.0.0.1:1234',
-    room: 'html-editor'
+    room: 'x'
     // maxBufferLength: 100
   }
 }, persistence)

examples/indexeddb/index.js

@@ -1,18 +1,24 @@
 /* global Y, CodeMirror */
 
-const persistence = new Y.IndexedDB()
-const connector = {
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
   connector: {
     name: 'websockets-client',
     room: 'codemirror-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    codemirror: 'Text' // y.share.codemirror is of type Y.Text
   }
-}
-// initialize a shared object. This function call returns a promise!
-const y = Y('codemirror-example', connector, persistence)
-window.yCodeMirror = y
+}).then(function (y) {
+  window.yCodeMirror = y
 
-var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
-  mode: 'javascript',
-  lineNumbers: true
+  var editor = CodeMirror(document.querySelector('#codeMirrorContainer'), {
+    mode: 'javascript',
+    lineNumbers: true
+  })
+  y.share.codemirror.bindCodeMirror(editor)
 })
-y.share.codemirror.bindCodeMirror(editor)

examples/yjs-dist.mjs

@@ -1,9 +1,9 @@
 
 import Y from '../src/Y.js'
 import yWebsocketsClient from '../../y-websockets-client/src/y-websockets-client.js'
-import extendYIndexedDBPersistence from '../../y-indexeddb/src/y-indexeddb.js'
+import IndexedDBPersistence from '../../y-indexeddb/src/y-indexeddb.js'
 
 Y.extend(yWebsocketsClient)
-extendYIndexedDBPersistence(Y)
+Y.IndexedDBPersistence = IndexedDBPersistence
 
 export default Y

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-47",
+  "version": "13.0.0-46",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "yjs",
-  "version": "13.0.0-47",
+  "version": "13.0.0-46",
   "description": "A framework for real-time p2p shared editing on any data",
   "main": "./y.node.js",
   "browser": "./y.js",

src/Persistence.js

@@ -25,55 +25,32 @@ export default class AbstractPersistence {
     if (cnf === undefined) {
       cnf = getFreshCnf()
       this.ys.set(y, cnf)
-      return this.init(y).then(() => {
-        y.on('afterTransaction', (y, transaction) => {
-          let cnf = this.ys.get(y)
-          if (cnf.len > 0) {
-            cnf.buffer.setUint32(0, cnf.len)
-            this.saveUpdate(y, cnf.buffer.createBuffer(), transaction)
-            let _cnf = getFreshCnf()
-            for (let key in _cnf) {
-              cnf[key] = _cnf[key]
-            }
+      this.init(y)
+      y.on('afterTransaction', (y, transaction) => {
+        let cnf = this.ys.get(y)
+        if (cnf.len > 0) {
+          cnf.buffer.setUint32(0, cnf.len)
+          this.saveUpdate(y, cnf.buffer.createBuffer(), transaction)
+          let _cnf = getFreshCnf()
+          for (let key in _cnf) {
+            cnf[key] = _cnf[key]
           }
-        })
-        return this.retrieve(y)
-      }).then(function () {
-        return Promise.resolve(cnf)
+        }
       })
-    } else {
-      return Promise.resolve(cnf)
     }
+    return this.retrieve(y).then(function () {
+      return Promise.resolve(cnf)
+    })
   }
+
   deinit (y) {
     this.ys.delete(y)
-    y.persistence = null
   }
 
   destroy () {
     this.ys = null
   }
 
-  /**
-   * Remove all persisted data that belongs to a room.
-   * Automatically destroys all Yjs all Yjs instances that persist to
-   * the room. If `destroyYjsInstances = false` the persistence functionality
-   * will be removed from the Yjs instances.
-   *
-   * ** Must be overwritten! **
-   */
-  removePersistedData (room, destroyYjsInstances = true) {
-    this.ys.forEach((cnf, y) => {
-      if (y.room === room) {
-        if (destroyYjsInstances) {
-          y.destroy()
-        } else {
-          this.deinit(y)
-        }
-      }
-    })
-  }
-
   /* overwrite */
   saveUpdate (buffer) {
   }
@@ -98,17 +75,17 @@ export default class AbstractPersistence {
       y.transact(function () {
         if (model != null) {
           fromBinary(y, new BinaryDecoder(new Uint8Array(model)))
+          y._setContentReady()
         }
         if (updates != null) {
           for (let i = 0; i < updates.length; i++) {
             integrateRemoteStructs(y, new BinaryDecoder(new Uint8Array(updates[i])))
+            y._setContentReady()
           }
         }
       })
-      y.emit('persistenceReady')
     })
   }
-
   /* overwrite */
   persist (y) {
     return toBinary(y).createBuffer()

src/Util/NamedEventHandler.js

@@ -1,7 +1,6 @@
 export default class NamedEventHandler {
   constructor () {
     this._eventListener = new Map()
-    this._stateListener = new Map()
   }
   _getListener (name) {
     let listeners = this._eventListener.get(name)
@@ -22,20 +21,6 @@ export default class NamedEventHandler {
     let listeners = this._getListener(name)
     listeners.on.add(f)
   }
-  _initStateListener (name) {
-    let state = this._stateListener.get(name)
-    if (state === undefined) {
-      state = {}
-      state.promise = new Promise(function (resolve) {
-        state.resolve = resolve
-      })
-      this._stateListener.set(name, state)
-    }
-    return state
-  }
-  when (name) {
-    return this._initStateListener(name).promise
-  }
   off (name, f) {
     if (name == null || f == null) {
       throw new Error('You must specify event name and function!')
@@ -47,7 +32,6 @@ export default class NamedEventHandler {
     }
   }
   emit (name, ...args) {
-    this._initStateListener(name).resolve()
     const listener = this._eventListener.get(name)
     if (listener !== undefined) {
       listener.on.forEach(f => f.apply(null, args))

src/Y.js

@@ -5,7 +5,6 @@ import { generateUserID } from './Util/generateUserID.js'
 import RootID from './Util/RootID.js'
 import NamedEventHandler from './Util/NamedEventHandler.js'
 import UndoManager from './Util/UndoManager.js'
-import { integrateRemoteStructs } from './MessageHandler/integrateRemoteStructs.js'
 
 import { messageToString, messageToRoomname } from './MessageHandler/messageToString.js'
 
@@ -62,15 +61,6 @@ export default class Y extends NamedEventHandler {
       this.emit('content')
     }
   }
-  whenContentReady () {
-    if (this._contentReady) {
-      return Promise.resolve()
-    } else {
-      return new Promise(resolve => {
-        this.once('content', resolve)
-      })
-    }
-  }
   _beforeChange () {}
   transact (f, remote = false) {
     let initialCall = this._transaction === null
@@ -202,8 +192,7 @@ Y.utils = {
   UndoManager,
   getRelativePosition,
   fromRelativePosition,
-  addType,
-  integrateRemoteStructs
+  addType
 }
 
 Y.debug = debug

y.node.js

@@ -1,7 +1,7 @@
 
 /**
  * yjs - A framework for real-time p2p shared editing on any data
- * @version v13.0.0-47
+ * @version v13.0.0-46
  * @license MIT
  */
 
@@ -3591,7 +3591,6 @@ function generateUserID () {
 class NamedEventHandler {
   constructor () {
     this._eventListener = new Map();
-    this._stateListener = new Map();
   }
   _getListener (name) {
     let listeners = this._eventListener.get(name);
@@ -3612,20 +3611,6 @@ class NamedEventHandler {
     let listeners = this._getListener(name);
     listeners.on.add(f);
   }
-  _initStateListener (name) {
-    let state = this._stateListener.get(name);
-    if (state === undefined) {
-      state = {};
-      state.promise = new Promise(function (resolve) {
-        state.resolve = resolve;
-      });
-      this._stateListener.set(name, state);
-    }
-    return state
-  }
-  when (name) {
-    return this._initStateListener(name).promise
-  }
   off (name, f) {
     if (name == null || f == null) {
       throw new Error('You must specify event name and function!')
@@ -3637,7 +3622,6 @@ class NamedEventHandler {
     }
   }
   emit (name, ...args) {
-    this._initStateListener(name).resolve();
     const listener = this._eventListener.get(name);
     if (listener !== undefined) {
       listener.on.forEach(f => f.apply(null, args));
@@ -4658,55 +4642,32 @@ class AbstractPersistence {
     if (cnf === undefined) {
       cnf = getFreshCnf();
       this.ys.set(y, cnf);
-      return this.init(y).then(() => {
-        y.on('afterTransaction', (y, transaction) => {
-          let cnf = this.ys.get(y);
-          if (cnf.len > 0) {
-            cnf.buffer.setUint32(0, cnf.len);
-            this.saveUpdate(y, cnf.buffer.createBuffer(), transaction);
-            let _cnf = getFreshCnf();
-            for (let key in _cnf) {
-              cnf[key] = _cnf[key];
-            }
+      this.init(y);
+      y.on('afterTransaction', (y, transaction) => {
+        let cnf = this.ys.get(y);
+        if (cnf.len > 0) {
+          cnf.buffer.setUint32(0, cnf.len);
+          this.saveUpdate(y, cnf.buffer.createBuffer(), transaction);
+          let _cnf = getFreshCnf();
+          for (let key in _cnf) {
+            cnf[key] = _cnf[key];
           }
-        });
-        return this.retrieve(y)
-      }).then(function () {
-        return Promise.resolve(cnf)
-      })
-    } else {
-      return Promise.resolve(cnf)
+        }
+      });
     }
+    return this.retrieve(y).then(function () {
+      return Promise.resolve(cnf)
+    })
   }
+
   deinit (y) {
     this.ys.delete(y);
-    y.persistence = null;
   }
 
   destroy () {
     this.ys = null;
   }
 
-  /**
-   * Remove all persisted data that belongs to a room.
-   * Automatically destroys all Yjs all Yjs instances that persist to
-   * the room. If `destroyYjsInstances = false` the persistence functionality
-   * will be removed from the Yjs instances.
-   *
-   * ** Must be overwritten! **
-   */
-  removePersistedData (room, destroyYjsInstances = true) {
-    this.ys.forEach((cnf, y) => {
-      if (y.room === room) {
-        if (destroyYjsInstances) {
-          y.destroy();
-        } else {
-          this.deinit(y);
-        }
-      }
-    });
-  }
-
   /* overwrite */
   saveUpdate (buffer) {
   }
@@ -4731,17 +4692,17 @@ class AbstractPersistence {
       y.transact(function () {
         if (model != null) {
           fromBinary(y, new BinaryDecoder(new Uint8Array(model)));
+          y._setContentReady();
         }
         if (updates != null) {
           for (let i = 0; i < updates.length; i++) {
             integrateRemoteStructs(y, new BinaryDecoder(new Uint8Array(updates[i])));
+            y._setContentReady();
           }
         }
       });
-      y.emit('persistenceReady');
     });
   }
-
   /* overwrite */
   persist (y) {
     return toBinary(y).createBuffer()
@@ -4788,15 +4749,6 @@ class Y$1 extends NamedEventHandler {
       this.emit('content');
     }
   }
-  whenContentReady () {
-    if (this._contentReady) {
-      return Promise.resolve()
-    } else {
-      return new Promise(resolve => {
-        this.once('content', resolve);
-      })
-    }
-  }
   _beforeChange () {}
   transact (f, remote = false) {
     let initialCall = this._transaction === null;
@@ -4928,8 +4880,7 @@ Y$1.utils = {
   UndoManager,
   getRelativePosition,
   fromRelativePosition,
-  addType: addStruct,
-  integrateRemoteStructs
+  addType: addStruct
 };
 
 Y$1.debug = browser;