@briza/illogical 1.5.0 → 1.5.3

package/changelog.md

@@ -1,5 +1,17 @@
 # illogical changelog
 
+## 1.5.3
+
+- Fixed an issue where conditions with object data were not being simplified correctly.
+
+## 1.5.2
+
+- Update dependencies.
+
+## 1.5.1
+
+- Fix issue with nested conditions not being completely simplified.
+
 ## 1.5.0
 
 - Add simplify capability to strictly evaluate the expression for all referred values

package/lib/illogical.esm.js

@@ -45,7 +45,7 @@ function isBoolean(value) {
  */
 
 function isEvaluable(value) {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
+  return typeof value === 'object' && value !== null && !Array.isArray(value) && typeof value.evaluate === 'function' && typeof value.simplify === 'function' && typeof value.serialize === 'function' && typeof value.toString === 'function';
 }
 
 function _defineProperty(obj, key, value) {
@@ -132,9 +132,9 @@ class Comparison {
   /**
    * {@link Evaluable.simplify}
    */
-  simplify(...args) {
-    const left = this.left.simplify(...args);
-    const right = this.right.simplify(...args);
+  simplify() {
+    const left = this.left.simplify(...arguments);
+    const right = this.right.simplify(...arguments);
 
     if (!isEvaluable(left) && !isEvaluable(right)) {
       return this.comparison(left, right);
@@ -888,17 +888,21 @@ class And extends Logical {
    */
 
 
-  simplify(...args) {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const simplified = this.operands.reduce((result, child) => {
       if (result !== false) {
         const childResult = child.simplify(...args);
 
-        if (!isBoolean(childResult)) {
+        if (isEvaluable(childResult)) {
           if (isBoolean(result)) {
-            return [child];
+            return [childResult];
           }
 
-          return [...result, child];
+          return [...result, childResult];
         }
 
         if (!childResult) {
@@ -960,8 +964,8 @@ class Not extends Logical {
    */
 
 
-  simplify(...args) {
-    const simplified = this.operands[0].simplify(...args);
+  simplify() {
+    const simplified = this.operands[0].simplify(...arguments);
 
     if (isBoolean(simplified)) {
       return !simplified;
@@ -1014,17 +1018,21 @@ class Nor extends Logical {
    */
 
 
-  simplify(...args) {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const simplified = this.operands.reduce((result, child) => {
       if (result !== false) {
         const childResult = child.simplify(...args);
 
         if (isEvaluable(childResult)) {
           if (isBoolean(result)) {
-            return [child];
+            return [childResult];
           }
 
-          return [...result, child];
+          return [...result, childResult];
         }
 
         if (childResult) {
@@ -1086,17 +1094,21 @@ class Or extends Logical {
    */
 
 
-  simplify(...args) {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const simplified = this.operands.reduce((result, child) => {
       if (result !== true) {
         const childResult = child.simplify(...args);
 
-        if (!isBoolean(childResult)) {
+        if (isEvaluable(childResult)) {
           if (isBoolean(result)) {
-            return [child];
+            return [childResult];
           }
 
-          return [...result, child];
+          return [...result, childResult];
         }
 
         if (childResult) {
@@ -1173,16 +1185,22 @@ class Xor extends Logical {
    */
 
 
-  simplify(...args) {
-    const [evaluablesLeft, trueCount] = this.operands.reduce(([notSimplifiedConditions, trueCount], child) => {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    const [evaluablesLeft, trueCount] = this.operands.reduce((_ref, child) => {
+      let [notSimplifiedConditions, trueCount] = _ref;
+
       if (trueCount > 1) {
         return [notSimplifiedConditions, trueCount];
       }
 
       const childResult = child.simplify(...args);
 
-      if (!isBoolean(childResult)) {
-        return [[...notSimplifiedConditions, child], trueCount];
+      if (isEvaluable(childResult)) {
+        return [[...notSimplifiedConditions, childResult], trueCount];
       }
 
       if (childResult) {
@@ -1244,11 +1262,11 @@ class Collection extends Operand {
    */
 
 
-  simplify(...args) {
+  simplify() {
     const values = [];
 
     for (const item of this.items) {
-      const simplifiedItem = item.simplify(...args);
+      const simplifiedItem = item.simplify(...arguments);
 
       if (isEvaluable(simplifiedItem)) {
         return this;
@@ -1455,9 +1473,10 @@ class Reference extends Operand {
    */
 
 
-  serialize({
-    referenceSerialization
-  }) {
+  serialize(_ref) {
+    let {
+      referenceSerialization
+    } = _ref;
     const key = this.dataType ? `${this.key}.(${this.dataType})` : this.key;
     return referenceSerialization(key);
   }
@@ -1596,6 +1615,8 @@ class Parser {
 
 
   parseRawExp(raw) {
+    var _this = this;
+
     // Value / Reference
     if (!Array.isArray(raw)) {
       return this.getOperand(raw);
@@ -1617,9 +1638,11 @@ class Parser {
      * @param collapsible
      */
 
-    const logicalExpressionReducer = (operands, collapsible = false) => {
+    const logicalExpressionReducer = function (operands) {
+      let collapsible = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
       if (operands.length === 0 || operands.filter(operand => operand.type === EvaluableType.Expression).length === 0) {
-        return this.getOperand(raw);
+        return _this.getOperand(raw);
       }
 
       return collapsible && operands.length === 1 ? operands[0] : undefined;

package/lib/illogical.js

@@ -49,7 +49,7 @@ function isBoolean(value) {
  */
 
 function isEvaluable(value) {
-  return typeof value === 'object' && value !== null && !Array.isArray(value);
+  return typeof value === 'object' && value !== null && !Array.isArray(value) && typeof value.evaluate === 'function' && typeof value.simplify === 'function' && typeof value.serialize === 'function' && typeof value.toString === 'function';
 }
 
 function _defineProperty(obj, key, value) {
@@ -136,9 +136,9 @@ class Comparison {
   /**
    * {@link Evaluable.simplify}
    */
-  simplify(...args) {
-    const left = this.left.simplify(...args);
-    const right = this.right.simplify(...args);
+  simplify() {
+    const left = this.left.simplify(...arguments);
+    const right = this.right.simplify(...arguments);
 
     if (!isEvaluable(left) && !isEvaluable(right)) {
       return this.comparison(left, right);
@@ -892,17 +892,21 @@ class And extends Logical {
    */
 
 
-  simplify(...args) {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const simplified = this.operands.reduce((result, child) => {
       if (result !== false) {
         const childResult = child.simplify(...args);
 
-        if (!isBoolean(childResult)) {
+        if (isEvaluable(childResult)) {
           if (isBoolean(result)) {
-            return [child];
+            return [childResult];
           }
 
-          return [...result, child];
+          return [...result, childResult];
         }
 
         if (!childResult) {
@@ -964,8 +968,8 @@ class Not extends Logical {
    */
 
 
-  simplify(...args) {
-    const simplified = this.operands[0].simplify(...args);
+  simplify() {
+    const simplified = this.operands[0].simplify(...arguments);
 
     if (isBoolean(simplified)) {
       return !simplified;
@@ -1018,17 +1022,21 @@ class Nor extends Logical {
    */
 
 
-  simplify(...args) {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const simplified = this.operands.reduce((result, child) => {
       if (result !== false) {
         const childResult = child.simplify(...args);
 
         if (isEvaluable(childResult)) {
           if (isBoolean(result)) {
-            return [child];
+            return [childResult];
           }
 
-          return [...result, child];
+          return [...result, childResult];
         }
 
         if (childResult) {
@@ -1090,17 +1098,21 @@ class Or extends Logical {
    */
 
 
-  simplify(...args) {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
     const simplified = this.operands.reduce((result, child) => {
       if (result !== true) {
         const childResult = child.simplify(...args);
 
-        if (!isBoolean(childResult)) {
+        if (isEvaluable(childResult)) {
           if (isBoolean(result)) {
-            return [child];
+            return [childResult];
           }
 
-          return [...result, child];
+          return [...result, childResult];
         }
 
         if (childResult) {
@@ -1177,16 +1189,22 @@ class Xor extends Logical {
    */
 
 
-  simplify(...args) {
-    const [evaluablesLeft, trueCount] = this.operands.reduce(([notSimplifiedConditions, trueCount], child) => {
+  simplify() {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    const [evaluablesLeft, trueCount] = this.operands.reduce((_ref, child) => {
+      let [notSimplifiedConditions, trueCount] = _ref;
+
       if (trueCount > 1) {
         return [notSimplifiedConditions, trueCount];
       }
 
       const childResult = child.simplify(...args);
 
-      if (!isBoolean(childResult)) {
-        return [[...notSimplifiedConditions, child], trueCount];
+      if (isEvaluable(childResult)) {
+        return [[...notSimplifiedConditions, childResult], trueCount];
       }
 
       if (childResult) {
@@ -1248,11 +1266,11 @@ class Collection extends Operand {
    */
 
 
-  simplify(...args) {
+  simplify() {
     const values = [];
 
     for (const item of this.items) {
-      const simplifiedItem = item.simplify(...args);
+      const simplifiedItem = item.simplify(...arguments);
 
       if (isEvaluable(simplifiedItem)) {
         return this;
@@ -1459,9 +1477,10 @@ class Reference extends Operand {
    */
 
 
-  serialize({
-    referenceSerialization
-  }) {
+  serialize(_ref) {
+    let {
+      referenceSerialization
+    } = _ref;
     const key = this.dataType ? `${this.key}.(${this.dataType})` : this.key;
     return referenceSerialization(key);
   }
@@ -1600,6 +1619,8 @@ class Parser {
 
 
   parseRawExp(raw) {
+    var _this = this;
+
     // Value / Reference
     if (!Array.isArray(raw)) {
       return this.getOperand(raw);
@@ -1621,9 +1642,11 @@ class Parser {
      * @param collapsible
      */
 
-    const logicalExpressionReducer = (operands, collapsible = false) => {
+    const logicalExpressionReducer = function (operands) {
+      let collapsible = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
       if (operands.length === 0 || operands.filter(operand => operand.type === EvaluableType.Expression).length === 0) {
-        return this.getOperand(raw);
+        return _this.getOperand(raw);
       }
 
       return collapsible && operands.length === 1 ? operands[0] : undefined;
@@ -1855,4 +1878,4 @@ exports.OPERATOR_PRESENT = OPERATOR$7;
 exports.OPERATOR_SUFFIX = OPERATOR$6;
 exports.OPERATOR_UNDEFINED = OPERATOR$5;
 exports.OPERATOR_XOR = OPERATOR;
-exports['default'] = Engine;
+exports["default"] = Engine;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@briza/illogical",
-  "version": "1.5.0",
+  "version": "1.5.3",
   "description": "A micro conditional javascript engine used to parse the raw logical and comparison expressions, evaluate the expression in the given data context, and provide access to a text form of the given expressions.",
   "main": "lib/illogical.js",
   "module": "lib/illogical.esm.js",
@@ -25,7 +25,7 @@
     "lint": "eslint --max-warnings 0 \"src/**/*.{ts,js}\"",
     "lint:fix": "eslint --max-warnings 0 \"src/**/*.{ts,js}\" --fix",
     "prepublishOnly": "npm run test && npm run build",
-    "check-licenses": "license-checker --summary --excludePrivatePackages --onlyAllow \"MIT;MIT OR X11;Apache-2.0;ISC;BSD-3-Clause;BSD-2-Clause;CC-BY-4.0;Public Domain;BSD;CC-BY-3.0;CC0-1.0;Unlicense\""
+    "check-licenses": "license-checker --summary --excludePrivatePackages --onlyAllow \"MIT;MIT OR X11;Apache-2.0;ISC;BSD-3-Clause;BSD-2-Clause;CC-BY-4.0;Public Domain;BSD;CC-BY-3.0;CC0-1.0;Python-2.0;Unlicense\""
   },
   "repository": {
     "type": "git",
@@ -42,31 +42,31 @@
     "rules"
   ],
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-typescript": "^7.15.0",
-    "@rollup/plugin-babel": "^5.2.3",
-    "@rollup/plugin-commonjs": "^20.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.4",
-    "@types/jest": "^27.0.1",
-    "@typescript-eslint/eslint-plugin": "^4.29.2",
-    "@typescript-eslint/parser": "^4.29.2",
-    "eslint": "^7.32.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-import-resolver-typescript": "^2.3.0",
-    "eslint-plugin-import": "^2.24.0",
+    "@babel/core": "^7.17.5",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-typescript": "^7.16.7",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^21.0.2",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@types/jest": "^27.4.1",
+    "@typescript-eslint/eslint-plugin": "^5.13.0",
+    "@typescript-eslint/parser": "^5.13.0",
+    "eslint": "^8.10.0",
+    "eslint-config-prettier": "^8.4.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "jest": "^27.0.6",
+    "jest": "^27.5.1",
     "license-checker": "^25.0.1",
-    "prettier": "^2.3.2",
-    "rollup": "^2.56.2",
+    "prettier": "^2.5.1",
+    "rollup": "^2.69.0",
     "rollup-plugin-eslint": "^7.0.0",
-    "ts-jest": "^27.0.5",
-    "typedoc": "^0.21.6",
-    "typescript": "^4.3.5"
+    "ts-jest": "^27.1.3",
+    "typedoc": "^0.22.12",
+    "typescript": "4.5.5"
   }
 }

package/readme.md

@@ -2,7 +2,7 @@
 
 A micro conditional javascript engine used to parse the raw logical and comparison expressions, evaluate the expression in the given data context, and provide access to a text form of the given expressions.
 
-> Revision: August 17, 2021.
+> Revision: February 1, 2022.
 
 ## About
 

package/types/common/evaluable.d.ts

@@ -15,7 +15,7 @@ export interface Context {
 /**
  * Evaluation result
  */
-export declare type Result = undefined | null | string | number | boolean | Array<Result>;
+export declare type Result = undefined | null | string | number | boolean | Array<Result> | Record<string, unknown>;
 export declare enum EvaluableType {
     Operand = "Operand",
     Expression = "Expression"