@takazudo/zfb 4.4.0 → 4.5.0

package/dist/zudo-react/form-recovery.js

@@ -0,0 +1,116 @@
+function within(scope, parents) {
+    for (let current = scope; current; current = current.parent)
+        if (parents.includes(current))
+            return true;
+    return false;
+}
+// Optional policy uses the owning renderer's ledger and errors across package copies.
+export function createFormRecovery(container, host) {
+    const { controlOwners, error, batch } = host;
+    return {
+        prepare(plans, map, mode, replacing, parent) {
+            const installed = [...(controlOwners.get(container.ownerDocument) ?? [])].filter((entry) => entry.root === container && entry.scope.active && !within(entry.scope, replacing));
+            // Fresh boundary controls still sit in the provisional tree during preflight.
+            // Resolve their ancestor form through the hydration map for group identity.
+            const plannedForms = new Map();
+            for (const plan of plans) {
+                const node = map.get(plan.element);
+                if (node.localName === "form" && node.id && !plannedForms.has(node.id))
+                    plannedForms.set(node.id, node);
+            }
+            const form = (node) => {
+                const id = node.getAttribute("form");
+                if (id !== null) {
+                    const target = plannedForms.get(id) ?? container.ownerDocument.getElementById(id);
+                    return target instanceof Element && target.localName === "form" ? target : null;
+                }
+                const ancestor = node.closest("form");
+                if (ancestor)
+                    return map.get(ancestor) ?? ancestor;
+                return parent instanceof Element
+                    ? parent.localName === "form"
+                        ? parent
+                        : parent.closest("form")
+                    : null;
+            };
+            return { installed, form };
+        },
+        validate(groupByModel, mode, { installed, form }) {
+            for (const [model, group] of groupByModel) {
+                for (const binding of group) {
+                    const radio = binding.node;
+                    if (binding.kind === "radio" &&
+                        installed.some((entry) => entry.binding.kind === "radio" &&
+                            entry.name === radio.name &&
+                            entry.form === form(radio) &&
+                            entry.binding.model !== model))
+                        error("ZR_MODEL_CONFLICT", binding.path, "same-name radios use different models");
+                }
+                const related = installed
+                    .filter((entry) => entry.binding.model === model)
+                    .map((entry) => entry.binding);
+                const complete = [...group, ...related];
+                for (const binding of group)
+                    binding.group = complete;
+                const radios = complete.every((binding) => binding.kind === "radio");
+                if (complete.some((binding) => binding.kind === "radio") && !radios)
+                    error("ZR_MODEL_CONFLICT", group[0].path, "radio and non-radio share model");
+                if (radios) {
+                    const nodes = complete.map((binding) => binding.node);
+                    const names = new Set(nodes.map((node) => `${node.name}\u0000${node.getAttribute("form") ?? ""}`));
+                    const optionValues = nodes.map((node) => node.value);
+                    if (names.size !== 1 ||
+                        new Set(nodes.map(form)).size !== 1 ||
+                        new Set(optionValues).size !== optionValues.length)
+                        error("ZR_MODEL_CONFLICT", group[0].path, "radio group membership or duplicate value");
+                    if ((mode === "mount" || group.every((binding) => binding.fresh)) &&
+                        model.value !== null &&
+                        !optionValues.includes(model.value))
+                        error("ZR_MODEL_VALUE", group[0].path, "radio model has no option");
+                    if (mode === "hydrate" &&
+                        group.filter((binding) => !binding.fresh && binding.node.checked)
+                            .length > 1)
+                        error("ZR_MODEL_CONFLICT", group[0].path, "multiple checked radios");
+                }
+                else if (mode === "hydrate" &&
+                    group
+                        .filter((binding) => !binding.fresh)
+                        .some((binding, _, adopted) => !Object.is(binding.read(), adopted[0].read())))
+                    error("ZR_MODEL_CONFLICT", group[0].path, "shared model controls disagree");
+            }
+        },
+        members(binding) {
+            return binding.live
+                ? [...(controlOwners.get(container.ownerDocument) ?? [])]
+                    .filter((entry) => entry.root === container &&
+                    entry.scope.active &&
+                    entry.binding.model === binding.model)
+                    .map((entry) => entry.binding)
+                : binding.group;
+        },
+        reconcile(groups, mode) {
+            if (mode === "hydrate")
+                batch(() => {
+                    for (const [model, group] of groups) {
+                        const adopted = group.filter((binding) => !binding.fresh);
+                        if (adopted.length)
+                            model.value =
+                                adopted[0].kind === "radio"
+                                    ? (adopted.find((binding) => binding.read() !== null)?.read() ??
+                                        (group.some((binding) => binding.fresh && binding.node.value === model.value)
+                                            ? model.value
+                                            : null))
+                                    : adopted[0].read();
+                        for (const binding of group)
+                            if (binding.fresh)
+                                binding.write(model.value);
+                    }
+                });
+            else
+                for (const [model, group] of groups)
+                    for (const binding of group)
+                        binding.write(model.value);
+        },
+    };
+}
+//# sourceMappingURL=form-recovery.js.map

package/dist/zudo-react/form-recovery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-recovery.js","sourceRoot":"","sources":["../../src/zudo-react/form-recovery.ts"],"names":[],"mappings":"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","sourcesContent":["import type { FormRecovery, FormHost } from \"./forms.js\";\nimport type { RuntimeScope } from \"./scope.js\";\nfunction within(scope: RuntimeScope, parents: readonly RuntimeScope[]): boolean {\n  for (let current: RuntimeScope | undefined = scope; current; current = current.parent)\n    if (parents.includes(current)) return true;\n  return false;\n}\n\n// Optional policy uses the owning renderer's ledger and errors across package copies.\nexport function createFormRecovery(container: Element, host: FormHost): FormRecovery {\n  const { controlOwners, error, batch } = host;\n  return {\n    prepare(plans, map, mode, replacing, parent) {\n      const installed = [...(controlOwners.get(container.ownerDocument) ?? [])].filter(\n        (entry) =>\n          entry.root === container && entry.scope.active && !within(entry.scope, replacing),\n      );\n      // Fresh boundary controls still sit in the provisional tree during preflight.\n      // Resolve their ancestor form through the hydration map for group identity.\n      const plannedForms = new Map<string, Node>();\n      for (const plan of plans) {\n        const node = map.get(plan.element) as Element;\n        if (node.localName === \"form\" && node.id && !plannedForms.has(node.id))\n          plannedForms.set(node.id, node);\n      }\n      const form = (node: HTMLInputElement): Node | null => {\n        const id = node.getAttribute(\"form\");\n        if (id !== null) {\n          const target = plannedForms.get(id) ?? container.ownerDocument.getElementById(id);\n          return target instanceof Element && target.localName === \"form\" ? target : null;\n        }\n        const ancestor = node.closest(\"form\");\n        if (ancestor) return map.get(ancestor) ?? ancestor;\n        return parent instanceof Element\n          ? parent.localName === \"form\"\n            ? parent\n            : parent.closest(\"form\")\n          : null;\n      };\n      return { installed, form };\n    },\n    validate(groupByModel, mode, { installed, form }) {\n      for (const [model, group] of groupByModel) {\n        for (const binding of group) {\n          const radio = binding.node as HTMLInputElement;\n          if (\n            binding.kind === \"radio\" &&\n            installed.some(\n              (entry) =>\n                entry.binding.kind === \"radio\" &&\n                entry.name === radio.name &&\n                entry.form === form(radio) &&\n                entry.binding.model !== model,\n            )\n          )\n            error(\"ZR_MODEL_CONFLICT\", binding.path, \"same-name radios use different models\");\n        }\n        const related = installed\n          .filter((entry) => entry.binding.model === model)\n          .map((entry) => entry.binding);\n        const complete = [...group, ...related];\n        for (const binding of group) binding.group = complete;\n        const radios = complete.every((binding) => binding.kind === \"radio\");\n        if (complete.some((binding) => binding.kind === \"radio\") && !radios)\n          error(\"ZR_MODEL_CONFLICT\", group[0]!.path, \"radio and non-radio share model\");\n        if (radios) {\n          const nodes = complete.map((binding) => binding.node as HTMLInputElement);\n          const names = new Set(\n            nodes.map((node) => `${node.name}\\u0000${node.getAttribute(\"form\") ?? \"\"}`),\n          );\n          const optionValues = nodes.map((node) => node.value);\n          if (\n            names.size !== 1 ||\n            new Set(nodes.map(form)).size !== 1 ||\n            new Set(optionValues).size !== optionValues.length\n          )\n            error(\"ZR_MODEL_CONFLICT\", group[0]!.path, \"radio group membership or duplicate value\");\n          if (\n            (mode === \"mount\" || group.every((binding) => binding.fresh)) &&\n            model.value !== null &&\n            !optionValues.includes(model.value as string)\n          )\n            error(\"ZR_MODEL_VALUE\", group[0]!.path, \"radio model has no option\");\n          if (\n            mode === \"hydrate\" &&\n            group.filter((binding) => !binding.fresh && (binding.node as HTMLInputElement).checked)\n              .length > 1\n          )\n            error(\"ZR_MODEL_CONFLICT\", group[0]!.path, \"multiple checked radios\");\n        } else if (\n          mode === \"hydrate\" &&\n          group\n            .filter((binding) => !binding.fresh)\n            .some((binding, _, adopted) => !Object.is(binding.read(), adopted[0]!.read()))\n        )\n          error(\"ZR_MODEL_CONFLICT\", group[0]!.path, \"shared model controls disagree\");\n      }\n    },\n    members(binding) {\n      return binding.live\n        ? [...(controlOwners.get(container.ownerDocument) ?? [])]\n            .filter(\n              (entry) =>\n                entry.root === container &&\n                entry.scope.active &&\n                entry.binding.model === binding.model,\n            )\n            .map((entry) => entry.binding)\n        : binding.group;\n    },\n    reconcile(groups, mode) {\n      if (mode === \"hydrate\")\n        batch(() => {\n          for (const [model, group] of groups) {\n            const adopted = group.filter((binding) => !binding.fresh);\n            if (adopted.length)\n              model.value =\n                adopted[0]!.kind === \"radio\"\n                  ? (adopted.find((binding) => binding.read() !== null)?.read() ??\n                    (group.some(\n                      (binding) =>\n                        binding.fresh && (binding.node as HTMLInputElement).value === model.value,\n                    )\n                      ? model.value\n                      : null))\n                  : adopted[0]!.read();\n            for (const binding of group) if (binding.fresh) binding.write(model.value);\n          }\n        });\n      else\n        for (const [model, group] of groups)\n          for (const binding of group) binding.write(model.value);\n    },\n  };\n}\n"]}

package/dist/zudo-react/forms.d.ts

@@ -1,16 +1,28 @@
+import { batch } from "./scheduler.js";
 import type { Signal } from "./reactive-types.js";
 import type { RuntimeScope } from "./scope.js";
 import { type RootOptions } from "./root.js";
+declare const controlOwners: WeakMap<Document, Set<ControlOwner>>;
+export interface ControlOwner {
+    root: Element;
+    name: string;
+    form: HTMLFormElement | null;
+    binding: Binding;
+    scope: RuntimeScope;
+}
 type Control = HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement;
-type Model = Signal<string | boolean | null>;
+export type Model = Signal<string | boolean | null>;
 export interface FormPlan {
     element: Element;
     props: Readonly<Record<string, unknown>>;
     path: string;
 }
-interface Binding {
+export interface Binding {
     node: Control;
     model: Model;
+    group?: Binding[];
+    fresh: boolean;
+    live: boolean;
     kind: "text" | "textarea" | "checkbox" | "select" | "radio";
     read(): string | boolean | null;
     write(value: string | boolean | null): void;
@@ -23,7 +35,29 @@ export declare class FormError extends TypeError {
     readonly detail: string;
     constructor(code: string, path: string, detail: string);
 }
-export declare function prepareForms(plans: FormPlan[], map: Map<Node, Node>, mode: "hydrate" | "mount", container: Element): Binding[];
-export declare function reconcileForms(bindings: Binding[], mode: "hydrate" | "mount"): void;
+declare function error(code: string, path: string, detail: string): never;
+export declare function prepareForms(plans: FormPlan[], map: Map<Node, Node>, mode: "hydrate" | "mount", container: Element, replacing?: readonly RuntimeScope[], parent?: Node | null): Binding[];
+export declare function reconcileForms(bindings: Binding[], mode: "hydrate" | "mount", container: Element): void;
 export declare function activateForms(bindings: Binding[], scope: RuntimeScope, cleanups: Array<() => void>, options: RootOptions, container: Element): void;
+export interface FormState {
+    form(node: HTMLInputElement): Node | null;
+    installed: ControlOwner[];
+}
+export interface FormRecovery {
+    prepare(plans: FormPlan[], map: Map<Node, Node>, mode: "hydrate" | "mount", replacing: readonly RuntimeScope[], parent?: Node | null): FormState;
+    validate(groups: Map<Model, Binding[]>, mode: "hydrate" | "mount", state: FormState): void;
+    members(binding: Binding): Binding[] | undefined;
+    reconcile(groups: Map<Model, Binding[]>, mode: "hydrate" | "mount"): void;
+}
+export interface FormHost {
+    controlOwners: typeof controlOwners;
+    error: typeof error;
+    batch: typeof batch;
+}
+export declare const formHost: {
+    controlOwners: WeakMap<Document, Set<ControlOwner>>;
+    error: typeof error;
+    batch: typeof batch;
+    recoveries: WeakMap<Element, FormRecovery>;
+};
 export {};

package/dist/zudo-react/forms.js

@@ -3,38 +3,31 @@ import { isReactive } from "./dom-bindings.js";
 import { subscribe } from "./reactive.js";
 import { diagnostic, report, rootPath } from "./root.js";
 const compositionKey = Symbol.for("@takazudo/zfb/zudo-react/composition-v1");
-const radioOwners = new WeakMap();
+// Capture every live model before a first boundary can appear in a later render.
+const controlOwners = new WeakMap();
 export class FormError extends TypeError {
-    code;
-    path;
-    detail;
     constructor(code, path, detail) {
         super(`${code}: ${detail} at ${path}`);
-        this.code = code;
-        this.path = path;
-        this.detail = detail;
+        Object.assign(this, { code, path, detail });
     }
 }
 function error(code, path, detail) {
     throw new FormError(code, path, detail);
 }
 function writable(value, path) {
-    if (!value ||
-        typeof value !== "object" ||
-        !("$$zudoReactive" in value) ||
-        value.$$zudoReactive !== "zudo-react.reactive.v1" ||
-        !("$$zudoWritable" in value) ||
-        value.$$zudoWritable !== "zudo-react.writable.v1")
-        error("ZR_MODEL_READONLY", path, "model requires a writable signal");
-    let proto = value;
-    while (proto) {
-        const descriptor = Object.getOwnPropertyDescriptor(proto, "value");
-        if (descriptor) {
-            if (typeof descriptor.set !== "function")
-                error("ZR_MODEL_READONLY", path, "model requires a writable signal");
-            return value;
+    if (isReactive(value) &&
+        "$$zudoWritable" in value &&
+        value.$$zudoWritable === "zudo-react.writable.v1") {
+        let proto = value;
+        while (proto) {
+            const descriptor = Object.getOwnPropertyDescriptor(proto, "value");
+            if (descriptor) {
+                if (typeof descriptor.set === "function")
+                    return value;
+                break;
+            }
+            proto = Object.getPrototypeOf(proto);
         }
-        proto = Object.getPrototypeOf(proto);
     }
     return error("ZR_MODEL_READONLY", path, "model requires a writable signal");
 }
@@ -52,95 +45,50 @@ function kind(node, props) {
         return "radio";
     return ["text", "search", "email", "url", "tel", "password"].includes(type) ? "text" : null;
 }
-// Text input: read/write string .value; listen to input.
-function textAdapter(node, path) {
-    return {
-        event: "input",
-        read: () => node.value,
-        write: (value) => {
-            if (typeof value !== "string")
-                error("ZR_MODEL_VALUE", path, "text requires string");
-            if (node.value !== value)
-                node.value = value;
-        },
-    };
-}
-// Textarea: read/write string .value; listen to input.
-function textareaAdapter(node, path) {
-    return {
-        event: "input",
-        read: () => node.value,
-        write: (value) => {
-            if (typeof value !== "string")
-                error("ZR_MODEL_VALUE", path, "textarea requires string");
-            if (node.value !== value)
-                node.value = value;
-        },
-    };
-}
-// Checkbox: read/write boolean .checked; listen to change.
-function checkboxAdapter(node, path) {
+// All adapters preserve native input/change events and avoid redundant writes.
+function adapterFor(kind, control, path) {
+    const node = control;
+    const radio = kind === "radio";
+    const checkbox = kind === "checkbox";
+    const property = checkbox || radio ? "checked" : "value";
     return {
-        event: "change",
-        read: () => node.checked,
+        event: kind === "text" || kind === "textarea" ? "input" : "change",
+        read: () => (radio ? (node.checked ? node.value : null) : node[property]),
         write: (value) => {
-            if (typeof value !== "boolean")
-                error("ZR_MODEL_VALUE", path, "checkbox requires boolean");
-            if (node.checked !== value)
-                node.checked = value;
-        },
-    };
-}
-// Single select: read/write string .value after options exist; listen to change.
-function selectAdapter(node, path) {
-    return {
-        event: "change",
-        read: () => node.value,
-        write: (value) => {
-            if (typeof value !== "string")
-                error("ZR_MODEL_VALUE", path, "select requires string");
-            if (!values(node).includes(value) && !(value === "" && node.selectedIndex === -1))
-                error("ZR_MODEL_VALUE", path, `select has no option ${value}`);
-            if (node.value !== value)
-                node.value = value;
-        },
-    };
-}
-// Radio group: read selected option or null; write checked; listen to change.
-function radioAdapter(node) {
-    return {
-        event: "change",
-        read: () => (node.checked ? node.value : null),
-        write: (value) => {
-            const checked = value === node.value;
-            if (node.checked !== checked)
-                node.checked = checked;
+            if (!radio) {
+                if (typeof value !== (checkbox ? "boolean" : "string"))
+                    error("ZR_MODEL_VALUE", path, `${kind} requires ${checkbox ? "boolean" : "string"}`);
+                if (kind === "select" &&
+                    !values(control).includes(value) &&
+                    !(value === "" && control.selectedIndex === -1))
+                    error("ZR_MODEL_VALUE", path, `select has no option ${value}`);
+            }
+            const next = radio ? value === node.value : value;
+            if (node[property] !== next)
+                node[property] = next;
         },
     };
 }
-function adapterFor(kind, node, path) {
-    switch (kind) {
-        case "text":
-            return textAdapter(node, path);
-        case "textarea":
-            return textareaAdapter(node, path);
-        case "checkbox":
-            return checkboxAdapter(node, path);
-        case "select":
-            return selectAdapter(node, path);
-        case "radio":
-            return radioAdapter(node);
-    }
-}
 function values(node) {
     return [...node.options].map((option) => option.value);
 }
 function optionValuesFor(group) {
     return group.map((binding) => binding.node.value);
 }
-export function prepareForms(plans, map, mode, container) {
+function groupBindings(bindings) {
+    const groups = new Map();
+    for (const binding of bindings) {
+        const group = groups.get(binding.model) ?? [];
+        group.push(binding);
+        groups.set(binding.model, group);
+    }
+    return groups;
+}
+export function prepareForms(plans, map, mode, container, replacing = [], parent) {
+    const recovery = formRecoveries.get(container);
+    const state = recovery?.prepare(plans, map, mode, replacing, parent);
+    const form = state?.form ?? ((node) => node.form);
     const bindings = [];
-    const groupByModel = new Map();
     const namedRadios = new Map();
     for (const plan of plans) {
         const { props, path } = plan;
@@ -193,8 +141,11 @@ export function prepareForms(plans, map, mode, container) {
                 const radio = node;
                 if (!radio.name || typeof props.value !== "string")
                     error("ZR_MODEL_UNSUPPORTED", path, "radio requires static name and value");
-                const owners = radioOwners.get(node.ownerDocument);
-                if ([...(owners ?? [])].some((entry) => entry.root !== container && entry.name === radio.name && entry.form === radio.form))
+                const owners = controlOwners.get(node.ownerDocument);
+                if ([...(owners ?? [])].some((entry) => entry.root !== container &&
+                    entry.binding.kind === "radio" &&
+                    entry.name === radio.name &&
+                    entry.form === form(radio)))
                     error("ZR_MODEL_CONFLICT", path, "same-name radio owned by another root");
                 const key = `${radio.name}\u0000${radio.getAttribute("form") ?? ""}`;
                 const prior = namedRadios.get(key);
@@ -205,41 +156,50 @@ export function prepareForms(plans, map, mode, container) {
             const binding = {
                 node: node,
                 model,
+                fresh: mode === "hydrate" && node === plan.element,
+                live: false,
                 kind: controlKind,
                 path,
                 ...adapterFor(controlKind, node, path),
             };
             bindings.push(binding);
-            const group = groupByModel.get(model) ?? [];
-            group.push(binding);
-            groupByModel.set(model, group);
         }
     }
-    for (const [model, group] of groupByModel) {
-        const radios = group.every((binding) => binding.kind === "radio");
-        if (group.some((binding) => binding.kind === "radio") && !radios)
-            error("ZR_MODEL_CONFLICT", group[0].path, "radio and non-radio share model");
-        if (radios) {
-            const nodes = group.map((binding) => binding.node);
-            const names = new Set(nodes.map((node) => `${node.name}\u0000${node.getAttribute("form") ?? ""}`));
-            const optionValues = nodes.map((node) => node.value);
-            if (names.size !== 1 ||
-                new Set(nodes.map((node) => node.form)).size !== 1 ||
-                new Set(optionValues).size !== optionValues.length)
-                error("ZR_MODEL_CONFLICT", group[0].path, "radio group membership or duplicate value");
-            if (mode === "mount" && model.value !== null && !optionValues.includes(model.value))
-                error("ZR_MODEL_VALUE", group[0].path, "radio model has no option");
-            if (mode === "hydrate" && nodes.filter((node) => node.checked).length > 1)
-                error("ZR_MODEL_CONFLICT", group[0].path, "multiple checked radios");
+    const groupByModel = groupBindings(bindings);
+    if (recovery)
+        recovery.validate(groupByModel, mode, state);
+    else {
+        for (const [model, group] of groupByModel) {
+            const radios = group.every((binding) => binding.kind === "radio");
+            if (group.some((binding) => binding.kind === "radio") && !radios)
+                error("ZR_MODEL_CONFLICT", group[0].path, "radio and non-radio share model");
+            if (radios) {
+                const nodes = group.map((binding) => binding.node);
+                const names = new Set(nodes.map((node) => `${node.name}\u0000${node.getAttribute("form") ?? ""}`));
+                const optionValues = nodes.map((node) => node.value);
+                if (names.size !== 1 ||
+                    new Set(nodes.map((node) => node.form)).size !== 1 ||
+                    new Set(optionValues).size !== optionValues.length)
+                    error("ZR_MODEL_CONFLICT", group[0].path, "radio group membership or duplicate value");
+                if (mode === "mount" &&
+                    model.value !== null &&
+                    !optionValues.includes(model.value))
+                    error("ZR_MODEL_VALUE", group[0].path, "radio model has no option");
+                if (mode === "hydrate" && nodes.filter((node) => node.checked).length > 1)
+                    error("ZR_MODEL_CONFLICT", group[0].path, "multiple checked radios");
+            }
+            else if (mode === "hydrate" &&
+                group.some((binding) => !Object.is(binding.read(), group[0].read())))
+                error("ZR_MODEL_CONFLICT", group[0].path, "shared model controls disagree");
         }
-        else if (mode === "hydrate" &&
-            group.some((binding) => !Object.is(binding.read(), group[0].read())))
-            error("ZR_MODEL_CONFLICT", group[0].path, "shared model controls disagree");
-        if (radios) {
+    }
+    for (const group of groupByModel.values()) {
+        if (group[0].kind === "radio") {
             for (const binding of group) {
                 const originalWrite = binding.write;
                 binding.write = (value) => {
-                    if (value !== null && !optionValuesFor(group).includes(value))
+                    if (value !== null &&
+                        !optionValuesFor(formRecoveries.get(container)?.members(binding) ?? group).includes(value))
                         error("ZR_MODEL_VALUE", binding.path, "radio model has no option");
                     originalWrite(value);
                 };
@@ -248,40 +208,51 @@ export function prepareForms(plans, map, mode, container) {
     }
     return bindings;
 }
-export function reconcileForms(bindings, mode) {
-    const groups = new Map();
-    for (const binding of bindings)
-        groups.set(binding.model, [...(groups.get(binding.model) ?? []), binding]);
+export function reconcileForms(bindings, mode, container) {
+    const groups = groupBindings(bindings);
+    const recovery = formRecoveries.get(container);
+    if (recovery)
+        return recovery.reconcile(groups, mode);
     if (mode === "hydrate")
-        batch(() => {
-            for (const [model, group] of groups) {
-                model.value =
-                    group[0].kind === "radio"
-                        ? (group.find((binding) => binding.read() !== null)?.read() ?? null)
-                        : group[0].read();
-            }
-        });
+        readModels(groups);
     else
         for (const [model, group] of groups)
             for (const binding of group)
                 binding.write(model.value);
 }
+function readModels(groups) {
+    batch(() => {
+        for (const [model, group] of groups)
+            model.value =
+                group[0].kind === "radio"
+                    ? (group.find((binding) => binding.read() !== null)?.read() ?? null)
+                    : group[0].read();
+    });
+}
 export function activateForms(bindings, scope, cleanups, options, container) {
     const byForm = new Map();
-    const owned = radioOwners.get(container.ownerDocument) ??
-        new Set();
-    radioOwners.set(container.ownerDocument, owned);
+    const owned = controlOwners.get(container.ownerDocument) ?? new Set();
+    controlOwners.set(container.ownerDocument, owned);
     const registrations = [];
-    for (const binding of bindings)
-        if (binding.kind === "radio") {
-            const node = binding.node;
-            const registration = { root: container, name: node.name, form: node.form };
-            registrations.push(registration);
-            owned.add(registration);
-        }
+    for (const binding of bindings) {
+        const node = binding.node;
+        const registration = {
+            root: container,
+            name: node.name,
+            form: (node.hasAttribute("form")
+                ? node.ownerDocument.getElementById(node.getAttribute("form"))
+                : node.closest("form")),
+            binding,
+            scope,
+        };
+        registrations.push(registration);
+        owned.add(registration);
+    }
     cleanups.push(() => {
-        for (const registration of registrations)
+        for (const registration of registrations) {
+            registration.binding.live = false;
             owned.delete(registration);
+        }
     });
     for (const binding of bindings) {
         const { node, model } = binding;
@@ -309,20 +280,16 @@ export function activateForms(bindings, scope, cleanups, options, container) {
             unknown = false;
             update();
         };
-        node.addEventListener(binding.event, onInput);
-        if (textual) {
-            node.addEventListener("compositionstart", onStart);
-            node.addEventListener("compositionend", onFinish);
-            node.addEventListener("blur", onFinish);
-        }
+        const listeners = [[binding.event, onInput]];
+        if (textual)
+            listeners.push(["compositionstart", onStart], ["compositionend", onFinish], ["blur", onFinish]);
+        for (const [name, handler] of listeners)
+            node.addEventListener(name, handler);
         cleanups.push(() => {
-            node.removeEventListener(binding.event, onInput);
-            if (textual) {
-                node.removeEventListener("compositionstart", onStart);
-                node.removeEventListener("compositionend", onFinish);
-                node.removeEventListener("blur", onFinish);
-            }
+            for (const [name, handler] of listeners)
+                node.removeEventListener(name, handler);
         });
+        const reportUpdate = (code, actual) => report(options, diagnostic(options, code, "update", `${rootPath(container)}${binding.path}`, "valid model update", actual));
         const subscription = subscribe(() => {
             const value = model.value;
             if (!composing && !unknown) {
@@ -332,14 +299,15 @@ export function activateForms(bindings, scope, cleanups, options, container) {
                 catch (failure) {
                     if (!(failure instanceof FormError))
                         throw failure;
-                    report(options, diagnostic(options, failure.code, "update", `${rootPath(container)}${binding.path}`, "valid model update", failure.detail));
+                    reportUpdate(failure.code, failure.detail);
                 }
             }
         }, {
             active: () => scope.active,
-            report: (code, actual) => report(options, diagnostic(options, code, "update", `${rootPath(container)}${binding.path}`, "valid model update", actual)),
+            report: reportUpdate,
         });
         subscription.run();
+        binding.live = true;
         cleanups.push(() => subscription.dispose());
         const form = node.form;
         if (form)
@@ -350,16 +318,17 @@ export function activateForms(bindings, scope, cleanups, options, container) {
         const onReset = (event) => queueMicrotask(() => {
             if (!active || event.defaultPrevented)
                 return;
-            batch(() => {
-                const groups = new Map();
-                for (const binding of members)
-                    groups.set(binding.model, [...(groups.get(binding.model) ?? []), binding]);
-                for (const [model, group] of groups)
-                    model.value =
-                        group[0].kind === "radio"
-                            ? (group.find((binding) => binding.read() !== null)?.read() ?? null)
-                            : group[0].read();
-            });
+            // A boundary owns only part of a native radio group. Read all current
+            // members after the browser reset, not just this scope's unchecked part.
+            // Keep ownership-local listeners so disposing a replaced attempt still
+            // cancels its queued reset work.
+            const recovery = formRecoveries.get(container);
+            const current = recovery
+                ? [
+                    ...new Set(members.flatMap((binding) => recovery.members(binding) ?? [binding])),
+                ].filter((binding) => binding.node.form === form)
+                : members;
+            readModels(groupBindings(current));
         });
         form.addEventListener("reset", onReset);
         cleanups.push(() => {
@@ -368,4 +337,6 @@ export function activateForms(bindings, scope, cleanups, options, container) {
         });
     }
 }
+const formRecoveries = new WeakMap();
+export const formHost = { controlOwners, error, batch, recoveries: formRecoveries };
 //# sourceMappingURL=forms.js.map