@legalplace/lplogic 2.0.3 → 2.1.0

package/dist/LpLogic.d.ts

@@ -1,3 +1,2 @@
-import jsonLogic from "@legalplace/json-logic-js";
-declare const LpLogic: typeof jsonLogic.apply;
+declare const LpLogic: (logic: any, data?: any) => any;
 export default LpLogic;

package/dist/LpLogic.js

@@ -4,163 +4,194 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var json_logic_js_1 = __importDefault(require("@legalplace/json-logic-js"));
+var reduceParents = function (parents, length) {
+    var reducedParents = [];
+    parents.sort(function (a, b) { return b.length - a.length; });
+    var _loop_1 = function (index) {
+        var currentIndexResult = parents.reduce(function (previousValue, currentValue) {
+            if (currentValue.length === 1)
+                return previousValue && currentValue[0];
+            if (currentValue[index] === undefined)
+                return false;
+            return previousValue && currentValue[index];
+        }, true);
+        reducedParents[index] = currentIndexResult;
+    };
+    for (var index = 0; index < length; index += 1) {
+        _loop_1(index);
+    }
+    return reducedParents;
+};
+var reduceValues = function (values, parents, compareFunction) {
+    if (parents === undefined || parents.length === 0) {
+        return values.map(function (currentValue) {
+            return compareFunction(currentValue, true);
+        });
+    }
+    var reducedParents = reduceParents(parents, values.length);
+    return values.map(function (currentValue, index) {
+        return compareFunction(currentValue, reducedParents[index]);
+    });
+};
 var safeEqual = function (value, comparator) {
-    if (!isNaN(comparator)) {
-        if (!isNaN(value)) {
-            return parseFloat(value) === parseFloat(comparator);
-        }
-        return false;
-    }
-    if (!isNaN(value)) {
-        return false;
-    }
-    return value === comparator;
+    var parsedValue = typeof value === "number" ? value : parseFloat(value);
+    var parsedComparator = typeof comparator === "number" ? comparator : parseFloat(comparator);
+    return parsedValue === parsedComparator;
 };
-json_logic_js_1.default.add_operation("=", function (value, comparator) {
-    if (!Array.isArray(value)) {
-        return safeEqual(value, comparator);
-    }
-    var filter = value.filter(function (_value) { return safeEqual(_value, comparator); });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation("=", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        return safeEqual(value, comparator) && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation("<>", function (value, comparator) {
-    if (!Array.isArray(value)) {
-        return !safeEqual(value, comparator);
-    }
-    var filter = value.filter(function (_value) { return !safeEqual(_value, comparator); });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation("<>", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        return !safeEqual(value, comparator) && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation("==", function (value, comparator) {
-    if (!Array.isArray(value)) {
-        return value === comparator;
-    }
-    var filter = value.filter(function (_value) { return _value === comparator; });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation("==", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        return value === comparator && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation(">=", function (value, c) {
-    var comparator = typeof c === "number" ? c : parseFloat(c);
-    if (!Array.isArray(value)) {
-        return value >= comparator;
-    }
-    var filter = value.filter(function (_value) { return _value >= comparator; });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation(">=", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        return value >= comparator && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation("<=", function (value, c) {
-    var comparator = typeof c === "number" ? c : parseFloat(c);
-    if (!Array.isArray(value)) {
-        return value >= comparator;
-    }
-    var filter = value.filter(function (_value) { return _value <= comparator; });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation("<=", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        return value <= comparator && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation(">", function (value, c) {
-    var comparator = typeof c === "number" ? c : parseFloat(c);
-    if (!Array.isArray(value)) {
-        return value > comparator;
-    }
-    var filter = value.filter(function (_value) { return _value > comparator; });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation(">", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        return value > comparator && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation("<", function (value, c) {
-    var comparator = typeof c === "number" ? c : parseFloat(c);
-    if (!Array.isArray(value)) {
-        return value < comparator;
-    }
-    var filter = value.filter(function (_value) { return _value < comparator; });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation("<", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        return value < comparator && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation("selected", function (value) {
-    if (!Array.isArray(value)) {
-        return value === true;
-    }
-    var filter = value.filter(function (_value) { return _value === true; });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation("selected", function (values, comparator, parents) {
+    var reducedValue = reduceValues(values, parents, function (value, parent) { return value && parent; });
+    var filter = reducedValue.filter(function (_value) { return _value === true; });
+    return reducedValue.length === filter.length;
 });
-json_logic_js_1.default.add_operation("not-selected", function (value) {
-    if (!Array.isArray(value)) {
-        return value !== true;
-    }
-    var filter = value.filter(function (_value) { return _value !== true; });
-    return value.length === filter.length;
+json_logic_js_1.default.add_operation("not-selected", function (values, comparator, parents) {
+    var reducedValue = reduceValues(values, parents, function (value, parent) { return value && parent; });
+    var filter = reducedValue.filter(function (_value) { return _value !== true; });
+    return reducedValue.length === filter.length;
 });
-json_logic_js_1.default.add_operation("has-one", function (value) {
-    if (!Array.isArray(value))
+json_logic_js_1.default.add_operation("has-one", function (values, comparator, parents) {
+    var reducedValue = reduceValues(values, parents, function (value, parent) { return value && parent; });
+    if (!Array.isArray(reducedValue))
         return true;
-    return value.length === 1;
+    return reducedValue.length === 1;
 });
-json_logic_js_1.default.add_operation("at-least-one", function (value) {
-    if (!Array.isArray(value))
+json_logic_js_1.default.add_operation("at-least-one", function (values, comparator, parents) {
+    var reducedValue = reduceValues(values, parents, function (value, parent) { return value && parent; });
+    if (!Array.isArray(reducedValue))
         return false;
-    return value.includes(true);
+    return reducedValue.includes(true);
 });
-json_logic_js_1.default.add_operation("has-many", function (value) {
-    if (!Array.isArray(value))
-        return false;
-    return value.length > 1;
+json_logic_js_1.default.add_operation("has-many", function (values, comparator, parents) {
+    var reducedValue = reduceValues(values, parents, function (value, parent) { return value && parent; });
+    if (!Array.isArray(reducedValue))
+        return true;
+    return reducedValue.length > 1;
 });
-var is = function (value, comparator) {
-    if (!Array.isArray(value)) {
-        var cleanValue = (typeof value === "number" ? value.toString() : value).toLowerCase();
-        var cleanComparator = (typeof comparator === "number" ? comparator.toString() : comparator).toLowerCase();
-        return cleanValue === cleanComparator;
-    }
-    var filter = value.filter(function (_value) { return is(_value, comparator); });
-    return value.length === filter.length;
+var is = function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        var cleanValue = (typeof value === "number"
+            ? value.toString()
+            : value).toLowerCase();
+        var cleanComparator = (typeof comparator === "number"
+            ? comparator.toString()
+            : comparator).toLowerCase();
+        return cleanValue === cleanComparator && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 };
 json_logic_js_1.default.add_operation("is", is);
 json_logic_js_1.default.add_operation("contains", is);
-var not = function (value, comparator) {
-    if (!Array.isArray(value)) {
-        var cleanValue = (typeof value === "number" ? value.toString() : value).toLowerCase();
-        var cleanComparator = (typeof comparator === "number" ? comparator.toString() : comparator).toLowerCase();
-        return cleanValue !== cleanComparator;
-    }
-    var filter = value.filter(function (_value) { return not(_value, comparator); });
-    return value.length === filter.length;
+var not = function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        var cleanValue = (typeof value === "number"
+            ? value.toString()
+            : value).toLowerCase();
+        var cleanComparator = (typeof comparator === "number"
+            ? comparator.toString()
+            : comparator).toLowerCase();
+        return cleanValue !== cleanComparator && parent;
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 };
 json_logic_js_1.default.add_operation("not", not);
 json_logic_js_1.default.add_operation("does-not-contain", not);
-json_logic_js_1.default.add_operation("empty", function (value) {
-    if (!Array.isArray(value)) {
+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;
-        return stringValue.trim().length === 0;
-    }
-    var filter = value.filter(function (_value) {
-        var stringValue = typeof _value === "number" ? _value.toString() : _value;
-        return stringValue.trim().length === 0;
+        return stringValue.trim().length === 0 && parent;
     });
-    return value.length === filter.length;
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-json_logic_js_1.default.add_operation("not-empty", function (value) {
-    if (!Array.isArray(value)) {
+json_logic_js_1.default.add_operation("not-empty", function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
         var stringValue = typeof value === "number" ? value.toString() : value;
-        return stringValue.trim().length > 0;
-    }
-    var filter = value.filter(function (_value) {
-        var stringValue = typeof _value === "number" ? _value.toString() : _value;
-        return stringValue.trim().length > 0;
+        return stringValue.trim().length > 0 && parent;
     });
-    return value.length === filter.length;
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 });
-var like = function (value, comparator) {
-    if (!Array.isArray(value)) {
-        var cleanValue = (typeof value === "number" ? value.toString() : value).toLowerCase();
-        var cleanComparator = (typeof comparator === "number" ? comparator.toString() : comparator).toLowerCase();
-        return new RegExp(cleanComparator).test(cleanValue);
-    }
-    var filter = value.filter(function (_value) { return like(_value, comparator); });
-    return value.length === filter.length;
+var like = function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        var cleanValue = (typeof value === "number"
+            ? value.toString()
+            : value).toLowerCase();
+        var cleanComparator = (typeof comparator === "number"
+            ? comparator.toString()
+            : comparator).toLowerCase();
+        return (new RegExp("( |^)" + cleanComparator + "( |$)", "i").test(cleanValue) && parent);
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 };
 json_logic_js_1.default.add_operation("like", like);
-var notLike = function (value, comparator) {
-    if (!Array.isArray(value)) {
-        var cleanValue = (typeof value === "number" ? value.toString() : value).toLowerCase();
-        var cleanComparator = (typeof comparator === "number" ? comparator.toString() : comparator).toLowerCase();
-        return !new RegExp(cleanComparator).test(cleanValue);
-    }
-    var filter = value.filter(function (_value) { return notLike(_value, comparator); });
-    return value.length === filter.length;
+var notLike = function (values, comparator, parents) {
+    var reducedValues = reduceValues(values, parents, function (value, parent) {
+        var cleanValue = (typeof value === "number"
+            ? value.toString()
+            : value).toLowerCase();
+        var cleanComparator = (typeof comparator === "number"
+            ? comparator.toString()
+            : comparator).toLowerCase();
+        return (!new RegExp("( |^)" + cleanComparator + "( |$)", "i").test(cleanValue) &&
+            parent);
+    });
+    var filter = reducedValues.filter(function (_value) { return _value === true; });
+    return reducedValues.length === filter.length;
 };
 json_logic_js_1.default.add_operation("not-like", notLike);
-var LpLogic = json_logic_js_1.default.apply;
+var LpLogic = function (logic, data) {
+    console.log("Condition", { logic: logic, data: data });
+    return json_logic_js_1.default.apply(logic, data);
+};
 exports.default = LpLogic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legalplace/lplogic",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "description": "LegalPlace LpLogic",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   "devDependencies": {
     "@babel/core": "^7.7.2",
     "@babel/preset-typescript": "^7.7.2",
-    "@legalplace/models-v3-types": "^3.1.0",
+    "@legalplace/models-v3-types": "^3.4.0",
     "@types/jest": "^24.0.15",
     "@types/node": "^12.6.1",
     "@typescript-eslint/eslint-plugin": "^2.6.1",

package/yarn.lock

@@ -351,10 +351,10 @@
   resolved "https://registry.yarnpkg.com/@legalplace/json-logic-js/-/json-logic-js-1.2.3.tgz#c8921dc4e485157c26740c536699fd10bb18b84e"
   integrity sha512-hyqkk3QqpDYZyEEupd6fyQEMUa3NuzlpaLiIu81z2/Wrb4z/5lw11wGTkIlTewuKq8UCxpJ7KpJXzwqq5smqXA==
 
-"@legalplace/models-v3-types@^3.1.0":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@legalplace/models-v3-types/-/models-v3-types-3.1.1.tgz#433a2f6d93a99e9a61d040457627772a2167a7ee"
-  integrity sha512-+c0EFH4bBQw7xB239PLtn1p83t4R1ygWrZwwuvFJnRGWuVle0w/RFkQ+gfwQZApvSx06U/vhNu8doRn/PVd3KQ==
+"@legalplace/models-v3-types@^3.4.0":
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/@legalplace/models-v3-types/-/models-v3-types-3.4.0.tgz#9cd0aa02d41cfa52c3682936d78d586e963f63a3"
+  integrity sha512-m6DRfxhxlAQZDgXUwSyI6HIWb7gLn7OEozsMNqUUoLslcrq4g9iOHkKAwnp30K2H6JgbS17ybhjSObVMinVirg==
 
 "@types/babel__core@^7.1.0":
   version "7.1.3"