implemented xml type for new event system

test/y-array.tests.js

@@ -27,9 +27,9 @@ test('basic spec', async function array0 (t) {
 test('insert three elements, try re-get property', async function array1 (t) {
   var { users, array0, array1 } = await initArrays(t, { users: 2 })
   array0.insert(0, [1, 2, 3])
-  t.compare(array0.toArray(), [1, 2, 3], '.toArray() works')
+  t.compare(array0.toJSON(), [1, 2, 3], '.toJSON() works')
   await flushAll(t, users)
-  t.compare(array1.toArray(), [1, 2, 3], '.toArray() works after sync')
+  t.compare(array1.toJSON(), [1, 2, 3], '.toJSON() works after sync')
   await compareUsers(t, users)
 })
 
@@ -76,8 +76,8 @@ test('disconnect really prevents sending messages', async function array5 (t) {
   array0.insert(1, ['user0'])
   array1.insert(1, ['user1'])
   await wait(1000)
-  t.compare(array0.toArray(), ['x', 'user0', 'y'])
-  t.compare(array1.toArray(), ['x', 'user1', 'y'])
+  t.compare(array0.toJSON(), ['x', 'user0', 'y'])
+  t.compare(array1.toJSON(), ['x', 'user1', 'y'])
   await users[1].reconnect()
   await users[2].reconnect()
   await compareUsers(t, users)
@@ -225,7 +225,7 @@ test('event has correct value when setting a primitive on a YArray (same user)',
   array0.insert(0, ['stuff'])
   t.assert(event.values[0] === event.object.get(0), 'compare value with get method')
   t.assert(event.values[0] === 'stuff', 'check that value is actually present')
-  t.assert(event.values[0] === array0.toArray()[0], '.toArray works as expected')
+  t.assert(event.values[0] === array0.toJSON()[0], '.toJSON works as expected')
   await compareUsers(t, users)
 })
 
@@ -240,7 +240,7 @@ test('event has correct value when setting a primitive on a YArray (received fro
   await flushAll(t, users)
   t.assert(event.values[0] === event.object.get(0), 'compare value with get method')
   t.assert(event.values[0] === 'stuff', 'check that value is actually present')
-  t.assert(event.values[0] === array0.toArray()[0], '.toArray works as expected')
+  t.assert(event.values[0] === array0.toJSON()[0], '.toJSON works as expected')
   await compareUsers(t, users)
 })
 
@@ -254,7 +254,7 @@ test('event has correct value when setting a type on a YArray (same user)', asyn
   array0.insert(0, [Y.Array])
   t.assert(event.values[0] === event.object.get(0), 'compare value with get method')
   t.assert(event.values[0] != null, 'event.value exists')
-  t.assert(event.values[0] === array0.toArray()[0], '.toArray works as expected')
+  t.assert(event.values[0] === array0.toJSON()[0], '.toJSON works as expected')
   await compareUsers(t, users)
 })
 test('event has correct value when setting a type on a YArray (ops received from another user)', async function array14 (t) {
@@ -268,7 +268,7 @@ test('event has correct value when setting a type on a YArray (ops received from
   await flushAll(t, users)
   t.assert(event.values[0] === event.object.get(0), 'compare value with get method')
   t.assert(event.values[0] != null, 'event.value exists')
-  t.assert(event.values[0] === array0.toArray()[0], '.toArray works as expected')
+  t.assert(event.values[0] === array0.toJSON()[0], '.toJSON works as expected')
   await compareUsers(t, users)
 })
 

test/y-map.tests.js

@@ -10,9 +10,9 @@ test('basic map tests', async function map0 (t) {
   map0.set('number', 1)
   map0.set('string', 'hello Y')
   map0.set('object', { key: { key2: 'value' } })
-  map0.set('y-map', Y.Map)
+  map0.set('y-map', new Y.Map())
   let map = map0.get('y-map')
-  map.set('y-array', Y.Array)
+  map.set('y-array', new Y.Array())
   let array = map.get('y-array')
   array.insert(0, [0])
   array.insert(0, [-1])
@@ -46,7 +46,7 @@ test('Basic get&set of Map property (converge via sync)', async function map1 (t
   await flushAll(t, users)
 
   for (let user of users) {
-    var u = user.share.map
+    var u = user.get('map', Y.Map)
     t.compare(u.get('stuff'), 'stuffy')
   }
   await compareUsers(t, users)
@@ -54,7 +54,7 @@ test('Basic get&set of Map property (converge via sync)', async function map1 (t
 
 test('Map can set custom types (Map)', async function map2 (t) {
   let { users, map0 } = await initArrays(t, { users: 2 })
-  var map = map0.set('Map', Y.Map)
+  var map = map0.set('Map', new Y.Map())
   map.set('one', 1)
   map = map0.get('Map')
   t.compare(map.get('one'), 1)
@@ -63,7 +63,7 @@ test('Map can set custom types (Map)', async function map2 (t) {
 
 test('Map can set custom types (Map) - get also returns the type', async function map3 (t) {
   let { users, map0 } = await initArrays(t, { users: 2 })
-  map0.set('Map', Y.Map)
+  map0.set('Map', new Y.Map())
   var map = map0.get('Map')
   map.set('one', 1)
   map = map0.get('Map')
@@ -73,7 +73,7 @@ test('Map can set custom types (Map) - get also returns the type', async functio
 
 test('Map can set custom types (Array)', async function map4 (t) {
   let { users, map0 } = await initArrays(t, { users: 2 })
-  var array = map0.set('Array', Y.Array)
+  var array = map0.set('Array', new Y.Array())
   array.insert(0, [1, 2, 3])
   array = map0.get('Array')
   t.compare(array.toArray(), [1, 2, 3])
@@ -88,7 +88,7 @@ test('Basic get&set of Map property (converge via update)', async function map5
   await flushAll(t, users)
 
   for (let user of users) {
-    var u = user.share.map
+    var u = user.get('map', Y.Map)
     t.compare(u.get('stuff'), 'stuffy')
   }
   await compareUsers(t, users)
@@ -102,7 +102,7 @@ test('Basic get&set of Map property (handle conflict)', async function map6 (t)
   await flushAll(t, users)
 
   for (let user of users) {
-    var u = user.share.map
+    var u = user.get('map', Y.Map)
     t.compare(u.get('stuff'), 'c0')
   }
   await compareUsers(t, users)
@@ -115,7 +115,7 @@ test('Basic get&set&delete of Map property (handle conflict)', async function ma
   map1.set('stuff', 'c1')
   await flushAll(t, users)
   for (let user of users) {
-    var u = user.share.map
+    var u = user.get('map', Y.Map)
     t.assert(u.get('stuff') === undefined)
   }
   await compareUsers(t, users)
@@ -129,7 +129,7 @@ test('Basic get&set of Map property (handle three conflicts)', async function ma
   map2.set('stuff', 'c3')
   await flushAll(t, users)
   for (let user of users) {
-    var u = user.share.map
+    var u = user.get('map', Y.Map)
     t.compare(u.get('stuff'), 'c0')
   }
   await compareUsers(t, users)
@@ -149,7 +149,7 @@ test('Basic get&set&delete of Map property (handle three conflicts)', async func
   map3.set('stuff', 'c3')
   await flushAll(t, users)
   for (let user of users) {
-    var u = user.share.map
+    var u = user.get('map', Y.Map)
     t.assert(u.get('stuff') === undefined)
   }
   await compareUsers(t, users)
@@ -163,7 +163,7 @@ test('observePath properties', async function map10 (t) {
       map.set('yay', 4)
     }
   })
-  map1.set('map', Y.Map)
+  map1.set('map', new Y.Map())
   await flushAll(t, users)
   map = map2.get('map')
   t.compare(map.get('yay'), 4)
@@ -172,7 +172,7 @@ test('observePath properties', async function map10 (t) {
 
 test('observe deep properties', async function map11 (t) {
   let { users, map1, map2, map3 } = await initArrays(t, { users: 4 })
-  var _map1 = map1.set('map', Y.Map)
+  var _map1 = map1.set('map', new Y.Map())
   var calls = 0
   var dmapid
   _map1.observe(function (event) {
@@ -182,10 +182,10 @@ test('observe deep properties', async function map11 (t) {
   })
   await flushAll(t, users)
   var _map3 = map3.get('map')
-  _map3.set('deepmap', Y.Map)
+  _map3.set('deepmap', new Y.Map())
   await flushAll(t, users)
   var _map2 = map2.get('map')
-  _map2.set('deepmap', Y.Map)
+  _map2.set('deepmap', new Y.Map())
   await flushAll(t, users)
   var dmap1 = _map1.get('deepmap')
   var dmap2 = _map2.get('deepmap')
@@ -205,8 +205,8 @@ test('observes using observePath', async function map12 (t) {
     pathes.push(event.path)
     calls++
   })
-  map0.set('map', Y.Map)
-  map0.get('map').set('array', Y.Array)
+  map0.set('map', new Y.Map())
+  map0.get('map').set('array', new Y.Array())
   map0.get('map').get('array').insert(0, ['content'])
   t.assert(calls === 3)
   t.compare(pathes, [[], ['map'], ['map', 'array']])
@@ -233,7 +233,7 @@ test('throws add & update & delete events (with type and primitive content)', as
     name: 'stuff'
   })
   // update, oldValue is in contents
-  map0.set('stuff', Y.Array)
+  map0.set('stuff', new Y.Array())
   compareEvent(t, event, {
     type: 'update',
     object: map0,
@@ -288,7 +288,7 @@ test('event has correct value when setting a type on a YMap (same user)', async
   map0.observe(function (e) {
     event = e
   })
-  map0.set('stuff', Y.Map)
+  map0.set('stuff', new Y.Map())
   t.compare(event.value._model, event.object.get(event.name)._model)
   await compareUsers(t, users)
 })
@@ -300,7 +300,7 @@ test('event has correct value when setting a type on a YMap (ops received from a
   map0.observe(function (e) {
     event = e
   })
-  map1.set('stuff', Y.Map)
+  map1.set('stuff', new Y.Map())
   await flushAll(t, users)
   t.compare(event.value._model, event.object.get(event.name)._model)
   await compareUsers(t, users)
@@ -310,13 +310,13 @@ var mapTransactions = [
   function set (t, user, chance) {
     let key = chance.pickone(['one', 'two'])
     var value = chance.string()
-    user.share.map.set(key, value)
+    user.get('map', Y.Map).set(key, value)
   },
   function setType (t, user, chance) {
     let key = chance.pickone(['one', 'two'])
-    var value = chance.pickone([Y.Array, Y.Map])
-    let type = user.share.map.set(key, value)
-    if (value === Y.Array) {
+    var value = chance.pickone([new Y.Array(), new Y.Map()])
+    let type = user.get('map', Y.Map).set(key, value)
+    if (value === new Y.Array()) {
       type.insert(0, [1, 2, 3, 4])
     } else {
       type.set('deepkey', 'deepvalue')
@@ -324,7 +324,7 @@ var mapTransactions = [
   },
   function _delete (t, user, chance) {
     let key = chance.pickone(['one', 'two'])
-    user.share.map.delete(key)
+    user.get('map', Y.Map).delete(key)
   }
 ]
 

test/y-xml.tests.js

@@ -50,7 +50,7 @@ test('events', async function xml1 (t) {
     type: 'childInserted',
     index: 0
   }
-  xml0.insert(0, [Y.XmlText('some text')])
+  xml0.insert(0, [new Y.XmlText('some text')])
   t.compare(event, expectedEvent, 'child inserted event')
   await flushAll(t, users)
   t.compare(remoteEvent, expectedEvent, 'child inserted event (remote)')
@@ -110,8 +110,8 @@ test('element insert (dom -> y)', async function xml4 (t) {
 test('element insert (y -> dom)', async function xml5 (t) {
   var { users, xml0 } = await initArrays(t, { users: 3 })
   let dom0 = xml0.getDom()
-  xml0.insert(0, [Y.XmlText('some text')])
-  xml0.insert(1, [Y.XmlElement('p')])
+  xml0.insert(0, [new Y.XmlText('some text')])
+  xml0.insert(1, [new Y.XmlElement('p')])
   t.assert(dom0.childNodes[0].textContent === 'some text', 'Retrieve Text node')
   t.assert(dom0.childNodes[1].nodeName === 'P', 'Retrieve Element node')
   await compareUsers(t, users)
@@ -132,7 +132,7 @@ test('y on insert, then delete (dom -> y)', async function xml6 (t) {
 test('y on insert, then delete (y -> dom)', async function xml7 (t) {
   var { users, xml0 } = await initArrays(t, { users: 3 })
   let dom0 = xml0.getDom()
-  xml0.insert(0, [Y.XmlElement('p')])
+  xml0.insert(0, [new Y.XmlElement('p')])
   t.assert(dom0.childNodes[0].nodeName === 'P', 'Get inserted element from dom')
   xml0.delete(0, 1)
   t.assert(dom0.childNodes.length === 0, '#childNodes is empty after delete')
@@ -142,7 +142,7 @@ test('y on insert, then delete (y -> dom)', async function xml7 (t) {
 test('delete consecutive (1) (Text)', async function xml8 (t) {
   var { users, xml0 } = await initArrays(t, { users: 3 })
   let dom0 = xml0.getDom()
-  xml0.insert(0, ['1', '2', '3'].map(Y.XmlText))
+  xml0.insert(0, [new Y.XmlText('1'), new Y.XmlText('2'), new Y.XmlText('3')])
   await wait()
   xml0.delete(1, 2)
   await wait()
@@ -155,7 +155,7 @@ test('delete consecutive (1) (Text)', async function xml8 (t) {
 test('delete consecutive (2) (Text)', async function xml9 (t) {
   var { users, xml0 } = await initArrays(t, { users: 3 })
   let dom0 = xml0.getDom()
-  xml0.insert(0, ['1', '2', '3'].map(Y.XmlText))
+  xml0.insert(0, [new Y.XmlText('1'), new Y.XmlText('2'), new Y.XmlText('3')])
   await wait()
   xml0.delete(0, 1)
   xml0.delete(1, 1)
@@ -169,7 +169,7 @@ test('delete consecutive (2) (Text)', async function xml9 (t) {
 test('delete consecutive (1) (Element)', async function xml10 (t) {
   var { users, xml0 } = await initArrays(t, { users: 3 })
   let dom0 = xml0.getDom()
-  xml0.insert(0, [Y.XmlElement('A'), Y.XmlElement('B'), Y.XmlElement('C')])
+  xml0.insert(0, [new Y.XmlElement('A'), new Y.XmlElement('B'), new Y.XmlElement('C')])
   await wait()
   xml0.delete(1, 2)
   await wait()
@@ -182,7 +182,7 @@ test('delete consecutive (1) (Element)', async function xml10 (t) {
 test('delete consecutive (2) (Element)', async function xml11 (t) {
   var { users, xml0 } = await initArrays(t, { users: 3 })
   let dom0 = xml0.getDom()
-  xml0.insert(0, [Y.XmlElement('A'), Y.XmlElement('B'), Y.XmlElement('C')])
+  xml0.insert(0, [new Y.XmlElement('A'), new Y.XmlElement('B'), new Y.XmlElement('C')])
   await wait()
   xml0.delete(0, 1)
   xml0.delete(1, 1)
@@ -198,8 +198,8 @@ test('Receive a bunch of elements (with disconnect)', async function xml12 (t) {
   let dom0 = xml0.getDom()
   let dom1 = xml1.getDom()
   users[1].disconnect()
-  xml0.insert(0, [Y.XmlElement('A'), Y.XmlElement('B'), Y.XmlElement('C')])
-  xml0.insert(0, [Y.XmlElement('X'), Y.XmlElement('Y'), Y.XmlElement('Z')])
+  xml0.insert(0, [new Y.XmlElement('A'), new Y.XmlElement('B'), new Y.XmlElement('C')])
+  xml0.insert(0, [new Y.XmlElement('X'), new Y.XmlElement('Y'), new Y.XmlElement('Z')])
   await users[1].reconnect()
   await flushAll(t, users)
   t.assert(xml0.length === 6, 'check length (y)')
@@ -267,36 +267,37 @@ test('filter attribute', async function xml15 (t) {
 
 // TODO: move elements
 var xmlTransactions = [
-  function attributeChange (t, user, chance) {
-    user.share.xml.getDom().setAttribute(chance.word(), chance.word())
+  /*function attributeChange (t, user, chance) {
+    user.get('xml', Y.XmlElement).getDom().setAttribute(chance.word(), chance.word())
   },
   function attributeChangeHidden (t, user, chance) {
-    user.share.xml.getDom().setAttribute('hidden', chance.word())
-  },
+    user.get('xml', Y.XmlElement).getDom().setAttribute('hidden', chance.word())
+  },*/
   function insertText (t, user, chance) {
-    let dom = user.share.xml.getDom()
+    let dom = user.get('xml', Y.XmlElement).getDom()
     var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
     dom.insertBefore(document.createTextNode(chance.word()), succ)
-  },
+  },/*
   function insertHiddenDom (t, user, chance) {
-    let dom = user.share.xml.getDom()
+    let dom = user.get('xml', Y.XmlElement).getDom()
     var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
     dom.insertBefore(document.createElement('hidden'), succ)
   },
+  /*
   function insertDom (t, user, chance) {
-    let dom = user.share.xml.getDom()
+    let dom = user.get('xml', Y.XmlElement).getDom()
     var succ = dom.children.length > 0 ? chance.pickone(dom.children) : null
     dom.insertBefore(document.createElement(chance.word()), succ)
   },
   function deleteChild (t, user, chance) {
-    let dom = user.share.xml.getDom()
+    let dom = user.get('xml', Y.XmlElement).getDom()
     if (dom.childNodes.length > 0) {
       var d = chance.pickone(dom.childNodes)
       d.remove()
     }
   },
   function insertTextSecondLayer (t, user, chance) {
-    let dom = user.share.xml.getDom()
+    let dom = user.get('xml', Y.XmlElement).getDom()
     if (dom.children.length > 0) {
       let dom2 = chance.pickone(dom.children)
       let succ = dom2.childNodes.length > 0 ? chance.pickone(dom2.childNodes) : null
@@ -304,7 +305,7 @@ var xmlTransactions = [
     }
   },
   function insertDomSecondLayer (t, user, chance) {
-    let dom = user.share.xml.getDom()
+    let dom = user.get('xml', Y.XmlElement).getDom()
     if (dom.children.length > 0) {
       let dom2 = chance.pickone(dom.children)
       let succ = dom2.childNodes.length > 0 ? chance.pickone(dom2.childNodes) : null
@@ -312,7 +313,7 @@ var xmlTransactions = [
     }
   },
   function deleteChildSecondLayer (t, user, chance) {
-    let dom = user.share.xml.getDom()
+    let dom = user.get('xml', Y.XmlElement).getDom()
     if (dom.children.length > 0) {
       let dom2 = chance.pickone(dom.children)
       if (dom2.childNodes.length > 0) {
@@ -320,7 +321,7 @@ var xmlTransactions = [
         d.remove()
       }
     }
-  }
+  }*/
 ]
 
 test('y-xml: Random tests (10)', async function xmlRandom10 (t) {