Merge branch 'master' into fayyaz/replace_lodash_isFinite

Author: zashraf1985

packages/optimizely-sdk/lib/core/audience_evaluator/index.js

@@ -35,7 +35,7 @@ var MODULE_NAME = 'AUDIENCE_EVALUATOR';
  * @constructor
  */
 function AudienceEvaluator(UNSTABLE_conditionEvaluators) {
-  this.typeToEvaluatorMap = fns.assignIn({}, UNSTABLE_conditionEvaluators, {
+  this.typeToEvaluatorMap = fns.assign({}, UNSTABLE_conditionEvaluators, {
     'custom_attribute': customAttributeConditionEvaluator
   });
 }

packages/optimizely-sdk/lib/core/decision_service/index.js

@@ -116,7 +116,7 @@ DecisionService.prototype.__resolveExperimentBucketMap = function(userId, attrib
   attributes = attributes || {}
   var userProfile = this.__getUserProfile(userId) || {};
   var attributeExperimentBucketMap = attributes[enums.CONTROL_ATTRIBUTES.STICKY_BUCKETING_KEY];
-  return fns.assignIn({}, userProfile.experiment_bucket_map, attributeExperimentBucketMap);
+  return fns.assign({}, userProfile.experiment_bucket_map, attributeExperimentBucketMap);
 };
 
 

packages/optimizely-sdk/lib/core/notification_center/index.js

@@ -66,7 +66,7 @@ NotificationCenter.prototype.addNotificationListener = function (notificationTyp
     }
 
     var callbackAlreadyAdded = false;
-    fns.forEach(this.__notificationListeners[notificationType], function (listenerEntry) {
+    (this.__notificationListeners[notificationType] || []).forEach(function(listenerEntry) {
       if (listenerEntry.callback === callback) {
         callbackAlreadyAdded = true;
         return false;
@@ -102,12 +102,13 @@ NotificationCenter.prototype.removeNotificationListener = function (listenerId)
     var indexToRemove;
     var typeToRemove;
     fns.forOwn(this.__notificationListeners, function (listenersForType, notificationType) {
-      fns.forEach(listenersForType, function (listenerEntry, i) {
+      (listenersForType || []).every(function(listenerEntry, i) {
         if (listenerEntry.id === listenerId) {
           indexToRemove = i;
           typeToRemove = notificationType;
           return false;
         }
+        return true
       });
       if (indexToRemove !== undefined && typeToRemove !== undefined) {
         return false;
@@ -160,7 +161,7 @@ NotificationCenter.prototype.clearNotificationListeners = function (notification
  */
 NotificationCenter.prototype.sendNotifications = function (notificationType, notificationData) {
   try {
-    fns.forEach(this.__notificationListeners[notificationType], function (listenerEntry) {
+    (this.__notificationListeners[notificationType] || []).forEach(function(listenerEntry) {
       var callback = listenerEntry.callback;
       try {
         callback(notificationData);

packages/optimizely-sdk/lib/core/project_config/index.js

@@ -41,7 +41,7 @@ module.exports = {
      * Conditions of audiences in projectConfig.typedAudiences are not
      * expected to be string-encoded as they are here in projectConfig.audiences.
      */
-    fns.forEach(projectConfig.audiences, function(audience) {
+    (projectConfig.audiences || []).forEach(function(audience) {
       audience.conditions = JSON.parse(audience.conditions);
     });
     projectConfig.audiencesById = fns.keyBy(projectConfig.audiences, 'id');
@@ -52,16 +52,16 @@ module.exports = {
     projectConfig.groupIdMap = fns.keyBy(projectConfig.groups, 'id');
 
     var experiments;
-    fns.forEach(projectConfig.groupIdMap, function(group, Id) {
-      experiments = fns.cloneDeep(group.experiments);
-      fns.forEach(experiments, function(experiment) {
-        projectConfig.experiments.push(fns.assignIn(experiment, {groupId: Id}));
+    Object.keys(projectConfig.groupIdMap || {}).forEach(function(Id) {
+      experiments = fns.cloneDeep(projectConfig.groupIdMap[Id].experiments);
+      (experiments || []).forEach(function(experiment) {
+        projectConfig.experiments.push(fns.assign(experiment, {groupId: Id}));
       });
     });
 
     projectConfig.rolloutIdMap = fns.keyBy(projectConfig.rollouts || [], 'id');
     fns.forOwn(projectConfig.rolloutIdMap, function(rollout) {
-      fns.forEach(rollout.experiments || [], function(experiment) {
+      (rollout.experiments || []).forEach(function(experiment) {
         projectConfig.experiments.push(fns.cloneDeep(experiment));
         // Creates { <variationKey>: <variation> } map inside of the experiment
         experiment.variationKeyMap = fns.keyBy(experiment.variations, 'key');
@@ -73,12 +73,12 @@ module.exports = {
 
     projectConfig.variationIdMap = {};
     projectConfig.variationVariableUsageMap = {};
-    fns.forEach(projectConfig.experiments, function(experiment) {
+    (projectConfig.experiments || []).forEach(function(experiment) {
       // Creates { <variationKey>: <variation> } map inside of the experiment
       experiment.variationKeyMap = fns.keyBy(experiment.variations, 'key');
 
       // Creates { <variationId>: { key: <variationKey>, id: <variationId> } } mapping for quick lookup
-      fns.assignIn(projectConfig.variationIdMap, fns.keyBy(experiment.variations, 'id'));
+      fns.assign(projectConfig.variationIdMap, fns.keyBy(experiment.variations, 'id'));
 
       fns.forOwn(experiment.variationKeyMap, function(variation) {
         if (variation.variables) {
@@ -94,7 +94,7 @@ module.exports = {
     projectConfig.featureKeyMap = fns.keyBy(projectConfig.featureFlags || [], 'key');
     fns.forOwn(projectConfig.featureKeyMap, function(feature) {
       feature.variableKeyMap = fns.keyBy(feature.variables, 'key');
-      fns.forEach(feature.experimentIds || [], function(experimentId) {
+      (feature.experimentIds || []).forEach(function(experimentId) {
         // Add this experiment in experiment-feature map.
         if (projectConfig.experimentFeatureMap[experimentId]) {
           projectConfig.experimentFeatureMap[experimentId].push(feature.id);

packages/optimizely-sdk/lib/index.browser.js

@@ -107,7 +107,7 @@ module.exports = {
         eventDispatcher = config.eventDispatcher;
       }
 
-      config = fns.assignIn(
+      config = fns.assign(
         {
           clientEngine: enums.JAVASCRIPT_CLIENT_ENGINE,
           eventBatchSize: DEFAULT_EVENT_BATCH_SIZE,

packages/optimizely-sdk/lib/index.react_native.js

@@ -86,7 +86,7 @@ module.exports = {
         config.skipJSONValidation = true;
       }
 
-      config = fns.assignIn(
+      config = fns.assign(
         {
           clientEngine: enums.JAVASCRIPT_CLIENT_ENGINE,
           eventBatchSize: DEFAULT_EVENT_BATCH_SIZE,

packages/optimizely-sdk/lib/utils/fns/index.js

@@ -18,8 +18,28 @@ var keyBy = require('@optimizely/js-sdk-utils').keyBy;
 var MAX_NUMBER_LIMIT = Math.pow(2, 53);
 
 module.exports = {
-  assign: require('lodash/assign'),
-  assignIn: require('lodash/assignIn'),
+  assign: function (target) {
+    if (!target) {
+      return {};
+    }
+    if (typeof Object.assign === 'function') {
+      return Object.assign.apply(Object, arguments);
+    } else {
+      var to = Object(target);
+      for (var index = 1; index < arguments.length; index++) {
+        var nextSource = arguments[index];
+        if (nextSource !== null && nextSource !== undefined) { 
+          for (var nextKey in nextSource) {
+            // Avoid bugs when hasOwnProperty is shadowed
+            if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+              to[nextKey] = nextSource[nextKey];
+            }
+          }
+        }
+      }
+      return to;
+    }
+  },
   cloneDeep: require('lodash/cloneDeep'),
   currentTimestamp: function() {
     return Math.round(new Date().getTime());
@@ -33,7 +53,6 @@ module.exports = {
       return item[key];
     });
   },
-  forEach: require('lodash/forEach'),
   forOwn: require('lodash/forOwn'),
   uuid: function() {
     return uuid.v4();