@briza/illogical 1.5.2 → 1.5.5

package/changelog.md

@@ -1,5 +1,19 @@
 # illogical changelog
 
+## 1.5.5
+
+- Expose default options for parser
+- Expose isEvaluable
+- Performance improvements in references
+
+## 1.5.4
+
+- Update dependencies.
+
+## 1.5.3
+
+- Fixed an issue where conditions with object data were not being simplified correctly.
+
 ## 1.5.2
 
 - Update dependencies.

package/lib/illogical.esm.js

@@ -1,3 +1,18 @@
+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.
@@ -45,22 +60,7 @@ function isBoolean(value) {
  */
 
 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;
+  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';
 }
 
 /**
@@ -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}
@@ -620,6 +620,9 @@ class Value extends Operand {
     }
 
     super();
+
+    _defineProperty(this, "value", void 0);
+
     this.value = value;
   }
   /**
@@ -816,11 +819,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}
@@ -1245,6 +1248,9 @@ class Collection extends Operand {
    */
   constructor(items) {
     super();
+
+    _defineProperty(this, "items", void 0);
+
     this.items = items;
   }
   /**
@@ -1332,13 +1338,39 @@ const toString = value => {
   return undefined;
 };
 
-function extractKeys(ctx, key) {
+const keyWithArrayIndexRegex = /^(?<currentKey>[^[\]]+?)(?<indexes>(?:\[\d+])+)?$/;
+const arrayIndexRegex = /\[(\d+)]/g;
+
+const parseKey = key => key.split('.').flatMap(key => {
+  const parseResult = keyWithArrayIndexRegex.exec(key);
+  const keys = [];
+
+  if (parseResult) {
+    var _parseResult$groups$c, _parseResult$groups, _parseResult$groups2;
+
+    keys.push((_parseResult$groups$c = parseResult === null || parseResult === void 0 ? void 0 : (_parseResult$groups = parseResult.groups) === null || _parseResult$groups === void 0 ? void 0 : _parseResult$groups.currentKey) !== null && _parseResult$groups$c !== void 0 ? _parseResult$groups$c : key);
+    const rawIndexes = parseResult === null || parseResult === void 0 ? void 0 : (_parseResult$groups2 = parseResult.groups) === null || _parseResult$groups2 === void 0 ? void 0 : _parseResult$groups2.indexes;
+
+    if (rawIndexes) {
+      for (const indexResult of rawIndexes.matchAll(arrayIndexRegex)) {
+        keys.push(parseInt(indexResult[1]));
+      }
+    }
+  } else {
+    keys.push(key);
+  }
+
+  return keys;
+});
+
+const complexKeyExpression = /{([^{}]+)}/;
+
+function extractComplexKeys(ctx, key) {
   // Resolve complex keys
-  const complexKeyExpression = /{([^{}]+)}/;
   let complexKeyMatches = complexKeyExpression.exec(key);
 
   while (complexKeyMatches) {
-    const resolvedValue = contextValueLookup(ctx, complexKeyMatches[1]);
+    const resolvedValue = complexValueLookup(ctx, complexKeyMatches[1]);
 
     if (resolvedValue === undefined) {
       return undefined;
@@ -1348,14 +1380,30 @@ function extractKeys(ctx, key) {
     complexKeyMatches = complexKeyExpression.exec(key);
   }
 
-  let keys = [key]; // Nested reference
+  return parseKey(key);
+}
+
+const isContext = value => isObject(value);
+
+const simpleValueLookup = keys => ctx => {
+  let pointer = ctx;
 
-  if (key.includes('.')) {
-    keys = key.split('.');
+  for (const key of keys) {
+    if (typeof key === 'number') {
+      if (!Array.isArray(pointer)) {
+        return undefined;
+      }
+
+      pointer = pointer[key];
+    } else if (!isContext(pointer)) {
+      return undefined;
+    } else {
+      pointer = pointer[key];
+    }
   }
 
-  return keys;
-}
+  return pointer;
+};
 /**
  * Lookup for the reference in the context.
  * The nested context value is annotated with "." delimiter.
@@ -1366,42 +1414,14 @@ function extractKeys(ctx, key) {
  */
 
 
-function contextValueLookup(ctx, key) {
-  const keys = extractKeys(ctx, key);
+function complexValueLookup(ctx, key) {
+  const keys = extractComplexKeys(ctx, key);
 
   if (!keys) {
     return undefined;
-  } // Context pointer
-
-
-  let pointer = ctx;
-
-  for (let i = 0; i < keys.length; i++) {
-    var _keys$i$match;
-
-    const currentKey = keys[i].replace(/\[.+$/, '');
-    let currentValue = pointer[currentKey]; // Resolve array notation
-
-    (_keys$i$match = keys[i].match(/\[\d+\]/g)) === null || _keys$i$match === void 0 ? void 0 : _keys$i$match.forEach(match => {
-      const arrayIndex = parseInt(match.replace(/[[\]]/g, ''));
-
-      if (!Array.isArray(currentValue) || currentValue[arrayIndex] === undefined) {
-        currentValue = undefined;
-      } else {
-        currentValue = currentValue[arrayIndex];
-      }
-    }); // Last node
-
-    if (i === keys.length - 1) {
-      return currentValue; // Nested path
-    } else if (currentValue !== undefined && isObject(currentValue)) {
-      pointer = currentValue; // Invalid nested reference path
-    } else {
-      break;
-    }
   }
 
-  return undefined;
+  return simpleValueLookup(keys !== null && keys !== void 0 ? keys : [])(ctx);
 }
 
 let DataType; // Equivalent to /^.+\.\((Number|String)\)$/
@@ -1412,10 +1432,13 @@ let DataType; // Equivalent to /^.+\.\((Number|String)\)$/
 })(DataType || (DataType = {}));
 
 const dataTypeRegex = new RegExp(`^.+\\.\\((${Object.keys(DataType).join('|')})\\)$`);
+
+const isComplexKey = key => key.indexOf('{') > -1;
 /**
  * Reference operand resolved within the context
  */
 
+
 class Reference extends Operand {
   /**
    * @constructor
@@ -1427,6 +1450,15 @@ class Reference extends Operand {
     }
 
     super();
+
+    _defineProperty(this, "key", void 0);
+
+    _defineProperty(this, "dataType", void 0);
+
+    _defineProperty(this, "valueLookup", void 0);
+
+    _defineProperty(this, "getKeys", void 0);
+
     this.key = key;
     const dataTypeMatch = dataTypeRegex.exec(this.key);
 
@@ -1437,6 +1469,17 @@ class Reference extends Operand {
     if (this.key.match(/.\(.+\)$/)) {
       this.key = this.key.replace(/.\(.+\)$/, '');
     }
+
+    if (isComplexKey(this.key)) {
+      this.valueLookup = context => complexValueLookup(context, this.key);
+
+      this.getKeys = context => extractComplexKeys(context, this.key);
+    } else {
+      const keys = parseKey(this.key);
+      this.valueLookup = simpleValueLookup(keys);
+
+      this.getKeys = () => keys;
+    }
   }
   /**
    * Evaluate in the given context.
@@ -1446,7 +1489,7 @@ class Reference extends Operand {
 
 
   evaluate(ctx) {
-    return this.toDataType(contextValueLookup(ctx, this.key));
+    return this.toDataType(this.valueLookup(ctx));
   }
   /**
    * {@link Evaluable.simplify}
@@ -1454,18 +1497,18 @@ class Reference extends Operand {
 
 
   simplify(ctx, strictKeys, optionalKeys) {
-    const keys = extractKeys(ctx, this.key);
-
-    if (!keys) {
-      return this;
-    }
+    var _this$getKeys;
 
-    const key = keys[0].replace(/\[.+$/, '');
+    const [key] = (_this$getKeys = this.getKeys(ctx)) !== null && _this$getKeys !== void 0 ? _this$getKeys : [];
 
     if (ctx[key] !== undefined) {
       return this.evaluate(ctx);
     }
 
+    if (!key || typeof key === 'number') {
+      return this;
+    }
+
     return strictKeys && strictKeys.includes(key) || optionalKeys && !optionalKeys.includes(key) ? undefined : this;
   }
   /**
@@ -1567,6 +1610,10 @@ 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
 
@@ -1776,10 +1823,6 @@ class Parser {
 
 }
 
-/**
- * Main module.
- * @module illogical
- */
 /**
  * Condition engine
  */
@@ -1790,6 +1833,8 @@ class Engine {
    * @param {Options?} options Parser options.
    */
   constructor(options) {
+    _defineProperty(this, "parser", void 0);
+
     this.parser = new Parser(options);
   }
   /**
@@ -1856,4 +1901,4 @@ class 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, Engine as default };
+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, defaultOptions, isEvaluable };

package/lib/illogical.js

@@ -2,6 +2,21 @@
 
 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.
@@ -49,22 +64,7 @@ function isBoolean(value) {
  */
 
 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;
+  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';
 }
 
 /**
@@ -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}
@@ -624,6 +624,9 @@ class Value extends Operand {
     }
 
     super();
+
+    _defineProperty(this, "value", void 0);
+
     this.value = value;
   }
   /**
@@ -820,11 +823,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}
@@ -1249,6 +1252,9 @@ class Collection extends Operand {
    */
   constructor(items) {
     super();
+
+    _defineProperty(this, "items", void 0);
+
     this.items = items;
   }
   /**
@@ -1336,13 +1342,39 @@ const toString = value => {
   return undefined;
 };
 
-function extractKeys(ctx, key) {
+const keyWithArrayIndexRegex = /^(?<currentKey>[^[\]]+?)(?<indexes>(?:\[\d+])+)?$/;
+const arrayIndexRegex = /\[(\d+)]/g;
+
+const parseKey = key => key.split('.').flatMap(key => {
+  const parseResult = keyWithArrayIndexRegex.exec(key);
+  const keys = [];
+
+  if (parseResult) {
+    var _parseResult$groups$c, _parseResult$groups, _parseResult$groups2;
+
+    keys.push((_parseResult$groups$c = parseResult === null || parseResult === void 0 ? void 0 : (_parseResult$groups = parseResult.groups) === null || _parseResult$groups === void 0 ? void 0 : _parseResult$groups.currentKey) !== null && _parseResult$groups$c !== void 0 ? _parseResult$groups$c : key);
+    const rawIndexes = parseResult === null || parseResult === void 0 ? void 0 : (_parseResult$groups2 = parseResult.groups) === null || _parseResult$groups2 === void 0 ? void 0 : _parseResult$groups2.indexes;
+
+    if (rawIndexes) {
+      for (const indexResult of rawIndexes.matchAll(arrayIndexRegex)) {
+        keys.push(parseInt(indexResult[1]));
+      }
+    }
+  } else {
+    keys.push(key);
+  }
+
+  return keys;
+});
+
+const complexKeyExpression = /{([^{}]+)}/;
+
+function extractComplexKeys(ctx, key) {
   // Resolve complex keys
-  const complexKeyExpression = /{([^{}]+)}/;
   let complexKeyMatches = complexKeyExpression.exec(key);
 
   while (complexKeyMatches) {
-    const resolvedValue = contextValueLookup(ctx, complexKeyMatches[1]);
+    const resolvedValue = complexValueLookup(ctx, complexKeyMatches[1]);
 
     if (resolvedValue === undefined) {
       return undefined;
@@ -1352,14 +1384,30 @@ function extractKeys(ctx, key) {
     complexKeyMatches = complexKeyExpression.exec(key);
   }
 
-  let keys = [key]; // Nested reference
+  return parseKey(key);
+}
+
+const isContext = value => isObject(value);
+
+const simpleValueLookup = keys => ctx => {
+  let pointer = ctx;
 
-  if (key.includes('.')) {
-    keys = key.split('.');
+  for (const key of keys) {
+    if (typeof key === 'number') {
+      if (!Array.isArray(pointer)) {
+        return undefined;
+      }
+
+      pointer = pointer[key];
+    } else if (!isContext(pointer)) {
+      return undefined;
+    } else {
+      pointer = pointer[key];
+    }
   }
 
-  return keys;
-}
+  return pointer;
+};
 /**
  * Lookup for the reference in the context.
  * The nested context value is annotated with "." delimiter.
@@ -1370,42 +1418,14 @@ function extractKeys(ctx, key) {
  */
 
 
-function contextValueLookup(ctx, key) {
-  const keys = extractKeys(ctx, key);
+function complexValueLookup(ctx, key) {
+  const keys = extractComplexKeys(ctx, key);
 
   if (!keys) {
     return undefined;
-  } // Context pointer
-
-
-  let pointer = ctx;
-
-  for (let i = 0; i < keys.length; i++) {
-    var _keys$i$match;
-
-    const currentKey = keys[i].replace(/\[.+$/, '');
-    let currentValue = pointer[currentKey]; // Resolve array notation
-
-    (_keys$i$match = keys[i].match(/\[\d+\]/g)) === null || _keys$i$match === void 0 ? void 0 : _keys$i$match.forEach(match => {
-      const arrayIndex = parseInt(match.replace(/[[\]]/g, ''));
-
-      if (!Array.isArray(currentValue) || currentValue[arrayIndex] === undefined) {
-        currentValue = undefined;
-      } else {
-        currentValue = currentValue[arrayIndex];
-      }
-    }); // Last node
-
-    if (i === keys.length - 1) {
-      return currentValue; // Nested path
-    } else if (currentValue !== undefined && isObject(currentValue)) {
-      pointer = currentValue; // Invalid nested reference path
-    } else {
-      break;
-    }
   }
 
-  return undefined;
+  return simpleValueLookup(keys !== null && keys !== void 0 ? keys : [])(ctx);
 }
 
 let DataType; // Equivalent to /^.+\.\((Number|String)\)$/
@@ -1416,10 +1436,13 @@ let DataType; // Equivalent to /^.+\.\((Number|String)\)$/
 })(DataType || (DataType = {}));
 
 const dataTypeRegex = new RegExp(`^.+\\.\\((${Object.keys(DataType).join('|')})\\)$`);
+
+const isComplexKey = key => key.indexOf('{') > -1;
 /**
  * Reference operand resolved within the context
  */
 
+
 class Reference extends Operand {
   /**
    * @constructor
@@ -1431,6 +1454,15 @@ class Reference extends Operand {
     }
 
     super();
+
+    _defineProperty(this, "key", void 0);
+
+    _defineProperty(this, "dataType", void 0);
+
+    _defineProperty(this, "valueLookup", void 0);
+
+    _defineProperty(this, "getKeys", void 0);
+
     this.key = key;
     const dataTypeMatch = dataTypeRegex.exec(this.key);
 
@@ -1441,6 +1473,17 @@ class Reference extends Operand {
     if (this.key.match(/.\(.+\)$/)) {
       this.key = this.key.replace(/.\(.+\)$/, '');
     }
+
+    if (isComplexKey(this.key)) {
+      this.valueLookup = context => complexValueLookup(context, this.key);
+
+      this.getKeys = context => extractComplexKeys(context, this.key);
+    } else {
+      const keys = parseKey(this.key);
+      this.valueLookup = simpleValueLookup(keys);
+
+      this.getKeys = () => keys;
+    }
   }
   /**
    * Evaluate in the given context.
@@ -1450,7 +1493,7 @@ class Reference extends Operand {
 
 
   evaluate(ctx) {
-    return this.toDataType(contextValueLookup(ctx, this.key));
+    return this.toDataType(this.valueLookup(ctx));
   }
   /**
    * {@link Evaluable.simplify}
@@ -1458,18 +1501,18 @@ class Reference extends Operand {
 
 
   simplify(ctx, strictKeys, optionalKeys) {
-    const keys = extractKeys(ctx, this.key);
-
-    if (!keys) {
-      return this;
-    }
+    var _this$getKeys;
 
-    const key = keys[0].replace(/\[.+$/, '');
+    const [key] = (_this$getKeys = this.getKeys(ctx)) !== null && _this$getKeys !== void 0 ? _this$getKeys : [];
 
     if (ctx[key] !== undefined) {
       return this.evaluate(ctx);
     }
 
+    if (!key || typeof key === 'number') {
+      return this;
+    }
+
     return strictKeys && strictKeys.includes(key) || optionalKeys && !optionalKeys.includes(key) ? undefined : this;
   }
   /**
@@ -1571,6 +1614,10 @@ 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
 
@@ -1780,10 +1827,6 @@ class Parser {
 
 }
 
-/**
- * Main module.
- * @module illogical
- */
 /**
  * Condition engine
  */
@@ -1794,6 +1837,8 @@ class Engine {
    * @param {Options?} options Parser options.
    */
   constructor(options) {
+    _defineProperty(this, "parser", void 0);
+
     this.parser = new Parser(options);
   }
   /**
@@ -1879,3 +1924,5 @@ exports.OPERATOR_SUFFIX = OPERATOR$6;
 exports.OPERATOR_UNDEFINED = OPERATOR$5;
 exports.OPERATOR_XOR = OPERATOR;
 exports["default"] = Engine;
+exports.defaultOptions = defaultOptions;
+exports.isEvaluable = isEvaluable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@briza/illogical",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "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",
@@ -42,31 +42,31 @@
     "rules"
   ],
   "devDependencies": {
-    "@babel/core": "^7.16.12",
+    "@babel/core": "^7.17.9",
     "@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": "^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.5.0",
-    "eslint-plugin-import": "^2.25.4",
+    "@rollup/plugin-babel": "^5.3.1",
+    "@rollup/plugin-commonjs": "^21.0.3",
+    "@rollup/plugin-node-resolve": "^13.2.0",
+    "@types/jest": "^27.4.1",
+    "@typescript-eslint/eslint-plugin": "^5.19.0",
+    "@typescript-eslint/parser": "^5.19.0",
+    "eslint": "^8.13.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-import-resolver-typescript": "^2.7.1",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-plugin-promise": "^6.0.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "jest": "^27.4.7",
+    "jest": "^27.5.1",
     "license-checker": "^25.0.1",
-    "prettier": "^2.5.1",
-    "rollup": "^2.66.1",
+    "prettier": "^2.6.2",
+    "rollup": "^2.70.1",
     "rollup-plugin-eslint": "^7.0.0",
-    "ts-jest": "^27.1.3",
-    "typedoc": "^0.22.11",
-    "typescript": "^4.5.5"
+    "ts-jest": "^27.1.4",
+    "typedoc": "^0.22.15",
+    "typescript": "4.6.3"
   }
 }

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: February 1, 2022.
+> Revision: March 22, 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"

package/types/index.d.ts

@@ -3,6 +3,7 @@
  * @module illogical
  */
 import { Context, Evaluable } from './common/evaluable';
+import { isEvaluable } from './common/type-check';
 import { OPERATOR as OPERATOR_EQ } from './expression/comparison/eq';
 import { OPERATOR as OPERATOR_GE } from './expression/comparison/ge';
 import { OPERATOR as OPERATOR_GT } from './expression/comparison/gt';
@@ -23,7 +24,8 @@ import { OPERATOR as OPERATOR_OR } from './expression/logical/or';
 import { OPERATOR as OPERATOR_XOR } from './expression/logical/xor';
 import { ExpressionInput, Input } from './parser';
 import { Options } from './parser/options';
-export { OPERATOR_EQ, OPERATOR_NE, OPERATOR_GT, OPERATOR_GE, OPERATOR_LT, OPERATOR_LE, OPERATOR_IN, OPERATOR_NOT_IN, OPERATOR_PREFIX, OPERATOR_SUFFIX, OPERATOR_OVERLAP, OPERATOR_UNDEFINED, OPERATOR_PRESENT, OPERATOR_AND, OPERATOR_OR, OPERATOR_NOR, OPERATOR_XOR, OPERATOR_NOT, };
+export { defaultOptions } from './parser/options';
+export { isEvaluable, OPERATOR_EQ, OPERATOR_NE, OPERATOR_GT, OPERATOR_GE, OPERATOR_LT, OPERATOR_LE, OPERATOR_IN, OPERATOR_NOT_IN, OPERATOR_PREFIX, OPERATOR_SUFFIX, OPERATOR_OVERLAP, OPERATOR_UNDEFINED, OPERATOR_PRESENT, OPERATOR_AND, OPERATOR_OR, OPERATOR_NOR, OPERATOR_XOR, OPERATOR_NOT, };
 /**
  * Condition engine
  */

package/types/operand/reference.d.ts

@@ -11,6 +11,8 @@ export declare enum DataType {
 export declare class Reference extends Operand {
     private readonly key;
     private readonly dataType;
+    private readonly valueLookup;
+    private readonly getKeys;
     /**
      * @constructor
      * @param {string} key Context key.