Skip to content

Removed dependency on lodash.isFinite #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjc1283 merged 4 commits into from
Feb 27, 2020
Merged

Removed dependency on lodash.isFinite #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e9583e
Removed isFinite method of Lodash
fayyazarshad Feb 20, 2020
eee13b0
Fixed lint issues
fayyazarshad Feb 20, 2020
b965ce5
changed the method name
fayyazarshad Feb 27, 2020
fc221c5
Merge branch 'master' into fayyaz/replace_lodash_isFinite
mjc1283 Feb 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions packages/optimizely-sdk/lib/core/custom_attribute_condition_evaluator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function exactEvaluator(condition, userAttributes, logger) {
var userValue = userAttributes[conditionName];
var userValueType = typeof userValue;

if (!isValueTypeValidForExactConditions(conditionValue) || (fns.isNumber(conditionValue) && !fns.isFinite(conditionValue))) {
if (!isValueTypeValidForExactConditions(conditionValue) || (fns.isNumber(conditionValue) && !fns.isSafeInteger(conditionValue))) {
logger.log(LOG_LEVEL.WARNING, sprintf(LOG_MESSAGES.UNEXPECTED_CONDITION_VALUE, MODULE_NAME, JSON.stringify(condition)));
return null;
}
Expand All @@ -114,7 +114,7 @@ function exactEvaluator(condition, userAttributes, logger) {
return null;
}

if (fns.isNumber(userValue) && !fns.isFinite(userValue)) {
if (fns.isNumber(userValue) && !fns.isSafeInteger(userValue)) {
logger.log(LOG_LEVEL.WARNING, sprintf(LOG_MESSAGES.OUT_OF_BOUNDS, MODULE_NAME, JSON.stringify(condition), conditionName));
return null;
}
Expand Down Expand Up @@ -152,7 +152,7 @@ function greaterThanEvaluator(condition, userAttributes, logger) {
var userValueType = typeof userValue;
var conditionValue = condition.value;

if (!fns.isFinite(conditionValue)) {
if (!fns.isSafeInteger(conditionValue)) {
logger.log(LOG_LEVEL.WARNING, sprintf(LOG_MESSAGES.UNEXPECTED_CONDITION_VALUE, MODULE_NAME, JSON.stringify(condition)));
return null;
}
Expand All @@ -167,7 +167,7 @@ function greaterThanEvaluator(condition, userAttributes, logger) {
return null;
}

if (!fns.isFinite(userValue)) {
if (!fns.isSafeInteger(userValue)) {
logger.log(LOG_LEVEL.WARNING, sprintf(LOG_MESSAGES.OUT_OF_BOUNDS, MODULE_NAME, JSON.stringify(condition), conditionName));
return null;
}
Expand All @@ -191,7 +191,7 @@ function lessThanEvaluator(condition, userAttributes, logger) {
var userValueType = typeof userValue;
var conditionValue = condition.value;

if (!fns.isFinite(conditionValue)) {
if (!fns.isSafeInteger(conditionValue)) {
logger.log(LOG_LEVEL.WARNING, sprintf(LOG_MESSAGES.UNEXPECTED_CONDITION_VALUE, MODULE_NAME, JSON.stringify(condition)));
return null;
}
Expand All @@ -206,7 +206,7 @@ function lessThanEvaluator(condition, userAttributes, logger) {
return null;
}

if (!fns.isFinite(userValue)) {
if (!fns.isSafeInteger(userValue)) {
logger.log(LOG_LEVEL.WARNING, sprintf(LOG_MESSAGES.OUT_OF_BOUNDS, MODULE_NAME, JSON.stringify(condition), conditionName));
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/optimizely-sdk/lib/optimizely/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ Optimizely.prototype.onReady = function(options) {
if (typeof options === 'object' && options !== null) {
timeout = options.timeout;
}
if (!fns.isFinite(timeout)) {
if (!fns.isSafeInteger(timeout)) {
timeout = DEFAULT_ONREADY_TIMEOUT;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/optimizely-sdk/lib/utils/attributes_validator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,6 @@ module.exports = {

isAttributeValid: function(attributeKey, attributeValue) {
return (typeof attributeKey === 'string') &&
(typeof attributeValue === 'string' || typeof attributeValue === 'boolean' || (fns.isNumber(attributeValue) && fns.isFinite(attributeValue)));
(typeof attributeValue === 'string' || typeof attributeValue === 'boolean' || (fns.isNumber(attributeValue) && fns.isSafeInteger(attributeValue)));
},
};
4 changes: 2 additions & 2 deletions packages/optimizely-sdk/lib/utils/event_processor_config_validator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var fns = require('../fns');
* @returns boolean
*/
function validateEventBatchSize(eventBatchSize) {
return fns.isFinite(eventBatchSize) && eventBatchSize >= 1;
return fns.isSafeInteger(eventBatchSize) && eventBatchSize >= 1;
}

/**
Expand All @@ -31,7 +31,7 @@ function validateEventBatchSize(eventBatchSize) {
* @returns boolean
*/
function validateEventFlushInterval(eventFlushInterval) {
return fns.isFinite(eventFlushInterval) && eventFlushInterval > 0;
return fns.isSafeInteger(eventFlushInterval) && eventFlushInterval > 0;
}

module.exports = {
Expand Down
10 changes: 4 additions & 6 deletions packages/optimizely-sdk/lib/utils/fns/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@
* limitations under the License.
*/
var uuid = require('uuid');
var _isFinite = require('lodash/isFinite');
var MAX_SAFE_INTEGER_LIMIT = Math.pow(2, 53);
var keyBy = require('@optimizely/js-sdk-utils').keyBy;
var MAX_NUMBER_LIMIT = Math.pow(2, 53);

module.exports = {
assign: function (target) {
if (!target) {
Expand All @@ -29,7 +27,7 @@ module.exports = {
var to = Object(target);
for (var index = 1; index < arguments.length; index++) {
var nextSource = arguments[index];
if (nextSource !== null && nextSource !== undefined) {
if (nextSource !== null && nextSource !== undefined) {
for (var nextKey in nextSource) {
// Avoid bugs when hasOwnProperty is shadowed
if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
Expand All @@ -45,8 +43,8 @@ module.exports = {
currentTimestamp: function() {
return Math.round(new Date().getTime());
},
isFinite: function(number) {
return _isFinite(number) && Math.abs(number) <= MAX_NUMBER_LIMIT;
isSafeInteger: function(number) {
return typeof number == 'number' && Math.abs(number) <= MAX_SAFE_INTEGER_LIMIT;
},
keyBy: function(arr, key) {
if (!arr) return {};
Expand Down
26 changes: 14 additions & 12 deletions packages/optimizely-sdk/lib/utils/fns/index.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,21 @@ describe('lib/utils/fns', function() {
describe('APIs', function() {
describe('isFinite', function() {
it('should return false for invalid numbers', function() {
assert.isFalse(fns.isFinite(Infinity));
assert.isFalse(fns.isFinite(-Infinity));
assert.isFalse(fns.isFinite(NaN));
assert.isFalse(fns.isFinite(Math.pow(2, 53) + 2));
assert.isFalse(fns.isFinite(-Math.pow(2, 53) - 2));
assert.isFalse(fns.isSafeInteger(Infinity));
assert.isFalse(fns.isSafeInteger(-Infinity));
assert.isFalse(fns.isSafeInteger(NaN));
assert.isFalse(fns.isSafeInteger(undefined));
assert.isFalse(fns.isSafeInteger('3'));
assert.isFalse(fns.isSafeInteger(Math.pow(2, 53) + 2));
assert.isFalse(fns.isSafeInteger(-Math.pow(2, 53) - 2));
});

it('should return true for valid numbers', function() {
assert.isTrue(fns.isFinite(0));
assert.isTrue(fns.isFinite(10));
assert.isTrue(fns.isFinite(10.5));
assert.isTrue(fns.isFinite(Math.pow(2, 53)));
assert.isTrue(fns.isFinite(-Math.pow(2, 53)));
assert.isTrue(fns.isSafeInteger(0));
assert.isTrue(fns.isSafeInteger(10));
assert.isTrue(fns.isSafeInteger(10.5));
assert.isTrue(fns.isSafeInteger(Math.pow(2, 53)));
assert.isTrue(fns.isSafeInteger(-Math.pow(2, 53)));
});
});

Expand All @@ -56,7 +58,7 @@ describe('lib/utils/fns', function() {
row4: { key1: 'row4', key2: 'key2row4' }
});
});

it('should return empty object when first argument is null or undefined', function() {
var obj = fns.keyBy(null, 'key1');
assert.isEmpty(obj);
Expand All @@ -65,7 +67,7 @@ describe('lib/utils/fns', function() {
assert.isEmpty(obj);
});
});

describe('isNumber', function() {
it('should return true in case of number', function() {
assert.isTrue(fns.isNumber(3));
Expand Down