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
12 changed files with 416 additions and 159 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1 @@
-node_modules
 bower_components
-.directory
-.codio
-.settings
-.jshintignore
-.jshintrc
-.validate.json
--- 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
@@ -13,7 +13,7 @@ We already provide abstract data types for
 |[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) |
+|[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 is not bound to a specific communication protocol. Therefore, Yjs is extremely scalable and can be used in a wide range of application scenarios.
@@ -49,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.
 ```
@@ -168,18 +168,28 @@ The promise returns an instance of Y. We denote it with a lower case `y`.
 * y.db.userId :: String
  * The used user id for this client. **Never overwrite this**

-
-# 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.
-
 ## 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.17",
+  "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
@@ -1986,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])
      }
@@ -1996,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) {
@@ -2232,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;
@@ -2247,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
@@ -2272,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
    */
@@ -2392,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)
@@ -2603,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]
@@ -2618,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')
@@ -2628,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
          })
@@ -2681,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)
+          })
        })
-      })
+      }
    })
  })
 }
@@ -2697,6 +2905,7 @@ class YConfig {
  db: Y.AbstractDatabase;
  connector: Y.AbstractConnector;
  share: {[key: string]: any};
+  options: Object;
  */
  constructor (opts, callback) {
    this.options = opts
@@ -2710,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)
@@ -2734,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