optimizely · zashraf1985 · May 23, 2022 · Mar 2, 2022 · Mar 14, 2022 · Mar 14, 2022
diff --git a/packages/optimizely-sdk/CHANGELOG.md b/packages/optimizely-sdk/CHANGELOG.md
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Changed
 - Add package.json script for running Karma tests locally using Chrome ([#651](https://github.com/optimizely/javascript-sdk/pull/651)).
-- Replaced explicit typescript typings with auto generated ones ([#745](https://github.com/optimizely/javascript-sdk/pull/745))
+- Replaced explicit typescript typings with auto generated ones ([#745](https://github.com/optimizely/javascript-sdk/pull/745)).
+- Integrated code from `utils` package into `optimizely-sdk` ([#749](https://github.com/optimizely/javascript-sdk/pull/749)).
 
 ## [4.9.1] - January 18, 2022
 

diff --git a/packages/optimizely-sdk/jest.config.js b/packages/optimizely-sdk/jest.config.js
@@ -0,0 +1,14 @@
+module.exports = {
+  "transform": {
+    "^.+\\.tsx?$": "ts-jest"
+  },
+  "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.tsx?$",
+  "moduleFileExtensions": [
+    "ts",
+    "tsx",
+    "js",
+    "jsx",
+    "json",
+    "node"
+  ],
+}
diff --git a/packages/optimizely-sdk/lib/core/audience_evaluator/index.tests.js b/packages/optimizely-sdk/lib/core/audience_evaluator/index.tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016, 2018-2020, Optimizely
+ * Copyright 2016, 2018-2020, 2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 import sinon from 'sinon';
 import { assert } from 'chai';
 import { getLogger } from '@optimizely/js-sdk-logging';
-import { sprintf } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../../utils/fns';
 
 import { createAudienceEvaluator } from './index';
 import * as conditionTreeEvaluator from '../condition_tree_evaluator';

diff --git a/packages/optimizely-sdk/lib/core/bucketer/index.tests.js b/packages/optimizely-sdk/lib/core/bucketer/index.tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2017, 2019-2021, Optimizely
+ * Copyright 2016-2017, 2019-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 import sinon from 'sinon';
 import { assert, expect } from 'chai';
 import { cloneDeep } from 'lodash';
-import { sprintf } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../../utils/fns';
 
 import * as bucketer from './';
 import {

diff --git a/packages/optimizely-sdk/lib/core/bucketer/index.ts b/packages/optimizely-sdk/lib/core/bucketer/index.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016, 2019-2021, Optimizely
+ * Copyright 2016, 2019-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 /**
  * Bucketer API for determining the variation id from the specified parameters
  */
-import { sprintf } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../../utils/fns';
 import murmurhash from 'murmurhash';
 import { LogHandler } from '@optimizely/js-sdk-logging';
 import {

diff --git a/packages/optimizely-sdk/lib/core/custom_attribute_condition_evaluator/index.tests.js b/packages/optimizely-sdk/lib/core/custom_attribute_condition_evaluator/index.tests.js
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020, Optimizely, Inc. and contributors                   *
+ * Copyright 2018-2020, 2022, Optimizely, Inc. and contributors                   *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -15,7 +15,7 @@
  ***************************************************************************/
 import sinon from 'sinon';
 import { assert } from 'chai';
-import { sprintf } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../../utils/fns';
 
 import {
   LOG_LEVEL,

diff --git a/packages/optimizely-sdk/lib/core/decision_service/index.tests.js b/packages/optimizely-sdk/lib/core/decision_service/index.tests.js
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2017-2021 Optimizely, Inc. and contributors                    *
+ * Copyright 2017-2022 Optimizely, Inc. and contributors                    *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -16,7 +16,7 @@
 import sinon from 'sinon';
 import { assert } from 'chai';
 import cloneDeep from 'lodash/cloneDeep';
-import { sprintf } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../../utils/fns';
 
 import { createDecisionService } from './';
 import * as bucketer from '../bucketer';

diff --git a/packages/optimizely-sdk/lib/core/decision_service/index.ts b/packages/optimizely-sdk/lib/core/decision_service/index.ts
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and      *
  * limitations under the License.                                           *
  ***************************************************************************/
-import { sprintf } from '@optimizely/js-sdk-utils';
 import { LogHandler } from '@optimizely/js-sdk-logging';
+import { sprintf } from '../../utils/fns';
 
 import fns from '../../utils/fns';
 import { bucket } from '../bucketer';

diff --git a/packages/optimizely-sdk/lib/core/notification_center/index.ts b/packages/optimizely-sdk/lib/core/notification_center/index.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020, Optimizely
+ * Copyright 2020, 2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { objectValues } from '@optimizely/js-sdk-utils';
 import { LogHandler, ErrorHandler } from '@optimizely/js-sdk-logging';
-import { NOTIFICATION_TYPES as notificationTypesEnum } from '@optimizely/js-sdk-utils';
+import { objectValues } from '../../utils/fns';
 import { NotificationListener, ListenerPayload } from '../../shared_types';
 
 import {
@@ -186,9 +185,9 @@ export class NotificationCenter {
 
   /**
    * Remove all previously added notification listeners for the argument type
-   * @param   {notificationTypesEnum}    notificationType One of NOTIFICATION_TYPES
+   * @param   {NOTIFICATION_TYPES}    notificationType One of NOTIFICATION_TYPES
    */
-  clearNotificationListeners(notificationType: notificationTypesEnum): void {
+  clearNotificationListeners(notificationType: NOTIFICATION_TYPES): void {
     try {
       this.notificationListeners[notificationType] = [];
     } catch (e) {
@@ -239,3 +238,9 @@ export class NotificationCenter {
 export function createNotificationCenter(options: NotificationCenterOptions): NotificationCenter {
   return new NotificationCenter(options);
 }
+
+export interface NotificationSender {
+  // TODO[OASIS-6649]: Don't use any type
+  // eslint-disable-next-line  @typescript-eslint/no-explicit-any
+  sendNotifications(notificationType: NOTIFICATION_TYPES, notificationData?: any): void
+}
diff --git a/packages/optimizely-sdk/lib/core/project_config/index.tests.js b/packages/optimizely-sdk/lib/core/project_config/index.tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016-2021, Optimizely
+ * Copyright 2016-2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ import sinon from 'sinon';
 import { assert } from 'chai';
 import { forEach, cloneDeep } from 'lodash';
 import { getLogger } from '@optimizely/js-sdk-logging';
-import { sprintf } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../../utils/fns';
 
 import fns from '../../utils/fns';
 import projectConfig from './';

diff --git a/packages/optimizely-sdk/lib/core/project_config/index.ts b/packages/optimizely-sdk/lib/core/project_config/index.ts
@@ -17,10 +17,11 @@ import {
   find,
   objectEntries,
   objectValues,
-  sprintf
-} from '@optimizely/js-sdk-utils';
+  sprintf,
+  assign,
+  keyBy
+} from '../../utils/fns';
 
-import fns from '../../utils/fns';
 import {
   ERROR_MESSAGES,
   LOG_LEVEL,
@@ -105,27 +106,27 @@ const MODULE_NAME = 'PROJECT_CONFIG';
 
 // eslint-disable-next-line  @typescript-eslint/no-explicit-any
 function createMutationSafeDatafileCopy(datafile: any): ProjectConfig {
-  const datafileCopy = fns.assign({}, datafile);
+  const datafileCopy = assign({}, datafile);
   datafileCopy.audiences = (datafile.audiences || []).map((audience: Audience) => {
-    return fns.assign({}, audience);
+    return assign({}, audience);
   });
   datafileCopy.experiments = (datafile.experiments || []).map((experiment: Experiment) => {
-    return fns.assign({}, experiment);
+    return assign({}, experiment);
   });
   datafileCopy.featureFlags = (datafile.featureFlags || []).map((featureFlag: FeatureFlag) => {
-    return fns.assign({}, featureFlag);
+    return assign({}, featureFlag);
   });
   datafileCopy.groups = (datafile.groups || []).map((group: Group) => {
-    const groupCopy = fns.assign({}, group);
+    const groupCopy = assign({}, group);
     groupCopy.experiments = (group.experiments || []).map((experiment) => {
-      return fns.assign({}, experiment);
+      return assign({}, experiment);
     });
     return groupCopy;
   });
   datafileCopy.rollouts = (datafile.rollouts || []).map((rollout: Rollout) => {
-    const rolloutCopy = fns.assign({}, rollout);
+    const rolloutCopy = assign({}, rollout);
     rolloutCopy.experiments = (rollout.experiments || []).map((experiment) => {
-      return fns.assign({}, experiment);
+      return assign({}, experiment);
     });
     return rolloutCopy;
   });
@@ -157,46 +158,46 @@ export const createProjectConfig = function(
   (projectConfig.audiences || []).forEach((audience) => {
     audience.conditions = JSON.parse(audience.conditions as string);
   });
-  projectConfig.audiencesById = fns.keyBy(projectConfig.audiences, 'id');
-  fns.assign(projectConfig.audiencesById, fns.keyBy(projectConfig.typedAudiences, 'id'));
+  projectConfig.audiencesById = keyBy(projectConfig.audiences, 'id');
+  assign(projectConfig.audiencesById, keyBy(projectConfig.typedAudiences, 'id'));
 
-  projectConfig.attributeKeyMap = fns.keyBy(projectConfig.attributes, 'key');
-  projectConfig.eventKeyMap = fns.keyBy(projectConfig.events, 'key');
-  projectConfig.groupIdMap = fns.keyBy(projectConfig.groups, 'id');
+  projectConfig.attributeKeyMap = keyBy(projectConfig.attributes, 'key');
+  projectConfig.eventKeyMap = keyBy(projectConfig.events, 'key');
+  projectConfig.groupIdMap = keyBy(projectConfig.groups, 'id');
 
   let experiments;
   Object.keys(projectConfig.groupIdMap || {}).forEach((Id) => {
     experiments = projectConfig.groupIdMap[Id].experiments;
     (experiments || []).forEach((experiment) => {
-      projectConfig.experiments.push(fns.assign(experiment, { groupId: Id }));
+      projectConfig.experiments.push(assign(experiment, { groupId: Id }));
     });
   });
 
-  projectConfig.rolloutIdMap = fns.keyBy(projectConfig.rollouts || [], 'id');
+  projectConfig.rolloutIdMap = keyBy(projectConfig.rollouts || [], 'id');
   objectValues(projectConfig.rolloutIdMap || {}).forEach(
     (rollout) => {
       (rollout.experiments || []).forEach((experiment) => {
         projectConfig.experiments.push(experiment);
         // Creates { <variationKey>: <variation> } map inside of the experiment
-        experiment.variationKeyMap = fns.keyBy(experiment.variations, 'key');
+        experiment.variationKeyMap = keyBy(experiment.variations, 'key');
       });
     }
   );
 
-  projectConfig.experimentKeyMap = fns.keyBy(projectConfig.experiments, 'key');
-  projectConfig.experimentIdMap = fns.keyBy(projectConfig.experiments, 'id');
+  projectConfig.experimentKeyMap = keyBy(projectConfig.experiments, 'key');
+  projectConfig.experimentIdMap = keyBy(projectConfig.experiments, 'id');
 
   projectConfig.variationIdMap = {};
   projectConfig.variationVariableUsageMap = {};
   (projectConfig.experiments || []).forEach((experiment) => {
     // Creates { <variationKey>: <variation> } map inside of the experiment
-    experiment.variationKeyMap = fns.keyBy(experiment.variations, 'key');
+    experiment.variationKeyMap = keyBy(experiment.variations, 'key');
 
     // Creates { <variationId>: { key: <variationKey>, id: <variationId> } } mapping for quick lookup
-    fns.assign(projectConfig.variationIdMap, fns.keyBy(experiment.variations, 'id'));
+    assign(projectConfig.variationIdMap, keyBy(experiment.variations, 'id'));
     objectValues(experiment.variationKeyMap || {}).forEach((variation) => {
       if (variation.variables) {
-        projectConfig.variationVariableUsageMap[variation.id] = fns.keyBy(variation.variables, 'id');
+        projectConfig.variationVariableUsageMap[variation.id] = keyBy(variation.variables, 'id');
       }
     });
   });
@@ -205,7 +206,7 @@ export const createProjectConfig = function(
   // for checking that experiment is a feature experiment or not.
   projectConfig.experimentFeatureMap = {};
 
-  projectConfig.featureKeyMap = fns.keyBy(projectConfig.featureFlags || [], 'key');
+  projectConfig.featureKeyMap = keyBy(projectConfig.featureFlags || [], 'key');
   objectValues(projectConfig.featureKeyMap || {}).forEach(
     (feature) => {
       // Json type is represented in datafile as a subtype of string for the sake of backwards compatibility.
@@ -217,7 +218,7 @@ export const createProjectConfig = function(
         }
       });
 
-      feature.variableKeyMap = fns.keyBy(feature.variables, 'key');
+      feature.variableKeyMap = keyBy(feature.variables, 'key');
       (feature.experimentIds || []).forEach((experimentId) => {
         // Add this experiment in experiment-feature map.
         if (projectConfig.experimentFeatureMap[experimentId]) {

diff --git a/packages/optimizely-sdk/lib/core/project_config/project_config_manager.tests.js b/packages/optimizely-sdk/lib/core/project_config/project_config_manager.tests.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019-2020 Optimizely
+ * Copyright 2019-2020, 2022, Optimizely
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ import sinon from 'sinon';
 import { assert } from 'chai';
 import { cloneDeep } from 'lodash';
 
-import { sprintf } from '@optimizely/js-sdk-utils';
 import * as logging from '@optimizely/js-sdk-logging';
+import { sprintf } from '../../utils/fns';
 import * as datafileManager from '@optimizely/js-sdk-datafile-manager';
 
 import * as projectConfig from './index';

diff --git a/packages/optimizely-sdk/lib/core/project_config/project_config_manager.ts b/packages/optimizely-sdk/lib/core/project_config/project_config_manager.ts
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { sprintf } from '@optimizely/js-sdk-utils';
 import { getLogger } from '@optimizely/js-sdk-logging';
+import { sprintf } from '../../utils/fns';
 
 import { ERROR_MESSAGES } from '../../utils/enums';
 import { createOptimizelyConfig } from '../optimizely_config';

diff --git a/packages/optimizely-sdk/lib/optimizely/index.tests.js b/packages/optimizely-sdk/lib/optimizely/index.tests.js
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2016-2021, Optimizely, Inc. and contributors                   *
+ * Copyright 2016-2022, Optimizely, Inc. and contributors                   *
  *                                                                          *
  * Licensed under the Apache License, Version 2.0 (the "License");          *
  * you may not use this file except in compliance with the License.         *
@@ -15,7 +15,8 @@
  ***************************************************************************/
 import { assert, expect } from 'chai';
 import sinon from 'sinon';
-import { sprintf, NOTIFICATION_TYPES } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../utils/fns';
+import { NOTIFICATION_TYPES } from '../utils/enums';
 import eventProcessor from '../plugins/event_processor';
 import * as logging from '@optimizely/js-sdk-logging';
 

diff --git a/packages/optimizely-sdk/lib/optimizely/index.ts b/packages/optimizely-sdk/lib/optimizely/index.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and      *
  * limitations under the License.                                           *
  ***************************************************************************/
-import { sprintf, objectValues } from '@optimizely/js-sdk-utils';
 import { LoggerFacade, ErrorHandler } from '@optimizely/js-sdk-logging';
+import { sprintf, objectValues } from '../utils/fns';
+import { NotificationCenter } from '../core/notification_center';
 import { EventProcessor } from '@optimizely/js-sdk-event-processor';
-import {NotificationCenter} from '../core/notification_center'
 
 import {
   UserAttributes,

diff --git a/packages/optimizely-sdk/lib/optimizely_user_context/index.tests.js b/packages/optimizely-sdk/lib/optimizely_user_context/index.tests.js
@@ -17,7 +17,8 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 
 import * as logging from '@optimizely/js-sdk-logging';
-import { sprintf, NOTIFICATION_TYPES } from '@optimizely/js-sdk-utils';
+import { sprintf } from '../utils/fns';
+import { NOTIFICATION_TYPES } from '../utils/enums';
 
 import OptimizelyUserContext from './';
 import { createLogger } from '../plugins/logger';