From 8f7332e40532b9f6e2f663e4a2535c42f22405d4 Mon Sep 17 00:00:00 2001 From: fayyazarshad Date: Tue, 18 Feb 2020 12:36:49 -0800 Subject: [PATCH 1/4] Removed isArray method of Lodash --- packages/optimizely-sdk/lib/utils/fns/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index c8688e282..15d836a3a 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -24,7 +24,7 @@ module.exports = { currentTimestamp: function() { return Math.round(new Date().getTime()); }, - isArray: require('lodash/isArray'), + isArray: Array.isArray, isEmpty: require('lodash/isEmpty'), isFinite: function(number) { return _isFinite(number) && Math.abs(number) <= MAX_NUMBER_LIMIT; From 2b6747eb816e62f5535b2a93e7cb424fda8a2aee Mon Sep 17 00:00:00 2001 From: fayyazarshad Date: Tue, 18 Feb 2020 13:14:58 -0800 Subject: [PATCH 2/4] Added method logic --- packages/optimizely-sdk/lib/utils/fns/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index 15d836a3a..e2c40b7b6 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -24,7 +24,9 @@ module.exports = { currentTimestamp: function() { return Math.round(new Date().getTime()); }, - isArray: Array.isArray, + isArray: function(value) { + return Array.isArray(value); + }, isEmpty: require('lodash/isEmpty'), isFinite: function(number) { return _isFinite(number) && Math.abs(number) <= MAX_NUMBER_LIMIT; From c53473511912507f5bcfa410700bd0fe0e9d6c8b Mon Sep 17 00:00:00 2001 From: fayyazarshad Date: Fri, 21 Feb 2020 11:23:12 -0800 Subject: [PATCH 3/4] Removing isArray from utils because Array.isArray would be used everywhere --- packages/optimizely-sdk/lib/utils/fns/index.js | 3 --- .../optimizely-sdk/lib/utils/json_schema_validator/index.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/optimizely-sdk/lib/utils/fns/index.js b/packages/optimizely-sdk/lib/utils/fns/index.js index e2c40b7b6..bd135283a 100644 --- a/packages/optimizely-sdk/lib/utils/fns/index.js +++ b/packages/optimizely-sdk/lib/utils/fns/index.js @@ -24,9 +24,6 @@ module.exports = { currentTimestamp: function() { return Math.round(new Date().getTime()); }, - isArray: function(value) { - return Array.isArray(value); - }, isEmpty: require('lodash/isEmpty'), isFinite: function(number) { return _isFinite(number) && Math.abs(number) <= MAX_NUMBER_LIMIT; diff --git a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js index bb8831594..1d829a070 100644 --- a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js +++ b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js @@ -40,7 +40,7 @@ module.exports = { if (result.valid) { return true; } else { - if (fns.isArray(result.errors)) { + if (Array.isArray(result.errors)) { throw new Error(sprintf(ERROR_MESSAGES.INVALID_DATAFILE, MODULE_NAME, result.errors[0].property, result.errors[0].message)); } throw new Error(sprintf(ERROR_MESSAGES.INVALID_JSON, MODULE_NAME)); From dc78b0d9aad1e10610fb58e06396a1533f78c188 Mon Sep 17 00:00:00 2001 From: fayyazarshad Date: Fri, 21 Feb 2020 11:28:49 -0800 Subject: [PATCH 4/4] Fixed lint error --- packages/optimizely-sdk/lib/utils/json_schema_validator/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js index 1d829a070..d51ff10ea 100644 --- a/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js +++ b/packages/optimizely-sdk/lib/utils/json_schema_validator/index.js @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -var fns = require('../fns'); var validate = require('json-schema').validate; var sprintf = require('@optimizely/js-sdk-utils').sprintf;