Skip to content

Commit

Permalink
null → undefined
Browse files Browse the repository at this point in the history
  • Loading branch information
egorFiNE committed Jun 5, 2018
1 parent d41fd56 commit 994179a
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
20 changes: 10 additions & 10 deletions js/base/Exchange.js
Expand Up @@ -187,57 +187,57 @@ module.exports = class Exchange {

// undefined, null and lots of nasty non-numeric values yield NaN
if (isNaN (_timestampNumber) || _timestampNumber < 0) {
return null;
return undefined;
}

if (_timestampNumber < 0) {
return null;
return undefined;
}

// last line of defence
try {
return new Date (_timestampNumber).toISOString ();
} catch (e) {
return null;
return undefined;
}
}

this.parse8601 = (x) => {
if (typeof x !== 'string' || !x) {
return null;
return undefined;
}

if (x.match (/^[0-9]+$/)) {
// a valid number in a string, not a date.
return null;
return undefined;
}

if (x.indexOf ('-') < 0 || x.indexOf (':') < 0) { // no date can be without a dash and a colon
return null;
return undefined;
}

// last line of defence
try {
const candidate = Date.parse (((x.indexOf ('+') >= 0) || (x.slice (-1) === 'Z')) ? x : (x + 'Z').replace (/\s(\d\d):/, 'T$1:'));
if (isNaN (candidate)) {
return null;
return undefined;
}
return candidate;
} catch (e) {
return null;
return undefined;
}
}

this.parseDate = (x) => {
if (typeof x !== 'string' || !x) {
return null;
return undefined;
}

if (x.indexOf ('GMT') >= 0) {
try {
return Date.parse (x);
} catch (e) {
return null;
return undefined;
}
}

Expand Down
32 changes: 16 additions & 16 deletions js/test/base/functions/test.datetime.js
Expand Up @@ -22,12 +22,12 @@ it ('iso8601', done => {
equal (exchange.iso8601(514862627000), '1986-04-26T01:23:47.000Z');
equal (exchange.iso8601(0), '1970-01-01T00:00:00.000Z');

equal (exchange.iso8601(-1), null);
equal (exchange.iso8601(), null);
equal (exchange.iso8601(null), null);
equal (exchange.iso8601(''), null);
equal (exchange.iso8601('a'), null);
equal (exchange.iso8601({}), null);
equal (exchange.iso8601(-1), undefined);
equal (exchange.iso8601(), undefined);
equal (exchange.iso8601(null), undefined);
equal (exchange.iso8601(''), undefined);
equal (exchange.iso8601('a'), undefined);
equal (exchange.iso8601({}), undefined);

done();
});
Expand All @@ -41,16 +41,16 @@ it ('parse8601', done => {

equal(exchange.parse8601('1986-04-26T01:23:47.000Z'), 514862627000);

equal(exchange.parse8601('1977-13-13T00:00:00.000Z'), null);
equal(exchange.parse8601('1986-04-26T25:71:47.000Z'), null);
equal(exchange.parse8601('1977-13-13T00:00:00.000Z'), undefined);
equal(exchange.parse8601('1986-04-26T25:71:47.000Z'), undefined);

equal(exchange.parse8601('3333'), null);
equal(exchange.parse8601('Sr90'), null);
equal(exchange.parse8601(''), null);
equal(exchange.parse8601(), null);
equal(exchange.parse8601(null), null);
equal(exchange.parse8601({}), null);
equal(exchange.parse8601(33), null);
equal(exchange.parse8601('3333'), undefined);
equal(exchange.parse8601('Sr90'), undefined);
equal(exchange.parse8601(''), undefined);
equal(exchange.parse8601(), undefined);
equal(exchange.parse8601(null), undefined);
equal(exchange.parse8601({}), undefined);
equal(exchange.parse8601(33), undefined);

done();
});
Expand All @@ -64,7 +64,7 @@ it ('parseDate', done => {

equal(exchange.parseDate('1986-04-26 00:00:00'), 514857600000);
equal(exchange.parseDate('1986-04-26T01:23:47.000Z'), 514862627000);
equal(exchange.parseDate('1986-13-13 00:00:00'), null);
equal(exchange.parseDate('1986-13-13 00:00:00'), undefined);

done();
});
Expand Down

0 comments on commit 994179a

Please sign in to comment.