Mirroristas/gun
2
0
Fork 0
mirror of https://github.com/amark/gun.git synced 2025-06-07 14:46:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pull latest

Browse Source
This commit is contained in:
Mark Nadal 2016-10-04 19:13:04 -07:00
parent dfcd2f7ab4
commit f122fe2dfb
2 changed files with 57 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
gun.js
View File

@ -911,6 +911,8 @@
} }
function get(at, cat){ function get(at, cat){
var soul = at.get[_soul], node = cat.graph[soul], field = at.get[_field]; var soul = at.get[_soul], node = cat.graph[soul], field = at.get[_field];
console.debug(10, 'GET', soul, node, field);
console.debug(2, 'GET', soul, node, field);
if(node && (!field || obj_has(node, field))){ if(node && (!field || obj_has(node, field))){
if(field){ if(field){
node = Gun.obj.put({_: node._}, field, node[field]); node = Gun.obj.put({_: node._}, field, node[field]);
@ -932,6 +934,8 @@
if(cat.graph){ if(cat.graph){
Gun.obj.map(at.put, ham, {at: at, cat: cat}); // all unions must happen first, sadly. Gun.obj.map(at.put, ham, {at: at, cat: cat}); // all unions must happen first, sadly.
} }
console.debug(12, 'IN', at);
console.debug(4, 'IN', at);
Gun.obj.map(at.put, map, {at: at, cat: cat}); Gun.obj.map(at.put, map, {at: at, cat: cat});
} }
function ham(data, key){ function ham(data, key){
@ -1433,6 +1437,10 @@
Gun.on.ack(tmp, at); Gun.on.ack(tmp, at);
if(at.err){ return } if(at.err){ return }
}; };
console.debug(16, 'in', cat.get, change, Gun.obj.copy(cat.ask), cat.next, cat.on('in').s.slice());
console.debug(13, 'in', cat.get, change, Gun.obj.copy(cat.ask), cat.next, cat.on('in').s.slice());
console.debug(6, 'in', cat.get, change, Gun.obj.copy(cat.ask), cat.next);
console.debug(5, 'in', cat.get, change, Gun.obj.copy(cat.ask), cat.next);
if(value.call(cat, at, ev)){ if(value.call(cat, at, ev)){
return; return;
} }
@ -1441,26 +1449,39 @@
Gun.chain.get.input = input; Gun.chain.get.input = input;
function value(at, ev){ function value(at, ev){
var cat = this, gun = at.gun, put = at.put, coat = gun._, rel, tmp; var cat = this, gun = at.gun, put = at.put, coat = gun._, rel, tmp;
if(u === at.put){
not(cat, at);
return true;
}
if(!(rel = Gun.val.rel.is(put))){ if(!(rel = Gun.val.rel.is(put))){
if(cat.proxy){ if(cat.proxy){
if(cat.proxy.it === at){ return true } // TODO: PERF! Anyway to simplify this? if(cat.proxy.it === at){
console.debug(15, 'value', cat.get, put, cat.proxy, cat.proxy.it === at);
ask(cat, Gun.node.soul(put), coat);
console.debug(18, 'value', cat.get, put, cat.proxy, cat.on('in').s.slice());
return true;
} // TODO: PERF! Anyway to simplify this?
if(cat.proxy.rel){ if(cat.proxy.rel){
cat.change = coat.change; cat.change = coat.change;
cat.put = coat.put; cat.put = coat.put;
} }
// TODO: BUG! This mutated `at` won't effect the original at that was sent via the poly-proxy approach. Meaning what is still cached in the poly-set is not this better/recent/fuller one. // TODO: BUG! This mutated `at` won't effect the original at that was sent via the poly-proxy approach. Meaning what is still cached in the poly-set is not this better/recent/fuller one.
console.debug(17, 'value', cat.get, put, cat.proxy, cat.on('in').s.slice());
console.debug(14, 'value', cat.get, put, cat.proxy, cat.proxy.it === at);
cat.on('in', obj_to(at, cat.proxy.it = {get: cat.get || at.get})); cat.on('in', obj_to(at, cat.proxy.it = {get: cat.get || at.get}));
console.debug(19, 'value', cat.get, put, cat.proxy);
} }
if(Gun.val.is(at)){ if(Gun.val.is(put)){
//not(); // ask? //ask(); // ask?
not(cat, at); not(cat, at);
return true; return true;
} }
// iterables? // iterables?
not(cat, at); if(!cat.proxy){
ask(cat); ask(cat, rel || Gun.node.soul(put));
}
return; return;
} };
if(coat.proxy && rel === coat.proxy.rel){ if(coat.proxy && rel === coat.proxy.rel){
coat.id = coat.id || Gun.text.random(6); coat.id = coat.id || Gun.text.random(6);
ask(cat, rel, coat); ask(cat, rel, coat);
@ -1482,13 +1503,18 @@
if(!cat.proxy || !cat.proxy[coat.id]){ // TODO: BUG! REPEATS ABOVE if(!cat.proxy || !cat.proxy[coat.id]){ // TODO: BUG! REPEATS ABOVE
(cat.proxy = cat.proxy || {})[coat.id] = coat; (cat.proxy = cat.proxy || {})[coat.id] = coat;
cat.proxy.res = ev.stun(rel); cat.proxy.res = ev.stun(rel);
console.debug(7, 'values', cat.get, put, cat.proxy, coat.proxy, cat === coat);
gun.on('in', input, cat); gun.on('in', input, cat);
} }
} }
//not() //not(cat, at);
//coat.put = u; // this okay?
tmp = coat.proxy = {rel: rel, ref: coat.root.get(rel)}; tmp = coat.proxy = {rel: rel, ref: coat.root.get(rel)};
tmp.ev = ev; tmp.res = ev.stun(rel); tmp.as = coat; tmp.ev = ev; tmp.res = ev.stun(rel); tmp.as = coat;
tmp.ref.on('in', input, coat); tmp.ref.on('in', input, coat);
console.debug(8, 'values', cat.get, put, cat.proxy, coat.proxy, cat === coat);
// TODO: BUG, MAKE SURE NOT TO DO ASK IF ^ IS CACHED SINCE IT WILL ON ITS OWN END.
ask(cat, rel, coat);
return true; return true;
} }
function value2(at, ev){ function value2(at, ev){
@ -1524,6 +1550,7 @@
tmp = coat.link = {rel: rel, ref: coat.root.get(rel)};//, res: ev.stun(rel), as: cat}; tmp = coat.link = {rel: rel, ref: coat.root.get(rel)};//, res: ev.stun(rel), as: cat};
tmp.res = ev.stun(rel); tmp.as = cat; tmp.res = ev.stun(rel); tmp.as = cat;
tmp.sub = tmp.ref.on('in', input, coat); tmp.sub = tmp.ref.on('in', input, coat);
ask();
return true; return true;
} }
function value1(at, ev){ function value1(at, ev){
@ -1640,6 +1667,7 @@
}); });
} }
function not(cat, at){ function not(cat, at){
//if(u !== at.put){ return }
var ask = cat.ask, tmp = cat.proxy; var ask = cat.ask, tmp = cat.proxy;
cat.proxy = null; cat.proxy = null;
if(null === tmp){ return } if(null === tmp){ return }
@ -1677,16 +1705,18 @@
if(tmp = proxy._['*'] || ask._['*']){ // TODO! BUG! Should be proxy, right? if(tmp = proxy._['*'] || ask._['*']){ // TODO! BUG! Should be proxy, right?
if(0 <= tmp){ if(0 <= tmp){
proxy._['*'] = -1; proxy._['*'] = -1;
coat.gun.on('out', { tmp = cat.root.get(soul);
console.debug(9, 'ask', Gun.obj.copy(ask), Gun.obj.copy(proxy));
tmp.on('out', {
get: {'#': soul}, get: {'#': soul},
gun: coat.gun, gun: tmp,
'#': Gun.on.ask(ack, coat.gun) '#': Gun.on.ask(ack, tmp)
}); });
return; return;
} }
} }
if(0 >= proxy._['.']){ return } if(0 >= proxy._['.'] && 0 >= ask._['.']){ return }
proxy._['.'] = -1; proxy._['.'] = ask._['.'] = -1;
obj_map(ask, function(state, key){ obj_map(ask, function(state, key){
state = proxy[key] || (proxy[key] = state); state = proxy[key] || (proxy[key] = state);
if(1 > state){ return } if(1 > state){ return }
@ -1711,6 +1741,7 @@
var opt = opt || {}, gun = opt.gun = this; var opt = opt || {}, gun = opt.gun = this;
if(opt.change){ opt.change = 1 } if(opt.change){ opt.change = 1 }
opt.any = cb; opt.any = cb;
console.debug(1, 'any', gun._.get);
return gun.on('in', any, opt).on('out', {get: opt}); return gun.on('in', any, opt).on('out', {get: opt});
} }
function any(at, ev){ var opt = this; function any(at, ev){ var opt = this;
@ -1719,10 +1750,8 @@
if((tmp = data) && tmp[Gun.val.rel._] && (tmp = Gun.val.rel.is(tmp))){ if((tmp = data) && tmp[Gun.val.rel._] && (tmp = Gun.val.rel.is(tmp))){
//console.log("ooooooooh jolllllly", data); //console.log("ooooooooh jolllllly", data);
if(null !== opt['.']){ if(null !== opt['.']){
if(u === cat.put){ if(Gun.val.rel.is(cat.put)){
gun.any(function(err,d,k,a,e){e.off(); cat.root.get(tmp).any(function(err,d,k,a,e){e.off()});
any.call(opt, obj_to(a, {get: at.get}), e);
});
return; return;
} }
} }
@ -2150,6 +2179,8 @@
if(!data){ return } // localStorage isn't trustworthy to say "not found". if(!data){ return } // localStorage isn't trustworthy to say "not found".
if(Gun.obj.has(lex, '.')){var tmp = data[lex['.']];data = {_: data._};if(u !== tmp){data[lex['.']] = tmp}} if(Gun.obj.has(lex, '.')){var tmp = data[lex['.']];data = {_: data._};if(u !== tmp){data[lex['.']] = tmp}}
//console.log('@@@@@@@@@@@@local get', data, at); //console.log('@@@@@@@@@@@@local get', data, at);
console.debug(11, 'get local', data);
console.debug(3, 'get local', data);
gun.Back(-1).on('in', {'@': at['#'], put: Gun.graph.node(data)}); gun.Back(-1).on('in', {'@': at['#'], put: Gun.graph.node(data)});
//},100); //},100);
} }

16
test/common.js
View File

@ -2441,7 +2441,7 @@ describe('Gun', function(){
}); });
}); });
it.only('get get get any parallel', function(done){ it('get get get any parallel', function(done){
var s = Gun.state.map();s.soul = 'parallel'; var s = Gun.state.map();s.soul = 'parallel';
Gun.on('put', {gun: gun, put: Gun.graph.ify({ Gun.on('put', {gun: gun, put: Gun.graph.ify({
bob: { bob: {
@ -2455,6 +2455,7 @@ describe('Gun', function(){
expect(field).to.be('age'); expect(field).to.be('age');
done.age = true; done.age = true;
}); });
console.debug.i=1;console.log("---------------------------");
gun.get('parallel').path('bob').path('name').any(function(err, data, field, at, ev){ gun.get('parallel').path('bob').path('name').any(function(err, data, field, at, ev){
console.log("*********** name", data); console.log("*********** name", data);
expect(data).to.be('Bob!'); expect(data).to.be('Bob!');
@ -2545,7 +2546,7 @@ describe('Gun', function(){
done(); done();
}); });
}); });
return;
it('get any any later', function(done){ it('get any any later', function(done){
var s = Gun.state.map();s.soul = 'full/later'; var s = Gun.state.map();s.soul = 'full/later';
Gun.on('put', {gun: gun, put: Gun.graph.ify({ Gun.on('put', {gun: gun, put: Gun.graph.ify({
@ -2748,7 +2749,7 @@ describe('Gun', function(){
},400); },400);
}); });
it('mutate pointer to primitive deep on', function(done){ it.only('mutate pointer to primitive deep on', function(done){
var s = Gun.state.map();s.soul = 'change/pointer'; var s = Gun.state.map();s.soul = 'change/pointer';
Gun.on('put', {gun: gun, put: Gun.graph.ify({ Gun.on('put', {gun: gun, put: Gun.graph.ify({
bob: { bob: {
@ -2760,8 +2761,9 @@ describe('Gun', function(){
} }
} }
}, s)}); }, s)});
console.debug.i=1;console.log("---------------------------");
gun.get('change/pointer').path('bob').path('pet').any(function(err, data, f, at, ev){ gun.get('change/pointer').path('bob').path('pet').any(function(err, data, f, at, ev){
//console.log("*********************", data); console.log("***", data);return;
if(done.c){ if(done.c){
expect(data).to.be(undefined); expect(data).to.be(undefined);
return; return;
@ -2770,7 +2772,7 @@ describe('Gun', function(){
expect(data.species).to.be('kitty'); expect(data.species).to.be('kitty');
done.c = 1; done.c = 1;
}); });
return;
setTimeout(function(){ setTimeout(function(){
gun.get('change/pointer').put({ gun.get('change/pointer').put({
bob: null bob: null
@ -2784,7 +2786,7 @@ describe('Gun', function(){
gun.get('change/pointer').any(function(err, data){ gun.get('change/pointer').any(function(err, data){
//console.log("*********", data); console.log("****************", data);
if(2 <= done.e && data.bob){ if(2 <= done.e && data.bob){
expect(data.bob).to.be('hello!'); expect(data.bob).to.be('hello!');
done(); done();
@ -2799,7 +2801,7 @@ describe('Gun', function(){
done.e = 1; done.e = 1;
}); });
}); });
return;
it('get only soul', function(done){ it('get only soul', function(done){
var s = Gun.state.map();s.soul = 'only/soul'; var s = Gun.state.map();s.soul = 'only/soul';
Gun.on('put', {gun: gun, put: Gun.graph.ify({ Gun.on('put', {gun: gun, put: Gun.graph.ify({