@splitsoftware/splitio-commons 1.13.2-rc.1 → 1.13.2-rc.11

package/src/evaluator/matchers/whitelist.ts

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

package/src/evaluator/matchersTransform/index.ts

@@ -2,10 +2,9 @@ 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, IWhitelistMatcherData } from '../../dtos/types';
+import { IBetweenMatcherData, IInSegmentMatcherData, ISplitMatcher, IUnaryNumericMatcherData } from '../../dtos/types';
 import { IMatcherDto } from '../types';
 
 /**
@@ -15,16 +14,17 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
 
   let parsedMatchers = matchers.map(matcher => {
     let {
-      matcherType                                   /* string */,
-      negate                                        /* boolean */,
-      keySelector                                   /* keySelectorObject */,
-      userDefinedSegmentMatcherData: segmentObject  /* segmentObject */,
-      whitelistMatcherData: whitelistObject         /* whiteListObject, provided by 'WHITELIST', set and string matchers */,
-      unaryNumericMatcherData: unaryNumericObject   /* unaryNumericObject */,
-      betweenMatcherData: betweenObject             /* betweenObject */,
-      dependencyMatcherData: dependencyObject       /* dependencyObject */,
+      matcherType,
+      negate,
+      keySelector,
+      userDefinedSegmentMatcherData,
+      whitelistMatcherData, /* whitelistObject, provided by 'WHITELIST', 'IN_LIST_SEMVER', set and string matchers */
+      unaryNumericMatcherData,
+      betweenMatcherData,
+      dependencyMatcherData,
       booleanMatcherData,
-      stringMatcherData
+      stringMatcherData,
+      betweenStringMatcherData
     } = matcher;
 
     let attribute = keySelector && keySelector.attribute;
@@ -34,28 +34,26 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
     let value = undefined;
 
     if (type === matcherTypes.IN_SEGMENT) {
-      value = segmentTransform(segmentObject as IInSegmentMatcherData);
-    } else if (type === matcherTypes.WHITELIST) {
-      value = whitelistTransform(whitelistObject as IWhitelistMatcherData);
+      value = segmentTransform(userDefinedSegmentMatcherData as IInSegmentMatcherData);
     } else if (type === matcherTypes.EQUAL_TO) {
-      value = numericTransform(unaryNumericObject as IUnaryNumericMatcherData);
+      value = numericTransform(unaryNumericMatcherData as IUnaryNumericMatcherData);
       dataType = matcherDataTypes.NUMBER;
 
-      if ((unaryNumericObject as IUnaryNumericMatcherData).dataType === 'DATETIME') {
+      if ((unaryNumericMatcherData as IUnaryNumericMatcherData).dataType === 'DATETIME') {
         value = zeroSinceHH(value);
         dataType = matcherDataTypes.DATETIME;
       }
     } else if (type === matcherTypes.GREATER_THAN_OR_EQUAL_TO ||
       type === matcherTypes.LESS_THAN_OR_EQUAL_TO) {
-      value = numericTransform(unaryNumericObject as IUnaryNumericMatcherData);
+      value = numericTransform(unaryNumericMatcherData as IUnaryNumericMatcherData);
       dataType = matcherDataTypes.NUMBER;
 
-      if ((unaryNumericObject as IUnaryNumericMatcherData).dataType === 'DATETIME') {
+      if ((unaryNumericMatcherData as IUnaryNumericMatcherData).dataType === 'DATETIME') {
         value = zeroSinceSS(value);
         dataType = matcherDataTypes.DATETIME;
       }
     } else if (type === matcherTypes.BETWEEN) {
-      value = betweenObject as IBetweenMatcherData;
+      value = betweenMatcherData as IBetweenMatcherData;
       dataType = matcherDataTypes.NUMBER;
 
       if (value.dataType === 'DATETIME') {
@@ -63,27 +61,36 @@ export function matchersTransform(matchers: ISplitMatcher[]): IMatcherDto[] {
         value.end = zeroSinceSS(value.end);
         dataType = matcherDataTypes.DATETIME;
       }
+    } else if (type === matcherTypes.BETWEEN_SEMVER) {
+      value = betweenStringMatcherData;
     } else if (
       type === matcherTypes.EQUAL_TO_SET ||
       type === matcherTypes.CONTAINS_ANY_OF_SET ||
       type === matcherTypes.CONTAINS_ALL_OF_SET ||
       type === matcherTypes.PART_OF_SET
     ) {
-      value = setTransform(whitelistObject as IWhitelistMatcherData);
+      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(whitelistObject as IWhitelistMatcherData);
+      value = whitelistTransform(whitelistMatcherData);
     } else if (type === matcherTypes.IN_SPLIT_TREATMENT) {
-      value = dependencyObject;
+      value = dependencyMatcherData;
       dataType = matcherDataTypes.NOT_SPECIFIED;
     } else if (type === matcherTypes.EQUAL_TO_BOOLEAN) {
       dataType = matcherDataTypes.BOOLEAN;
       value = booleanMatcherData;
-    } else if (type === matcherTypes.MATCHES_STRING) {
+    } else if (
+      type === matcherTypes.MATCHES_STRING ||
+      type === matcherTypes.EQUAL_TO_SEMVER ||
+      type === matcherTypes.GREATER_THAN_OR_EQUAL_TO_SEMVER ||
+      type === matcherTypes.LESS_THAN_OR_EQUAL_TO_SEMVER
+    ) {
       value = stringMatcherData;
     }
 
@@ -91,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 { IWhitelistMatcherData } from '../../dtos/types';
-import { _Set } from '../../utils/lang/sets';
+import { ISplitMatcher } from '../../dtos/types';
 
 /**
- * Extract whitelist as a set. Used by 'WHITELIST' matcher.
+ * Extract whitelist array.
  */
-export function whitelistTransform(whitelistObject: IWhitelistMatcherData) {
-  return new _Set(whitelistObject.whitelist);
+export function whitelistTransform(whitelistObject: ISplitMatcher['whitelistMatcherData']) {
+  return whitelistObject && whitelistObject.whitelist;
 }

package/src/evaluator/parser/index.ts

@@ -7,10 +7,11 @@ import { ifElseIfCombinerContext } from '../combiners/ifelseif';
 import { andCombinerContext } from '../combiners/and';
 import { thenable } from '../../utils/promise/thenable';
 import { IEvaluator, IMatcherDto, ISplitEvaluator } from '../types';
-import { ISplitCondition } from '../../dtos/types';
+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';
 
 export function parser(log: ILogger, conditions: ISplitCondition[], storage: IStorageSync | IStorageAsync): IEvaluator {
   let predicates = [];
@@ -28,18 +29,29 @@ export function parser(log: ILogger, conditions: ISplitCondition[], storage: ISt
 
     // create a set of pure functions from the matcher's dto
     const expressions = matchers.map((matcherDto: IMatcherDto) => {
-      const matcher = matcherFactory(log, matcherDto, storage);
+      let matcher: ReturnType<typeof matcherFactory>;
+      try {
+        matcher = matcherFactory(log, matcherDto, storage);
+      } catch (error) {
+        log.error(ENGINE_MATCHER_ERROR, [matcherDto.name, error]);
+      }
 
       // Evaluator function.
       return (key: string, attributes: SplitIO.Attributes | undefined, splitEvaluator: ISplitEvaluator) => {
         const value = sanitizeValue(log, key, matcherDto, attributes);
-        const result = value !== undefined && matcher ? matcher(value, splitEvaluator) : false;
+        let result: MaybeThenable<boolean> = false;
 
-        if (thenable(result)) {
-          // @ts-ignore
-          return result.then(res => Boolean(res ^ matcherDto.negate));
+        if (value !== undefined && matcher) {
+          try {
+            result = matcher(value, splitEvaluator);
+          } catch (error) {
+            log.error(ENGINE_MATCHER_ERROR, [matcherDto.name, error]);
+          }
         }
-        // @ts-ignore
+
+        if (thenable(result)) { // @ts-ignore
+          return result.then(res => Boolean(res ^ matcherDto.negate));
+        } // @ts-ignore
         return Boolean(result ^ matcherDto.negate);
       };
     });

package/src/evaluator/types.ts

@@ -1,6 +1,5 @@
-import { IBetweenMatcherData, IDependencyMatcherData, MaybeThenable } from '../dtos/types';
+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 | null
+  name: string
+  value?: string | number | boolean | string[] | IDependencyMatcherData | IBetweenMatcherData | IBetweenStringMatcherData | null
 
   attribute: string | null
   negate: boolean

package/src/logger/constants.ts

@@ -25,7 +25,6 @@ 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_STRING_INVALID = 20;
 export const ENGINE_MATCHER_STARTS_WITH = 21;
 export const ENGINE_MATCHER_WHITELIST = 22;
 export const ENGINE_VALUE = 23;
@@ -131,6 +130,7 @@ export const ERROR_NOT_BOOLEAN = 325;
 export const ERROR_MIN_CONFIG_PARAM = 326;
 export const ERROR_TOO_MANY_SETS = 327;
 export const ERROR_SETS_FILTER_EXCLUSIVE = 328;
+export const ENGINE_MATCHER_ERROR = 329;
 
 // Log prefixes (a.k.a. tags or categories)
 export const LOG_PREFIX_SETTINGS = 'settings';

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

@@ -23,7 +23,6 @@ export const codesDebug: [number, string][] = codesInfo.concat([
   [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_STRING_INVALID, c.LOG_PREFIX_ENGINE_MATCHER + '[stringMatcher] %s is an invalid regex'],
   [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.'],

package/src/logger/messages/error.ts

@@ -2,7 +2,8 @@ import * as c from '../constants';
 
 export const codesError: [number, string][] = [
   // evaluator
-  [c.ERROR_ENGINE_COMBINER_IFELSEIF, c.LOG_PREFIX_ENGINE_COMBINER + 'Invalid feature flag, no valid rules or unsupported matcher type found'],
+  [c.ERROR_ENGINE_COMBINER_IFELSEIF, c.LOG_PREFIX_ENGINE_COMBINER + 'Invalid feature flag, no valid rules or unsupported targeting rule type found'],
+  [c.ENGINE_MATCHER_ERROR, c.LOG_PREFIX_ENGINE_MATCHER + '[%s] %s'],
   // SDK
   [c.ERROR_LOGLEVEL_INVALID, 'logger: Invalid Log Level - No changes to the logs will be applied.'],
   [c.ERROR_CLIENT_CANNOT_GET_READY, 'The SDK will not get ready. Reason: %s'],

package/src/services/splitApi.ts

@@ -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?s=${FLAGS_SPEC}&since=${since}${till ? '&till=' + till : ''}${filterQueryString || ''}`;
+      const url = `${urls.sdk}/splitChanges?s=${FLAGS_SPEC}&since=${since}${filterQueryString || ''}${till ? '&till=' + till : ''}`;
       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/inLocalStorage/SplitsCacheInLocal.ts

@@ -146,7 +146,7 @@ export class SplitsCacheInLocal extends AbstractSplitsCacheSync {
 
     // when using a new split query, we must update it at the store
     if (this.updateNewFilter) {
-      this.log.info(LOG_PREFIX + 'SDK key or feature flag filter criteria was modified. Updating cache');
+      this.log.info(LOG_PREFIX + 'SDK key, flags filter criteria or flags spec version was modified. Updating cache');
       const storageHashKey = this.keys.buildHashKey();
       try {
         localStorage.setItem(storageHashKey, this.storageHash);

package/src/storages/pluggable/index.ts

@@ -96,7 +96,7 @@ export function PluggableStorage(options: PluggableStorageOptions): IStorageAsyn
         return wrapper.get(keys.buildHashKey()).then((hash) => {
           const currentHash = getStorageHash(settings);
           if (hash !== currentHash) {
-            log.info(LOG_PREFIX + 'Storage HASH has changed (SDK key or feature flag filter criteria was modified). Clearing cache');
+            log.info(LOG_PREFIX + 'Storage HASH has changed (SDK key, flags filter criteria or flags spec version was modified). Clearing cache');
             return wrapper.getKeysByPrefix(`${keys.prefix}.`).then(storageKeys => {
               return Promise.all(storageKeys.map(storageKey => wrapper.del(storageKey)));
             }).then(() => wrapper.set(keys.buildHashKey(), currentHash));

package/src/utils/Semver.ts

@@ -0,0 +1,111 @@
+import { isString } from '../utils/lang';
+
+const NUMERIC_IDENTIFIER_REGEX = /^[0-9]+$/;
+
+const METADATA_DELIMITER = '+';
+const PRERELEASE_DELIMITER = '-';
+const VALUE_DELIMITER = '.';
+
+/**
+ * Compares two strings. If both strings are numeric identifiers, they are compared numerically. Otherwise, they are compared lexicographically.
+ * This could be implemented using `a.localeCompare(b, undefined, { numeric: true })` but locale options are not broadly supported.
+ */
+function compareStrings(a: string, b: string): number {
+  if (NUMERIC_IDENTIFIER_REGEX.test(a) && NUMERIC_IDENTIFIER_REGEX.test(b)) {
+    const result = a.length - b.length;
+    if (result !== 0) {
+      return result;
+    }
+  }
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+
+// Sanitizes a numeric identifier by removing leading zeros
+function sanitizeNumericIdentifier(value: string): string {
+  return value.replace(/^0+(?=\d)/, '');
+}
+
+function throwError(version: string) {
+  throw new Error('Unable to convert to Semver, incorrect format: ' + version);
+}
+
+export class Semver {
+
+  private readonly _major: string;
+  private readonly _minor: string;
+  private readonly _patch: string;
+  private readonly _preRelease: string[];
+  private readonly _isStable: boolean;
+
+  // Version string for 'equal' and 'in list' comparisons
+  public readonly version: string;
+
+  public constructor(version: string) {
+    if (!isString(version)) throwError(version);
+
+    // Separate metadata if exists
+    let index = version.indexOf(METADATA_DELIMITER);
+    let [vWithoutMetadata, metadata] = index === -1 ? [version] : [version.slice(0, index), version.slice(index + 1)];
+    if (metadata === '') throwError(version);
+
+    // Set pre-release versions if exists
+    index = vWithoutMetadata.indexOf(PRERELEASE_DELIMITER);
+    if (index === -1) {
+      this._isStable = true;
+      this._preRelease = [];
+    } else {
+      this._isStable = false;
+      this._preRelease = vWithoutMetadata.slice(index + 1).split(VALUE_DELIMITER).map((value) => {
+        if (!value) throwError(version);
+        return NUMERIC_IDENTIFIER_REGEX.test(value) ?
+          sanitizeNumericIdentifier(value) :
+          value;
+      });
+      vWithoutMetadata = vWithoutMetadata.slice(0, index);
+    }
+
+    // Set major, minor, and patch versions
+    const vParts = vWithoutMetadata.split(VALUE_DELIMITER).map((value) => {
+      if (!value || !NUMERIC_IDENTIFIER_REGEX.test(value)) throwError(version);
+      return sanitizeNumericIdentifier(value);
+    });
+
+    if (vParts.length !== 3) throwError(version);
+    this._major = vParts[0];
+    this._minor = vParts[1];
+    this._patch = vParts[2];
+
+    // Set version string
+    this.version = vParts.join(VALUE_DELIMITER);
+    if (this._preRelease.length) this.version += PRERELEASE_DELIMITER + this._preRelease.join(VALUE_DELIMITER);
+    if (metadata) this.version += METADATA_DELIMITER + metadata;
+  }
+
+  /**
+   * Precedence comparision between 2 Semver objects.
+   *
+   * @return `0` if `this === toCompare`, `-1` if `this < toCompare`, and `1` if `this > toCompare`
+   */
+  public compare(toCompare: Semver): number {
+    if (this.version === toCompare.version) return 0;
+
+    let result = compareStrings(this._major, toCompare._major);
+    if (result !== 0) return result;
+
+    result = compareStrings(this._minor, toCompare._minor);
+    if (result !== 0) return result;
+
+    result = compareStrings(this._patch, toCompare._patch);
+    if (result !== 0) return result;
+
+    if (!this._isStable && toCompare._isStable) return -1;
+    if (this._isStable && !toCompare._isStable) return 1;
+
+    for (let i = 0, length = Math.min(this._preRelease.length, toCompare._preRelease.length); i < length; i++) {
+      const result = compareStrings(this._preRelease[i], toCompare._preRelease[i]);
+      if (result !== 0) return result;
+    }
+
+    return this._preRelease.length - toCompare._preRelease.length;
+  }
+}

package/src/utils/labels/index.ts

@@ -5,4 +5,4 @@ export const SDK_NOT_READY = 'not ready';
 export const EXCEPTION = 'exception';
 export const SPLIT_ARCHIVED = 'archived';
 export const NOT_IN_SPLIT = 'not in split';
-export const UNSUPPORTED_MATCHER_TYPE = 'unsupported matcher type';
+export const UNSUPPORTED_MATCHER_TYPE = 'targeting rule type unsupported by sdk';

package/src/utils/settingsValidation/logger/pluggableLogger.ts

@@ -4,7 +4,7 @@ import { LogLevel } from '../../../types';
 import { getLogLevel } from './commons';
 
 function isLogger(log: any): log is ILogger {
-  return log && typeof log.debug === 'function' && typeof log.info === 'function' && typeof log.warn === 'function' && typeof log.error === 'function' && typeof log.setLogLevel === 'function';
+  return log !== null && typeof log === 'object' && typeof log.debug === 'function' && typeof log.info === 'function' && typeof log.warn === 'function' && typeof log.error === 'function' && typeof log.setLogLevel === 'function';
 }
 
 // By default it starts disabled.

package/types/dtos/types.d.ts

@@ -11,6 +11,10 @@ export interface IBetweenMatcherData {
     start: number;
     end: number;
 }
+export interface IBetweenStringMatcherData {
+    start: string;
+    end: string;
+}
 export interface IWhitelistMatcherData {
     whitelist: string[];
 }
@@ -35,6 +39,7 @@ interface ISplitMatcherBase {
     dependencyMatcherData?: null | IDependencyMatcherData;
     booleanMatcherData?: null | boolean;
     stringMatcherData?: null | string;
+    betweenStringMatcherData?: null | IBetweenStringMatcherData;
 }
 interface IAllKeysMatcher extends ISplitMatcherBase {
     matcherType: 'ALL_KEYS';
@@ -103,7 +108,27 @@ interface IMatchesStringMatcher extends ISplitMatcherBase {
     matcherType: 'MATCHES_STRING';
     stringMatcherData: string;
 }
-export declare type ISplitMatcher = IAllKeysMatcher | IInSegmentMatcher | IWhitelistMatcher | IEqualToMatcher | IGreaterThanOrEqualToMatcher | ILessThanOrEqualToMatcher | IBetweenMatcher | IEqualToSetMatcher | IContainsAnyOfSetMatcher | IContainsAllOfSetMatcher | IPartOfSetMatcher | IStartsWithMatcher | IEndsWithMatcher | IContainsStringMatcher | IInSplitTreatmentMatcher | IEqualToBooleanMatcher | IMatchesStringMatcher;
+interface IEqualToSemverMatcher extends ISplitMatcherBase {
+    matcherType: 'EQUAL_TO_SEMVER';
+    stringMatcherData: string;
+}
+interface IGreaterThanOrEqualToSemverMatcher extends ISplitMatcherBase {
+    matcherType: 'GREATER_THAN_OR_EQUAL_TO_SEMVER';
+    stringMatcherData: string;
+}
+interface ILessThanOrEqualToSemverMatcher extends ISplitMatcherBase {
+    matcherType: 'LESS_THAN_OR_EQUAL_TO_SEMVER';
+    stringMatcherData: string;
+}
+interface IBetweenSemverMatcher extends ISplitMatcherBase {
+    matcherType: 'BETWEEN_SEMVER';
+    betweenStringMatcherData: IBetweenStringMatcherData;
+}
+interface IInListSemverMatcher extends ISplitMatcherBase {
+    matcherType: 'IN_LIST_SEMVER';
+    whitelistMatcherData: IWhitelistMatcherData;
+}
+export declare type ISplitMatcher = IAllKeysMatcher | IInSegmentMatcher | IWhitelistMatcher | IEqualToMatcher | IGreaterThanOrEqualToMatcher | ILessThanOrEqualToMatcher | IBetweenMatcher | IEqualToSetMatcher | IContainsAnyOfSetMatcher | IContainsAllOfSetMatcher | IPartOfSetMatcher | IStartsWithMatcher | IEndsWithMatcher | IContainsStringMatcher | IInSplitTreatmentMatcher | IEqualToBooleanMatcher | IMatchesStringMatcher | IEqualToSemverMatcher | IGreaterThanOrEqualToSemverMatcher | ILessThanOrEqualToSemverMatcher | IBetweenSemverMatcher | IInListSemverMatcher;
 /** Split object */
 export interface ISplitPartition {
     treatment: string;

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,3 +1,2 @@
-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(log: ILogger, ruleAttr: string[]): (runtimeAttr: string) => boolean;

package/types/evaluator/matchersTransform/set.d.ts

@@ -1,5 +1,5 @@
-import { IWhitelistMatcherData } from '../../dtos/types';
+import { ISplitMatcher } from '../../dtos/types';
 /**
  * Extract whitelist array. Used by set and string matchers
  */
-export declare function setTransform(whitelistObject: IWhitelistMatcherData): string[];
+export declare function setTransform(whitelistObject: ISplitMatcher['whitelistMatcherData']): string[] | null | undefined;

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

@@ -0,0 +1,7 @@
+import { ISplitMatcher } from '../../dtos/types';
+/**
+ * Extract value from string matcher data.
+ */
+export declare function stringTransform({ stringMatcherData }: ISplitMatcher): {
+    value: string | null | undefined;
+};

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

@@ -1,5 +1,5 @@
-import { IWhitelistMatcherData } from '../../dtos/types';
+import { ISplitMatcher } from '../../dtos/types';
 /**
- * Extract whitelist as a set. Used by 'WHITELIST' matcher.
+ * Extract whitelist array.
  */
-export declare function whitelistTransform(whitelistObject: IWhitelistMatcherData): import("../../utils/lang/sets").ISet<string>;
+export declare function whitelistTransform(whitelistObject: ISplitMatcher['whitelistMatcherData']): string[] | null | undefined;

package/types/evaluator/types.d.ts

@@ -1,6 +1,5 @@
-import { IBetweenMatcherData, IDependencyMatcherData, MaybeThenable } from '../dtos/types';
+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';
 export interface IDependencyMatcherValue {
@@ -9,7 +8,8 @@ export interface IDependencyMatcherValue {
 }
 export interface IMatcherDto {
     type: number;
-    value?: string | number | boolean | string[] | IDependencyMatcherData | ISet<string> | IBetweenMatcherData | null;
+    name: string;
+    value?: string | number | boolean | string[] | IDependencyMatcherData | IBetweenMatcherData | IBetweenStringMatcherData | null;
     attribute: string | null;
     negate: boolean;
     dataType: string;

package/types/logger/constants.d.ts

@@ -25,7 +25,6 @@ export declare const ENGINE_MATCHER_LESS = 16;
 export declare const ENGINE_MATCHER_PART_OF = 17;
 export declare const ENGINE_MATCHER_SEGMENT = 18;
 export declare const ENGINE_MATCHER_STRING = 19;
-export declare const ENGINE_MATCHER_STRING_INVALID = 20;
 export declare const ENGINE_MATCHER_STARTS_WITH = 21;
 export declare const ENGINE_MATCHER_WHITELIST = 22;
 export declare const ENGINE_VALUE = 23;
@@ -128,6 +127,7 @@ export declare const ERROR_NOT_BOOLEAN = 325;
 export declare const ERROR_MIN_CONFIG_PARAM = 326;
 export declare const ERROR_TOO_MANY_SETS = 327;
 export declare const ERROR_SETS_FILTER_EXCLUSIVE = 328;
+export declare const ENGINE_MATCHER_ERROR = 329;
 export declare const LOG_PREFIX_SETTINGS = "settings";
 export declare const LOG_PREFIX_INSTANTIATION = "Factory instantiation";
 export declare const LOG_PREFIX_ENGINE = "engine";

package/types/utils/labels/index.d.ts

@@ -5,4 +5,4 @@ export declare const SDK_NOT_READY = "not ready";
 export declare const EXCEPTION = "exception";
 export declare const SPLIT_ARCHIVED = "archived";
 export declare const NOT_IN_SPLIT = "not in split";
-export declare const UNSUPPORTED_MATCHER_TYPE = "unsupported matcher type";
+export declare const UNSUPPORTED_MATCHER_TYPE = "targeting rule type unsupported by sdk";

package/types/utils/semVer.d.ts

@@ -0,0 +1,15 @@
+export declare class Semver {
+    private readonly _major;
+    private readonly _minor;
+    private readonly _patch;
+    private readonly _preRelease;
+    private readonly _isStable;
+    readonly version: string;
+    constructor(version: string);
+    /**
+     * Precedence comparision between 2 Semver objects.
+     *
+     * @return `0` if `this === toCompare`, `-1` if `this < toCompare`, and `1` if `this > toCompare`
+     */
+    compare(toCompare: Semver): number;
+}

package/cjs/evaluator/matchersTransform/set.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setTransform = void 0;
-/**
- * Extract whitelist array. Used by set and string matchers
- */
-function setTransform(whitelistObject) {
-    return whitelistObject.whitelist;
-}
-exports.setTransform = setTransform;