@formio/js 5.0.0-rc.27 → 5.0.0-rc.29

package/lib/mjs/formio.form.d.ts

@@ -8,16 +8,10 @@ export function useModule(defaultFn?: null): (plugins: any, options?: {}) => voi
 import Components from './components/Components';
 import Displays from './displays/Displays';
 import Providers from './providers';
-import Rules from './validator/Rules';
 import Widgets from './widgets';
 import Templates from './templates/Templates';
-import Conjunctions from './validator/conjunctions';
-import Operators from './validator/operators';
-import QuickRules from './validator/quickRules';
-import Transformers from './validator/transformers';
-import ValueSources from './validator/valueSources';
 import Utils from './utils';
 import Form from './Form';
 import { Formio } from './Formio';
 import Licenses from './licenses';
-export { Components, Displays, Providers, Rules, Widgets, Templates, Conjunctions, Operators, QuickRules, Transformers, ValueSources, Utils, Form, Formio, Licenses };
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses };

package/lib/mjs/formio.form.js

@@ -5,12 +5,6 @@ import Components from './components/Components';
 import Displays from './displays/Displays';
 import Templates from './templates/Templates';
 import Providers from './providers';
-import Rules from './validator/Rules';
-import Conjunctions from './validator/conjunctions';
-import Operators from './validator/operators';
-import QuickRules from './validator/quickRules';
-import Transformers from './validator/transformers';
-import ValueSources from './validator/valueSources';
 import Widgets from './widgets';
 import Form from './Form';
 import Utils from './utils';
@@ -23,20 +17,15 @@ Formio.loadModules = (path = `${Formio.getApiUrl()}/externalModules.js`, name =
     });
 };
 // This is needed to maintain correct imports using the "dist" file.
+Formio.isRenderer = true;
 Formio.Components = Components;
 Formio.Templates = Templates;
 Formio.Utils = Utils;
 Formio.Form = Form;
 Formio.Displays = Displays;
 Formio.Providers = Providers;
-Formio.Rules = Rules;
 Formio.Widgets = Widgets;
 Formio.Evaluator = Evaluator;
-Formio.Conjunctions = Conjunctions;
-Formio.Operators = Operators;
-Formio.QuickRules = QuickRules;
-Formio.Transformers = Transformers;
-Formio.ValueSources = ValueSources;
 Formio.AllComponents = AllComponents;
 Formio.Licenses = Licenses;
 // This is strange, but is needed for "premium" components to import correctly.
@@ -85,30 +74,12 @@ export function registerModule(mod, defaultFn = null, options = {}) {
             case 'displays':
                 Formio.Displays.addDisplays(mod.displays);
                 break;
-            case 'rules':
-                Formio.Rules.addRules(mod.rules);
-                break;
             case 'evaluator':
                 Formio.Evaluator.registerEvaluator(mod.evaluator);
                 break;
-            case 'conjunctions':
-                Formio.Conjunctions.addConjunctions(mod.conjunctions);
-                break;
-            case 'operators':
-                Formio.Operators.addOperators(mod.operators);
-                break;
-            case 'quickRules':
-                Formio.QuickRules.addQuickRules(mod.quickRules);
-                break;
-            case 'transformers':
-                Formio.Transformers.addTransformers(mod.transformers);
-                break;
-            case 'valueSources':
-                Formio.ValueSources.addValueSources(mod.valueSources);
-                break;
             case 'library':
                 options.license
-                    ? Formio.Licenses.addLicense(mod.library, mod.license)
+                    ? Formio.Licenses.addLicense(mod.library, options.license)
                     : Formio.Licenses.removeLicense(mod.library);
                 break;
             default:
@@ -143,4 +114,4 @@ export function useModule(defaultFn = null) {
  */
 Formio.use = useModule();
 // Export the components.
-export { Components, Displays, Providers, Rules, Widgets, Templates, Conjunctions, Operators, QuickRules, Transformers, ValueSources, Utils, Form, Formio, Licenses };
+export { Components, Displays, Providers, Widgets, Templates, Utils, Form, Formio, Licenses };

package/lib/mjs/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./formio.form";
 import FormBuilder from './FormBuilder';
 import Builders from './builders/Builders';
-export { FormBuilder, Builders };
+import { Formio } from './formio.form';
+export { FormBuilder, Builders, Formio };

package/lib/mjs/index.js

@@ -2,6 +2,7 @@ import FormBuilder from './FormBuilder';
 import Builders from './builders/Builders';
 import { Formio, useModule } from './formio.form';
 Formio.Builders = Builders;
+Formio.isBuilder = true;
 Formio.use = useModule((key, mod) => {
     if (key === 'builders') {
         Formio.Builders.addBuilders(mod.builders);
@@ -10,4 +11,4 @@ Formio.use = useModule((key, mod) => {
     return false;
 });
 export * from './formio.form';
-export { FormBuilder, Builders };
+export { FormBuilder, Builders, Formio };

package/lib/mjs/providers/Providers.d.ts

@@ -27,7 +27,6 @@ export default class Providers {
                         type: any;
                     }>;
                     downloadFile(file: any): any;
-                    deleteFile(fileInfo: any): any;
                 };
                 title: string;
             };
@@ -50,10 +49,8 @@ export default class Providers {
                         type: any;
                         groupPermissions: any;
                         groupId: any;
-                        key: any;
                     }>;
                     downloadFile(file: any): any;
-                    deleteFile: (fileInfo: any) => any;
                 };
                 title: string;
             };
@@ -71,7 +68,6 @@ export default class Providers {
                 (formio: any): {
                     uploadFile(file: any, fileName: any, dir: any, progressCallback: any, url: any, options: any, fileKey: any, groupPermissions: any, groupId: any, abortCallback: any): Promise<any>;
                     downloadFile(file: any): Promise<any>;
-                    deleteFile: (fileInfo: any) => any;
                 };
                 title: string;
             };

package/lib/mjs/providers/storage/azure.d.ts

@@ -7,10 +7,8 @@ declare function azure(formio: any): {
         type: any;
         groupPermissions: any;
         groupId: any;
-        key: any;
     }>;
     downloadFile(file: any): any;
-    deleteFile: (fileInfo: any) => any;
 };
 declare namespace azure {
     const title: string;

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

@@ -6,7 +6,7 @@ const azure = (formio) => ({
             xhr.setRequestHeader('Content-Type', file.type);
             xhr.setRequestHeader('x-ms-blob-type', 'BlockBlob');
             return file;
-        }, file, fileName, dir, progressCallback, groupPermissions, groupId, abortCallback).then((response) => {
+        }, file, fileName, dir, progressCallback, groupPermissions, groupId, abortCallback).then(() => {
             return {
                 storage: 'azure',
                 name: XHR.path([dir, fileName]),
@@ -14,16 +14,11 @@ const azure = (formio) => ({
                 type: file.type,
                 groupPermissions,
                 groupId,
-                key: response.pathFile
             };
         });
     },
     downloadFile(file) {
         return formio.makeRequest('file', `${formio.formUrl}/storage/azure?name=${XHR.trim(file.name)}`, 'GET');
-    },
-    deleteFile: function deleteFile(fileInfo) {
-        var url = `${formio.formUrl}/storage/azure?name=${XHR.trim(fileInfo.name)}&key=${XHR.trim(fileInfo.key)}`;
-        return formio.makeRequest('', url, 'delete');
     }
 });
 azure.title = 'Azure File Services';

package/lib/mjs/providers/storage/googleDrive.d.ts

@@ -2,7 +2,6 @@ export default googledrive;
 declare function googledrive(formio: any): {
     uploadFile(file: any, fileName: any, dir: any, progressCallback: any, url: any, options: any, fileKey: any, groupPermissions: any, groupId: any, abortCallback: any): Promise<any>;
     downloadFile(file: any): Promise<any>;
-    deleteFile: (fileInfo: any) => any;
 };
 declare namespace googledrive {
     const title: string;

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

@@ -48,10 +48,6 @@ const googledrive = (formio) => ({
         file.url =
             `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}`;
         return Promise.resolve(file);
-    },
-    deleteFile: function deleteFile(fileInfo) {
-        var url = ''.concat(formio.formUrl, `/storage/gdrive?id=${fileInfo.id}&name=${fileInfo.originalName}`);
-        return formio.makeRequest('', url, 'delete');
     }
 });
 googledrive.title = 'Google Drive';

package/lib/mjs/providers/storage/s3.d.ts

@@ -11,7 +11,6 @@ declare function s3(formio: any): {
         type: any;
     }>;
     downloadFile(file: any): any;
-    deleteFile(fileInfo: any): any;
 };
 declare namespace s3 {
     const title: string;

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

@@ -38,10 +38,6 @@ const s3 = (formio) => ({
         else {
             return Promise.resolve(file);
         }
-    },
-    deleteFile(fileInfo) {
-        const url = `${formio.formUrl}/file/${XHR.trim(fileInfo.name)}?bucket=${XHR.trim(fileInfo.bucket)}&key=${XHR.trim(fileInfo.key)}`;
-        return formio.makeRequest('', url, 'delete');
     }
 });
 s3.title = 'S3';

package/lib/mjs/templates/Templates.d.ts

@@ -1,11 +1 @@
-export default class Templates {
-    static get templates(): any;
-    static addTemplate(name: any, template: any): void;
-    static extendTemplate(name: any, template: any): void;
-    static setTemplate(name: any, template: any): void;
-    static set current(arg: any);
-    static get current(): any;
-    static get defaultTemplates(): any;
-    static set framework(arg: any);
-    static get framework(): any;
-}
+export default Template;

package/lib/mjs/templates/Templates.js

@@ -1,41 +1,5 @@
-import _ from 'lodash';
 import templates from './index';
-export default class Templates {
-    static get templates() {
-        if (!Templates._templates) {
-            Templates._templates = templates;
-        }
-        return Templates._templates;
-    }
-    static addTemplate(name, template) {
-        Templates.templates[name] = template;
-    }
-    static extendTemplate(name, template) {
-        Templates.templates[name] = _.merge({}, Templates.templates[name], template);
-    }
-    static setTemplate(name, template) {
-        Templates.addTemplate(name, template);
-    }
-    static set current(templates) {
-        const defaultTemplates = Templates.current;
-        Templates._current = _.merge({}, defaultTemplates, templates);
-    }
-    static get current() {
-        if (Templates._current) {
-            return Templates._current;
-        }
-        return Templates.defaultTemplates;
-    }
-    static get defaultTemplates() {
-        return Templates.templates.hasOwnProperty('bootstrap') ? Templates.templates.bootstrap : {};
-    }
-    static set framework(framework) {
-        if (Templates.templates.hasOwnProperty(framework)) {
-            Templates._framework = framework;
-            Templates._current = Templates.templates[framework];
-        }
-    }
-    static get framework() {
-        return Templates._framework;
-    }
-}
+import { Template } from '@formio/core/template';
+Template.addTemplates(templates);
+Template.defaultTemplates = templates.bootstrap;
+export default Template;

package/lib/mjs/translations/en.d.ts

@@ -2,6 +2,8 @@ declare namespace _default {
     const unsavedRowsError: string;
     const invalidRowsError: string;
     const invalidRowError: string;
+    const invalidOption: string;
+    const invalidDay: string;
     const alertMessageWithLabel: string;
     const alertMessage: string;
     const complete: string;
@@ -26,11 +28,14 @@ declare namespace _default {
     const minDate: string;
     const maxYear: string;
     const minYear: string;
+    const minSelectedCount: string;
+    const maxSelectedCount: string;
     const invalid_email: string;
     const invalid_url: string;
     const invalid_regex: string;
     const invalid_date: string;
     const invalid_day: string;
+    const invalidValueProperty: string;
     const mask: string;
     const valueIsNotAvailable: string;
     const stripe: string;

package/lib/mjs/translations/en.js

@@ -2,6 +2,8 @@ export default {
     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',
@@ -26,11 +28,14 @@ export default {
     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.',
     invalid_url: '{{field}} must be a valid url.',
     invalid_regex: '{{field}} does not match the pattern {{regex}}.',
     invalid_date: '{{field}} is not a valid date.',
     invalid_day: '{{field}} is not a valid day.',
+    invalidValueProperty: 'Invalid Value Property',
     mask: '{{field}} does not match the mask.',
     valueIsNotAvailable: '{{ field }} is an invalid value.',
     stripe: '{{stripe}}',

package/lib/mjs/utils/formUtils.js

@@ -12,6 +12,7 @@ import chunk from 'lodash/chunk';
 import pad from 'lodash/pad';
 import { compare, applyPatch } from 'fast-json-patch';
 import _ from 'lodash';
+import { fastCloneDeep } from './utils';
 /**
  * Determine if a component is a layout component or not.
  *

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

@@ -1,2 +1,3 @@
+export { FormioUtils as Utils };
 export default FormioUtils;
 import * as FormioUtils from './utils';

package/lib/mjs/utils/index.js

@@ -2,4 +2,5 @@ import * as FormioUtils from './utils';
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;
 }
+export { FormioUtils as Utils };
 export default FormioUtils;

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

@@ -306,7 +306,7 @@ export function sanitize(string: any, options: any): any;
 export function fastCloneDeep(obj: any): any;
 export function isInputComponent(componentJson: any): any;
 export function getArrayFromComponentPath(pathStr: any): any;
-export function hasInvalidComponent(component: any): any;
+export function isChildOf(child: any, parent: any): boolean;
 export function getStringFromComponentPath(path: any): any;
 export function round(number: any, precision: any): any;
 /**
@@ -367,6 +367,7 @@ export namespace componentValueTypes {
     const date: string;
     const any: string;
 }
+export function interpolateErrors(component: any, errors: FieldError[], interpolateFn: any): [];
 import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import Evaluator from './Evaluator';

package/lib/mjs/utils/utils.js

@@ -715,8 +715,10 @@ export function convertFormatToMask(format) {
         .replace(/M{3}/g, '***')
         // Short month conversion if input as text.
         .replace(/e/g, 'Q')
+        // Month number conversion.
+        .replace(/W/g, '99')
         // Year conversion.
-        .replace(/[ydhmsHMG]/g, '9')
+        .replace(/[ydhmswHMG]/g, '9')
         // AM/PM conversion.
         .replace(/a/g, 'AA');
 }
@@ -1207,13 +1209,14 @@ export function getArrayFromComponentPath(pathStr) {
         .split('.')
         .map(part => _.defaultTo(_.toNumber(part), part));
 }
-export function hasInvalidComponent(component) {
-    return component.getComponents().some((comp) => {
-        if (_.isArray(comp.components)) {
-            return hasInvalidComponent(comp);
+export function isChildOf(child, parent) {
+    while (child && child.parent) {
+        if (child.parent === parent) {
+            return true;
         }
-        return comp.error;
-    });
+        child = child.parent;
+    }
+    return false;
 }
 export function getStringFromComponentPath(path) {
     if (!_.isArray(path)) {
@@ -1384,3 +1387,17 @@ export function getComponentSavedTypes(fullSchema) {
     }
     return null;
 }
+/**
+ * Interpolates @formio/core errors so that they are compatible with the renderer
+ * @param {FieldError[]} errors
+ * @param firstPass
+ * @returns {[]}
+ */
+export const interpolateErrors = (component, errors, interpolateFn) => {
+    return errors.map((error) => {
+        error.component = component;
+        const { errorKeyOrMessage, context } = error;
+        const toInterpolate = component.errors && component.errors[errorKeyOrMessage] ? component.errors[errorKeyOrMessage] : errorKeyOrMessage;
+        return { ...error, message: unescapeHTML(interpolateFn(toInterpolate, context)), context: { ...context } };
+    });
+};

package/package.json

@@ -1,30 +1,30 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.27",
+  "version": "5.0.0-rc.29",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
-  "module": "lib/mjs/index.js",
   "exports": {
     ".": {
-      "import": "./lib/mjs/index.js",
+      "import": "./lib/cjs/index.js",
       "require": "./lib/cjs/index.js"
     },
     "./sdk": {
-      "import": "./lib/mjs/Formio.js",
+      "import": "./lib/cjs/Formio.js",
       "require": "./lib/cjs/Formio.js"
     },
     "./utils": {
-      "import": "./lib/mjs/utils/index.js",
+      "import": "./lib/cjs/utils/index.js",
       "require": "./lib/cjs/utils/index.js"
     },
     "./form": {
-      "import": "./lib/mjs/formio.form.js",
+      "import": "./lib/cjs/formio.form.js",
       "require": "./lib/cjs/formio.form.js"
     },
     "./embed": {
-      "import": "./lib/mjs/formio.embed.js",
-      "require": "./lib/cjs/formio.embed.js"
-    }
+      "import": "./lib/cjs/Embed.js",
+      "require": "./lib/cjs/Embed.js"
+    },
+    "./dist/*": "./dist/*"
   },
   "types": "index.d.ts",
   "files": [
@@ -80,7 +80,7 @@
   "dependencies": {
     "@formio/bootstrap": "^3.0.0-rc.13",
     "@formio/choices.js": "^10.2.0",
-    "@formio/core": "1.3.0-rc.16",
+    "@formio/core": "^1.3.0-rc.21",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "autocompleter": "^8.0.4",
@@ -88,10 +88,10 @@
     "browser-cookies": "^1.2.0",
     "browser-md5-file": "^1.1.1",
     "compare-versions": "^6.0.0-rc.2",
-    "core-js": "^3.31.0",
+    "core-js": "^3.32.1",
     "dialog-polyfill": "^0.5.6",
     "dom-autoscroller": "^2.3.4",
-    "dompurify": "^3.0.3",
+    "dompurify": "^3.0.5",
     "downloadjs": "^1.4.7",
     "dragula": "^3.7.3",
     "eventemitter3": "^5.0.1",
@@ -111,7 +111,7 @@
     "string-hash": "^1.1.3",
     "tippy.js": "^6.3.7",
     "uuid": "^9.0.0",
-    "vanilla-picker": "^2.12.1"
+    "vanilla-picker": "^2.12.2"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.60.1",

package/lib/cjs/components/tree/Node.d.ts

@@ -1,55 +0,0 @@
-export default class Node {
-    constructor(parent: any, { data, children, }?: {
-        data?: {} | undefined;
-        children?: any[] | undefined;
-    }, { checkNode, createComponents, isNew, removeComponents, parentPath }?: {
-        checkNode: any;
-        createComponents: any;
-        isNew?: boolean | undefined;
-        removeComponents: any;
-        parentPath?: string | undefined;
-    });
-    parent: any;
-    previousData: {};
-    persistentData: any;
-    new: boolean;
-    createComponents: any;
-    checkNode: any;
-    removeComponents: any;
-    revertAvailable: boolean;
-    editing: boolean;
-    collapsed: boolean;
-    components: any[];
-    children: Node[];
-    parentPath: string;
-    get value(): any;
-    get isRoot(): boolean;
-    get changing(): boolean;
-    get hasChangingChildren(): any;
-    get hasData(): boolean;
-    get hasChildren(): boolean;
-    getChildrenPath(index: any): string;
-    eachChild(iteratee: any): Node;
-    getComponents(): any;
-    validateNode(): boolean;
-    addChild(): Node | null;
-    removeChild(childToRemove: any): Node;
-    edit(): Node;
-    save(): boolean;
-    cancel(): Node;
-    remove(): Node;
-    revert(): Node;
-    data: any;
-    commitData(): Node;
-    resetData(): Node;
-    updateComponentsContext(): Node;
-    instantiateComponents(): void;
-    clearComponents(): void;
-    /**
-     * Return a path of component's value.
-     *
-     * @param {Object} component - The component instance.
-     * @return {string} - The component's value path.
-     */
-    calculateComponentPath(component: Object): string;
-}