mirror of
https://github.com/amark/gun.git
synced 2025-03-30 15:08:33 +00:00
tests pass in IE6! Scheduler bug fixed.
This commit is contained in:
Mark Nadal
parent
11c2a8873e
commit
bc5b992f90
22
gun.js
22
gun.js
@ -242,7 +242,7 @@
|
||||
gun._.at = function(e){
|
||||
var proxy = function(cb, i, chain){
|
||||
var on = gun._.on(e), at;
|
||||
if(at = ((on = gun._.on(e)).e = on.e || {})[e]){ cb.call(on, at) }
|
||||
if(at = ((on = gun._.on(e)).e = on.e || {})[e]){ setTimeout(function(){cb.call(on, at)},0) }
|
||||
on[chain](function(at){
|
||||
cb.call(on, at);
|
||||
}, i);
|
||||
@ -618,7 +618,6 @@
|
||||
if(!gun.back){ gun = gun.put({}) }
|
||||
gun = gun.not(function(next, key){ return key? this.put({}).key(key) : this.put({}) });
|
||||
if(!val && !Gun.is.value(val)){ return gun }
|
||||
|
||||
var obj = {};
|
||||
obj['I' + drift + 'R' + Gun.text.random(5)] = val;
|
||||
return gun.put(obj, cb);
|
||||
@ -628,8 +627,8 @@
|
||||
cb = cb || function(){};
|
||||
|
||||
gun._.at('null').once(function(key){
|
||||
if(key.soul || gun.__.keys[key = (key || {}).key] || gun.__.flag.start[key]){ return }
|
||||
// TODO! BUG? There WAS a timing bug with the above, but setTimeout seems to fix it compared to setImmediate.
|
||||
if(key.soul || gun.__.keys[key = (key || {}).key]){ return }
|
||||
// TODO! BUG? Removed a start flag check and tests passed, but is that an edge case?
|
||||
var kick = function(next){
|
||||
if(++c){ return Gun.log("Warning! Multiple `not` resumes!"); }
|
||||
next._.at('soul').once(function($){ $.N0T = 'KICK SOUL'; gun._.at('soul').emit($) });
|
||||
@ -823,6 +822,7 @@
|
||||
schedule.soonest = Infinity;
|
||||
schedule.sort = Gun.list.sort('when');
|
||||
schedule.set = function(future){
|
||||
if(Infinity <= (schedule.soonest = future)){ return }
|
||||
var now = Gun.time.is();
|
||||
future = (future <= now)? 0 : (future - now);
|
||||
clearTimeout(schedule.id);
|
||||
@ -835,7 +835,7 @@
|
||||
if(!wait){ return }
|
||||
if(wait.when <= now){
|
||||
if(Gun.fns.is(wait.event)){
|
||||
wait.event();
|
||||
setTimeout(function(){ wait.event() },0);
|
||||
}
|
||||
} else {
|
||||
soonest = (soonest < wait.when)? soonest : wait.when;
|
||||
@ -845,7 +845,7 @@
|
||||
schedule.set(soonest);
|
||||
}
|
||||
Gun.schedule = function(state, cb){
|
||||
schedule.waiting.push({when: state, event: cb});
|
||||
schedule.waiting.push({when: state, event: cb || function(){}});
|
||||
if(schedule.soonest < state){ return }
|
||||
schedule.set(state);
|
||||
}
|
||||
@ -857,7 +857,7 @@
|
||||
var end = function(fn){
|
||||
ctx.end = fn || function(){};
|
||||
if(ctx.err){ return ctx.end(ctx.err, ctx), ctx.end = function(){} }
|
||||
// unique(ctx); // if we remove the setTimeout, we need to call this at the end as well.
|
||||
unique(ctx);
|
||||
}, ctx = {};
|
||||
if(!data){ return ctx.err = Gun.log('Serializer does not have correct parameters.'), end }
|
||||
ctx.at = {};
|
||||
@ -884,12 +884,10 @@
|
||||
function map(ctx, cb){
|
||||
var rel = function(at, soul){
|
||||
at.soul = at.soul || soul;
|
||||
setTimeout(function(){ unique(ctx) },0);
|
||||
if(!at.back || !at.back.length){ return }
|
||||
Gun.list.map(at.back, function(rel){
|
||||
rel[Gun._.soul] = at.soul;
|
||||
});
|
||||
// unique(ctx); could we remove the setTimeot?
|
||||
unique(ctx); // could we remove the setTimeot?
|
||||
}, it;
|
||||
Gun.obj.map(ctx.at.obj, function(val, field){
|
||||
ctx.at.val = val;
|
||||
@ -974,7 +972,7 @@
|
||||
(function local(key, cb){
|
||||
var node, lkey = key[Gun._.soul]? tab.prefix + tab.prenode + key[Gun._.soul]
|
||||
: tab.prefix + tab.prekey + key
|
||||
if((node = store.get(lkey)) && node[Gun._.soul]){ return local(node, cb) }
|
||||
if((node = store.get(lkey)) && Gun.is.soul(node)){ return local(node, cb) }
|
||||
if(cb.node = node){ Gun.log('tab via cache <---', key); setTimeout(function(){
|
||||
cb(null, node);
|
||||
cb(null, {_: {'#': Gun.is.soul.on(node) }}); // TODO: Don't have the symbols hard coded.
|
||||
@ -1115,7 +1113,7 @@
|
||||
function s(){}
|
||||
var store = window.localStorage || {setItem: function(){}, removeItem: function(){}, getItem: function(){}};
|
||||
s.put = function(key, val){ return store.setItem(key, Gun.text.ify(val)) }
|
||||
s.get = function(key){ return Gun.obj.ify(store.getItem(key)) }
|
||||
s.get = function(key){ return Gun.obj.ify(store.getItem(key) || null) }
|
||||
s.del = function(key){ return store.removeItem(key) }
|
||||
return s;
|
||||
}());
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
var Gun = Gun || require('../gun');
|
||||
if(typeof window !== 'undefined'){ root = window }
|
||||
(function(env){
|
||||
root = env.window? env.window : root;
|
||||
env.window && root.localStorage && root.localStorage.clear();
|
||||
root.Gun = root.Gun || require('../gun');
|
||||
}(this));
|
||||
Gun.log.squelch = true;
|
||||
|
||||
describe('Gun', function(){
|
||||
var t = {};
|
||||
describe('Utility', function(){
|
||||
@ -480,6 +484,31 @@ describe('Gun', function(){
|
||||
});
|
||||
});
|
||||
|
||||
describe('Schedule', function(){
|
||||
it('one', function(done){
|
||||
Gun.schedule(Gun.time.is(), function(){
|
||||
expect(true).to.be(true);
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
it('many', function(done){
|
||||
Gun.schedule(Gun.time.is() + 50, function(){
|
||||
done.first = true;
|
||||
});
|
||||
Gun.schedule(Gun.time.is() + 100, function(){
|
||||
done.second = true;
|
||||
});
|
||||
Gun.schedule(Gun.time.is() + 200, function(){
|
||||
done.third = true;
|
||||
expect(done.first).to.be(true);
|
||||
expect(done.second).to.be(true);
|
||||
expect(done.third).to.be(true);
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('Union', function(){
|
||||
var gun = Gun();
|
||||
|
||||
@ -603,7 +632,7 @@ describe('Gun', function(){
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
var to = 5000;
|
||||
it('disjoint future', function(done){
|
||||
var prime = {
|
||||
'asdf': {
|
||||
@ -613,7 +642,6 @@ describe('Gun', function(){
|
||||
y: 'goodbye'
|
||||
}
|
||||
}
|
||||
|
||||
expect(gun.__.graph['asdf'].y).to.not.be.ok();
|
||||
var now = Gun.time.is();
|
||||
var ctx = Gun.union(gun, prime, function(){
|
||||
@ -642,7 +670,7 @@ describe('Gun', function(){
|
||||
expect(Gun.time.is() - now).to.be.above(100);
|
||||
expect(gun.__.graph['asdf'].y).to.be('bye');
|
||||
expect(gun.__.graph['asdf'].z).to.be('who');
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
@ -673,7 +701,7 @@ describe('Gun', function(){
|
||||
expect(gun.__.graph['asdf'].x).to.be('how are you?');
|
||||
expect(gun.__.graph['asdf'].y).to.be('farewell');
|
||||
expect(gun.__.graph['asdf'].z).to.be('doctor who');
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
@ -1047,7 +1075,7 @@ describe('Gun', function(){
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
it('put path val sub', function(done){
|
||||
gun.put({last: {some: 'object'}}).path('last').val(function(val){
|
||||
expect(val.some).to.be('object');
|
||||
@ -1194,7 +1222,7 @@ describe('Gun', function(){
|
||||
});
|
||||
|
||||
it('context null put value val error', function(done){
|
||||
gun.put("oh yes",function(err){
|
||||
gun.put("oh yes", function(err){
|
||||
expect(err).to.be.ok();
|
||||
done();
|
||||
});
|
||||
@ -1204,55 +1232,55 @@ describe('Gun', function(){
|
||||
it('context null put node', function(done){
|
||||
foo = gun.put({foo: 'bar'}).val(function(obj){
|
||||
expect(obj.foo).to.be('bar');
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
it('context node put val', function(done){
|
||||
// EFFECTIVELY a TIMEOUT from the previous test.
|
||||
// EFFECTIVELY a TIMEOUT from the previous test. NO LONGER!
|
||||
foo.put('banana', function(err){
|
||||
expect(err).to.be.ok();
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
it('context node put node', function(done){
|
||||
// EFFECTIVELY a TIMEOUT from the previous test.
|
||||
// EFFECTIVELY a TIMEOUT from the previous test. NO LONGER!
|
||||
foo.put({bar: {zoo: 'who'}}).val(function(obj){
|
||||
expect(obj.foo).to.be('bar');
|
||||
expect(Gun.is.soul(obj.bar)).to.ok();
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
it('context node and field put value', function(done){
|
||||
// EFFECTIVELY a TIMEOUT from the previous test.
|
||||
// EFFECTIVELY a TIMEOUT from the previous test. NO LONGER!
|
||||
var tar = foo.path('tar');
|
||||
tar.put('zebra').val(function(val){
|
||||
expect(val).to.be('zebra');
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
var bar;
|
||||
it('context node and field of relation put node', function(done){
|
||||
// EFFECTIVELY a TIMEOUT from the previous test.
|
||||
// EFFECTIVELY a TIMEOUT from the previous test. NO LONGER!
|
||||
bar = foo.path('bar');
|
||||
bar.put({combo: 'double'}).val(function(obj){
|
||||
expect(obj.zoo).to.be('who');
|
||||
expect(obj.combo).to.be('double');
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
|
||||
it('context node and field, put node', function(done){
|
||||
// EFFECTIVELY a TIMEOUT from the previous test.
|
||||
// EFFECTIVELY a TIMEOUT from the previous test. NO LONGER!
|
||||
bar.path('combo').put({another: 'node'}).val(function(obj){
|
||||
expect(obj.another).to.be('node');
|
||||
bar.val(function(node){
|
||||
expect(Gun.is.soul(node.combo)).to.be.ok();
|
||||
expect(Gun.is.soul(node.combo)).to.be(Gun.is.soul.on(obj));
|
||||
done();
|
||||
done(); //setTimeout(function(){ done() },1);
|
||||
});
|
||||
});
|
||||
});
|
||||
@ -1417,8 +1445,9 @@ describe('Gun', function(){
|
||||
});
|
||||
gun.set(1).set(2).set(3).set(4) // if you set an object you'd have to do a `.back`
|
||||
.map().val(function(val){ // TODO! BUG! If we instead do gun.map().val() we will get stale data, fix this.
|
||||
expect(val).to.be(++i);
|
||||
if(4 === i){
|
||||
i += 1;
|
||||
expect(val).to.be(i);
|
||||
if(i % 4 === 0){
|
||||
done.i = 0;
|
||||
Gun.obj.map(gun.__.graph, function(){ done.i++ });
|
||||
expect(done.i).to.be(1); // make sure there isn't double.
|
||||
@ -1431,9 +1460,11 @@ describe('Gun', function(){
|
||||
var hooks = {get: function(key, cb, opt){
|
||||
cb();
|
||||
}, put: function(nodes, cb, opt){
|
||||
//root.console.log("put hook", nodes);
|
||||
Gun.union(gun1, nodes);
|
||||
cb();
|
||||
}, key: function(key, soul, cb, opt){
|
||||
//root.console.log("key hook", key, soul);
|
||||
gun1.key(key, null, soul);
|
||||
cb();
|
||||
}},
|
||||
|
||||
480
test/json2.js
Normal file
480
test/json2.js
Normal file
@ -0,0 +1,480 @@
|
||||
/*
|
||||
http://www.JSON.org/json2.js
|
||||
2011-02-23
|
||||
|
||||
Public Domain.
|
||||
|
||||
NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
|
||||
|
||||
See http://www.JSON.org/js.html
|
||||
|
||||
|
||||
This code should be minified before deployment.
|
||||
See http://javascript.crockford.com/jsmin.html
|
||||
|
||||
USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
|
||||
NOT CONTROL.
|
||||
|
||||
|
||||
This file creates a global JSON object containing two methods: stringify
|
||||
and parse.
|
||||
|
||||
JSON.stringify(value, replacer, space)
|
||||
value any JavaScript value, usually an object or array.
|
||||
|
||||
replacer an optional parameter that determines how object
|
||||
values are stringified for objects. It can be a
|
||||
function or an array of strings.
|
||||
|
||||
space an optional parameter that specifies the indentation
|
||||
of nested structures. If it is omitted, the text will
|
||||
be packed without extra whitespace. If it is a number,
|
||||
it will specify the number of spaces to indent at each
|
||||
level. If it is a string (such as '\t' or ' '),
|
||||
it contains the characters used to indent at each level.
|
||||
|
||||
This method produces a JSON text from a JavaScript value.
|
||||
|
||||
When an object value is found, if the object contains a toJSON
|
||||
method, its toJSON method will be called and the result will be
|
||||
stringified. A toJSON method does not serialize: it returns the
|
||||
value represented by the name/value pair that should be serialized,
|
||||
or undefined if nothing should be serialized. The toJSON method
|
||||
will be passed the key associated with the value, and this will be
|
||||
bound to the value
|
||||
|
||||
For example, this would serialize Dates as ISO strings.
|
||||
|
||||
Date.prototype.toJSON = function (key) {
|
||||
function f(n) {
|
||||
// Format integers to have at least two digits.
|
||||
return n < 10 ? '0' + n : n;
|
||||
}
|
||||
|
||||
return this.getUTCFullYear() + '-' +
|
||||
f(this.getUTCMonth() + 1) + '-' +
|
||||
f(this.getUTCDate()) + 'T' +
|
||||
f(this.getUTCHours()) + ':' +
|
||||
f(this.getUTCMinutes()) + ':' +
|
||||
f(this.getUTCSeconds()) + 'Z';
|
||||
};
|
||||
|
||||
You can provide an optional replacer method. It will be passed the
|
||||
key and value of each member, with this bound to the containing
|
||||
object. The value that is returned from your method will be
|
||||
serialized. If your method returns undefined, then the member will
|
||||
be excluded from the serialization.
|
||||
|
||||
If the replacer parameter is an array of strings, then it will be
|
||||
used to select the members to be serialized. It filters the results
|
||||
such that only members with keys listed in the replacer array are
|
||||
stringified.
|
||||
|
||||
Values that do not have JSON representations, such as undefined or
|
||||
functions, will not be serialized. Such values in objects will be
|
||||
dropped; in arrays they will be replaced with null. You can use
|
||||
a replacer function to replace those with JSON values.
|
||||
JSON.stringify(undefined) returns undefined.
|
||||
|
||||
The optional space parameter produces a stringification of the
|
||||
value that is filled with line breaks and indentation to make it
|
||||
easier to read.
|
||||
|
||||
If the space parameter is a non-empty string, then that string will
|
||||
be used for indentation. If the space parameter is a number, then
|
||||
the indentation will be that many spaces.
|
||||
|
||||
Example:
|
||||
|
||||
text = JSON.stringify(['e', {pluribus: 'unum'}]);
|
||||
// text is '["e",{"pluribus":"unum"}]'
|
||||
|
||||
|
||||
text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
|
||||
// text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
|
||||
|
||||
text = JSON.stringify([new Date()], function (key, value) {
|
||||
return this[key] instanceof Date ?
|
||||
'Date(' + this[key] + ')' : value;
|
||||
});
|
||||
// text is '["Date(---current time---)"]'
|
||||
|
||||
|
||||
JSON.parse(text, reviver)
|
||||
This method parses a JSON text to produce an object or array.
|
||||
It can throw a SyntaxError exception.
|
||||
|
||||
The optional reviver parameter is a function that can filter and
|
||||
transform the results. It receives each of the keys and values,
|
||||
and its return value is used instead of the original value.
|
||||
If it returns what it received, then the structure is not modified.
|
||||
If it returns undefined then the member is deleted.
|
||||
|
||||
Example:
|
||||
|
||||
// Parse the text. Values that look like ISO date strings will
|
||||
// be converted to Date objects.
|
||||
|
||||
myData = JSON.parse(text, function (key, value) {
|
||||
var a;
|
||||
if (typeof value === 'string') {
|
||||
a =
|
||||
/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
|
||||
if (a) {
|
||||
return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
|
||||
+a[5], +a[6]));
|
||||
}
|
||||
}
|
||||
return value;
|
||||
});
|
||||
|
||||
myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
|
||||
var d;
|
||||
if (typeof value === 'string' &&
|
||||
value.slice(0, 5) === 'Date(' &&
|
||||
value.slice(-1) === ')') {
|
||||
d = new Date(value.slice(5, -1));
|
||||
if (d) {
|
||||
return d;
|
||||
}
|
||||
}
|
||||
return value;
|
||||
});
|
||||
|
||||
|
||||
This is a reference implementation. You are free to copy, modify, or
|
||||
redistribute.
|
||||
*/
|
||||
|
||||
/*jslint evil: true, strict: false, regexp: false */
|
||||
|
||||
/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
|
||||
call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
|
||||
getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
|
||||
lastIndex, length, parse, prototype, push, replace, slice, stringify,
|
||||
test, toJSON, toString, valueOf
|
||||
*/
|
||||
|
||||
|
||||
// Create a JSON object only if one does not already exist. We create the
|
||||
// methods in a closure to avoid creating global variables.
|
||||
|
||||
var JSON;
|
||||
if (!JSON) {
|
||||
JSON = {};
|
||||
}
|
||||
|
||||
(function () {
|
||||
"use strict";
|
||||
|
||||
function f(n) {
|
||||
// Format integers to have at least two digits.
|
||||
return n < 10 ? '0' + n : n;
|
||||
}
|
||||
|
||||
if (typeof Date.prototype.toJSON !== 'function') {
|
||||
|
||||
Date.prototype.toJSON = function (key) {
|
||||
|
||||
return isFinite(this.valueOf()) ?
|
||||
this.getUTCFullYear() + '-' +
|
||||
f(this.getUTCMonth() + 1) + '-' +
|
||||
f(this.getUTCDate()) + 'T' +
|
||||
f(this.getUTCHours()) + ':' +
|
||||
f(this.getUTCMinutes()) + ':' +
|
||||
f(this.getUTCSeconds()) + 'Z' : null;
|
||||
};
|
||||
|
||||
String.prototype.toJSON =
|
||||
Number.prototype.toJSON =
|
||||
Boolean.prototype.toJSON = function (key) {
|
||||
return this.valueOf();
|
||||
};
|
||||
}
|
||||
|
||||
var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
|
||||
escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
|
||||
gap,
|
||||
indent,
|
||||
meta = { // table of character substitutions
|
||||
'\b': '\\b',
|
||||
'\t': '\\t',
|
||||
'\n': '\\n',
|
||||
'\f': '\\f',
|
||||
'\r': '\\r',
|
||||
'"' : '\\"',
|
||||
'\\': '\\\\'
|
||||
},
|
||||
rep;
|
||||
|
||||
|
||||
function quote(string) {
|
||||
|
||||
// If the string contains no control characters, no quote characters, and no
|
||||
// backslash characters, then we can safely slap some quotes around it.
|
||||
// Otherwise we must also replace the offending characters with safe escape
|
||||
// sequences.
|
||||
|
||||
escapable.lastIndex = 0;
|
||||
return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
|
||||
var c = meta[a];
|
||||
return typeof c === 'string' ? c :
|
||||
'\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
|
||||
}) + '"' : '"' + string + '"';
|
||||
}
|
||||
|
||||
|
||||
function str(key, holder) {
|
||||
|
||||
// Produce a string from holder[key].
|
||||
|
||||
var i, // The loop counter.
|
||||
k, // The member key.
|
||||
v, // The member value.
|
||||
length,
|
||||
mind = gap,
|
||||
partial,
|
||||
value = holder[key];
|
||||
|
||||
// If the value has a toJSON method, call it to obtain a replacement value.
|
||||
|
||||
if (value && typeof value === 'object' &&
|
||||
typeof value.toJSON === 'function') {
|
||||
value = value.toJSON(key);
|
||||
}
|
||||
|
||||
// If we were called with a replacer function, then call the replacer to
|
||||
// obtain a replacement value.
|
||||
|
||||
if (typeof rep === 'function') {
|
||||
value = rep.call(holder, key, value);
|
||||
}
|
||||
|
||||
// What happens next depends on the value's type.
|
||||
|
||||
switch (typeof value) {
|
||||
case 'string':
|
||||
return quote(value);
|
||||
|
||||
case 'number':
|
||||
|
||||
// JSON numbers must be finite. Encode non-finite numbers as null.
|
||||
|
||||
return isFinite(value) ? String(value) : 'null';
|
||||
|
||||
case 'boolean':
|
||||
case 'null':
|
||||
|
||||
// If the value is a boolean or null, convert it to a string. Note:
|
||||
// typeof null does not produce 'null'. The case is included here in
|
||||
// the remote chance that this gets fixed someday.
|
||||
|
||||
return String(value);
|
||||
|
||||
// If the type is 'object', we might be dealing with an object or an array or
|
||||
// null.
|
||||
|
||||
case 'object':
|
||||
|
||||
// Due to a specification blunder in ECMAScript, typeof null is 'object',
|
||||
// so watch out for that case.
|
||||
|
||||
if (!value) {
|
||||
return 'null';
|
||||
}
|
||||
|
||||
// Make an array to hold the partial results of stringifying this object value.
|
||||
|
||||
gap += indent;
|
||||
partial = [];
|
||||
|
||||
// Is the value an array?
|
||||
|
||||
if (Object.prototype.toString.apply(value) === '[object Array]') {
|
||||
|
||||
// The value is an array. Stringify every element. Use null as a placeholder
|
||||
// for non-JSON values.
|
||||
|
||||
length = value.length;
|
||||
for (i = 0; i < length; i += 1) {
|
||||
partial[i] = str(i, value) || 'null';
|
||||
}
|
||||
|
||||
// Join all of the elements together, separated with commas, and wrap them in
|
||||
// brackets.
|
||||
|
||||
v = partial.length === 0 ? '[]' : gap ?
|
||||
'[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
|
||||
'[' + partial.join(',') + ']';
|
||||
gap = mind;
|
||||
return v;
|
||||
}
|
||||
|
||||
// If the replacer is an array, use it to select the members to be stringified.
|
||||
|
||||
if (rep && typeof rep === 'object') {
|
||||
length = rep.length;
|
||||
for (i = 0; i < length; i += 1) {
|
||||
if (typeof rep[i] === 'string') {
|
||||
k = rep[i];
|
||||
v = str(k, value);
|
||||
if (v) {
|
||||
partial.push(quote(k) + (gap ? ': ' : ':') + v);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
// Otherwise, iterate through all of the keys in the object.
|
||||
|
||||
for (k in value) {
|
||||
if (Object.prototype.hasOwnProperty.call(value, k)) {
|
||||
v = str(k, value);
|
||||
if (v) {
|
||||
partial.push(quote(k) + (gap ? ': ' : ':') + v);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Join all of the member texts together, separated with commas,
|
||||
// and wrap them in braces.
|
||||
|
||||
v = partial.length === 0 ? '{}' : gap ?
|
||||
'{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
|
||||
'{' + partial.join(',') + '}';
|
||||
gap = mind;
|
||||
return v;
|
||||
}
|
||||
}
|
||||
|
||||
// If the JSON object does not yet have a stringify method, give it one.
|
||||
|
||||
if (typeof JSON.stringify !== 'function') {
|
||||
JSON.stringify = function (value, replacer, space) {
|
||||
|
||||
// The stringify method takes a value and an optional replacer, and an optional
|
||||
// space parameter, and returns a JSON text. The replacer can be a function
|
||||
// that can replace values, or an array of strings that will select the keys.
|
||||
// A default replacer method can be provided. Use of the space parameter can
|
||||
// produce text that is more easily readable.
|
||||
|
||||
var i;
|
||||
gap = '';
|
||||
indent = '';
|
||||
|
||||
// If the space parameter is a number, make an indent string containing that
|
||||
// many spaces.
|
||||
|
||||
if (typeof space === 'number') {
|
||||
for (i = 0; i < space; i += 1) {
|
||||
indent += ' ';
|
||||
}
|
||||
|
||||
// If the space parameter is a string, it will be used as the indent string.
|
||||
|
||||
} else if (typeof space === 'string') {
|
||||
indent = space;
|
||||
}
|
||||
|
||||
// If there is a replacer, it must be a function or an array.
|
||||
// Otherwise, throw an error.
|
||||
|
||||
rep = replacer;
|
||||
if (replacer && typeof replacer !== 'function' &&
|
||||
(typeof replacer !== 'object' ||
|
||||
typeof replacer.length !== 'number')) {
|
||||
throw new Error('JSON.stringify');
|
||||
}
|
||||
|
||||
// Make a fake root object containing our value under the key of ''.
|
||||
// Return the result of stringifying the value.
|
||||
|
||||
return str('', {'': value});
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
// If the JSON object does not yet have a parse method, give it one.
|
||||
|
||||
if (typeof JSON.parse !== 'function') {
|
||||
JSON.parse = function (text, reviver) {
|
||||
|
||||
// The parse method takes a text and an optional reviver function, and returns
|
||||
// a JavaScript value if the text is a valid JSON text.
|
||||
|
||||
var j;
|
||||
|
||||
function walk(holder, key) {
|
||||
|
||||
// The walk method is used to recursively walk the resulting structure so
|
||||
// that modifications can be made.
|
||||
|
||||
var k, v, value = holder[key];
|
||||
if (value && typeof value === 'object') {
|
||||
for (k in value) {
|
||||
if (Object.prototype.hasOwnProperty.call(value, k)) {
|
||||
v = walk(value, k);
|
||||
if (v !== undefined) {
|
||||
value[k] = v;
|
||||
} else {
|
||||
delete value[k];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return reviver.call(holder, key, value);
|
||||
}
|
||||
|
||||
|
||||
// Parsing happens in four stages. In the first stage, we replace certain
|
||||
// Unicode characters with escape sequences. JavaScript handles many characters
|
||||
// incorrectly, either silently deleting them, or treating them as line endings.
|
||||
|
||||
text = String(text);
|
||||
cx.lastIndex = 0;
|
||||
if (cx.test(text)) {
|
||||
text = text.replace(cx, function (a) {
|
||||
return '\\u' +
|
||||
('0000' + a.charCodeAt(0).toString(16)).slice(-4);
|
||||
});
|
||||
}
|
||||
|
||||
// In the second stage, we run the text against regular expressions that look
|
||||
// for non-JSON patterns. We are especially concerned with '()' and 'new'
|
||||
// because they can cause invocation, and '=' because it can cause mutation.
|
||||
// But just to be safe, we want to reject all unexpected forms.
|
||||
|
||||
// We split the second stage into 4 regexp operations in order to work around
|
||||
// crippling inefficiencies in IE's and Safari's regexp engines. First we
|
||||
// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
|
||||
// replace all simple value tokens with ']' characters. Third, we delete all
|
||||
// open brackets that follow a colon or comma or that begin the text. Finally,
|
||||
// we look to see that the remaining characters are only whitespace or ']' or
|
||||
// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
|
||||
|
||||
if (/^[\],:{}\s]*$/
|
||||
.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
|
||||
.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
|
||||
.replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
|
||||
|
||||
// In the third stage we use the eval function to compile the text into a
|
||||
// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
|
||||
// in JavaScript: it can begin a block or an object literal. We wrap the text
|
||||
// in parens to eliminate the ambiguity.
|
||||
|
||||
j = eval('(' + text + ')');
|
||||
|
||||
// In the optional fourth stage, we recursively walk the new structure, passing
|
||||
// each name/value pair to a reviver function for possible transformation.
|
||||
|
||||
return typeof reviver === 'function' ?
|
||||
walk({'': j}, '') : j;
|
||||
}
|
||||
|
||||
// If the text is not JSON parseable, then a SyntaxError is thrown.
|
||||
|
||||
throw new SyntaxError('JSON.parse');
|
||||
};
|
||||
}
|
||||
}());
|
||||
@ -2,6 +2,7 @@
|
||||
<head>
|
||||
<title>Gun Tests</title>
|
||||
<link rel="stylesheet" href="./mocha.css"/>
|
||||
<script src="./json2.js"></script>
|
||||
<script src="./mocha.js"></script>
|
||||
<script>mocha.setup({ui:'bdd',globals:[]});</script>
|
||||
<script src="./expect.js"></script>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user