@legalplace/lplogic 2.3.2-staging.0 → 2.3.2-staging.1

package/dist/LpLogic.js

@@ -41,10 +41,25 @@ var parseNumber = function (value) {
         return parseFloat(value.replace(",", "."));
     return value;
 };
+var cleanString = function (value) {
+    var raw = typeof value === "number" ? value.toString() : value.trim();
+    return raw
+        .normalize("NFD")
+        .replace(/[\u0300-\u036f]/g, "")
+        .replace(/œ/g, "oe")
+        .replace(/Œ/g, "oe")
+        .replace(/æ/g, "ae")
+        .replace(/Æ/g, "ae")
+        .toLowerCase();
+};
 var safeEqual = function (value, comparator) {
     var parsedValue = typeof value === "number" ? value : parseNumber(value);
     var parsedComparator = typeof comparator === "number" ? comparator : parseNumber(comparator);
-    return parsedValue === parsedComparator;
+    if (typeof parsedValue === "number" &&
+        typeof parsedComparator === "number") {
+        return parsedValue === parsedComparator;
+    }
+    return cleanString(value) === cleanString(comparator);
 };
 json_logic_js_1.default.add_operation("=", function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
@@ -130,13 +145,7 @@ json_logic_js_1.default.add_operation("has-many", function (values, comparator,
 });
 var is = function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
-        var cleanValue = (typeof value === "number"
-            ? value.toString()
-            : value.trim()).toLowerCase();
-        var cleanComparator = (typeof comparator === "number"
-            ? comparator.toString()
-            : comparator.trim()).toLowerCase();
-        return cleanValue === cleanComparator && parent;
+        return cleanString(value) === cleanString(comparator) && parent;
     });
     var filter = reducedValues.filter(function (_value) { return _value === true; });
     return reducedValues.length === filter.length;
@@ -144,13 +153,7 @@ var is = function (values, comparator, parents) {
 json_logic_js_1.default.add_operation("is", is);
 var not = function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
-        var cleanValue = (typeof value === "number"
-            ? value.toString()
-            : value.trim()).toLowerCase();
-        var cleanComparator = (typeof comparator === "number"
-            ? comparator.toString()
-            : comparator.trim()).toLowerCase();
-        return cleanValue !== cleanComparator && parent;
+        return cleanString(value) !== cleanString(comparator) && parent;
     });
     var filter = reducedValues.filter(function (_value) { return _value === true; });
     return reducedValues.length === filter.length;
@@ -159,21 +162,11 @@ json_logic_js_1.default.add_operation("not", not);
 var contains = function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
         if (Array.isArray(value)) {
-            return value.some(function (val) {
-                return (typeof val === "string" ? val.trim() : val.toString())
-                    .toLowerCase()
-                    .includes((typeof comparator === "string"
-                    ? comparator.trim()
-                    : comparator.toString()).toLowerCase()) && parent;
-            });
-        }
-        else {
-            var cleanValue = (typeof value === "number" ? value.toString() : value.trim()).toLowerCase();
-            var cleanComparator = (typeof comparator === "number"
-                ? comparator.toString()
-                : comparator.trim()).toLowerCase();
-            return cleanValue.includes(cleanComparator) && parent;
+            return (value.some(function (val) {
+                return cleanString(val).includes(cleanString(comparator));
+            }) && parent);
         }
+        return (cleanString(value).includes(cleanString(comparator)) && parent);
     });
     var filter = reducedValues.filter(function (value) { return value === true; });
     return reducedValues.length === filter.length;
@@ -182,21 +175,9 @@ json_logic_js_1.default.add_operation("contains", contains);
 var doesNotContain = function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
         if (Array.isArray(value)) {
-            return value.every(function (val) {
-                return !(typeof val === "string" ? val.trim() : val.toString())
-                    .toLowerCase()
-                    .includes((typeof comparator === "string"
-                    ? comparator.trim()
-                    : comparator.toString()).toLowerCase()) && parent;
-            });
-        }
-        else {
-            var cleanValue = (typeof value === "number" ? value.toString() : value.trim()).toLowerCase();
-            var cleanComparator = (typeof comparator === "number"
-                ? comparator.toString()
-                : comparator.trim()).toLowerCase();
-            return !cleanValue.includes(cleanComparator) && parent;
+            return (value.every(function (val) { return !cleanString(val).includes(cleanString(comparator)); }) && parent);
         }
+        return (!cleanString(value).includes(cleanString(comparator)) && parent);
     });
     var filter = reducedValues.filter(function (value) { return value === true; });
     return reducedValues.length === filter.length;
@@ -220,13 +201,7 @@ json_logic_js_1.default.add_operation("not-empty", function (values, comparator,
 });
 var like = function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
-        var cleanValue = (typeof value === "number"
-            ? value.toString()
-            : value.trim()).toLowerCase();
-        var cleanComparator = (typeof comparator === "number"
-            ? comparator.toString()
-            : comparator.trim()).toLowerCase();
-        return (new RegExp("( |^)".concat(cleanComparator, "( |$)"), "i").test(cleanValue) && parent);
+        return (new RegExp("( |^)".concat(cleanString(comparator), "( |$)"), "i").test(cleanString(value)) && parent);
     });
     var filter = reducedValues.filter(function (_value) { return _value === true; });
     return reducedValues.length === filter.length;
@@ -234,14 +209,7 @@ var like = function (values, comparator, parents) {
 json_logic_js_1.default.add_operation("like", like);
 var notLike = function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
-        var cleanValue = (typeof value === "number"
-            ? value.toString()
-            : value.trim()).toLowerCase();
-        var cleanComparator = (typeof comparator === "number"
-            ? comparator.toString()
-            : comparator.trim()).toLowerCase();
-        return (!new RegExp("( |^)".concat(cleanComparator, "( |$)"), "i").test(cleanValue) &&
-            parent);
+        return (!new RegExp("( |^)".concat(cleanString(comparator), "( |$)"), "i").test(cleanString(value)) && parent);
     });
     var filter = reducedValues.filter(function (_value) { return _value === true; });
     return reducedValues.length === filter.length;
@@ -277,9 +245,6 @@ var aggregateAny = function (reducedValues) {
 var aggregateFirst = function (reducedValues) {
     return reducedValues[0] === true;
 };
-var cleanString = function (value) {
-    return (typeof value === "number" ? value.toString() : value.trim()).toLowerCase();
-};
 var registerScopedBooleanOp = function (baseName, compareFn) {
     json_logic_js_1.default.add_operation("".concat(baseName, "-first"), function (values, _comparator, parents) {
         var reducedValue = reduceValues(values, parents, compareFn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/lplogic",
-  "version": "2.3.2-staging.0",
+  "version": "2.3.2-staging.1",
   "description": "LegalPlace LpLogic",
   "main": "dist/index.js",
   "scripts": {

package/tests/LpLogic.test.ts

@@ -255,3 +255,116 @@ test('Testing "conditions-met" with parents containing missing refs (null entrie
     )
   ).toBe(true)
 })
+
+/**
+ * Accent- and case-insensitive text matching (=, contains, like and negations).
+ * Matches the product table: la/lax, la/la ha, la/là, la/La, Léon/Leon.
+ */
+test('Testing "=" case-insensitive for strings', async () => {
+  expect(LpLogic({ "=": [{ var: "v.1" }, "la"] }, { v: { 1: ["La"] } })).toBe(
+    true
+  )
+  expect(LpLogic({ "=": [{ var: "v.1" }, "la"] }, { v: { 1: ["LA"] } })).toBe(
+    true
+  )
+})
+
+test('Testing "=" accent-insensitive for strings', async () => {
+  expect(LpLogic({ "=": [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })).toBe(
+    true
+  )
+  expect(
+    LpLogic({ "=": [{ var: "v.1" }, "Léon"] }, { v: { 1: ["Leon"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ "=": [{ var: "v.1" }, "Léon"] }, { v: { 1: ["LEON"] } })
+  ).toBe(true)
+})
+
+test('Testing "=" still false for different words', async () => {
+  expect(LpLogic({ "=": [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })).toBe(
+    false
+  )
+  expect(
+    LpLogic({ "=": [{ var: "v.1" }, "la"] }, { v: { 1: ["la ha"] } })
+  ).toBe(false)
+})
+
+test('Testing "=" still numeric for number-like values', async () => {
+  expect(LpLogic({ "=": [{ var: "v.1" }, "1.0"] }, { v: { 1: [1] } })).toBe(
+    true
+  )
+  expect(LpLogic({ "=": [{ var: "v.1" }, 1] }, { v: { 1: ["1"] } })).toBe(true)
+})
+
+test('Testing "<>" is inverse of accent/case-insensitive "="', async () => {
+  expect(LpLogic({ "<>": [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })).toBe(
+    false
+  )
+  expect(LpLogic({ "<>": [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })).toBe(
+    true
+  )
+})
+
+test('Testing "contains" accent- and case-insensitive', async () => {
+  expect(
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["la ha"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["La"] } })
+  ).toBe(true)
+})
+
+test('Testing "does-not-contain" is inverse of accent-insensitive contains', async () => {
+  expect(
+    LpLogic(
+      { "does-not-contain": [{ var: "v.1" }, "la"] },
+      { v: { 1: ["là"] } }
+    )
+  ).toBe(false)
+  expect(
+    LpLogic(
+      { "does-not-contain": [{ var: "v.1" }, "la"] },
+      { v: { 1: ["Bye"] } }
+    )
+  ).toBe(true)
+})
+
+test('Testing "like" accent- and case-insensitive word match', async () => {
+  expect(
+    LpLogic({ like: [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })
+  ).toBe(false)
+  expect(
+    LpLogic({ like: [{ var: "v.1" }, "la"] }, { v: { 1: ["la ha"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ like: [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ like: [{ var: "v.1" }, "la"] }, { v: { 1: ["La"] } })
+  ).toBe(true)
+})
+
+test('Testing "not-like" is inverse of accent-insensitive like', async () => {
+  expect(
+    LpLogic({ "not-like": [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })
+  ).toBe(false)
+  expect(
+    LpLogic({ "not-like": [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })
+  ).toBe(true)
+})
+
+test('Testing "is" accent-insensitive (legacy equal alias)', async () => {
+  expect(LpLogic({ is: [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })).toBe(
+    true
+  )
+  expect(
+    LpLogic({ is: [{ var: "v.1" }, "Léon"] }, { v: { 1: ["Leon"] } })
+  ).toBe(true)
+})