@verbb/formie-browser 1.0.13 → 1.0.15

package/dist/chunks/{api-BUb6P-xu.js → api-BK9b340y.js}

@@ -1,8 +1,8 @@
 import { a as e } from "./event-names-BCI2FLD8.js";
 import { t } from "./debug-BV0DvdHx.js";
-import { t as n } from "./theme-classes-Tv7q7ToE.js";
-import { i as r } from "./i18n-BY1ds1BL.js";
-import { n as i, t as a } from "./async-nPFRNQ06.js";
+import { t as n } from "./theme-classes-DAQuEqdP.js";
+import { n as r, t as i } from "./async-2GdXNFCE.js";
+import { i as a } from "./i18n-BY1ds1BL.js";
 //#region src/js/modules/captchas/constants.ts
 var o = 2e3, s = 5e3, c = 5e3, l = 12e4;
 //#endregion
@@ -38,13 +38,13 @@ function m(e, t, { value: n = "", container: r } = {}) {
 }
 async function h(e, t, n) {
 	if (f(e, t)) return !0;
-	let r = Date.now() + Math.max(n, 0);
-	for (; Date.now() < r;) if (await i(120), f(e, t)) return !0;
+	let i = Date.now() + Math.max(n, 0);
+	for (; Date.now() < i;) if (await r(120), f(e, t)) return !0;
 	return !1;
 }
 //#endregion
 //#region src/js/modules/captchas/host.ts
-var g = new Set([
+var g = /* @__PURE__ */ new Set([
 	"handle",
 	"placeholderSelector",
 	"errorMessage",
@@ -54,7 +54,7 @@ var g = new Set([
 	"formie:page:navigate",
 	"formie:page:navigate:after",
 	"formie:submit:result"
-], y = new Set(["formie:page:navigate", "formie:page:navigate:after"]);
+], y = /* @__PURE__ */ new Set(["formie:page:navigate", "formie:page:navigate:after"]);
 function b(e, t, n) {
 	return e.addEventListener(t, n), () => {
 		e.removeEventListener(t, n);
@@ -98,14 +98,14 @@ function O(e, t) {
 	return !n || typeof n != "object" ? null : n;
 }
 function k(e, t, n, r) {
-	let i = /* @__PURE__ */ new Set(), o = () => {
-		let a = x(e, t), o = new Set(a.filter((e) => S(e)));
-		a.forEach((e) => {
-			o.has(e) && !i.has(e) && (i.add(e), n(e));
-		}), Array.from(i).forEach((e) => {
-			o.has(e) || (i.delete(e), r(e));
+	let a = /* @__PURE__ */ new Set(), o = () => {
+		let i = x(e, t), o = new Set(i.filter((e) => S(e)));
+		i.forEach((e) => {
+			o.has(e) && !a.has(e) && (a.add(e), n(e));
+		}), Array.from(a).forEach((e) => {
+			o.has(e) || (a.delete(e), r(e));
 		});
-	}, s = a(o, 20), c = new MutationObserver(() => {
+	}, s = i(o, 20), c = new MutationObserver(() => {
 		s();
 	});
 	c.observe(e, {
@@ -133,9 +133,9 @@ function k(e, t, n, r) {
 		cleanup: () => {
 			c.disconnect(), l.forEach((e) => {
 				e();
-			}), Array.from(i).forEach((e) => {
+			}), Array.from(a).forEach((e) => {
 				r(e);
-			}), i.clear();
+			}), a.clear();
 		},
 		reconcile: s,
 		reconcileImmediate: o,
@@ -145,8 +145,8 @@ function k(e, t, n, r) {
 function A(e, t) {
 	return (typeof t.handle == "string" && t.handle.trim() !== "" ? t.handle.trim() : "") || e;
 }
-function j(e, t, { defaultPlaceholderSelector: n, defaultTokenFieldNames: i = [], defaultWaitForValueMs: a = o }) {
-	let s = t || {}, c = Object.entries(s).reduce((e, [t, n]) => (g.has(t) || (e[t] = n), e), {}), l = i.map(String).filter(Boolean), u = Number(a), d = typeof s.placeholderSelector == "string" && s.placeholderSelector.trim() !== "" ? s.placeholderSelector.trim() : n, f = typeof s.errorMessage == "string" && s.errorMessage.trim() !== "" ? s.errorMessage.trim() : r("Captcha challenge must be completed."), p = typeof s.sessionKey == "string" && s.sessionKey.trim() !== "" ? s.sessionKey.trim() : null, m = typeof s.value == "string" ? s.value : null;
+function j(e, t, { defaultPlaceholderSelector: n, defaultTokenFieldNames: r = [], defaultWaitForValueMs: i = o }) {
+	let s = t || {}, c = Object.entries(s).reduce((e, [t, n]) => (g.has(t) || (e[t] = n), e), {}), l = r.map(String).filter(Boolean), u = Number(i), d = typeof s.placeholderSelector == "string" && s.placeholderSelector.trim() !== "" ? s.placeholderSelector.trim() : n, f = typeof s.errorMessage == "string" && s.errorMessage.trim() !== "" ? s.errorMessage.trim() : a("Captcha challenge must be completed."), p = typeof s.sessionKey == "string" && s.sessionKey.trim() !== "" ? s.sessionKey.trim() : null, m = typeof s.value == "string" ? s.value : null;
 	return {
 		handle: A(e, s),
 		ui: {
@@ -155,7 +155,7 @@ function j(e, t, { defaultPlaceholderSelector: n, defaultTokenFieldNames: i = []
 		},
 		transport: {
 			tokenFieldNames: l,
-			waitForValueMs: Number.isFinite(u) ? u : a,
+			waitForValueMs: Number.isFinite(u) ? u : i,
 			sessionKey: p,
 			value: m
 		},
@@ -225,13 +225,15 @@ function M(e, t) {
 //#endregion
 //#region src/js/modules/captchas/factories.ts
 var N = t("captchas");
-function P({ id: e, defaultPlaceholderSelector: t, defaultTokenFieldNames: n = [], defaultWaitForValueMs: r = o, setup: i }) {
+function P({ moduleId: e, defaultPlaceholderSelector: t, defaultTokenFieldNames: n = [], defaultWaitForValueMs: r = o, setup: i }) {
 	return {
-		id: e,
+		moduleId: e,
+		version: 2,
+		surfaces: ["server-rendered", "client-rendered"],
 		kind: "captcha",
 		match: () => !0,
 		setup: async (a) => {
-			let o = j(e, a.options || {}, {
+			let o = j(e.split(":")[1], a.options || {}, {
 				defaultPlaceholderSelector: t,
 				defaultTokenFieldNames: n,
 				defaultWaitForValueMs: r
@@ -241,24 +243,40 @@ function P({ id: e, defaultPlaceholderSelector: t, defaultTokenFieldNames: n = [
 				placeholderSelector: o.ui.placeholderSelector,
 				tokenFieldNames: o.transport.tokenFieldNames
 			});
-			let s = M(a, o);
-			return i({
+			let s;
+			if (a.surface === "client-rendered" && !a.root.querySelector(o.ui.placeholderSelector)) {
+				let e = /^\[(data-[a-z0-9-]+)\]$/.exec(o.ui.placeholderSelector)?.[1];
+				if (!e) throw Error("The CAPTCHA needs a supported placeholder in the client-rendered form.");
+				s = document.createElement("div"), s.setAttribute(e, ""), (a.form ?? a.root).append(s);
+			}
+			let c = M(a, o), l = await i({
 				...a,
 				options: o,
-				services: s
+				services: c
 			});
+			if (!l) {
+				s?.remove();
+				return;
+			}
+			let u = l.destroy;
+			return {
+				...l,
+				destroy: async () => {
+					await u(), s?.remove();
+				}
+			};
 		}
 	};
 }
-function F({ id: e, defaultPlaceholderSelector: t, defaultTokenFieldNames: n = [], defaultWaitForValueMs: r = o }) {
+function F({ moduleId: e, defaultPlaceholderSelector: t, defaultTokenFieldNames: n = [], defaultWaitForValueMs: r = o }) {
 	return P({
-		id: e,
+		moduleId: e,
 		defaultPlaceholderSelector: t,
 		defaultTokenFieldNames: n,
 		defaultWaitForValueMs: r,
 		setup: async ({ services: t, options: n, root: r }) => {
 			let i = [], a = t.placeholder.getPrimary(), o = n.transport.sessionKey, s = n.transport.value || "", c = (e) => {
-				!e || !o || (e.innerHTML = "", m(e, o, {
+				e && o && (e.innerHTML = "", m(e, o, {
 					value: s,
 					container: e
 				}));
@@ -277,8 +295,8 @@ function F({ id: e, defaultPlaceholderSelector: t, defaultTokenFieldNames: n = [
 						e();
 					});
 				},
-				onBeforeStage: async (i) => {
-					if (i.stage !== "screen" || i.action !== "submit") return;
+				beforeSubmit: async (i) => {
+					if (i.action !== "submit") return;
 					let s = o ? [o] : n.transport.tokenFieldNames;
 					if (s.length !== 0 && !await h(r, s, n.transport.waitForValueMs)) {
 						let n = t.errors.getDefaultMessage();
@@ -294,17 +312,17 @@ function F({ id: e, defaultPlaceholderSelector: t, defaultTokenFieldNames: n = [
 }
 function I(t) {
 	return P({
-		id: t.id,
+		moduleId: t.moduleId,
 		defaultPlaceholderSelector: t.defaultPlaceholderSelector,
 		defaultTokenFieldNames: t.defaultTokenFieldNames,
 		setup: async (n) => {
-			let r = [], i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = n.services.placeholder.getPrimary(), s = !1, c = null, l = async () => (c ||= (N.log("Loading captcha provider API.", { moduleId: t.id }), t.load(n)), c), u = async (e) => {
+			let r = [], i = /* @__PURE__ */ new Map(), a = /* @__PURE__ */ new Map(), o = n.services.placeholder.getPrimary(), s = !1, c, l = null, u = async () => (l ||= (N.log("Loading captcha provider API.", { moduleId: t.moduleId }), t.load(n)), l), d = async (e) => {
 				let r = i.get(e);
 				if (n.services.errors.clear(e), !r) {
 					e.innerHTML = "";
 					return;
 				}
-				let a = await l();
+				let a = await u();
 				t.unmount && await t.unmount({
 					api: a,
 					widget: r,
@@ -312,11 +330,12 @@ function I(t) {
 					services: n.services,
 					options: n.options,
 					provider: n.options.provider
-				}), i.delete(e), e.innerHTML = "", n.services.tokens.clear(), N.log("Unmounted captcha placeholder widget.", { moduleId: t.id }), o === e && (o = n.services.placeholder.getPrimary());
-			}, d = async (e) => {
-				if (s || i.has(e) || a.has(e)) return;
+				}), i.delete(e), e.innerHTML = "", n.services.tokens.clear(), N.log("Unmounted captcha placeholder widget.", { moduleId: t.moduleId }), o === e && (o = n.services.placeholder.getPrimary());
+			}, f = async (e) => {
+				if (s || i.has(e)) return;
+				if (a.has(e)) return a.get(e);
 				let r = (async () => {
-					let r = await l();
+					let r = await u();
 					if (s || i.has(e)) return;
 					let a = n.services.placeholder.createContainer(e), c = await t.mount({
 						api: r,
@@ -326,25 +345,27 @@ function I(t) {
 						options: n.options,
 						provider: n.options.provider
 					});
-					i.set(e, c), o = e, N.log("Mounted captcha placeholder widget.", { moduleId: t.id });
+					i.set(e, c), o = e, N.log("Mounted captcha placeholder widget.", { moduleId: t.moduleId });
 				})().finally(() => {
 					a.delete(e);
 				});
 				a.set(e, r), await r;
-			}, f = n.services.placeholder.observe((e) => {
-				o = e, d(e);
+			}, p = n.services.placeholder.observe((e) => {
+				o = e, f(e).catch((e) => {
+					c = e;
+				});
 			}, (e) => {
-				u(e);
+				d(e);
 			});
-			r.push(f.cleanup);
-			let p = async (e) => {
-				let r = f.getVisible();
+			r.push(p.cleanup);
+			let m = async (e) => {
+				let r = p.getVisible();
 				if (t.reset) {
-					let a = await l();
+					let a = await u();
 					for (let o of r) {
 						let r = i.get(o);
 						if (!r) {
-							await d(o);
+							await f(o);
 							continue;
 						}
 						await t.reset({
@@ -357,42 +378,51 @@ function I(t) {
 							reason: e
 						}), n.services.tokens.clear(), n.services.errors.clear(o);
 					}
-					f.reconcile();
+					p.reconcile();
 					return;
 				}
-				for (let e of Array.from(i.keys())) await u(e);
-				for (let e of r) await d(e);
-				f.reconcile();
+				for (let e of Array.from(i.keys())) await d(e);
+				for (let e of r) await f(e);
+				p.reconcile();
 			};
-			return r.push(n.services.events.onRoot("formie:submit:result", (e) => {
+			r.push(n.services.events.onRoot("formie:submit:result", (e) => {
 				let t = e instanceof CustomEvent ? e.detail : null;
-				t?.stage !== "validate" && (t?.ok === !1 && t?.stage === "screen" || t?.ok !== !0 && p("submit-result"));
+				t?.stage !== "validate" && (t?.ok !== !1 || t?.stage !== "challenge") && t?.ok !== !0 && m("submit-result");
 			})), n.form && r.push(n.services.events.onForm(e("reset"), () => {
 				o = n.services.placeholder.getPrimary() || o, window.setTimeout(() => {
-					p("reset-state");
+					m("reset-state");
 				}, 0);
-			})), {
+			})), p.reconcileImmediate();
+			try {
+				if (await Promise.all([...a.values()]), c) throw c;
+			} catch (e) {
+				throw s = !0, r.forEach((e) => e()), e;
+			}
+			return {
+				assertReady: () => {
+					if (c) throw c;
+				},
 				destroy: async () => {
 					s = !0, r.forEach((e) => {
 						e();
 					});
-					for (let e of Array.from(i.keys())) await u(e);
+					for (let e of Array.from(i.keys())) await d(e);
 				},
-				onBeforeStage: async (e) => {
-					if (e.stage !== "screen" || e.action !== "submit") return;
-					f.reconcileImmediate();
-					let r = f.getVisible();
+				beforeSubmit: async (e) => {
+					if (e.action !== "submit") return;
+					p.reconcileImmediate();
+					let r = p.getVisible();
 					if (r.length === 0) return;
 					let a = r.find((e) => e === o) || r[0];
-					await d(a), a = o || a, n.services.errors.clear(a);
+					await f(a), a = o || a, n.services.errors.clear(a);
 					let s = i.get(a);
 					if (!s) {
 						let r = n.services.errors.getDefaultMessage();
-						n.services.errors.show(r, a), N.warn("Captcha widget unavailable at screen stage.", { moduleId: t.id }), e.abort(r);
+						n.services.errors.show(r, a), N.warn("Captcha widget unavailable at challenge stage.", { moduleId: t.moduleId }), e.abort(r);
 						return;
 					}
-					let c = await l();
-					await t.screen({
+					let c = await u();
+					await t.challenge({
 						api: c,
 						widget: s,
 						placeholder: a,