Deploy 10.0.2

Deploy 10.0.1
added xml example
2016-03-23 14:42:23 +01:00 · 2016-03-23 14:41:04 +01:00 · 2016-03-14 19:45:50 +01:00 · 2016-02-24 12:00:45 +01:00 · 2016-02-24 12:00:02 +01:00 · 2016-02-23 15:50:16 +01:00
14 changed files with 521 additions and 181 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-node_modules
 bower_components
-.directory
-.codio
-.settings
-.jshintignore
-.jshintrc
-.validate.json
--- a/Examples/Ace/index.html
+++ b/Examples/Ace/index.html
@@ -2,18 +2,28 @@
 <html>
  <head>
    <style type="text/css" media="screen">
-    #editor { 
+    #ace { 
        position: absolute;
        top: 0;
        right: 0;
        bottom: 0;
        left: 0;
    }
+    .inserted {
+      position:absolute;
+      z-index:20;
+      background-color: #FFC107;
+    }
+    .deleted {
+      position:absolute;
+      z-index:20;
+      background-color: #FFC107;
+    }
    </style>
  </head>
  <body>

-    <div id="editor"></div>
+    <div id="ace"></div>
    <script src="../bower_components/yjs/y.es6"></script>
    <script src="../bower_components/ace-builds/src/ace.js"></script>
    
--- a/Examples/Ace/index.js
+++ b/Examples/Ace/index.js
@@ -8,8 +8,6 @@ Y({
  connector: {
    name: 'websockets-client',
    room: 'ace-example'
-    // debug: true
-    // url: 'http://127.0.0.1:2345'
  },
  sourceDir: '/bower_components',
  share: {
@@ -19,10 +17,9 @@ Y({
  window.yAce = y

  // bind the textarea to a shared text element
-  var editor = ace.edit('editor')
-  editor.setTheme('ace/theme/monokai')
+  var editor = ace.edit('ace')
+  editor.setTheme('ace/theme/chrome')
  editor.getSession().setMode('ace/mode/javascript')

  y.share.ace.bindAce(editor)
-  // thats it..
 })
--- a/Examples/Quill/index.js
+++ b/Examples/Quill/index.js
@@ -8,8 +8,7 @@ Y({
  },
  connector: {
    name: 'websockets-client',
-    room: 'richtext-example',
-    debug: true
+    room: 'richtext-example'
    // url: 'http://127.0.0.1:1234'
  },
  sourceDir: '/bower_components',
--- a/Examples/Textarea/index.html
+++ b/Examples/Textarea/index.html
@@ -2,7 +2,7 @@
 <html>
 <body>
  <textarea style="width:80%;" rows=40 id="textfield" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"></textarea>
-  <script src="../bower_components/yjs/y.js"></script>
+  <script src="../bower_components/yjs/y.es6"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/Examples/Xml/index.html
+++ b/Examples/Xml/index.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<body>
+  <script src="../bower_components/yjs/y.es6"></script>
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0-beta1/jquery.min.js"></script>
+  <script src="./index.js"></script>
+</body>
+</html>
--- a/Examples/Xml/index.js
+++ b/Examples/Xml/index.js
@@ -0,0 +1,24 @@
+/* global Y */
+
+// initialize a shared object. This function call returns a promise!
+Y({
+  db: {
+    name: 'memory'
+  },
+  connector: {
+    name: 'websockets-client',
+    // url: 'http://127.0.0.1:1234',
+    room: 'Xml-example'
+  },
+  sourceDir: '/bower_components',
+  share: {
+    xml: 'Xml("p")' // y.share.xml is of type Y.Xml with tagname "p"
+  }
+}).then(function (y) {
+  window.yXml = y
+  // bind xml type to a dom, and put it in body
+  y.share.xml.getDom().then(function (dom) {
+    window.sharedDom = dom
+    document.body.appendChild(dom)
+  })
+})
--- a/Examples/bower.json
+++ b/Examples/bower.json
@@ -9,15 +9,15 @@
  "license": "MIT",
  "ignore": [],
  "dependencies": {
-    "yjs": "~0.7.6",
-    "y-array": "~0.7.5",
-    "y-map": "~0.7.2",
-    "y-memory": "~0.7.0",
-    "y-richtext": "~0.7.5",
-    "y-webrtc": "~0.7.1",
-    "y-websockets-client": "~0.7.10",
-    "y-text": "~0.7.1",
-    "y-indexeddb": "~0.7.1",
+    "yjs": "latest",
+    "y-array": "latest",
+    "y-map": "latest",
+    "y-memory": "latest",
+    "y-richtext": "latest",
+    "y-webrtc": "latest",
+    "y-websockets-client": "latest",
+    "y-text": "latest",
+    "y-indexeddb": "latest",
    "quill": "~0.20.1",
    "ace": "~1.2.3",
    "ace-builds": "~1.2.3"
--- a/README.md
+++ b/README.md
@@ -3,22 +3,20 @@

 Yjs is a framework for optimistic concurrency control and automatic conflict resolution on shared data. The framework provides similar functionality as [ShareJs] and [OpenCoweb], but supports peer-to-peer communication protocols by default. Yjs was designed to handle concurrent actions on arbitrary data like Text, Json, and XML. We also provide support for storing and manipulating your shared data offline. For more information and demo applications visit our [homepage](http://y-js.org/).

-**NOTE** This project is currently migrating. So there may exist some information that is not true anymore..
-
 You can create you own shared types easily.
 Therefore, you can design the sturcture of your custom type,
 and ensure data validity, while Yjs ensures data consistency (everyone will eventually end up with the same data).
-We already provide data types for
+We already provide abstract data types for

 | Name     | Description       |
 |----------|-------------------|
-|[map](https://github.com/y-js/y-map) | Add, update, and remove properties of an object. Included in Yjs|
-|[array](https://github.com/y-js/y-array) | A shared linked list 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 textareas, input elements, or HTML elements (e.g. *h1*, or *p*)|
-|[richtext](https://github.com/y-js/y-richtext) | Collaborate on rich text. Supports two way binding to several editors|
+|[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 textareas, input elements, or HTML elements (e.g. <*h1*>, or <*p*>). Also supports the [Ace Editor](https://ace.c9.io) |
+|[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/)|

-Yjs supports P2P message propagation, and not bound to a specific communication protocol. Therefore, Yjs is extremely scalable and can be used in a wide range of application scenarios.
+Yjs supports P2P message propagation, and is not bound to a specific communication protocol. Therefore, Yjs is extremely scalable and can be used in a wide range of application scenarios.

 We support several communication protocols as so called *Connectors*.
 You can create your own connector too - read [this wiki page](https://github.com/y-js/yjs/wiki/Custom-Connectors).
@@ -36,13 +34,13 @@ You are not limited to use a specific database to store the shared data. We prov
 |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 |
+|[indexeddb](https://github.com/y-js/y-indexeddb) | Offline storage for the browser |

 You can use Yjs client-, and server- side. You can get it as via npm, and bower. We even provide polymer elements for Yjs!

 The advantages over similar frameworks are support for
 * .. P2P message propagation and arbitrary communication protocols
-* .. arbitrary complex data types
+* .. share any type of data. The types provide a convenient interface
 * .. offline support: Changes are stored persistently and only relevant changes are propagated on rejoin
 * .. Intention Preservation: When working on Text, the intention of your changes are preserved. This is particularily important when working offline. Every type has a notion on how we define Intention Preservation on it.

@@ -51,7 +49,7 @@ Install yjs and its modules with [bower](http://bower.io/), or with [npm](https:

 ### Bower
 ```
-bower install yjs
+bower install yjs --save
 ```
 Then you include the libraries directly from the installation folder.
 ```
@@ -85,24 +83,113 @@ Y({
  share: {
    textarea: 'Text' // y.share.textarea is of type Y.Text
  }
-  // modules: ['Richtext', 'Array'] // optional list of modules you want to import
+  // types: ['Richtext', 'Array'] // optional list of types you want to import
 }).then(function (y) {
  // bind the textarea to a shared text element
  y.share.textarea.bind(document.getElementById('textfield'))
 }
 ```

-# Status
-Yjs is a work in progress. Different versions of the *y-* repositories may not work together. Just drop me a line if you run into troubles.
+# Api
+
+### Y(options)
+* 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. 
+  * Have a look at the used connector repository to see all available options.
+* options.sourceDir
+  * Path where all y-* modules are stored.
+  * Defaults to `/bower_components`
+  * Not required when running on `nodejs` / `iojs`
+  * When using browserify you can specify all used modules like this:
+```
+var Y = require('yjs')
+// you need to require the 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'll only share data if they specified the same type with the same property name
+* options.type
+  * 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.reconnect()
+  * Try to reconnect to the other instances (needs to be supported by the connector)
+  * Not supported by y-xmpp 
+* y.destroy()
+  * Destroy this object.
+  * Destroys all types (they will throw weird errors if you still use them)
+  * Disconnects from the other instances (via connector)
+  * Removes all data from the database
+* y.db.stopGarbageCollector()
+  * Stop the garbage collector. Call y.db.garbageCollect() to continue garbage collection
+* 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**

 ## Get 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 may help you with your problem, and answer your questions.

 Please report _any_ issues to the [Github issue page](https://github.com/y-js/yjs/issues)! I try to fix them very soon, if possible.
+If you want to see an issue fixed, please subscribe to the thread (or remind me via gitter).
+

 ## Changelog
-### 1.0.0
-This is a complete rewrite of the 0.5 version of Yjs. Since Yjs 1.0 it is possible to work asynchronously on a persistent database, which enables offline support.
+
+### 10.0.0
+
+* Support for more complex types (a type can be a composition of several types)
+* Fixes several memory leaks
+
+### 9.0.0
+There were several rolling updates from 0.6 to 0.8. We consider Yjs stable since a long time, 
+and intend to continue stable releases. From this release forward y-* modules will implement peer-dependencies for npm, and dependencies for bower.
+Furthermore, incompatible yjs instances will now throw errors when syncing - this feature was influenced by #48. The versioning jump was influenced by react (see [here](https://facebook.github.io/react/blog/2016/02/19/new-versioning-scheme.html))
+
+
+### 0.6.0
+This is a complete rewrite of the 0.5 version of Yjs. Since Yjs 0.6.0 it is possible to work asynchronously on a persistent database, which enables offline support.
 * Switched to semver versioning
 * Requires a promise implementation in environment (es6 promises suffice, included in all the major browsers). Otherwise you have to include a polyfill
 * Y.Object has been renamed to Y.Map
--- a/bower.json
+++ b/bower.json
@@ -1,19 +1,21 @@
 {
  "name": "yjs",
-  "version": "0.8.13",
+  "version": "10.0.2",
  "homepage": "y-js.org",
  "authors": [
    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
  ],
-  "description": "A Framework that enables Real-Time collaboration on arbitrary data structures.",
-  "main": "y.js",
+  "description": "A Framework for shared editing on any data",
+  "main": "./y.js",
  "keywords": [
+    "Yjs",
    "OT",
-    "collaboration",
-    "synchronization",
-    "sharejs",
-    "coweb",
-    "concurrency"
+    "Collaboration",
+    "Synchronization",
+    "ShareJS",
+    "Coweb",
+    "Concurrency"
  ],
-  "license": "MIT"
+  "license": "MIT",
+  "ignore": []
 }
--- a/y.es6
+++ b/y.es6
@@ -20,6 +20,8 @@ module.exports = function (Y/* :any */) {
    userId: UserId;
    send: Function;
    broadcast: Function;
+    broadcastOpBuffer: Array<Operation>;
+    protocolVersion: number;
    */
    /*
      opts contains the following information:
@@ -52,6 +54,7 @@ module.exports = function (Y/* :any */) {
      this.broadcastedHB = false
      this.syncStep2 = Promise.resolve()
      this.broadcastOpBuffer = []
+      this.protocolVersion = 10
    }
    reconnect () {
    }
@@ -150,7 +153,8 @@ module.exports = function (Y/* :any */) {
          conn.send(syncUser, {
            type: 'sync step 1',
            stateSet: stateSet,
-            deleteSet: deleteSet
+            deleteSet: deleteSet,
+            protocolVersion: conn.protocolVersion
          })
        })
      } else {
@@ -208,6 +212,18 @@ module.exports = function (Y/* :any */) {
      if (this.debug) {
        console.log(`receive ${sender} -> ${this.userId}: ${message.type}`, JSON.parse(JSON.stringify(message))) // eslint-disable-line
      }
+      if (message.protocolVersion != null && message.protocolVersion !== this.protocolVersion) {
+        console.error(
+          `You tried to sync with a yjs instance that has a different protocol version
+          (You: ${this.protocolVersion}, Client: ${message.protocolVersion}).
+          The sync was stopped. You need to upgrade your dependencies (especially Yjs & the Connector)!
+          `)
+        this.send(sender, {
+          type: 'sync stop',
+          protocolVersion: this.protocolVersion
+        })
+        return
+      }
      if (message.type === 'sync step 1') {
        // TODO: make transaction, stream the ops
        let conn = this
@@ -222,7 +238,8 @@ module.exports = function (Y/* :any */) {
            type: 'sync step 2',
            os: ops,
            stateSet: currentStateSet,
-            deleteSet: ds
+            deleteSet: ds,
+            protocolVersion: this.protocolVersion
          })
          if (this.forwardToSyncingClients) {
            conn.syncingClients.push(sender)
@@ -652,6 +669,18 @@ module.exports = function (Y /* :any */) {
        garbageCollect()
      }
    }
+    emptyGarbageCollector () {
+      return new Promise(resolve => {
+        var check = () => {
+          if (this.gc1.length > 0 || this.gc2.length > 0) {
+            this.garbageCollect().then(check)
+          } else {
+            resolve()
+          }
+        }
+        setTimeout(check, 0)
+      })
+    }
    addToDebug () {
      if (typeof YConcurrency_TestingMode !== 'undefined') {
        var command /* :string */ = Array.prototype.map.call(arguments, function (s) {
@@ -718,9 +747,17 @@ module.exports = function (Y /* :any */) {
      this.gc2 = this.gc2.filter(filter)
      delete op.gc
    }
-    destroy () {
+    * destroy () {
      clearInterval(this.gcInterval)
      this.gcInterval = null
+      for (var key in this.initializedTypes) {
+        var type = this.initializedTypes[key]
+        if (type._destroy != null) {
+          type._destroy()
+        } else {
+          console.error('The type you included does not provide destroy functionality, it will remain in memory (updating your packages will help).')
+        }
+      }
    }
    setUserId (userId) {
      if (!this.userIdPromise.inProgress) {
@@ -739,9 +776,7 @@ module.exports = function (Y /* :any */) {
      this.userIdPromise.then(f)
    }
    getNextOpId () {
-      if (this._nextUserId != null) {
-        return this._nextUserId
-      } else if (this.userId == null) {
+      if (this.userId == null) {
        throw new Error('OperationStore not yet initialized!')
      } else {
        return [this.userId, this.opClock++]
@@ -756,10 +791,13 @@ module.exports = function (Y /* :any */) {
      * check if was deleted, apply a delete operation after op was applied
    */
    apply (ops) {
-      for (var key in ops) {
-        var o = ops[key]
+      for (var i = 0; i < ops.length; i++) {
+        var o = ops[i]
        if (o.id == null || o.id[0] !== this.y.connector.userId) {
          var required = Y.Struct[o.struct].requiredOps(o)
+          if (o.requires != null) {
+            required = required.concat(o.requires)
+          }
          this.whenOperationsExist(required, o)
        }
      }
@@ -775,8 +813,8 @@ module.exports = function (Y /* :any */) {
          missing: ids.length
        }

-        for (let key in ids) {
-          let id = ids[key]
+        for (let i = 0; i < ids.length; i++) {
+          let id = ids[i]
          let sid = JSON.stringify(id)
          let l = this.listenersById[sid]
          if (l == null) {
@@ -819,8 +857,8 @@ module.exports = function (Y /* :any */) {
          if (op == null) {
            store.listenersById[sid] = l
          } else {
-            for (let key in l) {
-              let listener = l[key]
+            for (let i = 0; i < l.length; i++) {
+              let listener = l[i]
              let o = listener.op
              if (--listener.missing === 0) {
                yield* store.tryExecute.call(this, o)
@@ -872,15 +910,7 @@ module.exports = function (Y /* :any */) {
        }
      } else {
        // increase SS
-        var o = op
-        var state = yield* transaction.getState(op.id[0])
-        while (o != null && o.id[1] === state.clock && op.id[0] === o.id[0]) {
-          // either its a new operation (1. case), or it is an operation that was deleted, but is not yet in the OS
-          state.clock++
-          yield* transaction.checkDeleteStoreForState(state)
-          o = yield* transaction.os.findNext(o.id)
-        }
-        yield* transaction.setState(state)
+        yield* transaction.updateState(op.id[0])

        // notify whenOperation listeners (by id)
        var sid = JSON.stringify(op.id)
@@ -897,6 +927,15 @@ module.exports = function (Y /* :any */) {
        }
        var t = this.initializedTypes[JSON.stringify(op.parent)]

+        // if parent is deleted, mark as gc'd and return
+        if (op.parent != null) {
+          var parentIsDeleted = yield* transaction.isDeleted(op.parent)
+          if (parentIsDeleted) {
+            yield* transaction.deleteList(op.id)
+            return
+          }
+        }
+
        // Delete if DS says this is actually deleted
        var opIsDeleted = yield* transaction.isDeleted(op.id)
        if (!op.deleted && opIsDeleted) {
@@ -909,7 +948,12 @@ module.exports = function (Y /* :any */) {

        // notify parent, if it was instanciated as a custom type
        if (t != null) {
-          yield* t._changed(transaction, Y.utils.copyObject(op))
+          let o = Y.utils.copyObject(op)
+          if (opIsDeleted && !o.deleted) {
+            // op did not reflect the created delete op (happens when not using y-memory)
+            o.deleted = true
+          }
+          yield* t._changed(transaction, o)
        }
      }
    }
@@ -1040,7 +1084,7 @@ module.exports = function (Y/* :any */) {
        if (op.parentSub != null) {
          e.parentSub = op.parentSub
        }
-        if (op.opContent != null) {
+        if (op.hasOwnProperty('opContent')) {
          e.opContent = op.opContent
        } else {
          e.content = op.content
@@ -1235,11 +1279,18 @@ module.exports = function (Y/* :any */) {
        }
      },
      encode: function (op) {
-        return {
+        var e = {
          struct: 'List',
          id: op.id,
          type: op.type
        }
+        if (op.requires != null) {
+          e.requires = op.requires
+        }
+        if (op.info != null) {
+          e.info = op.info
+        }
+        return e
      },
      requiredOps: function () {
        /*
@@ -1308,12 +1359,19 @@ module.exports = function (Y/* :any */) {
        }
      },
      encode: function (op) {
-        return {
+        var e = {
          struct: 'Map',
          type: op.type,
          id: op.id,
          map: {} // overwrite map!!
        }
+        if (op.requires != null) {
+          e.requires = op.requires
+        }
+        if (op.info != null) {
+          e.info = op.info
+        }
+        return e
      },
      requiredOps: function () {
        return []
@@ -1430,26 +1488,52 @@ module.exports = function (Y/* :any */) {
      If it does not exist yes, create it.
      TODO: delete type from store.initializedTypes[id] when corresponding id was deleted!
    */
-    * getType (id) {
+    * getType (id, args) {
      var sid = JSON.stringify(id)
      var t = this.store.initializedTypes[sid]
      if (t == null) {
        var op/* :MapStruct | ListStruct */ = yield* this.getOperation(id)
        if (op != null) {
-          t = yield* Y[op.type].initType.call(this, this.store, op)
+          t = yield* Y[op.type].typeDefinition.initType.call(this, this.store, op, args)
          this.store.initializedTypes[sid] = t
        }
      }
      return t
    }
-    * createType (typedefinition) {
-      var structname = typedefinition.struct
-      var id = this.store.getNextOpId()
-      var op = Y.Struct[structname].create(id)
-      op.type = typedefinition.name
-      yield* this.applyCreatedOperations([op])
-      return yield* this.getType(id)
+    * createType (typedefinition, id) {
+      var structname = typedefinition[0].struct
+      id = id || this.store.getNextOpId()
+      var op
+      if (id[0] === '_') {
+        op = yield* this.getOperation(id)
+      } else {
+        op = Y.Struct[structname].create(id)
+        op.type = typedefinition[0].name
+      }
+      if (typedefinition[0].appendAdditionalInfo != null) {
+        yield* typedefinition[0].appendAdditionalInfo.call(this, op, typedefinition[1])
+      }
+      if (op[0] === '_') {
+        yield* this.setOperation(op)
+      } else {
+        yield* this.applyCreatedOperations([op])
+      }
+      return yield* this.getType(id, typedefinition[1])
    }
+    /* createType (typedefinition, id) {
+      var structname = typedefinition[0].struct
+      id = id || this.store.getNextOpId()
+      var op = Y.Struct[structname].create(id)
+      op.type = typedefinition[0].name
+      if (typedefinition[0].appendAdditionalInfo != null) {
+        yield* typedefinition[0].appendAdditionalInfo.call(this, op, typedefinition[1])
+      }
+      // yield* this.applyCreatedOperations([op])
+      yield* Y.Struct[op.struct].execute.call(this, op)
+      yield* this.addOperation(op)
+      yield* this.store.operationAdded(this, op)
+      return yield* this.getType(id, typedefinition[1])
+    }*/
    /*
      Apply operations that this user created (no remote ones!)
        * does not check for Struct.*.requiredOps()
@@ -1460,7 +1544,7 @@ module.exports = function (Y/* :any */) {
      for (var i = 0; i < ops.length; i++) {
        var op = ops[i]
        yield* this.store.tryExecute.call(this, op)
-        if (op.id == null || op.id[0] !== '_') {
+        if (op.id == null || typeof op.id[1] !== 'string') {
          send.push(Y.Struct[op.struct].encode(op))
        }
      }
@@ -1471,17 +1555,21 @@ module.exports = function (Y/* :any */) {
    }

    * deleteList (start) {
-      if (this.store.y.connector.isSynced) {
-        while (start != null && this.store.y.connector.isSynced) {
-          start = yield* this.getOperation(start)
+      while (start != null) {
+        start = yield* this.getOperation(start)
+        if (!start.gc) {
          start.gc = true
+          start.deleted = true
          yield* this.setOperation(start)
-          // TODO: will always reset the parent..
-          this.store.gc1.push(start.id)
-          start = start.right
+          yield* this.markDeleted(start.id, 1)
+          if (start.opContent != null) {
+            yield* this.deleteOperation(start.opContent)
+          }
+          if (this.store.y.connector.isSynced) {
+            this.store.gc1.push(start.id)
+          }
        }
-      } else {
-        // TODO: when not possible??? do later in (gcWhenSynced)
+        start = start.right
      }
    }

@@ -1496,7 +1584,7 @@ module.exports = function (Y/* :any */) {
        yield* this.markDeleted(targetId, 1)
      }

-      if (target != null && target.gc == null) {
+      if (target != null) {
        if (!target.deleted) {
          callType = true
          // set deleted & notify type
@@ -1516,18 +1604,23 @@ module.exports = function (Y/* :any */) {
          if (target.start != null) {
            // TODO: don't do it like this .. -.-
            yield* this.deleteList(target.start)
-            yield* this.deleteList(target.id)
+            // yield* this.deleteList(target.id) -- do not gc itself because this may still get referenced
          }
          if (target.map != null) {
            for (var name in target.map) {
              yield* this.deleteList(target.map[name])
            }
            // TODO: here to..  (see above)
-            yield* this.deleteList(target.id)
+            // yield* this.deleteList(target.id) -- see above
          }
          if (target.opContent != null) {
            yield* this.deleteOperation(target.opContent)
-            target.opContent = null
+            // target.opContent = null
+          }
+          if (target.requires != null) {
+            for (var i = 0; i < target.requires.length; i++) {
+              yield* this.deleteOperation(target.requires[i])
+            }
          }
        }
        var left
@@ -1694,9 +1787,40 @@ module.exports = function (Y/* :any */) {
    */
    * garbageCollectAfterSync () {
      yield* this.os.iterate(this, null, null, function * (op) {
-        if (op.deleted && op.left != null) {
-          var left = yield* this.getOperation(op.left)
-          this.store.addToGarbageCollector(op, left)
+        if (op.gc) {
+          this.store.gc1.push(op.id)
+        } else {
+          if (op.parent != null) {
+            var parentDeleted = yield* this.isDeleted(op.parent)
+            if (parentDeleted) {
+              op.gc = true
+              if (!op.deleted) {
+                yield* this.markDeleted(op.id, 1)
+                op.deleted = true
+                if (op.opContent != null) {
+                  yield* this.deleteOperation(op.opContent)
+                  /*
+                  var opContent = yield* this.getOperation(op.opContent)
+                  opContent.gc = true
+                  yield* this.setOperation(opContent)
+                  this.store.gc1.push(opContent.id)
+                  */
+                }
+                if (op.requires != null) {
+                  for (var i = 0; i < op.requires.length; i++) {
+                    yield* this.deleteOperation(op.requires[i])
+                  }
+                }
+              }
+              yield* this.setOperation(op)
+              this.store.gc1.push(op.id)
+              return
+            }
+          }
+          if (op.deleted && op.left != null) {
+            var left = yield* this.getOperation(op.left)
+            this.store.addToGarbageCollector(op, left)
+          }
        }
      })
    }
@@ -1722,6 +1846,29 @@ module.exports = function (Y/* :any */) {
        }
        */

+        var deps = []
+        if (o.opContent != null) {
+          deps.push(o.opContent)
+        }
+        if (o.requires != null) {
+          deps = deps.concat(o.requires)
+        }
+        for (var i = 0; i < deps.length; i++) {
+          var dep = yield* this.getOperation(deps[i])
+          if (dep != null) {
+            if (!dep.deleted) {
+              yield* this.deleteOperation(dep.id)
+              dep = yield* this.getOperation(dep.id)
+            }
+            dep.gc = true
+            yield* this.setOperation(dep)
+            this.store.gc1.push(dep.id)
+          } else {
+            yield* this.markGarbageCollected(deps[i], 1)
+            yield* this.updateState(deps[i][0]) // TODO: unneccessary?
+          }
+        }
+
        // remove gc'd op from the left op, if it exists
        if (o.left != null) {
          var left = yield* this.getOperation(o.left)
@@ -1804,20 +1951,22 @@ module.exports = function (Y/* :any */) {
            // so we have to set right here
            yield* this.setOperation(right)
          }
-          // o may originate in another operation.
-          // Since o is deleted, we have to reset o.origin's `originOf` property
-          if (o.origin != null) {
-            var origin = yield* this.getOperation(o.origin)
-            origin.originOf = origin.originOf.filter(function (_id) {
-              return !Y.utils.compareIds(id, _id)
-            })
-            yield* this.setOperation(origin)
-          }
        }
-
+        // o may originate in another operation.
+        // Since o is deleted, we have to reset o.origin's `originOf` property
+        if (o.origin != null) {
+          var origin = yield* this.getOperation(o.origin)
+          origin.originOf = origin.originOf.filter(function (_id) {
+            return !Y.utils.compareIds(id, _id)
+          })
+          yield* this.setOperation(origin)
+        }
+        var parent
        if (o.parent != null) {
-          // remove gc'd op from parent, if it exists
-          var parent /* MapOperation */ = yield* this.getOperation(o.parent)
+          parent = yield* this.getOperation(o.parent)
+        }
+        // remove gc'd op from parent, if it exists
+        if (parent != null) {
          var setParent = false // whether to save parent to the os
          if (o.parentSub != null) {
            if (Y.utils.compareIds(parent.map[o.parentSub], o.id)) {
@@ -1850,6 +1999,18 @@ module.exports = function (Y/* :any */) {
        state.clock = Math.max(state.clock, n.id[1] + n.len)
      }
    }
+    * updateState (user) {
+      var state = yield* this.getState(user)
+      yield* this.checkDeleteStoreForState(state)
+      var o = yield* this.getOperation([user, state.clock])
+      while (o != null && o.id[1] === state.clock && user === o.id[0]) {
+        // either its a new operation (1. case), or it is an operation that was deleted, but is not yet in the OS
+        state.clock++
+        yield* this.checkDeleteStoreForState(state)
+        o = yield* this.os.findNext(o.id)
+      }
+      yield* this.setState(state)
+    }
    /*
      apply a delete set in order to get
      the state of the supplied ds
@@ -1944,12 +2105,11 @@ module.exports = function (Y/* :any */) {
            yield* this.setState(state)
          }
        }
-      }
-      if (this.store.forwardAppliedOperations) {
-        for (let c = del[1]; c < del[1] + del[2]; c++) {
-          var ops = deletions.map(function (d) {
-            return {struct: 'Delete', target: [d[0], c]} // TODO: implement Delete with deletion length!
-          })
+        if (this.store.forwardAppliedOperations) {
+          var ops = []
+          for (let c = del[1]; c < del[1] + del[2]; c++) {
+            ops.push({struct: 'Delete', target: [d[0], c]}) // TODO: implement Delete with deletion length!
+          }
          this.store.y.connector.broadcastOps(ops)
        }
      }
@@ -1987,7 +2147,7 @@ module.exports = function (Y/* :any */) {
    }
    * addOperation (op) {
      yield* this.os.put(op)
-      if (!this.store.y.connector.isDisconnected() && this.store.forwardAppliedOperations && op.id[0] !== '_') {
+      if (!this.store.y.connector.isDisconnected() && this.store.forwardAppliedOperations && typeof op.id[1] !== 'string') {
        // is connected, and this is not going to be send in addOperation
        this.store.y.connector.broadcastOps([op])
      }
@@ -1997,18 +2157,21 @@ module.exports = function (Y/* :any */) {
      if (o != null || id[0] !== '_') {
        return o
      } else {
-        // need to generate this operation
-        if (this.store._nextUserId == null) {
-          var struct = id[1].split('_')[0]
-          // this.store._nextUserId = id
+        // generate this operation?
+        var comp = id[1].split('_')
+        if (comp.length > 1) {
+          var struct = comp[0]
          var op = Y.Struct[struct].create(id)
+          op.type = comp[1]
          yield* this.setOperation(op)
-          // delete this.store._nextUserId
          return op
        } else {
-          // Can only generate one operation at a time
+          // won't be called. but just in case..
+          console.error('Unexpected case. How can this happen?')
+          debugger // eslint-disable-line
          return null
        }
+        return null
      }
    }
    * removeOperation (id) {
@@ -2233,7 +2396,40 @@ module.exports = function (Y/* :any */) {
 module.exports = function (Y /* : any*/) {
  Y.utils = {}

-  class EventHandler {
+  class EventListenerHandler {
+    constructor () {
+      this.eventListeners = []
+    }
+    destroy () {
+      this.eventListeners = null
+    }
+     /*
+      Basic event listener boilerplate...
+    */
+    addEventListener (f) {
+      this.eventListeners.push(f)
+    }
+    removeEventListener (f) {
+      this.eventListeners = this.eventListeners.filter(function (g) {
+        return f !== g
+      })
+    }
+    removeAllEventListeners () {
+      this.eventListeners = []
+    }
+    callEventListeners (event) {
+      for (var i = 0; i < this.eventListeners.length; i++) {
+        try {
+          this.eventListeners[i](event)
+        } catch (e) {
+          console.error('User events must not throw Errors!')
+        }
+      }
+    }
+  }
+  Y.utils.EventListenerHandler = EventListenerHandler
+
+  class EventHandler extends EventListenerHandler {
    /* ::
    waiting: Array<Insertion | Deletion>;
    awaiting: number;
@@ -2248,10 +2444,16 @@ module.exports = function (Y /* : any*/) {
      all prematurely called operations were executed ("waiting operations")
    */
    constructor (onevent /* : Function */) {
+      super()
      this.waiting = []
      this.awaiting = 0
      this.onevent = onevent
-      this.eventListeners = []
+    }
+    destroy () {
+      super.destroy()
+      this.waiting = null
+      this.awaiting = null
+      this.onevent = null
    }
    /*
      Call this when a new operation arrives. It will be executed right away if
@@ -2273,30 +2475,6 @@ module.exports = function (Y /* : any*/) {
      this.awaiting++
      this.onevent(ops)
    }
-    /*
-      Basic event listener boilerplate...
-      TODO: maybe put this in a different type..
-    */
-    addEventListener (f) {
-      this.eventListeners.push(f)
-    }
-    removeEventListener (f) {
-      this.eventListeners = this.eventListeners.filter(function (g) {
-        return f !== g
-      })
-    }
-    removeAllEventListeners () {
-      this.eventListeners = []
-    }
-    callEventListeners (event) {
-      for (var i = 0; i < this.eventListeners.length; i++) {
-        try {
-          this.eventListeners[i](event)
-        } catch (e) {
-          console.log('User events must not throw Errors!') // eslint-disable-line
-        }
-      }
-    }
    /*
      Call this when you successfully awaited the execution of n Insert operations
    */
@@ -2393,10 +2571,26 @@ module.exports = function (Y /* : any*/) {
      this.initType = def.initType
      this.class = def.class
      this.name = def.name
+      if (def.appendAdditionalInfo != null) {
+        this.appendAdditionalInfo = def.appendAdditionalInfo
+      }
+      this.parseArguments = (def.parseArguments || function () {
+        return [this]
+      }).bind(this)
+      this.parseArguments.typeDefinition = this
    }
  }
  Y.utils.CustomType = CustomType

+  Y.utils.isTypeDefinition = function isTypeDefinition (v) {
+    if (v != null) {
+      if (v instanceof Y.utils.CustomType) return [v]
+      else if (v.constructor === Array && v[0] instanceof Y.utils.CustomType) return v
+      else if (v instanceof Function && v.typeDefinition instanceof Y.utils.CustomType) return [v.typeDefinition]
+    }
+    return false
+  }
+
  /*
    Make a flat copy of an object
    (just copy properties)
@@ -2604,7 +2798,11 @@ module.exports = Y
 Y.requiringModules = requiringModules

 Y.extend = function (name, value) {
-  Y[name] = value
+  if (value instanceof Y.utils.CustomType) {
+    Y[name] = value.parseArguments
+  } else {
+    Y[name] = value
+  }
  if (requiringModules[name] != null) {
    requiringModules[name].resolve()
    delete requiringModules[name]
@@ -2619,9 +2817,10 @@ function requestModules (modules) {
  var extention = typeof regeneratorRuntime !== 'undefined' ? '.js' : '.es6'
  var promises = []
  for (var i = 0; i < modules.length; i++) {
-    var modulename = 'y-' + modules[i].toLowerCase()
-    if (Y[modules[i]] == null) {
-      if (requiringModules[modules[i]] == null) {
+    var module = modules[i].split('(')[0]
+    var modulename = 'y-' + module.toLowerCase()
+    if (Y[module] == null) {
+      if (requiringModules[module] == null) {
        // module does not exist
        if (typeof window !== 'undefined' && window.Y !== 'undefined') {
          var imported = document.createElement('script')
@@ -2629,7 +2828,7 @@ function requestModules (modules) {
          document.head.appendChild(imported)

          let requireModule = {}
-          requiringModules[modules[i]] = requireModule
+          requiringModules[module] = requireModule
          requireModule.promise = new Promise(function (resolve) {
            requireModule.resolve = resolve
          })
@@ -2682,13 +2881,21 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
  }
  Y.sourceDir = opts.sourceDir
  return Y.requestModules(modules).then(function () {
-    return new Promise(function (resolve) {
-      var yconfig = new YConfig(opts)
-      yconfig.db.whenUserIdSet(function () {
-        yconfig.init(function () {
-          resolve(yconfig)
+    return new Promise(function (resolve, reject) {
+      if (opts == null) reject('An options object is expected! ')
+      else if (opts.connector == null) reject('You must specify a connector! (missing connector property)')
+      else if (opts.connector.name == null) reject('You must specify connector name! (missing connector.name property)')
+      else if (opts.db == null) reject('You must specify a database! (missing db property)')
+      else if (opts.connector.name == null) reject('You must specify db name! (missing db.name property)')
+      else if (opts.share == null) reject('You must specify a set of shared types!')
+      else {
+        var yconfig = new YConfig(opts)
+        yconfig.db.whenUserIdSet(function () {
+          yconfig.init(function () {
+            resolve(yconfig)
+          })
        })
-      })
+      }
    })
  })
 }
@@ -2698,6 +2905,7 @@ class YConfig {
  db: Y.AbstractDatabase;
  connector: Y.AbstractConnector;
  share: {[key: string]: any};
+  options: Object;
  */
  constructor (opts, callback) {
    this.options = opts
@@ -2711,15 +2919,20 @@ class YConfig {
    this.db.requestTransaction(function * requestTransaction () {
      // create shared object
      for (var propertyname in opts.share) {
-        var typename = opts.share[propertyname]
-        var id = ['_', Y[typename].struct + '_' + propertyname]
-        var op = yield* this.getOperation(id)
-        if (op.type !== typename) {
-          // not already in the db
-          op.type = typename
-          yield* this.setOperation(op)
+        var typeConstructor = opts.share[propertyname].split('(')
+        var typeName = typeConstructor.splice(0, 1)
+        var args = []
+        if (typeConstructor.length === 1) {
+          try {
+            args = JSON.parse('[' + typeConstructor[0].split(')')[0] + ']')
+          } catch (e) {
+            throw new Error('Was not able to parse type definition! (share.' + propertyname + ')')
+          }
        }
-        share[propertyname] = yield* this.getType(id)
+        var type = Y[typeName]
+        var typedef = type.typeDefinition
+        var id = ['_', typedef.struct + '_' + typeName + '_' + propertyname + '_' + typeConstructor]
+        share[propertyname] = yield* this.createType(type.apply(typedef, args), id)
      }
      this.store.whenTransactionsFinished()
        .then(callback)
@@ -2735,10 +2948,17 @@ class YConfig {
    return this.connector.reconnect()
  }
  destroy () {
-    this.disconnect()
-    this.db.destroy()
-    this.connector = null
-    this.db = null
+    if (this.connector.destroy != null) {
+      this.connector.destroy()
+    } else {
+      this.connector.disconnect()
+    }
+    var self = this
+    this.db.requestTransaction(function * () {
+      yield* self.db.destroy()
+      self.connector = null
+      self.db = null
+    })
  }
 }

--- a/y.es6.map
+++ b/y.es6.map
--- a/y.js
+++ b/y.js
--- a/y.js.map
+++ b/y.js.map
Author	SHA1	Message	Date
Kevin Jahns	658081566b	Deploy 10.0.2	2016-03-23 14:42:23 +01:00
Kevin Jahns	ffe0ec5a38	Deploy 10.0.1	2016-03-23 14:41:04 +01:00
Kevin Jahns	5cfe209688	added xml example	2016-03-14 19:45:50 +01:00
Kevin Jahns	51c8d3bdc6	Deploy 9.0.4	2016-02-24 12:00:45 +01:00
Kevin Jahns	0f86b71f78	add readme?	2016-02-24 12:00:02 +01:00
Kevin Jahns	fafda2726f	Deploy 9.0.3	2016-02-23 15:50:16 +01:00
Kevin Jahns	116770fbce	fix gitignore, fix Examples/bower.json	2016-02-23 15:47:53 +01:00
Kevin Jahns	5286f507c8	Deploy 9.0.2	2016-02-23 15:42:09 +01:00
Kevin Jahns	2f7349b712	fixed bower & added dependencies & cleanup	2016-02-23 15:41:22 +01:00
Kevin Jahns	54529ab1e7	Deploy 9.0.1	2016-02-23 11:58:10 +01:00
Kevin Jahns	e165c5ee2a	added peer dependencies, upgraded version to major (new versioning scheme)	2016-02-23 11:57:27 +01:00
Kevin Jahns	7b3693aff3	Deploy 0.8.28	2016-02-23 11:27:26 +01:00
Kevin Jahns	f75f47646b	Deploy 0.8.27	2016-02-22 13:08:01 +01:00
Kevin Jahns	64044123e3	Deploy 0.8.26	2016-02-22 13:06:11 +01:00
Kevin Jahns	a286162ace	Deploy 0.8.25	2016-02-22 13:04:32 +01:00
Kevin Jahns	f739f3b5d7	Deploy 0.8.23	2016-02-22 12:40:21 +01:00
Kevin Jahns	f2052f95f8	Deploy 0.8.22	2016-02-22 12:38:21 +01:00
Kevin Jahns	81324dc7d4	Deploy 0.8.21	2016-02-18 16:57:27 +01:00
Kevin Jahns	6599cb20b4	Deploy 0.8.20	2016-02-16 16:08:50 +01:00
Kevin Jahns	74ed9e4107	Deploy 0.8.18	2016-02-15 15:22:51 +01:00
Kevin Jahns	ef6d63c19a	Deploy 0.8.17	2016-02-04 23:13:47 +01:00
Kevin Jahns	941dd36e74	Deploy 0.8.16	2016-02-04 23:12:49 +01:00
Kevin Jahns	e74c22f0a9	Deploy 0.8.15	2016-02-04 23:11:07 +01:00
Kevin Jahns	98085b2807	Deploy 0.8.14	2016-02-04 15:26:28 +01:00
Kevin Jahns	e48608a7d4	update ace example	2016-02-04 12:53:27 +01:00
Kevin Jahns	ddbe19d78e	Deploy 0.8.13	2016-02-04 12:47:05 +01:00