@splitsoftware/splitio-commons 1.13.2-rc.0 → 1.13.2-rc.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGES.txt +4 -3
- package/cjs/evaluator/Engine.js +5 -6
- package/cjs/evaluator/combiners/ifelseif.js +3 -4
- package/cjs/evaluator/condition/index.js +2 -3
- package/cjs/evaluator/index.js +4 -5
- package/cjs/evaluator/matchers/all.js +1 -3
- package/cjs/evaluator/matchers/between.js +1 -3
- package/cjs/evaluator/matchers/boolean.js +1 -3
- package/cjs/evaluator/matchers/cont_all.js +1 -3
- package/cjs/evaluator/matchers/cont_any.js +1 -3
- package/cjs/evaluator/matchers/cont_str.js +1 -3
- package/cjs/evaluator/matchers/dependency.js +1 -1
- package/cjs/evaluator/matchers/eq.js +1 -3
- package/cjs/evaluator/matchers/eq_set.js +1 -3
- package/cjs/evaluator/matchers/ew.js +1 -3
- package/cjs/evaluator/matchers/gte.js +3 -5
- package/cjs/evaluator/matchers/index.js +12 -2
- package/cjs/evaluator/matchers/lte.js +3 -5
- package/cjs/evaluator/matchers/matcherTypes.js +6 -1
- package/cjs/evaluator/matchers/part_of.js +1 -3
- package/cjs/evaluator/matchers/segment.js +1 -6
- package/cjs/evaluator/matchers/semver_between.js +14 -0
- package/cjs/evaluator/matchers/semver_eq.js +13 -0
- package/cjs/evaluator/matchers/semver_gte.js +13 -0
- package/cjs/evaluator/matchers/semver_inlist.js +17 -0
- package/cjs/evaluator/matchers/semver_lte.js +13 -0
- package/cjs/evaluator/matchers/string.js +3 -12
- package/cjs/evaluator/matchers/sw.js +1 -3
- package/cjs/evaluator/matchers/whitelist.js +3 -4
- package/cjs/evaluator/matchersTransform/index.js +21 -16
- package/cjs/evaluator/matchersTransform/whitelist.js +2 -3
- package/cjs/evaluator/parser/index.js +24 -9
- package/cjs/logger/constants.js +5 -20
- package/cjs/logger/index.js +8 -1
- package/cjs/logger/messages/debug.js +5 -21
- package/cjs/logger/messages/error.js +2 -1
- package/cjs/logger/messages/warn.js +1 -1
- package/cjs/sdkClient/sdkClient.js +1 -6
- package/cjs/services/splitApi.js +5 -5
- package/cjs/storages/KeyBuilder.js +2 -1
- package/cjs/storages/inLocalStorage/SplitsCacheInLocal.js +1 -1
- package/cjs/storages/pluggable/index.js +1 -1
- package/cjs/utils/Semver.js +103 -0
- package/cjs/utils/constants/index.js +2 -1
- package/cjs/utils/labels/index.js +1 -1
- package/cjs/utils/settingsValidation/index.js +1 -1
- package/cjs/utils/settingsValidation/logger/pluggableLogger.js +1 -1
- package/esm/evaluator/Engine.js +5 -5
- package/esm/evaluator/combiners/ifelseif.js +3 -3
- package/esm/evaluator/condition/index.js +2 -2
- package/esm/evaluator/index.js +4 -4
- package/esm/evaluator/matchers/all.js +1 -3
- package/esm/evaluator/matchers/between.js +1 -3
- package/esm/evaluator/matchers/boolean.js +1 -3
- package/esm/evaluator/matchers/cont_all.js +1 -3
- package/esm/evaluator/matchers/cont_any.js +1 -3
- package/esm/evaluator/matchers/cont_str.js +1 -3
- package/esm/evaluator/matchers/dependency.js +1 -1
- package/esm/evaluator/matchers/eq.js +1 -3
- package/esm/evaluator/matchers/eq_set.js +1 -3
- package/esm/evaluator/matchers/ew.js +1 -3
- package/esm/evaluator/matchers/gte.js +3 -5
- package/esm/evaluator/matchers/index.js +12 -2
- package/esm/evaluator/matchers/lte.js +3 -5
- package/esm/evaluator/matchers/matcherTypes.js +6 -1
- package/esm/evaluator/matchers/part_of.js +1 -3
- package/esm/evaluator/matchers/segment.js +1 -6
- package/esm/evaluator/matchers/semver_between.js +10 -0
- package/esm/evaluator/matchers/semver_eq.js +9 -0
- package/esm/evaluator/matchers/semver_gte.js +9 -0
- package/esm/evaluator/matchers/semver_inlist.js +13 -0
- package/esm/evaluator/matchers/semver_lte.js +9 -0
- package/esm/evaluator/matchers/string.js +3 -12
- package/esm/evaluator/matchers/sw.js +1 -3
- package/esm/evaluator/matchers/whitelist.js +4 -5
- package/esm/evaluator/matchersTransform/index.js +21 -16
- package/esm/evaluator/matchersTransform/whitelist.js +2 -3
- package/esm/evaluator/parser/index.js +24 -9
- package/esm/logger/constants.js +2 -17
- package/esm/logger/index.js +9 -2
- package/esm/logger/messages/debug.js +5 -21
- package/esm/logger/messages/error.js +2 -1
- package/esm/logger/messages/warn.js +1 -1
- package/esm/sdkClient/sdkClient.js +1 -6
- package/esm/services/splitApi.js +6 -6
- package/esm/storages/KeyBuilder.js +2 -1
- package/esm/storages/inLocalStorage/SplitsCacheInLocal.js +1 -1
- package/esm/storages/pluggable/index.js +1 -1
- package/esm/utils/Semver.js +100 -0
- package/esm/utils/constants/index.js +1 -0
- package/esm/utils/labels/index.js +1 -1
- package/esm/utils/settingsValidation/index.js +1 -1
- package/esm/utils/settingsValidation/logger/pluggableLogger.js +1 -1
- package/package.json +1 -2
- package/src/dtos/types.ts +34 -1
- package/src/evaluator/Engine.ts +5 -6
- package/src/evaluator/combiners/ifelseif.ts +3 -3
- package/src/evaluator/condition/index.ts +2 -2
- package/src/evaluator/index.ts +4 -4
- package/src/evaluator/matchers/all.ts +1 -5
- package/src/evaluator/matchers/between.ts +3 -7
- package/src/evaluator/matchers/boolean.ts +2 -6
- package/src/evaluator/matchers/cont_all.ts +1 -5
- package/src/evaluator/matchers/cont_any.ts +1 -5
- package/src/evaluator/matchers/cont_str.ts +2 -6
- package/src/evaluator/matchers/dependency.ts +1 -1
- package/src/evaluator/matchers/eq.ts +2 -6
- package/src/evaluator/matchers/eq_set.ts +1 -5
- package/src/evaluator/matchers/ew.ts +2 -6
- package/src/evaluator/matchers/gte.ts +3 -7
- package/src/evaluator/matchers/index.ts +29 -19
- package/src/evaluator/matchers/lte.ts +3 -7
- package/src/evaluator/matchers/matcherTypes.ts +6 -1
- package/src/evaluator/matchers/part_of.ts +1 -5
- package/src/evaluator/matchers/segment.ts +1 -8
- package/src/evaluator/matchers/semver_between.ts +15 -0
- package/src/evaluator/matchers/semver_eq.ts +13 -0
- package/src/evaluator/matchers/semver_gte.ts +13 -0
- package/src/evaluator/matchers/semver_inlist.ts +17 -0
- package/src/evaluator/matchers/semver_lte.ts +13 -0
- package/src/evaluator/matchers/string.ts +3 -16
- package/src/evaluator/matchers/sw.ts +2 -6
- package/src/evaluator/matchers/whitelist.ts +5 -7
- package/src/evaluator/matchersTransform/index.ts +31 -23
- package/src/evaluator/matchersTransform/whitelist.ts +4 -5
- package/src/evaluator/parser/index.ts +25 -10
- package/src/evaluator/types.ts +3 -3
- package/src/logger/constants.ts +2 -17
- package/src/logger/index.ts +8 -2
- package/src/logger/messages/debug.ts +5 -21
- package/src/logger/messages/error.ts +2 -1
- package/src/logger/messages/warn.ts +1 -1
- package/src/sdkClient/sdkClient.ts +1 -8
- package/src/services/splitApi.ts +5 -6
- package/src/storages/KeyBuilder.ts +2 -1
- package/src/storages/inLocalStorage/SplitsCacheInLocal.ts +1 -1
- package/src/storages/pluggable/index.ts +1 -1
- package/src/types.ts +3 -3
- package/src/utils/Semver.ts +111 -0
- package/src/utils/constants/index.ts +2 -0
- package/src/utils/labels/index.ts +1 -1
- package/src/utils/settingsValidation/index.ts +1 -1
- package/src/utils/settingsValidation/logger/pluggableLogger.ts +1 -1
- package/types/dtos/types.d.ts +26 -1
- package/types/evaluator/matchers/all.d.ts +1 -2
- package/types/evaluator/matchers/between.d.ts +1 -2
- package/types/evaluator/matchers/boolean.d.ts +1 -2
- package/types/evaluator/matchers/cont_all.d.ts +1 -2
- package/types/evaluator/matchers/cont_any.d.ts +1 -2
- package/types/evaluator/matchers/cont_str.d.ts +1 -2
- package/types/evaluator/matchers/dependency.d.ts +1 -1
- package/types/evaluator/matchers/eq.d.ts +1 -2
- package/types/evaluator/matchers/eq_set.d.ts +1 -2
- package/types/evaluator/matchers/ew.d.ts +1 -2
- package/types/evaluator/matchers/gte.d.ts +1 -2
- package/types/evaluator/matchers/lte.d.ts +1 -2
- package/types/evaluator/matchers/part_of.d.ts +1 -2
- package/types/evaluator/matchers/segment.d.ts +1 -2
- package/types/evaluator/matchers/sember_inlist.d.ts +3 -0
- package/types/evaluator/matchers/semver_between.d.ts +2 -0
- package/types/evaluator/matchers/semver_eq.d.ts +1 -0
- package/types/evaluator/matchers/semver_gte.d.ts +1 -0
- package/types/evaluator/matchers/semver_inlist.d.ts +1 -0
- package/types/evaluator/matchers/semver_lte.d.ts +1 -0
- package/types/evaluator/matchers/string.d.ts +1 -2
- package/types/evaluator/matchers/sw.d.ts +1 -2
- package/types/evaluator/matchers/whitelist.d.ts +1 -3
- package/types/evaluator/matchersTransform/set.d.ts +2 -2
- package/types/evaluator/matchersTransform/string.d.ts +7 -0
- package/types/evaluator/matchersTransform/whitelist.d.ts +3 -3
- package/types/evaluator/types.d.ts +3 -3
- package/types/logger/constants.d.ts +2 -17
- package/types/types.d.ts +3 -3
- package/types/utils/constants/index.d.ts +1 -0
- package/types/utils/labels/index.d.ts +1 -1
- package/types/utils/semVer.d.ts +15 -0
- package/types/utils/settingsValidation/logger/globalLogLevel.d.ts +8 -0
- package/cjs/evaluator/matchersTransform/set.js +0 -10
- package/esm/evaluator/matchersTransform/set.js +0 -6
- package/src/evaluator/matchersTransform/set.ts +0 -8
package/CHANGES.txt
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
1.14.0 (
|
|
2
|
-
-
|
|
3
|
-
-
|
|
1
|
+
1.14.0 (May 3, 2024)
|
|
2
|
+
- Added support for targeting rules based on semantic versions (https://semver.org/).
|
|
3
|
+
- Added special impression label "targeting rule type unsupported by sdk" when the matcher type is not supported by the SDK, which returns 'control' treatment.
|
|
4
|
+
- Updated Split API client to include the flags spec version query parameter for the `splitChanges` and `auth` endpoints.
|
|
4
5
|
|
|
5
6
|
1.13.1 (January 10, 2024)
|
|
6
7
|
- 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
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Engine = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
4
|
var lang_1 = require("../utils/lang");
|
|
6
5
|
var parser_1 = require("./parser");
|
|
7
6
|
var key_1 = require("../utils/key");
|
|
8
7
|
var thenable_1 = require("../utils/promise/thenable");
|
|
9
|
-
var
|
|
8
|
+
var labels_1 = require("../utils/labels");
|
|
10
9
|
var constants_1 = require("../utils/constants");
|
|
11
10
|
function evaluationResult(result, defaultTreatment) {
|
|
12
11
|
return {
|
|
13
12
|
treatment: (0, lang_1.get)(result, 'treatment', defaultTreatment),
|
|
14
|
-
label: (0, lang_1.get)(result, 'label',
|
|
13
|
+
label: (0, lang_1.get)(result, 'label', labels_1.NO_CONDITION_MATCH)
|
|
15
14
|
};
|
|
16
15
|
}
|
|
17
16
|
var Engine = /** @class */ (function () {
|
|
@@ -42,16 +41,16 @@ var Engine = /** @class */ (function () {
|
|
|
42
41
|
catch (err) {
|
|
43
42
|
return {
|
|
44
43
|
treatment: constants_1.CONTROL,
|
|
45
|
-
label:
|
|
44
|
+
label: labels_1.EXCEPTION
|
|
46
45
|
};
|
|
47
46
|
}
|
|
48
47
|
if (this.isGarbage()) {
|
|
49
48
|
treatment = constants_1.CONTROL;
|
|
50
|
-
label =
|
|
49
|
+
label = labels_1.SPLIT_ARCHIVED;
|
|
51
50
|
}
|
|
52
51
|
else if (killed) {
|
|
53
52
|
treatment = defaultTreatment;
|
|
54
|
-
label =
|
|
53
|
+
label = labels_1.SPLIT_KILLED;
|
|
55
54
|
}
|
|
56
55
|
else {
|
|
57
56
|
var evaluation = this.evaluator(parsedKey, seed, trafficAllocation, trafficAllocationSeed, attributes, splitEvaluator);
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ifElseIfCombinerContext = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
4
|
var lang_1 = require("../../utils/lang");
|
|
6
5
|
var thenable_1 = require("../../utils/promise/thenable");
|
|
7
|
-
var
|
|
6
|
+
var labels_1 = require("../../utils/labels");
|
|
8
7
|
var constants_1 = require("../../utils/constants");
|
|
9
8
|
var constants_2 = require("../../logger/constants");
|
|
10
9
|
function ifElseIfCombinerContext(log, predicates) {
|
|
@@ -12,7 +11,7 @@ function ifElseIfCombinerContext(log, predicates) {
|
|
|
12
11
|
log.error(constants_2.ERROR_ENGINE_COMBINER_IFELSEIF);
|
|
13
12
|
return {
|
|
14
13
|
treatment: constants_1.CONTROL,
|
|
15
|
-
label:
|
|
14
|
+
label: labels_1.UNSUPPORTED_MATCHER_TYPE
|
|
16
15
|
};
|
|
17
16
|
}
|
|
18
17
|
function computeTreatment(predicateResults) {
|
|
@@ -39,7 +38,7 @@ function ifElseIfCombinerContext(log, predicates) {
|
|
|
39
38
|
return computeTreatment(predicateResults);
|
|
40
39
|
}
|
|
41
40
|
// if there is none predicates, then there was an error in parsing phase
|
|
42
|
-
if (!Array.isArray(predicates) ||
|
|
41
|
+
if (!Array.isArray(predicates) || predicates.length === 0) {
|
|
43
42
|
return unexpectedInputHandler;
|
|
44
43
|
}
|
|
45
44
|
else {
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.conditionContext = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
4
|
var engineUtils_1 = require("./engineUtils");
|
|
6
5
|
var thenable_1 = require("../../utils/promise/thenable");
|
|
7
|
-
var
|
|
6
|
+
var labels_1 = require("../../utils/labels");
|
|
8
7
|
// Build Evaluation object if and only if matchingResult is true
|
|
9
8
|
function match(log, matchingResult, bucketingKey, seed, treatments, label) {
|
|
10
9
|
if (matchingResult) {
|
|
@@ -24,7 +23,7 @@ function conditionContext(log, matcherEvaluator, treatments, label, conditionTyp
|
|
|
24
23
|
if (conditionType === 'ROLLOUT' && !(0, engineUtils_1.shouldApplyRollout)(trafficAllocation, key.bucketingKey, trafficAllocationSeed)) {
|
|
25
24
|
return {
|
|
26
25
|
treatment: undefined,
|
|
27
|
-
label:
|
|
26
|
+
label: labels_1.NOT_IN_SPLIT
|
|
28
27
|
};
|
|
29
28
|
}
|
|
30
29
|
// matcherEvaluator could be Async, this relays on matchers return value, so we need
|
package/cjs/evaluator/index.js
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.evaluateFeaturesByFlagSets = exports.evaluateFeatures = exports.evaluateFeature = void 0;
|
|
4
|
-
var tslib_1 = require("tslib");
|
|
5
4
|
var Engine_1 = require("./Engine");
|
|
6
5
|
var thenable_1 = require("../utils/promise/thenable");
|
|
7
|
-
var
|
|
6
|
+
var labels_1 = require("../utils/labels");
|
|
8
7
|
var constants_1 = require("../utils/constants");
|
|
9
8
|
var sets_1 = require("../utils/lang/sets");
|
|
10
9
|
var constants_2 = require("../logger/constants");
|
|
11
10
|
var treatmentException = {
|
|
12
11
|
treatment: constants_1.CONTROL,
|
|
13
|
-
label:
|
|
12
|
+
label: labels_1.EXCEPTION,
|
|
14
13
|
config: null
|
|
15
14
|
};
|
|
16
15
|
function treatmentsException(splitNames) {
|
|
@@ -94,13 +93,13 @@ exports.evaluateFeaturesByFlagSets = evaluateFeaturesByFlagSets;
|
|
|
94
93
|
function getEvaluation(log, splitJSON, key, attributes, storage) {
|
|
95
94
|
var evaluation = {
|
|
96
95
|
treatment: constants_1.CONTROL,
|
|
97
|
-
label:
|
|
96
|
+
label: labels_1.SPLIT_NOT_FOUND,
|
|
98
97
|
config: null
|
|
99
98
|
};
|
|
100
99
|
if (splitJSON) {
|
|
101
100
|
var split_1 = Engine_1.Engine.parse(log, splitJSON, storage);
|
|
102
101
|
evaluation = split_1.getTreatment(key, attributes, evaluateFeature);
|
|
103
|
-
// If the storage is async and the evaluated
|
|
102
|
+
// If the storage is async and the evaluated flag uses segments or dependencies, evaluation is thenable
|
|
104
103
|
if ((0, thenable_1.thenable)(evaluation)) {
|
|
105
104
|
return evaluation.then(function (result) {
|
|
106
105
|
result.changeNumber = split_1.getChangeNumber();
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.allMatcherContext = void 0;
|
|
4
|
-
|
|
5
|
-
function allMatcherContext(log) {
|
|
4
|
+
function allMatcherContext() {
|
|
6
5
|
return function allMatcher(runtimeAttr) {
|
|
7
|
-
log.debug(constants_1.ENGINE_MATCHER_ALL);
|
|
8
6
|
return runtimeAttr != null;
|
|
9
7
|
};
|
|
10
8
|
}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.betweenMatcherContext = void 0;
|
|
4
|
-
|
|
5
|
-
function betweenMatcherContext(log, ruleVO) {
|
|
4
|
+
function betweenMatcherContext(ruleVO) {
|
|
6
5
|
return function betweenMatcher(runtimeAttr) {
|
|
7
6
|
var isBetween = runtimeAttr >= ruleVO.start && runtimeAttr <= ruleVO.end;
|
|
8
|
-
log.debug(constants_1.ENGINE_MATCHER_BETWEEN, [runtimeAttr, ruleVO.start, ruleVO.end, isBetween]);
|
|
9
7
|
return isBetween;
|
|
10
8
|
};
|
|
11
9
|
}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.booleanMatcherContext = void 0;
|
|
4
|
-
|
|
5
|
-
function booleanMatcherContext(log, ruleAttr) {
|
|
4
|
+
function booleanMatcherContext(ruleAttr) {
|
|
6
5
|
return function booleanMatcher(runtimeAttr) {
|
|
7
6
|
var booleanMatches = ruleAttr === runtimeAttr;
|
|
8
|
-
log.debug(constants_1.ENGINE_MATCHER_BOOLEAN, [ruleAttr, runtimeAttr]);
|
|
9
7
|
return booleanMatches;
|
|
10
8
|
};
|
|
11
9
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.containsAllSetMatcherContext = void 0;
|
|
4
|
-
var constants_1 = require("../../logger/constants");
|
|
5
4
|
var lang_1 = require("../../utils/lang");
|
|
6
|
-
function containsAllSetMatcherContext(
|
|
5
|
+
function containsAllSetMatcherContext(ruleAttr) {
|
|
7
6
|
return function containsAllMatcher(runtimeAttr) {
|
|
8
7
|
var containsAll = true;
|
|
9
8
|
if (runtimeAttr.length < ruleAttr.length) {
|
|
@@ -18,7 +17,6 @@ function containsAllSetMatcherContext(log, ruleAttr) {
|
|
|
18
17
|
_loop_1(i);
|
|
19
18
|
}
|
|
20
19
|
}
|
|
21
|
-
log.debug(constants_1.ENGINE_MATCHER_CONTAINS_ALL, [runtimeAttr, ruleAttr, containsAll]);
|
|
22
20
|
return containsAll;
|
|
23
21
|
};
|
|
24
22
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.containsAnySetMatcherContext = void 0;
|
|
4
|
-
var constants_1 = require("../../logger/constants");
|
|
5
4
|
var lang_1 = require("../../utils/lang");
|
|
6
|
-
function containsAnySetMatcherContext(
|
|
5
|
+
function containsAnySetMatcherContext(ruleAttr) {
|
|
7
6
|
return function containsAnyMatcher(runtimeAttr) {
|
|
8
7
|
var containsAny = false;
|
|
9
8
|
var _loop_1 = function (i) {
|
|
@@ -13,7 +12,6 @@ function containsAnySetMatcherContext(log, ruleAttr) {
|
|
|
13
12
|
for (var i = 0; i < ruleAttr.length && !containsAny; i++) {
|
|
14
13
|
_loop_1(i);
|
|
15
14
|
}
|
|
16
|
-
log.debug(constants_1.ENGINE_MATCHER_CONTAINS_ANY, [runtimeAttr, ruleAttr, containsAny]);
|
|
17
15
|
return containsAny;
|
|
18
16
|
};
|
|
19
17
|
}
|
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.containsStringMatcherContext = void 0;
|
|
4
4
|
var lang_1 = require("../../utils/lang");
|
|
5
|
-
|
|
6
|
-
function containsStringMatcherContext(log, ruleAttr) {
|
|
5
|
+
function containsStringMatcherContext(ruleAttr) {
|
|
7
6
|
return function containsStringMatcher(runtimeAttr) {
|
|
8
7
|
var contains = ruleAttr.some(function (e) { return (0, lang_1.isString)(runtimeAttr) && runtimeAttr.indexOf(e) > -1; });
|
|
9
|
-
log.debug(constants_1.ENGINE_MATCHER_CONTAINS_STRING, [runtimeAttr, ruleAttr, contains]);
|
|
10
8
|
return contains;
|
|
11
9
|
};
|
|
12
10
|
}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.dependencyMatcherContext = void 0;
|
|
4
4
|
var thenable_1 = require("../../utils/promise/thenable");
|
|
5
5
|
var constants_1 = require("../../logger/constants");
|
|
6
|
-
function dependencyMatcherContext(
|
|
6
|
+
function dependencyMatcherContext(_a, storage, log) {
|
|
7
7
|
var split = _a.split, treatments = _a.treatments;
|
|
8
8
|
function checkTreatment(evaluation, acceptableTreatments, parentName) {
|
|
9
9
|
var matches = false;
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.equalToMatcherContext = void 0;
|
|
4
|
-
|
|
5
|
-
function equalToMatcherContext(log, ruleAttr) {
|
|
4
|
+
function equalToMatcherContext(ruleAttr) {
|
|
6
5
|
return function equalToMatcher(runtimeAttr) {
|
|
7
6
|
var isEqual = runtimeAttr === ruleAttr;
|
|
8
|
-
log.debug(constants_1.ENGINE_MATCHER_EQUAL, [runtimeAttr, ruleAttr, isEqual]);
|
|
9
7
|
return isEqual;
|
|
10
8
|
};
|
|
11
9
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.equalToSetMatcherContext = void 0;
|
|
4
|
-
var constants_1 = require("../../logger/constants");
|
|
5
4
|
var lang_1 = require("../../utils/lang");
|
|
6
|
-
function equalToSetMatcherContext(
|
|
5
|
+
function equalToSetMatcherContext(ruleAttr) {
|
|
7
6
|
return function equalToSetMatcher(runtimeAttr) {
|
|
8
7
|
// Length being the same is the first condition.
|
|
9
8
|
var isEqual = runtimeAttr.length === ruleAttr.length;
|
|
@@ -15,7 +14,6 @@ function equalToSetMatcherContext(log, ruleAttr) {
|
|
|
15
14
|
for (var i = 0; i < runtimeAttr.length && isEqual; i++) {
|
|
16
15
|
_loop_1(i);
|
|
17
16
|
}
|
|
18
|
-
log.debug(constants_1.ENGINE_MATCHER_EQUAL_TO_SET, [runtimeAttr, ruleAttr, isEqual]);
|
|
19
17
|
return isEqual;
|
|
20
18
|
};
|
|
21
19
|
}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.endsWithMatcherContext = void 0;
|
|
4
|
-
var constants_1 = require("../../logger/constants");
|
|
5
4
|
var lang_1 = require("../../utils/lang");
|
|
6
|
-
function endsWithMatcherContext(
|
|
5
|
+
function endsWithMatcherContext(ruleAttr) {
|
|
7
6
|
return function endsWithMatcher(runtimeAttr) {
|
|
8
7
|
var strEndsWith = ruleAttr.some(function (e) { return (0, lang_1.endsWith)(runtimeAttr, e); });
|
|
9
|
-
log.debug(constants_1.ENGINE_MATCHER_ENDS_WITH, [runtimeAttr, ruleAttr, strEndsWith]);
|
|
10
8
|
return strEndsWith;
|
|
11
9
|
};
|
|
12
10
|
}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.greaterThanEqualMatcherContext = void 0;
|
|
4
|
-
|
|
5
|
-
function greaterThanEqualMatcherContext(log, ruleAttr) {
|
|
4
|
+
function greaterThanEqualMatcherContext(ruleAttr) {
|
|
6
5
|
return function greaterThanEqualMatcher(runtimeAttr) {
|
|
7
|
-
var
|
|
8
|
-
|
|
9
|
-
return isGreaterEqualThan;
|
|
6
|
+
var isGreaterThanEqual = runtimeAttr >= ruleAttr;
|
|
7
|
+
return isGreaterThanEqual;
|
|
10
8
|
};
|
|
11
9
|
}
|
|
12
10
|
exports.greaterThanEqualMatcherContext = greaterThanEqualMatcherContext;
|
|
@@ -18,6 +18,11 @@ var cont_str_1 = require("./cont_str");
|
|
|
18
18
|
var dependency_1 = require("./dependency");
|
|
19
19
|
var boolean_1 = require("./boolean");
|
|
20
20
|
var string_1 = require("./string");
|
|
21
|
+
var semver_eq_1 = require("./semver_eq");
|
|
22
|
+
var semver_gte_1 = require("./semver_gte");
|
|
23
|
+
var semver_lte_1 = require("./semver_lte");
|
|
24
|
+
var semver_between_1 = require("./semver_between");
|
|
25
|
+
var semver_inlist_1 = require("./semver_inlist");
|
|
21
26
|
var matchers = [
|
|
22
27
|
undefined,
|
|
23
28
|
all_1.allMatcherContext,
|
|
@@ -36,7 +41,12 @@ var matchers = [
|
|
|
36
41
|
cont_str_1.containsStringMatcherContext,
|
|
37
42
|
dependency_1.dependencyMatcherContext,
|
|
38
43
|
boolean_1.booleanMatcherContext,
|
|
39
|
-
string_1.stringMatcherContext
|
|
44
|
+
string_1.stringMatcherContext,
|
|
45
|
+
semver_eq_1.equalToSemverMatcherContext,
|
|
46
|
+
semver_gte_1.greaterThanEqualToSemverMatcherContext,
|
|
47
|
+
semver_lte_1.lessThanEqualToSemverMatcherContext,
|
|
48
|
+
semver_between_1.betweenSemverMatcherContext,
|
|
49
|
+
semver_inlist_1.inListSemverMatcherContext, // IN_LIST_SEMVER: 22
|
|
40
50
|
];
|
|
41
51
|
/**
|
|
42
52
|
* Matcher factory.
|
|
@@ -46,7 +56,7 @@ function matcherFactory(log, matcherDto, storage) {
|
|
|
46
56
|
var matcherFn;
|
|
47
57
|
// @ts-ignore
|
|
48
58
|
if (matchers[type])
|
|
49
|
-
matcherFn = matchers[type](
|
|
59
|
+
matcherFn = matchers[type](value, storage, log); // There is no index-out-of-bound exception in JavaScript
|
|
50
60
|
return matcherFn;
|
|
51
61
|
}
|
|
52
62
|
exports.matcherFactory = matcherFactory;
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.lessThanEqualMatcherContext = void 0;
|
|
4
|
-
|
|
5
|
-
function lessThanEqualMatcherContext(log, ruleAttr) {
|
|
4
|
+
function lessThanEqualMatcherContext(ruleAttr) {
|
|
6
5
|
return function lessThanEqualMatcher(runtimeAttr) {
|
|
7
|
-
var
|
|
8
|
-
|
|
9
|
-
return isLessEqualThan;
|
|
6
|
+
var isLessThanEqual = runtimeAttr <= ruleAttr;
|
|
7
|
+
return isLessThanEqual;
|
|
10
8
|
};
|
|
11
9
|
}
|
|
12
10
|
exports.lessThanEqualMatcherContext = lessThanEqualMatcherContext;
|
|
@@ -19,7 +19,12 @@ exports.matcherTypes = {
|
|
|
19
19
|
CONTAINS_STRING: 14,
|
|
20
20
|
IN_SPLIT_TREATMENT: 15,
|
|
21
21
|
EQUAL_TO_BOOLEAN: 16,
|
|
22
|
-
MATCHES_STRING: 17
|
|
22
|
+
MATCHES_STRING: 17,
|
|
23
|
+
EQUAL_TO_SEMVER: 18,
|
|
24
|
+
GREATER_THAN_OR_EQUAL_TO_SEMVER: 19,
|
|
25
|
+
LESS_THAN_OR_EQUAL_TO_SEMVER: 20,
|
|
26
|
+
BETWEEN_SEMVER: 21,
|
|
27
|
+
IN_LIST_SEMVER: 22,
|
|
23
28
|
};
|
|
24
29
|
exports.matcherDataTypes = {
|
|
25
30
|
BOOLEAN: 'BOOLEAN',
|
|
@@ -2,8 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.partOfSetMatcherContext = void 0;
|
|
4
4
|
var lang_1 = require("../../utils/lang");
|
|
5
|
-
|
|
6
|
-
function partOfSetMatcherContext(log, ruleAttr) {
|
|
5
|
+
function partOfSetMatcherContext(ruleAttr) {
|
|
7
6
|
return function partOfMatcher(runtimeAttr) {
|
|
8
7
|
// To be part of the length should be minor or equal.
|
|
9
8
|
var isPartOf = runtimeAttr.length <= ruleAttr.length;
|
|
@@ -15,7 +14,6 @@ function partOfSetMatcherContext(log, ruleAttr) {
|
|
|
15
14
|
for (var i = 0; i < runtimeAttr.length && isPartOf; i++) {
|
|
16
15
|
_loop_1(i);
|
|
17
16
|
}
|
|
18
|
-
log.debug(constants_1.ENGINE_MATCHER_PART_OF, [runtimeAttr, ruleAttr, isPartOf]);
|
|
19
17
|
return isPartOf;
|
|
20
18
|
};
|
|
21
19
|
}
|
|
@@ -2,19 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.segmentMatcherContext = void 0;
|
|
4
4
|
var thenable_1 = require("../../utils/promise/thenable");
|
|
5
|
-
|
|
6
|
-
function segmentMatcherContext(log, segmentName, storage) {
|
|
5
|
+
function segmentMatcherContext(segmentName, storage) {
|
|
7
6
|
return function segmentMatcher(key) {
|
|
8
7
|
var isInSegment = storage.segments.isInSegment(segmentName, key);
|
|
9
8
|
if ((0, thenable_1.thenable)(isInSegment)) {
|
|
10
9
|
isInSegment.then(function (result) {
|
|
11
|
-
log.debug(constants_1.ENGINE_MATCHER_SEGMENT, [segmentName, key, isInSegment]);
|
|
12
10
|
return result;
|
|
13
11
|
});
|
|
14
12
|
}
|
|
15
|
-
else {
|
|
16
|
-
log.debug(constants_1.ENGINE_MATCHER_SEGMENT, [segmentName, key, isInSegment]);
|
|
17
|
-
}
|
|
18
13
|
return isInSegment;
|
|
19
14
|
};
|
|
20
15
|
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.betweenSemverMatcherContext = void 0;
|
|
4
|
+
var Semver_1 = require("../../utils/Semver");
|
|
5
|
+
function betweenSemverMatcherContext(ruleAttr) {
|
|
6
|
+
var startSemver = new Semver_1.Semver(ruleAttr.start);
|
|
7
|
+
var endSemver = new Semver_1.Semver(ruleAttr.end);
|
|
8
|
+
return function betweenSemverMatcher(runtimeAttr) {
|
|
9
|
+
var runtimeSemver = new Semver_1.Semver(runtimeAttr);
|
|
10
|
+
var isBetween = startSemver.compare(runtimeSemver) <= 0 && endSemver.compare(runtimeSemver) >= 0;
|
|
11
|
+
return isBetween;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
exports.betweenSemverMatcherContext = betweenSemverMatcherContext;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.equalToSemverMatcherContext = void 0;
|
|
4
|
+
var Semver_1 = require("../../utils/Semver");
|
|
5
|
+
function equalToSemverMatcherContext(ruleAttr) {
|
|
6
|
+
var ruleSemver = new Semver_1.Semver(ruleAttr);
|
|
7
|
+
return function equalToSemverMatcher(runtimeAttr) {
|
|
8
|
+
var runtimeSemver = new Semver_1.Semver(runtimeAttr);
|
|
9
|
+
var isEqual = ruleSemver.version === runtimeSemver.version;
|
|
10
|
+
return isEqual;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
exports.equalToSemverMatcherContext = equalToSemverMatcherContext;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.greaterThanEqualToSemverMatcherContext = void 0;
|
|
4
|
+
var Semver_1 = require("../../utils/Semver");
|
|
5
|
+
function greaterThanEqualToSemverMatcherContext(ruleAttr) {
|
|
6
|
+
var ruleSemver = new Semver_1.Semver(ruleAttr);
|
|
7
|
+
return function greaterThanEqualToSemverMatcher(runtimeAttr) {
|
|
8
|
+
var runtimeSemver = new Semver_1.Semver(runtimeAttr);
|
|
9
|
+
var isGreaterThanEqual = runtimeSemver.compare(ruleSemver) >= 0;
|
|
10
|
+
return isGreaterThanEqual;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
exports.greaterThanEqualToSemverMatcherContext = greaterThanEqualToSemverMatcherContext;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.inListSemverMatcherContext = void 0;
|
|
4
|
+
var sets_1 = require("../../utils/lang/sets");
|
|
5
|
+
var Semver_1 = require("../../utils/Semver");
|
|
6
|
+
function inListSemverMatcherContext(ruleAttr) {
|
|
7
|
+
// @TODO ruleAttr validation should be done at the `parser` or `matchersTransform` level to reuse for all matchers
|
|
8
|
+
if (!ruleAttr || ruleAttr.length === 0)
|
|
9
|
+
throw new Error('whitelistMatcherData is required for IN_LIST_SEMVER matcher type');
|
|
10
|
+
var listOfSemvers = new sets_1._Set(ruleAttr.map(function (version) { return new Semver_1.Semver(version).version; }));
|
|
11
|
+
return function inListSemverMatcher(runtimeAttr) {
|
|
12
|
+
var runtimeSemver = new Semver_1.Semver(runtimeAttr).version;
|
|
13
|
+
var isInList = listOfSemvers.has(runtimeSemver);
|
|
14
|
+
return isInList;
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
exports.inListSemverMatcherContext = inListSemverMatcherContext;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.lessThanEqualToSemverMatcherContext = void 0;
|
|
4
|
+
var Semver_1 = require("../../utils/Semver");
|
|
5
|
+
function lessThanEqualToSemverMatcherContext(ruleAttr) {
|
|
6
|
+
var ruleSemver = new Semver_1.Semver(ruleAttr);
|
|
7
|
+
return function lessThanEqualToSemverMatcher(runtimeAttr) {
|
|
8
|
+
var runtimeSemver = new Semver_1.Semver(runtimeAttr);
|
|
9
|
+
var isLessThanEqual = runtimeSemver.compare(ruleSemver) <= 0;
|
|
10
|
+
return isLessThanEqual;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
exports.lessThanEqualToSemverMatcherContext = lessThanEqualToSemverMatcherContext;
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.stringMatcherContext = void 0;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
function stringMatcherContext(ruleAttr) {
|
|
5
|
+
var regex = new RegExp(ruleAttr);
|
|
6
6
|
return function stringMatcher(runtimeAttr) {
|
|
7
|
-
var
|
|
8
|
-
try {
|
|
9
|
-
re = new RegExp(ruleAttr);
|
|
10
|
-
}
|
|
11
|
-
catch (e) {
|
|
12
|
-
log.debug(constants_1.ENGINE_MATCHER_STRING_INVALID, [ruleAttr]);
|
|
13
|
-
return false;
|
|
14
|
-
}
|
|
15
|
-
var regexMatches = re.test(runtimeAttr);
|
|
16
|
-
log.debug(constants_1.ENGINE_MATCHER_STRING, [runtimeAttr, ruleAttr, regexMatches ? 'yes' : 'no']);
|
|
7
|
+
var regexMatches = regex.test(runtimeAttr);
|
|
17
8
|
return regexMatches;
|
|
18
9
|
};
|
|
19
10
|
}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.startsWithMatcherContext = void 0;
|
|
4
|
-
var constants_1 = require("../../logger/constants");
|
|
5
4
|
var lang_1 = require("../../utils/lang");
|
|
6
|
-
function startsWithMatcherContext(
|
|
5
|
+
function startsWithMatcherContext(ruleAttr) {
|
|
7
6
|
return function startsWithMatcher(runtimeAttr) {
|
|
8
7
|
var matches = ruleAttr.some(function (e) { return (0, lang_1.startsWith)(runtimeAttr, e); });
|
|
9
|
-
log.debug(constants_1.ENGINE_MATCHER_STARTS_WITH, [runtimeAttr, ruleAttr, matches]);
|
|
10
8
|
return matches;
|
|
11
9
|
};
|
|
12
10
|
}
|
|
@@ -2,11 +2,10 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.whitelistMatcherContext = void 0;
|
|
4
4
|
var sets_1 = require("../../utils/lang/sets");
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
function whitelistMatcherContext(ruleAttr) {
|
|
6
|
+
var whitelistSet = new sets_1._Set(ruleAttr);
|
|
7
7
|
return function whitelistMatcher(runtimeAttr) {
|
|
8
|
-
var isInWhitelist =
|
|
9
|
-
log.debug(constants_1.ENGINE_MATCHER_WHITELIST, [runtimeAttr, (0, sets_1.setToArray)(ruleAttr).join(','), isInWhitelist]);
|
|
8
|
+
var isInWhitelist = whitelistSet.has(runtimeAttr);
|
|
10
9
|
return isInWhitelist;
|
|
11
10
|
};
|
|
12
11
|
}
|