@formio/js 5.0.0-rc.19 → 5.0.0-rc.20

package/lib/mjs/utils/utils.js

@@ -1,18 +1,17 @@
-/* global $ */
+/* global jQuery */
 import _ from 'lodash';
 import fetchPonyfill from 'fetch-ponyfill';
 import jsonLogic from 'json-logic-js';
 import moment from 'moment-timezone/moment-timezone';
 import jtz from 'jstimezonedetect';
 import { lodashOperators } from './jsonlogic/operators';
-import NativePromise from 'native-promise-only';
 import dompurify from 'dompurify';
 import { getValue } from './formUtils';
 import Evaluator from './Evaluator';
 import ConditionOperators from './conditionOperators';
 const interpolate = Evaluator.interpolate;
 const { fetch } = fetchPonyfill({
-    Promise: NativePromise
+    Promise: Promise
 });
 export * from './formUtils';
 // Configure JsonLogic
@@ -337,7 +336,7 @@ export function checkCondition(component, row, data, form, instance) {
  */
 export function checkTrigger(component, trigger, row, data, form, instance) {
     // If trigger is empty, don't fire it
-    if (!trigger[trigger.type]) {
+    if (!trigger || !trigger[trigger.type]) {
         return false;
     }
     switch (trigger.type) {
@@ -550,7 +549,7 @@ export function shouldLoadZones(timezone) {
 export function loadZones(url, timezone) {
     if (timezone && !shouldLoadZones(timezone)) {
         // Return non-resolving promise.
-        return new NativePromise(_.noop);
+        return new Promise(_.noop);
     }
     if (moment.zonesPromise) {
         return moment.zonesPromise;
@@ -824,7 +823,7 @@ export function getNumberDecimalLimit(component, defaultLimit) {
     }
     return decimalLimit;
 }
-export function getCurrencyAffixes({ currency = 'USD', decimalLimit, decimalSeparator, lang, }) {
+export function getCurrencyAffixes({ currency, decimalLimit, decimalSeparator, lang, }) {
     // Get the prefix and suffix from the localized string.
     let regex = `(.*)?${(100).toLocaleString(lang)}`;
     if (decimalLimit) {
@@ -833,7 +832,7 @@ export function getCurrencyAffixes({ currency = 'USD', decimalLimit, decimalSepa
     regex += '(.*)?';
     const parts = (100).toLocaleString(lang, {
         style: 'currency',
-        currency,
+        currency: currency ? currency : 'USD',
         useGrouping: true,
         maximumFractionDigits: decimalLimit || 0,
         minimumFractionDigits: decimalLimit || 0
@@ -952,8 +951,8 @@ export function bootstrapVersion(options) {
     if (options.bootstrap) {
         return options.bootstrap;
     }
-    if ((typeof $ === 'function') && (typeof $().collapse === 'function')) {
-        return parseInt($.fn.collapse.Constructor.VERSION.split('.')[0], 10);
+    if ((typeof jQuery === 'function') && (typeof jQuery().collapse === 'function')) {
+        return parseInt(jQuery.fn.collapse.Constructor.VERSION.split('.')[0], 10);
     }
     if (window.bootstrap && window.bootstrap.Collapse) {
         return parseInt(window.bootstrap.Collapse.VERSION.split('.')[0], 10);

package/lib/mjs/validator/Validator.d.ts

@@ -21,7 +21,7 @@ export class ValidationChecker {
             key: string;
             hasLabel: boolean;
             message(component: any): any;
-            check(component: any, setting: any, value: any): any;
+            check(component: any, setting: any, value: any): true | Promise<any>;
         };
         multiple: {
             key: string;
@@ -170,7 +170,35 @@ export class ValidationChecker {
         };
     };
     checkValidator(component: any, validator: any, setting: any, value: any, data: any, index: any, row: any, async: any): any;
-    validate(component: any, validatorName: any, value: any, data: any, index: any, row: any, async: any, conditionallyVisible: any, validationObj: any): any;
+    validate(component: any, validatorName: any, value: any, data: any, index: any, row: any, async: any, conditionallyVisible: any, validationObj: any): false | {
+        message: string;
+        level: string;
+        path: any;
+        context: {
+            validator: any;
+            hasLabel: any;
+            setting: any;
+            key: any;
+            label: any;
+            value: any;
+            index: any;
+            input: any;
+        };
+    } | Promise<false | {
+        message: string;
+        level: string;
+        path: any;
+        context: {
+            validator: any;
+            hasLabel: any;
+            setting: any;
+            key: any;
+            label: any;
+            value: any;
+            index: any;
+            input: any;
+        };
+    }>;
     checkComponent(component: any, data: any, row: any, includeWarnings?: boolean, async?: boolean): any;
     /**
      * Use the new validations engine to evaluate any errors.

package/lib/mjs/validator/Validator.js

@@ -1,10 +1,9 @@
 import _ from 'lodash';
 import { boolValue, getInputMask, matchInputMask, getDateSetting, escapeRegExCharacters, interpolate, convertFormatToMoment, getArrayFromComponentPath, unescapeHTML } from '../utils/utils';
 import moment from 'moment';
-import NativePromise from 'native-promise-only';
 import fetchPonyfill from 'fetch-ponyfill';
 const { fetch, Headers, Request } = fetchPonyfill({
-    Promise: NativePromise
+    Promise: Promise
 });
 import { checkInvalidDate, CALENDAR_ERROR_MESSAGES } from '../utils/calendarUtils';
 import Rules from './Rules';
@@ -69,7 +68,7 @@ class ValidationChecker {
                     if (!this.config.db) {
                         return true;
                     }
-                    return new NativePromise(resolve => {
+                    return new Promise(resolve => {
                         const form = this.config.form;
                         const submission = this.config.submission;
                         const path = `data.${component.path}`;
@@ -95,10 +94,19 @@ class ValidationChecker {
                         };
                         // Build the query
                         const query = { form: form._id };
+                        let collationOptions = {};
                         if (_.isString(value)) {
                             if (component.component.dbIndex) {
                                 addPathQueryParams(value, query, path);
                             }
+                            // These are kind of hacky but provides for a more efficient "unique" validation when the string is an email,
+                            // because we (by and large) only have to worry about ASCII and partial unicode; this way, we can use collation-
+                            // aware indexes with case insensitive email searches to make things like login and registration a whole lot faster
+                            else if (component.component.type === 'email' ||
+                                (component.component.type === 'textfield' && component.component.validate?.pattern === '[A-Za-z0-9]+')) {
+                                addPathQueryParams(value, query, path);
+                                collationOptions = { collation: { locale: 'en', strength: 2 } };
+                            }
                             else {
                                 addPathQueryParams({
                                     $regex: new RegExp(`^${escapeRegExCharacters(value)}$`),
@@ -126,8 +134,7 @@ class ValidationChecker {
                         // Only search for non-deleted items
                         query.deleted = { $eq: null };
                         query.state = 'submitted';
-                        // Try to find an existing value within the form
-                        this.config.db.findOne(query, (err, result) => {
+                        const uniqueValidationCallback = (err, result) => {
                             if (err) {
                                 return resolve(false);
                             }
@@ -144,6 +151,21 @@ class ValidationChecker {
                             else {
                                 return resolve(true);
                             }
+                        };
+                        // Try to find an existing value within the form
+                        this.config.db.findOne(query, null, collationOptions, (err, result) => {
+                            if (err && collationOptions.collation) {
+                                // presume this error comes from db compatibility, try again as regex
+                                delete query[path];
+                                addPathQueryParams({
+                                    $regex: new RegExp(`^${escapeRegExCharacters(value)}$`),
+                                    $options: 'i'
+                                }, query, path);
+                                this.config.db.findOne(query, uniqueValidationCallback);
+                            }
+                            else {
+                                return uniqueValidationCallback(err, result);
+                            }
                         });
                     }).catch(() => false);
                 }
@@ -819,7 +841,7 @@ class ValidationChecker {
             return '';
         };
         if (async) {
-            return NativePromise.resolve(resultOrPromise).then(processResult);
+            return Promise.resolve(resultOrPromise).then(processResult);
         }
         else {
             return processResult(resultOrPromise);
@@ -860,7 +882,7 @@ class ValidationChecker {
             }
         };
         if (async) {
-            return NativePromise.resolve(resultOrPromise).then(processResult);
+            return Promise.resolve(resultOrPromise).then(processResult);
         }
         else {
             return processResult(resultOrPromise);
@@ -872,7 +894,7 @@ class ValidationChecker {
             && !_.defaultTo(component.component.persistent, true);
         // If we're server-side and it's not a persistent component, don't run validation at all
         if (isServerSidePersistent || component.component.validate === false) {
-            return async ? NativePromise.resolve([]) : [];
+            return async ? Promise.resolve([]) : [];
         }
         data = data || component.rootValue;
         row = row || component.data;
@@ -993,7 +1015,7 @@ class ValidationChecker {
         };
         // Wait for results if using async mode, otherwise process and return immediately
         if (async) {
-            return NativePromise.all(resultsOrPromises).then(formatResults);
+            return Promise.all(resultsOrPromises).then(formatResults);
         }
         else {
             return formatResults(resultsOrPromises);

package/lib/mjs/validator/rules/Select.js

@@ -1,8 +1,7 @@
 import { interpolate } from '../../utils/utils';
-import NativePromise from 'native-promise-only';
 import fetchPonyfill from 'fetch-ponyfill';
 const { fetch, Headers, Request } = fetchPonyfill({
-    Promise: NativePromise
+    Promise: Promise
 });
 import _ from 'lodash';
 import Rule from './Rule';

package/lib/mjs/validator/rules/Unique.d.ts

@@ -1,5 +1,5 @@
 export default class Unique extends Rule {
     defaultMessage: string;
-    check(value: any): any;
+    check(value: any): true | Promise<any>;
 }
 import Rule from './Rule';

package/lib/mjs/validator/rules/Unique.js

@@ -1,6 +1,5 @@
 import { escapeRegExCharacters } from '../../utils/utils';
 import _ from 'lodash';
-import NativePromise from 'native-promise-only';
 import Rule from './Rule';
 export default class Unique extends Rule {
     defaultMessage = '{{field}} must be unique';
@@ -13,7 +12,7 @@ export default class Unique extends Rule {
         if (!this.config.db) {
             return true;
         }
-        return new NativePromise(resolve => {
+        return new Promise(resolve => {
             const form = this.config.form;
             const submission = this.config.submission;
             const path = `data.${this.component.path}`;

package/lib/mjs/widgets/CalendarWidget.d.ts

@@ -30,6 +30,7 @@ export default class CalendarWidget extends InputWidget {
      * @return {boolean} TRUE if the zones are loading, FALSE otherwise.
      */
     loadZones(): boolean;
+    attach(input: any): Promise<any>;
     defaultFormat: {
         date: string;
         time: string;

package/lib/mjs/widgets/InputWidget.d.ts

@@ -8,7 +8,7 @@ export default class InputWidget extends Element {
     namespace: string;
     component: any;
     settings: any;
-    attach(input: any): any;
+    attach(input: any): Promise<void>;
     _input: any;
     get defaultSettings(): {};
     set disabled(arg: any);

package/lib/mjs/widgets/InputWidget.js

@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import Element from '../Element';
-import NativePromise from 'native-promise-only';
 export default class InputWidget extends Element {
     static get defaultSettings() {
         return {
@@ -17,7 +16,7 @@ export default class InputWidget extends Element {
     }
     attach(input) {
         this._input = input;
-        return NativePromise.resolve();
+        return Promise.resolve();
     }
     get defaultSettings() {
         return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.19",
+  "version": "5.0.0-rc.20",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -33,24 +33,24 @@
     "lint"
   ],
   "scripts": {
-    "build": "npm run lib && npm run dist",
+    "build": "yarn doc && yarn lib && yarn dist",
+    "doc": "esdoc",
     "dist": "gulp clean:dist && webpack --config webpack.config.js && webpack --config webpack.prod.js && gulp build",
-    "lib": "gulp clean:lib && tsc --project tsconfig.cjs.json && tsc --project tsconfig.mjs.json && npm run lib:package",
+    "lib": "gulp clean:lib && tsc --project tsconfig.cjs.json && tsc --project tsconfig.mjs.json && yarn lib:package",
     "lib:package": "node ./libpackage.js",
-    "version": "node -e 'process.stdout.write(require(`./package.json`).version)'",
-    "build-app": "npm run build-app:create-app && npm run build-app:jekyll && npm run build-app:remove-app",
+    "version": "node -e 'console.log(require(`./package.json`).version)'",
+    "build-app": "yarn build-app:create-app && yarn build-app:jekyll && yarn build-app:remove-app",
     "build-app:create-app": "node -e 'var fs=require(`fs`);fs.writeFileSync(`./_config.app.yml`, `baseurl: /` + require(`./package.json`).version + `/`);'",
     "build-app:remove-app": "rm ./_config.app.yml",
     "build-app:jekyll": "jekyll build --config _config.yml,_config.app.yml",
     "deploy-s3": "$(node -e 'process.stdout.write(`aws s3 cp _site s3://formiojs.test-form.io/` + require(`./package.json`).version + `/ --recursive`)')",
-    "invalidate": "VERSION=$(npm run version);aws cloudfront create-invalidation --distribution-id E1MXNA5A4ZKRMZ --paths \"/$VERSION/*\"",
-    "release": "npm run build-app && npm run deploy-s3",
-    "tag": "VERSION=$(npm run version);git add -A; git commit -m \"Build $Version\";git push origin master;git tag v$VERSION;git push origin --tags;",
-    "dopublish": "npm test;gulp build;npm run tag;npm publish lib --tag=rc;",
+    "invalidate": "VERSION=$(yarn version);aws cloudfront create-invalidation --distribution-id E1MXNA5A4ZKRMZ --paths \"/$VERSION/*\"",
+    "release": "yarn build-app && yarn deploy-s3",
+    "tag": "VERSION=$(yarn version);git add -A; git commit -m \"Build $Version\";git push origin master;git tag v$VERSION;git push origin --tags;",
+    "dopublish": "npm test;gulp build;yarn tag;npm publish lib --tag=rc;",
     "lint": "gulp eslint",
     "serve": "jekyll serve --config _config.yml,_config.dev.yml",
-    "test": "npm run test:unit",
-    "test:unit": "npm run lib && mocha --require ts-node/register 'src/**/*.unit.js'",
+    "test": "mocha 'src/**/*.unit.js'",
     "test:updateRenders": "npm run lib && TZ=UTC node --require jsdom-global/register test/updateRenders.js",
     "test:e2e": "NODE_OPTIONS=\"--max-old-space-size=4096\" karma start --verbose --single-run"
   },
@@ -73,9 +73,9 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "^3.0.0-rc.6",
+    "@formio/bootstrap": "^3.0.0-rc.12",
     "@formio/choices.js": "^10.2.0",
-    "@formio/core": "1.3.0-rc.15",
+    "@formio/core": "1.3.0-rc.16",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "autocompleter": "^8.0.4",
@@ -93,7 +93,6 @@
     "fast-deep-equal": "^3.1.3",
     "fast-json-patch": "^3.1.1",
     "fetch-ponyfill": "^7.1.0",
-    "i18next": "23.2.3",
     "idb": "^7.1.1",
     "ismobilejs": "^1.1.1",
     "json-logic-js": "^2.0.2",
@@ -102,7 +101,6 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.43",
-    "native-promise-only": "^0.8.1",
     "quill": "^2.0.0-dev.3",
     "resize-observer-polyfill": "^1.5.1",
     "signature_pad": "^4.1.4",
@@ -114,6 +112,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.60.1",
     "@typescript-eslint/parser": "^5.60.1",
+    "ace-builds": "^1.4.12",
     "async-limiter": "^2.0.0",
     "bootstrap-icons": "^1.10.5",
     "bootswatch": "^5.3.0",