@10x-media/form-builder 0.1.0-beta.4 → 0.1.0-beta.5

package/dist/poll/resolvePollOutcome.d.ts

@@ -3,19 +3,32 @@ import { Payload, PayloadRequest } from "payload";
 //#region src/poll/resolvePollOutcome.d.ts
 type ResolvePollOutcomeArgs = {
   payload: Payload;
-  formId: number | string; /** A stable option value, matching one of the poll's choice values (the host's contract with `PollOption.value`). */
-  winningValue: string;
+  formId: number | string;
+  /**
+   * The winning set: stable option values, each matching one of the poll's choice values (the
+   * host's contract with `PollOption.value`). Pass more than one for a tie, an empty array to clear
+   * the outcome. Omit to auto-resolve via the poll's selected outcome strategy (`poll.type`).
+   */
+  winningValues?: string[];
   req?: PayloadRequest;
 };
 /**
- * Record a poll's final outcome from host domain logic (e.g. after the race is decided): writes
- * `poll.outcome.winningValue` and stamps `resolvedAt` with the current time. The outcome fields are
- * admin read-only with field-level `update: () => false`, so this server-side call (with
- * `overrideAccess`) is the only write path. Throws when the form does not exist or is not
- * poll-enabled. `<Poll>` treats a present `winningValue` as the final state and highlights the
- * matching result bucket.
+ * Record a poll's final outcome server-side, in one of two modes:
+ * - explicit: pass `winningValues` when host code already knows the winner(s); more than one is a
+ *   tie, and an empty array clears the outcome;
+ * - auto: omit it and the poll's selected outcome strategy (`poll.type`, from the `poll.types`
+ *   registry, defaulting to `manual`) resolves the winners. `manual` is a no-op; `mostVoted` reads
+ *   the aggregated results field; `source` delegates to the option source. A strategy that is not
+ *   yet decidable (or `manual`) writes nothing and this returns an empty set, so auto mode is safe
+ *   to call repeatedly from the close job and the read fallback.
+ *
+ * Every write runs through `payload.update` with `overrideAccess`, so the forms collection hook
+ * validates each value against the poll's effective options and owns the `poll.outcome.resolvedAt`
+ * stamp in both modes (auto-resolved winners are validated exactly as hand-picked ones). Throws only
+ * when the form does not exist or is not poll-enabled. Returns the recorded winning set (empty when
+ * auto mode did not decide).
  */
-declare const resolvePollOutcome: (args: ResolvePollOutcomeArgs) => Promise<void>;
+declare const resolvePollOutcome: (args: ResolvePollOutcomeArgs) => Promise<string[]>;
 //#endregion
 export { ResolvePollOutcomeArgs, resolvePollOutcome };
 //# sourceMappingURL=resolvePollOutcome.d.ts.map

package/dist/poll/resolvePollOutcome.js

@@ -1,34 +1,74 @@
 import { pollConfigOf } from "../form/pollState.js";
+import { aggregateFieldResponses } from "../aggregation/aggregateResponses.js";
+import { pollTypesOf } from "./pollTypeRegistry.js";
 import { FORMS_SLUG } from "../collections/forms.js";
 //#region src/poll/resolvePollOutcome.ts
+/** A strategy result narrowed to a deduped set of non-empty strings. */
+const cleanWinners = (value) => value === void 0 ? [] : [...new Set(value.filter((entry) => typeof entry === "string" && entry.length > 0))];
 /**
-* Record a poll's final outcome from host domain logic (e.g. after the race is decided): writes
-* `poll.outcome.winningValue` and stamps `resolvedAt` with the current time. The outcome fields are
-* admin read-only with field-level `update: () => false`, so this server-side call (with
-* `overrideAccess`) is the only write path. Throws when the form does not exist or is not
-* poll-enabled. `<Poll>` treats a present `winningValue` as the final state and highlights the
-* matching result bucket.
+* Record a poll's final outcome server-side, in one of two modes:
+* - explicit: pass `winningValues` when host code already knows the winner(s); more than one is a
+*   tie, and an empty array clears the outcome;
+* - auto: omit it and the poll's selected outcome strategy (`poll.type`, from the `poll.types`
+*   registry, defaulting to `manual`) resolves the winners. `manual` is a no-op; `mostVoted` reads
+*   the aggregated results field; `source` delegates to the option source. A strategy that is not
+*   yet decidable (or `manual`) writes nothing and this returns an empty set, so auto mode is safe
+*   to call repeatedly from the close job and the read fallback.
+*
+* Every write runs through `payload.update` with `overrideAccess`, so the forms collection hook
+* validates each value against the poll's effective options and owns the `poll.outcome.resolvedAt`
+* stamp in both modes (auto-resolved winners are validated exactly as hand-picked ones). Throws only
+* when the form does not exist or is not poll-enabled. Returns the recorded winning set (empty when
+* auto mode did not decide).
 */
 const resolvePollOutcome = async (args) => {
-	const { payload, formId, winningValue, req } = args;
-	if (pollConfigOf((await payload.findByID({
-		collection: "forms",
+	const { payload, formId, req } = args;
+	const form = await payload.findByID({
+		collection: FORMS_SLUG,
 		id: formId,
 		depth: 0,
 		overrideAccess: true,
 		req
-	})).poll)?.enabled !== true) throw new Error(`Form ${String(formId)} is not poll-enabled; cannot record an outcome.`);
+	});
+	const poll = pollConfigOf(form.poll);
+	if (form.pollEnabled !== true || !poll) throw new Error(`Form ${String(formId)} is not poll-enabled; cannot record an outcome.`);
+	let winningValues;
+	if (args.winningValues !== void 0) winningValues = args.winningValues;
+	else {
+		const strategyType = typeof poll.type === "string" && poll.type.length > 0 ? poll.type : "manual";
+		const strategy = pollTypesOf(payload).get(strategyType);
+		if (!strategy) return [];
+		let aggregated;
+		const aggregate = async () => {
+			if (aggregated === void 0) {
+				const resultsField = typeof poll.resultsField === "string" && poll.resultsField.length > 0 ? poll.resultsField : void 0;
+				aggregated = resultsField ? await aggregateFieldResponses({
+					payload,
+					formId,
+					field: resultsField,
+					req
+				}) : null;
+			}
+			return aggregated;
+		};
+		winningValues = cleanWinners(await strategy.resolveOutcome({
+			payload,
+			req,
+			form,
+			poll,
+			aggregate
+		}));
+		if (winningValues.length === 0) return [];
+	}
 	await payload.update({
 		collection: FORMS_SLUG,
 		id: formId,
-		data: { poll: { outcome: {
-			winningValue,
-			resolvedAt: (/* @__PURE__ */ new Date()).toISOString()
-		} } },
+		data: { poll: { outcome: { winningValues } } },
 		depth: 0,
 		overrideAccess: true,
 		req
 	});
+	return winningValues;
 };
 //#endregion
 export { resolvePollOutcome };

package/dist/poll/resolvePollOutcome.js.map

@@ -1 +1 @@
-{"version":3,"file":"resolvePollOutcome.js","names":[],"sources":["../../src/poll/resolvePollOutcome.ts"],"sourcesContent":["import type { Payload, PayloadRequest } from 'payload'\nimport { FORMS_SLUG } from '../collections/forms'\nimport { pollConfigOf } from '../form/pollState'\n\nexport type ResolvePollOutcomeArgs = {\n\tpayload: Payload\n\tformId: number | string\n\t/** A stable option value, matching one of the poll's choice values (the host's contract with `PollOption.value`). */\n\twinningValue: string\n\treq?: PayloadRequest\n}\n\n/**\n * Record a poll's final outcome from host domain logic (e.g. after the race is decided): writes\n * `poll.outcome.winningValue` and stamps `resolvedAt` with the current time. The outcome fields are\n * admin read-only with field-level `update: () => false`, so this server-side call (with\n * `overrideAccess`) is the only write path. Throws when the form does not exist or is not\n * poll-enabled. `<Poll>` treats a present `winningValue` as the final state and highlights the\n * matching result bucket.\n */\nexport const resolvePollOutcome = async (args: ResolvePollOutcomeArgs): Promise<void> => {\n\tconst { payload, formId, winningValue, req } = args\n\tconst form = await payload.findByID({\n\t\tcollection: FORMS_SLUG,\n\t\tid: formId,\n\t\tdepth: 0,\n\t\toverrideAccess: true,\n\t\treq,\n\t})\n\tconst poll = pollConfigOf(form.poll)\n\tif (poll?.enabled !== true) {\n\t\tthrow new Error(`Form ${String(formId)} is not poll-enabled; cannot record an outcome.`)\n\t}\n\tawait payload.update({\n\t\tcollection: FORMS_SLUG,\n\t\tid: formId,\n\t\tdata: { poll: { outcome: { winningValue, resolvedAt: new Date().toISOString() } } },\n\t\tdepth: 0,\n\t\toverrideAccess: true,\n\t\treq,\n\t})\n}\n"],"mappings":";;;;;;;;;;;AAoBA,MAAa,qBAAqB,OAAO,SAAgD;CACxF,MAAM,EAAE,SAAS,QAAQ,cAAc,QAAQ;CAS/C,IADa,cAAa,MAPP,QAAQ,SAAS;EACnC,YAAA;EACA,IAAI;EACJ,OAAO;EACP,gBAAgB;EAChB;CACD,CAAC,GAC8B,IACxB,GAAG,YAAY,MACrB,MAAM,IAAI,MAAM,QAAQ,OAAO,MAAM,EAAE,gDAAgD;CAExF,MAAM,QAAQ,OAAO;EACpB,YAAY;EACZ,IAAI;EACJ,MAAM,EAAE,MAAM,EAAE,SAAS;GAAE;GAAc,6BAAY,IAAI,KAAK,GAAE,YAAY;EAAE,EAAE,EAAE;EAClF,OAAO;EACP,gBAAgB;EAChB;CACD,CAAC;AACF"}
+{"version":3,"file":"resolvePollOutcome.js","names":[],"sources":["../../src/poll/resolvePollOutcome.ts"],"sourcesContent":["import type { Payload, PayloadRequest } from 'payload'\nimport { aggregateFieldResponses } from '../aggregation/aggregateResponses'\nimport type { FieldAggregation } from '../aggregation/types'\nimport { FORMS_SLUG } from '../collections/forms'\nimport { pollConfigOf } from '../form/pollState'\nimport type { PollOutcomeStrategyArgs } from './definePollType'\nimport { pollTypesOf } from './pollTypeRegistry'\n\nexport type ResolvePollOutcomeArgs = {\n\tpayload: Payload\n\tformId: number | string\n\t/**\n\t * The winning set: stable option values, each matching one of the poll's choice values (the\n\t * host's contract with `PollOption.value`). Pass more than one for a tie, an empty array to clear\n\t * the outcome. Omit to auto-resolve via the poll's selected outcome strategy (`poll.type`).\n\t */\n\twinningValues?: string[]\n\treq?: PayloadRequest\n}\n\n/** A strategy result narrowed to a deduped set of non-empty strings. */\nconst cleanWinners = (value: string[] | undefined): string[] =>\n\tvalue === undefined\n\t\t? []\n\t\t: [\n\t\t\t\t...new Set(\n\t\t\t\t\tvalue.filter((entry): entry is string => typeof entry === 'string' && entry.length > 0)\n\t\t\t\t),\n\t\t\t]\n\n/**\n * Record a poll's final outcome server-side, in one of two modes:\n * - explicit: pass `winningValues` when host code already knows the winner(s); more than one is a\n *   tie, and an empty array clears the outcome;\n * - auto: omit it and the poll's selected outcome strategy (`poll.type`, from the `poll.types`\n *   registry, defaulting to `manual`) resolves the winners. `manual` is a no-op; `mostVoted` reads\n *   the aggregated results field; `source` delegates to the option source. A strategy that is not\n *   yet decidable (or `manual`) writes nothing and this returns an empty set, so auto mode is safe\n *   to call repeatedly from the close job and the read fallback.\n *\n * Every write runs through `payload.update` with `overrideAccess`, so the forms collection hook\n * validates each value against the poll's effective options and owns the `poll.outcome.resolvedAt`\n * stamp in both modes (auto-resolved winners are validated exactly as hand-picked ones). Throws only\n * when the form does not exist or is not poll-enabled. Returns the recorded winning set (empty when\n * auto mode did not decide).\n */\nexport const resolvePollOutcome = async (args: ResolvePollOutcomeArgs): Promise<string[]> => {\n\tconst { payload, formId, req } = args\n\tconst form = await payload.findByID({\n\t\tcollection: FORMS_SLUG,\n\t\tid: formId,\n\t\tdepth: 0,\n\t\toverrideAccess: true,\n\t\treq,\n\t})\n\tconst poll = pollConfigOf(form.poll)\n\tif (form.pollEnabled !== true || !poll) {\n\t\tthrow new Error(`Form ${String(formId)} is not poll-enabled; cannot record an outcome.`)\n\t}\n\n\tlet winningValues: string[]\n\tif (args.winningValues !== undefined) {\n\t\twinningValues = args.winningValues\n\t} else {\n\t\tconst strategyType =\n\t\t\ttypeof poll.type === 'string' && poll.type.length > 0 ? poll.type : 'manual'\n\t\tconst strategy = pollTypesOf(payload).get(strategyType)\n\t\tif (!strategy) {\n\t\t\treturn []\n\t\t}\n\t\tlet aggregated: FieldAggregation | null | undefined\n\t\tconst aggregate = async (): Promise<FieldAggregation | null> => {\n\t\t\tif (aggregated === undefined) {\n\t\t\t\tconst resultsField =\n\t\t\t\t\ttypeof poll.resultsField === 'string' && poll.resultsField.length > 0\n\t\t\t\t\t\t? poll.resultsField\n\t\t\t\t\t\t: undefined\n\t\t\t\taggregated = resultsField\n\t\t\t\t\t? await aggregateFieldResponses({ payload, formId, field: resultsField, req })\n\t\t\t\t\t: null\n\t\t\t}\n\t\t\treturn aggregated\n\t\t}\n\t\twinningValues = cleanWinners(\n\t\t\tawait strategy.resolveOutcome({\n\t\t\t\tpayload,\n\t\t\t\treq,\n\t\t\t\tform: form as unknown as PollOutcomeStrategyArgs['form'],\n\t\t\t\tpoll,\n\t\t\t\taggregate,\n\t\t\t})\n\t\t)\n\t\tif (winningValues.length === 0) {\n\t\t\treturn []\n\t\t}\n\t}\n\n\tawait payload.update({\n\t\tcollection: FORMS_SLUG,\n\t\tid: formId,\n\t\tdata: { poll: { outcome: { winningValues } } },\n\t\tdepth: 0,\n\t\toverrideAccess: true,\n\t\treq,\n\t})\n\treturn winningValues\n}\n"],"mappings":";;;;;;AAqBA,MAAM,gBAAgB,UACrB,UAAU,KAAA,IACP,CAAC,IACD,CACA,GAAG,IAAI,IACN,MAAM,QAAQ,UAA2B,OAAO,UAAU,YAAY,MAAM,SAAS,CAAC,CACvF,CACD;;;;;;;;;;;;;;;;;AAkBH,MAAa,qBAAqB,OAAO,SAAoD;CAC5F,MAAM,EAAE,SAAS,QAAQ,QAAQ;CACjC,MAAM,OAAO,MAAM,QAAQ,SAAS;EACnC,YAAY;EACZ,IAAI;EACJ,OAAO;EACP,gBAAgB;EAChB;CACD,CAAC;CACD,MAAM,OAAO,aAAa,KAAK,IAAI;CACnC,IAAI,KAAK,gBAAgB,QAAQ,CAAC,MACjC,MAAM,IAAI,MAAM,QAAQ,OAAO,MAAM,EAAE,gDAAgD;CAGxF,IAAI;CACJ,IAAI,KAAK,kBAAkB,KAAA,GAC1B,gBAAgB,KAAK;MACf;EACN,MAAM,eACL,OAAO,KAAK,SAAS,YAAY,KAAK,KAAK,SAAS,IAAI,KAAK,OAAO;EACrE,MAAM,WAAW,YAAY,OAAO,EAAE,IAAI,YAAY;EACtD,IAAI,CAAC,UACJ,OAAO,CAAC;EAET,IAAI;EACJ,MAAM,YAAY,YAA8C;GAC/D,IAAI,eAAe,KAAA,GAAW;IAC7B,MAAM,eACL,OAAO,KAAK,iBAAiB,YAAY,KAAK,aAAa,SAAS,IACjE,KAAK,eACL,KAAA;IACJ,aAAa,eACV,MAAM,wBAAwB;KAAE;KAAS;KAAQ,OAAO;KAAc;IAAI,CAAC,IAC3E;GACJ;GACA,OAAO;EACR;EACA,gBAAgB,aACf,MAAM,SAAS,eAAe;GAC7B;GACA;GACM;GACN;GACA;EACD,CAAC,CACF;EACA,IAAI,cAAc,WAAW,GAC5B,OAAO,CAAC;CAEV;CAEA,MAAM,QAAQ,OAAO;EACpB,YAAY;EACZ,IAAI;EACJ,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE;EAC7C,OAAO;EACP,gBAAgB;EAChB;CACD,CAAC;CACD,OAAO;AACR"}

package/dist/poll/resultsField.js

@@ -0,0 +1,21 @@
+import { fieldNamesOfType } from "../fields/fieldNamesOfType.js";
+import { keys } from "../translations/keys.js";
+import { asTranslate } from "../translations/server.js";
+//#region src/poll/resultsField.ts
+/** Slugs of registered field types choosable as a poll's results field (`pollEligible: true`). */
+const pollEligibleTypes = (registry) => [...registry.values()].filter((definition) => definition.pollEligible === true).map((definition) => definition.type);
+/**
+* Validate for `poll.resultsField`, closed over the eligible type slugs derived from the registry
+* at collection-build time (mirrors the confirmation action's `toField`): unset is fine, otherwise
+* the value must name an existing, named field instance whose type is poll-eligible. Payload skips
+* the validate while the poll is disabled (the field's `admin.condition`), so a stale reference on
+* a disabled poll never blocks a save.
+*/
+const buildValidateResultsField = (eligibleTypes) => (value, { data, req }) => {
+	if (typeof value !== "string" || value.length === 0) return true;
+	return fieldNamesOfType(data && typeof data === "object" ? data.fields : void 0, eligibleTypes).includes(value) ? true : asTranslate(req.t)(keys.validationResultsFieldUnknown);
+};
+//#endregion
+export { buildValidateResultsField, pollEligibleTypes };
+
+//# sourceMappingURL=resultsField.js.map

package/dist/poll/resultsField.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resultsField.js","names":[],"sources":["../../src/poll/resultsField.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport { fieldNamesOfType } from '../fields/fieldNamesOfType'\nimport type { FieldTypeRegistry } from '../fields/registry'\nimport { keys } from '../translations/keys'\nimport { asTranslate } from '../translations/server'\n\n/** Slugs of registered field types choosable as a poll's results field (`pollEligible: true`). */\nexport const pollEligibleTypes = (registry: FieldTypeRegistry): string[] =>\n\t[...registry.values()]\n\t\t.filter((definition) => definition.pollEligible === true)\n\t\t.map((definition) => definition.type)\n\n/**\n * Validate for `poll.resultsField`, closed over the eligible type slugs derived from the registry\n * at collection-build time (mirrors the confirmation action's `toField`): unset is fine, otherwise\n * the value must name an existing, named field instance whose type is poll-eligible. Payload skips\n * the validate while the poll is disabled (the field's `admin.condition`), so a stale reference on\n * a disabled poll never blocks a save.\n */\nexport const buildValidateResultsField =\n\t(eligibleTypes: readonly string[]) =>\n\t(value: unknown, { data, req }: { data?: unknown; req: PayloadRequest }): string | true => {\n\t\tif (typeof value !== 'string' || value.length === 0) {\n\t\t\treturn true\n\t\t}\n\t\tconst fields =\n\t\t\tdata && typeof data === 'object' ? (data as Record<string, unknown>).fields : undefined\n\t\treturn fieldNamesOfType(fields, eligibleTypes).includes(value)\n\t\t\t? true\n\t\t\t: asTranslate(req.t)(keys.validationResultsFieldUnknown)\n\t}\n"],"mappings":";;;;;AAOA,MAAa,qBAAqB,aACjC,CAAC,GAAG,SAAS,OAAO,CAAC,EACnB,QAAQ,eAAe,WAAW,iBAAiB,IAAI,EACvD,KAAK,eAAe,WAAW,IAAI;;;;;;;;AAStC,MAAa,6BACX,mBACA,OAAgB,EAAE,MAAM,UAAkE;CAC1F,IAAI,OAAO,UAAU,YAAY,MAAM,WAAW,GACjD,OAAO;CAIR,OAAO,iBADN,QAAQ,OAAO,SAAS,WAAY,KAAiC,SAAS,KAAA,GAC/C,aAAa,EAAE,SAAS,KAAK,IAC1D,OACA,YAAY,IAAI,CAAC,EAAE,KAAK,6BAA6B;AACzD"}

package/dist/prefill/valuesFromSearchParams.js

@@ -1,3 +1,4 @@
+import { isNamedField } from "../fields/fieldKey.js";
 //#region src/prefill/valuesFromSearchParams.ts
 const TRUTHY = new Set([
 	"true",
@@ -24,7 +25,7 @@ const coerce = (kind, raw, all) => {
 const valuesFromSearchParams = (params, fields, registry, options = {}) => {
 	const isSearch = params instanceof URLSearchParams;
 	const paramKeys = isSearch ? [...new Set(params.keys())] : Object.keys(params);
-	const byName = new Map(fields.map((field) => [field.name, field]));
+	const byName = new Map(fields.filter(isNamedField).map((field) => [field.name, field]));
 	const result = {};
 	for (const param of paramKeys) {
 		const fieldName = options.map?.[param] ?? param;

package/dist/prefill/valuesFromSearchParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"valuesFromSearchParams.js","names":[],"sources":["../../src/prefill/valuesFromSearchParams.ts"],"sourcesContent":["import type { FieldTypeRegistry } from '../fields/registry'\nimport type { FormFieldValueKind } from '../fields/types'\nimport type { FormFieldInstance } from '../submissions/types'\n\nexport type PrefillOptions = {\n\t/** Map a query-param name to a field name. Unmapped params use their own name. */\n\tmap?: Record<string, string>\n\t/** If set, only these field names may be prefilled. */\n\tallow?: string[]\n\t/** These field names may never be prefilled. */\n\tdeny?: string[]\n}\n\nconst TRUTHY = new Set(['true', '1', 'on', 'yes'])\n\nconst coerce = (kind: FormFieldValueKind, raw: string, all: string[]): unknown => {\n\tswitch (kind) {\n\t\tcase 'number': {\n\t\t\tconst n = Number(raw)\n\t\t\treturn Number.isNaN(n) ? undefined : n\n\t\t}\n\t\tcase 'boolean':\n\t\t\treturn TRUTHY.has(raw.toLowerCase())\n\t\tcase 'text[]':\n\t\t\treturn all\n\t\tdefault:\n\t\t\treturn raw\n\t}\n}\n\n/**\n * Map URL/query params to typed initial values for KNOWN fields only, coerced by each field's value\n * kind. Unknown, denied, or un-allowed params are ignored; invalid numbers are dropped. Prefilled\n * values are never trusted -- they still validate on submit. Pass the result to `<Form initialValues>`.\n */\n// biome-ignore lint/complexity/useMaxParams: four positional args are the minimal surface (params, fields, registry, options)\nexport const valuesFromSearchParams = (\n\tparams: URLSearchParams | Record<string, string>,\n\tfields: FormFieldInstance[],\n\tregistry: FieldTypeRegistry,\n\toptions: PrefillOptions = {}\n): Record<string, unknown> => {\n\tconst isSearch = params instanceof URLSearchParams\n\tconst paramKeys = isSearch ? [...new Set(params.keys())] : Object.keys(params)\n\tconst byName = new Map(fields.map((field) => [field.name, field]))\n\tconst result: Record<string, unknown> = {}\n\n\tfor (const param of paramKeys) {\n\t\tconst fieldName = options.map?.[param] ?? param\n\n\t\tif (options.allow && !options.allow.includes(fieldName)) {\n\t\t\tcontinue\n\t\t}\n\t\tif (options.deny?.includes(fieldName)) {\n\t\t\tcontinue\n\t\t}\n\n\t\tconst field = byName.get(fieldName)\n\t\tconst definition = field && registry.get(field.blockType)\n\t\t// 'none'-kind (display-only) fields carry no value, so a param under their name is ignored.\n\t\tif (!field || !definition || definition.value === 'none') {\n\t\t\tcontinue\n\t\t}\n\n\t\tconst all = isSearch ? params.getAll(param) : [params[param] as string]\n\t\tconst value = coerce(definition.value, all[0] ?? '', all)\n\t\tif (value !== undefined) {\n\t\t\tresult[fieldName] = value\n\t\t}\n\t}\n\n\treturn result\n}\n"],"mappings":";AAaA,MAAM,SAAS,IAAI,IAAI;CAAC;CAAQ;CAAK;CAAM;AAAK,CAAC;AAEjD,MAAM,UAAU,MAA0B,KAAa,QAA2B;CACjF,QAAQ,MAAR;EACC,KAAK,UAAU;GACd,MAAM,IAAI,OAAO,GAAG;GACpB,OAAO,OAAO,MAAM,CAAC,IAAI,KAAA,IAAY;EACtC;EACA,KAAK,WACJ,OAAO,OAAO,IAAI,IAAI,YAAY,CAAC;EACpC,KAAK,UACJ,OAAO;EACR,SACC,OAAO;CACT;AACD;;;;;;AAQA,MAAa,0BACZ,QACA,QACA,UACA,UAA0B,CAAC,MACE;CAC7B,MAAM,WAAW,kBAAkB;CACnC,MAAM,YAAY,WAAW,CAAC,GAAG,IAAI,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,OAAO,KAAK,MAAM;CAC7E,MAAM,SAAS,IAAI,IAAI,OAAO,KAAK,UAAU,CAAC,MAAM,MAAM,KAAK,CAAC,CAAC;CACjE,MAAM,SAAkC,CAAC;CAEzC,KAAK,MAAM,SAAS,WAAW;EAC9B,MAAM,YAAY,QAAQ,MAAM,UAAU;EAE1C,IAAI,QAAQ,SAAS,CAAC,QAAQ,MAAM,SAAS,SAAS,GACrD;EAED,IAAI,QAAQ,MAAM,SAAS,SAAS,GACnC;EAGD,MAAM,QAAQ,OAAO,IAAI,SAAS;EAClC,MAAM,aAAa,SAAS,SAAS,IAAI,MAAM,SAAS;EAExD,IAAI,CAAC,SAAS,CAAC,cAAc,WAAW,UAAU,QACjD;EAGD,MAAM,MAAM,WAAW,OAAO,OAAO,KAAK,IAAI,CAAC,OAAO,MAAgB;EACtE,MAAM,QAAQ,OAAO,WAAW,OAAO,IAAI,MAAM,IAAI,GAAG;EACxD,IAAI,UAAU,KAAA,GACb,OAAO,aAAa;CAEtB;CAEA,OAAO;AACR"}
+{"version":3,"file":"valuesFromSearchParams.js","names":[],"sources":["../../src/prefill/valuesFromSearchParams.ts"],"sourcesContent":["import { isNamedField } from '../fields/fieldKey'\nimport type { FieldTypeRegistry } from '../fields/registry'\nimport type { FormFieldValueKind } from '../fields/types'\nimport type { FormFieldInstance } from '../submissions/types'\n\nexport type PrefillOptions = {\n\t/** Map a query-param name to a field name. Unmapped params use their own name. */\n\tmap?: Record<string, string>\n\t/** If set, only these field names may be prefilled. */\n\tallow?: string[]\n\t/** These field names may never be prefilled. */\n\tdeny?: string[]\n}\n\nconst TRUTHY = new Set(['true', '1', 'on', 'yes'])\n\nconst coerce = (kind: FormFieldValueKind, raw: string, all: string[]): unknown => {\n\tswitch (kind) {\n\t\tcase 'number': {\n\t\t\tconst n = Number(raw)\n\t\t\treturn Number.isNaN(n) ? undefined : n\n\t\t}\n\t\tcase 'boolean':\n\t\t\treturn TRUTHY.has(raw.toLowerCase())\n\t\tcase 'text[]':\n\t\t\treturn all\n\t\tdefault:\n\t\t\treturn raw\n\t}\n}\n\n/**\n * Map URL/query params to typed initial values for KNOWN fields only, coerced by each field's value\n * kind. Unknown, denied, or un-allowed params are ignored; invalid numbers are dropped. Prefilled\n * values are never trusted -- they still validate on submit. Pass the result to `<Form initialValues>`.\n */\n// biome-ignore lint/complexity/useMaxParams: four positional args are the minimal surface (params, fields, registry, options)\nexport const valuesFromSearchParams = (\n\tparams: URLSearchParams | Record<string, string>,\n\tfields: FormFieldInstance[],\n\tregistry: FieldTypeRegistry,\n\toptions: PrefillOptions = {}\n): Record<string, unknown> => {\n\tconst isSearch = params instanceof URLSearchParams\n\tconst paramKeys = isSearch ? [...new Set(params.keys())] : Object.keys(params)\n\tconst byName = new Map(fields.filter(isNamedField).map((field) => [field.name, field]))\n\tconst result: Record<string, unknown> = {}\n\n\tfor (const param of paramKeys) {\n\t\tconst fieldName = options.map?.[param] ?? param\n\n\t\tif (options.allow && !options.allow.includes(fieldName)) {\n\t\t\tcontinue\n\t\t}\n\t\tif (options.deny?.includes(fieldName)) {\n\t\t\tcontinue\n\t\t}\n\n\t\tconst field = byName.get(fieldName)\n\t\tconst definition = field && registry.get(field.blockType)\n\t\t// 'none'-kind (display-only) fields carry no value, so a param under their name is ignored.\n\t\tif (!field || !definition || definition.value === 'none') {\n\t\t\tcontinue\n\t\t}\n\n\t\tconst all = isSearch ? params.getAll(param) : [params[param] as string]\n\t\tconst value = coerce(definition.value, all[0] ?? '', all)\n\t\tif (value !== undefined) {\n\t\t\tresult[fieldName] = value\n\t\t}\n\t}\n\n\treturn result\n}\n"],"mappings":";;AAcA,MAAM,SAAS,IAAI,IAAI;CAAC;CAAQ;CAAK;CAAM;AAAK,CAAC;AAEjD,MAAM,UAAU,MAA0B,KAAa,QAA2B;CACjF,QAAQ,MAAR;EACC,KAAK,UAAU;GACd,MAAM,IAAI,OAAO,GAAG;GACpB,OAAO,OAAO,MAAM,CAAC,IAAI,KAAA,IAAY;EACtC;EACA,KAAK,WACJ,OAAO,OAAO,IAAI,IAAI,YAAY,CAAC;EACpC,KAAK,UACJ,OAAO;EACR,SACC,OAAO;CACT;AACD;;;;;;AAQA,MAAa,0BACZ,QACA,QACA,UACA,UAA0B,CAAC,MACE;CAC7B,MAAM,WAAW,kBAAkB;CACnC,MAAM,YAAY,WAAW,CAAC,GAAG,IAAI,IAAI,OAAO,KAAK,CAAC,CAAC,IAAI,OAAO,KAAK,MAAM;CAC7E,MAAM,SAAS,IAAI,IAAI,OAAO,OAAO,YAAY,EAAE,KAAK,UAAU,CAAC,MAAM,MAAM,KAAK,CAAC,CAAC;CACtF,MAAM,SAAkC,CAAC;CAEzC,KAAK,MAAM,SAAS,WAAW;EAC9B,MAAM,YAAY,QAAQ,MAAM,UAAU;EAE1C,IAAI,QAAQ,SAAS,CAAC,QAAQ,MAAM,SAAS,SAAS,GACrD;EAED,IAAI,QAAQ,MAAM,SAAS,SAAS,GACnC;EAGD,MAAM,QAAQ,OAAO,IAAI,SAAS;EAClC,MAAM,aAAa,SAAS,SAAS,IAAI,MAAM,SAAS;EAExD,IAAI,CAAC,SAAS,CAAC,cAAc,WAAW,UAAU,QACjD;EAGD,MAAM,MAAM,WAAW,OAAO,OAAO,KAAK,IAAI,CAAC,OAAO,MAAgB;EACtE,MAAM,QAAQ,OAAO,WAAW,OAAO,IAAI,MAAM,IAAI,GAAG;EACxD,IAAI,UAAU,KAAA,GACb,OAAO,aAAa;CAEtB;CAEA,OAAO;AACR"}

package/dist/react/Form.d.ts

@@ -1,5 +1,5 @@
 import { AnyFormFieldDefinition } from "../fields/types.js";
-import { FormDisplaySettings, FormDocument, FormPollSettings, FormResponseSettings } from "../form/types.js";
+import { FormButtonSettings, FormDocument, FormPollSettings, FormResponseSettings } from "../form/types.js";
 import { RendererTranslate } from "./contract.js";
 import { FormEventSink } from "../events/types.js";
 import { AnyValidationRuleDefinition } from "../validation/types.js";
@@ -23,10 +23,10 @@ type FormProps = {
   events?: FormEventSink;
   t?: RendererTranslate;
   locale?: string;
-  layout?: boolean; /** Submit button label. Precedence: this prop, then the form's `response.submitLabel`, then the translated default. */
-  submitLabel?: string; /** "Next" button label for multi-step forms. Defaults to the translated `'Next'`. */
-  nextLabel?: string; /** "Back" button label for multi-step forms. Defaults to the translated `'Back'`. */
-  backLabel?: string; /** Label for the overlay close control (modal/drawer). */
+  layout?: boolean; /** Submit button label. Precedence: this prop, then the form's `buttons.submitLabel`, then the translated default. */
+  submitLabel?: string; /** "Next" button label for multi-step forms. Precedence: this prop, then the form's `buttons.nextLabel`, then the translated default. */
+  nextLabel?: string; /** "Back" button label for multi-step forms. Precedence: this prop, then the form's `buttons.prevLabel`, then the translated default. */
+  prevLabel?: string; /** Label for the overlay close control (modal/drawer). */
   closeLabel?: string;
   successMessage?: string; /** Active presentation: a name into the registry or an inline presentation. Defaults to `'page'` when omitted. */
   presentation?: string | FormPresentation; /** Per-render presentation overrides merged onto the defaults (add, replace, or `false` to remove). */
@@ -34,8 +34,8 @@ type FormProps = {
   onClose?: () => void;
   /**
    * Accessible name for an overlay surface (modal/drawer). Hosts choosing between a trigger
-   * label and the form's own display title should prefer `form.display?.title` when
-   * `form.display?.showTitle` is set, falling back to their own label otherwise.
+   * label and the form's own admin title should prefer `form.title` when set, falling back to
+   * their own label otherwise.
    */
   title?: string; /** Seed initial field values (e.g. from `valuesFromSearchParams`). Still validated on submit. */
   initialValues?: Record<string, unknown>; /** Honeypot decoy (on by default). `false` removes it; `{ name }` matches a customized server `spam.honeypot.fieldName`. */
@@ -68,7 +68,7 @@ declare const Form: ({
   layout,
   submitLabel,
   nextLabel,
-  backLabel,
+  prevLabel,
   closeLabel,
   successMessage,
   presentation,

package/dist/react/Form.js

@@ -4,11 +4,12 @@ import { keys } from "../translations/keys.js";
 import { serializeBody } from "../actions/body/serializeBody.js";
 import { noopEventSink } from "../events/noopSink.js";
 import { CAPTCHA_TOKEN_KEY } from "../spam/constants.js";
+import { fieldKey, isNamedField } from "../fields/fieldKey.js";
 import { calcExpressionOf, computeCalcFields } from "../calc/computeCalcFields.js";
 import { evaluateCondition } from "../conditions/evaluate.js";
 import { en } from "../translations/en.js";
 import { defaultPresentationDescriptors } from "../presentations/defaults.js";
-import { buildRecallResolver } from "../recall/resolver.js";
+import { buildRecallResolver, descriptorsFor } from "../recall/resolver.js";
 import { firstStepId, isTerminalStepId, resolveNextStepId, stepFieldNames } from "../flow/engine.js";
 import { cn } from "./cn.js";
 import { makeTranslate } from "../translations/makeTranslate.js";
@@ -31,6 +32,8 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { createElement, useCallback, useEffect, useId, useMemo, useReducer, useRef, useState } from "react";
 //#region src/react/Form.tsx
 const isEmpty = (value) => value == null || value === "" || Array.isArray(value) && value.length === 0;
+/** A stored button label counts only when it is a non-empty string; anything else falls through. */
+const storedLabel = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
 const FIELD_WIDTHS = new Set([
 	"full",
 	"half",
@@ -39,7 +42,7 @@ const FIELD_WIDTHS = new Set([
 ]);
 const FieldHost = ({ field, renderer, locale, t }) => {
 	const id = useId();
-	const { value, errors, warnings, setValue, onBlur } = useField(field.name);
+	const { value, errors, setValue, onBlur } = useField(field.name);
 	return createElement(renderer, {
 		field,
 		id,
@@ -48,7 +51,6 @@ const FieldHost = ({ field, renderer, locale, t }) => {
 		onChange: setValue,
 		onBlur,
 		errors,
-		warnings,
 		required: Boolean(field.required),
 		locale,
 		t
@@ -64,15 +66,32 @@ const CalcFieldHost = ({ field, renderer, value, locale, t }) => {
 		onChange: () => {},
 		onBlur: () => {},
 		errors: [],
-		warnings: [],
 		required: false,
 		disabled: true,
 		locale,
 		t
 	});
 };
+/**
+* Hosts a nameless (bare) display block, e.g. a message: no `useField` binding at all. The
+* renderer reads only the instance and the form context; `name` is the row key for consistency.
+*/
+const StaticFieldHost = ({ field, renderer, locale, t }) => {
+	return createElement(renderer, {
+		field,
+		id: useId(),
+		name: fieldKey(field),
+		value: void 0,
+		onChange: () => {},
+		onBlur: () => {},
+		errors: [],
+		required: false,
+		locale,
+		t
+	});
+};
 /** The headless form controller: state, progressive client validation, conditional visibility, submission, events. */
-const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSuccess, onError, events, t, locale = "en", layout, submitLabel, nextLabel, backLabel, closeLabel = "Close", successMessage = "Thank you.", presentation, presentations, onClose, title, initialValues, honeypot, captchaToken, children, className, renderSubmit, renderNext, renderBack, submitButtonClassName, nextButtonClassName, backButtonClassName }) => {
+const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSuccess, onError, events, t, locale = "en", layout, submitLabel, nextLabel, prevLabel, closeLabel = "Close", successMessage = "Thank you.", presentation, presentations, onClose, title, initialValues, honeypot, captchaToken, children, className, renderSubmit, renderNext, renderBack, submitButtonClassName, nextButtonClassName, backButtonClassName }) => {
 	const honeypotName = honeypot === false ? null : honeypot?.name ?? "website";
 	const honeypotRef = useRef(null);
 	const registry = useMemo(() => buildFieldTypeRegistry(fieldTypes), [fieldTypes]);
@@ -80,18 +99,18 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 	const rendererRegistry = useMemo(() => resolveRenderers(defaultRenderers, renderers), [renderers]);
 	const presentationRegistry = useMemo(() => resolvePresentations(defaultPresentations, presentations), [presentations]);
 	const activePresentation = typeof presentation === "object" ? presentation : presentationRegistry.get(presentation ?? "page") ?? presentationRegistry.get("page") ?? defaultPresentationDescriptors.page;
-	const fieldsByName = useMemo(() => new Map(form.fields.map((field) => [field.name, field])), [form.fields]);
+	const fieldsByName = useMemo(() => new Map(form.fields.filter(isNamedField).map((field) => [field.name, field])), [form.fields]);
 	const translate = useMemo(() => t ?? makeTranslate(en), [t]);
-	const docSubmitLabel = typeof form.response?.submitLabel === "string" && form.response.submitLabel.length > 0 ? form.response.submitLabel : void 0;
+	const docButtons = form.buttons;
 	const labels = useMemo(() => ({
-		back: backLabel ?? translate(keys.formBack),
-		next: nextLabel ?? translate(keys.formNext),
-		submit: submitLabel ?? docSubmitLabel ?? translate(keys.formSubmit)
+		prev: prevLabel ?? storedLabel(docButtons?.prevLabel) ?? translate(keys.formBack),
+		next: nextLabel ?? storedLabel(docButtons?.nextLabel) ?? translate(keys.formNext),
+		submit: submitLabel ?? storedLabel(docButtons?.submitLabel) ?? translate(keys.formSubmit)
 	}), [
-		backLabel,
+		prevLabel,
 		nextLabel,
 		submitLabel,
-		docSubmitLabel,
+		docButtons,
 		translate
 	]);
 	const sinkRef = useRef(noopEventSink);
@@ -116,7 +135,7 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 		locale,
 		translate
 	]);
-	const flow = form.flow && form.flow.steps.length >= 2 ? form.flow : void 0;
+	const flow = form.multistep === true && form.flow && form.flow.steps.length >= 2 ? form.flow : void 0;
 	const [currentStepId, setCurrentStepId] = useState(() => flow ? firstStepId(flow) : void 0);
 	const [history, setHistory] = useState([]);
 	const startedRef = useRef(false);
@@ -142,8 +161,7 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 			rawDispatch({
 				type: "SET_FIELD_ISSUES",
 				name,
-				errors: [],
-				warnings: []
+				errors: []
 			});
 			return;
 		}
@@ -155,12 +173,11 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 			answers,
 			locale,
 			t: translate
-		}).then(({ errors, warnings }) => {
+		}).then(({ errors }) => {
 			rawDispatch({
 				type: "SET_FIELD_ISSUES",
 				name,
-				errors,
-				warnings
+				errors
 			});
 			const [firstError] = errors;
 			if (firstError !== void 0) emitFormEvent(sinkRef.current, formIdRef.current, {
@@ -178,15 +195,25 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 		translate
 	]);
 	const visible = visibleFields(form.fields, effectiveValues);
-	/** Answered visible fields as submission values. Display-only ('none' kind) fields never contribute. */
-	const answeredValues = () => visibleFields(form.fields, effectiveValues).filter((field) => registry.get(field.blockType)?.value !== "none").filter((field) => !isEmpty(effectiveValues[field.name])).map((field) => ({
+	/** Visible, answered named fields. Display-only ('none' kind) and nameless (bare) fields never contribute. */
+	const answerableFields = () => visibleFields(form.fields, effectiveValues).filter((field) => registry.get(field.blockType)?.value !== "none").filter(isNamedField).filter((field) => !isEmpty(effectiveValues[field.name]));
+	/** Answered visible fields as raw submission values, sent to the server on submit. */
+	const answeredValues = () => answerableFields().map((field) => ({
 		field: field.name,
 		value: effectiveValues[field.name]
 	}));
-	const stepVisible = (flow && currentStepId ? stepFieldNames(flow, currentStepId) : []).map((name) => visible.find((field) => field.name === name)).filter((field) => Boolean(field));
+	/**
+	* Same fields, formatted via `recall` (option labels, Yes/No, localized dates): recall-fidelity
+	* values for client-rendered templates, matching what the server gives email-team's body.
+	*/
+	const formattedValues = () => answerableFields().map((field) => ({
+		field: field.name,
+		value: recall(field.name)
+	}));
+	const stepVisible = (flow && currentStepId ? stepFieldNames(flow, currentStepId) : []).map((key) => visible.find((field) => fieldKey(field) === key)).filter((field) => Boolean(field));
 	const goNext = async () => {
 		if (!flow || !currentStepId) return;
-		const results = await Promise.all(stepVisible.filter((field) => !calcExpressionOf(field)).filter((field) => registry.get(field.blockType)?.value !== "none").filter((field) => evaluateCondition(field.validateWhen, effectiveValues)).map(async (field) => ({
+		const results = await Promise.all(stepVisible.filter((field) => !calcExpressionOf(field)).filter((field) => registry.get(field.blockType)?.value !== "none").filter(isNamedField).filter((field) => evaluateCondition(field.validateWhen, effectiveValues)).map(async (field) => ({
 			field,
 			...await validateFieldValue({
 				field,
@@ -207,8 +234,7 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 			rawDispatch({
 				type: "SET_FIELD_ISSUES",
 				name: result.field.name,
-				errors: result.errors,
-				warnings: result.warnings
+				errors: result.errors
 			});
 			if (result.errors.length > 0) hasError = true;
 		}
@@ -258,7 +284,7 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 		if (submittingRef.current) return;
 		submittingRef.current = true;
 		const visible = visibleFields(form.fields, effectiveValues);
-		const results = await Promise.all(visible.filter((field) => !calcExpressionOf(field)).filter((field) => registry.get(field.blockType)?.value !== "none").filter((field) => evaluateCondition(field.validateWhen, effectiveValues)).map(async (field) => ({
+		const results = await Promise.all(visible.filter((field) => !calcExpressionOf(field)).filter((field) => registry.get(field.blockType)?.value !== "none").filter(isNamedField).filter((field) => evaluateCondition(field.validateWhen, effectiveValues)).map(async (field) => ({
 			field,
 			...await validateFieldValue({
 				field,
@@ -271,22 +297,18 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 			})
 		})));
 		const errors = {};
-		const warnings = {};
-		for (const result of results) {
-			if (result.errors.length > 0) {
-				errors[result.field.name] = result.errors;
-				const [firstError] = result.errors;
-				if (firstError !== void 0) emitFormEvent(sinkRef.current, formIdRef.current, {
-					type: "field.errored",
-					field: result.field.name,
-					message: firstError
-				});
-			}
-			if (result.warnings.length > 0) warnings[result.field.name] = result.warnings;
+		for (const result of results) if (result.errors.length > 0) {
+			errors[result.field.name] = result.errors;
+			const [firstError] = result.errors;
+			if (firstError !== void 0) emitFormEvent(sinkRef.current, formIdRef.current, {
+				type: "field.errored",
+				field: result.field.name,
+				message: firstError
+			});
 		}
-		for (const field of visible.filter((f) => f.blockType === "repeater")) {
+		for (const field of visible.filter((f) => f.blockType === "repeater" && isNamedField(f))) {
 			const rows = Array.isArray(effectiveValues[field.name]) ? effectiveValues[field.name] : [];
-			const subFields = Array.isArray(field.subFields) ? field.subFields : [];
+			const subFields = (Array.isArray(field.subFields) ? field.subFields : []).filter(isNamedField);
 			for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
 				const row = rows[rowIndex] ?? {};
 				for (const subField of subFields) {
@@ -303,14 +325,12 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 					});
 					const compositeKey = `${field.name}[${rowIndex}].${subField.name}`;
 					if (subResult.errors.length > 0) errors[compositeKey] = subResult.errors;
-					if (subResult.warnings.length > 0) warnings[compositeKey] = subResult.warnings;
 				}
 			}
 		}
 		rawDispatch({
 			type: "SET_ALL_ISSUES",
-			errors,
-			warnings
+			errors
 		});
 		if (Object.keys(errors).length > 0) {
 			submittingRef.current = false;
@@ -352,8 +372,7 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 		} else {
 			if (result.fieldErrors) rawDispatch({
 				type: "SET_ALL_ISSUES",
-				errors: result.fieldErrors,
-				warnings: {}
+				errors: result.fieldErrors
 			});
 			const message = result.message ?? "Submission failed";
 			rawDispatch({
@@ -364,6 +383,7 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 		}
 	};
 	const contextValue = {
+		form,
 		state,
 		dispatch,
 		validateField,
@@ -418,8 +438,8 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 	if (state.submitted) {
 		const responseMessage = form.response?.type === "message" || form.response?.type == null ? form.response?.message : void 0;
 		const responseHtml = responseMessage ? serializeBody(responseMessage, {
-			values: answeredValues(),
-			descriptors: []
+			values: formattedValues(),
+			descriptors: descriptorsFor(answerableFields())
 		}) : void 0;
 		return /* @__PURE__ */ jsx(FormContext.Provider, {
 			value: contextValue,
@@ -439,11 +459,6 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 		});
 	}
 	const rendered = (flow ? stepVisible : visible).filter((field) => field.hidden !== true && field.calcDisplay !== false);
-	const displayTitleText = form.display?.showTitle && typeof form.display.title === "string" && form.display.title.length > 0 ? interpolate(form.display.title, recall) : void 0;
-	const displayIntroHtml = form.display?.intro ? serializeBody(form.display.intro, {
-		values: answeredValues(),
-		descriptors: []
-	}) : "";
 	return /* @__PURE__ */ jsx(FormContext.Provider, {
 		value: contextValue,
 		children: wrap(/* @__PURE__ */ jsxs("form", {
@@ -457,14 +472,6 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 					name: honeypotName,
 					inputRef: honeypotRef
 				}) : null,
-				displayTitleText ? /* @__PURE__ */ jsx("h2", {
-					className: "fb-form__title",
-					children: displayTitleText
-				}) : null,
-				displayIntroHtml ? /* @__PURE__ */ jsx("div", {
-					className: "fb-form__intro",
-					dangerouslySetInnerHTML: { __html: displayIntroHtml }
-				}) : null,
 				/* @__PURE__ */ jsx(FormLayout, {
 					enabled: layout !== false,
 					children: rendered.map((field) => {
@@ -474,10 +481,15 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 						const recalledField = applyRecall(field, recall);
 						return /* @__PURE__ */ jsx("div", {
 							...widthProps(width),
-							children: calcExpressionOf(field) ? /* @__PURE__ */ jsx(CalcFieldHost, {
+							children: !isNamedField(recalledField) ? /* @__PURE__ */ jsx(StaticFieldHost, {
+								field: recalledField,
+								renderer,
+								locale,
+								t: translate
+							}) : calcExpressionOf(recalledField) ? /* @__PURE__ */ jsx(CalcFieldHost, {
 								field: recalledField,
 								renderer,
-								value: effectiveValues[field.name],
+								value: effectiveValues[recalledField.name],
 								locale,
 								t: translate
 							}) : /* @__PURE__ */ jsx(FieldHost, {
@@ -486,7 +498,7 @@ const Form = ({ form, fieldTypes, rules, renderers, apiRoute, onSubmit, onSucces
 								locale,
 								t: translate
 							})
-						}, field.name);
+						}, fieldKey(field));
 					})
 				}),
 				state.submitError ? /* @__PURE__ */ jsx("p", {