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

package/src/evaluator/matchers/segment.ts

@@ -1,25 +1,18 @@
 import { MaybeThenable } from '../../dtos/types';
 import { ISegmentsCacheBase } from '../../storages/types';
-import { ILogger } from '../../logger/types';
 import { thenable } from '../../utils/promise/thenable';
-import { ENGINE_MATCHER_SEGMENT } from '../../logger/constants';
 
-export function segmentMatcherContext(log: ILogger, segmentName: string, storage: { segments: ISegmentsCacheBase }) {
+export function segmentMatcherContext(segmentName: string, storage: { segments: ISegmentsCacheBase }) {
 
   return function segmentMatcher(key: string): MaybeThenable<boolean> {
     const isInSegment = storage.segments.isInSegment(segmentName, key);
 
     if (thenable(isInSegment)) {
       isInSegment.then(result => {
-        log.debug(ENGINE_MATCHER_SEGMENT, [segmentName, key, isInSegment]);
-
         return result;
       });
-    } else {
-      log.debug(ENGINE_MATCHER_SEGMENT, [segmentName, key, isInSegment]);
     }
 
     return isInSegment;
   };
-
 }

package/src/evaluator/matchers/semver_between.ts

@@ -1,9 +1,7 @@
 import { IBetweenStringMatcherData } from '../../dtos/types';
-import { ENGINE_MATCHER_BETWEEN_SEMVER } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
-export function betweenSemverMatcherContext(log: ILogger, ruleAttr: IBetweenStringMatcherData) {
+export function betweenSemverMatcherContext(ruleAttr: IBetweenStringMatcherData) {
   const startSemver = new Semver(ruleAttr.start);
   const endSemver = new Semver(ruleAttr.end);
 
@@ -12,8 +10,6 @@ export function betweenSemverMatcherContext(log: ILogger, ruleAttr: IBetweenStri
 
     const isBetween = startSemver.compare(runtimeSemver) <= 0 && endSemver.compare(runtimeSemver) >= 0;
 
-    log.debug(ENGINE_MATCHER_BETWEEN_SEMVER, [runtimeAttr, ruleAttr.start, ruleAttr.end, isBetween]);
-
     return isBetween;
   };
 }

package/src/evaluator/matchers/semver_eq.ts

@@ -1,8 +1,6 @@
-import { ENGINE_MATCHER_EQUAL_SEMVER } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
-export function equalToSemverMatcherContext(log: ILogger, ruleAttr: string) {
+export function equalToSemverMatcherContext(ruleAttr: string) {
   const ruleSemver = new Semver(ruleAttr);
 
   return function equalToSemverMatcher(runtimeAttr: string): boolean {
@@ -10,8 +8,6 @@ export function equalToSemverMatcherContext(log: ILogger, ruleAttr: string) {
 
     const isEqual = ruleSemver.version === runtimeSemver.version;
 
-    log.debug(ENGINE_MATCHER_EQUAL_SEMVER, [runtimeAttr, ruleAttr, isEqual]);
-
     return isEqual;
   };
 }

package/src/evaluator/matchers/semver_gte.ts

@@ -1,8 +1,6 @@
-import { ENGINE_MATCHER_GREATER_SEMVER } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
-export function greaterThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: string) {
+export function greaterThanEqualToSemverMatcherContext(ruleAttr: string) {
   const ruleSemver = new Semver(ruleAttr);
 
   return function greaterThanEqualToSemverMatcher(runtimeAttr: string): boolean {
@@ -10,8 +8,6 @@ export function greaterThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: s
 
     const isGreaterThanEqual = runtimeSemver.compare(ruleSemver) >= 0;
 
-    log.debug(ENGINE_MATCHER_GREATER_SEMVER, [runtimeAttr, ruleAttr, isGreaterThanEqual]);
-
     return isGreaterThanEqual;
   };
 }

package/src/evaluator/matchers/semver_inlist.ts

@@ -1,21 +1,17 @@
-import { setToArray, ISet, _Set } from '../../utils/lang/sets';
-import { ILogger } from '../../logger/types';
+import { _Set } from '../../utils/lang/sets';
 import { Semver } from '../../utils/Semver';
-import { ENGINE_MATCHER_IN_LIST_SEMVER } from '../../logger/constants';
 
-export function inListSemverMatcherContext(log: ILogger, ruleAttr: ISet<string>) {
-  // @TODO move eventually to `matchersTransform` and validate for all matchers
-  if (!ruleAttr || ruleAttr.size === 0) throw new Error('whitelistMatcherData is required for IN_LIST_SEMVER matcher type');
+export function inListSemverMatcherContext(ruleAttr: string[]) {
+  // @TODO ruleAttr validation should be done at the `parser` or `matchersTransform` level to reuse for all matchers
+  if (!ruleAttr || ruleAttr.length === 0) throw new Error('whitelistMatcherData is required for IN_LIST_SEMVER matcher type');
 
-  const listOfSemvers = new _Set(setToArray(ruleAttr).map((version) => new Semver(version).version));
+  const listOfSemvers = new _Set(ruleAttr.map((version) => new Semver(version).version));
 
   return function inListSemverMatcher(runtimeAttr: string): boolean {
     const runtimeSemver = new Semver(runtimeAttr).version;
 
     const isInList = listOfSemvers.has(runtimeSemver);
 
-    log.debug(ENGINE_MATCHER_IN_LIST_SEMVER, [runtimeAttr, setToArray(ruleAttr).join(','), isInList]);
-
     return isInList;
   };
 }

package/src/evaluator/matchers/semver_lte.ts

@@ -1,8 +1,6 @@
-import { ENGINE_MATCHER_LESS_SEMVER } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
-export function lessThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: string) {
+export function lessThanEqualToSemverMatcherContext(ruleAttr: string) {
   const ruleSemver = new Semver(ruleAttr);
 
   return function lessThanEqualToSemverMatcher(runtimeAttr: string): boolean {
@@ -10,8 +8,6 @@ export function lessThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: stri
 
     const isLessThanEqual = runtimeSemver.compare(ruleSemver) <= 0;
 
-    log.debug(ENGINE_MATCHER_LESS_SEMVER, [runtimeAttr, ruleAttr, isLessThanEqual]);
-
     return isLessThanEqual;
   };
 }

package/src/evaluator/matchers/string.ts

@@ -1,14 +1,9 @@
-import { ENGINE_MATCHER_STRING } from '../../logger/constants';
-import { ILogger } from '../../logger/types';
-
-export function stringMatcherContext(log: ILogger, ruleAttr: string) {
+export function stringMatcherContext(ruleAttr: string) {
   const regex = new RegExp(ruleAttr);
 
   return function stringMatcher(runtimeAttr: string): boolean {
     const regexMatches = regex.test(runtimeAttr);
 
-    log.debug(ENGINE_MATCHER_STRING, [runtimeAttr, ruleAttr, regexMatches ? 'yes' : 'no']);
-
     return regexMatches;
   };
 }

package/src/evaluator/matchers/sw.ts

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

package/src/evaluator/matchers/whitelist.ts

@@ -1,12 +1,10 @@
-import { setToArray, ISet } from '../../utils/lang/sets';
-import { ILogger } from '../../logger/types';
-import { ENGINE_MATCHER_WHITELIST } from '../../logger/constants';
+import { _Set } from '../../utils/lang/sets';
 
-export function whitelistMatcherContext(log: ILogger, ruleAttr: ISet<string>) {
-  return function whitelistMatcher(runtimeAttr: string): boolean {
-    let isInWhitelist = ruleAttr.has(runtimeAttr);
+export function whitelistMatcherContext(ruleAttr: string[]) {
+  const whitelistSet = new _Set(ruleAttr);
 
-    log.debug(ENGINE_MATCHER_WHITELIST, [runtimeAttr, setToArray(ruleAttr).join(','), isInWhitelist]);
+  return function whitelistMatcher(runtimeAttr: string): boolean {
+    const isInWhitelist = whitelistSet.has(runtimeAttr);
 
     return isInWhitelist;
   };

package/src/evaluator/matchersTransform/index.ts

@@ -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';
 import { IBetweenMatcherData, IInSegmentMatcherData, ISplitMatcher, IUnaryNumericMatcherData } from '../../dtos/types';
@@ -36,11 +35,6 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
 
     if (type === matcherTypes.IN_SEGMENT) {
       value = segmentTransform(userDefinedSegmentMatcherData as IInSegmentMatcherData);
-    } else if (
-      type === matcherTypes.WHITELIST ||
-      type === matcherTypes.IN_LIST_SEMVER
-    ) {
-      value = whitelistTransform(whitelistMatcherData);
     } else if (type === matcherTypes.EQUAL_TO) {
       value = numericTransform(unaryNumericMatcherData as IUnaryNumericMatcherData);
       dataType = matcherDataTypes.NUMBER;
@@ -75,14 +69,16 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
       type === matcherTypes.CONTAINS_ALL_OF_SET ||
       type === matcherTypes.PART_OF_SET
     ) {
-      value = setTransform(whitelistMatcherData);
+      value = whitelistTransform(whitelistMatcherData);
       dataType = matcherDataTypes.SET;
     } 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;
       dataType = matcherDataTypes.NOT_SPECIFIED;
@@ -102,6 +98,7 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
       attribute,        // attribute over we should do the matching, undefined means 'use the key'
       negate,           // should we negate the result?
       type,             // which kind of matcher we should evaluate
+      name: matcherType,// name of the matcher for logging purposes
       value,            // metadata used for the matching
       dataType          // runtime input data type
     };

package/src/evaluator/matchersTransform/whitelist.ts

@@ -1,9 +1,8 @@
 import { ISplitMatcher } from '../../dtos/types';
-import { _Set } from '../../utils/lang/sets';
 
 /**
- * Extract whitelist as a set. Used by 'WHITELIST' matcher.
+ * Extract whitelist array.
  */
 export function whitelistTransform(whitelistObject: ISplitMatcher['whitelistMatcherData']) {
-  return new _Set(whitelistObject && whitelistObject.whitelist);
+  return whitelistObject && whitelistObject.whitelist;
 }

package/src/evaluator/parser/index.ts

@@ -11,7 +11,7 @@ import { ISplitCondition, MaybeThenable } from '../../dtos/types';
 import { IStorageAsync, IStorageSync } from '../../storages/types';
 import { SplitIO } from '../../types';
 import { ILogger } from '../../logger/types';
-import { ENGINE_MATCHER_ERROR } from '../../logger/constants';
+import { ENGINE_MATCHER_ERROR, ENGINE_MATCHER_RESULT } from '../../logger/constants';
 
 export function parser(log: ILogger, conditions: ISplitCondition[], storage: IStorageSync | IStorageAsync): IEvaluator {
   let predicates = [];
@@ -28,12 +28,12 @@ export function parser(log: ILogger, conditions: ISplitCondition[], storage: ISt
     const matchers = matchersTransform(matcherGroup.matchers);
 
     // create a set of pure functions from the matcher's dto
-    const expressions = matchers.map((matcherDto: IMatcherDto, index: number) => {
+    const expressions = matchers.map((matcherDto: IMatcherDto) => {
       let matcher: ReturnType<typeof matcherFactory>;
       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.
@@ -45,14 +45,18 @@ export function parser(log: ILogger, conditions: ISplitCondition[], storage: ISt
           try {
             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(res => Boolean(res ^ matcherDto.negate));
-        } // @ts-ignore
-        return Boolean(result ^ matcherDto.negate);
+        function handleResult(result: boolean) {
+          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);
       };
     });
 

package/src/evaluator/types.ts

@@ -1,6 +1,5 @@
 import { IBetweenMatcherData, IBetweenStringMatcherData, IDependencyMatcherData, MaybeThenable } from '../dtos/types';
 import { IStorageAsync, IStorageSync } from '../storages/types';
-import { ISet } from '../utils/lang/sets';
 import { SplitIO } from '../types';
 import { ILogger } from '../logger/types';
 
@@ -11,7 +10,8 @@ export interface IDependencyMatcherValue {
 
 export interface IMatcherDto {
   type: number
-  value?: string | number | boolean | string[] | IDependencyMatcherData | ISet<string> | IBetweenMatcherData | IBetweenStringMatcherData | null
+  name: string
+  value?: string | number | boolean | string[] | IDependencyMatcherData | IBetweenMatcherData | IBetweenStringMatcherData | null
 
   attribute: string | null
   negate: boolean

package/src/logger/constants.ts

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

package/src/logger/index.ts

@@ -1,6 +1,6 @@
 import { objectAssign } from '../utils/lang/objectAssign';
 import { ILoggerOptions, ILogger } from './types';
-import { find } from '../utils/lang';
+import { find, isObject } from '../utils/lang';
 import { LogLevel } from '../types';
 import { IMap, _Map } from '../utils/lang/maps';
 
@@ -28,7 +28,13 @@ export function isLogLevelString(str: string): str is LogLevel {
 export function _sprintf(format: string = '', args: any[] = []): string {
   let i = 0;
   return format.replace(/%s/g, function () {
-    return args[i++];
+    let arg = args[i++];
+    if (isObject(arg) || Array.isArray(arg)) {
+      try {
+        arg = JSON.stringify(arg);
+      } catch (e) { /* empty */ }
+    }
+    return arg;
   });
 }
 

package/src/logger/messages/debug.ts

@@ -7,31 +7,11 @@ export const codesDebug: [number, string][] = 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/src/logger/messages/warn.ts

@@ -4,7 +4,7 @@ import { codesError } from './error';
 export const codesWarn: [number, string][] = 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/src/services/splitApi.ts

@@ -4,7 +4,7 @@ import { splitHttpClientFactory } from './splitHttpClient';
 import { ISplitApi } from './types';
 import { objectAssign } from '../utils/lang/objectAssign';
 import { ITelemetryTracker } from '../trackers/types';
-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';
 
 const noCacheHeaderOptions = { headers: { 'Cache-Control': 'no-cache' } };
@@ -44,17 +44,16 @@ export function splitApiFactory(
     },
 
     fetchAuth(userMatchingKeys?: string[]) {
-      let url = `${urls.auth}/v2/auth`;
-      if (userMatchingKeys) { // accounting the possibility that `userMatchingKeys` is undefined (server-side API)
+      let url = `${urls.auth}/v2/auth?s=${FLAGS_SPEC}`;
+      if (userMatchingKeys) { // `userMatchingKeys` is undefined in server-side
         const 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(since: number, noCache?: boolean, till?: number) {
-      const url = `${urls.sdk}/splitChanges?since=${since}${till ? '&till=' + till : ''}${filterQueryString || ''}`;
+      const url = `${urls.sdk}/splitChanges?s=${FLAGS_SPEC}&since=${since}${till ? '&till=' + till : ''}${filterQueryString || ''}`;
       return splitHttpClient(url, noCache ? noCacheHeaderOptions : undefined, telemetryTracker.trackHttp(SPLITS))
         .catch((err) => {
           if (err.statusCode === 414) settings.log.error(ERROR_TOO_MANY_SETS);

package/src/storages/KeyBuilder.ts

@@ -1,4 +1,5 @@
 import { ISettings } from '../types';
+import { FLAGS_SPEC } from '../utils/constants';
 import { startsWith } from '../utils/lang';
 import { hash } from '../utils/murmur3/murmur3';
 
@@ -81,9 +82,9 @@ export class 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: ISettings) {
-  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/src/utils/constants/index.ts

@@ -104,3 +104,5 @@ export const NON_REQUESTED = 1;
 export const DISABLED = 0;
 export const ENABLED = 1;
 export const PAUSED = 2;
+
+export const FLAGS_SPEC = '1.1';

package/types/evaluator/matchers/all.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function allMatcherContext(log: ILogger): (runtimeAttr: string) => boolean;
+export declare function allMatcherContext(): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/between.d.ts

@@ -1,3 +1,2 @@
 import { IBetweenMatcherData } from '../../dtos/types';
-import { ILogger } from '../../logger/types';
-export declare function betweenMatcherContext(log: ILogger, ruleVO: IBetweenMatcherData): (runtimeAttr: number) => boolean;
+export declare function betweenMatcherContext(ruleVO: IBetweenMatcherData): (runtimeAttr: number) => boolean;

package/types/evaluator/matchers/boolean.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function booleanMatcherContext(log: ILogger, ruleAttr: boolean): (runtimeAttr: boolean) => boolean;
+export declare function booleanMatcherContext(ruleAttr: boolean): (runtimeAttr: boolean) => boolean;

package/types/evaluator/matchers/cont_all.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function containsAllSetMatcherContext(log: ILogger, ruleAttr: string[]): (runtimeAttr: string[]) => boolean;
+export declare function containsAllSetMatcherContext(ruleAttr: string[]): (runtimeAttr: string[]) => boolean;

package/types/evaluator/matchers/cont_any.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function containsAnySetMatcherContext(log: ILogger, ruleAttr: string[]): (runtimeAttr: string[]) => boolean;
+export declare function containsAnySetMatcherContext(ruleAttr: string[]): (runtimeAttr: string[]) => boolean;

package/types/evaluator/matchers/cont_str.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function containsStringMatcherContext(log: ILogger, ruleAttr: string[]): (runtimeAttr: string) => boolean;
+export declare function containsStringMatcherContext(ruleAttr: string[]): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/dependency.d.ts

@@ -2,4 +2,4 @@ import { IDependencyMatcherData, MaybeThenable } from '../../dtos/types';
 import { IStorageAsync, IStorageSync } from '../../storages/types';
 import { ILogger } from '../../logger/types';
 import { IDependencyMatcherValue, ISplitEvaluator } from '../types';
-export declare function dependencyMatcherContext(log: ILogger, { split, treatments }: IDependencyMatcherData, storage: IStorageSync | IStorageAsync): ({ key, attributes }: IDependencyMatcherValue, splitEvaluator: ISplitEvaluator) => MaybeThenable<boolean>;
+export declare function dependencyMatcherContext({ split, treatments }: IDependencyMatcherData, storage: IStorageSync | IStorageAsync, log: ILogger): ({ key, attributes }: IDependencyMatcherValue, splitEvaluator: ISplitEvaluator) => MaybeThenable<boolean>;

package/types/evaluator/matchers/eq.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function equalToMatcherContext(log: ILogger, ruleAttr: number): (runtimeAttr: number) => boolean;
+export declare function equalToMatcherContext(ruleAttr: number): (runtimeAttr: number) => boolean;

package/types/evaluator/matchers/eq_set.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function equalToSetMatcherContext(log: ILogger, ruleAttr: string[]): (runtimeAttr: string[]) => boolean;
+export declare function equalToSetMatcherContext(ruleAttr: string[]): (runtimeAttr: string[]) => boolean;

package/types/evaluator/matchers/ew.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function endsWithMatcherContext(log: ILogger, ruleAttr: string[]): (runtimeAttr: string) => boolean;
+export declare function endsWithMatcherContext(ruleAttr: string[]): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/gte.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function greaterThanEqualMatcherContext(log: ILogger, ruleAttr: number): (runtimeAttr: number) => boolean;
+export declare function greaterThanEqualMatcherContext(ruleAttr: number): (runtimeAttr: number) => boolean;

package/types/evaluator/matchers/lte.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function lessThanEqualMatcherContext(log: ILogger, ruleAttr: number): (runtimeAttr: number) => boolean;
+export declare function lessThanEqualMatcherContext(ruleAttr: number): (runtimeAttr: number) => boolean;

package/types/evaluator/matchers/part_of.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function partOfSetMatcherContext(log: ILogger, ruleAttr: string[]): (runtimeAttr: string[]) => boolean;
+export declare function partOfSetMatcherContext(ruleAttr: string[]): (runtimeAttr: string[]) => boolean;

package/types/evaluator/matchers/segment.d.ts

@@ -1,6 +1,5 @@
 import { MaybeThenable } from '../../dtos/types';
 import { ISegmentsCacheBase } from '../../storages/types';
-import { ILogger } from '../../logger/types';
-export declare function segmentMatcherContext(log: ILogger, segmentName: string, storage: {
+export declare function segmentMatcherContext(segmentName: string, storage: {
     segments: ISegmentsCacheBase;
 }): (key: string) => MaybeThenable<boolean>;

package/types/evaluator/matchers/semver_between.d.ts

@@ -1,3 +1,2 @@
 import { IBetweenStringMatcherData } from '../../dtos/types';
-import { ILogger } from '../../logger/types';
-export declare function betweenSemverMatcherContext(log: ILogger, ruleAttr: IBetweenStringMatcherData): (runtimeAttr: string) => boolean;
+export declare function betweenSemverMatcherContext(ruleAttr: IBetweenStringMatcherData): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/semver_eq.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function equalToSemverMatcherContext(log: ILogger, ruleAttr: string): (runtimeAttr: string) => boolean;
+export declare function equalToSemverMatcherContext(ruleAttr: string): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/semver_gte.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function greaterThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: string): (runtimeAttr: string) => boolean;
+export declare function greaterThanEqualToSemverMatcherContext(ruleAttr: string): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/semver_inlist.d.ts

@@ -1,3 +1 @@
-import { ISet } from '../../utils/lang/sets';
-import { ILogger } from '../../logger/types';
-export declare function inListSemverMatcherContext(log: ILogger, ruleAttr: ISet<string>): (runtimeAttr: string) => boolean;
+export declare function inListSemverMatcherContext(ruleAttr: string[]): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/semver_lte.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function lessThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: string): (runtimeAttr: string) => boolean;
+export declare function lessThanEqualToSemverMatcherContext(ruleAttr: string): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/string.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function stringMatcherContext(log: ILogger, ruleAttr: string): (runtimeAttr: string) => boolean;
+export declare function stringMatcherContext(ruleAttr: string): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/sw.d.ts

@@ -1,2 +1 @@
-import { ILogger } from '../../logger/types';
-export declare function startsWithMatcherContext(log: ILogger, ruleAttr: string[]): (runtimeAttr: string) => boolean;
+export declare function startsWithMatcherContext(ruleAttr: string[]): (runtimeAttr: string) => boolean;

package/types/evaluator/matchers/whitelist.d.ts

@@ -1,3 +1 @@
-import { ISet } from '../../utils/lang/sets';
-import { ILogger } from '../../logger/types';
-export declare function whitelistMatcherContext(log: ILogger, ruleAttr: ISet<string>): (runtimeAttr: string) => boolean;
+export declare function whitelistMatcherContext(ruleAttr: string[]): (runtimeAttr: string) => boolean;