@formio/js 5.1.0-dev.6102.8eddaab → 5.1.0-dev.6104.98e707b

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

@@ -1,4 +1,27 @@
 "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 };
 };
@@ -6,7 +29,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 utils_1 = __importDefault(require("../../utils"));
+const FormioUtils = __importStar(require("../../utils/utils"));
 const lodash_1 = __importDefault(require("lodash"));
 class TextFieldComponent extends Input_1.default {
     static schema(...extend) {
@@ -48,7 +71,7 @@ class TextFieldComponent extends Input_1.default {
             } });
     }
     static savedValueTypes(schema) {
-        return utils_1.default.getComponentSavedTypes(schema) || [utils_1.default.componentValueTypes.string];
+        return FormioUtils.getComponentSavedTypes(schema) || [FormioUtils.componentValueTypes.string];
     }
     get defaultSchema() {
         return TextFieldComponent.schema();
@@ -81,7 +104,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 = utils_1.default.fastCloneDeep(this.component);
+            this.originalComponent = FormioUtils.fastCloneDeep(this.component);
         }
     }
     attach(element) {
@@ -152,7 +175,7 @@ class TextFieldComponent extends Input_1.default {
             }
             else {
                 const placeholderChar = this.placeholderChar;
-                textInput.value = (0, vanilla_text_mask_1.conformToMask)(textValue, utils_1.default.getInputMask(mask), { placeholderChar }).conformedValue;
+                textInput.value = (0, vanilla_text_mask_1.conformToMask)(textValue, FormioUtils.getInputMask(mask), { placeholderChar }).conformedValue;
             }
         }
         else {
@@ -160,8 +183,8 @@ class TextFieldComponent extends Input_1.default {
         }
     }
     unmaskValue(value, format = this.component.displayMask) {
-        const mask = utils_1.default.getInputMask(format, this.placeholderChar);
-        return utils_1.default.unmaskValue(value, mask, this.placeholderChar);
+        const mask = FormioUtils.getInputMask(format, this.placeholderChar);
+        return FormioUtils.unmaskValue(value, mask, this.placeholderChar);
     }
     /**
      * Returns the value at this index.
@@ -222,7 +245,7 @@ class TextFieldComponent extends Input_1.default {
             return;
         }
         inputMask = inputMask || this.component.displayMask || this.component.inputMask;
-        const mask = utils_1.default.getInputMask(inputMask, this.placeholderChar);
+        const mask = FormioUtils.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");
+const utils_1 = require("../../utils/utils");
 const defaultDataFormat = 'HH:mm:ss';
 class TimeComponent extends TextField_1.default {
     static schema(...extend) {

package/lib/cjs/formio.form.js

@@ -22,6 +22,7 @@ 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"));
@@ -29,7 +30,6 @@ 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 = utils_2.Evaluator;
+Formio_1.Formio.Evaluator = Evaluator_1.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':
-                (0, utils_2.registerEvaluator)(mod.evaluator);
+                Formio_1.Formio.Evaluator.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");
+const utils_1 = require("./utils/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");
+const utils_1 = require("../../utils/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,14 +1,7 @@
-/**
- * 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 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;
 }
-export let Evaluator: DefaultEvaluator;
-import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/cjs/utils/Evaluator.js

@@ -3,31 +3,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerEvaluator = exports.Evaluator = exports.DefaultEvaluator = void 0;
+exports.Evaluator = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const string_hash_1 = __importDefault(require("string-hash"));
-const core_1 = require("@formio/core");
-class DefaultEvaluator extends core_1.DefaultEvaluator {
-    constructor() {
-        super(...arguments);
-        this.cache = {};
-        this.protectedEval = false;
-    }
-    template(template, hash) {
+const utils_1 = require("@formio/core/utils");
+class Evaluator extends utils_1.JSONLogicEvaluator {
+    static template(template, hash) {
         hash = hash || (0, string_hash_1.default)(template);
-        if (this.cache[hash]) {
-            return this.cache[hash];
+        if (Evaluator.cache[hash]) {
+            return Evaluator.cache[hash];
         }
         try {
             // Ensure we handle copied templates from the ejs files.
             template = template.replace(/ctx\./g, '');
-            return (this.cache[hash] = lodash_1.default.template(template, this.templateSettings));
+            return (Evaluator.cache[hash] = lodash_1.default.template(template, Evaluator.templateSettings));
         }
         catch (err) {
             console.warn('Error while processing template', err, template);
         }
     }
-    interpolate(rawTemplate, data, _options) {
+    static interpolate(rawTemplate, data, _options) {
         // Ensure reverse compatability.
         const options = lodash_1.default.isObject(_options) ? _options : { noeval: _options };
         if (typeof rawTemplate === 'function') {
@@ -41,11 +36,11 @@ class DefaultEvaluator extends core_1.DefaultEvaluator {
         }
         rawTemplate = String(rawTemplate);
         let template;
-        if (this.noeval || options.noeval) {
-            return this.interpolateString(rawTemplate, data, _options);
+        if (Evaluator.noeval || options.noeval) {
+            return utils_1.JSONLogicEvaluator.interpolateString(rawTemplate, data, _options);
         }
         else {
-            template = this.template(rawTemplate);
+            template = Evaluator.template(rawTemplate);
         }
         if (typeof template === 'function') {
             try {
@@ -59,14 +54,7 @@ class DefaultEvaluator extends core_1.DefaultEvaluator {
         return template;
     }
 }
-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;
+exports.Evaluator = Evaluator;
+Evaluator.cache = {};
+Evaluator.protectedEval = false;
+Evaluator.noeval = false;

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 index_1 = require("./index");
+const utils_1 = require("./utils");
 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, index_1.eachComponent)(container, (comp) => {
+        (0, utils_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, index_1.eachComponent)([component], (component) => {
+        (0, utils_1.eachComponent)([component], (component) => {
             // Skip key uniquification if this component doesn't have a key.
             if (!component.key) {
                 return;
             }
-            const newKey = (0, index_1.uniqueKey)(formKeys, component.key);
+            const newKey = (0, utils_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, index_1.eachComponent)(components, (component) => {
+        (0, utils_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 __1 = require("../");
+const utils_1 = require("../utils");
 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, __1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
+                && (0, utils_1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
                 && ((_b = conditionTriggerComponent.component) === null || _b === void 0 ? void 0 : _b.template)) {
-                return (0, __1.compareSelectResourceWithObjectTypeValues)(value, comparedValue, conditionTriggerComponent.component);
+                return (0, utils_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 Evaluator_1 = require("./Evaluator");
+const utils_1 = require("@formio/core/utils");
 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 Evaluator_1.Evaluator.interpolateString(currentTranslation, ...args);
+            return utils_1.Evaluator.interpolateString(currentTranslation, ...args);
         }
-        return Evaluator_1.Evaluator.interpolateString(text, ...args);
+        return utils_1.Evaluator.interpolateString(text, ...args);
     }
 }
 exports.I18n = I18n;

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

@@ -1,161 +1,3 @@
-export * from "./utils";
-export * from "./formUtils";
+export { FormioUtils as Utils };
 export default FormioUtils;
-declare const FormioUtils: {
-    Evaluator: import("./Evaluator").DefaultEvaluator;
-    flattenComponents: typeof import("@formio/core/lib/utils/formUtil").flattenComponents;
-    guid: typeof import("@formio/core/lib/utils/formUtil").guid;
-    uniqueName: typeof import("@formio/core/lib/utils/formUtil").uniqueName;
-    MODEL_TYPES_OF_KNOWN_COMPONENTS: {
-        nestedArray: string[];
-        nestedDataArray: string[];
-        dataObject: string[];
-        object: string[];
-        map: string[];
-        content: string[];
-        string: string[];
-        number: string[];
-        boolean: string[];
-        none: string[];
-        any: string[];
-    };
-    getModelType: typeof import("@formio/core/lib/utils/formUtil").getModelType;
-    getComponentPath: any;
-    setComponentScope: typeof import("@formio/core/lib/utils/formUtil").setComponentScope;
-    resetComponentScope: typeof import("@formio/core/lib/utils/formUtil").resetComponentScope;
-    isComponentNestedDataType: typeof import("@formio/core/lib/utils/formUtil").isComponentNestedDataType;
-    componentPath: typeof import("@formio/core/lib/utils/formUtil").componentPath;
-    getComponentPaths: typeof import("@formio/core/lib/utils/formUtil").getComponentPaths;
-    componentMatches: typeof import("@formio/core/lib/utils/formUtil").componentMatches;
-    getBestMatch: typeof import("@formio/core/lib/utils/formUtil").getBestMatch;
-    getComponentFromPath: typeof import("@formio/core/lib/utils/formUtil").getComponentFromPath;
-    getComponentValue: typeof import("@formio/core/lib/utils/formUtil").getComponentValue;
-    findComponents: typeof import("@formio/core/lib/utils/formUtil").findComponents;
-    eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => Promise<void>;
-    eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => void;
-    getComponentKey: typeof import("@formio/core/lib/utils/formUtil").getComponentKey;
-    getContextualRowPath: typeof import("@formio/core/lib/utils/formUtil").getContextualRowPath;
-    getContextualRowData: typeof import("@formio/core/lib/utils/formUtil").getContextualRowData;
-    componentInfo: typeof import("@formio/core/lib/utils/formUtil").componentInfo;
-    eachComponent: typeof import("@formio/core/lib/utils/formUtil").eachComponent;
-    eachComponentAsync: typeof import("@formio/core/lib/utils/formUtil").eachComponentAsync;
-    getComponentData: typeof import("@formio/core/lib/utils/formUtil").getComponentData;
-    getComponentActualValue: any;
-    isLayoutComponent: typeof import("@formio/core/lib/utils/formUtil").isLayoutComponent;
-    matchComponent: typeof import("@formio/core/lib/utils/formUtil").matchComponent;
-    getComponent: typeof import("@formio/core/lib/utils/formUtil").getComponent;
-    searchComponents: typeof import("@formio/core/lib/utils/formUtil").searchComponents;
-    removeComponent: typeof import("@formio/core/lib/utils/formUtil").removeComponent;
-    hasCondition: typeof import("@formio/core/lib/utils/formUtil").hasCondition;
-    parseFloatExt: typeof import("@formio/core/lib/utils/formUtil").parseFloatExt;
-    formatAsCurrency: typeof import("@formio/core/lib/utils/formUtil").formatAsCurrency;
-    escapeRegExCharacters: typeof import("@formio/core/lib/utils/formUtil").escapeRegExCharacters;
-    getValue: typeof import("@formio/core/lib/utils/formUtil").getValue;
-    getStrings: typeof import("@formio/core/lib/utils/formUtil").getStrings;
-    generateFormChange: typeof import("@formio/core/lib/utils/formUtil").generateFormChange;
-    applyFormChanges: typeof import("@formio/core/lib/utils/formUtil").applyFormChanges;
-    findComponent: typeof import("@formio/core/lib/utils/formUtil").findComponent;
-    getEmptyValue: typeof import("@formio/core/lib/utils/formUtil").getEmptyValue;
-    isComponentDataEmpty: typeof import("@formio/core/lib/utils/formUtil").isComponentDataEmpty;
-    isSelectResourceWithObjectValue: typeof import("@formio/core/lib/utils/formUtil").isSelectResourceWithObjectValue;
-    compareSelectResourceWithObjectTypeValues: typeof import("@formio/core/lib/utils/formUtil").compareSelectResourceWithObjectTypeValues;
-    getItemTemplateKeys: typeof import("@formio/core/lib/utils/formUtil").getItemTemplateKeys;
-    evaluate(func: string | object | Function, args: any, ret: string, interpolate: boolean, options?: import("@formio/core").EvaluatorOptions): any;
-    getRandomComponentId(): string;
-    getPropertyValue(style: CSSStyleDeclaration, prop: string): number;
-    getElementRect(element: HTMLElement): {
-        x: number;
-        y: number;
-        width: number;
-        height: number;
-    };
-    getScriptPlugin(property: string): any;
-    boolValue(value: string | boolean): boolean;
-    isMongoId(text: string): boolean;
-    checkCalculated(component: import("@formio/core").Component, submission: import("@formio/core").Submission, rowData: any): void;
-    checkSimpleConditional(component: any, condition: any, row: any, data: any, instance: any): boolean;
-    checkCustomConditional(component: import("@formio/core").Component, custom: string, row: any, data: any, form: import("@formio/core").Form, variable: string, onError: any, instance: any): any;
-    checkJsonConditional(component: import("@formio/core").Component, json: import("@formio/core").JSONConditional, row: any, data: any, form: import("@formio/core").Form, onError: any): boolean;
-    checkCondition(component: import("@formio/core").Component, row: any, data: any, form: import("@formio/core").Form, instance: any): boolean;
-    checkTrigger(component: import("@formio/core").Component, trigger: any, row: import("@formio/core").DataObject, data: import("@formio/core").DataObject, form: import("@formio/core").Form, instance: any): boolean;
-    setActionProperty(component: import("@formio/core").Component, action: any, result: string, row: import("@formio/core").DataObject, data: import("@formio/core").DataObject, instance: any): import("@formio/core").Component;
-    removeHTML(str: string): string;
-    unescapeHTML(str: string): string;
-    convertStringToHTMLElement(str: string, selector: string): HTMLElement;
-    getDateSetting(date: string | Date): Date | null;
-    isValidDate(date: string | Date): boolean;
-    currentTimezone(): string;
-    offsetDate(date: Date, timezone: string): Date;
-    zonesLoaded(): boolean;
-    shouldLoadZones(timezone: string): boolean;
-    loadZones(url: string, timezone: string): any;
-    momentDate(value: string | Date, format: string, timezone: string, options: object): Date;
-    formatDate(timezonesUrl: string, value: string | Date, format: string, timezone: string, flatPickrInputFormat: string): string;
-    formatOffset(timezonesUrl: string, formatFn: Function, date: string | Date, format: string, timezone: string): string;
-    getLocaleDateFormatInfo(locale: Intl.LocalesArgument): object;
-    convertFormatToFlatpickr(format: string): string;
-    convertFormatToMoment(format: string): string;
-    convertFormatToMask(format: string): string;
-    getInputMask(mask: string, placeholderChar: string): any[];
-    unmaskValue(value: string, mask: string, placeholderChar: string): string;
-    matchInputMask(value: string, inputMask: string): boolean;
-    getNumberSeparators(lang?: string): {
-        delimiter: string;
-        decimalSeparator: string;
-    };
-    getNumberDecimalLimit(component: import("@formio/core").Component, defaultLimit: number): number;
-    getCurrencyAffixes({ currency, decimalLimit, decimalSeparator, lang, }: {
-        currency: string;
-        decimalLimit: number;
-        decimalSeparator: string;
-        lang: string;
-    }): {
-        prefix: string;
-        suffix: string;
-    };
-    fieldData(data: import("@formio/core").DataObject, component: import("@formio/core").Component): any;
-    delay(fn: Function, delay?: number, ...args: any[]): any;
-    iterateKey(key: string): string;
-    uniqueKey(map: Record<string, string>, base: string): string;
-    bootstrapVersion(options: {
-        bootstrap: string;
-    }): number;
-    unfold(e: any): any;
-    withSwitch(a: any, b: any): Functions[];
-    observeOverload(callback: Function, options?: {
-        limit: number;
-        delay: number;
-    }): Function;
-    getContextComponents(context: any, excludeNested: boolean, excludedTypes?: string[]): any[];
-    getContextButtons(context: any): any[];
-    translateHTMLTemplate(template: string, translate: Function): string;
-    sanitize(string: string, options: any): string;
-    fastCloneDeep(obj: any): any;
-    isInputComponent(componentJson: import("@formio/core").Component): bool;
-    getArrayFromComponentPath(pathStr: string): Arryay<number>;
-    isChildOf(child: any, parent: any): boolean;
-    getStringFromComponentPath(path: number[]): string;
-    round(number: number, precision: number): string;
-    getIEBrowserVersion(): number | null;
-    getBrowserInfo(): object;
-    getComponentPathWithoutIndicies(path?: string): string;
-    getDataParentComponent(componentInstance: Component): any;
-    isPromise(value: any): boolean;
-    getFocusableElements(element: HTMLElement): NodeList<HTMLElement>;
-    getComponentSavedTypes(fullSchema: import("@formio/core").Component): string[] | null;
-    hasEncodedTimezone(value: string): boolean;
-    firstNonNil: any;
-    componentValueTypes: {
-        number: string;
-        string: string;
-        boolean: string;
-        array: string;
-        object: string;
-        date: string;
-        any: string;
-    };
-    interpolateErrors: (component: Component, errors: FieldError[], interpolateFn: Function) => [];
-};
-import { Evaluator } from './Evaluator';
-import { registerEvaluator } from './Evaluator';
-export { FormioUtils as Utils, Evaluator, registerEvaluator };
+import * as FormioUtils from './utils';

package/lib/cjs/utils/index.js

@@ -22,21 +22,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerEvaluator = exports.Evaluator = exports.Utils = void 0;
-const utils = __importStar(require("./utils"));
-const formUtils = __importStar(require("./formUtils"));
-const Evaluator_1 = require("./Evaluator");
-Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
-Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: function () { return Evaluator_1.registerEvaluator; } });
-const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { Evaluator: Evaluator_1.Evaluator });
+exports.Utils = void 0;
+const FormioUtils = __importStar(require("./utils"));
 exports.Utils = FormioUtils;
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
-__exportStar(require("./utils"), exports);
-__exportStar(require("./formUtils"), exports);
 exports.default = FormioUtils;

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

@@ -499,6 +499,7 @@ export function getComponentSavedTypes(fullSchema: import('@formio/core').Compon
  * @returns {boolean} if value has encoded timezone
  */
 export function hasEncodedTimezone(value: string): boolean;
+export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.
  * @param {Array<T>} collection - The collection to map through unfold.;
@@ -515,3 +516,7 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
+import ConditionOperators from './conditionOperators';
+import { Evaluator } from './Evaluator';
+export const interpolate: typeof Evaluator.interpolate;
+export { jsonLogic, ConditionOperators, moment, Evaluator, _ };

package/lib/cjs/utils/utils.js

@@ -1,19 +1,57 @@
 "use strict";
+/* global jQuery */
+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 __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContextComponents = exports.observeOverload = exports.withSwitch = exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = void 0;
-exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = void 0;
-/* global jQuery */
+exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
+exports.hasEncodedTimezone = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
 const lodash_1 = __importDefault(require("lodash"));
+exports._ = lodash_1.default;
+const json_logic_js_1 = __importDefault(require("json-logic-js"));
+exports.jsonLogic = json_logic_js_1.default;
 const moment_timezone_1 = __importDefault(require("moment-timezone/moment-timezone"));
+exports.moment = moment_timezone_1.default;
 const jstimezonedetect_1 = __importDefault(require("jstimezonedetect"));
+const operators_1 = require("./jsonlogic/operators");
 const dompurify_1 = __importDefault(require("dompurify"));
 const formUtils_1 = require("./formUtils");
 const Evaluator_1 = require("./Evaluator");
+Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 const conditionOperators_1 = __importDefault(require("./conditionOperators"));
+exports.ConditionOperators = conditionOperators_1.default;
 const core_1 = require("@formio/core");
+const interpolate = Evaluator_1.Evaluator.interpolate;
+exports.interpolate = interpolate;
+__exportStar(require("./formUtils"), exports);
+// Configure JsonLogic
+operators_1.lodashOperators.forEach((name) => json_logic_js_1.default.add_operation(`_${name}`, lodash_1.default[name]));
+// Retrieve Any Date
+json_logic_js_1.default.add_operation('getDate', (date) => {
+    return (0, moment_timezone_1.default)(date).toISOString();
+});
+// Set Relative Minimum Date
+json_logic_js_1.default.add_operation('relativeMinDate', (relativeMinDate) => {
+    return (0, moment_timezone_1.default)().subtract(relativeMinDate, 'days').toISOString();
+});
+// Set Relative Maximum Date
+json_logic_js_1.default.add_operation('relativeMaxDate', (relativeMaxDate) => {
+    return (0, moment_timezone_1.default)().add(relativeMaxDate, 'days').toISOString();
+});
 /**
  * Evaluate a method.
  * @param {Function|string|object} func - The function to evaluate.
@@ -297,7 +335,7 @@ exports.checkCustomConditional = checkCustomConditional;
  */
 function checkJsonConditional(component, json, row, data, form, onError) {
     try {
-        return core_1.jsonLogic.apply(json, {
+        return json_logic_js_1.default.apply(json, {
             data,
             row,
             form,

package/lib/cjs/widgets/CalendarWidget.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Formio_1 = require("../Formio");
 const InputWidget_1 = __importDefault(require("./InputWidget"));
-const utils_1 = require("../utils");
+const utils_1 = require("../utils/utils");
 const moment_1 = __importDefault(require("moment"));
 const lodash_1 = __importDefault(require("lodash"));
 const DEFAULT_FORMAT = 'yyyy-MM-dd hh:mm a';