@formio/js 5.0.0-dev.5799.552d965 → 5.0.0-dev.5800.896e9df

package/lib/cjs/components/_classes/multivalue/Multivalue.d.ts

@@ -2,11 +2,11 @@ export default class Multivalue extends Field {
     /**
      * Normalize values coming into updateValue.
      * @param {*} value - The value to normalize before setting.
-     * @param {Object} flags - Flags to use when normalizing the value.
+     * @param {object} flags - Flags to use when normalizing the value.
      * @param {*} emptyValue - The empty value for the field.
      * @returns {*} - The normalized value.
      */
-    normalizeValue(value: any, flags?: Object, emptyValue?: any): any;
+    normalizeValue(value: any, flags?: object, emptyValue?: any): any;
     get addAnother(): string;
     /**
      * @returns {Field} - The created field.

package/lib/cjs/components/_classes/multivalue/Multivalue.js

@@ -5,23 +5,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const Field_1 = __importDefault(require("../field/Field"));
 const lodash_1 = __importDefault(require("lodash"));
+const core_1 = require("@formio/core");
 class Multivalue extends Field_1.default {
     /**
      * Normalize values coming into updateValue.
      * @param {*} value - The value to normalize before setting.
-     * @param {Object} flags - Flags to use when normalizing the value.
+     * @param {object} flags - Flags to use when normalizing the value.
      * @param {*} emptyValue - The empty value for the field.
      * @returns {*} - The normalized value.
      */
     normalizeValue(value, flags = {}, emptyValue = this.emptyValue) {
+        const underlyingValueShouldBeArray = core_1.Utils.getModelType(this.component) === 'array' || this.component.storeas === 'array' || Array.isArray(emptyValue);
         if (this.component.multiple) {
             if (Array.isArray(value)) {
+                if (underlyingValueShouldBeArray) {
+                    if (value.length === 0 || !Array.isArray(value[0])) {
+                        return [value];
+                    }
+                }
                 if (value.length === 0) {
                     return [emptyValue];
                 }
-                if (this.component.storeas === 'array') {
-                    return super.normalizeValue([value], flags);
-                }
                 return super.normalizeValue(value, flags);
             }
             else {
@@ -29,7 +33,7 @@ class Multivalue extends Field_1.default {
             }
         }
         else {
-            if (Array.isArray(value) && !Array.isArray(emptyValue)) {
+            if (Array.isArray(value) && !underlyingValueShouldBeArray) {
                 if (this.component.storeas === 'string') {
                     return super.normalizeValue(value.join(this.delimiter || ''), flags);
                 }

package/lib/cjs/components/day/Day.js

@@ -561,7 +561,7 @@ class DayComponent extends Field_1.default {
     }
     isPartialDay(value) {
         if (!value) {
-            return false;
+            return true;
         }
         const [DAY, MONTH, YEAR] = this.component.dayFirst ? [0, 1, 2] : [1, 0, 2];
         const values = value.split('/');

package/lib/cjs/components/select/Select.js

@@ -1487,7 +1487,7 @@ class SelectComponent extends ListComponent_1.default {
                 if (Array.isArray(data)) {
                     data.forEach((item) => item[valueProperty] = item[valueProperty].toString());
                 }
-                else if (lodash_1.default.isObject(data)) {
+                else {
                     data[valueProperty] = data[valueProperty].toString();
                 }
                 return data;
@@ -1522,7 +1522,7 @@ class SelectComponent extends ListComponent_1.default {
             };
             value = (this.component.multiple && Array.isArray(value))
                 ? lodash_1.default.filter(items, (item) => value.includes(item.value))
-                : (valueProperty && items)
+                : valueProperty
                     ? (_a = getFromValues()) !== null && _a !== void 0 ? _a : { value, label: value }
                     : value;
         }

package/lib/cjs/components/select/fixtures/index.d.ts

@@ -23,6 +23,5 @@ import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './comp25';
 import comp26 from './comp26';
-import comp27 from './comp27';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26, comp27 };
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26 };
 export { multiSelect, multiSelectOptions } from "./comp3";

package/lib/cjs/components/select/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp27 = exports.comp26 = exports.comp25 = exports.comp24 = exports.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
+exports.comp26 = exports.comp25 = exports.comp24 = exports.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -57,5 +57,3 @@ const comp25_1 = __importDefault(require("./comp25"));
 exports.comp25 = comp25_1.default;
 const comp26_1 = __importDefault(require("./comp26"));
 exports.comp26 = comp26_1.default;
-const comp27_1 = __importDefault(require("./comp27"));
-exports.comp27 = comp27_1.default;

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

@@ -8,11 +8,10 @@ export function findComponents(components: import('@formio/core').Component[], q
 export const flattenComponents: typeof Utils.flattenComponents;
 export const guid: typeof Utils.guid;
 export const uniqueName: typeof Utils.uniqueName;
-export const MODEL_TYPES: Record<string, string[]>;
+export const MODEL_TYPES: any;
 export const getModelType: typeof Utils.getModelType;
 export const getComponentAbsolutePath: typeof Utils.getComponentAbsolutePath;
 export const getComponentPath: typeof Utils.getComponentPath;
-export const isComponentModelType: typeof Utils.isComponentModelType;
 export const isComponentNestedDataType: typeof Utils.isComponentNestedDataType;
 export const componentPath: typeof Utils.componentPath;
 export const componentChildPath: any;

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.isComponentModelType = exports.getComponentPath = exports.getComponentAbsolutePath = exports.getModelType = exports.MODEL_TYPES = exports.uniqueName = exports.guid = exports.flattenComponents = exports.findComponents = void 0;
+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, isComponentModelType, 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 } = core_1.Utils;
 exports.flattenComponents = flattenComponents;
 exports.guid = guid;
 exports.uniqueName = uniqueName;
@@ -10,7 +10,6 @@ exports.MODEL_TYPES = MODEL_TYPES;
 exports.getModelType = getModelType;
 exports.getComponentAbsolutePath = getComponentAbsolutePath;
 exports.getComponentPath = getComponentPath;
-exports.isComponentModelType = isComponentModelType;
 exports.isComponentNestedDataType = isComponentNestedDataType;
 exports.componentPath = componentPath;
 exports.componentChildPath = componentChildPath;

package/lib/mjs/components/_classes/multivalue/Multivalue.d.ts

@@ -2,11 +2,11 @@ export default class Multivalue extends Field {
     /**
      * Normalize values coming into updateValue.
      * @param {*} value - The value to normalize before setting.
-     * @param {Object} flags - Flags to use when normalizing the value.
+     * @param {object} flags - Flags to use when normalizing the value.
      * @param {*} emptyValue - The empty value for the field.
      * @returns {*} - The normalized value.
      */
-    normalizeValue(value: any, flags?: Object, emptyValue?: any): any;
+    normalizeValue(value: any, flags?: object, emptyValue?: any): any;
     get addAnother(): string;
     /**
      * @returns {Field} - The created field.

package/lib/mjs/components/_classes/multivalue/Multivalue.js

@@ -1,22 +1,26 @@
 import Field from '../field/Field';
 import _ from 'lodash';
+import { Utils } from '@formio/core';
 export default class Multivalue extends Field {
     /**
      * Normalize values coming into updateValue.
      * @param {*} value - The value to normalize before setting.
-     * @param {Object} flags - Flags to use when normalizing the value.
+     * @param {object} flags - Flags to use when normalizing the value.
      * @param {*} emptyValue - The empty value for the field.
      * @returns {*} - The normalized value.
      */
     normalizeValue(value, flags = {}, emptyValue = this.emptyValue) {
+        const underlyingValueShouldBeArray = Utils.getModelType(this.component) === 'array' || this.component.storeas === 'array' || Array.isArray(emptyValue);
         if (this.component.multiple) {
             if (Array.isArray(value)) {
+                if (underlyingValueShouldBeArray) {
+                    if (value.length === 0 || !Array.isArray(value[0])) {
+                        return [value];
+                    }
+                }
                 if (value.length === 0) {
                     return [emptyValue];
                 }
-                if (this.component.storeas === 'array') {
-                    return super.normalizeValue([value], flags);
-                }
                 return super.normalizeValue(value, flags);
             }
             else {
@@ -24,7 +28,7 @@ export default class Multivalue extends Field {
             }
         }
         else {
-            if (Array.isArray(value) && !Array.isArray(emptyValue)) {
+            if (Array.isArray(value) && !underlyingValueShouldBeArray) {
                 if (this.component.storeas === 'string') {
                     return super.normalizeValue(value.join(this.delimiter || ''), flags);
                 }

package/lib/mjs/components/day/Day.js

@@ -557,7 +557,7 @@ export default class DayComponent extends Field {
     }
     isPartialDay(value) {
         if (!value) {
-            return false;
+            return true;
         }
         const [DAY, MONTH, YEAR] = this.component.dayFirst ? [0, 1, 2] : [1, 0, 2];
         const values = value.split('/');

package/lib/mjs/components/select/Select.js

@@ -1514,7 +1514,7 @@ export default class SelectComponent extends ListComponent {
                 if (Array.isArray(data)) {
                     data.forEach((item) => item[valueProperty] = item[valueProperty].toString());
                 }
-                else if (_.isObject(data)) {
+                else {
                     data[valueProperty] = data[valueProperty].toString();
                 }
                 return data;
@@ -1549,7 +1549,7 @@ export default class SelectComponent extends ListComponent {
             };
             value = (this.component.multiple && Array.isArray(value))
                 ? _.filter(items, (item) => value.includes(item.value))
-                : (valueProperty && items)
+                : valueProperty
                     ? getFromValues() ?? { value, label: value }
                     : value;
         }

package/lib/mjs/components/select/fixtures/index.d.ts

@@ -23,6 +23,5 @@ import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './comp25';
 import comp26 from './comp26';
-import comp27 from './comp27';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26, comp27 };
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26 };
 export { multiSelect, multiSelectOptions } from "./comp3";

package/lib/mjs/components/select/fixtures/index.js

@@ -24,5 +24,4 @@ import comp23 from './comp23';
 import comp24 from './comp24';
 import comp25 from './comp25';
 import comp26 from './comp26';
-import comp27 from './comp27';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26, comp27 };
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25, comp26 };

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

@@ -8,11 +8,10 @@ export function findComponents(components: import('@formio/core').Component[], q
 export const flattenComponents: typeof Utils.flattenComponents;
 export const guid: typeof Utils.guid;
 export const uniqueName: typeof Utils.uniqueName;
-export const MODEL_TYPES: Record<string, string[]>;
+export const MODEL_TYPES: any;
 export const getModelType: typeof Utils.getModelType;
 export const getComponentAbsolutePath: typeof Utils.getComponentAbsolutePath;
 export const getComponentPath: typeof Utils.getComponentPath;
-export const isComponentModelType: typeof Utils.isComponentModelType;
 export const isComponentNestedDataType: typeof Utils.isComponentNestedDataType;
 export const componentPath: typeof Utils.componentPath;
 export const componentChildPath: any;

package/lib/mjs/utils/formUtils.js

@@ -1,5 +1,5 @@
 import { Utils } from '@formio/core';
-const { flattenComponents, guid, uniqueName, MODEL_TYPES, getModelType, getComponentAbsolutePath, getComponentPath, isComponentModelType, 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 } = 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, isComponentModelType, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5799.552d965",
+  "version": "5.0.0-dev.5800.896e9df",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   "dependencies": {
     "@formio/bootstrap": "3.0.0-dev.98.17ba6ea",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.1.0-dev.145.4491833",
+    "@formio/core": "2.1.0-dev.146.e57530c",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",

package/lib/cjs/components/select/fixtures/comp27.d.ts

@@ -1,18 +0,0 @@
-declare namespace _default {
-    let type: string;
-    let label: string;
-    let widget: string;
-    let tableView: boolean;
-    let dataSrc: string;
-    namespace data {
-        let custom: string;
-    }
-    let dataType: string;
-    let idPath: string;
-    let valueProperty: string;
-    let template: string;
-    let validateWhenHidden: boolean;
-    let key: string;
-    let input: boolean;
-}
-export default _default;

package/lib/cjs/components/select/fixtures/comp27.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    type: 'select',
-    label: 'Select',
-    widget: 'choicesjs',
-    tableView: true,
-    dataSrc: 'custom',
-    data: {
-        custom: 'values = data.dataSource;'
-    },
-    dataType: 'string',
-    idPath: 'name',
-    valueProperty: 'name',
-    template: '<span>{{ item.name }}</span>',
-    validateWhenHidden: false,
-    key: 'select',
-    input: true
-};

package/lib/mjs/components/select/fixtures/comp27.d.ts

@@ -1,18 +0,0 @@
-declare namespace _default {
-    let type: string;
-    let label: string;
-    let widget: string;
-    let tableView: boolean;
-    let dataSrc: string;
-    namespace data {
-        let custom: string;
-    }
-    let dataType: string;
-    let idPath: string;
-    let valueProperty: string;
-    let template: string;
-    let validateWhenHidden: boolean;
-    let key: string;
-    let input: boolean;
-}
-export default _default;

package/lib/mjs/components/select/fixtures/comp27.js

@@ -1,17 +0,0 @@
-export default {
-    type: 'select',
-    label: 'Select',
-    widget: 'choicesjs',
-    tableView: true,
-    dataSrc: 'custom',
-    data: {
-        custom: 'values = data.dataSource;'
-    },
-    dataType: 'string',
-    idPath: 'name',
-    valueProperty: 'name',
-    template: '<span>{{ item.name }}</span>',
-    validateWhenHidden: false,
-    key: 'select',
-    input: true
-};