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

package/CHANGES.txt

@@ -1,5 +1,7 @@
 1.14.0 (April XX, 2024)
+ - Added support for Semver matchers.
  - Updated impression label to 'unsupported matcher type' when the matcher type is not supported by the SDK.
+ - Updated Split API client to include the flags spec version query parameter for the `splitChanges` and `auth` endpoints.
 
 1.13.1 (January 10, 2024)
  - Updated client `destroy` method to release SDK key immediately and avoid unexpected warning logs when a factory is created with the same SDK key after the previous one was destroyed.

package/cjs/evaluator/Engine.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Engine = void 0;
-var tslib_1 = require("tslib");
 var lang_1 = require("../utils/lang");
 var parser_1 = require("./parser");
 var key_1 = require("../utils/key");
 var thenable_1 = require("../utils/promise/thenable");
-var LabelsConstants = (0, tslib_1.__importStar)(require("../utils/labels"));
+var labels_1 = require("../utils/labels");
 var constants_1 = require("../utils/constants");
 function evaluationResult(result, defaultTreatment) {
     return {
         treatment: (0, lang_1.get)(result, 'treatment', defaultTreatment),
-        label: (0, lang_1.get)(result, 'label', LabelsConstants.NO_CONDITION_MATCH)
+        label: (0, lang_1.get)(result, 'label', labels_1.NO_CONDITION_MATCH)
     };
 }
 var Engine = /** @class */ (function () {
@@ -42,16 +41,16 @@ var Engine = /** @class */ (function () {
         catch (err) {
             return {
                 treatment: constants_1.CONTROL,
-                label: LabelsConstants.EXCEPTION
+                label: labels_1.EXCEPTION
             };
         }
         if (this.isGarbage()) {
             treatment = constants_1.CONTROL;
-            label = LabelsConstants.SPLIT_ARCHIVED;
+            label = labels_1.SPLIT_ARCHIVED;
         }
         else if (killed) {
             treatment = defaultTreatment;
-            label = LabelsConstants.SPLIT_KILLED;
+            label = labels_1.SPLIT_KILLED;
         }
         else {
             var evaluation = this.evaluator(parsedKey, seed, trafficAllocation, trafficAllocationSeed, attributes, splitEvaluator);

package/cjs/evaluator/combiners/ifelseif.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ifElseIfCombinerContext = void 0;
-var tslib_1 = require("tslib");
 var lang_1 = require("../../utils/lang");
 var thenable_1 = require("../../utils/promise/thenable");
-var LabelsConstants = (0, tslib_1.__importStar)(require("../../utils/labels"));
+var labels_1 = require("../../utils/labels");
 var constants_1 = require("../../utils/constants");
 var constants_2 = require("../../logger/constants");
 function ifElseIfCombinerContext(log, predicates) {
@@ -12,7 +11,7 @@ function ifElseIfCombinerContext(log, predicates) {
         log.error(constants_2.ERROR_ENGINE_COMBINER_IFELSEIF);
         return {
             treatment: constants_1.CONTROL,
-            label: LabelsConstants.UNSUPPORTED_MATCHER_TYPE
+            label: labels_1.UNSUPPORTED_MATCHER_TYPE
         };
     }
     function computeTreatment(predicateResults) {

package/cjs/evaluator/condition/index.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.conditionContext = void 0;
-var tslib_1 = require("tslib");
 var engineUtils_1 = require("./engineUtils");
 var thenable_1 = require("../../utils/promise/thenable");
-var LabelsConstants = (0, tslib_1.__importStar)(require("../../utils/labels"));
+var labels_1 = require("../../utils/labels");
 // Build Evaluation object if and only if matchingResult is true
 function match(log, matchingResult, bucketingKey, seed, treatments, label) {
     if (matchingResult) {
@@ -24,7 +23,7 @@ function conditionContext(log, matcherEvaluator, treatments, label, conditionTyp
         if (conditionType === 'ROLLOUT' && !(0, engineUtils_1.shouldApplyRollout)(trafficAllocation, key.bucketingKey, trafficAllocationSeed)) {
             return {
                 treatment: undefined,
-                label: LabelsConstants.NOT_IN_SPLIT
+                label: labels_1.NOT_IN_SPLIT
             };
         }
         // matcherEvaluator could be Async, this relays on matchers return value, so we need

package/cjs/evaluator/index.js

@@ -1,16 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateFeaturesByFlagSets = exports.evaluateFeatures = exports.evaluateFeature = void 0;
-var tslib_1 = require("tslib");
 var Engine_1 = require("./Engine");
 var thenable_1 = require("../utils/promise/thenable");
-var LabelsConstants = (0, tslib_1.__importStar)(require("../utils/labels"));
+var labels_1 = require("../utils/labels");
 var constants_1 = require("../utils/constants");
 var sets_1 = require("../utils/lang/sets");
 var constants_2 = require("../logger/constants");
 var treatmentException = {
     treatment: constants_1.CONTROL,
-    label: LabelsConstants.EXCEPTION,
+    label: labels_1.EXCEPTION,
     config: null
 };
 function treatmentsException(splitNames) {
@@ -94,13 +93,13 @@ exports.evaluateFeaturesByFlagSets = evaluateFeaturesByFlagSets;
 function getEvaluation(log, splitJSON, key, attributes, storage) {
     var evaluation = {
         treatment: constants_1.CONTROL,
-        label: LabelsConstants.SPLIT_NOT_FOUND,
+        label: labels_1.SPLIT_NOT_FOUND,
         config: null
     };
     if (splitJSON) {
         var split_1 = Engine_1.Engine.parse(log, splitJSON, storage);
         evaluation = split_1.getTreatment(key, attributes, evaluateFeature);
-        // If the storage is async and the evaluated split uses segment, evaluation is thenable
+        // If the storage is async and the evaluated flag uses segments or dependencies, evaluation is thenable
         if ((0, thenable_1.thenable)(evaluation)) {
             return evaluation.then(function (result) {
                 result.changeNumber = split_1.getChangeNumber();

package/cjs/evaluator/matchers/all.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.allMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
-function allMatcherContext(log) {
+function allMatcherContext() {
     return function allMatcher(runtimeAttr) {
-        log.debug(constants_1.ENGINE_MATCHER_ALL);
         return runtimeAttr != null;
     };
 }

package/cjs/evaluator/matchers/between.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.betweenMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
-function betweenMatcherContext(log, ruleVO) {
+function betweenMatcherContext(ruleVO) {
     return function betweenMatcher(runtimeAttr) {
         var isBetween = runtimeAttr >= ruleVO.start && runtimeAttr <= ruleVO.end;
-        log.debug(constants_1.ENGINE_MATCHER_BETWEEN, [runtimeAttr, ruleVO.start, ruleVO.end, isBetween]);
         return isBetween;
     };
 }

package/cjs/evaluator/matchers/boolean.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.booleanMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
-function booleanMatcherContext(log, ruleAttr) {
+function booleanMatcherContext(ruleAttr) {
     return function booleanMatcher(runtimeAttr) {
         var booleanMatches = ruleAttr === runtimeAttr;
-        log.debug(constants_1.ENGINE_MATCHER_BOOLEAN, [ruleAttr, runtimeAttr]);
         return booleanMatches;
     };
 }

package/cjs/evaluator/matchers/cont_all.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.containsAllSetMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var lang_1 = require("../../utils/lang");
-function containsAllSetMatcherContext(log, ruleAttr) {
+function containsAllSetMatcherContext(ruleAttr) {
     return function containsAllMatcher(runtimeAttr) {
         var containsAll = true;
         if (runtimeAttr.length < ruleAttr.length) {
@@ -18,7 +17,6 @@ function containsAllSetMatcherContext(log, ruleAttr) {
                 _loop_1(i);
             }
         }
-        log.debug(constants_1.ENGINE_MATCHER_CONTAINS_ALL, [runtimeAttr, ruleAttr, containsAll]);
         return containsAll;
     };
 }

package/cjs/evaluator/matchers/cont_any.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.containsAnySetMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var lang_1 = require("../../utils/lang");
-function containsAnySetMatcherContext(log, ruleAttr) {
+function containsAnySetMatcherContext(ruleAttr) {
     return function containsAnyMatcher(runtimeAttr) {
         var containsAny = false;
         var _loop_1 = function (i) {
@@ -13,7 +12,6 @@ function containsAnySetMatcherContext(log, ruleAttr) {
         for (var i = 0; i < ruleAttr.length && !containsAny; i++) {
             _loop_1(i);
         }
-        log.debug(constants_1.ENGINE_MATCHER_CONTAINS_ANY, [runtimeAttr, ruleAttr, containsAny]);
         return containsAny;
     };
 }

package/cjs/evaluator/matchers/cont_str.js

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.containsStringMatcherContext = void 0;
 var lang_1 = require("../../utils/lang");
-var constants_1 = require("../../logger/constants");
-function containsStringMatcherContext(log, ruleAttr) {
+function containsStringMatcherContext(ruleAttr) {
     return function containsStringMatcher(runtimeAttr) {
         var contains = ruleAttr.some(function (e) { return (0, lang_1.isString)(runtimeAttr) && runtimeAttr.indexOf(e) > -1; });
-        log.debug(constants_1.ENGINE_MATCHER_CONTAINS_STRING, [runtimeAttr, ruleAttr, contains]);
         return contains;
     };
 }

package/cjs/evaluator/matchers/dependency.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dependencyMatcherContext = void 0;
 var thenable_1 = require("../../utils/promise/thenable");
 var constants_1 = require("../../logger/constants");
-function dependencyMatcherContext(log, _a, storage) {
+function dependencyMatcherContext(_a, storage, log) {
     var split = _a.split, treatments = _a.treatments;
     function checkTreatment(evaluation, acceptableTreatments, parentName) {
         var matches = false;

package/cjs/evaluator/matchers/eq.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.equalToMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
-function equalToMatcherContext(log, ruleAttr) {
+function equalToMatcherContext(ruleAttr) {
     return function equalToMatcher(runtimeAttr) {
         var isEqual = runtimeAttr === ruleAttr;
-        log.debug(constants_1.ENGINE_MATCHER_EQUAL, [runtimeAttr, ruleAttr, isEqual]);
         return isEqual;
     };
 }

package/cjs/evaluator/matchers/eq_set.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.equalToSetMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var lang_1 = require("../../utils/lang");
-function equalToSetMatcherContext(log, ruleAttr) {
+function equalToSetMatcherContext(ruleAttr) {
     return function equalToSetMatcher(runtimeAttr) {
         // Length being the same is the first condition.
         var isEqual = runtimeAttr.length === ruleAttr.length;
@@ -15,7 +14,6 @@ function equalToSetMatcherContext(log, ruleAttr) {
         for (var i = 0; i < runtimeAttr.length && isEqual; i++) {
             _loop_1(i);
         }
-        log.debug(constants_1.ENGINE_MATCHER_EQUAL_TO_SET, [runtimeAttr, ruleAttr, isEqual]);
         return isEqual;
     };
 }

package/cjs/evaluator/matchers/ew.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.endsWithMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var lang_1 = require("../../utils/lang");
-function endsWithMatcherContext(log, ruleAttr) {
+function endsWithMatcherContext(ruleAttr) {
     return function endsWithMatcher(runtimeAttr) {
         var strEndsWith = ruleAttr.some(function (e) { return (0, lang_1.endsWith)(runtimeAttr, e); });
-        log.debug(constants_1.ENGINE_MATCHER_ENDS_WITH, [runtimeAttr, ruleAttr, strEndsWith]);
         return strEndsWith;
     };
 }

package/cjs/evaluator/matchers/gte.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.greaterThanEqualMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
-function greaterThanEqualMatcherContext(log, ruleAttr) {
+function greaterThanEqualMatcherContext(ruleAttr) {
     return function greaterThanEqualMatcher(runtimeAttr) {
         var isGreaterThanEqual = runtimeAttr >= ruleAttr;
-        log.debug(constants_1.ENGINE_MATCHER_GREATER, [runtimeAttr, ruleAttr, isGreaterThanEqual]);
         return isGreaterThanEqual;
     };
 }

package/cjs/evaluator/matchers/index.js

@@ -56,7 +56,7 @@ function matcherFactory(log, matcherDto, storage) {
     var matcherFn;
     // @ts-ignore
     if (matchers[type])
-        matcherFn = matchers[type](log, value, storage); // There is no index-out-of-bound exception in JavaScript
+        matcherFn = matchers[type](value, storage, log); // There is no index-out-of-bound exception in JavaScript
     return matcherFn;
 }
 exports.matcherFactory = matcherFactory;

package/cjs/evaluator/matchers/lte.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lessThanEqualMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
-function lessThanEqualMatcherContext(log, ruleAttr) {
+function lessThanEqualMatcherContext(ruleAttr) {
     return function lessThanEqualMatcher(runtimeAttr) {
         var isLessThanEqual = runtimeAttr <= ruleAttr;
-        log.debug(constants_1.ENGINE_MATCHER_LESS, [runtimeAttr, ruleAttr, isLessThanEqual]);
         return isLessThanEqual;
     };
 }

package/cjs/evaluator/matchers/part_of.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.partOfSetMatcherContext = void 0;
 var lang_1 = require("../../utils/lang");
-var constants_1 = require("../../logger/constants");
-function partOfSetMatcherContext(log, ruleAttr) {
+function partOfSetMatcherContext(ruleAttr) {
     return function partOfMatcher(runtimeAttr) {
         // To be part of the length should be minor or equal.
         var isPartOf = runtimeAttr.length <= ruleAttr.length;
@@ -15,7 +14,6 @@ function partOfSetMatcherContext(log, ruleAttr) {
         for (var i = 0; i < runtimeAttr.length && isPartOf; i++) {
             _loop_1(i);
         }
-        log.debug(constants_1.ENGINE_MATCHER_PART_OF, [runtimeAttr, ruleAttr, isPartOf]);
         return isPartOf;
     };
 }

package/cjs/evaluator/matchers/segment.js

@@ -2,19 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.segmentMatcherContext = void 0;
 var thenable_1 = require("../../utils/promise/thenable");
-var constants_1 = require("../../logger/constants");
-function segmentMatcherContext(log, segmentName, storage) {
+function segmentMatcherContext(segmentName, storage) {
     return function segmentMatcher(key) {
         var isInSegment = storage.segments.isInSegment(segmentName, key);
         if ((0, thenable_1.thenable)(isInSegment)) {
             isInSegment.then(function (result) {
-                log.debug(constants_1.ENGINE_MATCHER_SEGMENT, [segmentName, key, isInSegment]);
                 return result;
             });
         }
-        else {
-            log.debug(constants_1.ENGINE_MATCHER_SEGMENT, [segmentName, key, isInSegment]);
-        }
         return isInSegment;
     };
 }

package/cjs/evaluator/matchers/semver_between.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.betweenSemverMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var Semver_1 = require("../../utils/Semver");
-function betweenSemverMatcherContext(log, ruleAttr) {
+function betweenSemverMatcherContext(ruleAttr) {
     var startSemver = new Semver_1.Semver(ruleAttr.start);
     var endSemver = new Semver_1.Semver(ruleAttr.end);
     return function betweenSemverMatcher(runtimeAttr) {
         var runtimeSemver = new Semver_1.Semver(runtimeAttr);
         var isBetween = startSemver.compare(runtimeSemver) <= 0 && endSemver.compare(runtimeSemver) >= 0;
-        log.debug(constants_1.ENGINE_MATCHER_BETWEEN_SEMVER, [runtimeAttr, ruleAttr.start, ruleAttr.end, isBetween]);
         return isBetween;
     };
 }

package/cjs/evaluator/matchers/semver_eq.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.equalToSemverMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var Semver_1 = require("../../utils/Semver");
-function equalToSemverMatcherContext(log, ruleAttr) {
+function equalToSemverMatcherContext(ruleAttr) {
     var ruleSemver = new Semver_1.Semver(ruleAttr);
     return function equalToSemverMatcher(runtimeAttr) {
         var runtimeSemver = new Semver_1.Semver(runtimeAttr);
         var isEqual = ruleSemver.version === runtimeSemver.version;
-        log.debug(constants_1.ENGINE_MATCHER_EQUAL_SEMVER, [runtimeAttr, ruleAttr, isEqual]);
         return isEqual;
     };
 }

package/cjs/evaluator/matchers/semver_gte.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.greaterThanEqualToSemverMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var Semver_1 = require("../../utils/Semver");
-function greaterThanEqualToSemverMatcherContext(log, ruleAttr) {
+function greaterThanEqualToSemverMatcherContext(ruleAttr) {
     var ruleSemver = new Semver_1.Semver(ruleAttr);
     return function greaterThanEqualToSemverMatcher(runtimeAttr) {
         var runtimeSemver = new Semver_1.Semver(runtimeAttr);
         var isGreaterThanEqual = runtimeSemver.compare(ruleSemver) >= 0;
-        log.debug(constants_1.ENGINE_MATCHER_GREATER_SEMVER, [runtimeAttr, ruleAttr, isGreaterThanEqual]);
         return isGreaterThanEqual;
     };
 }

package/cjs/evaluator/matchers/semver_inlist.js

@@ -3,16 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.inListSemverMatcherContext = void 0;
 var sets_1 = require("../../utils/lang/sets");
 var Semver_1 = require("../../utils/Semver");
-var constants_1 = require("../../logger/constants");
-function inListSemverMatcherContext(log, ruleAttr) {
-    // @TODO move eventually to `matchersTransform` and validate for all matchers
-    if (!ruleAttr || ruleAttr.size === 0)
+function inListSemverMatcherContext(ruleAttr) {
+    // @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');
-    var listOfSemvers = new sets_1._Set((0, sets_1.setToArray)(ruleAttr).map(function (version) { return new Semver_1.Semver(version).version; }));
+    var listOfSemvers = new sets_1._Set(ruleAttr.map(function (version) { return new Semver_1.Semver(version).version; }));
     return function inListSemverMatcher(runtimeAttr) {
         var runtimeSemver = new Semver_1.Semver(runtimeAttr).version;
         var isInList = listOfSemvers.has(runtimeSemver);
-        log.debug(constants_1.ENGINE_MATCHER_IN_LIST_SEMVER, [runtimeAttr, (0, sets_1.setToArray)(ruleAttr).join(','), isInList]);
         return isInList;
     };
 }

package/cjs/evaluator/matchers/semver_lte.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lessThanEqualToSemverMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var Semver_1 = require("../../utils/Semver");
-function lessThanEqualToSemverMatcherContext(log, ruleAttr) {
+function lessThanEqualToSemverMatcherContext(ruleAttr) {
     var ruleSemver = new Semver_1.Semver(ruleAttr);
     return function lessThanEqualToSemverMatcher(runtimeAttr) {
         var runtimeSemver = new Semver_1.Semver(runtimeAttr);
         var isLessThanEqual = runtimeSemver.compare(ruleSemver) <= 0;
-        log.debug(constants_1.ENGINE_MATCHER_LESS_SEMVER, [runtimeAttr, ruleAttr, isLessThanEqual]);
         return isLessThanEqual;
     };
 }

package/cjs/evaluator/matchers/string.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
-function stringMatcherContext(log, ruleAttr) {
+function stringMatcherContext(ruleAttr) {
     var regex = new RegExp(ruleAttr);
     return function stringMatcher(runtimeAttr) {
         var regexMatches = regex.test(runtimeAttr);
-        log.debug(constants_1.ENGINE_MATCHER_STRING, [runtimeAttr, ruleAttr, regexMatches ? 'yes' : 'no']);
         return regexMatches;
     };
 }

package/cjs/evaluator/matchers/sw.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startsWithMatcherContext = void 0;
-var constants_1 = require("../../logger/constants");
 var lang_1 = require("../../utils/lang");
-function startsWithMatcherContext(log, ruleAttr) {
+function startsWithMatcherContext(ruleAttr) {
     return function startsWithMatcher(runtimeAttr) {
         var matches = ruleAttr.some(function (e) { return (0, lang_1.startsWith)(runtimeAttr, e); });
-        log.debug(constants_1.ENGINE_MATCHER_STARTS_WITH, [runtimeAttr, ruleAttr, matches]);
         return matches;
     };
 }

package/cjs/evaluator/matchers/whitelist.js

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.whitelistMatcherContext = void 0;
 var sets_1 = require("../../utils/lang/sets");
-var constants_1 = require("../../logger/constants");
-function whitelistMatcherContext(log, ruleAttr) {
+function whitelistMatcherContext(ruleAttr) {
+    var whitelistSet = new sets_1._Set(ruleAttr);
     return function whitelistMatcher(runtimeAttr) {
-        var isInWhitelist = ruleAttr.has(runtimeAttr);
-        log.debug(constants_1.ENGINE_MATCHER_WHITELIST, [runtimeAttr, (0, sets_1.setToArray)(ruleAttr).join(','), isInWhitelist]);
+        var isInWhitelist = whitelistSet.has(runtimeAttr);
         return isInWhitelist;
     };
 }

package/cjs/evaluator/matchersTransform/index.js

@@ -5,7 +5,6 @@ var lang_1 = require("../../utils/lang");
 var matcherTypes_1 = require("../matchers/matcherTypes");
 var segment_1 = require("./segment");
 var whitelist_1 = require("./whitelist");
-var set_1 = require("./set");
 var unaryNumeric_1 = require("./unaryNumeric");
 var convertions_1 = require("../convertions");
 /**
@@ -22,10 +21,6 @@ function matchersTransform(matchers) {
         if (type === matcherTypes_1.matcherTypes.IN_SEGMENT) {
             value = (0, segment_1.segmentTransform)(userDefinedSegmentMatcherData);
         }
-        else if (type === matcherTypes_1.matcherTypes.WHITELIST ||
-            type === matcherTypes_1.matcherTypes.IN_LIST_SEMVER) {
-            value = (0, whitelist_1.whitelistTransform)(whitelistMatcherData);
-        }
         else if (type === matcherTypes_1.matcherTypes.EQUAL_TO) {
             value = (0, unaryNumeric_1.numericTransform)(unaryNumericMatcherData);
             dataType = matcherTypes_1.matcherDataTypes.NUMBER;
@@ -59,13 +54,15 @@ function matchersTransform(matchers) {
             type === matcherTypes_1.matcherTypes.CONTAINS_ANY_OF_SET ||
             type === matcherTypes_1.matcherTypes.CONTAINS_ALL_OF_SET ||
             type === matcherTypes_1.matcherTypes.PART_OF_SET) {
-            value = (0, set_1.setTransform)(whitelistMatcherData);
+            value = (0, whitelist_1.whitelistTransform)(whitelistMatcherData);
             dataType = matcherTypes_1.matcherDataTypes.SET;
         }
-        else if (type === matcherTypes_1.matcherTypes.STARTS_WITH ||
+        else if (type === matcherTypes_1.matcherTypes.WHITELIST ||
+            type === matcherTypes_1.matcherTypes.IN_LIST_SEMVER ||
+            type === matcherTypes_1.matcherTypes.STARTS_WITH ||
             type === matcherTypes_1.matcherTypes.ENDS_WITH ||
             type === matcherTypes_1.matcherTypes.CONTAINS_STRING) {
-            value = (0, set_1.setTransform)(whitelistMatcherData);
+            value = (0, whitelist_1.whitelistTransform)(whitelistMatcherData);
         }
         else if (type === matcherTypes_1.matcherTypes.IN_SPLIT_TREATMENT) {
             value = dependencyMatcherData;
@@ -85,6 +82,7 @@ function matchersTransform(matchers) {
             attribute: attribute,
             negate: negate,
             type: type,
+            name: matcherType,
             value: value,
             dataType: dataType // runtime input data type
         };

package/cjs/evaluator/matchersTransform/whitelist.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.whitelistTransform = void 0;
-var sets_1 = require("../../utils/lang/sets");
 /**
- * Extract whitelist as a set. Used by 'WHITELIST' matcher.
+ * Extract whitelist array.
  */
 function whitelistTransform(whitelistObject) {
-    return new sets_1._Set(whitelistObject && whitelistObject.whitelist);
+    return whitelistObject && whitelistObject.whitelist;
 }
 exports.whitelistTransform = whitelistTransform;

package/cjs/evaluator/parser/index.js

@@ -12,18 +12,18 @@ var thenable_1 = require("../../utils/promise/thenable");
 var constants_1 = require("../../logger/constants");
 function parser(log, conditions, storage) {
     var predicates = [];
-    var _loop_1 = function (i) {
+    for (var i = 0; i < conditions.length; i++) {
         var _a = conditions[i], matcherGroup = _a.matcherGroup, partitions = _a.partitions, label = _a.label, conditionType = _a.conditionType;
         // transform data structure
         var matchers = (0, matchersTransform_1.matchersTransform)(matcherGroup.matchers);
         // create a set of pure functions from the matcher's dto
-        var expressions = matchers.map(function (matcherDto, index) {
+        var expressions = matchers.map(function (matcherDto) {
             var matcher;
             try {
                 matcher = (0, matchers_1.matcherFactory)(log, matcherDto, storage);
             }
             catch (error) {
-                log.error(constants_1.ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+                log.error(constants_1.ENGINE_MATCHER_ERROR, [matcherDto.name, error]);
             }
             // Evaluator function.
             return function (key, attributes, splitEvaluator) {
@@ -34,27 +34,26 @@ function parser(log, conditions, storage) {
                         result = matcher(value, splitEvaluator);
                     }
                     catch (error) {
-                        log.error(constants_1.ENGINE_MATCHER_ERROR, [matcherGroup.matchers[index].matcherType, error]);
+                        log.error(constants_1.ENGINE_MATCHER_ERROR, [matcherDto.name, error]);
                     }
                 }
-                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);
+                function handleResult(result) {
+                    log.debug(constants_1.ENGINE_MATCHER_RESULT, [matcherDto.name, result, matcherDto.value, value]); // @ts-ignore
+                    return Boolean(result ^ matcherDto.negate);
+                }
+                return (0, thenable_1.thenable)(result) ?
+                    result.then(handleResult) :
+                    handleResult(result);
             };
         });
         // if matcher's factory can't instantiate the matchers, the expressions array will be empty
         if (expressions.length === 0) {
             // reset any data collected during parsing
             predicates = [];
-            return "break";
+            // and break the loop
+            break;
         }
         predicates.push((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);