@splitsoftware/splitio-commons 1.0.1-rc.5 → 1.2.0

package/esm/sync/streaming/UpdateWorkers/MySegmentsUpdateWorker.js

@@ -1,4 +1,4 @@
-import Backoff from '../../../utils/Backoff';
+import { Backoff } from '../../../utils/Backoff';
 /**
  * MySegmentsUpdateWorker class
  */
@@ -55,4 +55,4 @@ var MySegmentsUpdateWorker = /** @class */ (function () {
     };
     return MySegmentsUpdateWorker;
 }());
-export default MySegmentsUpdateWorker;
+export { MySegmentsUpdateWorker };

package/esm/sync/streaming/UpdateWorkers/SegmentsUpdateWorker.js

@@ -1,4 +1,4 @@
-import Backoff from '../../../utils/Backoff';
+import { Backoff } from '../../../utils/Backoff';
 /**
  * SegmentUpdateWorker class
  */
@@ -68,4 +68,4 @@ var SegmentsUpdateWorker = /** @class */ (function () {
     };
     return SegmentsUpdateWorker;
 }());
-export default SegmentsUpdateWorker;
+export { SegmentsUpdateWorker };

package/esm/sync/streaming/UpdateWorkers/SplitsUpdateWorker.js

@@ -1,5 +1,5 @@
 import { SDK_SPLITS_ARRIVED } from '../../../readiness/constants';
-import Backoff from '../../../utils/Backoff';
+import { Backoff } from '../../../utils/Backoff';
 /**
  * SplitsUpdateWorker class
  */
@@ -76,4 +76,4 @@ var SplitsUpdateWorker = /** @class */ (function () {
     };
     return SplitsUpdateWorker;
 }());
-export default SplitsUpdateWorker;
+export { SplitsUpdateWorker };

package/esm/sync/streaming/pushManager.js

@@ -1,12 +1,12 @@
-import objectAssign from 'object-assign';
-import Backoff from '../../utils/Backoff';
-import SSEHandlerFactory from './SSEHandler';
-import MySegmentsUpdateWorker from './UpdateWorkers/MySegmentsUpdateWorker';
-import SegmentsUpdateWorker from './UpdateWorkers/SegmentsUpdateWorker';
-import SplitsUpdateWorker from './UpdateWorkers/SplitsUpdateWorker';
+import { objectAssign } from '../../utils/lang/objectAssign';
+import { Backoff } from '../../utils/Backoff';
+import { SSEHandlerFactory } from './SSEHandler';
+import { MySegmentsUpdateWorker } from './UpdateWorkers/MySegmentsUpdateWorker';
+import { SegmentsUpdateWorker } from './UpdateWorkers/SegmentsUpdateWorker';
+import { SplitsUpdateWorker } from './UpdateWorkers/SplitsUpdateWorker';
 import { authenticateFactory, hashUserKey } from './AuthClient';
 import { forOwn } from '../../utils/lang';
-import SSEClient from './SSEClient';
+import { SSEClient } from './SSEClient';
 import { getMatching } from '../../utils/key';
 import { MY_SEGMENTS_UPDATE, MY_SEGMENTS_UPDATE_V2, PUSH_NONRETRYABLE_ERROR, PUSH_SUBSYSTEM_DOWN, SECONDS_BEFORE_EXPIRATION, SEGMENT_UPDATE, SPLIT_KILL, SPLIT_UPDATE, PUSH_RETRYABLE_ERROR, PUSH_SUBSYSTEM_UP, ControlType } from './constants';
 import { STREAMING_FALLBACK, STREAMING_REFRESH_TOKEN, STREAMING_CONNECTING, STREAMING_DISABLED, ERROR_STREAMING_AUTH, STREAMING_DISCONNECTING, STREAMING_RECONNECT, STREAMING_PARSING_MY_SEGMENTS_UPDATE_V2 } from '../../logger/constants';
@@ -19,7 +19,7 @@ import { hash64 } from '../../utils/murmur3/murmur3_64';
  * - for server-side if key is not provided in settings.
  * - for client-side, with support for multiple clients, if key is provided in settings
  */
-export default function pushManagerFactory(pollingManager, storage, readiness, fetchAuth, platform, settings) {
+export function pushManagerFactory(pollingManager, storage, readiness, fetchAuth, platform, settings) {
     // `userKey` is the matching key of main client in client-side SDK.
     // It can be used to check if running on client-side or server-side SDK.
     var userKey = settings.core.key ? getMatching(settings.core.key) : undefined; //
@@ -87,7 +87,8 @@ export default function pushManagerFactory(pollingManager, storage, readiness, f
         // Guard condition in case `stop/disconnectPush` has been called (e.g., calling SDK destroy, or app signal close/background)
         if (disconnected)
             return;
-        log.info(STREAMING_CONNECTING, [disconnected === undefined ? '' : 'Re-']);
+        // @TODO distinguish log for 'Connecting' (1st time) and 'Re-connecting'
+        log.info(STREAMING_CONNECTING);
         disconnected = false;
         var userKeys = userKey ? Object.keys(clients) : undefined;
         authenticate(userKeys).then(function (authData) {

package/esm/sync/submitters/submitterSyncTask.js

@@ -1,4 +1,4 @@
-import syncTaskFactory from '../syncTask';
+import { syncTaskFactory } from '../syncTask';
 import { SUBMITTERS_PUSH, SUBMITTERS_PUSH_FAILS, SUBMITTERS_PUSH_RETRY } from '../../logger/constants';
 /**
  * Base function to create submitter sync tasks, such as ImpressionsSyncTask and EventsSyncTask

package/esm/sync/syncTask.js

@@ -10,7 +10,7 @@ import { SYNC_TASK_EXECUTE, SYNC_TASK_START, SYNC_TASK_STOP } from '../logger/co
  * @param taskName  Optional task name for logging.
  * @returns A sync task that wraps the given task.
  */
-export default function syncTaskFactory(log, task, period, taskName) {
+export function syncTaskFactory(log, task, period, taskName) {
     if (taskName === void 0) { taskName = 'task'; }
     // Flag that indicates if the task is being executed
     var executing = false;

package/esm/trackers/eventTracker.js

@@ -1,5 +1,5 @@
-import objectAssign from 'object-assign';
-import thenable from '../utils/promise/thenable';
+import { objectAssign } from '../utils/lang/objectAssign';
+import { thenable } from '../utils/promise/thenable';
 import { EVENTS_TRACKER_SUCCESS, ERROR_EVENTS_TRACKER } from '../logger/constants';
 /**
  * Event tracker stores events in cache and pass them to the integrations manager if provided.
@@ -7,7 +7,7 @@ import { EVENTS_TRACKER_SUCCESS, ERROR_EVENTS_TRACKER } from '../logger/constant
  * @param eventsCache cache to save events
  * @param integrationsManager optional event handler used for integrations
  */
-export default function eventTrackerFactory(log, eventsCache, integrationsManager) {
+export function eventTrackerFactory(log, eventsCache, integrationsManager) {
     function queueEventsCallback(eventData, tracked) {
         var eventTypeId = eventData.eventTypeId, trafficTypeName = eventData.trafficTypeName, key = eventData.key, value = eventData.value, timestamp = eventData.timestamp, properties = eventData.properties;
         // Logging every prop would be too much.

package/esm/trackers/impressionObserver/ImpressionObserver.js

@@ -1,4 +1,4 @@
-import LRUCache from '../../utils/LRUCache';
+import { LRUCache } from '../../utils/LRUCache';
 var ImpressionObserver = /** @class */ (function () {
     function ImpressionObserver(size, hasher) {
         this.cache = new LRUCache(size);
@@ -12,4 +12,4 @@ var ImpressionObserver = /** @class */ (function () {
     };
     return ImpressionObserver;
 }());
-export default ImpressionObserver;
+export { ImpressionObserver };

package/esm/trackers/impressionObserver/impressionObserverCS.js

@@ -1,4 +1,4 @@
-import ImpressionObserver from './ImpressionObserver';
+import { ImpressionObserver } from './ImpressionObserver';
 import { hash } from '../../utils/murmur3/murmur3';
 import { buildKey } from './buildKey';
 export function hashImpression32(impression) {

package/esm/trackers/impressionObserver/impressionObserverSS.js

@@ -1,4 +1,4 @@
-import ImpressionObserver from './ImpressionObserver';
+import { ImpressionObserver } from './ImpressionObserver';
 import { hash128 } from '../../utils/murmur3/murmur3_128_x86';
 import { buildKey } from './buildKey';
 export function hashImpression128(impression) {

package/esm/trackers/impressionsTracker.js

@@ -1,5 +1,5 @@
-import objectAssign from 'object-assign';
-import thenable from '../utils/promise/thenable';
+import { objectAssign } from '../utils/lang/objectAssign';
+import { thenable } from '../utils/promise/thenable';
 import { truncateTimeFrame } from '../utils/time';
 import { IMPRESSIONS_TRACKER_SUCCESS, ERROR_IMPRESSIONS_TRACKER, ERROR_IMPRESSIONS_LISTENER } from '../logger/constants';
 /**
@@ -12,7 +12,7 @@ import { IMPRESSIONS_TRACKER_SUCCESS, ERROR_IMPRESSIONS_TRACKER, ERROR_IMPRESSIO
  * @param observer optional impression observer. If provided, previous time (pt property) is included in impression instances
  * @param countsCache optional cache to save impressions count. If provided, impressions will be deduped (OPTIMIZED mode)
  */
-export default function impressionsTrackerFactory(log, impressionsCache, 
+export function impressionsTrackerFactory(log, impressionsCache, 
 // @TODO consider passing only an optional integrationsManager to handle impressions
 _a, impressionListener, integrationsManager, 
 // if observer is provided, it implies `shouldAddPreviousTime` flag (i.e., if impressions previous time should be added or not)

package/esm/utils/Backoff.js

@@ -38,4 +38,4 @@ var Backoff = /** @class */ (function () {
     Backoff.DEFAULT_MAX_MILLIS = 1800000; // 30 minutes
     return Backoff;
 }());
-export default Backoff;
+export { Backoff };

package/esm/utils/LRUCache/index.js

@@ -37,4 +37,4 @@ var LRUCache = /** @class */ (function () {
     };
     return LRUCache;
 }());
-export default LRUCache;
+export { LRUCache };

package/esm/utils/MinEventEmitter.js

@@ -94,4 +94,4 @@ var EventEmitter = /** @class */ (function () {
     };
     return EventEmitter;
 }());
-export default EventEmitter;
+export { EventEmitter };

package/esm/utils/inputValidation/attribute.js

@@ -0,0 +1,16 @@
+import { isString, isFiniteNumber, isBoolean } from '../../utils/lang';
+export function validateAttribute(log, attributeKey, attributeValue, method) {
+    if (!isString(attributeKey) || attributeKey.length === 0) {
+        log.warn(method + ": you passed an invalid attribute name, attribute name must be a non-empty string.");
+        return false;
+    }
+    var isStringVal = isString(attributeValue);
+    var isFiniteVal = isFiniteNumber(attributeValue);
+    var isBoolVal = isBoolean(attributeValue);
+    var isArrayVal = Array.isArray(attributeValue);
+    if (!(isStringVal || isFiniteVal || isBoolVal || isArrayVal)) { // If it's not of valid type.
+        log.warn(method + ": you passed an invalid attribute value for " + attributeKey + ". Acceptable types are: string, number, boolean and array of strings.");
+        return false;
+    }
+    return true;
+}

package/esm/utils/inputValidation/attributes.js

@@ -1,4 +1,5 @@
 import { isObject } from '../lang';
+import { validateAttribute } from './attribute';
 import { ERROR_NOT_PLAIN_OBJECT } from '../../logger/constants';
 export function validateAttributes(log, maybeAttrs, method) {
     // Attributes are optional
@@ -7,3 +8,13 @@ export function validateAttributes(log, maybeAttrs, method) {
     log.error(ERROR_NOT_PLAIN_OBJECT, [method, 'attributes']);
     return false;
 }
+export function validateAttributesDeep(log, maybeAttributes, method) {
+    if (!validateAttributes(log, maybeAttributes, method))
+        return false;
+    var result = true;
+    Object.keys(maybeAttributes).forEach(function (attributeKey) {
+        if (!validateAttribute(log, attributeKey, maybeAttributes[attributeKey], method))
+            result = false;
+    });
+    return result;
+}

package/esm/utils/inputValidation/trafficTypeExistance.js

@@ -1,4 +1,4 @@
-import thenable from '../promise/thenable';
+import { thenable } from '../promise/thenable';
 import { LOCALHOST_MODE } from '../constants';
 import { WARN_NOT_EXISTENT_TT } from '../../logger/constants';
 function logTTExistanceWarning(log, maybeTT, method) {

package/esm/utils/lang/binarySearch.js

@@ -6,7 +6,7 @@
  * @returns integer number between 0 and `items.length`. This value is the index of the search value,
  * if it is contained in the array, or the index at which the value should be inserted to keep the array ordered.
  */
-export default function binarySearch(items, value) {
+export function binarySearch(items, value) {
     var startIndex = 0;
     var stopIndex = items.length - 1;
     var middle = Math.floor((stopIndex + startIndex) / 2);

package/esm/utils/lang/objectAssign.js

@@ -0,0 +1,82 @@
+/*
+Adaptation of "object-assign" library (https://www.npmjs.com/package/object-assign)
+exported as an ES module instead of CommonJS, to avoid extra configuration steps when using
+the ESM build of the SDK with tools that doesn't support CommonJS by default (e.g. Rollup).
+
+object-assign
+(c) Sindre Sorhus
+@license MIT
+*/
+/* eslint-disable */
+// @ts-nocheck
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+var propIsEnumerable = Object.prototype.propertyIsEnumerable;
+function toObject(val) {
+    if (val === null || val === undefined) {
+        throw new TypeError('Object.assign cannot be called with null or undefined');
+    }
+    return Object(val);
+}
+function shouldUseNative() {
+    try {
+        if (!Object.assign) {
+            return false;
+        }
+        // Detect buggy property enumeration order in older V8 versions.
+        // https://bugs.chromium.org/p/v8/issues/detail?id=4118
+        var test1 = new String('abc');
+        test1[5] = 'de';
+        if (Object.getOwnPropertyNames(test1)[0] === '5') {
+            return false;
+        }
+        // https://bugs.chromium.org/p/v8/issues/detail?id=3056
+        var test2 = {};
+        for (var i = 0; i < 10; i++) {
+            test2['_' + String.fromCharCode(i)] = i;
+        }
+        var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
+            return test2[n];
+        });
+        if (order2.join('') !== '0123456789') {
+            return false;
+        }
+        // https://bugs.chromium.org/p/v8/issues/detail?id=3056
+        var test3 = {};
+        'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
+            test3[letter] = letter;
+        });
+        if (Object.keys(Object.assign({}, test3)).join('') !==
+            'abcdefghijklmnopqrst') {
+            return false;
+        }
+        return true;
+    }
+    catch (err) {
+        // We don't expect any of the above to throw, but better to be safe.
+        return false;
+    }
+}
+export var objectAssign = shouldUseNative() ? Object.assign : function (target, source) {
+    var from;
+    var to = toObject(target);
+    var symbols;
+    for (var s = 1; s < arguments.length; s++) {
+        from = Object(arguments[s]);
+        // eslint-disable-next-line no-restricted-syntax
+        for (var key in from) {
+            if (hasOwnProperty.call(from, key)) {
+                to[key] = from[key];
+            }
+        }
+        if (getOwnPropertySymbols) {
+            symbols = getOwnPropertySymbols(from);
+            for (var i = 0; i < symbols.length; i++) {
+                if (propIsEnumerable.call(from, symbols[i])) {
+                    to[symbols[i]] = from[symbols[i]];
+                }
+            }
+        }
+    }
+    return to;
+};

package/esm/utils/promise/thenable.js

@@ -1,2 +1,4 @@
 // returns true if the given value is a thenable object
-export default (function (o) { return o !== undefined && o !== null && typeof o.then === 'function'; });
+export function thenable(o) {
+    return o !== undefined && o !== null && typeof o.then === 'function';
+}

package/esm/utils/promise/timeout.js

@@ -1,4 +1,4 @@
-export default function timeout(ms, promise) {
+export function timeout(ms, promise) {
     if (ms < 1)
         return promise;
     return new Promise(function (resolve, reject) {

package/esm/utils/promise/wrapper.js

@@ -16,7 +16,7 @@
  * @returns a promise that doesn't need to be handled for rejection (except when using async/await syntax) and
  * includes a method named `hasOnFulfilled` that returns true if the promise has attached an onFulfilled handler.
  */
-export default function promiseWrapper(customPromise, defaultOnRejected) {
+export function promiseWrapper(customPromise, defaultOnRejected) {
     var hasOnFulfilled = false;
     var hasOnRejected = false;
     function chain(promise) {

package/esm/utils/settingsValidation/impressionsMode.js

@@ -1,6 +1,6 @@
 import { ERROR_INVALID_IMPRESSIONS_MODE } from '../../logger/constants';
 import { DEBUG, OPTIMIZED } from '../constants';
-export default function validImpressionsMode(log, impressionsMode) {
+export function validImpressionsMode(log, impressionsMode) {
     impressionsMode = impressionsMode.toUpperCase();
     if ([DEBUG, OPTIMIZED].indexOf(impressionsMode) === -1) {
         log.error(ERROR_INVALID_IMPRESSIONS_MODE, [[DEBUG, OPTIMIZED], OPTIMIZED]);

package/esm/utils/settingsValidation/index.js

@@ -1,8 +1,8 @@
 import { merge } from '../lang';
-import mode from './mode';
+import { mode } from './mode';
 import { validateSplitFilters } from './splitFilters';
 import { STANDALONE_MODE, OPTIMIZED, LOCALHOST_MODE } from '../constants';
-import validImpressionsMode from './impressionsMode';
+import { validImpressionsMode } from './impressionsMode';
 var base = {
     // Define which kind of object you want to retrieve from SplitFactory
     mode: STANDALONE_MODE,
@@ -100,7 +100,7 @@ export function settingsValidation(config, validationParams) {
     // Startup periods
     startup.requestTimeoutBeforeReady = fromSecondsToMillis(startup.requestTimeoutBeforeReady);
     startup.readyTimeout = fromSecondsToMillis(startup.readyTimeout);
-    startup.eventsFirstPushWindow = fromSecondsToMillis(withDefaults.startup.eventsFirstPushWindow);
+    startup.eventsFirstPushWindow = fromSecondsToMillis(startup.eventsFirstPushWindow);
     // ensure a valid SDK mode
     // @ts-ignore, modify readonly prop
     withDefaults.mode = mode(withDefaults.core.authorizationKey, withDefaults.mode);

package/esm/utils/settingsValidation/mode.js

@@ -1,5 +1,5 @@
 import { LOCALHOST_MODE, STANDALONE_MODE, PRODUCER_MODE, CONSUMER_MODE, CONSUMER_PARTIAL_MODE } from '../constants';
-export default function mode(key, mode) {
+export function mode(key, mode) {
     // Leaving the comparison as is, in case we change the mode name but not the setting.
     if (key === 'localhost')
         return LOCALHOST_MODE;

package/esm/utils/timeTracker/index.js

@@ -1,7 +1,7 @@
 var _a;
 import { uniqueId } from '../lang';
-import timer from './timer';
-import thenable from '../promise/thenable';
+import { timer } from './timer';
+import { thenable } from '../promise/thenable';
 // Map we will use for storing timers data
 var timers = {};
 // Tasks constants
@@ -86,7 +86,8 @@ function getCallbackForTask(task, collector) {
         return collector[callbackData.method];
     return false;
 }
-var TrackerAPI = {
+// Our "time tracker" API
+export var TrackerAPI = {
     /**
      * "Private" method, used to attach count/countException and stop callbacks to a promise.
      *
@@ -190,5 +191,3 @@ var TrackerAPI = {
      */
     TaskNames: CONSTANTS
 };
-// Our "time tracker" API
-export default TrackerAPI;

package/esm/utils/timeTracker/now/browser.js

@@ -9,5 +9,4 @@ function nowFactory() {
         return Date.now;
     }
 }
-var now = nowFactory();
-export default now;
+export var now = nowFactory();

package/esm/utils/timeTracker/now/node.js

@@ -1,5 +1,5 @@
 // @TODO migrate to Node SDK package eventually
-export default function now() {
+export function now() {
     // eslint-disable-next-line no-undef
     var time = process.hrtime();
     return time[0] * 1e3 + time[1] * 1e-6; // convert it to milis

package/esm/utils/timeTracker/timer.js

@@ -1,4 +1,4 @@
-export default function start(now) {
+export function timer(now) {
     var st = now ? now() : Date.now();
     return function stop() {
         return Math.round(now ? now() : Date.now() - st);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "1.0.1-rc.5",
+  "version": "1.2.0",
   "description": "Split Javascript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",
@@ -44,7 +44,6 @@
   "bugs": "https://github.com/splitio/javascript-commons/issues",
   "homepage": "https://github.com/splitio/javascript-commons#readme",
   "dependencies": {
-    "object-assign": "^4.1.1",
     "tslib": "^2.1.0"
   },
   "devDependencies": {
@@ -52,13 +51,13 @@
     "@types/ioredis": "^4.28.0",
     "@types/jest": "^27.0.0",
     "@types/lodash": "^4.14.162",
-    "@types/object-assign": "^4.0.30",
     "@typescript-eslint/eslint-plugin": "^4.2.0",
     "@typescript-eslint/parser": "^4.2.0",
     "cross-env": "^7.0.2",
     "csv-streamify": "^4.0.0",
     "eslint": "^7.32.0",
     "eslint-plugin-compat": "3.7.0",
+    "eslint-plugin-import": "^2.25.3",
     "fetch-mock": "^9.10.7",
     "ioredis": "^4.28.0",
     "jest": "^27.2.3",

package/src/evaluator/Engine.ts

@@ -1,7 +1,7 @@
 import { get } from '../utils/lang';
-import parser from './parser';
+import { parser } from './parser';
 import { keyParser } from '../utils/key';
-import thenable from '../utils/promise/thenable';
+import { thenable } from '../utils/promise/thenable';
 import * as LabelsConstants from '../utils/labels';
 import { CONTROL } from '../utils/constants';
 import { ISplit, MaybeThenable } from '../dtos/types';
@@ -17,7 +17,7 @@ function evaluationResult(result: IEvaluation | undefined, defaultTreatment: str
   };
 }
 
-export default class Engine {
+export class Engine {
 
   constructor(private baseInfo: ISplit, private evaluator: IEvaluator) {
 

package/src/evaluator/combiners/and.ts

@@ -1,11 +1,11 @@
 import { findIndex } from '../../utils/lang';
 import { ILogger } from '../../logger/types';
-import thenable from '../../utils/promise/thenable';
+import { thenable } from '../../utils/promise/thenable';
 import { MaybeThenable } from '../../dtos/types';
 import { IMatcher } from '../types';
 import { ENGINE_COMBINER_AND } from '../../logger/constants';
 
-export default function andCombinerContext(log: ILogger, matchers: IMatcher[]) {
+export function andCombinerContext(log: ILogger, matchers: IMatcher[]) {
 
   function andResults(results: boolean[]): boolean {
     // Array.prototype.every is supported by target environments

package/src/evaluator/combiners/ifelseif.ts

@@ -1,13 +1,13 @@
 import { findIndex } from '../../utils/lang';
 import { ILogger } from '../../logger/types';
-import thenable from '../../utils/promise/thenable';
+import { thenable } from '../../utils/promise/thenable';
 import * as LabelsConstants from '../../utils/labels';
 import { CONTROL } from '../../utils/constants';
 import { SplitIO } from '../../types';
 import { IEvaluation, IEvaluator, ISplitEvaluator } from '../types';
 import { ENGINE_COMBINER_IFELSEIF, ENGINE_COMBINER_IFELSEIF_NO_TREATMENT, ERROR_ENGINE_COMBINER_IFELSEIF } from '../../logger/constants';
 
-export default function ifElseIfCombinerContext(log: ILogger, predicates: IEvaluator[]): IEvaluator {
+export function ifElseIfCombinerContext(log: ILogger, predicates: IEvaluator[]): IEvaluator {
 
   function unexpectedInputHandler() {
     log.error(ERROR_ENGINE_COMBINER_IFELSEIF);

package/src/evaluator/condition/index.ts

@@ -1,5 +1,5 @@
 import { getTreatment, shouldApplyRollout } from './engineUtils';
-import thenable from '../../utils/promise/thenable';
+import { thenable } from '../../utils/promise/thenable';
 import * as LabelsConstants from '../../utils/labels';
 import { MaybeThenable } from '../../dtos/types';
 import { IEvaluation, IEvaluator, ISplitEvaluator } from '../types';
@@ -22,7 +22,7 @@ function match(log: ILogger, matchingResult: boolean, bucketingKey: string | und
 }
 
 // Condition factory
-export default function conditionContext(log: ILogger, matcherEvaluator: (...args: any) => MaybeThenable<boolean>, treatments: { getTreatmentFor: (x: number) => string }, label: string, conditionType: 'ROLLOUT' | 'WHITELIST'): IEvaluator {
+export function conditionContext(log: ILogger, matcherEvaluator: (...args: any) => MaybeThenable<boolean>, treatments: { getTreatmentFor: (x: number) => string }, label: string, conditionType: 'ROLLOUT' | 'WHITELIST'): IEvaluator {
 
   return function conditionEvaluator(key: SplitIO.SplitKey, seed: number, trafficAllocation?: number, trafficAllocationSeed?: number, attributes?: SplitIO.Attributes, splitEvaluator?: ISplitEvaluator) {
 

package/src/evaluator/index.ts

@@ -1,5 +1,5 @@
-import Engine from './Engine';
-import thenable from '../utils/promise/thenable';
+import { Engine } from './Engine';
+import { thenable } from '../utils/promise/thenable';
 import * as LabelsConstants from '../utils/labels';
 import { CONTROL } from '../utils/constants';
 import { ISplit, MaybeThenable } from '../dtos/types';

package/src/evaluator/matchers/all.ts

@@ -1,7 +1,7 @@
 import { ENGINE_MATCHER_ALL } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 
-export default function allMatcherContext(log: ILogger) {
+export function allMatcherContext(log: ILogger) {
   return function allMatcher(runtimeAttr: string): boolean {
     log.debug(ENGINE_MATCHER_ALL);
 

package/src/evaluator/matchers/between.ts

@@ -2,7 +2,7 @@ import { IBetweenMatcherData } from '../../dtos/types';
 import { ENGINE_MATCHER_BETWEEN } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 
-export default function betweenMatcherContext(log: ILogger, ruleVO: IBetweenMatcherData) /*: Function */ {
+export function betweenMatcherContext(log: ILogger, ruleVO: IBetweenMatcherData) /*: Function */ {
   return function betweenMatcher(runtimeAttr: number): boolean {
 
     let isBetween = runtimeAttr >= ruleVO.start && runtimeAttr <= ruleVO.end;

package/src/evaluator/matchers/boolean.ts

@@ -1,7 +1,7 @@
 import { ENGINE_MATCHER_BOOLEAN } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 
-export default function booleanMatcherContext(log: ILogger, ruleAttr: boolean) /*: Function */ {
+export function booleanMatcherContext(log: ILogger, ruleAttr: boolean) /*: Function */ {
   return function booleanMatcher(runtimeAttr: boolean): boolean {
     let booleanMatches = ruleAttr === runtimeAttr;
 

package/src/evaluator/matchers/cont_all.ts

@@ -2,7 +2,7 @@ import { ENGINE_MATCHER_CONTAINS_ALL } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 import { findIndex } from '../../utils/lang';
 
-export default function containsAllMatcherContext(log: ILogger, ruleAttr: string[]) /*: Function */ {
+export function containsAllSetMatcherContext(log: ILogger, ruleAttr: string[]) /*: Function */ {
   return function containsAllMatcher(runtimeAttr: string[]): boolean {
     let containsAll = true;
 

package/src/evaluator/matchers/cont_any.ts

@@ -2,7 +2,7 @@ import { ENGINE_MATCHER_CONTAINS_ANY } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 import { findIndex } from '../../utils/lang';
 
-export default function containsAnyMatcherContext(log: ILogger, ruleAttr: string[]) /*: Function */ {
+export function containsAnySetMatcherContext(log: ILogger, ruleAttr: string[]) /*: Function */ {
   return function containsAnyMatcher(runtimeAttr: string[]): boolean {
     let containsAny = false;
 

package/src/evaluator/matchers/cont_str.ts

@@ -2,7 +2,7 @@ import { isString } from '../../utils/lang';
 import { ILogger } from '../../logger/types';
 import { ENGINE_MATCHER_CONTAINS_STRING } from '../../logger/constants';
 
-export default function containsStringMatcherContext(log: ILogger, ruleAttr: string[]) /*: Function */ {
+export function containsStringMatcherContext(log: ILogger, ruleAttr: string[]) /*: Function */ {
   return function containsStringMatcher(runtimeAttr: string): boolean {
     let contains = ruleAttr.some(e => isString(runtimeAttr) && runtimeAttr.indexOf(e) > -1);
 

package/src/evaluator/matchers/dependency.ts

@@ -1,11 +1,11 @@
 import { IDependencyMatcherData, MaybeThenable } from '../../dtos/types';
 import { IStorageAsync, IStorageSync } from '../../storages/types';
 import { ILogger } from '../../logger/types';
-import thenable from '../../utils/promise/thenable';
+import { thenable } from '../../utils/promise/thenable';
 import { IDependencyMatcherValue, IEvaluation, ISplitEvaluator } from '../types';
 import { ENGINE_MATCHER_DEPENDENCY, ENGINE_MATCHER_DEPENDENCY_PRE } from '../../logger/constants';
 
-export default function dependencyMatcherContext(log: ILogger, { split, treatments }: IDependencyMatcherData, storage: IStorageSync | IStorageAsync) {
+export function dependencyMatcherContext(log: ILogger, { split, treatments }: IDependencyMatcherData, storage: IStorageSync | IStorageAsync) {
 
   function checkTreatment(evaluation: IEvaluation, acceptableTreatments: string[], parentName: string) {
     let matches = false;

package/src/evaluator/matchers/eq.ts

@@ -1,7 +1,7 @@
 import { ENGINE_MATCHER_EQUAL } from '../../logger/constants';
 import { ILogger } from '../../logger/types';
 
-export default function equalToMatcherContext(log: ILogger, ruleAttr: number) /*: Function */ {
+export function equalToMatcherContext(log: ILogger, ruleAttr: number) /*: Function */ {
   return function equalToMatcher(runtimeAttr: number): boolean {
     let isEqual = runtimeAttr === ruleAttr;