@formio/js 5.2.0-rc.3 → 5.2.0-rc.4

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

@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import Field from '../_classes/field/Field';
-import { boolValue, componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
+import { boolValue, componentValueTypes, getComponentSavedTypes } from '../../utils';
 export default class SurveyComponent extends Field {
     static schema(...extend) {
         return Field.schema({

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

@@ -1,4 +1,4 @@
-import { componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
+import { componentValueTypes, getComponentSavedTypes } from '../../utils';
 import Input from '../_classes/input/Input';
 import Choices from '@formio/choices.js';
 export default class TagsComponent extends Input {

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

@@ -1,7 +1,7 @@
 /* global Quill */
 import TextFieldComponent from '../textfield/TextField';
 import _ from 'lodash';
-import { uniqueName, getBrowserInfo } from '../../utils/utils';
+import { uniqueName, getBrowserInfo } from '../../utils';
 export default class TextAreaComponent extends TextFieldComponent {
     static schema(...extend) {
         return TextFieldComponent.schema({
@@ -57,7 +57,15 @@ export default class TextAreaComponent extends TextFieldComponent {
         info.content = value;
         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" ${elementStyle ? `style='${elementStyle}'` : ''}></div>`;
+            const children = `
+        <div ${this._referenceAttributeName}="input"
+          class="formio-editor-read-only-content"
+          ${elementStyle ? `style='${elementStyle}'` : ''}
+          role="textbox"
+          aria-multiline="true"
+          aria-readonly="true"
+        >
+        </div>`;
             return this.renderTemplate('well', {
                 children,
                 nestedKey: this.key,

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

@@ -1,7 +1,7 @@
 import Input from '../_classes/input/Input';
 import { conformToMask } from '@formio/vanilla-text-mask';
 import Inputmask from 'inputmask';
-import * as FormioUtils from '../../utils/utils';
+import FormioUtils from '../../utils';
 import _ from 'lodash';
 export default class TextFieldComponent extends Input {
     static schema(...extend) {

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

@@ -1,6 +1,6 @@
 import moment from 'moment';
 import TextFieldComponent from '../textfield/TextField';
-import { getBrowserInfo } from '../../utils/utils';
+import { getBrowserInfo } from '../../utils';
 const defaultDataFormat = 'HH:mm:ss';
 export default class TimeComponent extends TextFieldComponent {
     static schema(...extend) {

package/lib/mjs/formio.form.js

@@ -8,10 +8,10 @@ import Providers from './providers';
 import Widgets from './widgets';
 import Form from './Form';
 import Utils from './utils';
-import { Evaluator } from './utils/Evaluator';
 import Licenses from './licenses';
 import EventEmitter from './EventEmitter';
 import Webform from './Webform';
+import { Evaluator, registerEvaluator } from './utils';
 Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -81,7 +81,7 @@ export function registerModule(mod, defaultFn = null, options = {}) {
                 Formio.Displays.addDisplays(mod.displays);
                 break;
             case 'evaluator':
-                Formio.Evaluator.registerEvaluator(mod.evaluator);
+                registerEvaluator(mod.evaluator);
                 break;
             case 'library':
                 options.license

package/lib/mjs/i18n.js

@@ -1,5 +1,5 @@
 import enTranslation from './translations/en';
-import { fastCloneDeep } from './utils/utils';
+import { fastCloneDeep } from './utils';
 export default {
     lng: 'en',
     nsSeparator: '::',

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

@@ -1,4 +1,4 @@
-import { uniqueName } from '../../utils/utils';
+import { uniqueName } from '../../utils';
 /**
  * UploadAdapter for CKEditor https://ckeditor.com/docs/ckeditor5/latest/framework/guides/deep-dive/upload-adapter.html
  */

package/lib/mjs/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/mjs/utils/Evaluator.js

@@ -1,25 +1,24 @@
 import _ from 'lodash';
 import stringHash from 'string-hash';
-import { JSONLogicEvaluator as CoreEvaluator } from '@formio/core/utils';
-export class Evaluator extends CoreEvaluator {
-    static cache = {};
-    static protectedEval = false;
-    static noeval = false;
-    static template(template, hash) {
+import { DefaultEvaluator as CoreEvaluator } from '@formio/core';
+export class DefaultEvaluator extends CoreEvaluator {
+    cache = {};
+    protectedEval = false;
+    template(template, hash) {
         hash = hash || stringHash(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] = _.template(template, Evaluator.templateSettings));
+            return (this.cache[hash] = _.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 = _.isObject(_options) ? _options : { noeval: _options };
         if (typeof rawTemplate === 'function') {
@@ -33,11 +32,11 @@ export class Evaluator extends CoreEvaluator {
         }
         rawTemplate = String(rawTemplate);
         let template;
-        if (Evaluator.noeval || options.noeval) {
-            return CoreEvaluator.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 {
@@ -51,3 +50,12 @@ export class Evaluator extends CoreEvaluator {
         return template;
     }
 }
+export let Evaluator = new DefaultEvaluator();
+/**
+ * Set the evaluator to use for evaluating expressions.
+ * @param {CoreEvaluator} override - The new evaluator instance to use.
+ * @returns {void}
+ */
+export function registerEvaluator(override) {
+    Evaluator = override;
+}

package/lib/mjs/utils/builder.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { eachComponent, uniqueKey } from './utils';
+import { eachComponent, uniqueKey } from './index';
 export default {
     /**
      * Appends a number to a component.key to keep it unique

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

@@ -1,6 +1,6 @@
 import ConditionOperator from './ConditionOperator';
 import _ from 'lodash';
-import { compareSelectResourceWithObjectTypeValues, isSelectResourceWithObjectValue } from '../utils';
+import { compareSelectResourceWithObjectTypeValues, isSelectResourceWithObjectValue } from '../';
 export default class IsEqualTo extends ConditionOperator {
     static get operatorKey() {
         return 'isEqual';

package/lib/mjs/utils/i18n.js

@@ -1,4 +1,4 @@
-import { Evaluator } from '@formio/core/utils';
+import { Evaluator } from './Evaluator';
 import i18n from '../i18n';
 const i18Defaults = {};
 for (const lang in i18n.resources) {

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

@@ -1,3 +1,160 @@
-export { FormioUtils as Utils };
+export * from "./utils";
+export * from "./formUtils";
 export default FormioUtils;
-import * as FormioUtils from './utils';
+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;
+    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 };

package/lib/mjs/utils/index.js

@@ -1,6 +1,16 @@
-import * as FormioUtils from './utils';
+import * as utils from './utils';
+import * as formUtils from './formUtils';
+import { Evaluator, registerEvaluator } from './Evaluator';
+const FormioUtils = {
+    ...utils,
+    ...formUtils,
+    Evaluator,
+};
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
 export { FormioUtils as Utils };
+export { Evaluator, registerEvaluator };
+export * from './utils';
+export * from './formUtils';
 export default FormioUtils;

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

@@ -490,7 +490,6 @@ export function getFocusableElements(element: HTMLElement): NodeList<HTMLElement
  * @returns {Array<string>|null} - The saved types for the component
  */
 export function getComponentSavedTypes(fullSchema: import('@formio/core').Component): Array<string> | null;
-export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.
  * @param {Array<T>} collection - The collection to map through unfold.;
@@ -507,7 +506,3 @@ 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/mjs/utils/utils.js

@@ -1,31 +1,12 @@
 /* global jQuery */
 import _ from 'lodash';
-import jsonLogic from 'json-logic-js';
 import moment from 'moment-timezone/moment-timezone';
 import jtz from 'jstimezonedetect';
-import { lodashOperators } from './jsonlogic/operators';
 import dompurify from 'dompurify';
 import { getValue } from './formUtils';
 import { Evaluator } from './Evaluator';
 import ConditionOperators from './conditionOperators';
-import { convertShowToBoolean } from '@formio/core';
-const interpolate = Evaluator.interpolate;
-export * from './formUtils';
-// Configure JsonLogic
-lodashOperators.forEach((name) => jsonLogic.add_operation(`_${name}`, _[name]));
-// Retrieve Any Date
-jsonLogic.add_operation('getDate', (date) => {
-    return moment(date).toISOString();
-});
-// Set Relative Minimum Date
-jsonLogic.add_operation('relativeMinDate', (relativeMinDate) => {
-    return moment().subtract(relativeMinDate, 'days').toISOString();
-});
-// Set Relative Maximum Date
-jsonLogic.add_operation('relativeMaxDate', (relativeMaxDate) => {
-    return moment().add(relativeMaxDate, 'days').toISOString();
-});
-export { jsonLogic, ConditionOperators, moment };
+import { jsonLogic, convertShowToBoolean } from '@formio/core';
 /**
  * Evaluate a method.
  * @param {Function|string|object} func - The function to evaluate.
@@ -1311,7 +1292,6 @@ export function sanitize(string, options) {
 export function fastCloneDeep(obj) {
     return obj ? JSON.parse(JSON.stringify(obj)) : obj;
 }
-export { Evaluator, interpolate };
 /**
  * Returns if the component is an input component.
  * @param {import('@formio/core').Component} componentJson - The JSON of a component.
@@ -1513,8 +1493,6 @@ export function getFocusableElements(element) {
     textarea:not([disabled]), button:not([disabled]), [href]`;
     return element.querySelectorAll(focusableSelector);
 }
-// Export lodash to save space with other libraries.
-export { _ };
 export const componentValueTypes = {
     number: 'number',
     string: 'string',

package/lib/mjs/widgets/CalendarWidget.js

@@ -1,6 +1,6 @@
 import { Formio } from '../Formio';
 import InputWidget from './InputWidget';
-import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToMoment, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, momentDate, zonesLoaded, shouldLoadZones, loadZones, } from '../utils/utils';
+import { convertFormatToFlatpickr, convertFormatToMask, convertFormatToMoment, formatDate, formatOffset, getBrowserInfo, getDateSetting, getLocaleDateFormatInfo, momentDate, zonesLoaded, shouldLoadZones, loadZones } from '../utils';
 import moment from 'moment';
 import _ from 'lodash';
 const DEFAULT_FORMAT = 'yyyy-MM-dd hh:mm a';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.2.0-rc.3",
+  "version": "5.2.0-rc.4",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {