FIO-9783: evaluator refactor (#6102)

* refactor evaluator to be class instance based

* lint

* WIP: fix imports/exports

* update to imports/exports

* update core dependency

* increase timeout in test

* increase timeout for datagrid test

* update core dependency

* update core dependency

* fix merge conflict

* lint

Author: brendanbond

package.json

@@ -81,7 +81,7 @@
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
     "@formio/bootstrap": "v3.0.0-dev.121.085d187",
-    "@formio/core": "v2.4.0-dev.232.d91b1e4",
+    "@formio/core": "2.4.0-dev.245.326cac7",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",

src/Element.js

@@ -1,10 +1,10 @@
-import EventEmitter from './EventEmitter';
-import { Formio } from './Formio';
-import * as FormioUtils from './utils/utils';
-import { I18n } from './utils/i18n';
 import _ from 'lodash';
 import moment from 'moment';
 import maskInput from '@formio/vanilla-text-mask';
+import EventEmitter from './EventEmitter';
+import { Formio } from './Formio';
+import { I18n } from './utils/i18n';
+import FormioUtils from './utils';
 
 /**
  * The root component for all elements within the Form.io renderer.
@@ -584,9 +584,9 @@ export default class Element {
     if (this.component.filter === string && !this.options.building) {
       const evalContext = this.evalContext(data);
       evalContext.data = _.mapValues(evalContext.data, (val) => _.isString(val) ? encodeURIComponent(val) : val);
-      return FormioUtils.interpolate(string, evalContext, options);
+      return FormioUtils.Evaluator.interpolate(string, evalContext, options);
     }
-    return FormioUtils.interpolate(string, this.evalContext(data), options);
+    return FormioUtils.Evaluator.interpolate(string, this.evalContext(data), options);
   }
 
   /**

src/EventEmitter.js

@@ -1,5 +1,5 @@
 import { EventEmitter as EventEmitter3 } from 'eventemitter3';
-import * as utils from './utils/utils';
+import { observeOverload } from './utils';
 export default class EventEmitter extends EventEmitter3 {
   constructor(conf = {}) {
     const { loadLimit = 1000, eventsSafeInterval = 300 } = conf;
@@ -9,7 +9,7 @@ export default class EventEmitter extends EventEmitter3 {
       console.warn(`There were more than ${loadLimit} events emitted in ${eventsSafeInterval} ms. It might be caused by events' infinite loop`, this.id);
     };
 
-    const dispatch = utils.observeOverload(overloadHandler, {
+    const dispatch = observeOverload(overloadHandler, {
       limit: loadLimit,
       delay: eventsSafeInterval
     });

src/Form.js

@@ -2,7 +2,7 @@ import Element from './Element';
 import { Formio } from './Formio';
 import Displays from './displays';
 import templates from './templates';
-import * as FormioUtils from './utils/utils';
+import FormioUtils from './utils';
 
 export default class Form extends Element {
   /**

src/PDF.js

@@ -1,6 +1,6 @@
 import { Formio } from './Formio';
 import Webform from './Webform';
-import { fastCloneDeep, eachComponent } from './utils/utils';
+import { fastCloneDeep, eachComponent } from './utils';
 
 export default class PDF extends Webform {
   constructor(element, options) {

src/PDFBuilder.js

@@ -2,8 +2,7 @@ import _ from 'lodash';
 import { Formio } from './Formio';
 
 import WebformBuilder from './WebformBuilder';
-import { fastCloneDeep, getElementRect , getBrowserInfo } from './utils/utils';
-import { eachComponent } from './utils/formUtils';
+import { fastCloneDeep, getElementRect , getBrowserInfo, eachComponent } from './utils';
 import BuilderUtils from './utils/builder';
 import PDF from './PDF';
 

src/Webform.js

@@ -12,8 +12,9 @@ import {
     getStringFromComponentPath,
     convertStringToHTMLElement,
     getArrayFromComponentPath,
-} from './utils/utils';
-import { eachComponent } from './utils/formUtils';
+    eachComponent
+} from './utils';
+
 import dayjs from "dayjs";
 
 // We need this here because dragula pulls in CustomEvent class that requires global to exist.

src/WebformBuilder.js

@@ -3,8 +3,14 @@ import Component from './components/_classes/component/Component';
 import tippy from 'tippy.js';
 import Components from './components/Components';
 import { Formio } from './Formio';
-import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath } from './utils/utils';
-import { eachComponent, getComponent } from './utils/formUtils';
+import {
+  fastCloneDeep,
+  bootstrapVersion,
+  getArrayFromComponentPath,
+  getStringFromComponentPath,
+  eachComponent,
+  getComponent,
+} from './utils';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
 import autoScroll from 'dom-autoscroller';

src/Wizard.js

@@ -8,7 +8,7 @@ import {
   firstNonNil,
   uniqueKey,
   eachComponent,
-} from './utils/utils';
+} from './utils';
 
 export default class Wizard extends Webform {
   /**

src/WizardBuilder.js

@@ -2,7 +2,7 @@ import WebformBuilder from './WebformBuilder';
 import Webform from './Webform';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
-import { fastCloneDeep } from './utils/utils';
+import { fastCloneDeep } from './utils';
 
 export default class WizardBuilder extends WebformBuilder {
   constructor() {