fig-tree-evaluator 2.5.0 → 2.5.2

package/build/operators/split.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -19,39 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SPLIT = void 0;
-var _operatorUtils_1 = require("./_operatorUtils");
-var requiredProperties = ['value'];
-var operatorAliases = ['split', 'arraySplit'];
-var propertyAliases = {
+const _operatorUtils_1 = require("./_operatorUtils");
+const requiredProperties = ['value'];
+const operatorAliases = ['split', 'arraySplit'];
+const propertyAliases = {
     string: 'value',
     separator: 'delimiter',
     trim: 'trimWhiteSpace',
@@ -59,38 +21,31 @@ var propertyAliases = {
     removeTrailing: 'excludeTrailing',
     excludeTrailingDelimiter: 'excludeTrailing',
 };
-var DEFAULT_DELIMITER = ' ';
-var evaluate = function (expression, config) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, value, delimiter, trimWhiteSpace, excludeTrailing, splitValues;
-    var _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
-            case 0: return [4, (0, _operatorUtils_1.evaluateArray)([
-                    expression.value,
-                    (_b = expression.delimiter) !== null && _b !== void 0 ? _b : DEFAULT_DELIMITER,
-                    (_c = expression.trimWhiteSpace) !== null && _c !== void 0 ? _c : true,
-                    (_d = expression.excludeTrailing) !== null && _d !== void 0 ? _d : true,
-                ], config)];
-            case 1:
-                _a = (_e.sent()), value = _a[0], delimiter = _a[1], trimWhiteSpace = _a[2], excludeTrailing = _a[3];
-                config.typeChecker({ name: 'value', value: value, expectedType: 'string' }, { name: 'delimiter', value: delimiter, expectedType: 'string' }, { name: 'trimWhiteSpace', value: trimWhiteSpace, expectedType: 'boolean' }, { name: 'excludeTrailing', value: excludeTrailing, expectedType: 'boolean' });
-                splitValues = value.split(delimiter);
-                if (trimWhiteSpace)
-                    splitValues = splitValues.map(function (val) { return val.trim(); });
-                if (excludeTrailing && splitValues[splitValues.length - 1] === '')
-                    splitValues.pop();
-                return [2, splitValues];
-        }
-    });
-}); };
-var parseChildren = function (expression) {
-    var _a = expression.children, value = _a[0], _b = _a[1], delimiter = _b === void 0 ? DEFAULT_DELIMITER : _b;
-    return __assign(__assign({}, expression), { value: value, delimiter: delimiter });
+const DEFAULT_DELIMITER = ' ';
+const evaluate = (expression, config) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
+    const [value, delimiter, trimWhiteSpace, excludeTrailing] = (yield (0, _operatorUtils_1.evaluateArray)([
+        expression.value,
+        (_a = expression.delimiter) !== null && _a !== void 0 ? _a : DEFAULT_DELIMITER,
+        (_b = expression.trimWhiteSpace) !== null && _b !== void 0 ? _b : true,
+        (_c = expression.excludeTrailing) !== null && _c !== void 0 ? _c : true,
+    ], config));
+    config.typeChecker({ name: 'value', value: value, expectedType: 'string' }, { name: 'delimiter', value: delimiter, expectedType: 'string' }, { name: 'trimWhiteSpace', value: trimWhiteSpace, expectedType: 'boolean' }, { name: 'excludeTrailing', value: excludeTrailing, expectedType: 'boolean' });
+    let splitValues = value.split(delimiter);
+    if (trimWhiteSpace)
+        splitValues = splitValues.map((val) => val.trim());
+    if (excludeTrailing && splitValues[splitValues.length - 1] === '')
+        splitValues.pop();
+    return splitValues;
+});
+const parseChildren = (expression) => {
+    const [value, delimiter = DEFAULT_DELIMITER] = expression.children;
+    return Object.assign(Object.assign({}, expression), { value, delimiter });
 };
 exports.SPLIT = {
-    requiredProperties: requiredProperties,
-    operatorAliases: operatorAliases,
-    propertyAliases: propertyAliases,
-    evaluate: evaluate,
-    parseChildren: parseChildren,
+    requiredProperties,
+    operatorAliases,
+    propertyAliases,
+    evaluate,
+    parseChildren,
 };

package/build/operators/stringSubstitution.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -19,76 +8,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.STRING_SUBSTITUTION = void 0;
-var _operatorUtils_1 = require("./_operatorUtils");
-var requiredProperties = ['string', 'substitutions'];
-var operatorAliases = ['stringSubstitution', 'substitute', 'stringSub', 'replace'];
-var propertyAliases = { replacements: 'substitutions' };
-var evaluate = function (expression, config) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, string, substitutions, regex, parameters, uniqueParameters, replacementsObj;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4, (0, _operatorUtils_1.evaluateArray)(__spreadArray([expression.string], expression.substitutions, true), config)];
-            case 1:
-                _a = (_b.sent()), string = _a[0], substitutions = _a.slice(1);
-                config.typeChecker({ name: 'string', value: string, expectedType: 'string' });
-                config.typeChecker({ name: 'substitutions', value: substitutions, expectedType: 'array' });
-                regex = /(%[\d]+)/g;
-                parameters = (string.match(regex) || []).sort(function (a, b) { return Number(a.slice(1)) - Number(b.slice(1)); });
-                uniqueParameters = new Set(parameters);
-                replacementsObj = (0, _operatorUtils_1.zipArraysToObject)(Array.from(uniqueParameters), substitutions);
-                return [2, string
-                        .split(regex)
-                        .map(function (fragment) { return (fragment in replacementsObj ? replacementsObj[fragment] : fragment); })
-                        .join('')];
-        }
-    });
-}); };
-var parseChildren = function (expression) {
-    var _a = expression.children, string = _a[0], substitutions = _a.slice(1);
-    return __assign(__assign({}, expression), { string: string, substitutions: substitutions });
+const _operatorUtils_1 = require("./_operatorUtils");
+const requiredProperties = ['string', 'substitutions'];
+const operatorAliases = ['stringSubstitution', 'substitute', 'stringSub', 'replace'];
+const propertyAliases = { replacements: 'substitutions' };
+const evaluate = (expression, config) => __awaiter(void 0, void 0, void 0, function* () {
+    const [string, ...substitutions] = (yield (0, _operatorUtils_1.evaluateArray)([expression.string, ...expression.substitutions], config));
+    config.typeChecker({ name: 'string', value: string, expectedType: 'string' });
+    config.typeChecker({ name: 'substitutions', value: substitutions, expectedType: 'array' });
+    const regex = /(%[\d]+)/g;
+    const parameters = (string.match(regex) || []).sort((a, b) => Number(a.slice(1)) - Number(b.slice(1)));
+    const uniqueParameters = new Set(parameters);
+    const replacementsObj = (0, _operatorUtils_1.zipArraysToObject)(Array.from(uniqueParameters), substitutions);
+    return string
+        .split(regex)
+        .map((fragment) => (fragment in replacementsObj ? replacementsObj[fragment] : fragment))
+        .join('');
+});
+const parseChildren = (expression) => {
+    const [string, ...substitutions] = expression.children;
+    return Object.assign(Object.assign({}, expression), { string, substitutions });
 };
 exports.STRING_SUBSTITUTION = {
-    requiredProperties: requiredProperties,
-    operatorAliases: operatorAliases,
-    propertyAliases: propertyAliases,
-    evaluate: evaluate,
-    parseChildren: parseChildren,
+    requiredProperties,
+    operatorAliases,
+    propertyAliases,
+    evaluate,
+    parseChildren,
 };

package/build/operators/subtract.js

@@ -8,59 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SUBTRACT = void 0;
-var logicalAnd_1 = require("./logicalAnd");
-var _operatorUtils_1 = require("./_operatorUtils");
-var requiredProperties = [];
-var operatorAliases = ['-', 'subtract', 'minus', 'takeaway'];
-var propertyAliases = { subtractFrom: 'from' };
-var evaluate = function (expression, config) { return __awaiter(void 0, void 0, void 0, function () {
-    var values;
+const logicalAnd_1 = require("./logicalAnd");
+const _operatorUtils_1 = require("./_operatorUtils");
+const requiredProperties = [];
+const operatorAliases = ['-', 'subtract', 'minus', 'takeaway'];
+const propertyAliases = { subtractFrom: 'from' };
+const evaluate = (expression, config) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0: return [4, (0, _operatorUtils_1.evaluateArray)((_a = expression.values) !== null && _a !== void 0 ? _a : [expression.from, expression.subtract], config)];
-            case 1:
-                values = (_b.sent());
-                config.typeChecker({ name: 'values', value: values, expectedType: 'array' });
-                if (values.length < 2)
-                    throw new Error('- Not enough values provided');
-                return [2, values[0] - values[1]];
-        }
-    });
-}); };
+    const values = (yield (0, _operatorUtils_1.evaluateArray)((_a = expression.values) !== null && _a !== void 0 ? _a : [expression.from, expression.subtract], config));
+    config.typeChecker({ name: 'values', value: values, expectedType: 'array' });
+    if (values.length < 2)
+        throw new Error('- Not enough values provided');
+    return values[0] - values[1];
+});
 exports.SUBTRACT = {
-    requiredProperties: requiredProperties,
-    operatorAliases: operatorAliases,
-    propertyAliases: propertyAliases,
-    evaluate: evaluate,
+    requiredProperties,
+    operatorAliases,
+    propertyAliases,
+    evaluate,
     parseChildren: logicalAnd_1.parseChildren,
 };

package/build/typeCheck.js

@@ -1,53 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeCheck = void 0;
-var helpers_1 = require("./helpers");
-var typeCheckItem = function (_a) {
-    var value = _a.value, name = _a.name, _b = _a.not, not = _b === void 0 ? false : _b, expectedType = _a.expectedType;
-    var result;
+const helpers_1 = require("./helpers");
+const typeCheckItem = ({ value, name, not = false, expectedType, }) => {
+    let result;
     if (Array.isArray(expectedType)) {
-        result = expectedType.some(function (type) { return typeCheckItem({ value: value, name: name, expectedType: type }) === true; });
+        result = expectedType.some((type) => typeCheckItem({ value, name, expectedType: type }) === true);
         if (not)
             result = !result;
         return result ? true : makeErrorString(name, value, expectedType.join('|'), not);
     }
     else {
-        var checker = typeCheckMap[expectedType];
+        const checker = typeCheckMap[expectedType];
         result = checker(value);
         if (not)
             result = !result;
         return result ? true : makeErrorString(name, value, expectedType, not);
     }
 };
-var typeCheck = function () {
-    var args = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        args[_i] = arguments[_i];
-    }
-    var errorStrings = [];
-    args.forEach(function (item) {
-        var result = typeCheckItem(item);
+const typeCheck = (...args) => {
+    const errorStrings = [];
+    args.forEach((item) => {
+        const result = typeCheckItem(item);
         if (result !== true)
             errorStrings.push(result);
     });
     return errorStrings.length > 0 ? errorStrings.join('\n') : true;
 };
 exports.typeCheck = typeCheck;
-var typeCheckMap = {
-    string: function (value) { return typeof value === 'string'; },
-    number: function (value) { return typeof value === 'number'; },
-    boolean: function (value) { return typeof value === 'boolean'; },
-    array: function (value) { return Array.isArray(value); },
-    undefined: function (value) { return value === undefined; },
-    null: function (value) { return value === null; },
-    object: function (value) { return typeof value === 'object' && !Array.isArray(value) && value !== null; },
+const typeCheckMap = {
+    string: (value) => typeof value === 'string',
+    number: (value) => typeof value === 'number',
+    boolean: (value) => typeof value === 'boolean',
+    array: (value) => Array.isArray(value),
+    undefined: (value) => value === undefined,
+    null: (value) => value === null,
+    object: (value) => typeof value === 'object' && !Array.isArray(value) && value !== null,
 };
-var makeErrorString = function (name, value, type, not) {
+const makeErrorString = (name, value, type, not) => {
     if (name !== undefined)
-        return "- Property \"".concat(name, "\" (value: ").concat(stringifyValue(value), ") is not of type: ").concat(not ? "!(".concat(type, ")") : type);
-    return "- ".concat(stringifyValue(value), " is not of type: ").concat(not ? "!(".concat(type, ")") : type);
+        return `- Property "${name}" (value: ${stringifyValue(value)}) is not of type: ${not ? `!(${type})` : type}`;
+    return `- ${stringifyValue(value)} is not of type: ${not ? `!(${type})` : type}`;
 };
-var stringifyValue = function (value) {
-    var stringValue = value === undefined || Number.isNaN(value) ? String(value) : JSON.stringify(value);
+const stringifyValue = (value) => {
+    const stringValue = value === undefined || Number.isNaN(value) ? String(value) : JSON.stringify(value);
     return (0, helpers_1.truncateString)(stringValue, 50);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fig-tree-evaluator",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Module to evaluate JSON-structured expression trees",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -31,7 +31,7 @@
     "build": "yarn generate && rimraf ./build && tsc",
     "dev": "cp -n src/dev/playground_example.ts src/dev/playground.ts || ts-node src/dev/playground.ts",
     "demo": "cd demo && yarn start",
-    "prepublish": "yarn build"
+    "prepublishOnly": "yarn build"
   },
   "dependencies": {
     "axios": "^0.27.2",