github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove merged in underscore usage and update to ES5/ES6.

Browse Source
This commit is contained in:
Hugh Willson
2017-07-25 21:32:42 -04:00
committed by Ben Newman
parent a7aa0175f6
commit 5b39d4b2da
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/ejson/ejson.js
View File

@@ -105,22 +105,31 @@ const builtinConverters = [
},
},
{ // RegExp
matchJSONValue: function (obj) {
return _.has(obj, '$regexp') && _.has(obj, '$flags') && _.size(obj) === 2;
matchJSONValue(obj) {
return hasOwn(obj, '$regexp')
&& hasOwn(obj, '$flags')
&& Object.keys(obj).length === 2;
},
matchObject: function (obj) {
matchObject(obj) {
return obj instanceof RegExp;
},
toJSONValue: function (regexp) {
return { $regexp: regexp.source, $flags: regexp.flags };
toJSONValue(regexp) {
return {
$regexp: regexp.source,
$flags: regexp.flags
};
},
fromJSONValue(obj) {
// Replaces duplicate / invalid flags.
return new RegExp(
obj.$regexp,
obj.$flags
// Cut off flags at 50 chars to avoid abusing RegExp for DOS.
.slice(0, 50)
.replace(/[^gimuy]/g,'')
.replace(/(.)(?=.*\1)/g, '')
);
},
fromJSONValue: function (obj) {
// replaces duplicate / invalid flags
// cut of flags to 50 chars to avoid abusing regex for DOS
return new RegExp(obj.$regexp, obj.$flags.substr(0, 50)
.replace(/[^gimuy]/g,'')
.replace(/(.)(?=.*\1)/g, ''));
}
},
{ // NaN, Inf, -Inf. (These are the only objects with typeof !== 'object'
// which we match.)