Merge branch 'master' into zeeshan/replace_lodash_values

Author: zashraf1985

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

@@ -144,7 +144,7 @@ DecisionService.prototype.__checkIfExperimentIsActive = function(configObj, expe
  * @return {string|null} Forced variation if it exists for user ID, otherwise null
  */
 DecisionService.prototype.__getWhitelistedVariation = function(experiment, userId) {
-  if (!fns.isEmpty(experiment.forcedVariations) && experiment.forcedVariations.hasOwnProperty(userId)) {
+  if (experiment.forcedVariations && experiment.forcedVariations.hasOwnProperty(userId)) {
     var forcedVariationKey = experiment.forcedVariations[userId];
     if (experiment.variationKeyMap.hasOwnProperty(forcedVariationKey)) {
       var forcedBucketingSucceededMessageLog = sprintf(LOG_MESSAGES.USER_FORCED_IN_VARIATION, MODULE_NAME, userId, forcedVariationKey);

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

@@ -122,7 +122,7 @@ module.exports = {
    */
   getExperimentId: function(projectConfig, experimentKey) {
     var experiment = projectConfig.experimentKeyMap[experimentKey];
-    if (fns.isEmpty(experiment)) {
+    if (!experiment) {
       throw new Error(sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, MODULE_NAME, experimentKey));
     }
     return experiment.id;
@@ -137,7 +137,7 @@ module.exports = {
    */
   getLayerId: function(projectConfig, experimentId) {
     var experiment = projectConfig.experimentIdMap[experimentId];
-    if (fns.isEmpty(experiment)) {
+    if (!experiment) {
       throw new Error(sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_ID, MODULE_NAME, experimentId));
     }
     return experiment.layerId;
@@ -190,7 +190,7 @@ module.exports = {
    */
   getExperimentStatus: function(projectConfig, experimentKey) {
     var experiment = projectConfig.experimentKeyMap[experimentKey];
-    if (fns.isEmpty(experiment)) {
+    if (!experiment) {
       throw new Error(sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, MODULE_NAME, experimentKey));
     }
     return experiment.status;
@@ -224,7 +224,7 @@ module.exports = {
    */
   getExperimentAudienceConditions: function(projectConfig, experimentKey) {
     var experiment = projectConfig.experimentKeyMap[experimentKey];
-    if (fns.isEmpty(experiment)) {
+    if (!experiment) {
       throw new Error(sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, MODULE_NAME, experimentKey));
     }
 
@@ -286,7 +286,7 @@ module.exports = {
    */
   getTrafficAllocation: function(projectConfig, experimentKey) {
     var experiment = projectConfig.experimentKeyMap[experimentKey];
-    if (fns.isEmpty(experiment)) {
+    if (!experiment) {
       throw new Error(sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, MODULE_NAME, experimentKey));
     }
     return experiment.trafficAllocation;

packages/optimizely-sdk/lib/index.d.ts

@@ -115,7 +115,7 @@ declare module "@optimizely/optimizely-sdk" {
     onReady(options?: {
       timeout?: number;
     }): Promise<{ success: boolean; reason?: string }>;
-    close(): void;
+    close(): Promise<{ success: boolean; reason?: string }>;
   }
 
   // An event to be submitted to Optimizely, enabling tracking the reach and impact of

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

@@ -375,7 +375,7 @@ Optimizely.prototype.getVariation = function(experimentKey, userId, attributes)
       }
 
       var experiment = configObj.experimentKeyMap[experimentKey];
-      if (fns.isEmpty(experiment)) {
+      if (!experiment) {
         this.logger.log(LOG_LEVEL.DEBUG, sprintf(ERROR_MESSAGES.INVALID_EXPERIMENT_KEY, MODULE_NAME, experimentKey));
         return null;
       }

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

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-var fns = require('../../utils/fns');
-
 var POST_METHOD = 'POST';
 var GET_METHOD = 'GET';
 var READYSTATE_COMPLETE = 4;
@@ -68,7 +66,7 @@ module.exports = {
 };
 
 var toQueryString = function(obj) {
-  return fns.map(obj, function(v, k) {
-    return encodeURIComponent(k) + '=' + encodeURIComponent(v);
+  return Object.keys(obj).map(function(k) {
+    return encodeURIComponent(k) + '=' + encodeURIComponent(obj[k]);
   }).join('&');
 };

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

@@ -25,15 +25,12 @@ module.exports = {
   currentTimestamp: function() {
     return Math.round(new Date().getTime());
   },
-  isArray: require('lodash/isArray'),
-  isEmpty: require('lodash/isEmpty'),
   isFinite: function(number) {
     return _isFinite(number) && Math.abs(number) <= MAX_NUMBER_LIMIT;
   },
   keyBy: require('lodash/keyBy'),
   forEach: require('lodash/forEach'),
   forOwn: require('lodash/forOwn'),
-  map: require('lodash/map'),
   uuid: function() {
     return uuid.v4();
   },

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

@@ -38,4 +38,4 @@ describe('lib/utils/fns', function() {
       });
     });
   });
-});
+});

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;
 
@@ -40,7 +39,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));