@formio/js 5.1.0-dev.5913.5ccc183 → 5.1.0-dev.5936.81a1533

package/lib/cjs/components/form/Form.js

@@ -8,7 +8,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const Component_1 = __importDefault(require("../_classes/component/Component"));
 const ComponentModal_1 = __importDefault(require("../_classes/componentModal/ComponentModal"));
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Formio_1 = require("../../Formio");
 const Form_1 = __importDefault(require("../../Form"));
 class FormComponent extends Component_1.default {
@@ -278,6 +278,9 @@ class FormComponent extends Component_1.default {
             if (this.isSubFormLazyLoad() && !this.hasLoadedForm && !this.subFormLoading) {
                 this.createSubForm(true);
             }
+            if (!this.subFormReady) {
+                return Promise.resolve();
+            }
             return this.subFormReady.then(() => {
                 this.empty(element);
                 if (this.options.builder) {
@@ -408,13 +411,15 @@ class FormComponent extends Component_1.default {
             }
             // Render the form.
             return (new Form_1.default(form, this.getSubOptions())).ready.then((instance) => {
+                var _a, _b;
                 this.subForm = instance;
                 this.subForm.currentForm = this;
                 this.subForm.parentVisible = this.visible;
                 const componentsMap = this.componentsMap;
                 const formComponentsMap = this.subForm.componentsMap;
                 lodash_1.default.assign(componentsMap, formComponentsMap);
-                this.component.components = this.subForm.components.map((comp) => comp.component);
+                this.component.components = (_a = this.subForm._form) === null || _a === void 0 ? void 0 : _a.components;
+                this.component.display = (_b = this.subForm._form) === null || _b === void 0 ? void 0 : _b.display;
                 this.subForm.on('change', () => {
                     if (this.subForm && !this.shouldConditionallyClear()) {
                         this.dataValue = this.subForm.getValue();
@@ -699,6 +704,13 @@ class FormComponent extends Component_1.default {
         }
         return errors;
     }
+    conditionallyHidden() {
+        const conditionallyHidden = super.conditionallyHidden();
+        if (this.subForm) {
+            this.subForm._conditionallyHidden = conditionallyHidden;
+        }
+        return conditionallyHidden;
+    }
     updateSubFormVisibility() {
         if (this.subForm) {
             this.subForm.parentVisible = this.visible;

package/lib/cjs/components/form/editForm/Form.edit.form.js

@@ -32,10 +32,11 @@ exports.default = [
         tooltip: 'if it is checked, the subform is loaded after navigation to the page with this component within the wizard.',
         input: true,
         customConditional({ instance, data }) {
-            var _a, _b, _c, _d;
-            const formInfo = (_b = (_a = instance.root) === null || _a === void 0 ? void 0 : _a.getComponent('form')) === null || _b === void 0 ? void 0 : _b.defaultDownloadedResources.find(res => res._id === data.form);
+            var _a, _b, _c;
+            const formComp = (_a = instance.root) === null || _a === void 0 ? void 0 : _a.getComponent('form');
+            const formInfo = formComp === null || formComp === void 0 ? void 0 : formComp.defaultDownloadedResources.find(res => res._id === data.form);
             const displayMode = 'wizard';
-            return ((_d = (_c = instance.options) === null || _c === void 0 ? void 0 : _c.editForm) === null || _d === void 0 ? void 0 : _d.display) === displayMode && formInfo && formInfo.display !== displayMode;
+            return ((_c = (_b = instance.options) === null || _b === void 0 ? void 0 : _b.editForm) === null || _c === void 0 ? void 0 : _c.display) === displayMode && ((data.form && !formInfo) || (formInfo && formInfo.display !== displayMode));
         },
     },
     {

package/lib/cjs/components/number/Number.js

@@ -7,7 +7,7 @@ const text_mask_addons_1 = require("@formio/text-mask-addons");
 const vanilla_text_mask_1 = require("@formio/vanilla-text-mask");
 const lodash_1 = __importDefault(require("lodash"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils/");
 class NumberComponent extends Input_1.default {
     static schema(...extend) {
         return Input_1.default.schema({

package/lib/cjs/components/panel/Panel.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const NestedComponent_1 = __importDefault(require("../_classes/nested/NestedComponent"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class PanelComponent extends NestedComponent_1.default {
     static schema(...extend) {
         return NestedComponent_1.default.schema({

package/lib/cjs/components/radio/Radio.d.ts

@@ -27,6 +27,7 @@ export default class RadioComponent extends ListComponent {
     itemsLoadedResolve: ((value: any) => void) | undefined;
     optionsLoaded: boolean | undefined;
     loadedOptions: any[] | undefined;
+    valuesMap: Map<any, any> | undefined;
     beforeSubmit(): Promise<any>;
     render(): string;
     attach(element: any): Promise<void>;
@@ -35,10 +36,13 @@ export default class RadioComponent extends ListComponent {
     validateValueAvailability(setting: any, value: any): boolean;
     getValueAsString(value: any, options?: {}): any;
     setValueAt(index: any, value: any): void;
+    prepareValue(item: any, options?: {}): any;
+    getValueByInput(input: any): any;
     loadItems(url: any, search: any, headers: any, options: any, method: any, body: any): void;
     loadItemsFromMetadata(): void;
     setItems(items: any): void;
     setSelectedClasses(): void;
+    setMetadata(value: any): void;
     updateValue(value: any, flags: any): boolean;
     currentValue: any;
 }

package/lib/cjs/components/radio/Radio.js

@@ -7,6 +7,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const ListComponent_1 = __importDefault(require("../_classes/list/ListComponent"));
 const Formio_1 = require("../../Formio");
 const utils_1 = require("../../utils/utils");
+const uuid_1 = require("uuid");
 class RadioComponent extends ListComponent_1.default {
     static schema(...extend) {
         return ListComponent_1.default.schema({
@@ -142,6 +143,7 @@ class RadioComponent extends ListComponent_1.default {
         });
         this.optionsLoaded = !this.component.dataSrc || this.component.dataSrc === 'values';
         this.loadedOptions = [];
+        this.valuesMap = new Map();
         if (!this.visible) {
             this.itemsLoadedResolve();
         }
@@ -181,9 +183,12 @@ class RadioComponent extends ListComponent_1.default {
                 if (!lodash_1.default.isString(this.dataValue)) {
                     dataValue = lodash_1.default.toString(this.dataValue);
                 }
-                if (this.isSelectURL && lodash_1.default.isObject(this.loadedOptions[index].value)) {
-                    const optionValue = this.component.dataType === 'string' ? JSON.stringify(this.loadedOptions[index].value) : this.loadedOptions[index].value;
-                    input.checked = lodash_1.default.isEqual(optionValue, this.dataValue);
+                if (this.isSelectURL) {
+                    const valueKey = this.loadedOptions[index].value;
+                    const optionValue = this.valuesMap.has(valueKey)
+                        ? this.valuesMap.get(valueKey)
+                        : valueKey;
+                    input.checked = lodash_1.default.isEqual(this.normalizeValue(optionValue), this.dataValue);
                 }
                 else {
                     input.checked = (dataValue === input.value && (input.value || this.component.dataSrc !== 'url'));
@@ -220,9 +225,14 @@ class RadioComponent extends ListComponent_1.default {
         let value = this.component.inputType === 'checkbox' ? '' : this.dataValue;
         this.refs.input.forEach((input, index) => {
             if (input.checked) {
-                value = (this.isSelectURL && lodash_1.default.isObject(this.loadedOptions[index].value)) ?
-                    this.loadedOptions[index].value :
-                    input.value;
+                if (!this.isSelectURL) {
+                    value = input.value;
+                    return;
+                }
+                const optionValue = this.loadedOptions[index].value;
+                value = this.valuesMap.has(optionValue)
+                    ? this.valuesMap.get(optionValue)
+                    : optionValue;
             }
         });
         return value;
@@ -266,8 +276,8 @@ class RadioComponent extends ListComponent_1.default {
     }
     setValueAt(index, value) {
         if (this.refs.input && this.refs.input[index] && value !== null && value !== undefined) {
-            const inputValue = this.refs.input[index].value;
-            this.refs.input[index].checked = (inputValue === value.toString());
+            const inputValue = this.getValueByInput(this.refs.input[index]);
+            this.refs.input[index].checked = lodash_1.default.isEqual(inputValue, value);
         }
     }
     get shouldLoad() {
@@ -277,6 +287,23 @@ class RadioComponent extends ListComponent_1.default {
         }
         return super.shouldLoad;
     }
+    prepareValue(item, options = {}) {
+        const value = this.component.valueProperty && !options.skipValueProperty
+            ? lodash_1.default.get(item, this.component.valueProperty)
+            : item;
+        if (this.component.type === 'radio' && typeof value !== 'string') {
+            const uuid = (0, uuid_1.v4)();
+            this.valuesMap.set(uuid, value);
+            return uuid;
+        }
+        return value;
+    }
+    getValueByInput(input) {
+        const inputValue = input.value;
+        return this.valuesMap.has(inputValue)
+            ? this.valuesMap.get(inputValue)
+            : inputValue;
+    }
     loadItems(url, search, headers, options, method, body) {
         if (this.optionsLoaded) {
             this.itemsLoadedResolve();
@@ -327,7 +354,7 @@ class RadioComponent extends ListComponent_1.default {
                 label: this.itemTemplate(item)
             };
             if (lodash_1.default.isEqual(item, this.selectData || lodash_1.default.pick(this.dataValue, lodash_1.default.keys(item)))) {
-                this.loadedOptions[i].value = this.dataValue;
+                this.loadedOptions[i].value = this.prepareValue(this.dataValue, { skipValueProperty: true });
             }
         });
         this.optionsLoaded = true;
@@ -337,12 +364,15 @@ class RadioComponent extends ListComponent_1.default {
         const listData = [];
         items === null || items === void 0 ? void 0 : items.forEach((item, i) => {
             const valueAtProperty = lodash_1.default.get(item, this.component.valueProperty);
-            this.loadedOptions[i] = {
-                value: this.component.valueProperty ? valueAtProperty : item,
-                label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
-            };
-            listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
-            const value = this.loadedOptions[i].value;
+            const value = this.prepareValue(item);
+            const label = this.component.valueProperty
+                ? this.itemTemplate(item, valueAtProperty, i)
+                : this.itemTemplate(item, item, i);
+            this.loadedOptions[i] = { label, value };
+            listData.push(this.templateData[i]);
+            if (this.valuesMap.has(value)) {
+                this.templateData[value] = this.templateData[i];
+            }
             if (!this.isRadio && (lodash_1.default.isObject(value) || lodash_1.default.isBoolean(value) || lodash_1.default.isUndefined(value))) {
                 this.loadedOptions[i].invalid = true;
             }
@@ -365,7 +395,11 @@ class RadioComponent extends ListComponent_1.default {
             const value = this.dataValue;
             this.refs.wrapper.forEach((wrapper, index) => {
                 const input = this.refs.input[index];
-                const checked = (value === undefined || value === null) ? false : (input.type === 'checkbox') ? value[input.value] || input.checked : (input.value.toString() === value.toString());
+                const checked = (value === undefined || value === null)
+                    ? false
+                    : (input.type === 'checkbox')
+                        ? value[input.value] || input.checked
+                        : lodash_1.default.isEqual(this.normalizeValue(this.getValueByInput(input)), value);
                 if (checked) {
                     //add class to container when selected
                     this.addClass(wrapper, this.optionSelectedClass);
@@ -379,10 +413,26 @@ class RadioComponent extends ListComponent_1.default {
             });
         }
     }
+    setMetadata(value) {
+        var _a;
+        let key = value;
+        if (typeof value !== 'string') {
+            const checkedInput = Array.prototype.find.call((_a = this.refs.input) !== null && _a !== void 0 ? _a : [], (input => input.type === 'radio' && input.getAttribute('checked')));
+            key = (checkedInput === null || checkedInput === void 0 ? void 0 : checkedInput.value) || key;
+        }
+        if (this.isSelectURL && this.templateData && this.templateData[key]) {
+            const submission = this.root.submission;
+            if (!submission.metadata.selectData) {
+                submission.metadata.selectData = {};
+            }
+            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[key]);
+        }
+    }
     updateValue(value, flags) {
         const changed = super.updateValue(value, flags);
         if (changed) {
             this.setSelectedClasses();
+            this.setMetadata(this.dataValue);
         }
         if (!flags || !flags.modified || !this.isRadio) {
             if (changed) {
@@ -438,14 +488,10 @@ class RadioComponent extends ListComponent_1.default {
                 value = !(!value || value.toString() === 'false');
                 break;
         }
-        if (this.isSelectURL && this.templateData && this.templateData[value]) {
-            const submission = this.root.submission;
-            if (!submission.metadata.selectData) {
-                submission.metadata.selectData = {};
-            }
-            lodash_1.default.set(submission.metadata.selectData, this.path, this.templateData[value]);
-        }
         return super.normalizeValue(value);
     }
+    isSingleInputValue() {
+        return true;
+    }
 }
 exports.default = RadioComponent;

package/lib/cjs/components/recaptcha/editForm/ReCaptcha.edit.display.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 exports.default = [
     {
         key: 'recaptchaInfo',

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

@@ -7,7 +7,7 @@ const lodash_1 = __importDefault(require("lodash"));
 const Formio_1 = require("../../Formio");
 const ListComponent_1 = __importDefault(require("../_classes/list/ListComponent"));
 const Form_1 = __importDefault(require("../../Form"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const ChoicesWrapper_1 = __importDefault(require("../../utils/ChoicesWrapper"));
 class SelectComponent extends ListComponent_1.default {
     static schema(...extend) {

package/lib/cjs/components/select/editForm/Select.edit.data.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../../utils/utils");
+const utils_1 = require("../../../utils");
 const calculateSingleSelectData = (context, defaultValue) => {
     const { instance, data } = context;
     const rawDefaultValue = instance.downloadedResources.find(resource => lodash_1.default.get(resource, data.valueProperty) === defaultValue);

package/lib/cjs/components/selectboxes/SelectBoxes.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Radio_1 = __importDefault(require("../radio/Radio"));
 class SelectBoxesComponent extends Radio_1.default {
     static schema(...extend) {

package/lib/cjs/components/signature/Signature.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const signature_pad_1 = __importDefault(require("signature_pad"));
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class SignatureComponent extends Input_1.default {
     static schema(...extend) {
         return Input_1.default.schema({

package/lib/cjs/components/survey/Survey.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class SurveyComponent extends Field_1.default {
     static schema(...extend) {
         return Field_1.default.schema({

package/lib/cjs/components/tags/Tags.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 const choices_js_1 = __importDefault(require("choices.js"));
 class TagsComponent extends Input_1.default {

package/lib/cjs/components/textarea/TextArea.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* global Quill */
 const TextField_1 = __importDefault(require("../textfield/TextField"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 class TextAreaComponent extends TextField_1.default {
     static schema(...extend) {
         return TextField_1.default.schema({
@@ -63,8 +63,8 @@ class TextAreaComponent extends TextField_1.default {
         if ((this.options.readOnly || this.disabled) && !this.isHtmlRenderMode()) {
             const elementStyle = this.info.attr.style || '';
             const children = `
-        <div ${this._referenceAttributeName}="input" 
-          class="formio-editor-read-only-content" 
+        <div ${this._referenceAttributeName}="input"
+          class="formio-editor-read-only-content"
           ${elementStyle ? `style='${elementStyle}'` : ''}
           role="textbox"
           aria-multiline="true"

package/lib/cjs/components/textfield/TextField.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Input_1 = __importDefault(require("../_classes/input/Input"));
 const vanilla_text_mask_1 = require("@formio/vanilla-text-mask");
 const inputmask_1 = __importDefault(require("inputmask"));
-const FormioUtils = __importStar(require("../../utils/utils"));
+const utils_1 = __importDefault(require("../../utils"));
 const lodash_1 = __importDefault(require("lodash"));
 class TextFieldComponent extends Input_1.default {
     static schema(...extend) {
@@ -71,7 +48,7 @@ class TextFieldComponent extends Input_1.default {
             } });
     }
     static savedValueTypes(schema) {
-        return FormioUtils.getComponentSavedTypes(schema) || [FormioUtils.componentValueTypes.string];
+        return utils_1.default.getComponentSavedTypes(schema) || [utils_1.default.componentValueTypes.string];
     }
     get defaultSchema() {
         return TextFieldComponent.schema();
@@ -104,7 +81,7 @@ class TextFieldComponent extends Input_1.default {
                 displayInTimezone, locale: this.component.widget.locale || this.options.language, saveAs: 'text' });
             // update originalComponent to include widget settings after component initialization
             // originalComponent is used to restore the component (and widget) after evaluating field logic
-            this.originalComponent = FormioUtils.fastCloneDeep(this.component);
+            this.originalComponent = utils_1.default.fastCloneDeep(this.component);
         }
     }
     attach(element) {
@@ -175,7 +152,7 @@ class TextFieldComponent extends Input_1.default {
             }
             else {
                 const placeholderChar = this.placeholderChar;
-                textInput.value = (0, vanilla_text_mask_1.conformToMask)(textValue, FormioUtils.getInputMask(mask), { placeholderChar }).conformedValue;
+                textInput.value = (0, vanilla_text_mask_1.conformToMask)(textValue, utils_1.default.getInputMask(mask), { placeholderChar }).conformedValue;
             }
         }
         else {
@@ -183,8 +160,8 @@ class TextFieldComponent extends Input_1.default {
         }
     }
     unmaskValue(value, format = this.component.displayMask) {
-        const mask = FormioUtils.getInputMask(format, this.placeholderChar);
-        return FormioUtils.unmaskValue(value, mask, this.placeholderChar);
+        const mask = utils_1.default.getInputMask(format, this.placeholderChar);
+        return utils_1.default.unmaskValue(value, mask, this.placeholderChar);
     }
     /**
      * Returns the value at this index.
@@ -245,7 +222,7 @@ class TextFieldComponent extends Input_1.default {
             return;
         }
         inputMask = inputMask || this.component.displayMask || this.component.inputMask;
-        const mask = FormioUtils.getInputMask(inputMask, this.placeholderChar);
+        const mask = utils_1.default.getInputMask(inputMask, this.placeholderChar);
         this.defaultMask = mask;
         if (input && inputMask) {
             try {

package/lib/cjs/components/time/Time.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const moment_1 = __importDefault(require("moment"));
 const TextField_1 = __importDefault(require("../textfield/TextField"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const defaultDataFormat = 'HH:mm:ss';
 class TimeComponent extends TextField_1.default {
     static schema(...extend) {

package/lib/cjs/formio.form.js

@@ -22,7 +22,6 @@ const Form_1 = __importDefault(require("./Form"));
 exports.Form = Form_1.default;
 const utils_1 = __importDefault(require("./utils"));
 exports.Utils = utils_1.default;
-const Evaluator_1 = require("./utils/Evaluator");
 const licenses_1 = __importDefault(require("./licenses"));
 exports.Licenses = licenses_1.default;
 const EventEmitter_1 = __importDefault(require("./EventEmitter"));
@@ -30,6 +29,7 @@ exports.EventEmitter = EventEmitter_1.default;
 const Webform_1 = __importDefault(require("./Webform"));
 exports.Webform = Webform_1.default;
 const i18n_1 = require("./utils/i18n");
+const utils_2 = require("./utils");
 Formio_1.Formio.loadModules = (path = `${Formio_1.Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio_1.Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -45,7 +45,7 @@ Formio_1.Formio.Form = Form_1.default;
 Formio_1.Formio.Displays = Displays_1.default;
 Formio_1.Formio.Providers = providers_1.default;
 Formio_1.Formio.Widgets = widgets_1.default;
-Formio_1.Formio.Evaluator = Evaluator_1.Evaluator;
+Formio_1.Formio.Evaluator = utils_2.Evaluator;
 Formio_1.Formio.AllComponents = components_1.default;
 Formio_1.Formio.Licenses = licenses_1.default;
 // This is strange, but is needed for "premium" components to import correctly.
@@ -100,7 +100,7 @@ function registerModule(mod, defaultFn = null, options = {}) {
                 Formio_1.Formio.Displays.addDisplays(mod.displays);
                 break;
             case 'evaluator':
-                Formio_1.Formio.Evaluator.registerEvaluator(mod.evaluator);
+                (0, utils_2.registerEvaluator)(mod.evaluator);
                 break;
             case 'translations':
                 i18n_1.I18n.setDefaultTranslations(mod.translations);

package/lib/cjs/i18n.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const en_1 = __importDefault(require("./translations/en"));
-const utils_1 = require("./utils/utils");
+const utils_1 = require("./utils");
 exports.default = {
     lng: 'en',
     nsSeparator: '::',

package/lib/cjs/providers/storage/uploadAdapter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFormioUploadAdapterPlugin = void 0;
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 /**
  * UploadAdapter for CKEditor https://ckeditor.com/docs/ckeditor5/latest/framework/guides/deep-dive/upload-adapter.html
  */

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

@@ -1,7 +1,21 @@
-export class Evaluator {
-    static cache: {};
-    static protectedEval: boolean;
-    static noeval: boolean;
-    static template(template: any, hash: any): any;
-    static interpolate(rawTemplate: any, data: any, _options: any): any;
+/**
+ * For backwards compatibility we a standalone interpolate function. This merely calls the
+ * global mutable Evaluator instance's interpolate function.
+ * @param  {...any} args - interpolate arguments, typically "rawTemplate", "data", and "options"
+ * @returns {any} the interpolation result.
+ */
+export function interpolate(...args: any[]): any;
+/**
+ * Set the evaluator to use for evaluating expressions.
+ * @param {CoreEvaluator} override - The new evaluator instance to use.
+ * @returns {void}
+ */
+export function registerEvaluator(override: CoreEvaluator): void;
+export class DefaultEvaluator extends CoreEvaluator {
+    cache: {};
+    protectedEval: boolean;
+    template(template: any, hash: any): any;
+    interpolate(rawTemplate: any, data: any, _options: any): any;
 }
+export let Evaluator: DefaultEvaluator;
+import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/cjs/utils/Evaluator.js

@@ -3,26 +3,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Evaluator = void 0;
+exports.registerEvaluator = exports.interpolate = exports.Evaluator = exports.DefaultEvaluator = 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.JSONLogicEvaluator {
-    static template(template, hash) {
+const core_1 = require("@formio/core");
+class DefaultEvaluator extends core_1.DefaultEvaluator {
+    constructor() {
+        super(...arguments);
+        this.cache = {};
+        this.protectedEval = false;
+    }
+    template(template, hash) {
         hash = hash || (0, string_hash_1.default)(template);
-        if (Evaluator.cache[hash]) {
-            return Evaluator.cache[hash];
+        if (this.cache[hash]) {
+            return this.cache[hash];
         }
         try {
             // Ensure we handle copied templates from the ejs files.
             template = template.replace(/ctx\./g, '');
-            return (Evaluator.cache[hash] = lodash_1.default.template(template, Evaluator.templateSettings));
+            return (this.cache[hash] = lodash_1.default.template(template, this.templateSettings));
         }
         catch (err) {
             console.warn('Error while processing template', err, template);
         }
     }
-    static interpolate(rawTemplate, data, _options) {
+    interpolate(rawTemplate, data, _options) {
         // Ensure reverse compatability.
         const options = lodash_1.default.isObject(_options) ? _options : { noeval: _options };
         if (typeof rawTemplate === 'function') {
@@ -36,11 +41,11 @@ class Evaluator extends utils_1.JSONLogicEvaluator {
         }
         rawTemplate = String(rawTemplate);
         let template;
-        if (Evaluator.noeval || options.noeval) {
-            return utils_1.JSONLogicEvaluator.interpolateString(rawTemplate, data, _options);
+        if (this.noeval || options.noeval) {
+            return this.interpolateString(rawTemplate, data, _options);
         }
         else {
-            template = Evaluator.template(rawTemplate);
+            template = this.template(rawTemplate);
         }
         if (typeof template === 'function') {
             try {
@@ -54,7 +59,25 @@ class Evaluator extends utils_1.JSONLogicEvaluator {
         return template;
     }
 }
-exports.Evaluator = Evaluator;
-Evaluator.cache = {};
-Evaluator.protectedEval = false;
-Evaluator.noeval = false;
+exports.DefaultEvaluator = DefaultEvaluator;
+exports.Evaluator = new DefaultEvaluator();
+// preserve the standalone interpolate function for backwards compatibility
+/**
+ * For backwards compatibility we a standalone interpolate function. This merely calls the
+ * global mutable Evaluator instance's interpolate function.
+ * @param  {...any} args - interpolate arguments, typically "rawTemplate", "data", and "options"
+ * @returns {any} the interpolation result.
+ */
+function interpolate(...args) {
+    return exports.Evaluator.interpolate(...args);
+}
+exports.interpolate = interpolate;
+/**
+ * Set the evaluator to use for evaluating expressions.
+ * @param {CoreEvaluator} override - The new evaluator instance to use.
+ * @returns {void}
+ */
+function registerEvaluator(override) {
+    exports.Evaluator = override;
+}
+exports.registerEvaluator = registerEvaluator;