@legalplace/lplogic 2.3.5 → 2.3.6

package/dist/LpLogic.js

@@ -159,30 +159,8 @@ var not = function (values, comparator, parents) {
     return reducedValues.length === filter.length;
 };
 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 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;
-};
-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 !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;
-};
-json_logic_js_1.default.add_operation("does-not-contain", doesNotContain);
+json_logic_js_1.default.add_operation("contains", is);
+json_logic_js_1.default.add_operation("does-not-contain", not);
 json_logic_js_1.default.add_operation("empty", function (values, comparator, parents) {
     var reducedValues = reduceValues(values, parents, function (value, parent) {
         var stringValue = typeof value === "number" ? value.toString() : value;
@@ -313,10 +291,10 @@ registerScopedComparisonOp("not", function (value, comparator, parent) {
     return cleanString(value) !== cleanString(comparator) && parent;
 });
 registerScopedComparisonOp("contains", function (value, comparator, parent) {
-    return cleanString(value).includes(cleanString(comparator)) && parent;
+    return cleanString(value) === cleanString(comparator) && parent;
 });
 registerScopedComparisonOp("does-not-contain", function (value, comparator, parent) {
-    return !cleanString(value).includes(cleanString(comparator)) && parent;
+    return cleanString(value) !== cleanString(comparator) && parent;
 });
 registerScopedComparisonOp("like", function (value, comparator, parent) {
     return new RegExp("( |^)".concat(cleanString(comparator), "( |$)"), "i").test(cleanString(value)) && parent;

package/package.json

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

package/tests/LpLogic.test.ts

@@ -308,17 +308,38 @@ test('Testing "<>" is inverse of accent/case-insensitive "="', async () => {
 
 test('Testing "contains" accent- and case-insensitive', async () => {
   expect(
-    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })
   ).toBe(true)
   expect(
-    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["la ha"] } })
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["La"] } })
   ).toBe(true)
+})
+
+/**
+ * Regression guard: `contains` is an alias of `is` (equality), never substring.
+ * These are the discriminating cases the suite previously lacked - "Hello"
+ * against "Hello" passes under both semantics, so it caught nothing when the
+ * operator silently became `.includes()`.
+ */
+test('Testing "contains" is equality, not substring', async () => {
   expect(
-    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["là"] } })
-  ).toBe(true)
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })
+  ).toBe(false)
   expect(
-    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["La"] } })
+    LpLogic({ contains: [{ var: "v.1" }, "la"] }, { v: { 1: ["la ha"] } })
+  ).toBe(false)
+  expect(
+    LpLogic({ contains: [{ var: "v.1" }, "SARL"] }, { v: { 1: ["SARL"] } })
   ).toBe(true)
+  expect(
+    LpLogic(
+      { contains: [{ var: "v.1" }, "SARL"] },
+      { v: { 1: ["SARL unipersonnelle"] } }
+    )
+  ).toBe(false)
+  expect(
+    LpLogic({ contains: [{ var: "v.1" }, "SARL"] }, { v: { 1: ["EURL/SARL"] } })
+  ).toBe(false)
 })
 
 test('Testing "does-not-contain" is inverse of accent-insensitive contains', async () => {
@@ -336,6 +357,33 @@ test('Testing "does-not-contain" is inverse of accent-insensitive contains', asy
   ).toBe(true)
 })
 
+test('Testing "does-not-contain" is inequality, not substring', async () => {
+  expect(
+    LpLogic({ "does-not-contain": [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })
+  ).toBe(true)
+  expect(
+    LpLogic(
+      { "does-not-contain": [{ var: "v.1" }, "SARL"] },
+      { v: { 1: ["SARL unipersonnelle"] } }
+    )
+  ).toBe(true)
+})
+
+test('Testing scoped "contains" variants share the equality predicate', async () => {
+  expect(
+    LpLogic({ "contains-any": [{ var: "v.1" }, "la"] }, { v: { 1: ["lax", "la"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ "contains-any": [{ var: "v.1" }, "la"] }, { v: { 1: ["lax", "lab"] } })
+  ).toBe(false)
+  expect(
+    LpLogic({ "contains-first": [{ var: "v.1" }, "la"] }, { v: { 1: ["la", "lax"] } })
+  ).toBe(true)
+  expect(
+    LpLogic({ "contains-first": [{ var: "v.1" }, "la"] }, { v: { 1: ["lax", "la"] } })
+  ).toBe(false)
+})
+
 test('Testing "like" accent- and case-insensitive word match', async () => {
   expect(
     LpLogic({ like: [{ var: "v.1" }, "la"] }, { v: { 1: ["lax"] } })

package/.gitlab-automator

@@ -1,7 +0,0 @@
-GITLAB_PRIVATE_TOKEN=glpat-BOv5W1i6MoAAvHjzkmc5nW86MQp1OjkH.01.0w119catf
-GITLAB_BASE_URL=https://git.legalplace.eu
-GITLAB_API_PROJECT_ID=28
-GITLAB_USER_ID=9
-CURRENT_PROJECT_ID=39
-SLACK_USER_ID=U0B3SNBV3
-CLICKUP_PRIVATE_TOKEN=pk_32519579_K5W4L4KEVXY03A3D2WFA46D07HVGTL5L