@kameleoon/javascript-sdk-core 2.4.5 → 2.4.6
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.
|
@@ -47,15 +47,20 @@ class CustomDataCondition {
|
|
|
47
47
|
return (0, _tsRes.Ok)(this.matchType === _types.MatchTypeCustomData.UNDEFINED);
|
|
48
48
|
}
|
|
49
49
|
checkCondition(customDataValue) {
|
|
50
|
-
if (this.conditionValue === null) {
|
|
50
|
+
if (this.conditionValue === null && this.matchType !== _types.MatchTypeCustomData.TRUE && this.matchType !== _types.MatchTypeCustomData.FALSE) {
|
|
51
51
|
return false;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
+
// --- Note ---
|
|
55
|
+
// `MatchTypeCustomData.TRUE` and `MatchTypeCustomData.FALSE` do not use condition value
|
|
56
|
+
// so we can safely assume that `this.conditionValue` is a string at this point
|
|
57
|
+
const conditionValue = this.conditionValue;
|
|
58
|
+
|
|
54
59
|
// --- Note ---
|
|
55
60
|
// `AMONG_VALUES` is checked separately to avoid recursion overhead
|
|
56
61
|
// for `JSON.parse` inside `this.parseArray`
|
|
57
62
|
if (this.matchType === _types.MatchTypeCustomData.AMONG_VALUES) {
|
|
58
|
-
const result = this.parseArray(
|
|
63
|
+
const result = this.parseArray(conditionValue);
|
|
59
64
|
if (!result.ok) {
|
|
60
65
|
this.error = result.error;
|
|
61
66
|
return false;
|
|
@@ -68,11 +73,11 @@ class CustomDataCondition {
|
|
|
68
73
|
}
|
|
69
74
|
switch (this.matchType) {
|
|
70
75
|
case _types.MatchTypeCustomData.CONTAINS:
|
|
71
|
-
return customDataValue.includes(
|
|
76
|
+
return customDataValue.includes(conditionValue);
|
|
72
77
|
case _types.MatchTypeCustomData.EXACT:
|
|
73
78
|
return customDataValue === this.conditionValue;
|
|
74
79
|
case _types.MatchTypeCustomData.REGULAR_EXPRESSION:
|
|
75
|
-
return this.parseRegExp(
|
|
80
|
+
return this.parseRegExp(conditionValue).test(customDataValue);
|
|
76
81
|
case _types.MatchTypeCustomData.LOWER:
|
|
77
82
|
return Number(customDataValue) < Number(this.conditionValue);
|
|
78
83
|
case _types.MatchTypeCustomData.EQUAL:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customDataCondition.js","names":["_tsRes","require","_kameleoonData","_kameleoonError","_types","_defineProperty","obj","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","CustomDataCondition","constructor","customDataIndex","valueMatchType","isInclude","inverseResult","matchType","conditionValue","evaluate","targetingData","isCustomData","data","type","KameleoonData","CustomData","filteredData","map","item","filter","index","length","lastDataItem","customDataValue","result","checkCondition","error","Err","Ok","MatchTypeCustomData","UNDEFINED","AMONG_VALUES","parseArray","ok","resultData","Set","Array","isArray","some","has","includes","CONTAINS","EXACT","REGULAR_EXPRESSION","parseRegExp","test","LOWER","EQUAL","GREATER","
|
|
1
|
+
{"version":3,"file":"customDataCondition.js","names":["_tsRes","require","_kameleoonData","_kameleoonError","_types","_defineProperty","obj","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","CustomDataCondition","constructor","customDataIndex","valueMatchType","isInclude","inverseResult","matchType","conditionValue","evaluate","targetingData","isCustomData","data","type","KameleoonData","CustomData","filteredData","map","item","filter","index","length","lastDataItem","customDataValue","result","checkCondition","error","Err","Ok","MatchTypeCustomData","UNDEFINED","TRUE","FALSE","AMONG_VALUES","parseArray","ok","resultData","Set","Array","isArray","some","has","includes","CONTAINS","EXACT","REGULAR_EXPRESSION","parseRegExp","test","LOWER","EQUAL","GREATER","toLowerCase","_","expression","flags","split","RegExp","JSON","parse","err","KameleoonError","KameleoonException","AmongValuesCheck","exports"],"sources":["../../../src/targeting/conditions/customDataCondition.ts"],"sourcesContent":["import { Err, Ok, Result } from 'ts-res';\nimport {\n KameleoonData,\n CustomDataType,\n KameleoonDataItemType,\n} from '../../kameleoonData';\nimport { KameleoonError, KameleoonException } from '../../kameleoonError';\nimport { EvaluationDataType, MatchTypeCustomData } from '../types';\nimport { ConditionDataType, ICondition } from './types';\n\nexport class CustomDataCondition implements ICondition {\n private customDataIndex: number;\n private matchType: MatchTypeCustomData | null;\n private inverseResult: boolean;\n private conditionValue: string | null;\n private error?: KameleoonError;\n\n constructor({\n customDataIndex,\n valueMatchType,\n isInclude,\n value,\n }: ConditionDataType) {\n this.customDataIndex = Number(customDataIndex);\n this.inverseResult = !(isInclude ?? true);\n this.matchType = valueMatchType;\n this.conditionValue = value;\n }\n\n public evaluate({\n targetingData,\n }: EvaluationDataType): Result<boolean, KameleoonError> {\n const isCustomData = (\n data: KameleoonDataItemType,\n ): data is CustomDataType => data.type === KameleoonData.CustomData;\n\n const filteredData = targetingData\n .map((item) => item.data)\n .filter(isCustomData)\n .filter((item) => item.index === this.customDataIndex);\n\n if (filteredData.length) {\n const lastDataItem = filteredData[filteredData.length - 1];\n const { value: customDataValue } = lastDataItem;\n const result = this.inverseResult\n ? !this.checkCondition(customDataValue)\n : this.checkCondition(customDataValue);\n\n if (this.error) {\n return Err(this.error);\n }\n\n return Ok(result);\n }\n\n return Ok(this.matchType === MatchTypeCustomData.UNDEFINED);\n }\n\n private checkCondition(customDataValue: CustomDataType['value']): boolean {\n if (\n this.conditionValue === null &&\n this.matchType !== MatchTypeCustomData.TRUE &&\n this.matchType !== MatchTypeCustomData.FALSE\n ) {\n return false;\n }\n\n // --- Note ---\n // `MatchTypeCustomData.TRUE` and `MatchTypeCustomData.FALSE` do not use condition value\n // so we can safely assume that `this.conditionValue` is a string at this point\n const conditionValue = this.conditionValue as string;\n\n // --- Note ---\n // `AMONG_VALUES` is checked separately to avoid recursion overhead\n // for `JSON.parse` inside `this.parseArray`\n if (this.matchType === MatchTypeCustomData.AMONG_VALUES) {\n const result = this.parseArray(conditionValue);\n\n if (!result.ok) {\n this.error = result.error;\n\n return false;\n }\n\n const resultData = new Set(result.data);\n\n return Array.isArray(customDataValue)\n ? customDataValue.some((value) => resultData.has(value))\n : result.data.includes(customDataValue);\n }\n\n if (Array.isArray(customDataValue)) {\n return customDataValue.some((value) => this.checkCondition(value));\n }\n\n switch (this.matchType) {\n case MatchTypeCustomData.CONTAINS:\n return customDataValue.includes(conditionValue);\n case MatchTypeCustomData.EXACT:\n return customDataValue === this.conditionValue;\n case MatchTypeCustomData.REGULAR_EXPRESSION:\n return this.parseRegExp(conditionValue).test(customDataValue);\n case MatchTypeCustomData.LOWER:\n return Number(customDataValue) < Number(this.conditionValue);\n case MatchTypeCustomData.EQUAL:\n return Number(customDataValue) === Number(this.conditionValue);\n case MatchTypeCustomData.GREATER:\n return Number(customDataValue) > Number(this.conditionValue);\n case MatchTypeCustomData.TRUE:\n return customDataValue.toLowerCase() === 'true';\n case MatchTypeCustomData.FALSE:\n return customDataValue.toLowerCase() === 'false';\n default:\n return false;\n }\n }\n\n private parseRegExp(value: string): RegExp {\n if (value[0] === '/') {\n const [_, expression, flags] = value.split('/');\n\n return new RegExp(expression, flags);\n }\n\n return new RegExp(value);\n }\n\n private parseArray(value: string): Result<string[], KameleoonError> {\n try {\n const result = JSON.parse(value);\n\n if (Array.isArray(result)) {\n return Ok(result);\n }\n } catch (err) {\n return Err(\n new KameleoonError(KameleoonException.AmongValuesCheck, err, value),\n );\n }\n\n return Ok([]);\n }\n}\n"],"mappings":"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"}
|