@formio/js 5.1.0-dev.6108.401a61f → 5.1.0-dev.6112.06b0f26

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

@@ -1,4 +1,4 @@
-import { getContextButtons } from '../../../utils/utils';
+import { getContextButtons } from '../../../utils';
 export default [
     {
         key: 'recaptchaInfo',

package/lib/mjs/components/select/Select.d.ts

@@ -89,6 +89,7 @@ export default class SelectComponent extends ListComponent {
     disableInfiniteScroll(): void;
     set serverCount(value: any);
     get serverCount(): any;
+    shouldResetChoicesItems(items: any): boolean;
     setItems(items: any, fromSearch: any): void;
     selectItems: any;
     set downloadedResources(value: any);

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

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import { Formio } from '../../Formio';
 import ListComponent from '../_classes/list/ListComponent';
 import Form from '../../Form';
-import { getRandomComponentId, boolValue, isPromise, componentValueTypes, getComponentSavedTypes, isSelectResourceWithObjectValue, removeHTML } from '../../utils/utils';
+import { getRandomComponentId, boolValue, isPromise, componentValueTypes, getComponentSavedTypes, isSelectResourceWithObjectValue, removeHTML } from '../../utils';
 import Choices from '../../utils/ChoicesWrapper';
 export default class SelectComponent extends ListComponent {
     static schema(...extend) {
@@ -359,6 +359,18 @@ export default class SelectComponent extends ListComponent {
         this.downloadedResources.serverCount = this.downloadedResources.length;
         this.serverCount = this.downloadedResources.length;
     }
+    shouldResetChoicesItems(items) {
+        if (this.choices._store.choices.length !== items.length) {
+            return true;
+        }
+        for (let item of items) {
+            const choicesItem = this.choices._store.choices.find((i) => i.label === item.label);
+            if (!choicesItem) {
+                return true;
+            }
+        }
+        return false;
+    }
     /* eslint-disable max-statements */
     setItems(items, fromSearch) {
         this.selectItems = items;
@@ -444,7 +456,7 @@ export default class SelectComponent extends ListComponent {
             this.addOption(itemValueAndLabel.value, itemValueAndLabel.label, {}, _.get(item, this.component.idPath, String(index)));
         });
         if (this.choices) {
-            this.choices.setChoices(this.selectOptions, 'value', 'label', true);
+            this.choices.setChoices(this.selectOptions, 'value', 'label', true, true, !fromSearch && this.shouldResetChoicesItems(this.selectOptions));
         }
         else if (this.loading) {
             // Re-attach select input.
@@ -935,8 +947,9 @@ export default class SelectComponent extends ListComponent {
             });
         }
         // Add value options.
+        const value = this.undoValueTyping(this.dataValue);
         this.addValueOptions();
-        this.setChoicesValue(this.dataValue);
+        this.setChoicesValue(value);
         if (this.isSelectResource && this.refs.addResource) {
             this.addEventListener(this.refs.addResource, 'click', (event) => {
                 event.preventDefault();
@@ -1248,7 +1261,7 @@ export default class SelectComponent extends ListComponent {
             }
             _.set(submission.metadata.selectData, this.path, templateData);
         }
-        if (flags.resetValue && this.root?.submission && !this.options.readOnly) {
+        if (flags.resetValue && !flags.fromSubmission && this.root?.submission && !this.options.readOnly) {
             const submission = this.root.submission;
             if (!submission.metadata) {
                 submission.metadata = {};
@@ -1312,6 +1325,9 @@ export default class SelectComponent extends ListComponent {
             this.lazyLoadInit = true;
             const searchProperty = this.component.searchField || this.component.valueProperty;
             this.triggerUpdate(_.get(value.data || value, searchProperty, value), true);
+            this.itemsLoaded.then(() => {
+                this.setChoicesValue(value, hasPreviousValue, flags);
+            });
             return changed;
         }
         // Add the value options.

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

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { eachComponent } from '../../../utils/utils';
+import { eachComponent } from '../../../utils';
 const calculateSingleSelectData = (context, defaultValue) => {
     const { instance, data } = context;
     const rawDefaultValue = instance.downloadedResources.find(resource => _.get(resource, data.valueProperty) === defaultValue);

package/lib/mjs/components/selectboxes/SelectBoxes.d.ts

@@ -8,6 +8,12 @@ export default class SelectBoxesComponent extends RadioComponent {
      * @returns {boolean} - If the value is empty.
      */
     isEmpty(value?: any): boolean;
+    /**
+     * Normalize values coming into updateValue.
+     * @param {any} value - The value to normalize.
+     * @returns {*} - The normalized value
+     */
+    normalizeValue(value: any): any;
     setInputsDisabled(value: any, onlyUnchecked: any): void;
     checkComponentValidity(data: any, dirty: any, rowData: any, options: any, errors?: any[]): boolean;
 }

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

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { componentValueTypes, getComponentSavedTypes, boolValue, getComponent } from '../../utils/utils';
+import { componentValueTypes, getComponentSavedTypes, boolValue, getComponent } from '../../utils';
 import RadioComponent from '../radio/Radio';
 export default class SelectBoxesComponent extends RadioComponent {
     static schema(...extend) {

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

@@ -1,7 +1,7 @@
 import SignaturePad from 'signature_pad';
 import Input from '../_classes/input/Input';
 import _ from 'lodash';
-import { componentValueTypes, getComponentSavedTypes } from '../../utils/utils';
+import { componentValueTypes, getComponentSavedTypes } from '../../utils';
 export default class SignatureComponent extends Input {
     static schema(...extend) {
         return Input.schema({

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 '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({
@@ -58,8 +58,8 @@ export default class TextAreaComponent extends TextFieldComponent {
         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"
@@ -188,7 +188,12 @@ export default class TextAreaComponent extends TextFieldComponent {
                                 const editorHeight = (numRows * 31) + 14;
                                 editor.ui.view.editable.editableElement.style.height = `${(editorHeight)}px`;
                             }
-                            editor.isReadOnly = isReadOnly;
+                            if (isReadOnly) {
+                                editor.enableReadOnlyMode(this.id);
+                            }
+                            else {
+                                editor.disableReadOnlyMode(this.id);
+                            }
                             editor.data.set(value);
                         }
                         editorReady(editor);

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) {
@@ -114,7 +114,12 @@ export default class TextFieldComponent extends Input {
         // If no value is provided, then set the defaultValue.
         if (!value.value) {
             const defaultValue = flags.noDefault ? this.emptyValue : this.defaultValue;
-            value.value = Array.isArray(defaultValue) ? defaultValue[0] : defaultValue;
+            if (Array.isArray(defaultValue)) {
+                value.value = _.isObject(defaultValue[0]) ? defaultValue[0].value : defaultValue;
+            }
+            else {
+                value.value = _.isObject(defaultValue) ? defaultValue.value : defaultValue;
+            }
         }
         return value;
     }

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,11 +8,11 @@ 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 { I18n } from './utils/i18n';
+import { I18n } from '@formio/core';
+import { Evaluator, registerEvaluator } from './utils';
 Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name = 'externalModules') => {
     Formio.requireLibrary(name, name, path, true)
         .then((modules) => {
@@ -83,7 +83,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 'translations':
                 I18n.setDefaultTranslations(mod.translations);

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/translations/en.d.ts

@@ -1,233 +1,2 @@
-declare const _default: {
-    unsavedRowsError: string;
-    invalidRowsError: string;
-    invalidRowError: string;
-    invalidOption: string;
-    invalidDay: string;
-    complete: string;
-    error: string;
-    errorListHotkey: string;
-    errorsListNavigationMessage: string;
-    submitError: string;
-    required: string;
-    unique: string;
-    array: string;
-    array_nonempty: string;
-    nonarray: string;
-    select: string;
-    pattern: string;
-    minLength: string;
-    maxLength: string;
-    minWords: string;
-    maxWords: string;
-    min: string;
-    max: string;
-    maxDate: string;
-    minDate: string;
-    maxYear: string;
-    minYear: string;
-    minSelectedCount: string;
-    maxSelectedCount: string;
-    invalid_email: string;
-    invalid_url: string;
-    invalid_regex: string;
-    invalid_date: string;
-    invalid_day: string;
-    invalidValueProperty: string;
-    mask: string;
-    valueIsNotAvailable: string;
-    stripe: string;
-    month: string;
-    day: string;
-    year: string;
-    january: string;
-    february: string;
-    march: string;
-    april: string;
-    may: string;
-    june: string;
-    july: string;
-    august: string;
-    september: string;
-    october: string;
-    november: string;
-    december: string;
-    next: string;
-    previous: string;
-    cancel: string;
-    submit: string;
-    confirmCancel: string;
-    saveDraftInstanceError: string;
-    saveDraftAuthError: string;
-    restoreDraftInstanceError: string;
-    saveDraftError: string;
-    restoreDraftError: string;
-    time: string;
-    cancelButtonAriaLabel: string;
-    previousButtonAriaLabel: string;
-    nextButtonAriaLabel: string;
-    submitButtonAriaLabel: string;
-    reCaptchaTokenValidationError: string;
-    reCaptchaTokenNotSpecifiedError: string;
-    apiKey: string;
-    typeRemaining: string;
-    typeCount: string;
-    requiredDayField: string;
-    requiredDayEmpty: string;
-    requiredMonthField: string;
-    requiredYearField: string;
-    formNotReady: string;
-    noFormElement: string;
-    notUniqueKey: string;
-    newFormSchema: string;
-    missingUrl: string;
-    urlNotAttachedToBtn: string;
-    loadingProjectSettingsError: string;
-    sessionStorageSupportError: string;
-    builderUniqueError: string;
-    pageNotFound: string;
-    noDragInfoError: string;
-    addonSupportTypeError: string;
-    setPathError: string;
-    calculatedPathDeprecation: string;
-    unknownTemplate: string;
-    unknownComponent: string;
-    renderTemplateFunctionDeprecation: string;
-    whenReadyDeprecation: string;
-    loadResourcesError: string;
-    noSelectDataConfiguration: string;
-    indexedDBSupportError: string;
-    caretPositionSavingError: string;
-    iteratableRowsError: string;
-    checkRowDeprecation: string;
-    noOAuthBtn: string;
-    noOAuthConfiguration: string;
-    oAuthErrorsTitle: string;
-    noOAuthFormUrl: string;
-    oAuthStateError: string;
-    componentInvalidRowValidation: string;
-    videoPlayerNotFound: string;
-    synchronizationFailed: string;
-    fileWithDuplicatedNameInProgress: string;
-    fileWithDuplicatedNameLoaded: string;
-    nestedForm: string;
-    noDataProvided: string;
-    subformSubmissionLoadingError: string;
-    noDelimiterSet: string;
-    noSiteKey: string;
-    failedToNormalize: string;
-    failedToCompareItems: string;
-    editorFocusError: string;
-    quillImageUploadFailed: string;
-    noFilesSelected: string;
-    needConfigurationForQuill: string;
-    waitPdfConverting: string;
-    uploading: string;
-    pasteBelow: string;
-    copy: string;
-    move: string;
-    edit: string;
-    editJson: string;
-    remove: string;
-    clickToSetValue: string;
-    words: string;
-    characters: string;
-    addAnother: string;
-    yes: string;
-    no: string;
-    wantToClearData: string;
-    yesDelete: string;
-    waitFileProcessing: string;
-    wrongFileType: string;
-    fileTooSmall: string;
-    fileTooBig: string;
-    noFileService: string;
-    fileProcessingFailed: string;
-    readyForUpload: string;
-    readyForRemovingFromStorage: string;
-    preparingFileToRemove: string;
-    succefullyRemoved: string;
-    succefullyUploaded: string;
-    maxSelectItems: string;
-    minSelectItems: string;
-    clickToSign: string;
-    surveyQuestion: string;
-    surveyQuestionValue: string;
-    success: string;
-    noResultsFound: string;
-    noChoices: string;
-    typeToSearch: string;
-    loading: string;
-    help: string;
-    component: string;
-    save: string;
-    preview: string;
-    dragAndDropComponent: string;
-    searchFields: string;
-    noMatchesFound: string;
-    fileName: string;
-    size: string;
-    type: string;
-    gallery: string;
-    camera: string;
-    dropFilesToAttach: string;
-    useCamera: string;
-    browse: string;
-    takePicture: string;
-    switchToFileUpload: string;
-    completeStatus: string;
-    noStorageSet: string;
-    noFileApiSupport: string;
-    noFormDataSupport: string;
-    noProgressSupport: string;
-    close: string;
-    addResource: string;
-    autocomplete: string;
-    showPreview: string;
-    hidePreview: string;
-    createPage: string;
-    page: string;
-    closeBtnDescription: string;
-    cancelBtnDescription: string;
-    saveBtnDescription: string;
-    addOrRemove: string;
-    anyFileTypesAllowed: string;
-    allowedFileTypes: string;
-    syncing: string;
-    syncNow: string;
-    pressToOpen: string;
-    browseToAttachFileFor: string;
-    or: string;
-    numericOnly: string;
-    uploadPdfFile: string;
-    dropToStart: string;
-    expand: string;
-    collapse: string;
-    add: string;
-    delete: string;
-    revert: string;
-    removeBtnPressToRemove: string;
-    file: string;
-    captureVideo: string;
-    captureAudio: string;
-    captureImage: string;
-    browseFiles: string;
-    noComponentsSetInGrid: string;
-    sortAscending: string;
-    sortDescending: string;
-    filter: string;
-    clear: string;
-    showItemsWithValue: string;
-    gridItemsPerPage: string;
-    gridAllItems: string;
-    recordsSelectedOnPage: string;
-    recordsSelectedInTable: string;
-    gridSelectAll: string;
-    itemsInTable: string;
-    clearSelection: string;
-    editGridRow: string;
-    deleteGridRow: string;
-    selected: string;
-    actions: string;
-};
+declare const _default: any;
 export default _default;

package/lib/mjs/translations/en.js

@@ -1,59 +1,26 @@
 import bootstrap from '@formio/bootstrap';
+import { coreEnTranslation } from '@formio/core';
+import _ from 'lodash';
 export default {
     ...(bootstrap?.translations?.en || {}),
+    // these keys contain a '-' to strip whitespace in core
+    // which is not handled correctly in the renderer, so we redefine them
+    ..._.omit(coreEnTranslation, ['maxDate', 'minDate']),
     unsavedRowsError: 'Please save all rows before proceeding.',
     invalidRowsError: 'Please correct invalid rows before proceeding.',
     invalidRowError: 'Invalid row. Please correct it or delete.',
     invalidOption: '{{field}} is an invalid value.',
     invalidDay: '{{field}} is not a valid day.',
+    alertMessageWithLabel: '{{label}}: {{message}}',
+    alertMessage: '{{message}}',
     complete: 'Submission Complete',
     error: 'Please fix the following errors before submitting.',
     errorListHotkey: 'Press Ctrl + Alt + X to go back to the error list.',
     errorsListNavigationMessage: 'Click to navigate to the field with following error.',
     submitError: 'Please check the form and correct all errors before submitting.',
-    required: '{{field}} is required',
-    unique: '{{field}} must be unique',
-    array: '{{field}} must be an array',
-    array_nonempty: '{{field}} must be a non-empty array', // eslint-disable-line camelcase
-    nonarray: '{{field}} must not be an array',
-    select: '{{field}} contains an invalid selection',
-    pattern: '{{field}} does not match the pattern {{pattern}}',
-    minLength: '{{field}} must have at least {{length}} characters.',
-    maxLength: '{{field}} must have no more than {{length}} characters.',
-    minWords: '{{field}} must have at least {{length}} words.',
-    maxWords: '{{field}} must have no more than {{length}} words.',
-    min: '{{field}} cannot be less than {{min}}.',
-    max: '{{field}} cannot be greater than {{max}}.',
     maxDate: '{{field}} should not contain date after {{maxDate}}',
     minDate: '{{field}} should not contain date before {{minDate}}',
-    maxYear: '{{field}} should not contain year greater than {{maxYear}}',
-    minYear: '{{field}} should not contain year less than {{minYear}}',
-    minSelectedCount: 'You must select at least {{minCount}} items',
-    maxSelectedCount: 'You may only select up to {{maxCount}} items',
-    invalid_email: '{{field}} must be a valid email.', // eslint-disable-line camelcase
-    invalid_url: '{{field}} must be a valid url.', // eslint-disable-line camelcase
-    invalid_regex: '{{field}} does not match the pattern {{regex}}.', // eslint-disable-line camelcase
-    invalid_date: '{{field}} is not a valid date.', // eslint-disable-line camelcase
-    invalid_day: '{{field}} is not a valid day.', // eslint-disable-line camelcase
-    invalidValueProperty: 'Invalid Value Property',
-    mask: '{{field}} does not match the mask.',
-    valueIsNotAvailable: '{{ field }} is an invalid value.',
     stripe: '{{stripe}}',
-    month: 'Month',
-    day: 'Day',
-    year: 'Year',
-    january: 'January',
-    february: 'February',
-    march: 'March',
-    april: 'April',
-    may: 'May',
-    june: 'June',
-    july: 'July',
-    august: 'August',
-    september: 'September',
-    october: 'October',
-    november: 'November',
-    december: 'December',
     next: 'Next',
     previous: 'Previous',
     cancel: 'Cancel',
@@ -72,12 +39,10 @@ export default {
     reCaptchaTokenValidationError: 'ReCAPTCHA: Token validation error',
     reCaptchaTokenNotSpecifiedError: 'ReCAPTCHA: Token is not specified in submission',
     apiKey: 'API Key is not unique: {{key}}',
+    apiKeyNotValid: 'API Key is not valid: {{key}}',
     typeRemaining: '{{ remaining }} {{ type }} remaining.',
     typeCount: '{{ count }} {{ type }}',
-    requiredDayField: '{{ field }} is required',
     requiredDayEmpty: '{{ field }} is required',
-    requiredMonthField: '{{ field }} is required',
-    requiredYearField: '{{ field }} is required',
     formNotReady: 'Form not ready. Use form.ready promise',
     noFormElement: 'No DOM element for form.',
     notUniqueKey: 'API Key is not unique',
@@ -137,8 +102,6 @@ export default {
     words: 'words',
     characters: 'characters',
     addAnother: 'Add Another',
-    yes: 'Yes',
-    no: 'No',
     wantToClearData: 'Do you want to clear data?',
     yesDelete: 'Yes, delete it',
     waitFileProcessing: 'Processing file. Please wait...',
@@ -155,8 +118,6 @@ export default {
     maxSelectItems: 'You may only select up to {{maxCount}} items',
     minSelectItems: 'You must select at least {{minCount}} items',
     clickToSign: 'Click to Sign',
-    surveyQuestion: 'Question',
-    surveyQuestionValue: 'Value',
     success: 'Success',
     noResultsFound: 'No results found',
     noChoices: 'No choices to choose from',

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

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

package/lib/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,22 @@ export class Evaluator extends CoreEvaluator {
         return template;
     }
 }
+export let Evaluator = new DefaultEvaluator();
+// preserve the standalone interpolate function for backwards compatibility
+/**
+ * For backwards compatibility we a standalone interpolate function. This merely calls the
+ * global mutable Evaluator instance's interpolate function.
+ * @param  {...any} args - interpolate arguments, typically "rawTemplate", "data", and "options"
+ * @returns {any} the interpolation result.
+ */
+export function interpolate(...args) {
+    return Evaluator.interpolate(...args);
+}
+/**
+ * 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;
+}