@formio/js 5.1.0-dev.6101.0682abe → 5.1.0-dev.6102.9a0147c

package/lib/cjs/components/editgrid/EditGrid.js

@@ -9,7 +9,7 @@ const components_1 = require("@formio/bootstrap/components");
 const NestedArrayComponent_1 = __importDefault(require("../_classes/nestedarray/NestedArrayComponent"));
 const Component_1 = __importDefault(require("../_classes/component/Component"));
 const Alert_1 = __importDefault(require("../alert/Alert"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const EditRowState = {
     New: 'new',
     Editing: 'editing',

package/lib/cjs/components/editgrid/editForm/EditGrid.edit.display.js

@@ -35,7 +35,7 @@ exports.default = [
         weight: 1002,
         input: false,
         customConditional() {
-            return !Evaluator_1.Evaluator.noeval;
+            return !Evaluator_1.Evaluator.noeval || !Evaluator_1.Evaluator.protectedEval;
         },
     },
     {

package/lib/cjs/components/file/File.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("../_classes/field/Field"));
-const utils_1 = require("../../utils/utils");
+const utils_1 = require("../../utils");
 const downloadjs_1 = __importDefault(require("downloadjs"));
 const lodash_1 = __importDefault(require("lodash"));
 const fileProcessor_1 = __importDefault(require("../../providers/processor/fileProcessor"));
@@ -905,17 +905,16 @@ class FileComponent extends Field_1.default {
     }
     uploadFile(fileToSync) {
         return __awaiter(this, void 0, void 0, function* () {
-            const filePromise = this.fileService.uploadFile(fileToSync.storage, fileToSync.file, fileToSync.name, fileToSync.dir, 
+            return yield this.fileService.uploadFile(fileToSync.storage, fileToSync.file, fileToSync.name, fileToSync.dir, 
             // Progress callback
             this.updateProgress.bind(this, fileToSync), fileToSync.url, fileToSync.options, fileToSync.fileKey, fileToSync.groupPermissions, fileToSync.groupResourceId, () => {
-                this.emit('fileUploadingStart', filePromise);
+                this.emit('fileUploadingStart');
             }, 
             // Abort upload callback
             (abort) => this.abortUploads.push({
                 id: fileToSync.id,
                 abort,
             }), this.getMultipartOptions(fileToSync));
-            return yield filePromise;
         });
     }
     upload() {
@@ -937,7 +936,7 @@ class FileComponent extends Field_1.default {
                     fileToSync.message = this.t('succefullyUploaded');
                     fileInfo.originalName = fileToSync.originalName;
                     fileInfo.hash = fileToSync.hash;
-                    this.emit('fileUploadingEnd', Promise.resolve(fileInfo));
+                    this.emit('fileUploadingEnd');
                 }
                 catch (response) {
                     fileToSync.status = 'error';
@@ -947,7 +946,7 @@ class FileComponent extends Field_1.default {
                         : response.type === 'abort'
                             ? this.t('Request was aborted')
                             : response.toString();
-                    this.emit('fileUploadingEnd', Promise.reject(response));
+                    this.emit('fileUploadingEnd');
                     this.emit('fileUploadError', {
                         fileToSync,
                         response,

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 {

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.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 utils_1 = require("../../utils");
 class RadioComponent extends ListComponent_1.default {
     static schema(...extend) {
         return ListComponent_1.default.schema({

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
  */
@@ -27,7 +27,7 @@ class FormioUploadAdapter {
                 null,
                 null
             ];
-            const uploadPromise = this.fileService.uploadFile(...uploadParams, () => this.component.emit('fileUploadingStart', uploadPromise)).then((result) => {
+            this.fileService.uploadFile(...uploadParams, () => this.component.emit('fileUploadingStart')).then((result) => {
                 return this.fileService.downloadFile(result);
             }).then((result) => {
                 return resolve({
@@ -37,7 +37,7 @@ class FormioUploadAdapter {
                 console.warn('An Error occured while uploading file', err);
                 reject(err);
             }).finally(() => {
-                this.component.emit('fileUploadingEnd', uploadPromise);
+                this.component.emit('fileUploadingEnd');
             });
         }));
     }

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

@@ -1,7 +1,14 @@
-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;
+/**
+ * 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.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,14 @@ 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();
+/**
+ * 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;

package/lib/cjs/utils/builder.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");
+const index_1 = require("./index");
 exports.default = {
     /**
      * Appends a number to a component.key to keep it unique
@@ -15,19 +15,19 @@ exports.default = {
     uniquify(container, component) {
         let changed = false;
         const formKeys = {};
-        (0, utils_1.eachComponent)(container, (comp) => {
+        (0, index_1.eachComponent)(container, (comp) => {
             formKeys[comp.key] = true;
             if (['address', 'container', 'datagrid', 'editgrid', 'dynamicWizard', 'tree'].includes(comp.type) || comp.tree || comp.arrayTree) {
                 return true;
             }
         }, true);
         // Recurse into all child components.
-        (0, utils_1.eachComponent)([component], (component) => {
+        (0, index_1.eachComponent)([component], (component) => {
             // Skip key uniquification if this component doesn't have a key.
             if (!component.key) {
                 return;
             }
-            const newKey = (0, utils_1.uniqueKey)(formKeys, component.key);
+            const newKey = (0, index_1.uniqueKey)(formKeys, component.key);
             if (newKey !== component.key) {
                 component.key = newKey;
                 changed = true;
@@ -60,7 +60,7 @@ exports.default = {
     },
     getBindedShortcuts(components, input) {
         const result = [];
-        (0, utils_1.eachComponent)(components, (component) => {
+        (0, index_1.eachComponent)(components, (component) => {
             if (component === input) {
                 return;
             }

package/lib/cjs/utils/conditionOperators/IsEqualTo.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const ConditionOperator_1 = __importDefault(require("./ConditionOperator"));
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("../utils");
+const __1 = require("../");
 class IsEqualTo extends ConditionOperator_1.default {
     static get operatorKey() {
         return 'isEqual';
@@ -25,9 +25,9 @@ class IsEqualTo extends ConditionOperator_1.default {
         if ((_a = instance === null || instance === void 0 ? void 0 : instance.root) === null || _a === void 0 ? void 0 : _a.getComponent) {
             const conditionTriggerComponent = instance.root.getComponent(path);
             if (conditionTriggerComponent
-                && (0, utils_1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
+                && (0, __1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
                 && ((_b = conditionTriggerComponent.component) === null || _b === void 0 ? void 0 : _b.template)) {
-                return (0, utils_1.compareSelectResourceWithObjectTypeValues)(value, comparedValue, conditionTriggerComponent.component);
+                return (0, __1.compareSelectResourceWithObjectTypeValues)(value, comparedValue, conditionTriggerComponent.component);
             }
         }
         //special check for select boxes

package/lib/cjs/utils/i18n.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18n = void 0;
-const utils_1 = require("@formio/core/utils");
+const Evaluator_1 = require("./Evaluator");
 const i18n_1 = __importDefault(require("../i18n"));
 const lodash_1 = require("lodash");
 const core_1 = require("@formio/core");
@@ -111,9 +111,9 @@ class I18n {
             if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
                 args[0].field = this.currentLanguage[customTranslationFieldName];
             }
-            return utils_1.Evaluator.interpolateString(currentTranslation, ...args);
+            return Evaluator_1.Evaluator.interpolateString(currentTranslation, ...args);
         }
-        return utils_1.Evaluator.interpolateString(text, ...args);
+        return Evaluator_1.Evaluator.interpolateString(text, ...args);
     }
 }
 exports.I18n = I18n;