@splitsoftware/splitio-commons 1.13.2-rc.5 → 1.13.2-rc.7

package/esm/evaluator/matchersTransform/index.js

@@ -2,7 +2,6 @@ import { findIndex } from '../../utils/lang';
 import { matcherTypes, matcherTypesMapper, matcherDataTypes } from '../matchers/matcherTypes';
 import { segmentTransform } from './segment';
 import { whitelistTransform } from './whitelist';
-import { setTransform } from './set';
 import { numericTransform } from './unaryNumeric';
 import { zeroSinceHH, zeroSinceSS } from '../convertions';
 /**
@@ -19,10 +18,6 @@ export function matchersTransform(matchers) {
         if (type === matcherTypes.IN_SEGMENT) {
             value = segmentTransform(userDefinedSegmentMatcherData);
         }
-        else if (type === matcherTypes.WHITELIST ||
-            type === matcherTypes.IN_LIST_SEMVER) {
-            value = whitelistTransform(whitelistMatcherData);
-        }
         else if (type === matcherTypes.EQUAL_TO) {
             value = numericTransform(unaryNumericMatcherData);
             dataType = matcherDataTypes.NUMBER;
@@ -56,13 +51,15 @@ export function matchersTransform(matchers) {
             type === matcherTypes.CONTAINS_ANY_OF_SET ||
             type === matcherTypes.CONTAINS_ALL_OF_SET ||
             type === matcherTypes.PART_OF_SET) {
-            value = setTransform(whitelistMatcherData);
+            value = whitelistTransform(whitelistMatcherData);
             dataType = matcherDataTypes.SET;
         }
-        else if (type === matcherTypes.STARTS_WITH ||
+        else if (type === matcherTypes.WHITELIST ||
+            type === matcherTypes.IN_LIST_SEMVER ||
+            type === matcherTypes.STARTS_WITH ||
             type === matcherTypes.ENDS_WITH ||
             type === matcherTypes.CONTAINS_STRING) {
-            value = setTransform(whitelistMatcherData);
+            value = whitelistTransform(whitelistMatcherData);
         }
         else if (type === matcherTypes.IN_SPLIT_TREATMENT) {
             value = dependencyMatcherData;
@@ -82,6 +79,7 @@ export function matchersTransform(matchers) {
             attribute: attribute,
             negate: negate,
             type: type,
+            name: matcherType,
             value: value,
             dataType: dataType // runtime input data type
         };

package/esm/evaluator/matchersTransform/whitelist.js

@@ -1,7 +1,6 @@
-import { _Set } from '../../utils/lang/sets';
 /**
- * Extract whitelist as a set. Used by 'WHITELIST' matcher.
+ * Extract whitelist array.
  */
 export function whitelistTransform(whitelistObject) {
-    return new _Set(whitelistObject && whitelistObject.whitelist);
+    return whitelistObject && whitelistObject.whitelist;
 }

package/esm/evaluator/parser/index.js

@@ -6,21 +6,21 @@ import { conditionContext } from '../condition';
 import { ifElseIfCombinerContext } from '../combiners/ifelseif';
 import { andCombinerContext } from '../combiners/and';
 import { thenable } from '../../utils/promise/thenable';
-import { ENGINE_MATCHER_ERROR } from '../../logger/constants';
+import { ENGINE_MATCHER_ERROR, ENGINE_MATCHER_RESULT } from '../../logger/constants';
 export function parser(log, conditions, storage) {
     var predicates = [];
-    var _loop_1 = function (i) {
+    for (var i = 0; i < conditions.length; i++) {
         var _a = conditions[i], matcherGroup = _a.matcherGroup, partitions = _a.partitions, label = _a.label, conditionType = _a.conditionType;
         // transform data structure
         var matchers = matchersTransform(matcherGroup.matchers);
         // create a set of pure functions from the matcher's dto
-        var expressions = matchers.map(function (matcherDto, index) {
+        var expressions = matchers.map(function (matcherDto) {
             var matcher;
             try {
                 matcher = matcherFactory(log, matcherDto, storage);
             }
             catch (error) {
-                log.error(ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+                log.error(ENGINE_MATCHER_ERROR, [matcherDto.name, error]);
             }
             // Evaluator function.
             return function (key, attributes, splitEvaluator) {
@@ -31,27 +31,26 @@ export function parser(log, conditions, storage) {
                         result = matcher(value, splitEvaluator);
                     }
                     catch (error) {
-                        log.error(ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+                        log.error(ENGINE_MATCHER_ERROR, [matcherDto.name, error]);
                     }
                 }
-                if (thenable(result)) { // @ts-ignore
-                    return result.then(function (res) { return Boolean(res ^ matcherDto.negate); });
-                } // @ts-ignore
-                return Boolean(result ^ matcherDto.negate);
+                function handleResult(result) {
+                    log.debug(ENGINE_MATCHER_RESULT, [matcherDto.name, result, matcherDto.value, value]); // @ts-ignore
+                    return Boolean(result ^ matcherDto.negate);
+                }
+                return thenable(result) ?
+                    result.then(handleResult) :
+                    handleResult(result);
             };
         });
         // if matcher's factory can't instantiate the matchers, the expressions array will be empty
         if (expressions.length === 0) {
             // reset any data collected during parsing
             predicates = [];
-            return "break";
+            // and break the loop
+            break;
         }
         predicates.push(conditionContext(log, andCombinerContext(log, expressions), Treatments.parse(partitions), label, conditionType));
-    };
-    for (var i = 0; i < conditions.length; i++) {
-        var state_1 = _loop_1(i);
-        if (state_1 === "break")
-            break;
     }
     // Instanciate evaluator given the set of conditions using if else if logic
     return ifElseIfCombinerContext(log, predicates);

package/esm/logger/constants.js

@@ -9,24 +9,8 @@ export var ENGINE_COMBINER_AND = 0;
 export var ENGINE_COMBINER_IFELSEIF = 1;
 export var ENGINE_COMBINER_IFELSEIF_NO_TREATMENT = 2;
 export var ENGINE_BUCKET = 3;
-export var ENGINE_MATCHER_ALL = 4;
-export var ENGINE_MATCHER_BETWEEN = 5;
-export var ENGINE_MATCHER_BOOLEAN = 6;
-export var ENGINE_MATCHER_CONTAINS_ALL = 7;
-export var ENGINE_MATCHER_CONTAINS_ANY = 8;
-export var ENGINE_MATCHER_CONTAINS_STRING = 9;
 export var ENGINE_MATCHER_DEPENDENCY = 10;
 export var ENGINE_MATCHER_DEPENDENCY_PRE = 11;
-export var ENGINE_MATCHER_EQUAL = 12;
-export var ENGINE_MATCHER_EQUAL_TO_SET = 13;
-export var ENGINE_MATCHER_ENDS_WITH = 14;
-export var ENGINE_MATCHER_GREATER = 15;
-export var ENGINE_MATCHER_LESS = 16;
-export var ENGINE_MATCHER_PART_OF = 17;
-export var ENGINE_MATCHER_SEGMENT = 18;
-export var ENGINE_MATCHER_STRING = 19;
-export var ENGINE_MATCHER_STARTS_WITH = 21;
-export var ENGINE_MATCHER_WHITELIST = 22;
 export var ENGINE_VALUE = 23;
 export var ENGINE_SANITIZE = 24;
 export var CLEANUP_REGISTERING = 25;
@@ -44,11 +28,7 @@ export var SYNC_TASK_START = 36;
 export var SYNC_TASK_EXECUTE = 37;
 export var SYNC_TASK_STOP = 38;
 export var SETTINGS_SPLITS_FILTER = 39;
-export var ENGINE_MATCHER_EQUAL_SEMVER = 40;
-export var ENGINE_MATCHER_GREATER_SEMVER = 41;
-export var ENGINE_MATCHER_LESS_SEMVER = 42;
-export var ENGINE_MATCHER_BETWEEN_SEMVER = 43;
-export var ENGINE_MATCHER_IN_LIST_SEMVER = 44;
+export var ENGINE_MATCHER_RESULT = 40;
 export var CLIENT_READY_FROM_CACHE = 100;
 export var CLIENT_READY = 101;
 export var IMPRESSION = 102;

package/esm/logger/index.js

@@ -1,5 +1,5 @@
 import { objectAssign } from '../utils/lang/objectAssign';
-import { find } from '../utils/lang';
+import { find, isObject } from '../utils/lang';
 import { _Map } from '../utils/lang/maps';
 export var LogLevels = {
     DEBUG: 'DEBUG',
@@ -24,7 +24,14 @@ export function _sprintf(format, args) {
     if (args === void 0) { args = []; }
     var i = 0;
     return format.replace(/%s/g, function () {
-        return args[i++];
+        var arg = args[i++];
+        if (isObject(arg) || Array.isArray(arg)) {
+            try {
+                arg = JSON.stringify(arg);
+            }
+            catch (e) { /* empty */ }
+        }
+        return arg;
     });
 }
 var defaultOptions = {

package/esm/logger/messages/debug.js

@@ -6,31 +6,11 @@ export var codesDebug = codesInfo.concat([
     [c.ENGINE_COMBINER_IFELSEIF, c.LOG_PREFIX_ENGINE_COMBINER + 'Treatment found: %s'],
     [c.ENGINE_COMBINER_IFELSEIF_NO_TREATMENT, c.LOG_PREFIX_ENGINE_COMBINER + 'All predicates evaluated, no treatment found.'],
     [c.ENGINE_BUCKET, c.LOG_PREFIX_ENGINE + ': using algo "murmur" bucket %s for key %s using seed %s - treatment %s'],
-    [c.ENGINE_MATCHER_ALL, c.LOG_PREFIX_ENGINE_MATCHER + '[allMatcher] is always true'],
-    [c.ENGINE_MATCHER_BETWEEN, c.LOG_PREFIX_ENGINE_MATCHER + '[betweenMatcher] is %s between %s and %s? %s'],
-    [c.ENGINE_MATCHER_BOOLEAN, c.LOG_PREFIX_ENGINE_MATCHER + '[booleanMatcher] %s === %s'],
-    [c.ENGINE_MATCHER_CONTAINS_ALL, c.LOG_PREFIX_ENGINE_MATCHER + '[containsAllMatcher] %s contains all elements of %s? %s'],
-    [c.ENGINE_MATCHER_CONTAINS_ANY, c.LOG_PREFIX_ENGINE_MATCHER + '[containsAnyMatcher] %s contains at least an element of %s? %s'],
-    [c.ENGINE_MATCHER_CONTAINS_STRING, c.LOG_PREFIX_ENGINE_MATCHER + '[containsStringMatcher] %s contains %s? %s'],
-    [c.ENGINE_MATCHER_DEPENDENCY, c.LOG_PREFIX_ENGINE_MATCHER + '[dependencyMatcher] parent feature flag "%s" evaluated to "%s" with label "%s". %s evaluated treatment is part of [%s] ? %s.'],
-    [c.ENGINE_MATCHER_DEPENDENCY_PRE, c.LOG_PREFIX_ENGINE_MATCHER + '[dependencyMatcher] will evaluate parent feature flag: "%s" with key: %s %s'],
-    [c.ENGINE_MATCHER_EQUAL, c.LOG_PREFIX_ENGINE_MATCHER + '[equalToMatcher] is %s equal to %s? %s'],
-    [c.ENGINE_MATCHER_EQUAL_TO_SET, c.LOG_PREFIX_ENGINE_MATCHER + '[equalToSetMatcher] is %s equal to set %s? %s'],
-    [c.ENGINE_MATCHER_ENDS_WITH, c.LOG_PREFIX_ENGINE_MATCHER + '[endsWithMatcher] %s ends with %s? %s'],
-    [c.ENGINE_MATCHER_GREATER, c.LOG_PREFIX_ENGINE_MATCHER + '[greaterThanEqualMatcher] is %s greater than %s? %s'],
-    [c.ENGINE_MATCHER_LESS, c.LOG_PREFIX_ENGINE_MATCHER + '[lessThanEqualMatcher] is %s less than %s? %s'],
-    [c.ENGINE_MATCHER_PART_OF, c.LOG_PREFIX_ENGINE_MATCHER + '[partOfMatcher] %s is part of %s? %s'],
-    [c.ENGINE_MATCHER_SEGMENT, c.LOG_PREFIX_ENGINE_MATCHER + '[segmentMatcher] evaluated %s / %s => %s'],
-    [c.ENGINE_MATCHER_STRING, c.LOG_PREFIX_ENGINE_MATCHER + '[stringMatcher] does %s matches with %s? %s'],
-    [c.ENGINE_MATCHER_STARTS_WITH, c.LOG_PREFIX_ENGINE_MATCHER + '[startsWithMatcher] %s starts with %s? %s'],
-    [c.ENGINE_MATCHER_WHITELIST, c.LOG_PREFIX_ENGINE_MATCHER + '[whitelistMatcher] evaluated %s in [%s] => %s'],
-    [c.ENGINE_VALUE, c.LOG_PREFIX_ENGINE_VALUE + 'Extracted attribute [%s], [%s] will be used for matching.'],
-    [c.ENGINE_SANITIZE, c.LOG_PREFIX_ENGINE + ':sanitize: Attempted to sanitize [%s] which should be of type [%s]. Sanitized and processed value => [%s]'],
-    [c.ENGINE_MATCHER_EQUAL_SEMVER, c.LOG_PREFIX_ENGINE_MATCHER + '[equalToSemverMatcher] is %s equal to %s? %s'],
-    [c.ENGINE_MATCHER_GREATER_SEMVER, c.LOG_PREFIX_ENGINE_MATCHER + '[greaterThanEqualSemverMatcher] is %s greater than %s? %s'],
-    [c.ENGINE_MATCHER_LESS_SEMVER, c.LOG_PREFIX_ENGINE_MATCHER + '[lessThanEqualSemverMatcher] is %s less than %s? %s'],
-    [c.ENGINE_MATCHER_BETWEEN_SEMVER, c.LOG_PREFIX_ENGINE_MATCHER + '[betweenSemverMatcher] is %s between %s and %s? %s'],
-    [c.ENGINE_MATCHER_IN_LIST_SEMVER, c.LOG_PREFIX_ENGINE_MATCHER + '[inListSemverMatcher] is %s in list [%s]? %s'],
+    [c.ENGINE_MATCHER_DEPENDENCY, c.LOG_PREFIX_ENGINE_MATCHER + '[IN_SPLIT_TREATMENT] parent feature flag "%s" evaluated to "%s" with label "%s". %s evaluated treatment is part of %s ? %s.'],
+    [c.ENGINE_MATCHER_DEPENDENCY_PRE, c.LOG_PREFIX_ENGINE_MATCHER + '[IN_SPLIT_TREATMENT] will evaluate parent feature flag: "%s" with key: %s %s'],
+    [c.ENGINE_VALUE, c.LOG_PREFIX_ENGINE_VALUE + 'Extracted attribute `%s`. %s will be used for matching.'],
+    [c.ENGINE_SANITIZE, c.LOG_PREFIX_ENGINE + ':sanitize: Attempted to sanitize %s which should be of type %s. Sanitized and processed value => %s'],
+    [c.ENGINE_MATCHER_RESULT, c.LOG_PREFIX_ENGINE_MATCHER + '[%s] Result: %s. Rule value: %s. Evaluation value: %s'],
     // SDK
     [c.CLEANUP_REGISTERING, c.LOG_PREFIX_CLEANUP + 'Registering cleanup handler %s'],
     [c.CLEANUP_DEREGISTERING, c.LOG_PREFIX_CLEANUP + 'Deregistering cleanup handler %s'],

package/esm/logger/messages/warn.js

@@ -3,7 +3,7 @@ import { codesError } from './error';
 export var codesWarn = codesError.concat([
     // evaluator
     [c.ENGINE_VALUE_INVALID, c.LOG_PREFIX_ENGINE_VALUE + 'Value %s doesn\'t match with expected type.'],
-    [c.ENGINE_VALUE_NO_ATTRIBUTES, c.LOG_PREFIX_ENGINE_VALUE + 'Defined attribute [%s], no attributes received.'],
+    [c.ENGINE_VALUE_NO_ATTRIBUTES, c.LOG_PREFIX_ENGINE_VALUE + 'Defined attribute `%s`. No attributes received.'],
     // synchronizer
     [c.SYNC_MYSEGMENTS_FETCH_RETRY, c.LOG_PREFIX_SYNC_MYSEGMENTS + 'Retrying download of segments #%s. Reason: %s'],
     [c.SYNC_SPLITS_FETCH_FAILS, c.LOG_PREFIX_SYNC_SPLITS + 'Error while doing fetch of feature flags. %s'],

package/esm/services/splitApi.js

@@ -1,6 +1,6 @@
 import { splitHttpClientFactory } from './splitHttpClient';
 import { objectAssign } from '../utils/lang/objectAssign';
-import { SPLITS, IMPRESSIONS, IMPRESSIONS_COUNT, EVENTS, TELEMETRY, TOKEN, SEGMENT, MY_SEGMENT } from '../utils/constants';
+import { SPLITS, IMPRESSIONS, IMPRESSIONS_COUNT, EVENTS, TELEMETRY, TOKEN, SEGMENT, MY_SEGMENT, FLAGS_SPEC } from '../utils/constants';
 import { ERROR_TOO_MANY_SETS } from '../logger/constants';
 var noCacheHeaderOptions = { headers: { 'Cache-Control': 'no-cache' } };
 function userKeyToQueryParam(userKey) {
@@ -29,16 +29,16 @@ export function splitApiFactory(settings, platform, telemetryTracker) {
             return splitHttpClient(url).then(function () { return true; }).catch(function () { return false; });
         },
         fetchAuth: function (userMatchingKeys) {
-            var url = urls.auth + "/v2/auth";
-            if (userMatchingKeys) { // accounting the possibility that `userMatchingKeys` is undefined (server-side API)
+            var url = urls.auth + "/v2/auth?s=" + FLAGS_SPEC;
+            if (userMatchingKeys) { // `userMatchingKeys` is undefined in server-side
                 var queryParams = userMatchingKeys.map(userKeyToQueryParam).join('&');
-                if (queryParams) // accounting the possibility that `userKeys` and thus `queryParams` are empty
-                    url += '?' + queryParams;
+                if (queryParams)
+                    url += '&' + queryParams;
             }
             return splitHttpClient(url, undefined, telemetryTracker.trackHttp(TOKEN));
         },
         fetchSplitChanges: function (since, noCache, till) {
-            var url = urls.sdk + "/splitChanges?since=" + since + (till ? '&till=' + till : '') + (filterQueryString || '');
+            var url = urls.sdk + "/splitChanges?s=" + FLAGS_SPEC + "&since=" + since + (till ? '&till=' + till : '') + (filterQueryString || '');
             return splitHttpClient(url, noCache ? noCacheHeaderOptions : undefined, telemetryTracker.trackHttp(SPLITS))
                 .catch(function (err) {
                 if (err.statusCode === 414)

package/esm/storages/KeyBuilder.js

@@ -1,3 +1,4 @@
+import { FLAGS_SPEC } from '../utils/constants';
 import { startsWith } from '../utils/lang';
 import { hash } from '../utils/murmur3/murmur3';
 var everythingAtTheEnd = /[^.]+$/;
@@ -62,9 +63,9 @@ var KeyBuilder = /** @class */ (function () {
 }());
 export { KeyBuilder };
 /**
- * Generates a murmur32 hash based on the authorization key and the feature flags filter query.
+ * Generates a murmur32 hash based on the authorization key, the feature flags filter query, and version of SplitChanges API.
  * The hash is in hexadecimal format (8 characters max, 32 bits).
  */
 export function getStorageHash(settings) {
-    return hash(settings.core.authorizationKey + "::" + settings.sync.__splitFiltersValidation.queryString).toString(16);
+    return hash(settings.core.authorizationKey + "::" + settings.sync.__splitFiltersValidation.queryString + "::" + FLAGS_SPEC).toString(16);
 }

package/esm/utils/constants/index.js

@@ -86,3 +86,4 @@ export var NON_REQUESTED = 1;
 export var DISABLED = 0;
 export var ENABLED = 1;
 export var PAUSED = 2;
+export var FLAGS_SPEC = '1.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@splitsoftware/splitio-commons",
-  "version": "1.13.2-rc.5",
+  "version": "1.13.2-rc.7",
   "description": "Split JavaScript SDK common components",
   "main": "cjs/index.js",
   "module": "esm/index.js",

package/src/evaluator/Engine.ts

@@ -2,7 +2,7 @@ import { get } from '../utils/lang';
 import { parser } from './parser';
 import { keyParser } from '../utils/key';
 import { thenable } from '../utils/promise/thenable';
-import * as LabelsConstants from '../utils/labels';
+import { EXCEPTION, NO_CONDITION_MATCH, SPLIT_ARCHIVED, SPLIT_KILLED } from '../utils/labels';
 import { CONTROL } from '../utils/constants';
 import { ISplit, MaybeThenable } from '../dtos/types';
 import { SplitIO } from '../types';
@@ -13,7 +13,7 @@ import { ILogger } from '../logger/types';
 function evaluationResult(result: IEvaluation | undefined, defaultTreatment: string): IEvaluationResult {
   return {
     treatment: get(result, 'treatment', defaultTreatment),
-    label: get(result, 'label', LabelsConstants.NO_CONDITION_MATCH)
+    label: get(result, 'label', NO_CONDITION_MATCH)
   };
 }
 
@@ -55,16 +55,16 @@ export class Engine {
     } catch (err) {
       return {
         treatment: CONTROL,
-        label: LabelsConstants.EXCEPTION
+        label: EXCEPTION
       };
     }
 
     if (this.isGarbage()) {
       treatment = CONTROL;
-      label = LabelsConstants.SPLIT_ARCHIVED;
+      label = SPLIT_ARCHIVED;
     } else if (killed) {
       treatment = defaultTreatment;
-      label = LabelsConstants.SPLIT_KILLED;
+      label = SPLIT_KILLED;
     } else {
       const evaluation = this.evaluator(
         parsedKey,
@@ -98,4 +98,3 @@ export class Engine {
     return this.baseInfo.changeNumber;
   }
 }
-

package/src/evaluator/combiners/ifelseif.ts

@@ -1,7 +1,7 @@
 import { findIndex } from '../../utils/lang';
 import { ILogger } from '../../logger/types';
 import { thenable } from '../../utils/promise/thenable';
-import * as LabelsConstants from '../../utils/labels';
+import { UNSUPPORTED_MATCHER_TYPE } from '../../utils/labels';
 import { CONTROL } from '../../utils/constants';
 import { SplitIO } from '../../types';
 import { IEvaluation, IEvaluator, ISplitEvaluator } from '../types';
@@ -14,7 +14,7 @@ export function ifElseIfCombinerContext(log: ILogger, predicates: IEvaluator[]):
 
     return {
       treatment: CONTROL,
-      label: LabelsConstants.UNSUPPORTED_MATCHER_TYPE
+      label: UNSUPPORTED_MATCHER_TYPE
     };
   }
 

package/src/evaluator/condition/index.ts

@@ -1,6 +1,6 @@
 import { getTreatment, shouldApplyRollout } from './engineUtils';
 import { thenable } from '../../utils/promise/thenable';
-import * as LabelsConstants from '../../utils/labels';
+import { NOT_IN_SPLIT } from '../../utils/labels';
 import { MaybeThenable } from '../../dtos/types';
 import { IEvaluation, IEvaluator, ISplitEvaluator } from '../types';
 import { SplitIO } from '../../types';
@@ -30,7 +30,7 @@ export function conditionContext(log: ILogger, matcherEvaluator: (...args: any)
     if (conditionType === 'ROLLOUT' && !shouldApplyRollout(trafficAllocation as number, (key as SplitIO.SplitKeyObject).bucketingKey as string, trafficAllocationSeed as number)) {
       return {
         treatment: undefined, // treatment value is assigned later
-        label: LabelsConstants.NOT_IN_SPLIT
+        label: NOT_IN_SPLIT
       };
     }
 

package/src/evaluator/index.ts

@@ -1,6 +1,6 @@
 import { Engine } from './Engine';
 import { thenable } from '../utils/promise/thenable';
-import * as LabelsConstants from '../utils/labels';
+import { EXCEPTION, SPLIT_NOT_FOUND } from '../utils/labels';
 import { CONTROL } from '../utils/constants';
 import { ISplit, MaybeThenable } from '../dtos/types';
 import { IStorageAsync, IStorageSync } from '../storages/types';
@@ -12,7 +12,7 @@ import { WARN_FLAGSET_WITHOUT_FLAGS } from '../logger/constants';
 
 const treatmentException = {
   treatment: CONTROL,
-  label: LabelsConstants.EXCEPTION,
+  label: EXCEPTION,
   config: null
 };
 
@@ -143,7 +143,7 @@ function getEvaluation(
 ): MaybeThenable<IEvaluationResult> {
   let evaluation: MaybeThenable<IEvaluationResult> = {
     treatment: CONTROL,
-    label: LabelsConstants.SPLIT_NOT_FOUND,
+    label: SPLIT_NOT_FOUND,
     config: null
   };
 
@@ -151,7 +151,7 @@ function getEvaluation(
     const split = Engine.parse(log, splitJSON, storage);
     evaluation = split.getTreatment(key, attributes, evaluateFeature);
 
-    // If the storage is async and the evaluated split uses segment, evaluation is thenable
+    // If the storage is async and the evaluated flag uses segments or dependencies, evaluation is thenable
     if (thenable(evaluation)) {
       return evaluation.then(result => {
         result.changeNumber = split.getChangeNumber();

package/src/evaluator/matchers/all.ts

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

package/src/evaluator/matchers/between.ts

@@ -1,13 +1,9 @@
 import { IBetweenMatcherData } from '../../dtos/types';
-import { ENGINE_MATCHER_BETWEEN } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 
-export function betweenMatcherContext(log: ILogger, ruleVO: IBetweenMatcherData) {
-  return function betweenMatcher(runtimeAttr: number): boolean {
-
-    let isBetween = runtimeAttr >= ruleVO.start && runtimeAttr <= ruleVO.end;
+export function betweenMatcherContext(ruleVO: IBetweenMatcherData) {
 
-    log.debug(ENGINE_MATCHER_BETWEEN, [runtimeAttr, ruleVO.start, ruleVO.end, isBetween]);
+  return function betweenMatcher(runtimeAttr: number): boolean {
+    const isBetween = runtimeAttr >= ruleVO.start && runtimeAttr <= ruleVO.end;
 
     return isBetween;
   };

package/src/evaluator/matchers/boolean.ts

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

package/src/evaluator/matchers/cont_all.ts

@@ -1,8 +1,6 @@
-import { ENGINE_MATCHER_CONTAINS_ALL } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { findIndex } from '../../utils/lang';
 
-export function containsAllSetMatcherContext(log: ILogger, ruleAttr: string[]) {
+export function containsAllSetMatcherContext(ruleAttr: string[]) {
   return function containsAllMatcher(runtimeAttr: string[]): boolean {
     let containsAll = true;
 
@@ -15,8 +13,6 @@ export function containsAllSetMatcherContext(log: ILogger, ruleAttr: string[]) {
       }
     }
 
-    log.debug(ENGINE_MATCHER_CONTAINS_ALL, [runtimeAttr, ruleAttr, containsAll]);
-
     return containsAll;
   };
 }

package/src/evaluator/matchers/cont_any.ts

@@ -1,8 +1,6 @@
-import { ENGINE_MATCHER_CONTAINS_ANY } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { findIndex } from '../../utils/lang';
 
-export function containsAnySetMatcherContext(log: ILogger, ruleAttr: string[]) {
+export function containsAnySetMatcherContext(ruleAttr: string[]) {
   return function containsAnyMatcher(runtimeAttr: string[]): boolean {
     let containsAny = false;
 
@@ -10,8 +8,6 @@ export function containsAnySetMatcherContext(log: ILogger, ruleAttr: string[]) {
       if (findIndex(runtimeAttr, e => e === ruleAttr[i]) >= 0) containsAny = true;
     }
 
-    log.debug(ENGINE_MATCHER_CONTAINS_ANY, [runtimeAttr, ruleAttr, containsAny]);
-
     return containsAny;
   };
 }

package/src/evaluator/matchers/cont_str.ts

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

package/src/evaluator/matchers/dependency.ts

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

package/src/evaluator/matchers/eq.ts

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

package/src/evaluator/matchers/eq_set.ts

@@ -1,8 +1,6 @@
-import { ENGINE_MATCHER_EQUAL_TO_SET } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { findIndex } from '../../utils/lang';
 
-export function equalToSetMatcherContext(log: ILogger, ruleAttr: string[]) {
+export function equalToSetMatcherContext(ruleAttr: string[]) {
   return function equalToSetMatcher(runtimeAttr: string[]): boolean {
     // Length being the same is the first condition.
     let isEqual = runtimeAttr.length === ruleAttr.length;
@@ -12,8 +10,6 @@ export function equalToSetMatcherContext(log: ILogger, ruleAttr: string[]) {
       if (findIndex(ruleAttr, e => e === runtimeAttr[i]) < 0) isEqual = false;
     }
 
-    log.debug(ENGINE_MATCHER_EQUAL_TO_SET, [runtimeAttr, ruleAttr, isEqual]);
-
     return isEqual;
   };
 }

package/src/evaluator/matchers/ew.ts

@@ -1,12 +1,8 @@
-import { ENGINE_MATCHER_ENDS_WITH } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { endsWith } from '../../utils/lang';
 
-export function endsWithMatcherContext(log: ILogger, ruleAttr: string[]) {
+export function endsWithMatcherContext(ruleAttr: string[]) {
   return function endsWithMatcher(runtimeAttr: string): boolean {
-    let strEndsWith = ruleAttr.some(e => endsWith(runtimeAttr, e));
-
-    log.debug(ENGINE_MATCHER_ENDS_WITH, [runtimeAttr, ruleAttr, strEndsWith]);
+    const strEndsWith = ruleAttr.some(e => endsWith(runtimeAttr, e));
 
     return strEndsWith;
   };

package/src/evaluator/matchers/gte.ts

@@ -1,11 +1,7 @@
-import { ENGINE_MATCHER_GREATER } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
+export function greaterThanEqualMatcherContext(ruleAttr: number) {
 
-export function greaterThanEqualMatcherContext(log: ILogger, ruleAttr: number) {
   return function greaterThanEqualMatcher(runtimeAttr: number): boolean {
-    let isGreaterThanEqual = runtimeAttr >= ruleAttr;
-
-    log.debug(ENGINE_MATCHER_GREATER, [runtimeAttr, ruleAttr, isGreaterThanEqual]);
+    const isGreaterThanEqual = runtimeAttr >= ruleAttr;
 
     return isGreaterThanEqual;
   };

package/src/evaluator/matchers/index.ts

@@ -61,6 +61,6 @@ export function matcherFactory(log: ILogger, matcherDto: IMatcherDto, storage?:
 
   let matcherFn;
   // @ts-ignore
-  if (matchers[type]) matcherFn = matchers[type](log, value, storage); // There is no index-out-of-bound exception in JavaScript
+  if (matchers[type]) matcherFn = matchers[type](value, storage, log); // There is no index-out-of-bound exception in JavaScript
   return matcherFn;
 }

package/src/evaluator/matchers/lte.ts

@@ -1,11 +1,7 @@
-import { ENGINE_MATCHER_LESS } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
+export function lessThanEqualMatcherContext(ruleAttr: number) {
 
-export function lessThanEqualMatcherContext(log: ILogger, ruleAttr: number) {
   return function lessThanEqualMatcher(runtimeAttr: number): boolean {
-    let isLessThanEqual = runtimeAttr <= ruleAttr;
-
-    log.debug(ENGINE_MATCHER_LESS, [runtimeAttr, ruleAttr, isLessThanEqual]);
+    const isLessThanEqual = runtimeAttr <= ruleAttr;
 
     return isLessThanEqual;
   };

package/src/evaluator/matchers/part_of.ts

@@ -1,8 +1,6 @@
 import { findIndex } from '../../utils/lang';
-import { ILogger } from '../../logger/types';
-import { ENGINE_MATCHER_PART_OF } from '../../logger/constants';
 
-export function partOfSetMatcherContext(log: ILogger, ruleAttr: string[]) {
+export function partOfSetMatcherContext(ruleAttr: string[]) {
   return function partOfMatcher(runtimeAttr: string[]): boolean {
     // To be part of the length should be minor or equal.
     let isPartOf = runtimeAttr.length <= ruleAttr.length;
@@ -12,8 +10,6 @@ export function partOfSetMatcherContext(log: ILogger, ruleAttr: string[]) {
       if (findIndex(ruleAttr, e => e === runtimeAttr[i]) < 0) isPartOf = false;
     }
 
-    log.debug(ENGINE_MATCHER_PART_OF, [runtimeAttr, ruleAttr, isPartOf]);
-
     return isPartOf;
   };
 }