@formio/js 5.0.0-rc.28 → 5.0.0-rc.30

package/lib/mjs/Embed.d.ts

@@ -1,24 +1,32 @@
 export class Formio {
+    static FormioClass: null;
     static baseUrl: any;
     static projectUrl: any;
+    static pathType: any;
     static language: any;
     static config: {};
-    static cdn: null;
-    static proxy: boolean;
+    static cdn: CDN;
+    static modules: any[];
+    static icons: string;
+    static formioReady: Promise<any>;
     static version: string;
-    static setBaseUrl(url: any): Promise<void>;
-    static setProjectUrl(url: any): Promise<void>;
+    static setBaseUrl(url: any, norecurse?: boolean): void;
+    static setApiUrl(url: any, norecurse?: boolean): void;
+    static setProjectUrl(url: any, norecurse?: boolean): void;
+    static setAppUrl(url: any, norecurse?: boolean): void;
+    static setPathType(type: any, norecurse?: boolean): void;
     static debug(...args: any[]): void;
     static clearCache(): void;
-    static global(prop: any): any;
+    static global(prop: any, flag?: string): any;
+    static use(module: any): void;
     static createElement(type: any, attrs: any, children: any): any;
-    static addScript(wrapper: any, src: any, name: any): Promise<any>;
+    static addScript(wrapper: any, src: any, name: any, flag?: string): Promise<any>;
     static addStyles(wrapper: any, href: any): Promise<void>;
     static submitDone(instance: any, submission: any): Promise<void>;
     static formioScript(script: any, builder: any): any;
     static init(element: any, options?: {}, builder?: boolean): Promise<any>;
-    static createForm(element: any, form: any, options: any): Promise<any>;
-    static builder(element: any, form: any, options: any): Promise<any>;
+    static createForm(element: any, form: any, options?: {}): Promise<any>;
+    static builder(element: any, form: any, options?: {}): Promise<any>;
 }
 export namespace Formio {
     export { Form };
@@ -41,3 +49,4 @@ export class Form {
 }
 export class FormBuilder extends Form {
 }
+import CDN from './CDN.js';

package/lib/mjs/Embed.js

@@ -1,17 +1,48 @@
 import CDN from './CDN.js';
 class Formio {
+    static FormioClass = null;
     static baseUrl;
     static projectUrl;
+    static pathType;
     static language;
     static config = {};
-    static cdn = null;
-    static proxy = true;
+    static cdn = new CDN();
+    static modules = [];
+    static icons = '';
+    static formioReady = new Promise((ready, reject) => {
+        Formio._formioReady = ready;
+        Formio._formioReadyReject = reject;
+    });
     static version = 'FORMIO_VERSION';
-    static async setBaseUrl(url) {
+    static setBaseUrl(url, norecurse = false) {
         Formio.baseUrl = url;
+        if (!norecurse && Formio.FormioClass) {
+            Formio.FormioClass.setBaseUrl(url);
+        }
+    }
+    static setApiUrl(url, norecurse = false) {
+        Formio.baseUrl = url;
+        if (!norecurse && Formio.FormioClass) {
+            Formio.FormioClass.setApiUrl(url);
+        }
     }
-    static async setProjectUrl(url) {
+    static setProjectUrl(url, norecurse = false) {
         Formio.projectUrl = url;
+        if (!norecurse && Formio.FormioClass) {
+            Formio.FormioClass.setProjectUrl(url);
+        }
+    }
+    static setAppUrl(url, norecurse = false) {
+        Formio.projectUrl = url;
+        if (!norecurse && Formio.FormioClass) {
+            Formio.FormioClass.setAppUrl(url);
+        }
+    }
+    static setPathType(type, norecurse = false) {
+        Formio.pathType = type;
+        if (!norecurse && Formio.FormioClass) {
+            Formio.FormioClass.setPathType(type);
+        }
     }
     static debug(...args) {
         if (Formio.config.debug) {
@@ -23,14 +54,22 @@ class Formio {
             Formio.FormioClass.clearCache();
         }
     }
-    static global(prop) {
+    static global(prop, flag = '') {
         const globalValue = window[prop];
-        if (globalValue && globalValue.proxy) {
+        if (flag && globalValue && !globalValue[flag]) {
             return null;
         }
         Formio.debug(`Getting global ${prop}`, globalValue);
         return globalValue;
     }
+    static use(module) {
+        if (Formio.FormioClass && Formio.FormioClass.isRenderer) {
+            Formio.FormioClass.use(module);
+        }
+        else {
+            Formio.modules.push(module);
+        }
+    }
     static createElement(type, attrs, children) {
         const element = document.createElement(type);
         Object.keys(attrs).forEach(key => {
@@ -41,14 +80,14 @@ class Formio {
         });
         return element;
     }
-    static async addScript(wrapper, src, name) {
+    static async addScript(wrapper, src, name, flag = '') {
         if (!src) {
             return Promise.resolve();
         }
         if (typeof src !== 'string' && src.length) {
             return Promise.all(src.map(ref => Formio.addScript(wrapper, ref)));
         }
-        if (name && Formio.global(name)) {
+        if (name && Formio.global(name, flag)) {
             Formio.debug(`${name} already loaded.`);
             return Promise.resolve(Formio.global(name));
         }
@@ -62,7 +101,7 @@ class Formio {
         return new Promise((resolve) => {
             Formio.debug(`Waiting to load ${name}`);
             const wait = setInterval(() => {
-                if (Formio.global(name)) {
+                if (Formio.global(name, flag)) {
                     clearInterval(wait);
                     Formio.debug(`${name} loaded.`);
                     resolve(Formio.global(name));
@@ -126,7 +165,7 @@ class Formio {
     }
     // eslint-disable-next-line max-statements
     static async init(element, options = {}, builder = false) {
-        Formio.cdn = new CDN(Formio.config.cdn);
+        Formio.cdn = new CDN(Formio.config.cdn, Formio.config.cdnUrls || {});
         Formio.config.libs = Formio.config.libs || {
             uswds: {
                 fa: true,
@@ -173,10 +212,19 @@ class Formio {
                     }]
             }]));
         const renderer = Formio.config.debug ? 'formio.form' : 'formio.form.min';
-        Formio.FormioClass = await Formio.addScript(wrapper, Formio.formioScript(Formio.config.script || `${Formio.cdn.js}/${renderer}.js`, builder), 'Formio');
-        Formio.FormioClass.setBaseUrl(Formio.baseUrl || Formio.config.base);
-        Formio.FormioClass.setProjectUrl(Formio.projectUrl || Formio.config.project);
+        Formio.FormioClass = await Formio.addScript(wrapper, Formio.formioScript(Formio.config.script || `${Formio.cdn.js}/${renderer}.js`, builder), 'Formio', builder ? 'isBuilder' : 'isRenderer');
+        Formio.FormioClass.setBaseUrl(options.baseUrl || Formio.baseUrl || Formio.config.base);
+        Formio.FormioClass.setProjectUrl(options.projectUrl || Formio.projectUrl || Formio.config.project);
         Formio.FormioClass.language = Formio.language;
+        Formio.modules.forEach((module) => {
+            Formio.FormioClass.use(module);
+        });
+        if (Formio.icons) {
+            Formio.FormioClass.icons = Formio.icons;
+        }
+        if (Formio.pathType) {
+            Formio.FormioClass.setPathType(Formio.pathType);
+        }
         // Add premium modules
         if (Formio.global('premium')) {
             Formio.debug('Using premium module.');
@@ -220,9 +268,10 @@ class Formio {
             await Formio.config.before(Formio.FormioClass, element, Formio.config);
         }
         Formio.FormioClass.license = true;
+        Formio._formioReady(Formio.FormioClass);
         return wrapper;
     }
-    static async createForm(element, form, options) {
+    static async createForm(element, form, options = {}) {
         const wrapper = await Formio.init(element, options);
         return Formio.FormioClass.createForm(element, form, {
             ...options,
@@ -248,7 +297,7 @@ class Formio {
             return instance;
         });
     }
-    static async builder(element, form, options) {
+    static async builder(element, form, options = {}) {
         const wrapper = await Formio.init(element, options, true);
         return Formio.FormioClass.builder(element, form, options).then((instance) => {
             Formio.debug('Builder created', instance);

package/lib/mjs/Formio.d.ts

@@ -1,2 +1 @@
 export { Formio };
-import { Formio } from '@formio/core';

package/lib/mjs/Formio.js

@@ -1,11 +1,12 @@
-import { Formio } from '@formio/core';
+import { Formio } from '@formio/core/sdk';
+import { Formio as FormioEmbed } from './Embed';
 import CDN from './CDN';
 import Providers from './providers';
 Formio.cdn = new CDN();
 Formio.Providers = Providers;
 Formio.version = 'FORMIO_VERSION';
 const isNil = (val) => val === null || val === undefined;
-Formio.prototype.uploadFile = function (storage, file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, uploadStartCallback, abortCallback) {
+Formio.prototype.uploadFile = function (storage, file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, uploadStartCallback, abortCallback, multipartOptions) {
     const requestArgs = {
         provider: storage,
         method: 'upload',
@@ -25,7 +26,7 @@ Formio.prototype.uploadFile = function (storage, file, fileName, dir, progressCa
                     if (uploadStartCallback) {
                         uploadStartCallback();
                     }
-                    return provider.uploadFile(file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, abortCallback);
+                    return provider.uploadFile(file, fileName, dir, progressCallback, url, options, fileKey, groupPermissions, groupId, abortCallback, multipartOptions);
                 }
                 else {
                     throw ('Storage provider not found');
@@ -86,4 +87,11 @@ Formio.prototype.deleteFile = function (file, options) {
 };
 // For reverse compatability.
 Formio.Promise = Promise;
+Formio.formioReady = FormioEmbed.formioReady;
+Formio.config = FormioEmbed.config;
+Formio.builder = FormioEmbed.builder;
+Formio.Form = FormioEmbed.Form;
+Formio.FormBuilder = FormioEmbed.FormBuilder;
+Formio.use = FormioEmbed.use;
+Formio.createForm = FormioEmbed.createForm;
 export { Formio };

package/lib/mjs/Webform.d.ts

@@ -394,10 +394,9 @@ declare class Webform extends NestedDataComponent {
     get variables(): any;
 }
 declare namespace Webform {
-    const setBaseUrl: typeof Formio.setBaseUrl;
-    const setApiUrl: typeof Formio.setApiUrl;
-    const setAppUrl: typeof Formio.setAppUrl;
+    const setBaseUrl: any;
+    const setApiUrl: any;
+    const setAppUrl: any;
 }
 export default Webform;
 import NestedDataComponent from './components/_classes/nesteddata/NestedDataComponent';
-import { Formio } from './Formio';

package/lib/mjs/WebformBuilder.js

@@ -14,7 +14,7 @@ import './components/builder';
 if (typeof window !== 'undefined' && typeof window.global === 'undefined') {
     window.global = window;
 }
-import dragula from 'dragula/dist/dragula.min.js';
+import dragula from 'dragula';
 export default class WebformBuilder extends Component {
     // eslint-disable-next-line max-statements
     constructor() {
@@ -1126,8 +1126,8 @@ export default class WebformBuilder extends Component {
                     comp = component;
                 }
             });
-            const originalComp = comp.component;
-            const originalComponentSchema = comp.schema;
+            const originalComp = comp?.component;
+            const originalComponentSchema = comp?.schema;
             const isParentSaveChildMethod = this.isParentSaveChildMethod(parent.formioComponent);
             if (parentContainer && !isParentSaveChildMethod) {
                 parentContainer[index] = submissionData;

package/lib/mjs/Wizard.d.ts

@@ -89,10 +89,9 @@ declare class Wizard extends Webform {
     focusOnComponent(key: any): any;
 }
 declare namespace Wizard {
-    const setBaseUrl: typeof Formio.setBaseUrl;
-    const setApiUrl: typeof Formio.setApiUrl;
-    const setAppUrl: typeof Formio.setAppUrl;
+    const setBaseUrl: any;
+    const setApiUrl: any;
+    const setAppUrl: any;
 }
 export default Wizard;
 import Webform from './Webform';
-import { Formio } from './Formio';

package/lib/mjs/components/_classes/component/Component.d.ts

@@ -725,7 +725,7 @@ declare class Component extends Element {
      * @param {*} flags - The flags to control the behavior of the validation.
      * @returns
      */
-    validateComponent(data: any, row: any, flags?: any): any[] | Promise<any[]>;
+    validateComponent(data: any, row: any, flags?: any): any;
     /**
      * Checks the validity of this component and sets the error message if it is invalid.
      *

package/lib/mjs/components/_classes/component/Component.js

@@ -3,7 +3,7 @@ import { conformToMask } from '@formio/vanilla-text-mask';
 import tippy from 'tippy.js';
 import _ from 'lodash';
 import isMobile from 'ismobilejs';
-import { processOne, processOneSync, validateProcess, validateProcessSync } from '@formio/core';
+import { processOne, processOneSync, validateProcess, validateProcessSync } from '@formio/core/process';
 import { Formio } from '../../../Formio';
 import * as FormioUtils from '../../../utils/utils';
 import { fastCloneDeep, boolValue, getComponentPath, isInsideScopingComponent, currentTimezone } from '../../../utils/utils';

package/lib/mjs/components/_classes/nested/NestedComponent.js

@@ -3,7 +3,7 @@ import _ from 'lodash';
 import Field from '../field/Field';
 import Components from '../../Components';
 import { getArrayFromComponentPath, getStringFromComponentPath, getRandomComponentId } from '../../../utils/utils';
-import { process as processAsync, processSync } from '@formio/core';
+import { process as processAsync, processSync } from '@formio/core/process';
 export default class NestedComponent extends Field {
     static schema(...extend) {
         return Field.schema({

package/lib/mjs/components/editgrid/EditGrid.js

@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import { processSync } from '@formio/core';
+import { processSync } from '@formio/core/process';
 import { editgrid as templates } from '@formio/bootstrap/components';
 import NestedArrayComponent from '../_classes/nestedarray/NestedArrayComponent';
 import Component from '../_classes/component/Component';

package/lib/mjs/formio.form.js

@@ -17,6 +17,7 @@ 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;

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);

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/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/package.json

@@ -1,30 +1,30 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.28",
+  "version": "5.0.0-rc.30",
   "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": [
@@ -78,9 +78,9 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "^3.0.0-rc.13",
+    "@formio/bootstrap": "^3.0.0-rc.15",
     "@formio/choices.js": "^10.2.0",
-    "@formio/core": "^1.3.0-rc.19",
+    "@formio/core": "^1.3.0-rc.23",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "autocompleter": "^8.0.4",