Merge branch 'master' into uzair/sdk_options_refactor

Author: ozayr-zaviar

packages/optimizely-sdk/CHANGELOG.MD

@@ -7,6 +7,43 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [4.5.1] - March 2, 2021
+
+### Bug fixes
+-  Refactored TypeScript type definitions to have `OptimizelyUserContext` and `OptimizelyDecision` imported from `shared_types` to provide isolation from internal modules ([#655](https://github.com/optimizely/javascript-sdk/pull/655))
+
+## [4.5.0] - February 17, 2021
+
+### New Features
+
+- Introducing a new primary interface for retrieving feature flag status, configuration and associated experiment decisions for users ([#632](https://github.com/optimizely/javascript-sdk/pull/632), [#634](https://github.com/optimizely/javascript-sdk/pull/634), [#635](https://github.com/optimizely/javascript-sdk/pull/635), [#636](https://github.com/optimizely/javascript-sdk/pull/636), [#640](https://github.com/optimizely/javascript-sdk/pull/640), [#642](https://github.com/optimizely/javascript-sdk/pull/642), [#643](https://github.com/optimizely/javascript-sdk/pull/643), [#644](https://github.com/optimizely/javascript-sdk/pull/644), [#647](https://github.com/optimizely/javascript-sdk/pull/647), [#648](https://github.com/optimizely/javascript-sdk/pull/648)). The new `OptimizelyUserContext` class is instantiated with `createUserContext` and exposes the following APIs to get `OptimizelyDecision`:
+
+	- setAttribute
+	- decide
+	- decideAll
+	- decideForKeys
+	- trackEvent
+
+- For details, refer to our documentation page:
+  - browser version: [https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-sdk](https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-sdk).
+  - Node version: [https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-node-sdk](https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-node-sdk).
+
+## [4.5.0-beta] - February 10, 2021
+
+### New Features
+
+- Introducing a new primary interface for retrieving feature flag status, configuration and associated experiment decisions for users ([#632](https://github.com/optimizely/javascript-sdk/pull/632), [#634](https://github.com/optimizely/javascript-sdk/pull/634), [#635](https://github.com/optimizely/javascript-sdk/pull/635), [#636](https://github.com/optimizely/javascript-sdk/pull/636), [#640](https://github.com/optimizely/javascript-sdk/pull/640), [#642](https://github.com/optimizely/javascript-sdk/pull/642), [#643](https://github.com/optimizely/javascript-sdk/pull/643), [#644](https://github.com/optimizely/javascript-sdk/pull/644), [#647](https://github.com/optimizely/javascript-sdk/pull/647), [#648](https://github.com/optimizely/javascript-sdk/pull/648)). The new `OptimizelyUserContext` class is instantiated with `createUserContext` and exposes the following APIs to get `OptimizelyDecision`:
+
+	- setAttribute
+	- decide
+	- decideAll
+	- decideForKeys
+	- trackEvent
+
+- For details, refer to our documentation page:
+  - browser version: [https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-sdk](https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-sdk).
+  - Node version: [https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-node-sdk](https://docs.developers.optimizely.com/full-stack/v4.0/docs/javascript-node-sdk).
+
 ## [4.4.3] - November 23, 2020
 
 ### Bug fixes

packages/optimizely-sdk/lib/core/bucketer/index.tests.js

@@ -18,7 +18,7 @@ import { assert, expect } from 'chai';
 import { cloneDeep } from 'lodash';
 import { sprintf } from '@optimizely/js-sdk-utils';
 
-import bucketer from './';
+import * as bucketer from './';
 import {
   ERROR_MESSAGES,
   LOG_MESSAGES,

packages/optimizely-sdk/lib/core/bucketer/index.js renamed to packages/optimizely-sdk/lib/core/bucketer/index.ts

@@ -19,18 +19,48 @@
  */
 import { sprintf } from '@optimizely/js-sdk-utils';
 import murmurhash from 'murmurhash';
+import { LogHandler } from '@optimizely/js-sdk-logging';
+import {
+  DecisionResponse,
+  Experiment,
+  Variation
+} from '../../shared_types';
 
 import {
   ERROR_MESSAGES,
   LOG_LEVEL,
   LOG_MESSAGES,
 } from '../../utils/enums';
 
-var HASH_SEED = 1;
-var MAX_HASH_VALUE = Math.pow(2, 32);
-var MAX_TRAFFIC_VALUE = 10000;
-var MODULE_NAME = 'BUCKETER';
-var RANDOM_POLICY = 'random';
+const HASH_SEED = 1;
+const MAX_HASH_VALUE = Math.pow(2, 32);
+const MAX_TRAFFIC_VALUE = 10000;
+const MODULE_NAME = 'BUCKETER';
+const RANDOM_POLICY = 'random';
+
+interface TrafficAllocation {
+  entityId: string;
+  endOfRange: number;
+}
+
+interface Group {
+  id: string;
+  policy: string;
+  trafficAllocation: TrafficAllocation[];
+}
+
+interface BucketerParams {
+  experimentId: string;
+  experimentKey: string;
+  userId: string;
+  trafficAllocationConfig: TrafficAllocation[];
+  experimentKeyMap: { [key: string]: Experiment };
+  groupIdMap: { [key: string]: Group };
+  variationIdMap: { [id: string]: Variation } ;
+  varationIdMapKey: string;
+  logger: LogHandler;
+  bucketingId: string;
+}
 
 /**
  * Determines ID of variation to be shown for the given input params
@@ -48,18 +78,18 @@ var RANDOM_POLICY = 'random';
  * @return {Object}             DecisionResponse                         DecisionResponse containing variation ID that user has been bucketed into,
  *                                                                       null if user is not bucketed into any experiment and the decide reasons.
  */
-export var bucket = function(bucketerParams) {
-  var decideReasons = [];
+export const bucket = function(bucketerParams: BucketerParams):  DecisionResponse<string | null> {
+  const decideReasons: string[] = [];
   // Check if user is in a random group; if so, check if user is bucketed into a specific experiment
-  var experiment = bucketerParams.experimentKeyMap[bucketerParams.experimentKey];
-  var groupId = experiment['groupId'];
+  const experiment = bucketerParams.experimentKeyMap[bucketerParams.experimentKey];
+  const groupId = experiment['groupId'];
   if (groupId) {
-    var group = bucketerParams.groupIdMap[groupId];
+    const group = bucketerParams.groupIdMap[groupId];
     if (!group) {
       throw new Error(sprintf(ERROR_MESSAGES.INVALID_GROUP_ID, MODULE_NAME, groupId));
     }
     if (group.policy === RANDOM_POLICY) {
-      var bucketedExperimentId = this.bucketUserIntoExperiment(
+      const bucketedExperimentId = bucketUserIntoExperiment(
         group,
         bucketerParams.bucketingId,
         bucketerParams.userId,
@@ -68,7 +98,7 @@ export var bucket = function(bucketerParams) {
 
       // Return if user is not bucketed into any experiment
       if (bucketedExperimentId === null) {
-        var notbucketedInAnyExperimentLogMessage = sprintf(
+        const notbucketedInAnyExperimentLogMessage = sprintf(
           LOG_MESSAGES.USER_NOT_IN_ANY_EXPERIMENT,
           MODULE_NAME,
           bucketerParams.userId,
@@ -84,7 +114,7 @@ export var bucket = function(bucketerParams) {
 
       // Return if user is bucketed into a different experiment than the one specified
       if (bucketedExperimentId !== bucketerParams.experimentId) {
-        var notBucketedIntoExperimentOfGroupLogMessage = sprintf(
+        const notBucketedIntoExperimentOfGroupLogMessage = sprintf(
           LOG_MESSAGES.USER_NOT_BUCKETED_INTO_EXPERIMENT_IN_GROUP,
           MODULE_NAME,
           bucketerParams.userId,
@@ -100,7 +130,7 @@ export var bucket = function(bucketerParams) {
       }
 
       // Continue bucketing if user is bucketed into specified experiment
-      var bucketedIntoExperimentOfGroupLogMessage = sprintf(
+      const bucketedIntoExperimentOfGroupLogMessage = sprintf(
         LOG_MESSAGES.USER_BUCKETED_INTO_EXPERIMENT_IN_GROUP,
         MODULE_NAME,
         bucketerParams.userId,
@@ -111,10 +141,10 @@ export var bucket = function(bucketerParams) {
       decideReasons.push(bucketedIntoExperimentOfGroupLogMessage);
     }
   }
-  var bucketingId = sprintf('%s%s', bucketerParams.bucketingId, bucketerParams.experimentId);
-  var bucketValue = this._generateBucketValue(bucketingId);
+  const bucketingId = sprintf('%s%s', bucketerParams.bucketingId, bucketerParams.experimentId);
+  const bucketValue = _generateBucketValue(bucketingId);
 
-  var bucketedUserLogMessage = sprintf(
+  const bucketedUserLogMessage = sprintf(
     LOG_MESSAGES.USER_ASSIGNED_TO_EXPERIMENT_BUCKET,
     MODULE_NAME,
     bucketValue,
@@ -123,18 +153,19 @@ export var bucket = function(bucketerParams) {
   bucketerParams.logger.log(LOG_LEVEL.DEBUG, bucketedUserLogMessage);
   decideReasons.push(bucketedUserLogMessage);
 
-  var entityId = this._findBucket(bucketValue, bucketerParams.trafficAllocationConfig);
-
-  if (!bucketerParams.variationIdMap.hasOwnProperty(entityId)) {
-    if (entityId) {
-      var invalidVariationIdLogMessage = sprintf(LOG_MESSAGES.INVALID_VARIATION_ID, MODULE_NAME);
-      bucketerParams.logger.log(LOG_LEVEL.WARNING, invalidVariationIdLogMessage);
-      decideReasons.push(invalidVariationIdLogMessage);
+  const entityId = _findBucket(bucketValue, bucketerParams.trafficAllocationConfig);
+  if (entityId !== null) {
+    if (!bucketerParams.variationIdMap[entityId]) {
+      if (entityId) {
+        const invalidVariationIdLogMessage = sprintf(LOG_MESSAGES.INVALID_VARIATION_ID, MODULE_NAME);
+        bucketerParams.logger.log(LOG_LEVEL.WARNING, invalidVariationIdLogMessage);
+        decideReasons.push(invalidVariationIdLogMessage);
+      }
+      return {
+        result: null,
+        reasons: decideReasons,
+      };
     }
-    return {
-      result: null,
-      reasons: decideReasons,
-    };
   }
 
   return {
@@ -145,54 +176,63 @@ export var bucket = function(bucketerParams) {
 
 /**
  * Returns bucketed experiment ID to compare against experiment user is being called into
- * @param {Object} group        Group that experiment is in
- * @param {string} bucketingId  Bucketing ID
- * @param {string} userId       ID of user to be bucketed into experiment
- * @param {Object} logger       Logger implementation
- * @return {string|null} ID of experiment if user is bucketed into experiment within the group, null otherwise
+ * @param  {Group}       group        Group that experiment is in
+ * @param  {string}      bucketingId  Bucketing ID
+ * @param  {string}      userId       ID of user to be bucketed into experiment
+ * @param  {LogHandler}  logger       Logger implementation
+ * @return {string|null}              ID of experiment if user is bucketed into experiment within the group, null otherwise
  */
-export var bucketUserIntoExperiment = function(group, bucketingId, userId, logger) {
-  var bucketingKey = sprintf('%s%s', bucketingId, group.id);
-  var bucketValue = this._generateBucketValue(bucketingKey);
+export const bucketUserIntoExperiment = function(
+  group: Group,
+  bucketingId: string,
+  userId: string,
+  logger: LogHandler
+  ): string | null {
+  const bucketingKey = sprintf('%s%s', bucketingId, group.id);
+  const bucketValue = _generateBucketValue(bucketingKey);
   logger.log(
     LOG_LEVEL.DEBUG,
     sprintf(LOG_MESSAGES.USER_ASSIGNED_TO_EXPERIMENT_BUCKET, MODULE_NAME, bucketValue, userId)
   );
-  var trafficAllocationConfig = group.trafficAllocation;
-  var bucketedExperimentId = this._findBucket(bucketValue, trafficAllocationConfig);
+  const trafficAllocationConfig = group.trafficAllocation;
+  const bucketedExperimentId = _findBucket(bucketValue, trafficAllocationConfig);
   return bucketedExperimentId;
 };
 
 /**
  * Returns entity ID associated with bucket value
- * @param  {string}   bucketValue
- * @param  {Object[]} trafficAllocationConfig
- * @param  {number}   trafficAllocationConfig[].endOfRange
- * @param  {number}   trafficAllocationConfig[].entityId
- * @return {string|null}   Entity ID for bucketing if bucket value is within traffic allocation boundaries, null otherwise
+ * @param  {number}                bucketValue
+ * @param  {TrafficAllocation[]}   trafficAllocationConfig
+ * @param  {number}                trafficAllocationConfig[].endOfRange
+ * @param  {string}                trafficAllocationConfig[].entityId
+ * @return {string|null}           Entity ID for bucketing if bucket value is within traffic allocation boundaries, null otherwise
  */
-export var _findBucket = function(bucketValue, trafficAllocationConfig) {
-  for (var i = 0; i < trafficAllocationConfig.length; i++) {
+export const _findBucket = function(
+  bucketValue: number,
+  trafficAllocationConfig: TrafficAllocation[]
+  ): string | null {
+  for (let i = 0; i < trafficAllocationConfig.length; i++) {
     if (bucketValue < trafficAllocationConfig[i].endOfRange) {
       return trafficAllocationConfig[i].entityId;
     }
   }
+
   return null;
 };
 
 /**
  * Helper function to generate bucket value in half-closed interval [0, MAX_TRAFFIC_VALUE)
- * @param  {string} bucketingKey String value for bucketing
- * @return {string} the generated bucket value
- * @throws If bucketing value is not a valid string
+ * @param  {string}               bucketingKey          String value for bucketing
+ * @return {number}               The generated bucket value
+ * @throws                        If bucketing value is not a valid string
  */
-export var _generateBucketValue = function(bucketingKey) {
+export const _generateBucketValue = function(bucketingKey: string): number {
   try {
     // NOTE: the mmh library already does cast the hash value as an unsigned 32bit int
     // https://github.com/perezd/node-murmurhash/blob/master/murmurhash.js#L115
-    var hashValue = murmurhash.v3(bucketingKey, HASH_SEED);
-    var ratio = hashValue / MAX_HASH_VALUE;
-    return parseInt(ratio * MAX_TRAFFIC_VALUE, 10);
+    const hashValue = murmurhash.v3(bucketingKey, HASH_SEED);
+    const ratio = hashValue / MAX_HASH_VALUE;
+    return Math.floor(ratio * MAX_TRAFFIC_VALUE);
   } catch (ex) {
     throw new Error(sprintf(ERROR_MESSAGES.INVALID_BUCKETING_ID, MODULE_NAME, bucketingKey, ex.message));
   }
@@ -201,6 +241,4 @@ export var _generateBucketValue = function(bucketingKey) {
 export default {
   bucket: bucket,
   bucketUserIntoExperiment: bucketUserIntoExperiment,
-  _findBucket: _findBucket,
-  _generateBucketValue: _generateBucketValue,
 };

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

@@ -20,14 +20,10 @@ import {
   UserProfileService,
   FeatureFlag,
   Experiment,
-  Variation
+  Variation,
+  DecisionResponse
 } from '../../shared_types';
 
-interface DecisionResponse<T> {
-  readonly result: T;
-  readonly reasons: string[];
-}
-
 /**
  * Creates an instance of the DecisionService.
  * @param  {Options}          options        Configuration options

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

@@ -148,7 +148,7 @@ describe('javascript-sdk', function() {
         optlyInstance.onReady().catch(function() {});
 
         assert.instanceOf(optlyInstance, Optimizely);
-        assert.equal(optlyInstance.clientVersion, '4.4.3');
+        assert.equal(optlyInstance.clientVersion, '4.5.1');
       });
 
       it('should set the JavaScript client engine and version', function() {

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

@@ -43,33 +43,33 @@ declare module '@optimizely/optimizely-sdk' {
 
   export type OptimizelyFeature = import('./shared_types').OptimizelyFeature;
 
-  export type EventTags = import ('./shared_types').EventTags;
+  export type EventTags = import('./shared_types').EventTags;
 
-  export type Event = import ('./shared_types').Event;
+  export type Event = import('./shared_types').Event;
 
-  export type EventDispatcher = import ('./shared_types').EventDispatcher;
+  export type EventDispatcher = import('./shared_types').EventDispatcher;
 
-  export type DatafileOptions = import ('./shared_types').DatafileOptions;
+  export type DatafileOptions = import('./shared_types').DatafileOptions;
 
   export type Config = import ('./shared_types').Config;
 
   export type SDKOptions = Config;
 
-  export type OptimizelyOptions = import ('./shared_types').OptimizelyOptions;
+  export type OptimizelyOptions = import('./shared_types').OptimizelyOptions;
 
   export type UserProfileService = import('./shared_types').UserProfileService;
 
   export type UserProfile = import('./shared_types').UserProfile;
 
   export type ListenerPayload = import('./shared_types').ListenerPayload;
 
-  export type OptimizelyUserContext = import('./optimizely_user_context').default;
+  export type OptimizelyDecision = import('./shared_types').OptimizelyDecision;
 
-  export type OptimizelyDecision = import('./optimizely_decision').OptimizelyDecision;
+  export type OptimizelyUserContext = import('./shared_types').OptimizelyUserContext;
 
   export enum OptimizelyDecideOption {
     DISABLE_DECISION_EVENT = 'DISABLE_DECISION_EVENT',
-    ENABLED_FLAGS_ONLY =  'ENABLED_FLAGS_ONLY',
+    ENABLED_FLAGS_ONLY = 'ENABLED_FLAGS_ONLY',
     IGNORE_USER_PROFILE_SERVICE = 'IGNORE_USER_PROFILE_SERVICE',
     INCLUDE_REASONS = 'INCLUDE_REASONS',
     EXCLUDE_VARIABLES = 'EXCLUDE_VARIABLES'

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

@@ -90,7 +90,7 @@ describe('optimizelyFactory', function() {
         optlyInstance.onReady().catch(function() {});
 
         assert.instanceOf(optlyInstance, Optimizely);
-        assert.equal(optlyInstance.clientVersion, '4.4.3');
+        assert.equal(optlyInstance.clientVersion, '4.5.1');
       });
 
       describe('event processor configuration', function() {

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

@@ -89,7 +89,7 @@ describe('javascript-sdk/react-native', function() {
         optlyInstance.onReady().catch(function() {});
 
         assert.instanceOf(optlyInstance, Optimizely);
-        assert.equal(optlyInstance.clientVersion, '4.4.3');
+        assert.equal(optlyInstance.clientVersion, '4.5.1');
       });
 
       it('should set the Javascript client engine and version', function() {

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

@@ -26,9 +26,10 @@ import {
   FeatureFlag,
   FeatureVariable,
   OptimizelyOptions,
-  OptimizelyDecideOption
+  OptimizelyDecideOption,
+  OptimizelyDecision
 } from '../shared_types';
-import { OptimizelyDecision, newErrorDecision } from '../optimizely_decision';
+import { newErrorDecision } from '../optimizely_decision';
 import OptimizelyUserContext from '../optimizely_user_context';
 import { createProjectConfigManager, ProjectConfigManager } from '../core/project_config/project_config_manager';
 import { createNotificationCenter, NotificationCenter } from '../core/notification_center';