diff --git a/gulpfile.js b/gulpfile.js
index 84e79f1e0f9ada539b0ea29b5e8ba12560fe2573..5490e79dd9d228209f5fb3ad4ce40ae5ac99e4ea 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -100,24 +100,18 @@ gulp.task('build', function () {
.pipe(gulp.dest('.'))
})
-gulp.task('test', function () {
- return gulp.src(files.test)
+gulp.task('testbuild', function () {
+ gulp.src('src/**/*.js')
.pipe(sourcemaps.init())
- .pipe(concat('jasmine'))
.pipe(babel({
loose: 'all',
- optional: ['es7.asyncFunctions'],
modules: 'ignore',
+ // optional: ['es7.asyncFunctions'],
+ blacklist: 'regenerator',
experimental: true
}))
- .pipe(uglify())
- .pipe(sourcemaps.write('.'))
+ .pipe(sourcemaps.write())
.pipe(gulp.dest('build'))
- .pipe(ignore.include('*.js'))
- .pipe(jasmine({
- verbose: true,
- includeStuckTrace: true
- }))
})
gulp.task('build_jasmine_browser', function () {
@@ -134,16 +128,40 @@ gulp.task('build_jasmine_browser', function () {
.pipe(sourcemaps.write())
.pipe(gulp.dest('build'))
})
-
-gulp.task('develop', ['build_jasmine_browser'], function () {
- gulp.watch(files.test, ['build_jasmine_browser'])
+var testy = [
+ "build/Helper.spec.js",
+ "build/y.js",
+ "build/Connector.js",
+ "build/OperationStore.js",
+ "build/Struct.js",
+ "build/Utils.js",
+ "build/OperationStores/RedBlackTree.js",
+ "build/OperationStores/Memory.js",
+ "build/OperationStores/IndexedDB.js",
+ "build/Connectors/Test.js",
+ "build/Connectors/WebRTC.js",
+ "build/Types/Array.js",
+ "build/Types/Map.js",
+ "build/Types/TextBind.js",
+ "build/**/*.spec.js"
+]
+gulp.task('develop', ['testbuild'], function () {
+ //gulp.watch(files.test, ['build_jasmine_browser'])
// gulp.watch(files.test, ["test"])
- gulp.watch(files.test, ['build'])
+ gulp.watch('src/**/*.js', ['testbuild'])
- return gulp.src('build/jasmine_browser.js')
- .pipe(watch('build/jasmine_browser.js'))
+ return gulp.src(testy)
+ .pipe(watch('build/**/*.js'))
.pipe(jasmineBrowser.specRunner())
.pipe(jasmineBrowser.server({port: options.testport}))
})
+gulp.task('test', ['testbuild'], function () {
+ return gulp.src(testy)
+ .pipe(jasmine({
+ verbose: true,
+ includeStuckTrace: true
+ }))
+})
+
gulp.task('default', ['build', 'test'])
diff --git a/package.json b/package.json
index 18425ac4baa3b5660fcebfffe6f80c0dd07d293a..aed81744e62c94018ecd519d34545b6cbf52d216 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
"gulp": "^3.9.0",
"gulp-babel": "^5.1.0",
"gulp-concat": "^2.5.2",
+ "gulp-ignore": "^1.2.1",
"gulp-jasmine": "^2.0.1",
"gulp-jasmine-browser": "^0.1.3",
"gulp-sourcemaps": "^1.5.2",
diff --git a/q.js b/q.js
index 84f1d6dc143573ebb96e02424df4187dab35453f..31dbc05fb20eefbb4d9c7b4e4b75be7e6576f2a4 100644
--- a/q.js
+++ b/q.js
@@ -1,4 +1,12 @@
'use strict';
-class YY {
-}
+
+var x = new Promise(function(r){r(true)})
+
+x.then(function(q){console.log("yay",q)})
+
+var ff = function * (){
+
+}
+
+console.log("dtrn")
diff --git a/spec/support/jasmine.json b/spec/support/jasmine.json
index 1ca814d6c95ade69a1078a583d71ea0927b3e92a..4c904ce09c65fc660b09ca02a1246a2f9d2faea4 100644
--- a/spec/support/jasmine.json
+++ b/spec/support/jasmine.json
@@ -1,5 +1,5 @@
{
- "spec_dir": "src",
+ "spec_dir": "build",
"spec_files": [
"**/**.spec.js"
],
@@ -11,6 +11,12 @@
"Struct.js",
"Utils.js",
"OperationStores/RedBlackTree.js",
- "OperationStores/Memory.js"
+ "OperationStores/Memory.js",
+ "OperationStores/IndexedDB.js",
+ "Connectors/Test.js",
+ "Connectors/WebRTC.js",
+ "Types/Array.js",
+ "Types/Map.js",
+ "Types/TextBind.js"
]
}
diff --git a/src/Connector.js b/src/Connector.js
index 157700990936b5e74cf61f3130b4c3f42883d95c..02d46199c7930d43d2aa74d9eda638748e14a30c 100644
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -1,3 +1,4 @@
+/* globals Y */
'use strict'
class AbstractConnector { // eslint-disable-line no-unused-vars
@@ -297,3 +298,4 @@ class AbstractConnector { // eslint-disable-line no-unused-vars
}
}
}
+Y.AbstractConnector = AbstractConnector
diff --git a/src/Connectors/Test.js b/src/Connectors/Test.js
index 87cae0da73e5f1ece4501ee2cb5831796d852ba5..a6b39b66558962d142b23d1bb1a4de0ae5d0833c 100644
--- a/src/Connectors/Test.js
+++ b/src/Connectors/Test.js
@@ -1,4 +1,4 @@
-/* global getRandom, AbstractConnector, Y, wait */
+/* global getRandom, Y, wait */
'use strict'
var globalRoom = {
@@ -23,6 +23,8 @@ var globalRoom = {
}
}
}
+Y.utils.globalRoom = globalRoom
+
function flushOne () {
var bufs = []
for (var i in globalRoom.buffers) {
@@ -45,7 +47,7 @@ function flushOne () {
var userIdCounter = 0
-class Test extends AbstractConnector {
+class Test extends Y.AbstractConnector {
constructor (y, options) {
if (options === undefined) {
throw new Error('Options must not be undefined!')
diff --git a/src/Connectors/WebRTC.js b/src/Connectors/WebRTC.js
index 11e750d041dd0f8f22a323dc2d35b9b11a35847d..acf9aa86ebaaaafc6c1339fdacd43fac4dd67166 100644
--- a/src/Connectors/WebRTC.js
+++ b/src/Connectors/WebRTC.js
@@ -1,6 +1,7 @@
-/* global AbstractConnector, Y */
+/* global Y */
+'use strict'
-class WebRTC extends AbstractConnector {
+class WebRTC extends Y.AbstractConnector {
constructor (y, options) {
if (options === undefined) {
throw new Error('Options must not be undefined!')
diff --git a/src/Helper.spec.js b/src/Helper.spec.js
index 21c066aaee3510c52e1e349c44861307777009e5..74879f095d2a64045e23a0eee42c0ac3f02d9f76 100644
--- a/src/Helper.spec.js
+++ b/src/Helper.spec.js
@@ -5,11 +5,18 @@
This is just a compilation of functions that help to test this library!
***/
-var g = global || window
+var g
+if (typeof global !== 'undefined') {
+ g = global
+} else if (typeof window !== 'undefined') {
+ g = window
+} else {
+ throw new Error('No global object?')
+}
g.g = g
-var co = require('co')
-g.co = co
+//var co = require('co')
+// g.co = co
function wait (t) {
if (t == null) {
@@ -46,7 +53,7 @@ function getRandomNumber(n) {//eslint-disable-line
}
g.getRandomNumber = getRandomNumber
-g.applyRandomTransactions = co.wrap(function * applyRandomTransactions (users, objects, transactions, numberOfTransactions) { //eslint-disable-line
+g.applyRandomTransactions = async(function * applyRandomTransactions (users, objects, transactions, numberOfTransactions) { //eslint-disable-line
function randomTransaction (root) {
var f = getRandom(transactions)
f(root)
@@ -74,21 +81,21 @@ g.applyRandomTransactions = co.wrap(function * applyRandomTransactions (users, o
yield users[0].connector.flushAll()
})
-g.garbageCollectAllUsers = co.wrap(function * garbageCollectAllUsers (users) {
+g.garbageCollectAllUsers = async(function * garbageCollectAllUsers (users) {
for (var i in users) {
yield users[i].db.garbageCollect()
yield users[i].db.garbageCollect()
}
})
-g.compareAllUsers = co.wrap(function * compareAllUsers (users) { //eslint-disable-line
+g.compareAllUsers = async(function * compareAllUsers (users) { //eslint-disable-line
var s1, s2, ds1, ds2, allDels1, allDels2
var db1 = []
function * t1 () {
s1 = yield* this.getStateSet()
ds1 = yield* this.getDeleteSet()
allDels1 = []
- yield* this.ds.iterate(null, null, function (d) {
+ this.ds.iterate(null, null, function (d) {
allDels1.push(d)
})
}
@@ -96,7 +103,7 @@ g.compareAllUsers = co.wrap(function * compareAllUsers (users) { //eslint-disabl
s2 = yield* this.getStateSet()
ds2 = yield* this.getDeleteSet()
allDels2 = []
- yield* this.ds.iterate(null, null, function (d) {
+ this.ds.iterate(null, null, function (d) {
allDels2.push(d)
})
}
@@ -150,13 +157,13 @@ g.compareAllUsers = co.wrap(function * compareAllUsers (users) { //eslint-disabl
}
})
-g.createUsers = co.wrap(function * createUsers (self, numberOfUsers) { //eslint-disable-line
- if (globalRoom.users[0] != null) {//eslint-disable-line
- yield globalRoom.users[0].flushAll()//eslint-disable-line
+g.createUsers = async(function * createUsers (self, numberOfUsers) { //eslint-disable-line
+ if (Y.utils.globalRoom.users[0] != null) {//eslint-disable-line
+ yield Y.utils.globalRoom.users[0].flushAll()//eslint-disable-line
}
// destroy old users
- for (var u in globalRoom.users) {//eslint-disable-line
- globalRoom.users[u].y.destroy()//eslint-disable-line
+ for (var u in Y.utils.globalRoom.users) {//eslint-disable-line
+ Y.utils.globalRoom.users[u].y.destroy()//eslint-disable-line
}
self.users = []
@@ -175,3 +182,35 @@ g.createUsers = co.wrap(function * createUsers (self, numberOfUsers) { //eslint-
}
self.users = yield Promise.all(promises)
})
+
+function async (makeGenerator) {
+ return function (arg) {
+ var generator = makeGenerator.apply(this, arguments)
+
+ function handle (result) {
+ // result => { done: [Boolean], value: [Object] }
+ if (result.done) return Promise.resolve(result.value)
+
+ return Promise.resolve(result.value).then(function (res) {
+ return handle(generator.next(res))
+ }, function (err) {
+ debugger
+ return handle(generator.throw(err))
+ })
+ }
+
+ try {
+ return handle(generator.next())
+ } catch (ex) {
+ return Promise.reject(ex)
+ }
+ }
+}
+g.wrapCo = async
+
+/*function wrapCo (gen) {
+ return function (done) {
+ return co.wrap(gen)(done)
+ }
+}
+g.wrapCo = wrapCo*/
diff --git a/src/OperationStore.js b/src/OperationStore.js
index fbaeac324361d276f57e6005c82a878a9f55b486..c5b9a4b738e337113c7aa59fe4d4b0d449fb1a38 100644
--- a/src/OperationStore.js
+++ b/src/OperationStore.js
@@ -2,10 +2,6 @@
'use strict'
-var RBTree = Y.RBTree
-var Struct = Y.Struct
-var copyObject = Y.copyObject
-
class AbstractTransaction { // eslint-disable-line no-unused-vars
constructor (store) {
this.store = store
@@ -33,7 +29,7 @@ class AbstractTransaction { // eslint-disable-line no-unused-vars
for (var i = 0; i < ops.length; i++) {
var op = ops[i]
yield* this.store.tryExecute.call(this, op)
- send.push(copyObject(Struct[op.struct].encode(op)))
+ send.push(Y.utils.copyObject(Y.Struct[op.struct].encode(op)))
}
if (this.store.y.connector.broadcastedHB) {
this.store.y.connector.broadcast({
@@ -68,7 +64,7 @@ class AbstractOperationStore { // eslint-disable-line no-unused-vars
// wont be kept in memory.
this.initializedTypes = {}
this.whenUserIdSetListener = null
- this.waitingOperations = new RBTree()
+ this.waitingOperations = new Y.utils.RBTree()
this.gc1 = [] // first stage
this.gc2 = [] // second stage -> after that, kill it
@@ -136,7 +132,7 @@ class AbstractOperationStore { // eslint-disable-line no-unused-vars
for (var key in ops) {
var o = ops[key]
if (!o.gc) {
- var required = Struct[o.struct].requiredOps(o)
+ var required = Y.Struct[o.struct].requiredOps(o)
this.whenOperationsExist(required, o)
} else {
throw new Error("Must not receive gc'd ops!")
@@ -208,7 +204,7 @@ class AbstractOperationStore { // eslint-disable-line no-unused-vars
}
* tryExecute (op) {
if (op.struct === 'Delete') {
- yield* Struct.Delete.execute.call(this, op)
+ yield* Y.Struct.Delete.execute.call(this, op)
} else {
while (op != null) {
var state = yield* this.getState(op.id[0])
@@ -216,14 +212,14 @@ class AbstractOperationStore { // eslint-disable-line no-unused-vars
state.clock++
yield* this.checkDeleteStoreForState(state)
yield* this.setState(state)
- var isDeleted = yield* this.store.ds.isDeleted(op.id)
+ var isDeleted = this.store.ds.isDeleted(op.id)
- yield* Struct[op.struct].execute.call(this, op)
+ yield* Y.Struct[op.struct].execute.call(this, op)
yield* this.addOperation(op)
yield* this.store.operationAdded(this, op)
if (isDeleted) {
- yield* Struct['Delete'].execute.call(this, {target: op.id})
+ yield* Y.Struct['Delete'].execute.call(this, {struct: 'Delete', target: op.id})
}
// find next operation to execute
@@ -259,7 +255,7 @@ class AbstractOperationStore { // eslint-disable-line no-unused-vars
// notify parent, if it has been initialized as a custom type
var t = this.initializedTypes[JSON.stringify(op.parent)]
if (t != null && !op.deleted) {
- yield* t._changed(transaction, copyObject(op))
+ yield* t._changed(transaction, Y.utils.copyObject(op))
}
}
removeParentListener (id, f) {
diff --git a/src/OperationStores/IndexedDB.js b/src/OperationStores/IndexedDB.js
index d742fe08392095183ee59e03dd614f2e9e70644f..f219779a8590153083157fe23acfd142b8188b82 100644
--- a/src/OperationStores/IndexedDB.js
+++ b/src/OperationStores/IndexedDB.js
@@ -1,5 +1,7 @@
+'use strict'
+
Y.IndexedDB = (function () { // eslint-disable-line
- class Transaction extends AbstractTransaction { // eslint-disable-line
+ class Transaction extends Y.AbstractTransaction { // eslint-disable-line
constructor (store) {
super(store)
this.transaction = store.db.transaction(['OperationStore', 'StateVector'], 'readwrite')
@@ -79,7 +81,7 @@ Y.IndexedDB = (function () { // eslint-disable-line
return ops
}
}
- class OperationStore extends AbstractOperationStore { // eslint-disable-line no-undef
+ class OperationStore extends Y.AbstractOperationStore { // eslint-disable-line no-undef
constructor (y, opts) {
super(y, opts)
if (opts == null) {
@@ -162,7 +164,6 @@ Y.IndexedDB = (function () { // eslint-disable-line
}
}
handleTransactions(tGen.next())
-
}
requestTransaction (makeGen) {
this.transactionQueue.queue.push(makeGen)
diff --git a/src/OperationStores/IndexedDB.spec.js b/src/OperationStores/IndexedDB.spec.js
index b065f773c14e0f34df98ea3233e27b1dc531f357..ece7565c6cd5a70e98d85f36206e185bd6d5aba9 100644
--- a/src/OperationStores/IndexedDB.spec.js
+++ b/src/OperationStores/IndexedDB.spec.js
@@ -1,7 +1,7 @@
/* global Y */
/* eslint-env browser,jasmine */
-if (typeof window !== 'undefined') {
+if (typeof window !== 'undefined' && false) {
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000
describe('IndexedDB', function () {
var ob
diff --git a/src/OperationStores/Memory.js b/src/OperationStores/Memory.js
index 28686120eb6d9e5e5a70780a1d958598d924ee94..67483fdf120af61aa1b77fe0332c30c88d92c3bd 100644
--- a/src/OperationStores/Memory.js
+++ b/src/OperationStores/Memory.js
@@ -1,4 +1,4 @@
-/* global Struct, RBTree, Y, compareIds */
+/* global Y */
'use strict'
function copyObject (o) {
@@ -8,8 +8,9 @@ function copyObject (o) {
}
return c
}
+Y.utils.copyObject = copyObject
-class DeleteStore extends Y.RBTree {
+class DeleteStore extends Y.utils.RBTree {
constructor () {
super()
}
@@ -36,7 +37,7 @@ class DeleteStore extends Y.RBTree {
}
// can extend right?
var next = n.next()
- if (next !== null && compareIds([n.val.id[0], n.val.id[1] + n.val.len], next.val.id)) {
+ if (next !== null && Y.utils.compareIds([n.val.id[0], n.val.id[1] + n.val.len], next.val.id)) {
n.val.len = n.val.len + next.val.len
super.delete(next.val.id)
}
@@ -117,7 +118,7 @@ class DeleteStore extends Y.RBTree {
}
}
-Y.DeleteStore = DeleteStore
+Y.utils.DeleteStore = DeleteStore
Y.Memory = (function () { // eslint-disable-line no-unused-vars
class Transaction extends Y.AbstractTransaction { // eslint-disable-line
@@ -206,7 +207,7 @@ Y.Memory = (function () { // eslint-disable-line no-unused-vars
this.os.iterate([user, startPos], [user, endPos], function (op) {// eslint-disable-line
if (!op.gc) {
- ops.push(Struct[op.struct].encode(op))
+ ops.push(Y.Struct[op.struct].encode(op))
}
})
}
@@ -251,7 +252,7 @@ Y.Memory = (function () { // eslint-disable-line no-unused-vars
class OperationStore extends Y.AbstractOperationStore { // eslint-disable-line no-undef
constructor (y, opts) {
super(y, opts)
- this.os = new RBTree()
+ this.os = new Y.utils.RBTree()
this.ss = {}
this.waitingTransactions = []
this.transactionInProgress = false
diff --git a/src/OperationStores/Memory.spec.js b/src/OperationStores/Memory.spec.js
index 78eaa39bb218bd193812021e9944e3d11918ccc4..4755bfd39c0455f322859649c2a89d8f22278ea5 100644
--- a/src/OperationStores/Memory.spec.js
+++ b/src/OperationStores/Memory.spec.js
@@ -1,13 +1,11 @@
/* global Y */
/* eslint-env browser,jasmine,console */
-var DeleteStore = Y.DeleteStore
-
describe('Memory', function () {
describe('DeleteStore', function () {
var ds
beforeEach(function () {
- ds = new DeleteStore()
+ ds = new Y.utils.DeleteStore()
})
it('Deleted operation is deleted', function () {
ds.delete(['u1', 10])
diff --git a/src/OperationStores/RedBlackTree.js b/src/OperationStores/RedBlackTree.js
index 1c82b35344ccd948f6729c9dedec08610ccc9d54..9885b967d4fc24de823b2f163aa8ca2b55d67c3b 100644
--- a/src/OperationStores/RedBlackTree.js
+++ b/src/OperationStores/RedBlackTree.js
@@ -1,11 +1,10 @@
-/* global Y, copyObject */
+/* global Y */
'use strict'
-var compareIds = Y.compareIds
-
function smaller (a, b) {
return a[0] < b[0] || (a[0] === b[0] && a[1] < b[1])
}
+Y.utils.smaller = smaller
class N {
// A created node is always red!
@@ -190,7 +189,7 @@ class RBTree { // eslint-disable-line no-unused-vars
}
iterate (from, to, f) {
var o = this.findNodeWithLowerBound(from)
- while (o !== null && (to === null || smaller(o.val.id, to) || compareIds(o.val.id, to))) {
+ while (o !== null && (to === null || smaller(o.val.id, to) || Y.utils.compareIds(o.val.id, to))) {
f(o.val)
o = o.next()
}
@@ -201,7 +200,7 @@ class RBTree { // eslint-disable-line no-unused-vars
if (to == null) { to = null }
var os = []
this.iterate(from, to, function (o) {
- var o_ = copyObject(o)
+ var o_ = Y.utils.copyObject(o)
var id = o_.id
delete o_.id
o_['id[0]'] = id[0]
@@ -460,4 +459,4 @@ class RBTree { // eslint-disable-line no-unused-vars
}
}
-Y.RBTree = RBTree
+Y.utils.RBTree = RBTree
diff --git a/src/OperationStores/RedBlackTree.spec.js b/src/OperationStores/RedBlackTree.spec.js
index 9558866c4058baf81b71d85b94c3b064507864b4..ac8b689346a71050a6a68b8718c05af81914b21f 100644
--- a/src/OperationStores/RedBlackTree.spec.js
+++ b/src/OperationStores/RedBlackTree.spec.js
@@ -1,9 +1,6 @@
/* global Y */
/* eslint-env browser,jasmine,console */
-var RBTree = Y.RBTree
-var compareIds = Y.compareIds
-var smaller = Y.smaller
var numberOfRBTreeTests = 1000
function itRedNodesDoNotHaveBlackChildren (tree) {
@@ -54,7 +51,7 @@ function itRootNodeIsBlack (tree) {
describe('RedBlack Tree', function () {
beforeEach(function () {
- this.tree = new RBTree()
+ this.tree = new Y.utils.RBTree()
})
it('can add&retrieve 5 elements', function () {
this.tree.add({val: 'four', id: [4]})
@@ -97,7 +94,7 @@ describe('RedBlack Tree', function () {
expect(this.tree.find([2])).toBeUndefined()
})
describe('debug #2', function () {
- var tree = new RBTree()
+ var tree = new Y.utils.RBTree()
tree.add({id: [8433]})
tree.add({id: [12844]})
tree.add({id: [1795]})
@@ -114,17 +111,19 @@ describe('RedBlack Tree', function () {
describe(`After adding&deleting (0.8/0.2) ${numberOfRBTreeTests} times`, function () {
var elements = []
- var tree = new RBTree()
+ var tree = new Y.utils.RBTree()
for (var i = 0; i < numberOfRBTreeTests; i++) {
var r = Math.random()
if (r < 0.8) {
var obj = [Math.floor(Math.random() * numberOfRBTreeTests * 10000)]
- elements.push(obj)
- tree.add({id: obj})
+ if (!tree.findNode(obj)) {
+ elements.push(obj)
+ tree.add({id: obj})
+ }
} else if (elements.length > 0) {
var elemid = Math.floor(Math.random() * elements.length)
var elem = elements[elemid]
- elements = elements.filter(function (e) {return !compareIds(e, elem); }); // eslint-disable-line
+ elements = elements.filter(function (e) {return !Y.utils.compareIds(e, elem); }); // eslint-disable-line
tree.delete(elem)
}
}
@@ -148,7 +147,7 @@ describe('RedBlack Tree', function () {
it('iterating over a tree with lower bound yields the right amount of results', function () {
var lowerBound = elements[Math.floor(Math.random() * elements.length)]
var expectedResults = elements.filter(function (e, pos) {
- return (smaller(lowerBound, e) || compareIds(e, lowerBound)) && elements.indexOf(e) === pos
+ return (Y.utils.smaller(lowerBound, e) || Y.utils.compareIds(e, lowerBound)) && elements.indexOf(e) === pos
}).length
var actualResults = 0
@@ -175,7 +174,7 @@ describe('RedBlack Tree', function () {
it('iterating over a tree with upper bound yields the right amount of results', function () {
var upperBound = elements[Math.floor(Math.random() * elements.length)]
var expectedResults = elements.filter(function (e, pos) {
- return (smaller(e, upperBound) || compareIds(e, upperBound)) && elements.indexOf(e) === pos
+ return (Y.utils.smaller(e, upperBound) || Y.utils.compareIds(e, upperBound)) && elements.indexOf(e) === pos
}).length
var actualResults = 0
@@ -190,7 +189,7 @@ describe('RedBlack Tree', function () {
var b1 = elements[Math.floor(Math.random() * elements.length)]
var b2 = elements[Math.floor(Math.random() * elements.length)]
var upperBound, lowerBound
- if (smaller(b1, b2)) {
+ if (Y.utils.smaller(b1, b2)) {
lowerBound = b1
upperBound = b2
} else {
@@ -198,8 +197,8 @@ describe('RedBlack Tree', function () {
upperBound = b1
}
var expectedResults = elements.filter(function (e, pos) {
- return (smaller(lowerBound, e) || compareIds(e, lowerBound)) &&
- (smaller(e, upperBound) || compareIds(e, upperBound)) && elements.indexOf(e) === pos
+ return (Y.utils.smaller(lowerBound, e) || Y.utils.compareIds(e, lowerBound)) &&
+ (Y.utils.smaller(e, upperBound) || Y.utils.compareIds(e, upperBound)) && elements.indexOf(e) === pos
}).length
var actualResults = 0
tree.iterate(lowerBound, upperBound, function (val) {
diff --git a/src/Struct.js b/src/Struct.js
index 0bd5bc7863a487444cde15b4d4c81a7c78ce04e6..d66dbd86b00966ece3abff90206111827bfc9c1e 100644
--- a/src/Struct.js
+++ b/src/Struct.js
@@ -1,8 +1,6 @@
/* global Y */
'use strict'
-var copyObject = Y.copyObject
-
function compareIds (id1, id2) {
if (id1 == null || id2 == null) {
if (id1 == null && id2 == null) {
@@ -16,7 +14,7 @@ function compareIds (id1, id2) {
return false
}
}
-Y.compareIds = compareIds
+Y.utils.compareIds = compareIds
var Struct = {
/* This Operations does _not_ have an id!
@@ -51,7 +49,7 @@ var Struct = {
yield* this.setOperation(target)
var t = this.store.initializedTypes[JSON.stringify(target.parent)]
if (t != null) {
- yield* t._changed(this, copyObject(op))
+ yield* t._changed(this, Y.utils.copyObject(op))
}
}
this.ds.delete(op.target)
diff --git a/src/Types/Array.js b/src/Types/Array.js
index 24cc37e3ac48a87826bf4ee595e902647b48fda5..18dcb2682ce4ddb9c90c9fdfba9dd35c8e2d1b42 100644
--- a/src/Types/Array.js
+++ b/src/Types/Array.js
@@ -1,4 +1,5 @@
-/* global EventHandler, Y, CustomType, Struct */
+/* global Y */
+'use strict'
;(function () {
class YArray {
@@ -9,7 +10,7 @@
this.idArray = idArray
// Array of all the values
this.valArray = valArray
- this.eventHandler = new EventHandler(ops => {
+ this.eventHandler = new Y.utils.EventHandler(ops => {
var userEvents = []
for (var i in ops) {
var op = ops[i]
@@ -112,7 +113,8 @@
eventHandler.awaitedLastInserts(ops.length)
})
}
- delete (pos, length = 1) {
+ delete (pos, length) {
+ if (length == null) { length = 1 }
if (typeof length !== 'number') {
throw new Error('pos must be a number!')
}
@@ -162,7 +164,7 @@
}
}
- Y.Array = new CustomType({
+ Y.Array = new Y.utils.CustomType({
class: YArray,
createType: function * YArrayCreator () {
var model = {
@@ -177,7 +179,7 @@
},
initType: function * YArrayInitializer (os, model) {
var valArray = []
- var idArray = yield* Struct.List.map.call(this, model, function (c) {
+ var idArray = yield* Y.Struct.List.map.call(this, model, function (c) {
valArray.push(c.content)
return JSON.stringify(c.id)
})
diff --git a/src/Types/Array.spec.js b/src/Types/Array.spec.js
index d43739df02f8bb09f97918769a9cd4970c5e7154..d4ce3e00bc31225d741c730baa957737b790f93d 100644
--- a/src/Types/Array.spec.js
+++ b/src/Types/Array.spec.js
@@ -1,4 +1,4 @@
-/* global createUsers, wait, Y, compareAllUsers, getRandomNumber, applyRandomTransactions, co, garbageCollectAllUsers */
+/* global createUsers, wait, Y, compareAllUsers, getRandomNumber, applyRandomTransactions, wrapCo, garbageCollectAllUsers */
/* eslint-env browser,jasmine */
var numberOfYArrayTests = 5
@@ -7,28 +7,30 @@ describe('Array Type', function () {
var y1, y2, y3, yconfig1, yconfig2, yconfig3, flushAll
jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000
- beforeEach(co.wrap(function * (done) {
+ beforeEach(wrapCo(function * (done) {
yield createUsers(this, 3)
y1 = (yconfig1 = this.users[0]).root
y2 = (yconfig2 = this.users[1]).root
y3 = (yconfig3 = this.users[2]).root
flushAll = this.users[0].connector.flushAll
+ yield wait(100)
done()
}))
- afterEach(co.wrap(function * (done) {
+ afterEach(wrapCo(function * (done) {
yield compareAllUsers(this.users)
done()
}))
describe('Basic tests', function () {
- it('insert three elements, try re-get property', co.wrap(function * (done) {
+ it('insert three elements, try re-get property', wrapCo(function * (done) {
+ console.log("blahhhhhhhhhhhhhhhhh ")
var array = yield y1.set('Array', Y.Array)
array.insert(0, [1, 2, 3])
array = yield y1.get('Array') // re-get property
expect(array.toArray()).toEqual([1, 2, 3])
done()
}))
- it('Basic insert in array (handle three conflicts)', co.wrap(function * (done) {
+ it('Basic insert in array (handle three conflicts)', wrapCo(function * (done) {
yield y1.set('Array', Y.Array)
yield flushAll()
var l1 = yield y1.get('Array')
@@ -42,7 +44,7 @@ describe('Array Type', function () {
expect(l2.toArray()).toEqual(l3.toArray())
done()
}))
- it('Basic insert&delete in array (handle three conflicts)', co.wrap(function * (done) {
+ it('Basic insert&delete in array (handle three conflicts)', wrapCo(function * (done) {
var l1, l2, l3
l1 = yield y1.set('Array', Y.Array)
l1.insert(0, ['x', 'y', 'z'])
@@ -59,7 +61,7 @@ describe('Array Type', function () {
expect(l2.toArray()).toEqual([0, 2, 'y'])
done()
}))
- it('Handles getOperations ascending ids bug in late sync', co.wrap(function * (done) {
+ it('Handles getOperations ascending ids bug in late sync', wrapCo(function * (done) {
var l1, l2
l1 = yield y1.set('Array', Y.Array)
l1.insert(0, ['x', 'y'])
@@ -78,7 +80,7 @@ describe('Array Type', function () {
expect(l1.toArray()).toEqual(l2.toArray())
done()
}))
- it('Handles deletions in late sync', co.wrap(function * (done) {
+ it('Handles deletions in late sync', wrapCo(function * (done) {
var l1, l2
l1 = yield y1.set('Array', Y.Array)
l1.insert(0, ['x', 'y'])
@@ -95,7 +97,7 @@ describe('Array Type', function () {
expect(l1.toArray()).toEqual(l2.toArray())
done()
}))
- it('Handles deletions in late sync (2)', co.wrap(function * (done) {
+ it('Handles deletions in late sync (2)', wrapCo(function * (done) {
var l1, l2
l1 = yield y1.set('Array', Y.Array)
yield flushAll()
@@ -109,7 +111,7 @@ describe('Array Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('Basic insert. Then delete the whole array', co.wrap(function * (done) {
+ it('Basic insert. Then delete the whole array', wrapCo(function * (done) {
var l1, l2, l3
l1 = yield y1.set('Array', Y.Array)
l1.insert(0, ['x', 'y', 'z'])
@@ -123,7 +125,7 @@ describe('Array Type', function () {
expect(l2.toArray()).toEqual([])
done()
}))
- it('Basic insert. Then delete the whole array (merge listeners on late sync)', co.wrap(function * (done) {
+ it('Basic insert. Then delete the whole array (merge listeners on late sync)', wrapCo(function * (done) {
var l1, l2, l3
l1 = yield y1.set('Array', Y.Array)
l1.insert(0, ['x', 'y', 'z'])
@@ -141,7 +143,7 @@ describe('Array Type', function () {
expect(l2.toArray()).toEqual([])
done()
}))
- it('Basic insert. Then delete the whole array (merge deleter on late sync)', co.wrap(function * (done) {
+ it('Basic insert. Then delete the whole array (merge deleter on late sync)', wrapCo(function * (done) {
var l1, l2, l3
l1 = yield y1.set('Array', Y.Array)
l1.insert(0, ['x', 'y', 'z'])
@@ -159,7 +161,7 @@ describe('Array Type', function () {
expect(l2.toArray()).toEqual([])
done()
}))
- it('throw insert & delete events', co.wrap(function * (done) {
+ it('throw insert & delete events', wrapCo(function * (done) {
var array = yield this.users[0].root.set('array', Y.Array)
var event
array.observe(function (e) {
@@ -182,7 +184,7 @@ describe('Array Type', function () {
yield wait(50)
done()
}))
- it('garbage collects', co.wrap(function * (done) {
+ it('garbage collects', wrapCo(function * (done) {
var l1, l2, l3
l1 = yield y1.set('Array', Y.Array)
l1.insert(0, ['x', 'y', 'z'])
@@ -227,7 +229,7 @@ describe('Array Type', function () {
}
}
}
- beforeEach(co.wrap(function * (done) {
+ beforeEach(wrapCo(function * (done) {
yield this.users[0].root.set('Array', Y.Array)
yield flushAll()
@@ -238,11 +240,11 @@ describe('Array Type', function () {
this.arrays = yield Promise.all(promises)
done()
}))
- it('arrays.length equals users.length', co.wrap(function * (done) { // eslint-disable-line
+ it('arrays.length equals users.length', wrapCo(function * (done) { // eslint-disable-line
expect(this.arrays.length).toEqual(this.users.length)
done()
}))
- it(`succeed after ${numberOfYArrayTests} actions`, co.wrap(function * (done) {
+ it(`succeed after ${numberOfYArrayTests} actions`, wrapCo(function * (done) {
for (var u of this.users) {
u.connector.debug = true
}
diff --git a/src/Types/Map.js b/src/Types/Map.js
index 57e4872b04820a1c3d1db25efcf3b1b30b4960d7..cbcbb1b19e93e1eaf7844185d414a5cfaf88bd45 100644
--- a/src/Types/Map.js
+++ b/src/Types/Map.js
@@ -1,14 +1,15 @@
-/* global EventHandler, Y, CustomType, copyObject, compareIds */
+/* global Y */
+'use strict'
;(function () {
class YMap {
constructor (os, model) {
this._model = model.id
this.os = os
- this.map = copyObject(model.map)
+ this.map = Y.utils.copyObject(model.map)
this.contents = {}
this.opContents = {}
- this.eventHandler = new EventHandler(ops => {
+ this.eventHandler = new Y.utils.EventHandler(ops => {
var userEvents = []
for (var i in ops) {
var op = ops[i]
@@ -61,7 +62,7 @@
userEvents.push(insertEvent)
}
} else if (op.struct === 'Delete') {
- if (compareIds(this.map[key], op.target)) {
+ if (Y.utils.compareIds(this.map[key], op.target)) {
delete this.opContents[key]
delete this.contents[key]
var deleteEvent = {
@@ -85,7 +86,7 @@
// if property is a type, return a promise
if (this.opContents[key] == null) {
if (key == null) {
- return copyObject(this.contents)
+ return Y.utils.copyObject(this.contents)
} else {
return this.contents[key]
}
@@ -106,7 +107,7 @@
struct: 'Delete'
}
var eventHandler = this.eventHandler
- var modDel = copyObject(del)
+ var modDel = Y.utils.copyObject(del)
modDel.key = key
eventHandler.awaitAndPrematurelyCall([modDel])
this.os.requestTransaction(function *() {
@@ -130,7 +131,7 @@
struct: 'Insert'
}
var def = Promise.defer()
- if (value instanceof CustomType) {
+ if (value instanceof Y.utils.CustomType) {
// construct a new type
this.os.requestTransaction(function *() {
var type = yield* value.createType.call(this)
@@ -208,7 +209,7 @@
this.eventHandler.receivedOp(op)
}
}
- Y.Map = new CustomType({
+ Y.Map = new Y.utils.CustomType({
class: YMap,
createType: function * YMapCreator () {
var model = {
diff --git a/src/Types/Map.spec.js b/src/Types/Map.spec.js
index 235780c04a61f46608cd4b7cbad6920fab5b490e..f4ade29b9172528e7b17a99c88202802d5cc06b6 100644
--- a/src/Types/Map.spec.js
+++ b/src/Types/Map.spec.js
@@ -1,13 +1,13 @@
-/* global createUsers, Y, compareAllUsers, getRandomNumber, applyRandomTransactions, co */
+/* global createUsers, Y, compareAllUsers, getRandomNumber, applyRandomTransactions, wrapCo */
/* eslint-env browser,jasmine */
-var numberOfYMapTests = 100
+var numberOfYMapTests = 5
describe('Map Type', function () {
var y1, y2, y3, y4, flushAll
jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000
- beforeEach(co.wrap(function * (done) {
+ beforeEach(wrapCo(function * (done) {
yield createUsers(this, 5)
y1 = this.users[0].root
y2 = this.users[1].root
@@ -16,13 +16,13 @@ describe('Map Type', function () {
flushAll = this.users[0].connector.flushAll
done()
}))
- afterEach(co.wrap(function * (done) {
+ afterEach(wrapCo(function * (done) {
yield compareAllUsers(this.users)
done()
}), 5000)
describe('Basic tests', function () {
- it('Basic get&set of Map property (converge via sync)', co.wrap(function * (done) {
+ it('Basic get&set of Map property (converge via sync)', wrapCo(function * (done) {
y1.set('stuff', 'stuffy')
expect(y1.get('stuff')).toEqual('stuffy')
yield flushAll()
@@ -33,7 +33,7 @@ describe('Map Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('Map can set custom types (Map)', co.wrap(function * (done) {
+ it('Map can set custom types (Map)', wrapCo(function * (done) {
var map = yield y1.set('Map', Y.Map)
map.set('one', 1)
map = yield y1.get('Map')
@@ -41,7 +41,7 @@ describe('Map Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('Map can set custom types (Array)', co.wrap(function * (done) {
+ it('Map can set custom types (Array)', wrapCo(function * (done) {
var array = yield y1.set('Array', Y.Array)
array.insert(0, [1, 2, 3])
array = yield y1.get('Array')
@@ -49,7 +49,7 @@ describe('Map Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('Basic get&set of Map property (converge via update)', co.wrap(function * (done) {
+ it('Basic get&set of Map property (converge via update)', wrapCo(function * (done) {
yield flushAll()
y1.set('stuff', 'stuffy')
expect(y1.get('stuff')).toEqual('stuffy')
@@ -61,7 +61,7 @@ describe('Map Type', function () {
}
done()
}))
- it('Basic get&set of Map property (handle conflict)', co.wrap(function * (done) {
+ it('Basic get&set of Map property (handle conflict)', wrapCo(function * (done) {
yield flushAll()
y1.set('stuff', 'c0')
@@ -75,7 +75,7 @@ describe('Map Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('Basic get&set&delete of Map property (handle conflict)', co.wrap(function * (done) {
+ it('Basic get&set&delete of Map property (handle conflict)', wrapCo(function * (done) {
yield flushAll()
y1.set('stuff', 'c0')
y1.delete('stuff')
@@ -89,7 +89,7 @@ describe('Map Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('Basic get&set of Map property (handle three conflicts)', co.wrap(function * (done) {
+ it('Basic get&set of Map property (handle three conflicts)', wrapCo(function * (done) {
yield flushAll()
y1.set('stuff', 'c0')
y2.set('stuff', 'c1')
@@ -104,7 +104,7 @@ describe('Map Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('Basic get&set&delete of Map property (handle three conflicts)', co.wrap(function * (done) {
+ it('Basic get&set&delete of Map property (handle three conflicts)', wrapCo(function * (done) {
yield flushAll()
y1.set('stuff', 'c0')
y2.set('stuff', 'c1')
@@ -125,7 +125,7 @@ describe('Map Type', function () {
yield compareAllUsers(this.users)
done()
}))
- it('throws add & update & delete events (with type and primitive content)', co.wrap(function * (done) {
+ it('throws add & update & delete events (with type and primitive content)', wrapCo(function * (done) {
var event
yield flushAll()
y1.observe(function (e) {
@@ -186,7 +186,7 @@ describe('Map Type', function () {
}
}
}
- beforeEach(co.wrap(function * (done) {
+ beforeEach(wrapCo(function * (done) {
yield y1.set('Map', Y.Map)
yield flushAll()
@@ -197,7 +197,7 @@ describe('Map Type', function () {
this.maps = yield Promise.all(promises)
done()
}))
- it(`succeed after ${numberOfYMapTests} actions`, co.wrap(function * (done) {
+ it(`succeed after ${numberOfYMapTests} actions`, wrapCo(function * (done) {
yield applyRandomTransactions(this.users, this.maps, randomMapTransactions, numberOfYMapTests)
yield flushAll()
yield compareMapValues(this.maps)
diff --git a/src/Types/TextBind.js b/src/Types/TextBind.js
index ab13c67a601a642932d3e86ce81553aacf2f448c..77262bf0d6f4b97566673b8e82976f6c6b392c55 100644
--- a/src/Types/TextBind.js
+++ b/src/Types/TextBind.js
@@ -1,9 +1,8 @@
/* global Y */
-
-var CustomType = Y.CustomType
+'use strict'
;(function () {
- class YTextBind extends Y . Array . class {
+ class YTextBind extends Y.Array.class {
constructor (os, _model, idArray, valArray) {
super(os, _model, idArray, valArray)
this.textfields = []
@@ -12,7 +11,7 @@ var CustomType = Y.CustomType
return this.valArray.join('')
}
insert (pos, content) {
- super(pos, content.split(''))
+ super.insert(pos, content.split(''))
}
bind (textfield, domRoot) {
domRoot = domRoot || window; // eslint-disable-line
@@ -265,7 +264,7 @@ var CustomType = Y.CustomType
}
}
}
- Y.TextBind = new CustomType({
+ Y.TextBind = new Y.utils.CustomType({
class: YTextBind,
createType: function * YTextBindCreator () {
var model = {
diff --git a/src/Utils.js b/src/Utils.js
index 1a0a0ced15e7a14e20e9545ffb173f1c45417e1e..733c294206acfd0d78a625d5676b4469d8e62121 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -1,10 +1,6 @@
/* global Y */
'use strict'
-var compareIds = Y.compareIds
-var copyObject = Y.copyObject
-var GeneratorFunction = (function *() {}).constructor;// eslint-disable-line
-
class EventHandler { // eslint-disable-line
constructor (onevent) {
this.waiting = []
@@ -16,7 +12,7 @@ class EventHandler { // eslint-disable-line
if (this.awaiting <= 0) {
this.onevent([op])
} else {
- this.waiting.push(copyObject(op))
+ this.waiting.push(Y.utils.copyObject(op))
}
}
awaitAndPrematurelyCall (ops) {
@@ -49,12 +45,12 @@ class EventHandler { // eslint-disable-line
var op = ops[oid]
for (var i = this.waiting.length - 1; i >= 0; i--) {
let w = this.waiting[i]
- if (compareIds(op.left, w.id)) {
+ if (Y.utils.compareIds(op.left, w.id)) {
// include the effect of op in w
w.right = op.id
// exclude the effect of w in op
op.left = w.left
- } else if (compareIds(op.right, w.id)) {
+ } else if (Y.utils.compareIds(op.right, w.id)) {
// similar..
w.left = op.id
op.right = w.right
@@ -71,7 +67,7 @@ class EventHandler { // eslint-disable-line
for (var i in this.waiting) {
let w = this.waiting[i]
// We will just care about w.left
- if (compareIds(del.target, w.left)) {
+ if (Y.utils.compareIds(del.target, w.left)) {
del.left = newLeft
}
}
@@ -88,6 +84,7 @@ class EventHandler { // eslint-disable-line
}
}
}
+Y.utils.EventHandler = EventHandler
class CustomType { // eslint-disable-line
constructor (def) {
@@ -102,3 +99,4 @@ class CustomType { // eslint-disable-line
this.class = def.class
}
}
+Y.utils.CustomType = CustomType
diff --git a/src/y.js b/src/y.js
index b5cefe7b46e27230320d6f20c72340c30612193d..2b313342075c6af9eff7e5688f878f411ff75581 100644
--- a/src/y.js
+++ b/src/y.js
@@ -40,7 +40,7 @@ class YConfig { // eslint-disable-line no-unused-vars
Promise.all([
this.db.garbageCollect(),
this.db.garbageCollect()
- ]).then(function () {
+ ]).then(() => {
this.connector.reconnect()
})
}
@@ -55,4 +55,8 @@ class YConfig { // eslint-disable-line no-unused-vars
}
}
-if (g) g.Y = Y //eslint-disable-line
+if (g) { // eslint-disable-line
+ g.Y = Y //eslint-disable-line
+ debugger //eslint-disable-line
+}
+Y.utils = {}
diff --git a/test.js b/test.js
index b7529600bfdd1af2bc0bf56199f7dd500284dfcf..3cf0cdb1b32e1fb34d0fef64435eb73e64e53ccd 100644
--- a/test.js
+++ b/test.js
@@ -2,7 +2,16 @@
function * aaa (){}
-class X {
+class Y {
+ constructor () {
+ this.y = 4
+ }
+}
+
+class X extends Y {
+ constructor (a) {
+ this.x = 'true'
+ }
stuff () {
console.log("yay")
var r = function * () {
@@ -12,6 +21,14 @@ class X {
console.dir(r())
}
}
+var Q = {}
+Q["X"] = X
-(new X).stuff()
+var P = Q['X']
+var x = new P( 44 )
+(new Promise(function(resolve){
+ resolve(true)
+})).then(function(arg){
+ console.log("yay", arg)
+})