@briza/illogical 1.5.1 → 1.5.2

package/changelog.md

@@ -1,5 +1,9 @@
 # illogical changelog
 
+## 1.5.2
+
+- Update dependencies.
+
 ## 1.5.1
 
 - Fix issue with nested conditions not being completely simplified.

package/lib/illogical.esm.js

@@ -1,18 +1,3 @@
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
 /**
  * Is number predicate.
  * @param value Tested value.
@@ -63,6 +48,21 @@ function isEvaluable(value) {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
 /**
  * Valid types for context members
  */
@@ -97,12 +97,12 @@ class Comparison {
    * @param {Operand} right Right operand.
    */
   constructor(operator, operatorSymbol, left, right) {
+    _defineProperty(this, "type", EvaluableType.Expression);
+
     this.operator = operator;
     this.operatorSymbol = operatorSymbol;
     this.left = left;
     this.right = right;
-
-    _defineProperty(this, "type", EvaluableType.Expression);
   }
   /**
    * {@link Evaluable.evaluate}
@@ -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);
@@ -620,9 +620,6 @@ class Value extends Operand {
     }
 
     super();
-
-    _defineProperty(this, "value", void 0);
-
     this.value = value;
   }
   /**
@@ -819,11 +816,11 @@ class Logical {
    * @param {Evaluable[]} operands Collection of operands.
    */
   constructor(operator, operatorSymbol, operands) {
+    _defineProperty(this, "type", EvaluableType.Expression);
+
     this.operator = operator;
     this.operatorSymbol = operatorSymbol;
     this.operands = operands;
-
-    _defineProperty(this, "type", EvaluableType.Expression);
   }
   /**
    * {@link Evaluable.evaluate}
@@ -891,7 +888,11 @@ 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);
@@ -963,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;
@@ -1017,7 +1018,11 @@ 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);
@@ -1089,7 +1094,11 @@ 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);
@@ -1176,8 +1185,14 @@ 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];
       }
@@ -1230,9 +1245,6 @@ class Collection extends Operand {
    */
   constructor(items) {
     super();
-
-    _defineProperty(this, "items", void 0);
-
     this.items = items;
   }
   /**
@@ -1250,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;
@@ -1415,11 +1427,6 @@ class Reference extends Operand {
     }
 
     super();
-
-    _defineProperty(this, "key", void 0);
-
-    _defineProperty(this, "dataType", void 0);
-
     this.key = key;
     const dataTypeMatch = dataTypeRegex.exec(this.key);
 
@@ -1466,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);
   }
@@ -1559,10 +1567,6 @@ class Parser {
    * @param {Options?} options Parser options.
    */
   constructor(options) {
-    _defineProperty(this, "opts", void 0);
-
-    _defineProperty(this, "expectedOperators", void 0);
-
     this.opts = { ...defaultOptions
     }; // Apply exclusive options overrides
 
@@ -1611,6 +1615,8 @@ class Parser {
 
 
   parseRawExp(raw) {
+    var _this = this;
+
     // Value / Reference
     if (!Array.isArray(raw)) {
       return this.getOperand(raw);
@@ -1632,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;
@@ -1768,6 +1776,10 @@ class Parser {
 
 }
 
+/**
+ * Main module.
+ * @module illogical
+ */
 /**
  * Condition engine
  */
@@ -1778,8 +1790,6 @@ class Engine {
    * @param {Options?} options Parser options.
    */
   constructor(options) {
-    _defineProperty(this, "parser", void 0);
-
     this.parser = new Parser(options);
   }
   /**
@@ -1846,5 +1856,4 @@ class Engine {
 
 }
 
-export default Engine;
-export { OPERATOR$4 as OPERATOR_AND, OPERATOR$h as OPERATOR_EQ, OPERATOR$g as OPERATOR_GE, OPERATOR$f as OPERATOR_GT, OPERATOR$e as OPERATOR_IN, OPERATOR$d as OPERATOR_LE, OPERATOR$c as OPERATOR_LT, OPERATOR$b as OPERATOR_NE, OPERATOR$2 as OPERATOR_NOR, OPERATOR$3 as OPERATOR_NOT, OPERATOR$a as OPERATOR_NOT_IN, OPERATOR$1 as OPERATOR_OR, OPERATOR$9 as OPERATOR_OVERLAP, OPERATOR$8 as OPERATOR_PREFIX, OPERATOR$7 as OPERATOR_PRESENT, OPERATOR$6 as OPERATOR_SUFFIX, OPERATOR$5 as OPERATOR_UNDEFINED, OPERATOR as OPERATOR_XOR };
+export { OPERATOR$4 as OPERATOR_AND, OPERATOR$h as OPERATOR_EQ, OPERATOR$g as OPERATOR_GE, OPERATOR$f as OPERATOR_GT, OPERATOR$e as OPERATOR_IN, OPERATOR$d as OPERATOR_LE, OPERATOR$c as OPERATOR_LT, OPERATOR$b as OPERATOR_NE, OPERATOR$2 as OPERATOR_NOR, OPERATOR$3 as OPERATOR_NOT, OPERATOR$a as OPERATOR_NOT_IN, OPERATOR$1 as OPERATOR_OR, OPERATOR$9 as OPERATOR_OVERLAP, OPERATOR$8 as OPERATOR_PREFIX, OPERATOR$7 as OPERATOR_PRESENT, OPERATOR$6 as OPERATOR_SUFFIX, OPERATOR$5 as OPERATOR_UNDEFINED, OPERATOR as OPERATOR_XOR, Engine as default };

package/lib/illogical.js

@@ -2,21 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
 /**
  * Is number predicate.
  * @param value Tested value.
@@ -67,6 +52,21 @@ function isEvaluable(value) {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
 /**
  * Valid types for context members
  */
@@ -101,12 +101,12 @@ class Comparison {
    * @param {Operand} right Right operand.
    */
   constructor(operator, operatorSymbol, left, right) {
+    _defineProperty(this, "type", EvaluableType.Expression);
+
     this.operator = operator;
     this.operatorSymbol = operatorSymbol;
     this.left = left;
     this.right = right;
-
-    _defineProperty(this, "type", EvaluableType.Expression);
   }
   /**
    * {@link Evaluable.evaluate}
@@ -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);
@@ -624,9 +624,6 @@ class Value extends Operand {
     }
 
     super();
-
-    _defineProperty(this, "value", void 0);
-
     this.value = value;
   }
   /**
@@ -823,11 +820,11 @@ class Logical {
    * @param {Evaluable[]} operands Collection of operands.
    */
   constructor(operator, operatorSymbol, operands) {
+    _defineProperty(this, "type", EvaluableType.Expression);
+
     this.operator = operator;
     this.operatorSymbol = operatorSymbol;
     this.operands = operands;
-
-    _defineProperty(this, "type", EvaluableType.Expression);
   }
   /**
    * {@link Evaluable.evaluate}
@@ -895,7 +892,11 @@ 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);
@@ -967,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;
@@ -1021,7 +1022,11 @@ 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);
@@ -1093,7 +1098,11 @@ 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);
@@ -1180,8 +1189,14 @@ 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];
       }
@@ -1234,9 +1249,6 @@ class Collection extends Operand {
    */
   constructor(items) {
     super();
-
-    _defineProperty(this, "items", void 0);
-
     this.items = items;
   }
   /**
@@ -1254,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;
@@ -1419,11 +1431,6 @@ class Reference extends Operand {
     }
 
     super();
-
-    _defineProperty(this, "key", void 0);
-
-    _defineProperty(this, "dataType", void 0);
-
     this.key = key;
     const dataTypeMatch = dataTypeRegex.exec(this.key);
 
@@ -1470,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);
   }
@@ -1563,10 +1571,6 @@ class Parser {
    * @param {Options?} options Parser options.
    */
   constructor(options) {
-    _defineProperty(this, "opts", void 0);
-
-    _defineProperty(this, "expectedOperators", void 0);
-
     this.opts = { ...defaultOptions
     }; // Apply exclusive options overrides
 
@@ -1615,6 +1619,8 @@ class Parser {
 
 
   parseRawExp(raw) {
+    var _this = this;
+
     // Value / Reference
     if (!Array.isArray(raw)) {
       return this.getOperand(raw);
@@ -1636,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;
@@ -1772,6 +1780,10 @@ class Parser {
 
 }
 
+/**
+ * Main module.
+ * @module illogical
+ */
 /**
  * Condition engine
  */
@@ -1782,8 +1794,6 @@ class Engine {
    * @param {Options?} options Parser options.
    */
   constructor(options) {
-    _defineProperty(this, "parser", void 0);
-
     this.parser = new Parser(options);
   }
   /**
@@ -1868,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.1",
+  "version": "1.5.2",
   "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",
+    "@babel/core": "^7.16.12",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-typescript": "^7.16.7",
     "@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",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@types/jest": "^27.4.0",
+    "@typescript-eslint/eslint-plugin": "^5.10.2",
+    "@typescript-eslint/parser": "^5.10.2",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-import-resolver-typescript": "^2.3.0",
-    "eslint-plugin-import": "^2.24.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.4.7",
     "license-checker": "^25.0.1",
-    "prettier": "^2.3.2",
-    "rollup": "^2.56.2",
+    "prettier": "^2.5.1",
+    "rollup": "^2.66.1",
     "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.11",
+    "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