@formio/js 5.1.0-dev.6205.d795b91 → 5.1.0-dev.6208.59bdd3f

package/lib/cjs/components/select/Select.js

@@ -1124,7 +1124,7 @@ class SelectComponent extends ListComponent_1.default {
         }
         // Choices will return undefined if nothing is selected. We really want '' to be empty.
         if (value === undefined || value === null) {
-            value = '';
+            value = this.emptyValue;
         }
         return value;
     }

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

@@ -17,5 +17,8 @@ export class DefaultEvaluator extends CoreEvaluator {
     template(template: any, hash: any): any;
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
-export let Evaluator: DefaultEvaluator;
+/**
+ * @type {DefaultEvaluator}
+ */
+export const Evaluator: DefaultEvaluator;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/cjs/utils/Evaluator.js

@@ -60,7 +60,32 @@ class DefaultEvaluator extends core_1.DefaultEvaluator {
     }
 }
 exports.DefaultEvaluator = DefaultEvaluator;
-exports.Evaluator = new DefaultEvaluator();
+let currentEvaluator = new DefaultEvaluator();
+/**
+ *Create evaluator object that forwards calls to current evaluator
+ * to provide access to actual Evaluator instance via formioUtils
+ */
+function createEvaluatorObject() {
+    return {
+        get cache() { return currentEvaluator.cache; },
+        set cache(value) { currentEvaluator.cache = value; },
+        get noeval() { return currentEvaluator.noeval; },
+        set noeval(value) { currentEvaluator.noeval = value; },
+        get protectedEval() { return currentEvaluator.protectedEval; },
+        set protectedEval(value) { currentEvaluator.protectedEval = value; },
+        get templateSettings() { return currentEvaluator.templateSettings; },
+        set templateSettings(value) { currentEvaluator.templateSettings = value; },
+        evaluator: (...args) => currentEvaluator.evaluator ? currentEvaluator.evaluator(...args) : undefined,
+        interpolate: (...args) => currentEvaluator.interpolate ? currentEvaluator.interpolate(...args) : undefined,
+        evaluate: (...args) => currentEvaluator.evaluate ? currentEvaluator.evaluate(...args) : undefined,
+        template: (...args) => currentEvaluator.template ? currentEvaluator.template(...args) : undefined,
+    };
+}
+// for compatibility with @formio/protected-eval
+/**
+ * @type {DefaultEvaluator}
+ */
+exports.Evaluator = createEvaluatorObject();
 // preserve the standalone interpolate function for backwards compatibility
 /**
  * For backwards compatibility we a standalone interpolate function. This merely calls the
@@ -69,7 +94,7 @@ exports.Evaluator = new DefaultEvaluator();
  * @returns {any} the interpolation result.
  */
 function interpolate(...args) {
-    return exports.Evaluator.interpolate(...args);
+    return currentEvaluator.interpolate(...args);
 }
 exports.interpolate = interpolate;
 /**
@@ -78,6 +103,8 @@ exports.interpolate = interpolate;
  * @returns {void}
  */
 function registerEvaluator(override) {
-    exports.Evaluator = override;
+    currentEvaluator = override;
+    // Update the Evaluator object methods to point to new evaluator
+    Object.assign(exports.Evaluator, createEvaluatorObject());
 }
 exports.registerEvaluator = registerEvaluator;

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

@@ -2,7 +2,8 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    DefaultEvaluator: typeof DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -165,6 +166,7 @@ declare const FormioUtils: {
 };
 import { Evaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
+import { DefaultEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
 export { FormioUtils as Utils, Evaluator, registerEvaluator };

package/lib/cjs/utils/index.js

@@ -38,7 +38,8 @@ Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: fun
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
 const lodash_1 = __importDefault(require("lodash"));
 const moment_1 = __importDefault(require("moment"));
-const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { Evaluator: Evaluator_1.Evaluator,
+const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { DefaultEvaluator: Evaluator_1.DefaultEvaluator,
+    Evaluator: Evaluator_1.Evaluator,
     interpolate: Evaluator_1.interpolate,
     ConditionOperators: conditionOperators_1.default,
     _: lodash_1.default,

package/lib/mjs/components/select/Select.js

@@ -1154,7 +1154,7 @@ export default class SelectComponent extends ListComponent {
         }
         // Choices will return undefined if nothing is selected. We really want '' to be empty.
         if (value === undefined || value === null) {
-            value = '';
+            value = this.emptyValue;
         }
         return value;
     }

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

@@ -17,5 +17,8 @@ export class DefaultEvaluator extends CoreEvaluator {
     template(template: any, hash: any): any;
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
-export let Evaluator: DefaultEvaluator;
+/**
+ * @type {DefaultEvaluator}
+ */
+export const Evaluator: DefaultEvaluator;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/mjs/utils/Evaluator.js

@@ -50,7 +50,32 @@ export class DefaultEvaluator extends CoreEvaluator {
         return template;
     }
 }
-export let Evaluator = new DefaultEvaluator();
+let currentEvaluator = new DefaultEvaluator();
+/**
+ *Create evaluator object that forwards calls to current evaluator
+ * to provide access to actual Evaluator instance via formioUtils
+ */
+function createEvaluatorObject() {
+    return {
+        get cache() { return currentEvaluator.cache; },
+        set cache(value) { currentEvaluator.cache = value; },
+        get noeval() { return currentEvaluator.noeval; },
+        set noeval(value) { currentEvaluator.noeval = value; },
+        get protectedEval() { return currentEvaluator.protectedEval; },
+        set protectedEval(value) { currentEvaluator.protectedEval = value; },
+        get templateSettings() { return currentEvaluator.templateSettings; },
+        set templateSettings(value) { currentEvaluator.templateSettings = value; },
+        evaluator: (...args) => currentEvaluator.evaluator ? currentEvaluator.evaluator(...args) : undefined,
+        interpolate: (...args) => currentEvaluator.interpolate ? currentEvaluator.interpolate(...args) : undefined,
+        evaluate: (...args) => currentEvaluator.evaluate ? currentEvaluator.evaluate(...args) : undefined,
+        template: (...args) => currentEvaluator.template ? currentEvaluator.template(...args) : undefined,
+    };
+}
+// for compatibility with @formio/protected-eval
+/**
+ * @type {DefaultEvaluator}
+ */
+export const Evaluator = createEvaluatorObject();
 // preserve the standalone interpolate function for backwards compatibility
 /**
  * For backwards compatibility we a standalone interpolate function. This merely calls the
@@ -59,7 +84,7 @@ export let Evaluator = new DefaultEvaluator();
  * @returns {any} the interpolation result.
  */
 export function interpolate(...args) {
-    return Evaluator.interpolate(...args);
+    return currentEvaluator.interpolate(...args);
 }
 /**
  * Set the evaluator to use for evaluating expressions.
@@ -67,5 +92,7 @@ export function interpolate(...args) {
  * @returns {void}
  */
 export function registerEvaluator(override) {
-    Evaluator = override;
+    currentEvaluator = override;
+    // Update the Evaluator object methods to point to new evaluator
+    Object.assign(Evaluator, createEvaluatorObject());
 }

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

@@ -2,7 +2,8 @@ export * from "./utils";
 export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
+    DefaultEvaluator: typeof DefaultEvaluator;
+    Evaluator: DefaultEvaluator;
     interpolate: typeof interpolate;
     ConditionOperators: {
         [x: string]: typeof import("./conditionOperators/IsEqualTo").default | typeof import("./conditionOperators/DateGreaterThan").default;
@@ -165,6 +166,7 @@ declare const FormioUtils: {
 };
 import { Evaluator } from './Evaluator';
 import { registerEvaluator } from './Evaluator';
+import { DefaultEvaluator } from './Evaluator';
 import { interpolate } from './Evaluator';
 import moment from 'moment';
 export { FormioUtils as Utils, Evaluator, registerEvaluator };

package/lib/mjs/utils/index.js

@@ -1,12 +1,13 @@
 import * as utils from './utils';
 import * as formUtils from './formUtils';
-import { Evaluator, registerEvaluator, interpolate } from './Evaluator';
+import { Evaluator, registerEvaluator, interpolate, DefaultEvaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
 import _ from 'lodash';
 import moment from 'moment';
 const FormioUtils = {
     ...utils,
     ...formUtils,
+    DefaultEvaluator,
     Evaluator,
     interpolate,
     ConditionOperators,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6205.d795b91",
+  "version": "5.1.0-dev.6208.59bdd3f",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {