Skip to content

Commit

Permalink
add Date#toJSON, #156
Browse files Browse the repository at this point in the history
  • Loading branch information
zloirock committed Jan 28, 2016
1 parent 61cce86 commit 1484988
Show file tree
Hide file tree
Showing 25 changed files with 151 additions and 6 deletions.
2 changes: 2 additions & 0 deletions build/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ module.exports = {
'es6.date.now',
'es6.date.to-string',
'es6.date.to-iso-string',
'es6.date.to-json',
'es6.typed.array-buffer',
'es6.typed.data-view',
'es6.typed.int8-array',
Expand Down Expand Up @@ -231,6 +232,7 @@ module.exports = {
'es6.array.last-index-of',
'es6.date.now',
'es6.date.to-iso-string',
'es6.date.to-json',
'es6.string.trim',
'es6.regexp.to-string',
'es6.parse-int',
Expand Down
1 change: 1 addition & 0 deletions es5/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ require('../modules/es6.array.index-of');
require('../modules/es6.array.last-index-of');
require('../modules/es6.date.now');
require('../modules/es6.date.to-iso-string');
require('../modules/es6.date.to-json');
require('../modules/es6.parse-int');
require('../modules/es6.parse-float');
require('../modules/es6.string.trim');
Expand Down
1 change: 1 addition & 0 deletions es6/date.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require('../modules/es6.date.now');
require('../modules/es6.date.to-string');
require('../modules/es6.date.to-iso-string');
require('../modules/es6.date.to-json');
module.exports = Date;
1 change: 1 addition & 0 deletions es6/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ require('../modules/es6.string.sup');
require('../modules/es6.date.now');
require('../modules/es6.date.to-string');
require('../modules/es6.date.to-iso-string');
require('../modules/es6.date.to-json');
require('../modules/es6.array.is-array');
require('../modules/es6.array.from');
require('../modules/es6.array.of');
Expand Down
3 changes: 2 additions & 1 deletion fn/date/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require('../../modules/es6.date.now');
require('../../modules/es6.date.to-iso-string');
require('../../modules/es6.date.to-string');
require('../../modules/es6.date.to-iso-string');
require('../../modules/es6.date.to-json');
module.exports = require('../../modules/_core').Date;
2 changes: 2 additions & 0 deletions fn/date/to-json.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require('../../modules/es6.date.to-json');
module.exports = require('../../modules/_core').Date.toJSON;
1 change: 1 addition & 0 deletions library/es5/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ require('../modules/es6.array.index-of');
require('../modules/es6.array.last-index-of');
require('../modules/es6.date.now');
require('../modules/es6.date.to-iso-string');
require('../modules/es6.date.to-json');
require('../modules/es6.parse-int');
require('../modules/es6.parse-float');
require('../modules/es6.string.trim');
Expand Down
1 change: 1 addition & 0 deletions library/es6/date.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require('../modules/es6.date.now');
require('../modules/es6.date.to-string');
require('../modules/es6.date.to-iso-string');
require('../modules/es6.date.to-json');
module.exports = Date;
1 change: 1 addition & 0 deletions library/es6/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ require('../modules/es6.string.sup');
require('../modules/es6.date.now');
require('../modules/es6.date.to-string');
require('../modules/es6.date.to-iso-string');
require('../modules/es6.date.to-json');
require('../modules/es6.array.is-array');
require('../modules/es6.array.from');
require('../modules/es6.array.of');
Expand Down
3 changes: 2 additions & 1 deletion library/fn/date/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require('../../modules/es6.date.now');
require('../../modules/es6.date.to-iso-string');
require('../../modules/es6.date.to-string');
require('../../modules/es6.date.to-iso-string');
require('../../modules/es6.date.to-json');
module.exports = require('../../modules/_core').Date;
2 changes: 2 additions & 0 deletions library/fn/date/to-json.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
require('../../modules/es6.date.to-json');
module.exports = require('../../modules/_core').Date.toJSON;
1 change: 1 addition & 0 deletions library/modules/es5.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ require('./es6.array.index-of');
require('./es6.array.last-index-of');
require('./es6.date.now');
require('./es6.date.to-iso-string');
require('./es6.date.to-json');
require('./es6.parse-int');
require('./es6.parse-float');
require('./es6.string.trim');
Expand Down
14 changes: 14 additions & 0 deletions library/modules/es6.date.to-json.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';
var $export = require('./_export')
, toObject = require('./_to-object')
, toPrimitive = require('./_to-primitive');

$export($export.P + $export.F * require('./_fails')(function(){
return Date.prototype.toJSON.call({toISOString: function(){ return 1; }}) !== 1;
}), 'Date', {
toJSON: function toJSON(key){
var O = toObject(this)
, pv = toPrimitive(O);
return typeof pv == 'number' && !isFinite(pv) ? null : O.toISOString();
}
});
1 change: 1 addition & 0 deletions library/shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ require('./modules/es6.string.sup');
require('./modules/es6.date.now');
require('./modules/es6.date.to-string');
require('./modules/es6.date.to-iso-string');
require('./modules/es6.date.to-json');
require('./modules/es6.array.is-array');
require('./modules/es6.array.from');
require('./modules/es6.array.of');
Expand Down
1 change: 1 addition & 0 deletions modules/es5.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ require('./es6.array.index-of');
require('./es6.array.last-index-of');
require('./es6.date.now');
require('./es6.date.to-iso-string');
require('./es6.date.to-json');
require('./es6.parse-int');
require('./es6.parse-float');
require('./es6.string.trim');
Expand Down
14 changes: 14 additions & 0 deletions modules/es6.date.to-json.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
'use strict';
var $export = require('./_export')
, toObject = require('./_to-object')
, toPrimitive = require('./_to-primitive');

$export($export.P + $export.F * require('./_fails')(function(){
return Date.prototype.toJSON.call({toISOString: function(){ return 1; }}) !== 1;
}), 'Date', {
toJSON: function toJSON(key){
var O = toObject(this)
, pv = toPrimitive(O);
return typeof pv == 'number' && !isFinite(pv) ? null : O.toISOString();
}
});
1 change: 1 addition & 0 deletions shim.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ require('./modules/es6.string.sup');
require('./modules/es6.date.now');
require('./modules/es6.date.to-string');
require('./modules/es6.date.to-iso-string');
require('./modules/es6.date.to-json');
require('./modules/es6.array.is-array');
require('./modules/es6.array.from');
require('./modules/es6.array.of');
Expand Down
3 changes: 2 additions & 1 deletion tests/commonjs.ls
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,9 @@ for P in <[.. ../library]>
ok require("#P/fn/json").stringify([1]) is '[1]'
ok require("#P/fn/json/stringify")([1]) is '[1]'
ok typeof require("#P/fn/date/now")(new Date) is \number
ok typeof require("#P/fn/date/to-iso-string")(new Date) is \string
ok typeof require("#P/fn/date/to-string")(new Date) is \string
ok typeof require("#P/fn/date/to-iso-string")(new Date) is \string
ok require("#P/fn/date/to-json")(Infinity) is null
ok require("#P/fn/date")
ok require("#P/fn/symbol/has-instance")
ok require("#P/fn/symbol/is-concat-spreadable")
Expand Down
27 changes: 26 additions & 1 deletion tests/es.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions tests/library.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions tests/library/es6.date.to-json.ls
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{module, test} = QUnit
module \ES6

test 'Date#toJSON' (assert)!->
{toJSON, toISOString} = core.Date
assert.isFunction toJSON
if Date::toISOString
d = new Date!
assert.same toJSON(d), toISOString(d), 'base'
assert.same toJSON(new Date NaN), null, 'not finite'
assert.same toJSON(toISOString: -> 42), 42, 'generic'
27 changes: 26 additions & 1 deletion tests/tests.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions tests/tests/es6.date.to-iso-string.ls
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ module \ES6

test 'Date#toISOString' (assert)!->
assert.isFunction Date::toISOString
assert.arity Date::toISOString, 0
assert.name Date::toISOString, \toISOString
assert.looksNative Date::toISOString
assert.strictEqual new Date(0).toISOString!, '1970-01-01T00:00:00.000Z'
assert.strictEqual new Date(1e12+1).toISOString!, '2001-09-09T01:46:40.001Z'
assert.strictEqual new Date(-5e13-1).toISOString!, '0385-07-25T07:06:39.999Z'
Expand Down
12 changes: 12 additions & 0 deletions tests/tests/es6.date.to-json.ls
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{module, test} = QUnit
module \ES6

test 'Date#toJSON' (assert)!->
assert.isFunction Date::toJSON
assert.arity Date::toJSON, 1
assert.name Date::toJSON, \toJSON
assert.looksNative Date::toJSON
d = new Date!
assert.same d.toJSON!, d.toISOString!, 'base'
assert.same new Date(NaN)toJSON!, null, 'not finite'
assert.same Date::toJSON.call(toISOString: -> 42), 42, 'generic'
2 changes: 1 addition & 1 deletion tests/tests/es6.date.to-string.ls
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{module, test} = QUnit
module \ES6

test 'Date#toString' (assert)->
test 'Date#toString' (assert)!->
assert.isFunction Date::toString
assert.arity Date::toString, 0
assert.name Date::toString, \toString
Expand Down

0 comments on commit 1484988

Please sign in to comment.