@formio/js 5.1.0-dev.6123.055aa35 → 5.1.0-dev.6125.181c4f5

package/lib/cjs/WebformBuilder.js

@@ -1129,11 +1129,14 @@ class WebformBuilder extends Component_1.default {
         const repeatablePaths = [];
         const keys = new Map();
         (0, utils_1.eachComponent)(this.form.components, (comp, path, components, parent, paths) => {
-            if (keys.has(paths.dataPath)) {
-                repeatablePaths.push(paths.dataPath);
-            }
-            else {
-                keys.set(paths.dataPath, true);
+            const isLayout = (0, utils_1.componentInfo)(comp).layout;
+            if (!isLayout) {
+                if (keys.has(paths.dataPath)) {
+                    repeatablePaths.push(paths.dataPath);
+                }
+                else {
+                    keys.set(paths.dataPath, true);
+                }
             }
         }, true);
         return repeatablePaths;
@@ -1147,6 +1150,9 @@ class WebformBuilder extends Component_1.default {
                 comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
                 hasInvalidComponents = true;
             }
+            else {
+                comp.setCustomValidity();
+            }
         });
         this.emit('builderFormValidityChange', hasInvalidComponents);
     }

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

@@ -11,4 +11,5 @@ export class DefaultEvaluator extends CoreEvaluator {
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
 export let Evaluator: DefaultEvaluator;
+export function interpolate(rawTemplate: any, data: any, _options: any): any;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/cjs/utils/Evaluator.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.registerEvaluator = exports.Evaluator = exports.DefaultEvaluator = void 0;
+exports.registerEvaluator = exports.interpolate = exports.Evaluator = exports.DefaultEvaluator = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const string_hash_1 = __importDefault(require("string-hash"));
 const core_1 = require("@formio/core");
@@ -61,6 +61,8 @@ class DefaultEvaluator extends core_1.DefaultEvaluator {
 }
 exports.DefaultEvaluator = DefaultEvaluator;
 exports.Evaluator = new DefaultEvaluator();
+// preserve the standalone interpolate function for backwards compatibility
+exports.interpolate = exports.Evaluator.interpolate;
 /**
  * Set the evaluator to use for evaluating expressions.
  * @param {CoreEvaluator} override - The new evaluator instance to use.

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

@@ -3,6 +3,7 @@ export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
     Evaluator: import("./Evaluator").DefaultEvaluator;
+    interpolate: (rawTemplate: any, data: any, _options: any) => any;
     flattenComponents: typeof import("@formio/core/lib/utils/formUtil").flattenComponents;
     guid: typeof import("@formio/core/lib/utils/formUtil").guid;
     uniqueName: typeof import("@formio/core/lib/utils/formUtil").uniqueName;

package/lib/cjs/utils/index.js

@@ -32,7 +32,8 @@ const formUtils = __importStar(require("./formUtils"));
 const Evaluator_1 = require("./Evaluator");
 Object.defineProperty(exports, "Evaluator", { enumerable: true, get: function () { return Evaluator_1.Evaluator; } });
 Object.defineProperty(exports, "registerEvaluator", { enumerable: true, get: function () { return Evaluator_1.registerEvaluator; } });
-const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { Evaluator: Evaluator_1.Evaluator });
+const FormioUtils = Object.assign(Object.assign(Object.assign({}, utils), formUtils), { Evaluator: Evaluator_1.Evaluator,
+    interpolate: Evaluator_1.interpolate });
 exports.Utils = FormioUtils;
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;

package/lib/mjs/WebformBuilder.js

@@ -3,7 +3,7 @@ import Component from './components/_classes/component/Component';
 import tippy from 'tippy.js';
 import Components from './components/Components';
 import { Formio } from './Formio';
-import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath, eachComponent, getComponent, } from './utils';
+import { fastCloneDeep, bootstrapVersion, getArrayFromComponentPath, getStringFromComponentPath, eachComponent, getComponent, componentInfo } from './utils';
 import BuilderUtils from './utils/builder';
 import _ from 'lodash';
 import autoScroll from 'dom-autoscroller';
@@ -1112,11 +1112,14 @@ export default class WebformBuilder extends Component {
         const repeatablePaths = [];
         const keys = new Map();
         eachComponent(this.form.components, (comp, path, components, parent, paths) => {
-            if (keys.has(paths.dataPath)) {
-                repeatablePaths.push(paths.dataPath);
-            }
-            else {
-                keys.set(paths.dataPath, true);
+            const isLayout = componentInfo(comp).layout;
+            if (!isLayout) {
+                if (keys.has(paths.dataPath)) {
+                    repeatablePaths.push(paths.dataPath);
+                }
+                else {
+                    keys.set(paths.dataPath, true);
+                }
             }
         }, true);
         return repeatablePaths;
@@ -1130,6 +1133,9 @@ export default class WebformBuilder extends Component {
                 comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
                 hasInvalidComponents = true;
             }
+            else {
+                comp.setCustomValidity();
+            }
         });
         this.emit('builderFormValidityChange', hasInvalidComponents);
     }

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

@@ -11,4 +11,5 @@ export class DefaultEvaluator extends CoreEvaluator {
     interpolate(rawTemplate: any, data: any, _options: any): any;
 }
 export let Evaluator: DefaultEvaluator;
+export function interpolate(rawTemplate: any, data: any, _options: any): any;
 import { DefaultEvaluator as CoreEvaluator } from '@formio/core';

package/lib/mjs/utils/Evaluator.js

@@ -51,6 +51,8 @@ export class DefaultEvaluator extends CoreEvaluator {
     }
 }
 export let Evaluator = new DefaultEvaluator();
+// preserve the standalone interpolate function for backwards compatibility
+export const interpolate = Evaluator.interpolate;
 /**
  * Set the evaluator to use for evaluating expressions.
  * @param {CoreEvaluator} override - The new evaluator instance to use.

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

@@ -3,6 +3,7 @@ export * from "./formUtils";
 export default FormioUtils;
 declare const FormioUtils: {
     Evaluator: import("./Evaluator").DefaultEvaluator;
+    interpolate: (rawTemplate: any, data: any, _options: any) => any;
     flattenComponents: typeof import("@formio/core/lib/utils/formUtil").flattenComponents;
     guid: typeof import("@formio/core/lib/utils/formUtil").guid;
     uniqueName: typeof import("@formio/core/lib/utils/formUtil").uniqueName;

package/lib/mjs/utils/index.js

@@ -1,10 +1,11 @@
 import * as utils from './utils';
 import * as formUtils from './formUtils';
-import { Evaluator, registerEvaluator } from './Evaluator';
+import { Evaluator, registerEvaluator, interpolate } from './Evaluator';
 const FormioUtils = {
     ...utils,
     ...formUtils,
     Evaluator,
+    interpolate
 };
 if (typeof global === 'object') {
     global.FormioUtils = FormioUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.6123.055aa35",
+  "version": "5.1.0-dev.6125.181c4f5",
   "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": "2.4.0-dev.245.326cac7",
+    "@formio/core": "v2.4.0-dev.255.7fab6ff",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
@@ -176,7 +176,8 @@
     "webpack-bundle-analyzer": "^4.10.2",
     "webpack-cli": "^5.1.1",
     "webpack-node-externals": "^3.0.0",
-    "webpack-stream": "^7.0.0"
+    "webpack-stream": "^7.0.0",
+    "zx": "^8.5.4"
   },
   "nyc": {
     "check-coverage": true,