@formio/js 5.0.0-dev.5610.11a9aca → 5.0.0-dev.5610.da13e39

package/lib/cjs/Element.d.ts

@@ -233,10 +233,11 @@ export default class Element {
      * @param {string|Function|object} func - The function or string to evaluate.
      * @param {object} args - The arguments to pass to the evaluation.
      * @param {string} ret - The name of the variable within the evaluation context to return.
-     * @param {boolean} tokenize - Determines if it should replace all {{ }} token references with actual data.
+     * @param {boolean} interpolate - Determines if it should replace all {{ }} token references with actual data.
+     * @param {import('@formio/core').EvaluatorOptions} options - The options to pass to the evaluation.
      * @returns {*} - The result of the evaluation.
      */
-    evaluate(func: string | Function | object, args: object, ret: string, tokenize: boolean): any;
+    evaluate(func: string | Function | object, args: object, ret: string, interpolate: boolean, options?: import('@formio/core').EvaluatorOptions): any;
     /**
      * Allow for options to hook into the functionality of this renderer.
      * @returns {*} - The result of the hook function.

package/lib/cjs/Element.js

@@ -563,11 +563,12 @@ class Element {
      * @param {string|Function|object} func - The function or string to evaluate.
      * @param {object} args - The arguments to pass to the evaluation.
      * @param {string} ret - The name of the variable within the evaluation context to return.
-     * @param {boolean} tokenize - Determines if it should replace all {{ }} token references with actual data.
+     * @param {boolean} interpolate - Determines if it should replace all {{ }} token references with actual data.
+     * @param {import('@formio/core').EvaluatorOptions} options - The options to pass to the evaluation.
      * @returns {*} - The result of the evaluation.
      */
-    evaluate(func, args, ret, tokenize) {
-        return FormioUtils.evaluate(func, this.evalContext(args), ret, tokenize);
+    evaluate(func, args, ret, interpolate, options = {}) {
+        return FormioUtils.evaluate(func, this.evalContext(args), ret, interpolate, options);
     }
     /**
      * Allow for options to hook into the functionality of this renderer.

package/lib/cjs/utils/Evaluator.d.ts

@@ -4,5 +4,4 @@ export class Evaluator {
     static noeval: boolean;
     static template(template: any, hash: any): any;
     static interpolate(rawTemplate: any, data: any, _options: any): any;
-    static evaluate(func: any, args: any): any;
 }

package/lib/cjs/utils/Evaluator.js

@@ -7,7 +7,7 @@ exports.Evaluator = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const string_hash_1 = __importDefault(require("string-hash"));
 const utils_1 = require("@formio/core/utils");
-class Evaluator extends utils_1.Evaluator {
+class Evaluator extends utils_1.JSONLogicEvaluator {
     static template(template, hash) {
         hash = hash || (0, string_hash_1.default)(template);
         if (Evaluator.cache[hash]) {
@@ -37,7 +37,7 @@ class Evaluator extends utils_1.Evaluator {
         rawTemplate = String(rawTemplate);
         let template;
         if (Evaluator.noeval || options.noeval) {
-            return utils_1.Evaluator.interpolateString(rawTemplate, data, _options);
+            return utils_1.JSONLogicEvaluator.interpolateString(rawTemplate, data, _options);
         }
         else {
             template = Evaluator.template(rawTemplate);
@@ -53,9 +53,6 @@ class Evaluator extends utils_1.Evaluator {
         }
         return template;
     }
-    static evaluate(func, args) {
-        return Array.isArray(args) ? func(...args) : func(args);
-    }
 }
 exports.Evaluator = Evaluator;
 Evaluator.cache = {};

package/lib/cjs/utils/utils.d.ts

@@ -3,10 +3,11 @@
  * @param {Function|string|object} func - The function to evaluate.
  * @param {*} args - A map of arguments to pass to the function.
  * @param {string} ret - The name of the "return" variable in the script.
- * @param {boolean} tokenize - True if the script should be interpolated before being executed.
+ * @param {boolean} interpolate - True if the script should be interpolated before being executed.
+ * @param {import('@formio/core').EvaluatorOptions} options - The evaluator options.
  * @returns {*} - The result of the evaluation.
  */
-export function evaluate(func: Function | string | object, args: any, ret: string, tokenize: boolean): any;
+export function evaluate(func: Function | string | object, args: any, ret: string, interpolate: boolean, options?: import('@formio/core').EvaluatorOptions): any;
 /**
  * Returns a random compoennt ID.
  * @returns {string} - A random component ID.

package/lib/cjs/utils/utils.js

@@ -83,65 +83,12 @@ function setPathToComponentAndPerentSchema(component) {
  * @param {Function|string|object} func - The function to evaluate.
  * @param {*} args - A map of arguments to pass to the function.
  * @param {string} ret - The name of the "return" variable in the script.
- * @param {boolean} tokenize - True if the script should be interpolated before being executed.
+ * @param {boolean} interpolate - True if the script should be interpolated before being executed.
+ * @param {import('@formio/core').EvaluatorOptions} options - The evaluator options.
  * @returns {*} - The result of the evaluation.
  */
-function evaluate(func, args, ret, tokenize) {
-    let returnVal = null;
-    const component = args.component ? args.component : { key: 'unknown' };
-    if (!args.form && args.instance) {
-        args.form = lodash_1.default.get(args.instance, 'root._form', {});
-    }
-    const componentKey = component.key;
-    if (typeof func === 'string') {
-        if (ret) {
-            func += `;return ${ret}`;
-        }
-        if (tokenize) {
-            // Replace all {{ }} references with actual data.
-            func = func.replace(/({{\s+(.*)\s+}})/, (match, $1, $2) => {
-                if ($2.indexOf('data.') === 0) {
-                    return lodash_1.default.get(args.data, $2.replace('data.', ''));
-                }
-                else if ($2.indexOf('row.') === 0) {
-                    return lodash_1.default.get(args.row, $2.replace('row.', ''));
-                }
-                // Support legacy...
-                return lodash_1.default.get(args.data, $2);
-            });
-        }
-        try {
-            func = Evaluator_1.Evaluator.evaluator(func, args);
-            args = lodash_1.default.values(args);
-        }
-        catch (err) {
-            console.warn(`An error occured within the custom function for ${componentKey}`, err);
-            returnVal = null;
-            func = false;
-        }
-    }
-    if (typeof func === 'function') {
-        try {
-            returnVal = Evaluator_1.Evaluator.evaluate(func, args);
-        }
-        catch (err) {
-            returnVal = null;
-            console.warn(`An error occured within custom function for ${componentKey}`, err);
-        }
-    }
-    else if (typeof func === 'object') {
-        try {
-            returnVal = json_logic_js_1.default.apply(func, args);
-        }
-        catch (err) {
-            returnVal = null;
-            console.warn(`An error occured within custom function for ${componentKey}`, err);
-        }
-    }
-    else if (func) {
-        console.warn(`Unknown function type for ${componentKey}`);
-    }
-    return returnVal;
+function evaluate(func, args, ret, interpolate, options = {}) {
+    return Evaluator_1.Evaluator.evaluate(func, args, ret, interpolate, undefined, options);
 }
 exports.evaluate = evaluate;
 /**

package/lib/mjs/Element.d.ts

@@ -233,10 +233,11 @@ export default class Element {
      * @param {string|Function|object} func - The function or string to evaluate.
      * @param {object} args - The arguments to pass to the evaluation.
      * @param {string} ret - The name of the variable within the evaluation context to return.
-     * @param {boolean} tokenize - Determines if it should replace all {{ }} token references with actual data.
+     * @param {boolean} interpolate - Determines if it should replace all {{ }} token references with actual data.
+     * @param {import('@formio/core').EvaluatorOptions} options - The options to pass to the evaluation.
      * @returns {*} - The result of the evaluation.
      */
-    evaluate(func: string | Function | object, args: object, ret: string, tokenize: boolean): any;
+    evaluate(func: string | Function | object, args: object, ret: string, interpolate: boolean, options?: import('@formio/core').EvaluatorOptions): any;
     /**
      * Allow for options to hook into the functionality of this renderer.
      * @returns {*} - The result of the hook function.

package/lib/mjs/Element.js

@@ -532,11 +532,12 @@ export default class Element {
      * @param {string|Function|object} func - The function or string to evaluate.
      * @param {object} args - The arguments to pass to the evaluation.
      * @param {string} ret - The name of the variable within the evaluation context to return.
-     * @param {boolean} tokenize - Determines if it should replace all {{ }} token references with actual data.
+     * @param {boolean} interpolate - Determines if it should replace all {{ }} token references with actual data.
+     * @param {import('@formio/core').EvaluatorOptions} options - The options to pass to the evaluation.
      * @returns {*} - The result of the evaluation.
      */
-    evaluate(func, args, ret, tokenize) {
-        return FormioUtils.evaluate(func, this.evalContext(args), ret, tokenize);
+    evaluate(func, args, ret, interpolate, options = {}) {
+        return FormioUtils.evaluate(func, this.evalContext(args), ret, interpolate, options);
     }
     /**
      * Allow for options to hook into the functionality of this renderer.

package/lib/mjs/utils/Evaluator.d.ts

@@ -4,5 +4,4 @@ export class Evaluator {
     static noeval: boolean;
     static template(template: any, hash: any): any;
     static interpolate(rawTemplate: any, data: any, _options: any): any;
-    static evaluate(func: any, args: any): any;
 }

package/lib/mjs/utils/Evaluator.js

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import stringHash from 'string-hash';
-import { Evaluator as CoreEvaluator } from '@formio/core/utils';
+import { JSONLogicEvaluator as CoreEvaluator } from '@formio/core/utils';
 export class Evaluator extends CoreEvaluator {
     static cache = {};
     static protectedEval = false;
@@ -50,7 +50,4 @@ export class Evaluator extends CoreEvaluator {
         }
         return template;
     }
-    static evaluate(func, args) {
-        return Array.isArray(args) ? func(...args) : func(args);
-    }
 }

package/lib/mjs/utils/utils.d.ts

@@ -3,10 +3,11 @@
  * @param {Function|string|object} func - The function to evaluate.
  * @param {*} args - A map of arguments to pass to the function.
  * @param {string} ret - The name of the "return" variable in the script.
- * @param {boolean} tokenize - True if the script should be interpolated before being executed.
+ * @param {boolean} interpolate - True if the script should be interpolated before being executed.
+ * @param {import('@formio/core').EvaluatorOptions} options - The evaluator options.
  * @returns {*} - The result of the evaluation.
  */
-export function evaluate(func: Function | string | object, args: any, ret: string, tokenize: boolean): any;
+export function evaluate(func: Function | string | object, args: any, ret: string, interpolate: boolean, options?: import('@formio/core').EvaluatorOptions): any;
 /**
  * Returns a random compoennt ID.
  * @returns {string} - A random component ID.

package/lib/mjs/utils/utils.js

@@ -46,65 +46,12 @@ function setPathToComponentAndPerentSchema(component) {
  * @param {Function|string|object} func - The function to evaluate.
  * @param {*} args - A map of arguments to pass to the function.
  * @param {string} ret - The name of the "return" variable in the script.
- * @param {boolean} tokenize - True if the script should be interpolated before being executed.
+ * @param {boolean} interpolate - True if the script should be interpolated before being executed.
+ * @param {import('@formio/core').EvaluatorOptions} options - The evaluator options.
  * @returns {*} - The result of the evaluation.
  */
-export function evaluate(func, args, ret, tokenize) {
-    let returnVal = null;
-    const component = args.component ? args.component : { key: 'unknown' };
-    if (!args.form && args.instance) {
-        args.form = _.get(args.instance, 'root._form', {});
-    }
-    const componentKey = component.key;
-    if (typeof func === 'string') {
-        if (ret) {
-            func += `;return ${ret}`;
-        }
-        if (tokenize) {
-            // Replace all {{ }} references with actual data.
-            func = func.replace(/({{\s+(.*)\s+}})/, (match, $1, $2) => {
-                if ($2.indexOf('data.') === 0) {
-                    return _.get(args.data, $2.replace('data.', ''));
-                }
-                else if ($2.indexOf('row.') === 0) {
-                    return _.get(args.row, $2.replace('row.', ''));
-                }
-                // Support legacy...
-                return _.get(args.data, $2);
-            });
-        }
-        try {
-            func = Evaluator.evaluator(func, args);
-            args = _.values(args);
-        }
-        catch (err) {
-            console.warn(`An error occured within the custom function for ${componentKey}`, err);
-            returnVal = null;
-            func = false;
-        }
-    }
-    if (typeof func === 'function') {
-        try {
-            returnVal = Evaluator.evaluate(func, args);
-        }
-        catch (err) {
-            returnVal = null;
-            console.warn(`An error occured within custom function for ${componentKey}`, err);
-        }
-    }
-    else if (typeof func === 'object') {
-        try {
-            returnVal = jsonLogic.apply(func, args);
-        }
-        catch (err) {
-            returnVal = null;
-            console.warn(`An error occured within custom function for ${componentKey}`, err);
-        }
-    }
-    else if (func) {
-        console.warn(`Unknown function type for ${componentKey}`);
-    }
-    return returnVal;
+export function evaluate(func, args, ret, interpolate, options = {}) {
+    return Evaluator.evaluate(func, args, ret, interpolate, undefined, options);
 }
 /**
  * Returns a random compoennt ID.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5610.11a9aca",
+  "version": "5.0.0-dev.5610.da13e39",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "^3.0.0-rc.24",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "^2.1.0-dev.tt.10",
+    "@formio/core": "^2.1.0-dev.tt.12",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",