@legalplace/lplogic 2.1.3 → 2.1.5
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/dist/LpLogic.js +22 -15
- package/package.json +1 -1
package/dist/LpLogic.js
CHANGED
|
@@ -33,9 +33,16 @@ var reduceValues = function (values, parents, compareFunction) {
|
|
|
33
33
|
return compareFunction(currentValue, reducedParents[index]);
|
|
34
34
|
});
|
|
35
35
|
};
|
|
36
|
+
var parseNumber = function (value) {
|
|
37
|
+
if (typeof value === "number")
|
|
38
|
+
return value;
|
|
39
|
+
if (/^([0-9]+)(,|.)?([0-9]+)?$/.test(value))
|
|
40
|
+
return parseFloat(value.replace(",", "."));
|
|
41
|
+
return value;
|
|
42
|
+
};
|
|
36
43
|
var safeEqual = function (value, comparator) {
|
|
37
|
-
var parsedValue = typeof value === "number" ? value :
|
|
38
|
-
var parsedComparator = typeof comparator === "number" ? comparator :
|
|
44
|
+
var parsedValue = typeof value === "number" ? value : parseNumber(value);
|
|
45
|
+
var parsedComparator = typeof comparator === "number" ? comparator : parseNumber(comparator);
|
|
39
46
|
return parsedValue === parsedComparator;
|
|
40
47
|
};
|
|
41
48
|
json_logic_js_1.default.add_operation("=", function (values, comparator, parents) {
|
|
@@ -54,35 +61,35 @@ json_logic_js_1.default.add_operation("<>", function (values, comparator, parent
|
|
|
54
61
|
});
|
|
55
62
|
json_logic_js_1.default.add_operation("==", function (values, comparator, parents) {
|
|
56
63
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
57
|
-
return value === comparator && parent;
|
|
64
|
+
return parseNumber(value) === parseNumber(comparator) && parent;
|
|
58
65
|
});
|
|
59
66
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
60
67
|
return reducedValues.length === filter.length;
|
|
61
68
|
});
|
|
62
69
|
json_logic_js_1.default.add_operation(">=", function (values, comparator, parents) {
|
|
63
70
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
64
|
-
return value >= comparator && parent;
|
|
71
|
+
return parseNumber(value) >= parseNumber(comparator) && parent;
|
|
65
72
|
});
|
|
66
73
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
67
74
|
return reducedValues.length === filter.length;
|
|
68
75
|
});
|
|
69
76
|
json_logic_js_1.default.add_operation("<=", function (values, comparator, parents) {
|
|
70
77
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
71
|
-
return value <= comparator && parent;
|
|
78
|
+
return parseNumber(value) <= parseNumber(comparator) && parent;
|
|
72
79
|
});
|
|
73
80
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
74
81
|
return reducedValues.length === filter.length;
|
|
75
82
|
});
|
|
76
83
|
json_logic_js_1.default.add_operation(">", function (values, comparator, parents) {
|
|
77
84
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
78
|
-
return value > comparator && parent;
|
|
85
|
+
return parseNumber(value) > parseNumber(comparator) && parent;
|
|
79
86
|
});
|
|
80
87
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
81
88
|
return reducedValues.length === filter.length;
|
|
82
89
|
});
|
|
83
90
|
json_logic_js_1.default.add_operation("<", function (values, comparator, parents) {
|
|
84
91
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
85
|
-
return value < comparator && parent;
|
|
92
|
+
return parseNumber(value) < parseNumber(comparator) && parent;
|
|
86
93
|
});
|
|
87
94
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
88
95
|
return reducedValues.length === filter.length;
|
|
@@ -123,10 +130,10 @@ var is = function (values, comparator, parents) {
|
|
|
123
130
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
124
131
|
var cleanValue = (typeof value === "number"
|
|
125
132
|
? value.toString()
|
|
126
|
-
: value).toLowerCase();
|
|
133
|
+
: value.trim()).toLowerCase();
|
|
127
134
|
var cleanComparator = (typeof comparator === "number"
|
|
128
135
|
? comparator.toString()
|
|
129
|
-
: comparator).toLowerCase();
|
|
136
|
+
: comparator.trim()).toLowerCase();
|
|
130
137
|
return cleanValue === cleanComparator && parent;
|
|
131
138
|
});
|
|
132
139
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
@@ -138,10 +145,10 @@ var not = function (values, comparator, parents) {
|
|
|
138
145
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
139
146
|
var cleanValue = (typeof value === "number"
|
|
140
147
|
? value.toString()
|
|
141
|
-
: value).toLowerCase();
|
|
148
|
+
: value.trim()).toLowerCase();
|
|
142
149
|
var cleanComparator = (typeof comparator === "number"
|
|
143
150
|
? comparator.toString()
|
|
144
|
-
: comparator).toLowerCase();
|
|
151
|
+
: comparator.trim()).toLowerCase();
|
|
145
152
|
return cleanValue !== cleanComparator && parent;
|
|
146
153
|
});
|
|
147
154
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
@@ -169,10 +176,10 @@ var like = function (values, comparator, parents) {
|
|
|
169
176
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
170
177
|
var cleanValue = (typeof value === "number"
|
|
171
178
|
? value.toString()
|
|
172
|
-
: value).toLowerCase();
|
|
179
|
+
: value.trim()).toLowerCase();
|
|
173
180
|
var cleanComparator = (typeof comparator === "number"
|
|
174
181
|
? comparator.toString()
|
|
175
|
-
: comparator).toLowerCase();
|
|
182
|
+
: comparator.trim()).toLowerCase();
|
|
176
183
|
return (new RegExp("( |^)" + cleanComparator + "( |$)", "i").test(cleanValue) && parent);
|
|
177
184
|
});
|
|
178
185
|
var filter = reducedValues.filter(function (_value) { return _value === true; });
|
|
@@ -183,10 +190,10 @@ var notLike = function (values, comparator, parents) {
|
|
|
183
190
|
var reducedValues = reduceValues(values, parents, function (value, parent) {
|
|
184
191
|
var cleanValue = (typeof value === "number"
|
|
185
192
|
? value.toString()
|
|
186
|
-
: value).toLowerCase();
|
|
193
|
+
: value.trim()).toLowerCase();
|
|
187
194
|
var cleanComparator = (typeof comparator === "number"
|
|
188
195
|
? comparator.toString()
|
|
189
|
-
: comparator).toLowerCase();
|
|
196
|
+
: comparator.trim()).toLowerCase();
|
|
190
197
|
return (!new RegExp("( |^)" + cleanComparator + "( |$)", "i").test(cleanValue) &&
|
|
191
198
|
parent);
|
|
192
199
|
});
|