Convert enums to TS (#555)

yavorona · web-flow · commit dafdb6028063 · 2020-08-19T09:39:07.000-07:00
diff --git a/packages/optimizely-sdk/lib/core/decision_service/index.js b/packages/optimizely-sdk/lib/core/decision_service/index.js
@@ -16,7 +16,7 @@
 import { sprintf } from'@optimizely/js-sdk-utils';
 
 import bucketer from '../bucketer';
-import enums from '../../utils/enums';
+import * as enums from '../../utils/enums';
 import fns from '../../utils/fns';
 import projectConfig from '../project_config';
 import AudienceEvaluator from '../audience_evaluator';
diff --git a/packages/optimizely-sdk/lib/core/event_builder/index.js b/packages/optimizely-sdk/lib/core/event_builder/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import fns from '../../utils/fns';
-import enums from '../../utils/enums';
+import { CONTROL_ATTRIBUTES, RESERVED_EVENT_KEYWORDS } from '../../utils/enums';
 import projectConfig from '../project_config';
 import * as eventTagUtils from '../../utils/event_tag_utils';
 import * as attributeValidator from '../../utils/attributes_validator';
@@ -78,8 +78,8 @@ function getCommonEventParams(options) {
 
   if (typeof botFiltering === 'boolean') {
     commonParams.visitors[0].attributes.push({
-      entity_id: enums.CONTROL_ATTRIBUTES.BOT_FILTERING,
-      key: enums.CONTROL_ATTRIBUTES.BOT_FILTERING,
+      entity_id: CONTROL_ATTRIBUTES.BOT_FILTERING,
+      key: CONTROL_ATTRIBUTES.BOT_FILTERING,
       type: CUSTOM_ATTRIBUTE_FEATURE_TYPE,
       value: botFiltering,
     });
@@ -138,12 +138,12 @@ function getVisitorSnapshot(configObj, eventKey, eventTags, logger) {
   if (eventTags) {
     var revenue = eventTagUtils.getRevenueValue(eventTags, logger);
     if (revenue !== null) {
-      eventDict[enums.RESERVED_EVENT_KEYWORDS.REVENUE] = revenue;
+      eventDict[RESERVED_EVENT_KEYWORDS.REVENUE] = revenue;
     }
 
     var eventValue = eventTagUtils.getEventValue(eventTags, logger);
     if (eventValue !== null) {
-      eventDict[enums.RESERVED_EVENT_KEYWORDS.VALUE] = eventValue;
+      eventDict[RESERVED_EVENT_KEYWORDS.VALUE] = eventValue;
     }
 
     eventDict['tags'] = eventTags;
diff --git a/packages/optimizely-sdk/lib/core/notification_center/index.tests.js b/packages/optimizely-sdk/lib/core/notification_center/index.tests.js
@@ -17,7 +17,7 @@ import sinon from 'sinon';
 import { assert } from 'chai';
 
 import NotificationCenter from './';
-import enums from '../../utils/enums';
+import * as enums from '../../utils/enums';
 import logger from '../../plugins/logger';
 import errorHandler from '../../plugins/error_handler';
 
diff --git a/packages/optimizely-sdk/lib/index.browser.js b/packages/optimizely-sdk/lib/index.browser.js
@@ -27,7 +27,7 @@ import fns from './utils/fns';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
 import defaultEventDispatcher from './plugins/event_dispatcher/index.browser';
-import enums from './utils/enums';
+import * as enums from './utils/enums';
 import loggerPlugin from './plugins/logger';
 import Optimizely from './optimizely';
 import eventProcessorConfigValidator from './utils/event_processor_config_validator';
diff --git a/packages/optimizely-sdk/lib/index.browser.umdtests.js b/packages/optimizely-sdk/lib/index.browser.umdtests.js
@@ -17,7 +17,7 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 
 import configValidator from './utils/config_validator';
-import enums from './utils/enums';
+import * as enums from './utils/enums';
 import logger from './plugins/logger';
 import Optimizely from './optimizely';
 import testData from './tests/test_data';
diff --git a/packages/optimizely-sdk/lib/index.node.js b/packages/optimizely-sdk/lib/index.node.js
@@ -24,7 +24,7 @@ import {
 
 import fns from './utils/fns';
 import Optimizely from './optimizely';
-import enums from './utils/enums';
+import * as enums from './utils/enums';
 import loggerPlugin from './plugins/logger';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
diff --git a/packages/optimizely-sdk/lib/index.node.tests.js b/packages/optimizely-sdk/lib/index.node.tests.js
@@ -17,7 +17,7 @@ import { assert } from 'chai';
 import sinon from 'sinon';
 import * as eventProcessor from '@optimizely/js-sdk-event-processor';
 
-import enums from './utils/enums';
+import * as enums from './utils/enums';
 import Optimizely from './optimizely';
 import testData from './tests/test_data';
 import loggerPlugin from './plugins/logger';
diff --git a/packages/optimizely-sdk/lib/index.react_native.js b/packages/optimizely-sdk/lib/index.react_native.js
@@ -23,7 +23,7 @@ import {
 } from '@optimizely/js-sdk-logging';
 
 import fns from './utils/fns';
-import enums from './utils/enums';
+import * as enums from './utils/enums';
 import Optimizely from './optimizely';
 import configValidator from './utils/config_validator';
 import defaultErrorHandler from './plugins/error_handler';
diff --git a/packages/optimizely-sdk/lib/optimizely/index.js b/packages/optimizely-sdk/lib/optimizely/index.js
@@ -19,7 +19,7 @@ import * as eventProcessor from '@optimizely/js-sdk-event-processor';
 import fns from '../utils/fns'
 import { validate } from '../utils/attributes_validator';
 import decisionService from '../core/decision_service';
-import enums from '../utils/enums';
+import * as enums from '../utils/enums';
 import { getImpressionEvent, getConversionEvent } from '../core/event_builder/index.js';
 import { buildConversionEvent, buildImpressionEvent } from '../core/event_builder/event_helpers';
 import * as eventTagsValidator from '../utils/event_tags_validator';
diff --git a/packages/optimizely-sdk/lib/optimizely/index.tests.js b/packages/optimizely-sdk/lib/optimizely/index.tests.js
@@ -24,7 +24,7 @@ import AudienceEvaluator from '../core/audience_evaluator';
 import bluebird from 'bluebird';
 import bucketer from '../core/bucketer';
 import projectConfigManager from '../core/project_config/project_config_manager';
-import enums from '../utils/enums';
+import * as enums from '../utils/enums';
 import eventBuilder from '../core/event_builder/index.js';
 import eventDispatcher from '../plugins/event_dispatcher/index.node';
 import errorHandler from '../plugins/error_handler';
diff --git a/packages/optimizely-sdk/lib/utils/enums/index.ts b/packages/optimizely-sdk/lib/utils/enums/index.ts
@@ -19,15 +19,15 @@ import { NOTIFICATION_TYPES as notificationTypesEnum } from '@optimizely/js-sdk-
 /**
  * Contains global enums used throughout the library
  */
-export var LOG_LEVEL = {
+export const LOG_LEVEL = {
   NOTSET: 0,
   DEBUG: 1,
   INFO: 2,
   WARNING: 3,
   ERROR: 4,
 };
 
-export var ERROR_MESSAGES = {
+export const ERROR_MESSAGES = {
   CONDITION_EVALUATOR_ERROR: '%s: Error evaluating audience condition of type %s: %s',
   DATAFILE_AND_SDK_KEY_MISSING: '%s: You must provide at least one of sdkKey or datafile. Cannot start Optimizely',
   EXPERIMENT_KEY_NOT_IN_DATAFILE: '%s: Experiment key %s is not in datafile.',
@@ -65,7 +65,7 @@ export var ERROR_MESSAGES = {
   INVALID_VARIATION_KEY: '%s: Provided variation key is in an invalid format.',
 };
 
-export var LOG_MESSAGES = {
+export const LOG_MESSAGES = {
   ACTIVATE_USER: '%s: Activating user %s in experiment %s.',
   DISPATCH_CONVERSION_EVENT: '%s: Dispatching conversion event to URL %s with params %s.',
   DISPATCH_IMPRESSION_EVENT: '%s: Dispatching impression event to URL %s with params %s.',
@@ -157,32 +157,32 @@ export var LOG_MESSAGES = {
   UNABLE_TO_ATTACH_UNLOAD: '%s: unable to bind optimizely.close() to page unload event: "%s"',
 };
 
-export var RESERVED_EVENT_KEYWORDS = {
+export const RESERVED_EVENT_KEYWORDS = {
   REVENUE: 'revenue',
   VALUE: 'value',
 };
 
-export var CONTROL_ATTRIBUTES = {
+export const CONTROL_ATTRIBUTES = {
   BOT_FILTERING: '$opt_bot_filtering',
   BUCKETING_ID: '$opt_bucketing_id',
   STICKY_BUCKETING_KEY: '$opt_experiment_bucket_map',
   USER_AGENT: '$opt_user_agent',
 };
 
-export var JAVASCRIPT_CLIENT_ENGINE = 'javascript-sdk';
-export var NODE_CLIENT_ENGINE = 'node-sdk';
-export var REACT_CLIENT_ENGINE = 'react-sdk';
-export var NODE_CLIENT_VERSION = '4.2.1';
+export const JAVASCRIPT_CLIENT_ENGINE = 'javascript-sdk';
+export const NODE_CLIENT_ENGINE = 'node-sdk';
+export const REACT_CLIENT_ENGINE = 'react-sdk';
+export const NODE_CLIENT_VERSION = '4.2.1';
 
-export var VALID_CLIENT_ENGINES = [
+export const VALID_CLIENT_ENGINES = [
   NODE_CLIENT_ENGINE,
   REACT_CLIENT_ENGINE,
   JAVASCRIPT_CLIENT_ENGINE,
 ];
 
-export var NOTIFICATION_TYPES = notificationTypesEnum;
+export const NOTIFICATION_TYPES = notificationTypesEnum;
 
-export var DECISION_NOTIFICATION_TYPES = {
+export const DECISION_NOTIFICATION_TYPES = {
   AB_TEST: 'ab-test',
   FEATURE: 'feature',
   FEATURE_TEST: 'feature-test',
@@ -196,20 +196,20 @@ export var DECISION_NOTIFICATION_TYPES = {
  * source is used to decide whether to dispatch an impression event to
  * Optimizely.
  */
-export var DECISION_SOURCES = {
+export const DECISION_SOURCES = {
   FEATURE_TEST: 'feature-test',
   ROLLOUT: 'rollout',
 };
 
-export var AUDIENCE_EVALUATION_TYPES = {
+export const AUDIENCE_EVALUATION_TYPES = {
   RULE: 'rule',
   EXPERIMENT: 'experiment',
-}
+};
 
 /*
  * Possible types of variables attached to features
  */
-export var FEATURE_VARIABLE_TYPES = {
+export const FEATURE_VARIABLE_TYPES = {
   BOOLEAN: 'boolean',
   DOUBLE: 'double',
   INTEGER: 'integer',
@@ -220,27 +220,8 @@ export var FEATURE_VARIABLE_TYPES = {
 /*
  * Supported datafile versions
  */
-export var DATAFILE_VERSIONS = {
+export const DATAFILE_VERSIONS = {
   V2: '2',
   V3: '3',
   V4: '4',
 };
-
-export default {
-  LOG_LEVEL: LOG_LEVEL,
-  ERROR_MESSAGES: ERROR_MESSAGES,
-  LOG_MESSAGES: LOG_MESSAGES,
-  RESERVED_EVENT_KEYWORDS: RESERVED_EVENT_KEYWORDS,
-  CONTROL_ATTRIBUTES: CONTROL_ATTRIBUTES,
-  JAVASCRIPT_CLIENT_ENGINE: JAVASCRIPT_CLIENT_ENGINE,
-  NODE_CLIENT_ENGINE: NODE_CLIENT_ENGINE,
-  REACT_CLIENT_ENGINE: REACT_CLIENT_ENGINE,
-  NODE_CLIENT_VERSION: NODE_CLIENT_VERSION,
-  VALID_CLIENT_ENGINES: VALID_CLIENT_ENGINES,
-  NOTIFICATION_TYPES: NOTIFICATION_TYPES,
-  DECISION_NOTIFICATION_TYPES: DECISION_NOTIFICATION_TYPES,
-  DECISION_SOURCES: DECISION_SOURCES,
-  FEATURE_VARIABLE_TYPES: FEATURE_VARIABLE_TYPES,
-  DATAFILE_VERSIONS: DATAFILE_VERSIONS,
-  AUDIENCE_EVALUATION_TYPES: AUDIENCE_EVALUATION_TYPES
-}
