@briza/illogical 1.7.0 → 1.7.1

package/changelog.md

@@ -1,5 +1,9 @@
 # illogical changelog
 
+## 1.7.1
+
+- Adding Reference cache and other performance improvements to condition parsing.
+
 ## 1.7.0
 
 - Introducing unsafeSimplify which simplifies the condition without fully parsing it beforehand.

package/lib/illogical.esm.js

@@ -472,29 +472,33 @@ const toDateNumber = value => {
 
 const keyWithArrayIndexRegex = /^(?<currentKey>[^[\]]+?)(?<indexes>(?:\[\d+])+)?$/;
 const arrayIndexRegex = /\[(\d+)]/g;
-const parseBacktickWrappedKey = key => key.startsWith('`') && key.endsWith('`') ? key.slice(1, -1) : key;
-const parseKey = key => {
-  const keys = key.match(/(`[^[\]]+`(\[\d+\])*|[^`.]+)/g);
-  return !keys ? [] : keys.flatMap(key => {
-    const unwrappedKey = parseBacktickWrappedKey(key);
-    const keys = [];
-    const parseResult = keyWithArrayIndexRegex.exec(unwrappedKey);
-    if (parseResult) {
-      var _parseResult$groups$c, _parseResult$groups, _parseResult$groups2;
-      const extractedKey = parseBacktickWrappedKey((_parseResult$groups$c = parseResult === null || parseResult === 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 : unwrappedKey);
-      keys.push(extractedKey);
-      const rawIndexes = parseResult === null || parseResult === 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]));
-        }
+function parseBacktickWrappedKey(key) {
+  return key[0] === '`' && key[key.length - 1] === '`' ? key.slice(1, -1) : key;
+}
+function parseKeyComponents(key) {
+  const unwrappedKey = parseBacktickWrappedKey(key);
+  const keys = [];
+  const parseResult = keyWithArrayIndexRegex.exec(unwrappedKey);
+  if (parseResult) {
+    var _parseResult$groups$c, _parseResult$groups, _parseResult$groups2;
+    const extractedKey = parseBacktickWrappedKey((_parseResult$groups$c = parseResult === null || parseResult === 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 : unwrappedKey);
+    keys.push(extractedKey);
+    const rawIndexes = parseResult === null || parseResult === 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(unwrappedKey);
     }
-    return keys;
-  });
-};
+  } else {
+    keys.push(unwrappedKey);
+  }
+  return keys;
+}
+const parseKeyRegex = /(`[^[\]]+`(\[\d+\])*|[^`.]+)/g;
+function parseKey(key) {
+  const keys = key.match(parseKeyRegex);
+  return !keys ? [] : keys.flatMap(parseKeyComponents);
+}
 const complexKeyExpression = /{([^{}]+)}/;
 function extractComplexKeys(ctx, key) {
   // Resolve complex keys
@@ -551,6 +555,7 @@ let DataType = /*#__PURE__*/function (DataType) {
 // Equivalent to /^.+\.\((Number|String)\)$/
 const dataTypeRegex = new RegExp(`^.+\\.\\((${Object.keys(DataType).join('|')})\\)$`);
 const isComplexKey = key => key.indexOf('{') > -1;
+const castingRegex = /\.\(.+\)$/;
 
 /**
  * Reference operand resolved within the context
@@ -573,9 +578,7 @@ class Reference extends Operand {
     const dataTypeMatch = dataTypeRegex.exec(this.key);
     if (dataTypeMatch) {
       this.dataType = DataType[dataTypeMatch[1]];
-    }
-    if (this.key.match(/.\(.+\)$/)) {
-      this.key = this.key.replace(/.\(.+\)$/, '');
+      this.key = this.key.replace(castingRegex, '');
     }
     if (isComplexKey(this.key)) {
       this.valueLookup = context => complexValueLookup(context, this.key);
@@ -1690,7 +1693,7 @@ class Collection extends Operand {
  * @return {boolean}
  */
 function defaultReferencePredicate(key) {
-  return isString(key) && key.startsWith('$');
+  return key[0] === '$';
 }
 
 /**
@@ -1748,6 +1751,7 @@ class Parser {
     _defineProperty(this, "opts", void 0);
     _defineProperty(this, "expectedRootOperators", void 0);
     _defineProperty(this, "unexpectedRootSymbols", new Set([OPERATOR$i, OPERATOR$j, OPERATOR$k, OPERATOR$l]));
+    _defineProperty(this, "referenceCache", new Map());
     this.opts = {
       ...defaultOptions
     };
@@ -1769,6 +1773,18 @@ class Parser {
   get options() {
     return this.opts;
   }
+  getReference(key) {
+    const cached = this.referenceCache.get(key);
+    if (cached !== undefined) {
+      return cached;
+    }
+    const reference = new Reference(this.opts.referenceTransform(key));
+    this.referenceCache.set(key, reference);
+    return reference;
+  }
+  resolve(raw) {
+    return isString(raw) && this.opts.referencePredicate(raw) ? this.getReference(raw) : new Value(raw);
+  }
 
   /**
    * Parse raw expression into evaluable expression.
@@ -1927,11 +1943,14 @@ class Parser {
    * @param raw Raw data
    */
   getOperand(raw) {
-    const resolve = raw => this.opts.referencePredicate(raw) ? new Reference(this.opts.referenceTransform(raw)) : new Value(raw);
     if (Array.isArray(raw)) {
-      return new Collection(raw.map(item => resolve(item)));
+      const collectionItems = [];
+      for (const item of raw) {
+        collectionItems.push(this.resolve(item));
+      }
+      return new Collection(collectionItems);
     }
-    return resolve(raw);
+    return this.resolve(raw);
   }
 }
 

package/lib/illogical.js

@@ -476,29 +476,33 @@ const toDateNumber = value => {
 
 const keyWithArrayIndexRegex = /^(?<currentKey>[^[\]]+?)(?<indexes>(?:\[\d+])+)?$/;
 const arrayIndexRegex = /\[(\d+)]/g;
-const parseBacktickWrappedKey = key => key.startsWith('`') && key.endsWith('`') ? key.slice(1, -1) : key;
-const parseKey = key => {
-  const keys = key.match(/(`[^[\]]+`(\[\d+\])*|[^`.]+)/g);
-  return !keys ? [] : keys.flatMap(key => {
-    const unwrappedKey = parseBacktickWrappedKey(key);
-    const keys = [];
-    const parseResult = keyWithArrayIndexRegex.exec(unwrappedKey);
-    if (parseResult) {
-      var _parseResult$groups$c, _parseResult$groups, _parseResult$groups2;
-      const extractedKey = parseBacktickWrappedKey((_parseResult$groups$c = parseResult === null || parseResult === 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 : unwrappedKey);
-      keys.push(extractedKey);
-      const rawIndexes = parseResult === null || parseResult === 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]));
-        }
+function parseBacktickWrappedKey(key) {
+  return key[0] === '`' && key[key.length - 1] === '`' ? key.slice(1, -1) : key;
+}
+function parseKeyComponents(key) {
+  const unwrappedKey = parseBacktickWrappedKey(key);
+  const keys = [];
+  const parseResult = keyWithArrayIndexRegex.exec(unwrappedKey);
+  if (parseResult) {
+    var _parseResult$groups$c, _parseResult$groups, _parseResult$groups2;
+    const extractedKey = parseBacktickWrappedKey((_parseResult$groups$c = parseResult === null || parseResult === 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 : unwrappedKey);
+    keys.push(extractedKey);
+    const rawIndexes = parseResult === null || parseResult === 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(unwrappedKey);
     }
-    return keys;
-  });
-};
+  } else {
+    keys.push(unwrappedKey);
+  }
+  return keys;
+}
+const parseKeyRegex = /(`[^[\]]+`(\[\d+\])*|[^`.]+)/g;
+function parseKey(key) {
+  const keys = key.match(parseKeyRegex);
+  return !keys ? [] : keys.flatMap(parseKeyComponents);
+}
 const complexKeyExpression = /{([^{}]+)}/;
 function extractComplexKeys(ctx, key) {
   // Resolve complex keys
@@ -555,6 +559,7 @@ let DataType = /*#__PURE__*/function (DataType) {
 // Equivalent to /^.+\.\((Number|String)\)$/
 const dataTypeRegex = new RegExp(`^.+\\.\\((${Object.keys(DataType).join('|')})\\)$`);
 const isComplexKey = key => key.indexOf('{') > -1;
+const castingRegex = /\.\(.+\)$/;
 
 /**
  * Reference operand resolved within the context
@@ -577,9 +582,7 @@ class Reference extends Operand {
     const dataTypeMatch = dataTypeRegex.exec(this.key);
     if (dataTypeMatch) {
       this.dataType = DataType[dataTypeMatch[1]];
-    }
-    if (this.key.match(/.\(.+\)$/)) {
-      this.key = this.key.replace(/.\(.+\)$/, '');
+      this.key = this.key.replace(castingRegex, '');
     }
     if (isComplexKey(this.key)) {
       this.valueLookup = context => complexValueLookup(context, this.key);
@@ -1694,7 +1697,7 @@ class Collection extends Operand {
  * @return {boolean}
  */
 function defaultReferencePredicate(key) {
-  return isString(key) && key.startsWith('$');
+  return key[0] === '$';
 }
 
 /**
@@ -1752,6 +1755,7 @@ class Parser {
     _defineProperty(this, "opts", void 0);
     _defineProperty(this, "expectedRootOperators", void 0);
     _defineProperty(this, "unexpectedRootSymbols", new Set([OPERATOR$i, OPERATOR$j, OPERATOR$k, OPERATOR$l]));
+    _defineProperty(this, "referenceCache", new Map());
     this.opts = {
       ...defaultOptions
     };
@@ -1773,6 +1777,18 @@ class Parser {
   get options() {
     return this.opts;
   }
+  getReference(key) {
+    const cached = this.referenceCache.get(key);
+    if (cached !== undefined) {
+      return cached;
+    }
+    const reference = new Reference(this.opts.referenceTransform(key));
+    this.referenceCache.set(key, reference);
+    return reference;
+  }
+  resolve(raw) {
+    return isString(raw) && this.opts.referencePredicate(raw) ? this.getReference(raw) : new Value(raw);
+  }
 
   /**
    * Parse raw expression into evaluable expression.
@@ -1931,11 +1947,14 @@ class Parser {
    * @param raw Raw data
    */
   getOperand(raw) {
-    const resolve = raw => this.opts.referencePredicate(raw) ? new Reference(this.opts.referenceTransform(raw)) : new Value(raw);
     if (Array.isArray(raw)) {
-      return new Collection(raw.map(item => resolve(item)));
+      const collectionItems = [];
+      for (const item of raw) {
+        collectionItems.push(this.resolve(item));
+      }
+      return new Collection(collectionItems);
     }
-    return resolve(raw);
+    return this.resolve(raw);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@briza/illogical",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "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",

package/readme.md

@@ -2,8 +2,6 @@
 
 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: March 22, 2022.
-
 ## About
 
 This project has been developed to provide a shared conditional logic between front-end and back-end code, stored in JSON or in any other data serialization format.

package/types/parser/index.d.ts

@@ -10,6 +10,7 @@ export declare class Parser {
     private readonly opts;
     private readonly expectedRootOperators;
     private readonly unexpectedRootSymbols;
+    private readonly referenceCache;
     /**
      * @constructor
      * @param {Options?} options Parser options.
@@ -20,6 +21,8 @@ export declare class Parser {
      * @type {Options}
      */
     get options(): Options;
+    private getReference;
+    private resolve;
     /**
      * Parse raw expression into evaluable expression.
      * @param {ExpressionInput} raw Raw expression.