@splitsoftware/splitio-commons 1.13.2-rc.3 → 1.13.2-rc.4

package/cjs/evaluator/matchers/semver_eq.js

@@ -5,7 +5,8 @@ var Semver_1 = require("../../utils/Semver");
 function equalToSemverMatcherContext(log, ruleAttr) {
     var ruleSemver = new Semver_1.Semver(ruleAttr);
     return function equalToSemverMatcher(runtimeAttr) {
-        var isEqual = ruleSemver.version === new Semver_1.Semver(runtimeAttr).version;
+        var runtimeSemver = new Semver_1.Semver(runtimeAttr);
+        var isEqual = ruleSemver.version === runtimeSemver.version;
         return isEqual;
     };
 }

package/cjs/evaluator/matchers/semver_gte.js

@@ -5,7 +5,8 @@ var Semver_1 = require("../../utils/Semver");
 function greaterThanEqualToSemverMatcherContext(log, ruleAttr) {
     var ruleSemver = new Semver_1.Semver(ruleAttr);
     return function greaterThanEqualToSemverMatcher(runtimeAttr) {
-        var isGreaterThanEqual = new Semver_1.Semver(runtimeAttr).compare(ruleSemver) >= 0;
+        var runtimeSemver = new Semver_1.Semver(runtimeAttr);
+        var isGreaterThanEqual = runtimeSemver.compare(ruleSemver) >= 0;
         return isGreaterThanEqual;
     };
 }

package/cjs/evaluator/matchers/semver_lte.js

@@ -5,7 +5,8 @@ var Semver_1 = require("../../utils/Semver");
 function lessThanEqualToSemverMatcherContext(log, ruleAttr) {
     var ruleSemver = new Semver_1.Semver(ruleAttr);
     return function lessThanEqualToSemverMatcher(runtimeAttr) {
-        var isLessThenEqual = new Semver_1.Semver(runtimeAttr).compare(ruleSemver) <= 0;
+        var runtimeSemver = new Semver_1.Semver(runtimeAttr);
+        var isLessThenEqual = runtimeSemver.compare(ruleSemver) <= 0;
         return isLessThenEqual;
     };
 }

package/cjs/evaluator/matchers/string.js

@@ -3,16 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringMatcherContext = void 0;
 var constants_1 = require("../../logger/constants");
 function stringMatcherContext(log, ruleAttr) {
+    var regex = new RegExp(ruleAttr);
     return function stringMatcher(runtimeAttr) {
-        var re;
-        try {
-            re = new RegExp(ruleAttr);
-        }
-        catch (e) {
-            log.debug(constants_1.ENGINE_MATCHER_STRING_INVALID, [ruleAttr]);
-            return false;
-        }
-        var regexMatches = re.test(runtimeAttr);
+        var regexMatches = regex.test(runtimeAttr);
         log.debug(constants_1.ENGINE_MATCHER_STRING, [runtimeAttr, ruleAttr, regexMatches ? 'yes' : 'no']);
         return regexMatches;
     };

package/cjs/evaluator/parser/index.js

@@ -9,24 +9,37 @@ var condition_1 = require("../condition");
 var ifelseif_1 = require("../combiners/ifelseif");
 var and_1 = require("../combiners/and");
 var thenable_1 = require("../../utils/promise/thenable");
+var constants_1 = require("../../logger/constants");
 function parser(log, conditions, storage) {
     var predicates = [];
-    for (var i = 0; i < conditions.length; i++) {
+    var _loop_1 = function (i) {
         var _a = conditions[i], matcherGroup = _a.matcherGroup, partitions = _a.partitions, label = _a.label, conditionType = _a.conditionType;
         // transform data structure
         var matchers = (0, matchersTransform_1.matchersTransform)(matcherGroup.matchers);
         // create a set of pure functions from the matcher's dto
-        var expressions = matchers.map(function (matcherDto) {
-            var matcher = (0, matchers_1.matcherFactory)(log, matcherDto, storage);
+        var expressions = matchers.map(function (matcherDto, index) {
+            var matcher;
+            try {
+                matcher = (0, matchers_1.matcherFactory)(log, matcherDto, storage);
+            }
+            catch (error) {
+                log.error(constants_1.ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+            }
             // Evaluator function.
             return function (key, attributes, splitEvaluator) {
                 var value = (0, value_1.sanitizeValue)(log, key, matcherDto, attributes);
-                var result = value !== undefined && matcher ? matcher(value, splitEvaluator) : false;
-                if ((0, thenable_1.thenable)(result)) {
-                    // @ts-ignore
-                    return result.then(function (res) { return Boolean(res ^ matcherDto.negate); });
+                var result = false;
+                if (value !== undefined && matcher) {
+                    try {
+                        result = matcher(value, splitEvaluator);
+                    }
+                    catch (error) {
+                        log.error(constants_1.ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+                    }
                 }
-                // @ts-ignore
+                if ((0, thenable_1.thenable)(result)) { // @ts-ignore
+                    return result.then(function (res) { return Boolean(res ^ matcherDto.negate); });
+                } // @ts-ignore
                 return Boolean(result ^ matcherDto.negate);
             };
         });
@@ -34,10 +47,14 @@ function parser(log, conditions, storage) {
         if (expressions.length === 0) {
             // reset any data collected during parsing
             predicates = [];
-            // and break the loop
-            break;
+            return "break";
         }
         predicates.push((0, condition_1.conditionContext)(log, (0, and_1.andCombinerContext)(log, expressions), treatments_1.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 (0, ifelseif_1.ifElseIfCombinerContext)(log, predicates);

package/cjs/logger/constants.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SYNC_SPLITS_FETCH_RETRY = exports.POLLING_STOP = exports.POLLING_START = exports.POLLING_SMART_PAUSING = exports.NEW_FACTORY = exports.NEW_SHARED_CLIENT = exports.IMPRESSION_QUEUEING = exports.IMPRESSION = exports.CLIENT_READY = exports.CLIENT_READY_FROM_CACHE = exports.SETTINGS_SPLITS_FILTER = exports.SYNC_TASK_STOP = exports.SYNC_TASK_EXECUTE = exports.SYNC_TASK_START = exports.STREAMING_NEW_MESSAGE = exports.SYNC_SPLITS_SEGMENTS = exports.SYNC_SPLITS_REMOVED = exports.SYNC_SPLITS_NEW = exports.SYNC_SPLITS_FETCH = exports.SYNC_OFFLINE_DATA = exports.RETRIEVE_MANAGER = exports.RETRIEVE_CLIENT_EXISTING = exports.RETRIEVE_CLIENT_DEFAULT = exports.CLEANUP_DEREGISTERING = exports.CLEANUP_REGISTERING = exports.ENGINE_SANITIZE = exports.ENGINE_VALUE = exports.ENGINE_MATCHER_WHITELIST = exports.ENGINE_MATCHER_STARTS_WITH = exports.ENGINE_MATCHER_STRING_INVALID = exports.ENGINE_MATCHER_STRING = exports.ENGINE_MATCHER_SEGMENT = exports.ENGINE_MATCHER_PART_OF = exports.ENGINE_MATCHER_LESS = exports.ENGINE_MATCHER_GREATER = exports.ENGINE_MATCHER_ENDS_WITH = exports.ENGINE_MATCHER_EQUAL_TO_SET = exports.ENGINE_MATCHER_EQUAL = exports.ENGINE_MATCHER_DEPENDENCY_PRE = exports.ENGINE_MATCHER_DEPENDENCY = exports.ENGINE_MATCHER_CONTAINS_STRING = exports.ENGINE_MATCHER_CONTAINS_ANY = exports.ENGINE_MATCHER_CONTAINS_ALL = exports.ENGINE_MATCHER_BOOLEAN = exports.ENGINE_MATCHER_BETWEEN = exports.ENGINE_MATCHER_ALL = exports.ENGINE_BUCKET = exports.ENGINE_COMBINER_IFELSEIF_NO_TREATMENT = exports.ENGINE_COMBINER_IFELSEIF = exports.ENGINE_COMBINER_AND = void 0;
-exports.ERROR_STREAMING_SSE = exports.ERROR_SYNC_OFFLINE_LOADING = exports.ERROR_CLIENT_CANNOT_GET_READY = exports.ERROR_CLIENT_LISTENER = exports.ERROR_LOGLEVEL_INVALID = exports.ERROR_ENGINE_COMBINER_IFELSEIF = exports.WARN_FLAGSET_WITHOUT_FLAGS = exports.WARN_FLAGSET_NOT_CONFIGURED = exports.WARN_LOWERCASE_FLAGSET = exports.WARN_INVALID_FLAGSET = exports.STREAMING_PARSING_SPLIT_UPDATE = exports.STREAMING_PARSING_MY_SEGMENTS_UPDATE_V2 = exports.WARN_SDK_KEY = exports.WARN_SPLITS_FILTER_EMPTY = exports.WARN_SPLITS_FILTER_INVALID = exports.WARN_SPLITS_FILTER_IGNORED = exports.WARN_INTEGRATION_INVALID = exports.WARN_NOT_EXISTENT_TT = exports.WARN_LOWERCASE_TRAFFIC_TYPE = exports.WARN_NOT_EXISTENT_SPLIT = exports.WARN_TRIMMING = exports.WARN_CONVERTING = exports.WARN_TRIMMING_PROPERTIES = exports.WARN_SETTING_NULL = exports.SUBMITTERS_PUSH_RETRY = exports.SUBMITTERS_PUSH_FAILS = exports.STREAMING_FALLBACK = exports.STREAMING_PARSING_MESSAGE_FAILS = exports.STREAMING_PARSING_ERROR_FAILS = exports.SYNC_SPLITS_FETCH_FAILS = exports.SYNC_MYSEGMENTS_FETCH_RETRY = exports.CLIENT_NOT_READY = exports.CLIENT_NO_LISTENER = exports.ENGINE_VALUE_NO_ATTRIBUTES = exports.ENGINE_VALUE_INVALID = exports.USER_CONSENT_INITIAL = exports.USER_CONSENT_NOT_UPDATED = exports.USER_CONSENT_UPDATED = exports.IMPRESSIONS_TRACKER_SUCCESS = exports.EVENTS_TRACKER_SUCCESS = exports.SYNC_STOP_POLLING = exports.SYNC_CONTINUE_POLLING = exports.SYNC_START_POLLING = exports.SUBMITTERS_PUSH = exports.SUBMITTERS_PUSH_FULL_QUEUE = exports.STREAMING_DISCONNECTING = exports.STREAMING_DISABLED = exports.STREAMING_CONNECTING = exports.STREAMING_RECONNECT = exports.STREAMING_REFRESH_TOKEN = void 0;
-exports.LOG_PREFIX_CLEANUP = exports.LOG_PREFIX_UNIQUE_KEYS_TRACKER = exports.LOG_PREFIX_EVENTS_TRACKER = exports.LOG_PREFIX_IMPRESSIONS_TRACKER = exports.LOG_PREFIX_SYNC_SUBMITTERS = exports.LOG_PREFIX_SYNC_POLLING = exports.LOG_PREFIX_SYNC_MYSEGMENTS = exports.LOG_PREFIX_SYNC_SEGMENTS = exports.LOG_PREFIX_SYNC_SPLITS = exports.LOG_PREFIX_SYNC_STREAMING = exports.LOG_PREFIX_SYNC_OFFLINE = exports.LOG_PREFIX_SYNC_MANAGER = exports.LOG_PREFIX_SYNC = exports.LOG_PREFIX_ENGINE_VALUE = exports.LOG_PREFIX_ENGINE_MATCHER = exports.LOG_PREFIX_ENGINE_COMBINER = exports.LOG_PREFIX_ENGINE = exports.LOG_PREFIX_INSTANTIATION = exports.LOG_PREFIX_SETTINGS = exports.ERROR_SETS_FILTER_EXCLUSIVE = exports.ERROR_TOO_MANY_SETS = exports.ERROR_MIN_CONFIG_PARAM = exports.ERROR_NOT_BOOLEAN = exports.ERROR_STORAGE_INVALID = exports.ERROR_LOCALHOST_MODULE_REQUIRED = exports.ERROR_HTTP = exports.ERROR_INVALID_CONFIG_PARAM = exports.ERROR_EMPTY_ARRAY = exports.ERROR_EMPTY = exports.ERROR_INVALID = exports.ERROR_INVALID_KEY_OBJECT = exports.ERROR_TOO_LONG = exports.ERROR_NULL = exports.ERROR_CLIENT_DESTROYED = exports.ERROR_NOT_FINITE = exports.ERROR_SIZE_EXCEEDED = exports.ERROR_NOT_PLAIN_OBJECT = exports.ERROR_EVENT_TYPE_FORMAT = exports.ERROR_EVENTS_TRACKER = exports.ERROR_IMPRESSIONS_LISTENER = exports.ERROR_IMPRESSIONS_TRACKER = exports.ERROR_STREAMING_AUTH = void 0;
+exports.STREAMING_REFRESH_TOKEN = exports.SYNC_SPLITS_FETCH_RETRY = exports.POLLING_STOP = exports.POLLING_START = exports.POLLING_SMART_PAUSING = exports.NEW_FACTORY = exports.NEW_SHARED_CLIENT = exports.IMPRESSION_QUEUEING = exports.IMPRESSION = exports.CLIENT_READY = exports.CLIENT_READY_FROM_CACHE = exports.SETTINGS_SPLITS_FILTER = exports.SYNC_TASK_STOP = exports.SYNC_TASK_EXECUTE = exports.SYNC_TASK_START = exports.STREAMING_NEW_MESSAGE = exports.SYNC_SPLITS_SEGMENTS = exports.SYNC_SPLITS_REMOVED = exports.SYNC_SPLITS_NEW = exports.SYNC_SPLITS_FETCH = exports.SYNC_OFFLINE_DATA = exports.RETRIEVE_MANAGER = exports.RETRIEVE_CLIENT_EXISTING = exports.RETRIEVE_CLIENT_DEFAULT = exports.CLEANUP_DEREGISTERING = exports.CLEANUP_REGISTERING = exports.ENGINE_SANITIZE = exports.ENGINE_VALUE = exports.ENGINE_MATCHER_WHITELIST = exports.ENGINE_MATCHER_STARTS_WITH = exports.ENGINE_MATCHER_STRING = exports.ENGINE_MATCHER_SEGMENT = exports.ENGINE_MATCHER_PART_OF = exports.ENGINE_MATCHER_LESS = exports.ENGINE_MATCHER_GREATER = exports.ENGINE_MATCHER_ENDS_WITH = exports.ENGINE_MATCHER_EQUAL_TO_SET = exports.ENGINE_MATCHER_EQUAL = exports.ENGINE_MATCHER_DEPENDENCY_PRE = exports.ENGINE_MATCHER_DEPENDENCY = exports.ENGINE_MATCHER_CONTAINS_STRING = exports.ENGINE_MATCHER_CONTAINS_ANY = exports.ENGINE_MATCHER_CONTAINS_ALL = exports.ENGINE_MATCHER_BOOLEAN = exports.ENGINE_MATCHER_BETWEEN = exports.ENGINE_MATCHER_ALL = exports.ENGINE_BUCKET = exports.ENGINE_COMBINER_IFELSEIF_NO_TREATMENT = exports.ENGINE_COMBINER_IFELSEIF = exports.ENGINE_COMBINER_AND = void 0;
+exports.ERROR_STREAMING_AUTH = exports.ERROR_STREAMING_SSE = exports.ERROR_SYNC_OFFLINE_LOADING = exports.ERROR_CLIENT_CANNOT_GET_READY = exports.ERROR_CLIENT_LISTENER = exports.ERROR_LOGLEVEL_INVALID = exports.ERROR_ENGINE_COMBINER_IFELSEIF = exports.WARN_FLAGSET_WITHOUT_FLAGS = exports.WARN_FLAGSET_NOT_CONFIGURED = exports.WARN_LOWERCASE_FLAGSET = exports.WARN_INVALID_FLAGSET = exports.STREAMING_PARSING_SPLIT_UPDATE = exports.STREAMING_PARSING_MY_SEGMENTS_UPDATE_V2 = exports.WARN_SDK_KEY = exports.WARN_SPLITS_FILTER_EMPTY = exports.WARN_SPLITS_FILTER_INVALID = exports.WARN_SPLITS_FILTER_IGNORED = exports.WARN_INTEGRATION_INVALID = exports.WARN_NOT_EXISTENT_TT = exports.WARN_LOWERCASE_TRAFFIC_TYPE = exports.WARN_NOT_EXISTENT_SPLIT = exports.WARN_TRIMMING = exports.WARN_CONVERTING = exports.WARN_TRIMMING_PROPERTIES = exports.WARN_SETTING_NULL = exports.SUBMITTERS_PUSH_RETRY = exports.SUBMITTERS_PUSH_FAILS = exports.STREAMING_FALLBACK = exports.STREAMING_PARSING_MESSAGE_FAILS = exports.STREAMING_PARSING_ERROR_FAILS = exports.SYNC_SPLITS_FETCH_FAILS = exports.SYNC_MYSEGMENTS_FETCH_RETRY = exports.CLIENT_NOT_READY = exports.CLIENT_NO_LISTENER = exports.ENGINE_VALUE_NO_ATTRIBUTES = exports.ENGINE_VALUE_INVALID = exports.USER_CONSENT_INITIAL = exports.USER_CONSENT_NOT_UPDATED = exports.USER_CONSENT_UPDATED = exports.IMPRESSIONS_TRACKER_SUCCESS = exports.EVENTS_TRACKER_SUCCESS = exports.SYNC_STOP_POLLING = exports.SYNC_CONTINUE_POLLING = exports.SYNC_START_POLLING = exports.SUBMITTERS_PUSH = exports.SUBMITTERS_PUSH_FULL_QUEUE = exports.STREAMING_DISCONNECTING = exports.STREAMING_DISABLED = exports.STREAMING_CONNECTING = exports.STREAMING_RECONNECT = void 0;
+exports.LOG_PREFIX_CLEANUP = exports.LOG_PREFIX_UNIQUE_KEYS_TRACKER = exports.LOG_PREFIX_EVENTS_TRACKER = exports.LOG_PREFIX_IMPRESSIONS_TRACKER = exports.LOG_PREFIX_SYNC_SUBMITTERS = exports.LOG_PREFIX_SYNC_POLLING = exports.LOG_PREFIX_SYNC_MYSEGMENTS = exports.LOG_PREFIX_SYNC_SEGMENTS = exports.LOG_PREFIX_SYNC_SPLITS = exports.LOG_PREFIX_SYNC_STREAMING = exports.LOG_PREFIX_SYNC_OFFLINE = exports.LOG_PREFIX_SYNC_MANAGER = exports.LOG_PREFIX_SYNC = exports.LOG_PREFIX_ENGINE_VALUE = exports.LOG_PREFIX_ENGINE_MATCHER = exports.LOG_PREFIX_ENGINE_COMBINER = exports.LOG_PREFIX_ENGINE = exports.LOG_PREFIX_INSTANTIATION = exports.LOG_PREFIX_SETTINGS = exports.ENGINE_MATCHER_ERROR = exports.ERROR_SETS_FILTER_EXCLUSIVE = exports.ERROR_TOO_MANY_SETS = exports.ERROR_MIN_CONFIG_PARAM = exports.ERROR_NOT_BOOLEAN = exports.ERROR_STORAGE_INVALID = exports.ERROR_LOCALHOST_MODULE_REQUIRED = exports.ERROR_HTTP = exports.ERROR_INVALID_CONFIG_PARAM = exports.ERROR_EMPTY_ARRAY = exports.ERROR_EMPTY = exports.ERROR_INVALID = exports.ERROR_INVALID_KEY_OBJECT = exports.ERROR_TOO_LONG = exports.ERROR_NULL = exports.ERROR_CLIENT_DESTROYED = exports.ERROR_NOT_FINITE = exports.ERROR_SIZE_EXCEEDED = exports.ERROR_NOT_PLAIN_OBJECT = exports.ERROR_EVENT_TYPE_FORMAT = exports.ERROR_EVENTS_TRACKER = exports.ERROR_IMPRESSIONS_LISTENER = exports.ERROR_IMPRESSIONS_TRACKER = void 0;
 /**
  * Message codes used to trim string log messages from commons and client-side API modules,
  * in order to reduce the minimal SDK size for Browser and eventually other client-side environments.
@@ -30,7 +30,6 @@ exports.ENGINE_MATCHER_LESS = 16;
 exports.ENGINE_MATCHER_PART_OF = 17;
 exports.ENGINE_MATCHER_SEGMENT = 18;
 exports.ENGINE_MATCHER_STRING = 19;
-exports.ENGINE_MATCHER_STRING_INVALID = 20;
 exports.ENGINE_MATCHER_STARTS_WITH = 21;
 exports.ENGINE_MATCHER_WHITELIST = 22;
 exports.ENGINE_VALUE = 23;
@@ -133,6 +132,7 @@ exports.ERROR_NOT_BOOLEAN = 325;
 exports.ERROR_MIN_CONFIG_PARAM = 326;
 exports.ERROR_TOO_MANY_SETS = 327;
 exports.ERROR_SETS_FILTER_EXCLUSIVE = 328;
+exports.ENGINE_MATCHER_ERROR = 329;
 // Log prefixes (a.k.a. tags or categories)
 exports.LOG_PREFIX_SETTINGS = 'settings';
 exports.LOG_PREFIX_INSTANTIATION = 'Factory instantiation';

package/cjs/logger/messages/debug.js

@@ -26,7 +26,6 @@ exports.codesDebug = info_1.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/cjs/logger/messages/error.js

@@ -6,6 +6,7 @@ var c = (0, tslib_1.__importStar)(require("../constants"));
 exports.codesError = [
     // evaluator
     [c.ERROR_ENGINE_COMBINER_IFELSEIF, c.LOG_PREFIX_ENGINE_COMBINER + 'Invalid feature flag, no valid rules or unsupported matcher 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/cjs/utils/Semver.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Semver = void 0;
+var lang_1 = require("../utils/lang");
 var NUMERIC_IDENTIFIER_REGEX = /^[0-9]+$/;
 var METADATA_DELIMITER = '+';
 var PRERELEASE_DELIMITER = '-';
@@ -27,6 +28,8 @@ function throwError(version) {
 }
 var Semver = /** @class */ (function () {
     function Semver(version) {
+        if (!(0, lang_1.isString)(version))
+            throwError(version);
         // Separate metadata if exists
         var index = version.indexOf(METADATA_DELIMITER);
         var _a = index === -1 ? [version] : [version.slice(0, index), version.slice(index + 1)], vWithoutMetadata = _a[0], metadata = _a[1];

package/esm/evaluator/matchers/semver_eq.js

@@ -2,7 +2,8 @@ import { Semver } from '../../utils/Semver';
 export function equalToSemverMatcherContext(log, ruleAttr) {
     var ruleSemver = new Semver(ruleAttr);
     return function equalToSemverMatcher(runtimeAttr) {
-        var isEqual = ruleSemver.version === new Semver(runtimeAttr).version;
+        var runtimeSemver = new Semver(runtimeAttr);
+        var isEqual = ruleSemver.version === runtimeSemver.version;
         return isEqual;
     };
 }

package/esm/evaluator/matchers/semver_gte.js

@@ -2,7 +2,8 @@ import { Semver } from '../../utils/Semver';
 export function greaterThanEqualToSemverMatcherContext(log, ruleAttr) {
     var ruleSemver = new Semver(ruleAttr);
     return function greaterThanEqualToSemverMatcher(runtimeAttr) {
-        var isGreaterThanEqual = new Semver(runtimeAttr).compare(ruleSemver) >= 0;
+        var runtimeSemver = new Semver(runtimeAttr);
+        var isGreaterThanEqual = runtimeSemver.compare(ruleSemver) >= 0;
         return isGreaterThanEqual;
     };
 }

package/esm/evaluator/matchers/semver_lte.js

@@ -2,7 +2,8 @@ import { Semver } from '../../utils/Semver';
 export function lessThanEqualToSemverMatcherContext(log, ruleAttr) {
     var ruleSemver = new Semver(ruleAttr);
     return function lessThanEqualToSemverMatcher(runtimeAttr) {
-        var isLessThenEqual = new Semver(runtimeAttr).compare(ruleSemver) <= 0;
+        var runtimeSemver = new Semver(runtimeAttr);
+        var isLessThenEqual = runtimeSemver.compare(ruleSemver) <= 0;
         return isLessThenEqual;
     };
 }

package/esm/evaluator/matchers/string.js

@@ -1,15 +1,8 @@
-import { ENGINE_MATCHER_STRING_INVALID, ENGINE_MATCHER_STRING } from '../../logger/constants';
+import { ENGINE_MATCHER_STRING } from '../../logger/constants';
 export function stringMatcherContext(log, ruleAttr) {
+    var regex = new RegExp(ruleAttr);
     return function stringMatcher(runtimeAttr) {
-        var re;
-        try {
-            re = new RegExp(ruleAttr);
-        }
-        catch (e) {
-            log.debug(ENGINE_MATCHER_STRING_INVALID, [ruleAttr]);
-            return false;
-        }
-        var regexMatches = re.test(runtimeAttr);
+        var regexMatches = regex.test(runtimeAttr);
         log.debug(ENGINE_MATCHER_STRING, [runtimeAttr, ruleAttr, regexMatches ? 'yes' : 'no']);
         return regexMatches;
     };

package/esm/evaluator/parser/index.js

@@ -6,24 +6,37 @@ 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';
 export function parser(log, conditions, storage) {
     var predicates = [];
-    for (var i = 0; i < conditions.length; i++) {
+    var _loop_1 = function (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) {
-            var matcher = matcherFactory(log, matcherDto, storage);
+        var expressions = matchers.map(function (matcherDto, index) {
+            var matcher;
+            try {
+                matcher = matcherFactory(log, matcherDto, storage);
+            }
+            catch (error) {
+                log.error(ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+            }
             // Evaluator function.
             return function (key, attributes, splitEvaluator) {
                 var value = sanitizeValue(log, key, matcherDto, attributes);
-                var result = value !== undefined && matcher ? matcher(value, splitEvaluator) : false;
-                if (thenable(result)) {
-                    // @ts-ignore
-                    return result.then(function (res) { return Boolean(res ^ matcherDto.negate); });
+                var result = false;
+                if (value !== undefined && matcher) {
+                    try {
+                        result = matcher(value, splitEvaluator);
+                    }
+                    catch (error) {
+                        log.error(ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+                    }
                 }
-                // @ts-ignore
+                if (thenable(result)) { // @ts-ignore
+                    return result.then(function (res) { return Boolean(res ^ matcherDto.negate); });
+                } // @ts-ignore
                 return Boolean(result ^ matcherDto.negate);
             };
         });
@@ -31,10 +44,14 @@ export function parser(log, conditions, storage) {
         if (expressions.length === 0) {
             // reset any data collected during parsing
             predicates = [];
-            // and break the loop
-            break;
+            return "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

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

package/esm/logger/messages/debug.js

@@ -22,7 +22,6 @@ export var codesDebug = 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/esm/logger/messages/error.js

@@ -2,6 +2,7 @@ import * as c from '../constants';
 export var codesError = [
     // evaluator
     [c.ERROR_ENGINE_COMBINER_IFELSEIF, c.LOG_PREFIX_ENGINE_COMBINER + 'Invalid feature flag, no valid rules or unsupported matcher 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/esm/utils/Semver.js

@@ -1,3 +1,4 @@
+import { isString } from '../utils/lang';
 var NUMERIC_IDENTIFIER_REGEX = /^[0-9]+$/;
 var METADATA_DELIMITER = '+';
 var PRERELEASE_DELIMITER = '-';
@@ -24,6 +25,8 @@ function throwError(version) {
 }
 var Semver = /** @class */ (function () {
     function Semver(version) {
+        if (!isString(version))
+            throwError(version);
         // Separate metadata if exists
         var index = version.indexOf(METADATA_DELIMITER);
         var _a = index === -1 ? [version] : [version.slice(0, index), version.slice(index + 1)], vWithoutMetadata = _a[0], metadata = _a[1];

package/package.json

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

package/src/evaluator/matchers/semver_between.ts

@@ -3,15 +3,13 @@ import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
 export function betweenSemverMatcherContext(log: ILogger, ruleAttr: IBetweenStringMatcherData) {
-
   const startSemver = new Semver(ruleAttr.start);
   const endSemver = new Semver(ruleAttr.end);
 
   return function betweenSemverMatcher(key: string): boolean {
-
     const runtimeSemver = new Semver(key);
 
-    let isBetween = startSemver.compare(runtimeSemver) <= 0 && endSemver.compare(runtimeSemver) >= 0;
+    const isBetween = startSemver.compare(runtimeSemver) <= 0 && endSemver.compare(runtimeSemver) >= 0;
 
     return isBetween;
   };

package/src/evaluator/matchers/semver_eq.ts

@@ -2,11 +2,12 @@ import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
 export function equalToSemverMatcherContext(log: ILogger, ruleAttr: string) {
-
   const ruleSemver = new Semver(ruleAttr);
 
   return function equalToSemverMatcher(runtimeAttr: string): boolean {
-    const isEqual = ruleSemver.version === new Semver(runtimeAttr).version;
+    const runtimeSemver = new Semver(runtimeAttr);
+
+    const isEqual = ruleSemver.version === runtimeSemver.version;
 
     return isEqual;
   };

package/src/evaluator/matchers/semver_gte.ts

@@ -2,11 +2,12 @@ import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
 export function greaterThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: string) {
-
   const ruleSemver = new Semver(ruleAttr);
 
   return function greaterThanEqualToSemverMatcher(runtimeAttr: string): boolean {
-    let isGreaterThanEqual = new Semver(runtimeAttr).compare(ruleSemver) >= 0;
+    const runtimeSemver = new Semver(runtimeAttr);
+
+    const isGreaterThanEqual = runtimeSemver.compare(ruleSemver) >= 0;
 
     return isGreaterThanEqual;
   };

package/src/evaluator/matchers/semver_lte.ts

@@ -2,11 +2,12 @@ import { ILogger } from '../../logger/types';
 import { Semver } from '../../utils/Semver';
 
 export function lessThanEqualToSemverMatcherContext(log: ILogger, ruleAttr: string) {
-
   const ruleSemver = new Semver(ruleAttr);
 
   return function lessThanEqualToSemverMatcher(runtimeAttr: string): boolean {
-    let isLessThenEqual = new Semver(runtimeAttr).compare(ruleSemver) <= 0;
+    const runtimeSemver = new Semver(runtimeAttr);
+
+    const isLessThenEqual = runtimeSemver.compare(ruleSemver) <= 0;
 
     return isLessThenEqual;
   };

package/src/evaluator/matchers/string.ts

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

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 = [];
@@ -27,19 +28,30 @@ 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) => {
-      const matcher = matcherFactory(log, matcherDto, storage);
+    const expressions = matchers.map((matcherDto: IMatcherDto, index: number) => {
+      let matcher: ReturnType<typeof matcherFactory>;
+      try {
+        matcher = matcherFactory(log, matcherDto, storage);
+      } catch (error) {
+        log.error(ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, 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, [matcherGroup.matchers[index].matcherType, 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/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/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

@@ -3,6 +3,7 @@ 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.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/utils/Semver.ts

@@ -1,3 +1,5 @@
+import { isString } from '../utils/lang';
+
 const NUMERIC_IDENTIFIER_REGEX = /^[0-9]+$/;
 
 const METADATA_DELIMITER = '+';
@@ -39,6 +41,8 @@ export class Semver {
   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)];

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/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";