yonote/yjs
24
0
Fork 0
Code Pull Requests 1 Releases Activity

added xml example

Browse Source
This commit is contained in:
Kevin Jahns 2016-03-14 19:45:50 +01:00
parent 51c8d3bdc6
commit 5cfe209688
6 changed files with 6035 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Examples/Xml/index.html Normal file
View File

@ -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>

24
Examples/Xml/index.js Normal file
View File

@ -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)
})
})

221
y.es6
View File

@ -760,9 +760,7 @@ module.exports = function (Y /* :any */) {
this.userIdPromise.then(f) this.userIdPromise.then(f)
} }
getNextOpId () { getNextOpId () {
if (this._nextUserId != null) { if (this.userId == null) {
return this._nextUserId
} else if (this.userId == null) {
throw new Error('OperationStore not yet initialized!') throw new Error('OperationStore not yet initialized!')
} else { } else {
return [this.userId, this.opClock++] return [this.userId, this.opClock++]
@ -781,6 +779,9 @@ module.exports = function (Y /* :any */) {
var o = ops[i] var o = ops[i]
if (o.id == null || o.id[0] !== this.y.connector.userId) { if (o.id == null || o.id[0] !== this.y.connector.userId) {
var required = Y.Struct[o.struct].requiredOps(o) var required = Y.Struct[o.struct].requiredOps(o)
if (o.requires != null) {
required = required.concat(o.requires)
}
this.whenOperationsExist(required, o) this.whenOperationsExist(required, o)
} }
} }
@ -929,7 +930,7 @@ module.exports = function (Y /* :any */) {
} }
// notify parent, if it was instanciated as a custom type // notify parent, if it was instanciated as a custom type
if (t != null) { if (t != null && !opIsDeleted) {
yield* t._changed(transaction, Y.utils.copyObject(op)) yield* t._changed(transaction, Y.utils.copyObject(op))
} }
} }
@ -1061,7 +1062,7 @@ module.exports = function (Y/* :any */) {
if (op.parentSub != null) { if (op.parentSub != null) {
e.parentSub = op.parentSub e.parentSub = op.parentSub
} }
if (op.opContent != null) { if (op.hasOwnProperty('opContent')) {
e.opContent = op.opContent e.opContent = op.opContent
} else { } else {
e.content = op.content e.content = op.content
@ -1256,11 +1257,18 @@ module.exports = function (Y/* :any */) {
} }
}, },
encode: function (op) { encode: function (op) {
return { var e = {
struct: 'List', struct: 'List',
id: op.id, id: op.id,
type: op.type type: op.type
} }
if (op.requires != null) {
e.requires = op.requires
}
if (op.info != null) {
e.info = op.info
}
return e
}, },
requiredOps: function () { requiredOps: function () {
/* /*
@ -1329,12 +1337,19 @@ module.exports = function (Y/* :any */) {
} }
}, },
encode: function (op) { encode: function (op) {
return { var e = {
struct: 'Map', struct: 'Map',
type: op.type, type: op.type,
id: op.id, id: op.id,
map: {} // overwrite map!! map: {} // overwrite map!!
} }
if (op.requires != null) {
e.requires = op.requires
}
if (op.info != null) {
e.info = op.info
}
return e
}, },
requiredOps: function () { requiredOps: function () {
return [] return []
@ -1451,26 +1466,52 @@ module.exports = function (Y/* :any */) {
If it does not exist yes, create it. If it does not exist yes, create it.
TODO: delete type from store.initializedTypes[id] when corresponding id was deleted! TODO: delete type from store.initializedTypes[id] when corresponding id was deleted!
*/ */
* getType (id) { * getType (id, args) {
var sid = JSON.stringify(id) var sid = JSON.stringify(id)
var t = this.store.initializedTypes[sid] var t = this.store.initializedTypes[sid]
if (t == null) { if (t == null) {
var op/* :MapStruct | ListStruct */ = yield* this.getOperation(id) var op/* :MapStruct | ListStruct */ = yield* this.getOperation(id)
if (op != null) { 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 this.store.initializedTypes[sid] = t
} }
} }
return t return t
} }
* createType (typedefinition) { * createType (typedefinition, id) {
var structname = typedefinition.struct var structname = typedefinition[0].struct
var id = this.store.getNextOpId() id = id || this.store.getNextOpId()
var op = Y.Struct[structname].create(id) var op
op.type = typedefinition.name if (id[0] === '_') {
yield* this.applyCreatedOperations([op]) op = yield* this.getOperation(id)
return yield* this.getType(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!) Apply operations that this user created (no remote ones!)
* does not check for Struct.*.requiredOps() * does not check for Struct.*.requiredOps()
@ -1481,7 +1522,7 @@ module.exports = function (Y/* :any */) {
for (var i = 0; i < ops.length; i++) { for (var i = 0; i < ops.length; i++) {
var op = ops[i] var op = ops[i]
yield* this.store.tryExecute.call(this, op) 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)) send.push(Y.Struct[op.struct].encode(op))
} }
} }
@ -1517,7 +1558,7 @@ module.exports = function (Y/* :any */) {
yield* this.markDeleted(targetId, 1) yield* this.markDeleted(targetId, 1)
} }
if (target != null && target.gc == null) { if (target != null) {
if (!target.deleted) { if (!target.deleted) {
callType = true callType = true
// set deleted & notify type // set deleted & notify type
@ -1548,7 +1589,7 @@ module.exports = function (Y/* :any */) {
} }
if (target.opContent != null) { if (target.opContent != null) {
yield* this.deleteOperation(target.opContent) yield* this.deleteOperation(target.opContent)
target.opContent = null // target.opContent = null
} }
} }
var left var left
@ -1835,10 +1876,12 @@ module.exports = function (Y/* :any */) {
yield* this.setOperation(origin) yield* this.setOperation(origin)
} }
} }
var parent
if (o.parent != null) { if (o.parent != null){
// remove gc'd op from parent, if it exists parent = yield* this.getOperation(o.parent)
var parent /* MapOperation */ = 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 var setParent = false // whether to save parent to the os
if (o.parentSub != null) { if (o.parentSub != null) {
if (Y.utils.compareIds(parent.map[o.parentSub], o.id)) { if (Y.utils.compareIds(parent.map[o.parentSub], o.id)) {
@ -2007,7 +2050,7 @@ module.exports = function (Y/* :any */) {
} }
* addOperation (op) { * addOperation (op) {
yield* this.os.put(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 // is connected, and this is not going to be send in addOperation
this.store.y.connector.broadcastOps([op]) this.store.y.connector.broadcastOps([op])
} }
@ -2017,18 +2060,21 @@ module.exports = function (Y/* :any */) {
if (o != null || id[0] !== '_') { if (o != null || id[0] !== '_') {
return o return o
} else { } else {
// need to generate this operation // generate this operation?
if (this.store._nextUserId == null) { var comp = id[1].split('_')
var struct = id[1].split('_')[0] if (comp.length > 1) {
// this.store._nextUserId = id var struct = comp[0]
var op = Y.Struct[struct].create(id) var op = Y.Struct[struct].create(id)
op.type = comp[1]
yield* this.setOperation(op) yield* this.setOperation(op)
// delete this.store._nextUserId
return op return op
} else { } 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
} }
return null
} }
} }
* removeOperation (id) { * removeOperation (id) {
@ -2253,7 +2299,40 @@ module.exports = function (Y/* :any */) {
module.exports = function (Y /* : any*/) { module.exports = function (Y /* : any*/) {
Y.utils = {} 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>; waiting: Array<Insertion | Deletion>;
awaiting: number; awaiting: number;
@ -2268,16 +2347,16 @@ module.exports = function (Y /* : any*/) {
all prematurely called operations were executed ("waiting operations") all prematurely called operations were executed ("waiting operations")
*/ */
constructor (onevent /* : Function */) { constructor (onevent /* : Function */) {
super()
this.waiting = [] this.waiting = []
this.awaiting = 0 this.awaiting = 0
this.onevent = onevent this.onevent = onevent
this.eventListeners = []
} }
destroy () { destroy () {
super.destroy()
this.waiting = null this.waiting = null
this.awaiting = null this.awaiting = null
this.onevent = null this.onevent = null
this.eventListeners = null
} }
/* /*
Call this when a new operation arrives. It will be executed right away if Call this when a new operation arrives. It will be executed right away if
@ -2299,30 +2378,6 @@ module.exports = function (Y /* : any*/) {
this.awaiting++ this.awaiting++
this.onevent(ops) 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 Call this when you successfully awaited the execution of n Insert operations
*/ */
@ -2419,10 +2474,26 @@ module.exports = function (Y /* : any*/) {
this.initType = def.initType this.initType = def.initType
this.class = def.class this.class = def.class
this.name = def.name 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.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 Make a flat copy of an object
(just copy properties) (just copy properties)
@ -2630,7 +2701,11 @@ module.exports = Y
Y.requiringModules = requiringModules Y.requiringModules = requiringModules
Y.extend = function (name, value) { 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) { if (requiringModules[name] != null) {
requiringModules[name].resolve() requiringModules[name].resolve()
delete requiringModules[name] delete requiringModules[name]
@ -2645,9 +2720,10 @@ function requestModules (modules) {
var extention = typeof regeneratorRuntime !== 'undefined' ? '.js' : '.es6' var extention = typeof regeneratorRuntime !== 'undefined' ? '.js' : '.es6'
var promises = [] var promises = []
for (var i = 0; i < modules.length; i++) { for (var i = 0; i < modules.length; i++) {
var modulename = 'y-' + modules[i].toLowerCase() var module = modules[i].split('(')[0]
if (Y[modules[i]] == null) { var modulename = 'y-' + module.toLowerCase()
if (requiringModules[modules[i]] == null) { if (Y[module] == null) {
if (requiringModules[module] == null) {
// module does not exist // module does not exist
if (typeof window !== 'undefined' && window.Y !== 'undefined') { if (typeof window !== 'undefined' && window.Y !== 'undefined') {
var imported = document.createElement('script') var imported = document.createElement('script')
@ -2655,7 +2731,7 @@ function requestModules (modules) {
document.head.appendChild(imported) document.head.appendChild(imported)
let requireModule = {} let requireModule = {}
requiringModules[modules[i]] = requireModule requiringModules[module] = requireModule
requireModule.promise = new Promise(function (resolve) { requireModule.promise = new Promise(function (resolve) {
requireModule.resolve = resolve requireModule.resolve = resolve
}) })
@ -2746,15 +2822,20 @@ class YConfig {
this.db.requestTransaction(function * requestTransaction () { this.db.requestTransaction(function * requestTransaction () {
// create shared object // create shared object
for (var propertyname in opts.share) { for (var propertyname in opts.share) {
var typename = opts.share[propertyname] var typeConstructor = opts.share[propertyname].split('(')
var id = ['_', Y[typename].struct + '_' + propertyname] var typeName = typeConstructor.splice(0, 1)
var op = yield* this.getOperation(id) var args = []
if (op.type !== typename) { if (typeConstructor.length === 1) {
// not already in the db try {
op.type = typename args = JSON.parse('[' + typeConstructor[0].split(')')[0] + ']')
yield* this.setOperation(op) } 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() this.store.whenTransactionsFinished()
.then(callback) .then(callback)

2
y.es6.map
View File

File diff suppressed because one or more lines are too long

5853
y.js
View File

File diff suppressed because one or more lines are too long

2
y.js.map
View File

File diff suppressed because one or more lines are too long