@formio/js 5.0.0-dev.5871.544083b → 5.0.0-dev.5873.124778a

package/lib/cjs/Wizard.js

@@ -916,7 +916,7 @@ class Wizard extends Webform_1.default {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {

package/lib/cjs/utils/conditionOperators/IsEqualTo.js

@@ -27,15 +27,7 @@ class IsEqualTo extends ConditionOperator_1.default {
             if (conditionTriggerComponent
                 && (0, utils_1.isSelectResourceWithObjectValue)(conditionTriggerComponent.component)
                 && ((_b = conditionTriggerComponent.component) === null || _b === void 0 ? void 0 : _b.template)) {
-                if (!value || !lodash_1.default.isPlainObject(value)) {
-                    return false;
-                }
-                const { template, valueProperty } = conditionTriggerComponent.component;
-                if (valueProperty === 'data') {
-                    value = { data: value };
-                    comparedValue = { data: comparedValue };
-                }
-                return lodash_1.default.every((0, utils_1.getItemTemplateKeys)(template) || [], k => lodash_1.default.isEqual(lodash_1.default.get(value, k), lodash_1.default.get(comparedValue, k)));
+                return (0, utils_1.compareSelectResourceWithObjectTypeValues)(value, comparedValue, conditionTriggerComponent.component);
             }
         }
         //special check for select boxes

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

@@ -41,4 +41,7 @@ export const applyFormChanges: typeof Utils.applyFormChanges;
 export const findComponent: typeof Utils.findComponent;
 export const getEmptyValue: typeof Utils.getEmptyValue;
 export const isComponentDataEmpty: typeof Utils.isComponentDataEmpty;
+export const isSelectResourceWithObjectValue: typeof Utils.isSelectResourceWithObjectValue;
+export const compareSelectResourceWithObjectTypeValues: typeof Utils.compareSelectResourceWithObjectTypeValues;
+export const getItemTemplateKeys: typeof Utils.getItemTemplateKeys;
 import { Utils } from '@formio/core';

package/lib/cjs/utils/formUtils.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isComponentDataEmpty = exports.getEmptyValue = exports.findComponent = exports.applyFormChanges = exports.generateFormChange = exports.getStrings = exports.getValue = exports.escapeRegExCharacters = exports.formatAsCurrency = exports.parseFloatExt = exports.hasCondition = exports.removeComponent = exports.searchComponents = exports.getComponent = exports.matchComponent = exports.isLayoutComponent = exports.getComponentActualValue = exports.getComponentData = exports.eachComponentAsync = exports.eachComponent = exports.componentInfo = exports.getContextualRowData = exports.getContextualRowPath = exports.getComponentKey = exports.eachComponentData = exports.eachComponentDataAsync = exports.componentChildPath = exports.componentPath = exports.isComponentNestedDataType = exports.getComponentPath = exports.getComponentAbsolutePath = exports.getModelType = exports.MODEL_TYPES = exports.uniqueName = exports.guid = exports.flattenComponents = exports.findComponents = void 0;
+exports.getItemTemplateKeys = exports.compareSelectResourceWithObjectTypeValues = exports.isSelectResourceWithObjectValue = exports.isComponentDataEmpty = exports.getEmptyValue = exports.findComponent = exports.applyFormChanges = exports.generateFormChange = exports.getStrings = exports.getValue = exports.escapeRegExCharacters = exports.formatAsCurrency = exports.parseFloatExt = exports.hasCondition = exports.removeComponent = exports.searchComponents = exports.getComponent = exports.matchComponent = exports.isLayoutComponent = exports.getComponentActualValue = exports.getComponentData = exports.eachComponentAsync = exports.eachComponent = exports.componentInfo = exports.getContextualRowData = exports.getContextualRowPath = exports.getComponentKey = exports.eachComponentData = exports.eachComponentDataAsync = exports.componentChildPath = exports.componentPath = exports.isComponentNestedDataType = exports.getComponentPath = exports.getComponentAbsolutePath = exports.getModelType = exports.MODEL_TYPES = exports.uniqueName = exports.guid = exports.flattenComponents = exports.findComponents = void 0;
 const core_1 = require("@formio/core");
-const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty } = core_1.Utils;
+const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys } = core_1.Utils;
 exports.flattenComponents = flattenComponents;
 exports.guid = guid;
 exports.uniqueName = uniqueName;
@@ -39,6 +39,9 @@ exports.applyFormChanges = applyFormChanges;
 exports.findComponent = findComponent;
 exports.getEmptyValue = getEmptyValue;
 exports.isComponentDataEmpty = isComponentDataEmpty;
+exports.isSelectResourceWithObjectValue = isSelectResourceWithObjectValue;
+exports.compareSelectResourceWithObjectTypeValues = compareSelectResourceWithObjectTypeValues;
+exports.getItemTemplateKeys = getItemTemplateKeys;
 /**
  * Deprecated version of findComponents. Renamed to searchComponents.
  * @param {import('@formio/core').Component[]} components - The components to find components within.

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

@@ -498,18 +498,6 @@ export function getFocusableElements(element: HTMLElement): NodeList<HTMLElement
  * @returns {Array<string>|null} - The saved types for the component
  */
 export function getComponentSavedTypes(fullSchema: import('@formio/core').Component): Array<string> | null;
-/**
- * Returns the template keys inside the template code.
- * @param {string} template - The template to get the keys from.
- * @returns {Array<string>} - The keys inside the template.
- */
-export function getItemTemplateKeys(template: string): Array<string>;
-/**
- * Returns if the component is a select resource with an object for its value.
- * @param {import('@formio/core').Component} comp - The component to check.
- * @returns {boolean} - TRUE if the component is a select resource with an object for its value; FALSE otherwise.
- */
-export function isSelectResourceWithObjectValue(comp?: import('@formio/core').Component): boolean;
 export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.
@@ -527,7 +515,6 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
-import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import { Evaluator } from './Evaluator';
 export const interpolate: typeof Evaluator.interpolate;

package/lib/cjs/utils/utils.js

@@ -19,7 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstNonNil = exports.unfold = exports.bootstrapVersion = exports.uniqueKey = exports.iterateKey = exports.delay = exports.fieldData = exports.getCurrencyAffixes = exports.getNumberDecimalLimit = exports.getNumberSeparators = exports.matchInputMask = exports.unmaskValue = exports.getInputMask = exports.convertFormatToMask = exports.convertFormatToMoment = exports.convertFormatToFlatpickr = exports.getLocaleDateFormatInfo = exports.formatOffset = exports.formatDate = exports.momentDate = exports.loadZones = exports.shouldLoadZones = exports.zonesLoaded = exports.offsetDate = exports.currentTimezone = exports.isValidDate = exports.getDateSetting = exports.guid = exports.uniqueName = exports.convertStringToHTMLElement = exports.unescapeHTML = exports.removeHTML = exports.setActionProperty = exports.checkTrigger = exports.checkCondition = exports.checkJsonConditional = exports.checkCustomConditional = exports.getComponentActualValue = exports.checkSimpleConditional = exports.checkCalculated = exports.isMongoId = exports.boolValue = exports.getScriptPlugin = exports.getElementRect = exports.getPropertyValue = exports.getRandomComponentId = exports.evaluate = exports.moment = exports.ConditionOperators = exports.jsonLogic = void 0;
-exports.isSelectResourceWithObjectValue = exports.getItemTemplateKeys = exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
+exports.interpolateErrors = exports.getComponentSavedTypes = exports.componentValueTypes = exports._ = exports.getFocusableElements = exports.isInsideScopingComponent = exports.isPromise = exports.getDataParentComponent = exports.getComponentPath = exports.getComponentPathWithoutIndicies = exports.getBrowserInfo = exports.getIEBrowserVersion = exports.round = exports.getStringFromComponentPath = exports.isChildOf = exports.getArrayFromComponentPath = exports.isInputComponent = exports.interpolate = exports.Evaluator = exports.fastCloneDeep = exports.sanitize = exports.translateHTMLTemplate = exports.getContextButtons = exports.getContextComponents = exports.observeOverload = exports.withSwitch = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports._ = lodash_1.default;
 const json_logic_js_1 = __importDefault(require("json-logic-js"));
@@ -1681,35 +1681,3 @@ const interpolateErrors = (component, errors, interpolateFn) => {
     });
 };
 exports.interpolateErrors = interpolateErrors;
-/**
- * Returns the template keys inside the template code.
- * @param {string} template - The template to get the keys from.
- * @returns {Array<string>} - The keys inside the template.
- */
-function getItemTemplateKeys(template) {
-    const templateKeys = [];
-    if (!template) {
-        return templateKeys;
-    }
-    const keys = template.match(/({{\s*(.*?)\s*}})/g);
-    if (keys) {
-        keys.forEach((key) => {
-            const propKey = key.match(/{{\s*item\.(.*?)\s*}}/);
-            if (propKey && propKey.length > 1) {
-                templateKeys.push(propKey[1]);
-            }
-        });
-    }
-    return templateKeys;
-}
-exports.getItemTemplateKeys = getItemTemplateKeys;
-/**
- * Returns if the component is a select resource with an object for its value.
- * @param {import('@formio/core').Component} comp - The component to check.
- * @returns {boolean} - TRUE if the component is a select resource with an object for its value; FALSE otherwise.
- */
-function isSelectResourceWithObjectValue(comp = {}) {
-    const { reference, dataSrc, valueProperty } = comp;
-    return reference || (dataSrc === 'resource' && (!valueProperty || valueProperty === 'data'));
-}
-exports.isSelectResourceWithObjectValue = isSelectResourceWithObjectValue;

package/lib/mjs/Wizard.js

@@ -903,7 +903,7 @@ export default class Wizard extends Webform {
         const components = !currentPageOnly || this.isLastPage()
             ? this.getComponents()
             : this.currentPage.components;
-        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, childErrors) && check, true);
+        return components.reduce((check, comp) => comp.checkValidity(data, dirty, row, currentPageOnly, childErrors) && check, true);
     }
     get errors() {
         if (!this.isLastPage()) {

package/lib/mjs/utils/conditionOperators/IsEqualTo.js

@@ -1,6 +1,6 @@
 import ConditionOperator from './ConditionOperator';
 import _ from 'lodash';
-import { getItemTemplateKeys, isSelectResourceWithObjectValue } from '../utils';
+import { compareSelectResourceWithObjectTypeValues, isSelectResourceWithObjectValue } from '../utils';
 export default class IsEqualTo extends ConditionOperator {
     static get operatorKey() {
         return 'isEqual';
@@ -21,15 +21,7 @@ export default class IsEqualTo extends ConditionOperator {
             if (conditionTriggerComponent
                 && isSelectResourceWithObjectValue(conditionTriggerComponent.component)
                 && conditionTriggerComponent.component?.template) {
-                if (!value || !_.isPlainObject(value)) {
-                    return false;
-                }
-                const { template, valueProperty } = conditionTriggerComponent.component;
-                if (valueProperty === 'data') {
-                    value = { data: value };
-                    comparedValue = { data: comparedValue };
-                }
-                return _.every(getItemTemplateKeys(template) || [], k => _.isEqual(_.get(value, k), _.get(comparedValue, k)));
+                return compareSelectResourceWithObjectTypeValues(value, comparedValue, conditionTriggerComponent.component);
             }
         }
         //special check for select boxes

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

@@ -41,4 +41,7 @@ export const applyFormChanges: typeof Utils.applyFormChanges;
 export const findComponent: typeof Utils.findComponent;
 export const getEmptyValue: typeof Utils.getEmptyValue;
 export const isComponentDataEmpty: typeof Utils.isComponentDataEmpty;
+export const isSelectResourceWithObjectValue: typeof Utils.isSelectResourceWithObjectValue;
+export const compareSelectResourceWithObjectTypeValues: typeof Utils.compareSelectResourceWithObjectTypeValues;
+export const getItemTemplateKeys: typeof Utils.getItemTemplateKeys;
 import { Utils } from '@formio/core';

package/lib/mjs/utils/formUtils.js

@@ -1,5 +1,5 @@
 import { Utils } from '@formio/core';
-const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty } = Utils;
+const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys } = Utils;
 /**
  * Deprecated version of findComponents. Renamed to searchComponents.
  * @param {import('@formio/core').Component[]} components - The components to find components within.
@@ -10,4 +10,4 @@ export function findComponents(components, query) {
     console.warn('formio.js/utils findComponents is deprecated. Use searchComponents instead.');
     return searchComponents(components, query);
 }
-export { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty };
+export { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentNestedDataType, componentPath, componentChildPath, eachComponentDataAsync, eachComponentData, getComponentKey, getContextualRowPath, getContextualRowData, componentInfo, eachComponent, eachComponentAsync, getComponentData, getComponentActualValue, isLayoutComponent, matchComponent, getComponent, searchComponents, removeComponent, hasCondition, parseFloatExt, formatAsCurrency, escapeRegExCharacters, getValue, getStrings, generateFormChange, applyFormChanges, findComponent, getEmptyValue, isComponentDataEmpty, isSelectResourceWithObjectValue, compareSelectResourceWithObjectTypeValues, getItemTemplateKeys };

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

@@ -498,18 +498,6 @@ export function getFocusableElements(element: HTMLElement): NodeList<HTMLElement
  * @returns {Array<string>|null} - The saved types for the component
  */
 export function getComponentSavedTypes(fullSchema: import('@formio/core').Component): Array<string> | null;
-/**
- * Returns the template keys inside the template code.
- * @param {string} template - The template to get the keys from.
- * @returns {Array<string>} - The keys inside the template.
- */
-export function getItemTemplateKeys(template: string): Array<string>;
-/**
- * Returns if the component is a select resource with an object for its value.
- * @param {import('@formio/core').Component} comp - The component to check.
- * @returns {boolean} - TRUE if the component is a select resource with an object for its value; FALSE otherwise.
- */
-export function isSelectResourceWithObjectValue(comp?: import('@formio/core').Component): boolean;
 export * from "./formUtils";
 /**
  * Map values through unfold and return first non-nil value.
@@ -527,7 +515,6 @@ export namespace componentValueTypes {
     let any: string;
 }
 export function interpolateErrors(component: Component, errors: FieldError[], interpolateFn: Function): [];
-import jsonLogic from 'json-logic-js';
 import ConditionOperators from './conditionOperators';
 import { Evaluator } from './Evaluator';
 export const interpolate: typeof Evaluator.interpolate;

package/lib/mjs/utils/utils.js

@@ -1587,33 +1587,3 @@ export const interpolateErrors = (component, errors, interpolateFn) => {
         return { ...error, message: unescapeHTML(interpolateFn(toInterpolate, context)), context: { ...context } };
     });
 };
-/**
- * Returns the template keys inside the template code.
- * @param {string} template - The template to get the keys from.
- * @returns {Array<string>} - The keys inside the template.
- */
-export function getItemTemplateKeys(template) {
-    const templateKeys = [];
-    if (!template) {
-        return templateKeys;
-    }
-    const keys = template.match(/({{\s*(.*?)\s*}})/g);
-    if (keys) {
-        keys.forEach((key) => {
-            const propKey = key.match(/{{\s*item\.(.*?)\s*}}/);
-            if (propKey && propKey.length > 1) {
-                templateKeys.push(propKey[1]);
-            }
-        });
-    }
-    return templateKeys;
-}
-/**
- * Returns if the component is a select resource with an object for its value.
- * @param {import('@formio/core').Component} comp - The component to check.
- * @returns {boolean} - TRUE if the component is a select resource with an object for its value; FALSE otherwise.
- */
-export function isSelectResourceWithObjectValue(comp = {}) {
-    const { reference, dataSrc, valueProperty } = comp;
-    return reference || (dataSrc === 'resource' && (!valueProperty || valueProperty === 'data'));
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5871.544083b",
+  "version": "5.0.0-dev.5873.124778a",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -82,7 +82,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-dev.98.17ba6ea",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.3.0-dev.160.cabaa43",
+    "@formio/core": "v2.1.0-dev.174.9a3c6ec",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",