@formio/js 5.1.0-dev.5936.81a1533 → 5.1.0-dev.5939.f5aa9d6

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

@@ -26,8 +26,8 @@ export const getBestMatch: typeof Utils.getBestMatch;
 export const getComponentFromPath: typeof Utils.getComponentFromPath;
 export const getComponentValue: typeof Utils.getComponentValue;
 export const findComponents: typeof Utils.findComponents;
-export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => Promise<void>;
-export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => void;
+export const eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => Promise<void>;
+export const eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => void;
 export const getComponentKey: typeof Utils.getComponentKey;
 export const getContextualRowPath: typeof Utils.getContextualRowPath;
 export const getContextualRowData: typeof Utils.getContextualRowData;

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

@@ -37,8 +37,8 @@ declare const FormioUtils: {
     getComponentFromPath: typeof import("@formio/core/lib/utils/formUtil").getComponentFromPath;
     getComponentValue: typeof import("@formio/core/lib/utils/formUtil").getComponentValue;
     findComponents: typeof import("@formio/core/lib/utils/formUtil").findComponents;
-    eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => Promise<void>;
-    eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined) => void;
+    eachComponentDataAsync: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataAsyncCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => Promise<void>;
+    eachComponentData: (components: import("@formio/core").Component[], data: import("@formio/core").DataObject, fn: import("@formio/core").EachComponentDataCallback, includeAll?: boolean | undefined, local?: boolean | undefined, parent?: import("@formio/core").Component | undefined, parentPaths?: import("@formio/core").ComponentPaths | undefined, noScopeReset?: boolean | undefined) => void;
     getComponentKey: typeof import("@formio/core/lib/utils/formUtil").getComponentKey;
     getContextualRowPath: typeof import("@formio/core/lib/utils/formUtil").getContextualRowPath;
     getContextualRowData: typeof import("@formio/core/lib/utils/formUtil").getContextualRowData;

package/lib/mjs/utils/utils.js

@@ -199,7 +199,15 @@ export function checkSimpleConditional(component, condition, row, data, instance
                 return true;
             }
             const splittedConditionPath = conditionComponentPath.split('.');
-            const conditionalPaths = instance?.parent?.type === 'datagrid' || instance?.parent?.type === 'editgrid' ? [] : getConditionalPathsRecursive(splittedConditionPath, data);
+            const checkParentTypeInTree = (instance, componentType) => {
+                if (!instance?.parent) {
+                    return false;
+                }
+                return instance?.parent.type === componentType || checkParentTypeInTree(instance.parent, componentType);
+            };
+            const conditionalPaths = checkParentTypeInTree(instance, 'datagrid') || checkParentTypeInTree(instance, 'editgrid')
+                ? []
+                : getConditionalPathsRecursive(splittedConditionPath, data);
             if (conditionalPaths.length > 0) {
                 return conditionalPaths.map((path) => {
                     const value = getComponentActualValue(path, data, row);
@@ -313,7 +321,7 @@ function getRow(component, row, instance, conditional) {
     }
     const dataParent = getDataParentComponent(instance);
     if (dataParent) {
-        const parentPath = dataParent.paths?.localDataPath;
+        const parentPath = dataParent.paths?.localPath;
         const isTriggerCondtionComponentPath = condition.when || !condition.conditions
             ? condition.when?.startsWith(dataParent.paths?.localPath)
             : _.some(condition.conditions, cond => cond.component.startsWith(dataParent.paths?.localPath));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.5936.81a1533",
+  "version": "5.1.0-dev.5939.f5aa9d6",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -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.255.7fab6ff",
+    "@formio/core": "2.4.0-dev.267.2866472",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",

package/lib/cjs/i18n.d.ts

@@ -1,13 +0,0 @@
-declare namespace _default {
-    let lng: string;
-    let nsSeparator: string;
-    let keySeparator: string;
-    let pluralSeparator: string;
-    let contextSeparator: string;
-    namespace resources {
-        namespace en {
-            let translation: any;
-        }
-    }
-}
-export default _default;

package/lib/cjs/i18n.js

@@ -1,19 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const en_1 = __importDefault(require("./translations/en"));
-const utils_1 = require("./utils");
-exports.default = {
-    lng: 'en',
-    nsSeparator: '::',
-    keySeparator: '.|.',
-    pluralSeparator: '._.',
-    contextSeparator: '._.',
-    resources: {
-        en: {
-            translation: (0, utils_1.fastCloneDeep)(en_1.default)
-        }
-    }
-};

package/lib/cjs/utils/i18n.d.ts

@@ -1,19 +0,0 @@
-/**
- * This file is used to mimic the i18n library interface.
- */
-export class I18n {
-    static languages: {};
-    static setDefaultTranslations(languages: any): void;
-    static init(languages?: {}): I18n;
-    static createInstance(): I18n;
-    constructor(languages?: {});
-    languages: any;
-    defaultKeys: any;
-    language: string;
-    currentLanguage: any;
-    setLanguages(languages: any, noDefaultOverride: any): void;
-    dir(lang?: string): "rtl" | "ltr";
-    changeLanguage(language: any, ready?: null): void;
-    addResourceBundle(language: any, type: any, strings: any): void;
-    t(text: any, ...args: any[]): any;
-}

package/lib/cjs/utils/i18n.js

@@ -1,120 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.I18n = void 0;
-const Evaluator_1 = require("./Evaluator");
-const i18n_1 = __importDefault(require("../i18n"));
-const lodash_1 = require("lodash");
-const core_1 = require("@formio/core");
-const i18Defaults = {};
-for (const lang in i18n_1.default.resources) {
-    if (i18n_1.default.resources.hasOwnProperty(lang)) {
-        i18Defaults[lang] = i18n_1.default.resources[lang].translation;
-    }
-}
-/**
- * This file is used to mimic the i18n library interface.
- */
-class I18n {
-    constructor(languages = {}) {
-        var _a;
-        this.languages = (0, core_1.fastCloneDeep)(I18n.languages || {});
-        this.defaultKeys = ((_a = I18n.languages) === null || _a === void 0 ? void 0 : _a.en) || {};
-        this.language = 'en';
-        this.currentLanguage = i18Defaults.en;
-        this.setLanguages(languages);
-        this.changeLanguage(this.language);
-    }
-    static setDefaultTranslations(languages) {
-        if ((0, lodash_1.isEmpty)(languages)) {
-            return;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = Object.assign(Object.assign({}, languages[lang]), this.languages[lang]);
-            }
-        }
-    }
-    setLanguages(languages, noDefaultOverride) {
-        if (languages.resources) {
-            for (const lang in languages.resources) {
-                if (languages.resources.hasOwnProperty(lang)) {
-                    languages[lang] = languages.resources[lang].translation;
-                }
-            }
-            delete languages.resources;
-        }
-        if (languages.lng) {
-            languages.language = languages.lng;
-            delete languages.lng;
-        }
-        // Do not use these configurations.
-        delete languages.nsSeparator;
-        delete languages.keySeparator;
-        delete languages.pluralSeparator;
-        delete languages.contextSeparator;
-        // Now establish the languages default.
-        if (languages.language) {
-            this.language = languages.language;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = noDefaultOverride
-                    ? Object.assign(Object.assign({}, languages[lang]), this.languages[lang]) : Object.assign(Object.assign({}, this.languages[lang]), languages[lang]);
-            }
-        }
-    }
-    static init(languages = {}) {
-        return new I18n(languages);
-    }
-    dir(lang = '') {
-        lang = lang || this.language;
-        const rtls = ['ar', 'he', 'fa', 'ps', 'ur'];
-        return rtls.includes(lang) ? 'rtl' : 'ltr';
-    }
-    static createInstance() {
-        return new I18n();
-    }
-    changeLanguage(language, ready = null) {
-        if (!this.languages[language]) {
-            language = 'en';
-        }
-        this.language = language;
-        this.currentLanguage = this.languages[language] ? this.languages[language] : {};
-        if (ready) {
-            ready();
-        }
-    }
-    addResourceBundle(language, type, strings) {
-        this.languages[language] = strings;
-    }
-    t(text, ...args) {
-        var _a;
-        let currentTranslation = this.currentLanguage[text];
-        // provide compatibility with cases where the entire phrase is used as a key
-        // get the phrase that is possibly being used as a key
-        const defaultKey = this.defaultKeys[text];
-        if (defaultKey && this.currentLanguage[defaultKey]) {
-            // get translation using the phrase as a key
-            currentTranslation = this.currentLanguage[defaultKey];
-        }
-        if (currentTranslation) {
-            const customTranslationFieldName = (_a = args[0]) === null || _a === void 0 ? void 0 : _a.field;
-            if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
-                args[0].field = this.currentLanguage[customTranslationFieldName];
-            }
-            return Evaluator_1.Evaluator.interpolateString(currentTranslation, ...args);
-        }
-        return Evaluator_1.Evaluator.interpolateString(text, ...args);
-    }
-}
-exports.I18n = I18n;
-I18n.languages = i18Defaults;

package/lib/mjs/i18n.d.ts

@@ -1,13 +0,0 @@
-declare namespace _default {
-    let lng: string;
-    let nsSeparator: string;
-    let keySeparator: string;
-    let pluralSeparator: string;
-    let contextSeparator: string;
-    namespace resources {
-        namespace en {
-            let translation: any;
-        }
-    }
-}
-export default _default;

package/lib/mjs/i18n.js

@@ -1,14 +0,0 @@
-import enTranslation from './translations/en';
-import { fastCloneDeep } from './utils';
-export default {
-    lng: 'en',
-    nsSeparator: '::',
-    keySeparator: '.|.',
-    pluralSeparator: '._.',
-    contextSeparator: '._.',
-    resources: {
-        en: {
-            translation: fastCloneDeep(enTranslation)
-        }
-    }
-};

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

@@ -1,19 +0,0 @@
-/**
- * This file is used to mimic the i18n library interface.
- */
-export class I18n {
-    static languages: {};
-    static setDefaultTranslations(languages: any): void;
-    static init(languages?: {}): I18n;
-    static createInstance(): I18n;
-    constructor(languages?: {});
-    languages: any;
-    defaultKeys: any;
-    language: string;
-    currentLanguage: any;
-    setLanguages(languages: any, noDefaultOverride: any): void;
-    dir(lang?: string): "rtl" | "ltr";
-    changeLanguage(language: any, ready?: null): void;
-    addResourceBundle(language: any, type: any, strings: any): void;
-    t(text: any, ...args: any[]): any;
-}

package/lib/mjs/utils/i18n.js

@@ -1,112 +0,0 @@
-import { Evaluator } from './Evaluator';
-import i18n from '../i18n';
-import { isEmpty } from 'lodash';
-import { fastCloneDeep } from '@formio/core';
-const i18Defaults = {};
-for (const lang in i18n.resources) {
-    if (i18n.resources.hasOwnProperty(lang)) {
-        i18Defaults[lang] = i18n.resources[lang].translation;
-    }
-}
-/**
- * This file is used to mimic the i18n library interface.
- */
-export class I18n {
-    static languages = i18Defaults;
-    languages = fastCloneDeep(I18n.languages || {});
-    defaultKeys = I18n.languages?.en || {};
-    language = 'en';
-    currentLanguage = i18Defaults.en;
-    constructor(languages = {}) {
-        this.setLanguages(languages);
-        this.changeLanguage(this.language);
-    }
-    static setDefaultTranslations(languages) {
-        if (isEmpty(languages)) {
-            return;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = { ...languages[lang], ...this.languages[lang], };
-            }
-        }
-    }
-    setLanguages(languages, noDefaultOverride) {
-        if (languages.resources) {
-            for (const lang in languages.resources) {
-                if (languages.resources.hasOwnProperty(lang)) {
-                    languages[lang] = languages.resources[lang].translation;
-                }
-            }
-            delete languages.resources;
-        }
-        if (languages.lng) {
-            languages.language = languages.lng;
-            delete languages.lng;
-        }
-        // Do not use these configurations.
-        delete languages.nsSeparator;
-        delete languages.keySeparator;
-        delete languages.pluralSeparator;
-        delete languages.contextSeparator;
-        // Now establish the languages default.
-        if (languages.language) {
-            this.language = languages.language;
-        }
-        for (const lang in languages) {
-            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
-                if (!this.languages[lang]) {
-                    this.languages[lang] = {};
-                }
-                this.languages[lang] = noDefaultOverride
-                    ? { ...languages[lang], ...this.languages[lang] }
-                    : { ...this.languages[lang], ...languages[lang] };
-            }
-        }
-    }
-    static init(languages = {}) {
-        return new I18n(languages);
-    }
-    dir(lang = '') {
-        lang = lang || this.language;
-        const rtls = ['ar', 'he', 'fa', 'ps', 'ur'];
-        return rtls.includes(lang) ? 'rtl' : 'ltr';
-    }
-    static createInstance() {
-        return new I18n();
-    }
-    changeLanguage(language, ready = null) {
-        if (!this.languages[language]) {
-            language = 'en';
-        }
-        this.language = language;
-        this.currentLanguage = this.languages[language] ? this.languages[language] : {};
-        if (ready) {
-            ready();
-        }
-    }
-    addResourceBundle(language, type, strings) {
-        this.languages[language] = strings;
-    }
-    t(text, ...args) {
-        let currentTranslation = this.currentLanguage[text];
-        // provide compatibility with cases where the entire phrase is used as a key
-        // get the phrase that is possibly being used as a key
-        const defaultKey = this.defaultKeys[text];
-        if (defaultKey && this.currentLanguage[defaultKey]) {
-            // get translation using the phrase as a key
-            currentTranslation = this.currentLanguage[defaultKey];
-        }
-        if (currentTranslation) {
-            const customTranslationFieldName = args[0]?.field;
-            if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
-                args[0].field = this.currentLanguage[customTranslationFieldName];
-            }
-            return Evaluator.interpolateString(currentTranslation, ...args);
-        }
-        return Evaluator.interpolateString(text, ...args);
-    }
-}