fig-tree-evaluator 2.2.0 → 2.2.1

package/README.md

@@ -59,7 +59,7 @@ A range of built-in operators are available, from simple logic, arithmetic and s
 
 Fig-tree evaluates expressions structured in a JSON/Javascript object [expression tree](https://www.geeksforgeeks.org/expression-tree/). A single "node" of the tree consists of an **Operator**, with associated parameters (or child nodes), each of which can itself be another Operator node -- i.e. a recursive tree structure of arbitrary depth and complexity.
 
-A wide range of [operators are available](#operator-reference), but [custom fuctions](#custom_functions) can be added to your implementation if you wish to extend the base functionality.
+A wide range of [operators are available](#operator-reference), but [custom functions](#custom_functions) can be added to your implementation if you wish to extend the base functionality.
 
 For example:
 
@@ -1255,6 +1255,8 @@ Aliases: `customFunctions`, `customFunction`, `objectFunctions`, `functions`, `f
 - `functionPath` (or `functionsPath`, `functionName`, `funcPath`<sup>*</sup>: (string) -- path to where the function resides in the `options.functions` object
 - `args` (or `arguments`, `variables`): (array) -- input arguments for the function
 
+Custom functions provide a mechanism to extend the functionality of the FigTree evaluator to suit almost any requirements.
+
 Custom functions are stored in the evaluator `options`, in the `functions` property.
 
 For examples, consider the following fig-tree instance:
@@ -1307,7 +1309,7 @@ e.g.
 
 ## Alias Nodes
 
-If you have a node that is used more than once in a complex expression, it's possible to just evaluate the repeated node once, and refer to it throughout using an "alias" reference.
+If you have a node that is used more than once in a complex expression, it's possible to just evaluate the repeated node once, and refer to it throughout using an "alias" reference. This allows for a simpler expression (reduces duplication) as well as a performance improvement, since the aliased node is only evaluated once, providing a simple [memoization](https://en.wikipedia.org/wiki/Memoization) mechanism.
 
 For example, if you have the expression:
 ```js

package/build/operators/conditional.js

@@ -10,13 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONDITIONAL = void 0;
-const _operatorUtils_1 = require("./_operatorUtils");
+const evaluate_1 = require("../evaluate");
 const requiredProperties = ['condition', 'valueIfTrue', 'valueIfFalse'];
 const operatorAliases = ['?', 'conditional', 'ifThen'];
 const propertyAliases = { ifTrue: 'valueIfTrue', ifFalse: 'valueIfFalse', ifNot: 'valueIfFalse' };
 const evaluate = (expression, config) => __awaiter(void 0, void 0, void 0, function* () {
-    const [condition, valueIfTrue, valueIfFalse] = yield (0, _operatorUtils_1.evaluateArray)([expression.condition, expression.valueIfTrue, expression.valueIfFalse], config);
-    return !!condition ? valueIfTrue : valueIfFalse;
+    const condition = yield (0, evaluate_1.evaluatorFunction)(expression.condition, config);
+    return !!condition
+        ? yield (0, evaluate_1.evaluatorFunction)(expression.valueIfTrue, config)
+        : yield (0, evaluate_1.evaluatorFunction)(expression.valueIfFalse, config);
 });
 const parseChildren = (expression) => {
     const [condition, valueIfTrue, valueIfFalse] = expression.children;

package/build/operators/graphQL.js

@@ -13,7 +13,7 @@ exports.GRAPHQL = void 0;
 const _operatorUtils_1 = require("./_operatorUtils");
 const requiredProperties = ['query'];
 const operatorAliases = ['graphQl', 'graphql', 'gql'];
-const propertyAliases = { endpoint: 'url', outputNode: 'returnNode', returnPropery: 'returnNode' };
+const propertyAliases = { endpoint: 'url', outputNode: 'returnNode', returnProperty: 'returnNode' };
 const evaluate = (expression, config) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b, _c, _d, _e;
     const [query, urlObj, variables, returnNode, headers] = (yield (0, _operatorUtils_1.evaluateArray)([

package/build/operators/match.js

@@ -12,11 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MATCH = void 0;
 const _operatorUtils_1 = require("./_operatorUtils");
 const evaluate_1 = require("../evaluate");
+const helpers_1 = require("../helpers");
 const requiredProperties = ['matchExpression'];
 const operatorAliases = ['match', 'switch'];
 const propertyAliases = { arms: 'branches', cases: 'branches', match: 'matchExpression' };
 const evaluate = (expression, config) => __awaiter(void 0, void 0, void 0, function* () {
-    const [matchExpression, branches] = (yield (0, _operatorUtils_1.evaluateArray)([expression.matchExpression, expression.branches], config));
+    const matchExpression = (yield (0, evaluate_1.evaluatorFunction)(expression.matchExpression, config));
+    const branches = expression.branches;
     config.typeChecker({
         name: 'matchExpression',
         value: matchExpression,
@@ -26,7 +28,9 @@ const evaluate = (expression, config) => __awaiter(void 0, void 0, void 0, funct
         value: branches,
         expectedType: ['object', 'array', 'undefined'],
     });
-    const branchObject = Array.isArray(branches) ? (0, _operatorUtils_1.singleArrayToObject)(branches) : branches !== null && branches !== void 0 ? branches : {};
+    let branchObject = Array.isArray(branches) ? (0, _operatorUtils_1.singleArrayToObject)(branches) : branches !== null && branches !== void 0 ? branches : {};
+    if ((0, helpers_1.isOperatorNode)(branchObject))
+        branchObject = yield (0, evaluate_1.evaluatorFunction)(branchObject, config);
     if (matchExpression in branchObject)
         return yield (0, evaluate_1.evaluatorFunction)(branchObject[matchExpression], config);
     if ('fallback' in branchObject)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fig-tree-evaluator",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Module to evaluate JSON-structured expression trees",
   "main": "build/index.js",
   "types": "build/index.d.ts",