@reformer/core 8.0.0 → 9.0.0-beta.2

package/dist/index.js

@@ -1,9 +1,9 @@
-import { signal as y, computed as h, effect as _, batch as me, Signal as ie } from "@preact/signals-core";
-import { i as B, d as ye, g as Y } from "./behaviors-O9a1Djj9.js";
-import { j as rt, c as nt, k as at, e as ot, m as lt, a as ut, b as ct, r as ht, f as dt, h as ft, s as pt, t as vt, w as mt } from "./behaviors-O9a1Djj9.js";
-import re, { useRef as q, useCallback as S } from "react";
-import { default as gt } from "./validators.js";
-class I {
+import { signal as y, computed as f, effect as _, batch as be, Signal as oe } from "@preact/signals-core";
+import { F as N, E as O, i as G, g as X, d as _e } from "./behaviors-Br4Im38V.js";
+import { j as ot, c as lt, k as ut, e as ct, m as ht, a as dt, b as ft, r as pt, f as vt, h as mt, s as yt, t as gt, u as bt, w as _t } from "./behaviors-Br4Im38V.js";
+import le, { useRef as M, useCallback as E } from "react";
+import { default as At } from "./validators.js";
+class L {
   // ============================================================================
   // Protected состояние (для Template Method паттерна)
   // ============================================================================
@@ -29,33 +29,33 @@ class I {
    * Пользователь взаимодействовал с узлом (touched)
    * Computed из _touched для предоставления readonly интерфейса
    */
-  touched = h(() => this._touched.value);
+  touched = f(() => this._touched.value);
   /**
    * Пользователь не взаимодействовал с узлом (untouched)
    */
-  untouched = h(() => !this._touched.value);
+  untouched = f(() => !this._touched.value);
   /**
    * Значение узла было изменено (dirty)
    * Computed из _dirty для предоставления readonly интерфейса
    */
-  dirty = h(() => this._dirty.value);
+  dirty = f(() => this._dirty.value);
   /**
    * Значение узла не было изменено (pristine)
    */
-  pristine = h(() => !this._dirty.value);
+  pristine = f(() => !this._dirty.value);
   /**
    * Текущий статус узла
    * Computed из _status для предоставления readonly интерфейса
    */
-  status = h(() => this._status.value);
+  status = f(() => this._status.value);
   /**
    * Узел отключен (disabled)
    */
-  disabled = h(() => this._status.value === "disabled");
+  disabled = f(() => this._status.value === "disabled");
   /**
    * Узел включен (enabled)
    */
-  enabled = h(() => this._status.value !== "disabled");
+  enabled = f(() => this._status.value !== "disabled");
   /**
    * Получить ошибки валидации с фильтрацией
    *
@@ -448,7 +448,7 @@ class K {
     this.clear();
   }
 }
-const O = {
+const w = {
   /** FieldNode.watch() */
   Watch: "watch",
   /** FieldNode.computeFrom() */
@@ -462,144 +462,11 @@ const O = {
   /** ArrayNode.watchLength() */
   WatchLength: "watchLength"
 };
-let ge = 0;
-function N(s) {
-  return `${s}-${++ge}`;
+let Ee = 0;
+function k(s) {
+  return `${s}-${++Ee}`;
 }
-var w = /* @__PURE__ */ ((s) => (s.THROW = "throw", s.LOG = "log", s.CONVERT = "convert", s))(w || {});
-class k {
-  /**
-   * Обработать ошибку согласно заданной стратегии
-   *
-   * @param error Ошибка для обработки (Error | string | unknown)
-   * @param context Контекст ошибки для логирования (например, 'AsyncValidator', 'BehaviorRegistry')
-   * @param strategy Стратегия обработки (THROW | LOG | CONVERT)
-   * @returns ValidationError если strategy = CONVERT, undefined если strategy = LOG, никогда не возвращается если strategy = THROW
-   *
-   * @example
-   * ```typescript
-   * // THROW - пробросить ошибку
-   * try {
-   *   riskyOperation();
-   * } catch (error) {
-   *   FormErrorHandler.handle(error, 'RiskyOperation', ErrorStrategy.THROW);
-   *   // Этот код никогда не выполнится
-   * }
-   *
-   * // LOG - залогировать и продолжить
-   * try {
-   *   nonCriticalOperation();
-   * } catch (error) {
-   *   FormErrorHandler.handle(error, 'NonCritical', ErrorStrategy.LOG);
-   *   // Продолжаем выполнение
-   * }
-   *
-   * // CONVERT - конвертировать в ValidationError
-   * try {
-   *   await validator(value);
-   * } catch (error) {
-   *   const validationError = FormErrorHandler.handle(
-   *     error,
-   *     'AsyncValidator',
-   *     ErrorStrategy.CONVERT
-   *   );
-   *   return validationError;
-   * }
-   * ```
-   */
-  static handle(e, t, i = "throw") {
-    const r = this.extractMessage(e);
-    switch (i) {
-      case "throw":
-        throw e;
-      case "log":
-        return;
-      case "convert":
-        return {
-          code: "validator_error",
-          message: r,
-          params: { field: t }
-        };
-    }
-  }
-  /**
-   * Извлечь сообщение из ошибки
-   *
-   * Обрабатывает различные типы ошибок:
-   * - Error объекты → error.message
-   * - Строки → возвращает как есть
-   * - Объекты с message → извлекает message
-   * - Другое → String(error)
-   *
-   * @param error Ошибка для извлечения сообщения
-   * @returns Сообщение ошибки
-   * @private
-   *
-   * @example
-   * ```typescript
-   * FormErrorHandler.extractMessage(new Error('Test'));
-   * // 'Test'
-   *
-   * FormErrorHandler.extractMessage('String error');
-   * // 'String error'
-   *
-   * FormErrorHandler.extractMessage({ message: 'Object error' });
-   * // 'Object error'
-   *
-   * FormErrorHandler.extractMessage(null);
-   * // 'null'
-   * ```
-   */
-  static extractMessage(e) {
-    return e instanceof Error ? e.message : typeof e == "string" ? e : typeof e == "object" && e !== null && "message" in e ? String(e.message) : String(e);
-  }
-  /**
-   * Создать ValidationError с заданными параметрами
-   *
-   * Утилитная функция для создания ValidationError объектов
-   *
-   * @param code Код ошибки
-   * @param message Сообщение ошибки
-   * @param field Поле (опционально)
-   * @returns ValidationError объект
-   *
-   * @example
-   * ```typescript
-   * const error = FormErrorHandler.createValidationError(
-   *   'required',
-   *   'This field is required',
-   *   'email'
-   * );
-   * // { code: 'required', message: 'This field is required', field: 'email' }
-   * ```
-   */
-  static createValidationError(e, t, i) {
-    return {
-      code: e,
-      message: t,
-      params: i ? { field: i } : void 0
-    };
-  }
-  /**
-   * Проверить, является ли объект ValidationError
-   *
-   * Type guard для ValidationError
-   *
-   * @param value Значение для проверки
-   * @returns true если value является ValidationError
-   *
-   * @example
-   * ```typescript
-   * if (FormErrorHandler.isValidationError(result)) {
-   *   console.log(result.code); // OK, типобезопасно
-   * }
-   * ```
-   */
-  static isValidationError(e) {
-    return typeof e == "object" && e !== null && "code" in e && "message" in e && typeof e.code == "string" && typeof e.message == "string";
-  }
-}
-class be {
+class Ae {
   /** Внутренний сигнал статуса */
   _status;
   /** Публичный read-only сигнал статуса */
@@ -616,7 +483,7 @@ class be {
    * @param initial - Начальный статус (по умолчанию 'valid')
    */
   constructor(e = "valid") {
-    this._status = y(e), this.status = h(() => this._status.value), this.valid = h(() => this._status.value === "valid"), this.invalid = h(() => this._status.value === "invalid"), this.pending = h(() => this._status.value === "pending"), this.disabled = h(() => this._status.value === "disabled");
+    this._status = y(e), this.status = f(() => this._status.value), this.valid = f(() => this._status.value === "valid"), this.invalid = f(() => this._status.value === "invalid"), this.pending = f(() => this._status.value === "pending"), this.disabled = f(() => this._status.value === "disabled");
   }
   /**
    * Начать валидацию
@@ -649,7 +516,7 @@ class be {
    * ```
    */
   completeValidation(e) {
-    (this._status.value === "pending" || this._status.value !== "disabled") && (this._status.value = e ? "invalid" : "valid");
+    this._status.value !== "disabled" && (this._status.value = e ? "invalid" : "valid");
   }
   /**
    * Установить ошибки напрямую (без перехода через pending)
@@ -744,7 +611,7 @@ class be {
     return this._status.value !== "disabled";
   }
 }
-class _e extends I {
+class Se extends L {
   // ============================================================================
   // Приватные сигналы
   // ============================================================================
@@ -752,7 +619,6 @@ class _e extends I {
   _errors;
   // _touched, _dirty наследуются от FormNode (protected)
   // _status управляется через statusMachine
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   _componentProps;
   /**
    * State machine для управления статусом поля
@@ -772,7 +638,6 @@ class _e extends I {
   disabled;
   // touched, dirty наследуются от FormNode
   errors;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   componentProps;
   /**
    * Вычисляемое свойство: нужно ли показывать ошибку
@@ -804,7 +669,7 @@ class _e extends I {
   // Конструктор
   // ============================================================================
   constructor(e) {
-    super(), this.validators = e.validators || [], this.asyncValidators = e.asyncValidators || [], this.updateOn = e.updateOn || "blur", this.debounceMs = e.debounce || 0, this.component = e.component, this._value = e.valueSignal ?? y(e.value), this.initialValue = this._value.peek(), this._errors = y([]), this._componentProps = y(e.componentProps || {}), this.statusMachine = new be(e.disabled ? "disabled" : "valid"), this.value = h(() => this._value.value), this.valid = h(() => this.statusMachine.valid.value), this.invalid = h(() => this.statusMachine.invalid.value), this.pending = h(() => this.statusMachine.pending.value), this.status = h(() => this.statusMachine.status.value), this.disabled = h(() => this.statusMachine.disabled.value), this.errors = h(() => this._errors.value), this.componentProps = h(() => this._componentProps.value), this.shouldShowError = h(
+    super(), this.validators = e.validators || [], this.asyncValidators = e.asyncValidators || [], this.updateOn = e.updateOn || "blur", this.debounceMs = e.debounce || 0, this.component = e.component, this._value = e.valueSignal ?? y(e.value), this.initialValue = this._value.peek(), this._errors = y([]), this._componentProps = y(e.componentProps || {}), this.statusMachine = new Ae(e.disabled ? "disabled" : "valid"), this.value = f(() => this._value.value), this.valid = f(() => this.statusMachine.valid.value), this.invalid = f(() => this.statusMachine.invalid.value), this.pending = f(() => this.statusMachine.pending.value), this.status = f(() => this.statusMachine.status.value), this.disabled = f(() => this.statusMachine.disabled.value), this.errors = f(() => this._errors.value), this.componentProps = f(() => this._componentProps.value), this.shouldShowError = f(
       () => this.statusMachine.invalid.value && (this._touched.value || this._dirty.value)
     );
   }
@@ -949,14 +814,14 @@ class _e extends I {
     e || this.currentAbortController?.abort(), this.currentAbortController = t;
     const { signal: i } = t, r = [];
     for (const a of this.validators) {
-      const o = a(this._value.value);
-      o && r.push(o);
+      const l = a(this._value.value);
+      l && r.push(l);
     }
     if (i.aborted)
       return !1;
     if (r.length > 0) {
       this._errors.value = r;
-      const a = r.some((o) => o.severity !== "warning");
+      const a = r.some((l) => l.severity !== "warning");
       if (this.statusMachine.setErrors(a), a)
         return !1;
     }
@@ -966,32 +831,32 @@ class _e extends I {
       this.statusMachine.startValidation();
       try {
         const a = await Promise.all(
-          this.asyncValidators.map(async (l) => {
+          this.asyncValidators.map(async (c) => {
             if (i.aborted)
               throw new DOMException("Validation aborted", "AbortError");
             try {
-              const u = await l(this._value.value, { signal: i });
+              const u = await c(this._value.value, { signal: i });
               if (i.aborted)
                 throw new DOMException("Validation aborted", "AbortError");
               return u;
             } catch (u) {
               if (u instanceof DOMException && u.name === "AbortError")
                 throw u;
-              return k.handle(
+              return N.handle(
                 u,
                 "FieldNode AsyncValidator",
-                w.CONVERT
+                O.CONVERT
               );
             }
           })
         );
         if (i.aborted)
           return !1;
-        const o = a.filter(Boolean);
-        if (o.length > 0) {
-          this._errors.value = o;
-          const l = o.some((u) => u.severity !== "warning");
-          if (this.statusMachine.completeValidation(l), l)
+        const l = a.filter((c) => c !== null);
+        if (l.length > 0) {
+          this._errors.value = l;
+          const c = l.some((u) => u.severity !== "warning");
+          if (this.statusMachine.completeValidation(c), c)
             return !1;
         }
       } catch (a) {
@@ -1048,7 +913,6 @@ class _e extends I {
    * });
    * ```
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   updateComponentProps(e) {
     this._componentProps.value = {
       ...this._componentProps.value,
@@ -1125,7 +989,7 @@ class _e extends I {
     const t = new AbortController(), i = _(() => {
       const n = this.value.value;
       e(n, t.signal);
-    }), r = N(O.Watch);
+    }), r = k(w.Watch);
     return this.disposers.add(r, () => {
       t.abort(), i();
     });
@@ -1154,9 +1018,9 @@ class _e extends I {
    */
   computeFrom(e, t) {
     const i = _(() => {
-      const n = e.map((o) => o.value), a = t(...n);
+      const n = e.map((l) => l.value), a = t(...n);
       this.setValue(a, { emitEvent: !1 });
-    }), r = N(O.ComputeFrom);
+    }), r = k(w.ComputeFrom);
     return this.disposers.add(r, i);
   }
   /**
@@ -1188,45 +1052,58 @@ class _e extends I {
   }
 }
 function H(s) {
-  const { getChildren: e, ownErrors: t, disabled: i } = s, r = h(() => t.value.length > 0 ? !1 : e().every((c) => c.disabled.value || c.valid.value)), n = h(() => !r.value), a = h(() => e().some((c) => c.pending.value)), o = h(() => e().some((c) => c.touched.value)), l = h(() => e().some((c) => c.dirty.value)), u = h(() => {
-    const c = [...t.value];
-    for (const f of e())
-      c.push(...f.errors.value);
-    return c;
-  }), m = h(() => i?.value ? "disabled" : a.value ? "pending" : n.value ? "invalid" : "valid");
+  const { getChildren: e, ownErrors: t, disabled: i } = s, r = f(() => t.value.length > 0 ? !1 : e().every((o) => o.disabled.value || o.valid.value)), n = f(() => !r.value), a = f(() => e().some((o) => o.pending.value)), l = f(() => e().some((o) => o.touched.value)), c = f(() => e().some((o) => o.dirty.value)), u = f(() => {
+    const o = [...t.value];
+    for (const v of e())
+      o.push(...v.errors.value);
+    return o;
+  }), d = f(() => i?.value ? "disabled" : a.value ? "pending" : n.value ? "invalid" : "valid");
   return {
     valid: r,
     invalid: n,
     pending: a,
-    touched: o,
-    dirty: l,
+    touched: l,
+    dirty: c,
     errors: u,
-    status: m
+    status: d
   };
 }
-function Ee(s) {
+function Z(s) {
   return typeof s == "object" && s !== null && "getProxy" in s && typeof s.getProxy == "function";
 }
-function Ae(s, e) {
+const ee = "$";
+function we(s, e) {
+  let t;
+  const i = () => {
+    if (!t) {
+      const r = {};
+      e.forEach((n, a) => {
+        r[a] = n && Z(n) ? n.getProxy() : n;
+      }), t = r;
+    }
+    return t;
+  };
   return new Proxy(s, {
-    get: (t, i) => {
-      if (i in t)
-        return t[i];
-      if (typeof i == "string" && e.has(i)) {
-        const r = e.get(i);
-        return r && Ee(r) ? r.getProxy() : r;
+    get: (r, n) => {
+      if (n === ee)
+        return i();
+      if (n in r)
+        return r[n];
+      if (typeof n == "string" && e.has(n)) {
+        const a = e.get(n);
+        return a && Z(a) ? a.getProxy() : a;
       }
     },
-    set: (t, i, r) => typeof i == "string" && e.has(i) ? !1 : (t[i] = r, !0),
-    has: (t, i) => typeof i == "string" && e.has(i) ? !0 : i in t,
-    ownKeys: (t) => {
-      const i = Reflect.ownKeys(t), r = Array.from(e.keys());
-      return [.../* @__PURE__ */ new Set([...i, ...r])];
+    set: (r, n, a) => typeof n == "string" && e.has(n) ? !1 : (r[n] = a, !0),
+    has: (r, n) => n === ee || typeof n == "string" && e.has(n) ? !0 : n in r,
+    ownKeys: (r) => {
+      const n = Reflect.ownKeys(r), a = Array.from(e.keys());
+      return [.../* @__PURE__ */ new Set([...n, ...a])];
     },
-    getOwnPropertyDescriptor: (t, i) => typeof i == "string" && e.has(i) ? { enumerable: !0, configurable: !0 } : Reflect.getOwnPropertyDescriptor(t, i)
+    getOwnPropertyDescriptor: (r, n) => typeof n == "string" && e.has(n) ? { enumerable: !0, configurable: !0 } : Reflect.getOwnPropertyDescriptor(r, n)
   });
 }
-class Se {
+class ke {
   /**
    * @param form - Форма для отправки
    */
@@ -1236,7 +1113,7 @@ class Se {
   /** Внутренний сигнал состояния отправки */
   _submitting = y(!1);
   /** Публичный read-only сигнал состояния отправки */
-  submitting = h(() => this._submitting.value);
+  submitting = f(() => this._submitting.value);
   /**
    * Отправить форму
    *
@@ -1248,7 +1125,12 @@ class Se {
    *
    * @param onSubmit - Callback для отправки данных
    * @param options - Опции submit
-   * @returns Результат от onSubmit или null если валидация не пройдена
+   * @returns Результат от onSubmit или `null` если валидация не пройдена
+   *
+   * @remarks
+   * Возвращаемый `null` неоднозначен: он сигналит и провал валидации, и легитимный `null`,
+   * который вернул `onSubmit` (или void-обработчик). Чтобы различать эти случаи, используйте
+   * {@link submitWithResult} — он отдаёт явный флаг `success`.
    *
    * @example
    * ```typescript
@@ -1324,7 +1206,7 @@ class Se {
     return this._submitting.value;
   }
 }
-function we(s) {
+function Ve(s) {
   const e = [];
   for (const t of s.split(".")) {
     const i = /^([^[\]]+)(?:\[(\d+)\])?$/.exec(t);
@@ -1333,7 +1215,7 @@ function we(s) {
   }
   return e;
 }
-let x = class ne extends I {
+let P = class ue extends L {
   // ============================================================================
   // Приватные поля
   // ============================================================================
@@ -1358,7 +1240,7 @@ let x = class ne extends I {
   /**
    * Фабрика для создания узлов формы
    */
-  nodeFactory = new ke();
+  nodeFactory = new Ne();
   // ============================================================================
   // Приватные сигналы состояния (inline из StateManager)
   // ============================================================================
@@ -1369,6 +1251,19 @@ let x = class ne extends I {
   _disabled = y(!1);
   /** Form-level validation errors */
   _formErrors = y([]);
+  /**
+   * M1: валидация уровня модели/схемы (`validateFormModel(model, schema)`). Привязывается
+   * `createForm({ model, schema })`, т.к. под M1 валидаторы срезаны с FieldNode и живут на слое
+   * модели. Без неё `validate()`/`submit()` пропускали бы все schema-валидаторы. @internal
+   */
+  _modelValidate;
+  /**
+   * M1: связь листовой ноды-ребёнка → её сигнал модели (тот, что помечает `markDerived`).
+   * Нужна bulk-сеттерам (`setValue`/`patchValue`), чтобы корректно определять derived-поля:
+   * `field.value` — computed-обёртка, отличная от записываемого сигнала модели. @internal
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  _fieldSignals = /* @__PURE__ */ new WeakMap();
   // ============================================================================
   // Публичные computed signals
   // ============================================================================
@@ -1382,24 +1277,24 @@ let x = class ne extends I {
   status;
   submitting;
   constructor(e) {
-    super(), this.formSubmitter = new Se(this);
-    const i = "form" in e ? e.form : e;
-    for (const [n, a] of Object.entries(i)) {
-      const o = this.createNode(a);
-      this._fields.set(n, o);
+    super(), this.formSubmitter = new ke(this);
+    const t = e.form, i = t != null && typeof t == "object" && ("valueSignal" in t || "value" in t), n = "form" in e && !i ? e.form : e;
+    for (const [l, c] of Object.entries(n)) {
+      const u = this.createNode(c);
+      this._fields.set(l, u);
     }
-    this.value = h(() => {
-      const n = {};
-      return this._fields.forEach((a, o) => {
-        n[o] = a.value.value;
-      }), n;
+    this.value = f(() => {
+      const l = {};
+      return this._fields.forEach((c, u) => {
+        l[u] = c.value.value;
+      }), l;
     });
-    const r = H({
+    const a = H({
       getChildren: () => Array.from(this._fields.values()),
       ownErrors: this._formErrors,
       disabled: this._disabled
     });
-    this.valid = r.valid, this.invalid = r.invalid, this.pending = r.pending, this.touched = r.touched, this.dirty = r.dirty, this.errors = r.errors, this.status = r.status, this.submitting = this.formSubmitter.submitting;
+    this.valid = a.valid, this.invalid = a.invalid, this.pending = a.pending, this.touched = a.touched, this.dirty = a.dirty, this.errors = a.errors, this.status = a.status, this.submitting = this.formSubmitter.submitting;
   }
   // ============================================================================
   // Приватный метод для создания Proxy
@@ -1409,7 +1304,7 @@ let x = class ne extends I {
    * @see buildFormProxy
    */
   buildProxy() {
-    return Ae(this, this._fields);
+    return we(this, this._fields);
   }
   // ============================================================================
   // Реализация абстрактных методов FormNode
@@ -1424,17 +1319,19 @@ let x = class ne extends I {
     for (const [i, r] of Object.entries(e)) {
       const n = this._fields.get(i);
       if (n) {
-        if (B(n.value)) continue;
+        const a = this._fieldSignals.get(n) ?? n.value;
+        if (G(a)) continue;
         n.setValue(r, t);
       }
     }
   }
   patchValue(e) {
-    me(() => {
+    be(() => {
       for (const [t, i] of Object.entries(e)) {
         const r = this._fields.get(t);
         if (r && i !== void 0) {
-          if (B(r.value)) continue;
+          const n = this._fieldSignals.get(r) ?? r.value;
+          if (G(n)) continue;
           r.setValue(i, { emitEvent: !1 });
         }
       }
@@ -1458,7 +1355,7 @@ let x = class ne extends I {
    * ```
    */
   reset(e) {
-    this._fields.forEach((t, i) => {
+    this._formErrors.value = [], this._fields.forEach((t, i) => {
       const r = e?.[i];
       t.reset(r);
     });
@@ -1467,14 +1364,16 @@ let x = class ne extends I {
    * Сбросить форму к исходным значениям (initialValues)
    */
   resetToInitial() {
-    this._fields.forEach((e) => {
+    this._formErrors.value = [], this._fields.forEach((e) => {
       "resetToInitial" in e && typeof e.resetToInitial == "function" ? e.resetToInitial() : e.reset();
     });
   }
   async validate() {
-    return this.clearErrors(), await Promise.all(Array.from(this._fields.values()).map((e) => e.validate())), Array.from(this._fields.values()).every(
-      (e) => e.valid.value || e.disabled.value
+    this.clearErrors(), await Promise.all(Array.from(this._fields.values()).map((i) => i.validate()));
+    const e = this._modelValidate ? await this._modelValidate() : !0, t = Array.from(this._fields.values()).every(
+      (i) => i.valid.value || i.disabled.value
     );
+    return e && t;
   }
   /**
    * Установить form-level validation errors
@@ -1556,7 +1455,12 @@ let x = class ne extends I {
    *
    * @param onSubmit - Callback для отправки данных
    * @param options - Опции submit (skipValidation, skipTouch)
-   * @returns Результат от onSubmit или null если валидация не пройдена
+   * @returns Результат от onSubmit или `null` если валидация не пройдена
+   *
+   * @remarks
+   * `null` перегружен: он означает и «валидация не пройдена», и легитимный `null`-результат
+   * `onSubmit` (или void-обработчик). Если вызывающей стороне нужно различать эти случаи —
+   * используйте {@link submitWithResult}, который возвращает явный флаг `success`.
    */
   async submit(e, t) {
     return this.formSubmitter.submit(e, t);
@@ -1603,12 +1507,12 @@ let x = class ne extends I {
   getFieldByPath(e) {
     if (e.startsWith(".") || e.endsWith("."))
       return;
-    const t = we(e);
+    const t = Ve(e);
     if (t.length === 0)
       return;
     let i = this;
     for (const r of t) {
-      if (!(i instanceof ne) || (i = i.getField(r.key), !i)) return;
+      if (!(i instanceof ue) || (i = i.getField(r.key), !i)) return;
       if (r.index !== void 0)
         if ("at" in i && "length" in i && typeof i.at == "function") {
           const n = i.at(r.index);
@@ -1649,14 +1553,14 @@ let x = class ne extends I {
   linkFields(e, t, i) {
     const r = this._fields.get(e), n = this._fields.get(t);
     if (!r || !n) {
-      const l = r ? t : e;
-      throw new Error(`GroupNode.linkFields: field "${String(l)}" not found`);
+      const c = r ? t : e;
+      throw new Error(`GroupNode.linkFields: field "${String(c)}" not found`);
     }
     const a = _(() => {
-      const l = r.value.value, u = i ? i(l) : l;
+      const c = r.value.value, u = i ? i(c) : c;
       n.setValue(u, { emitEvent: !1 });
-    }), o = N(O.LinkFields);
-    return this.disposers.add(o, a);
+    }), l = k(w.LinkFields);
+    return this.disposers.add(l, a);
   }
   /**
    * Подписка на изменения вложенного поля по строковому пути
@@ -1685,14 +1589,27 @@ let x = class ne extends I {
    * useEffect(() => dispose, []);
    * ```
    */
+  /** Подписка на top-level поле — value типизирован как `T[K]`. */
   watchField(e, t) {
     const i = this.getFieldByPath(e);
     if (!i)
       throw new Error(`GroupNode.watchField: field "${e}" not found`);
     const r = _(() => {
-      const a = i.value.value;
-      t(a);
-    }), n = N(O.WatchField);
+      t(i.value.value);
+    }), n = k(w.WatchField);
+    return this.disposers.add(n, r);
+  }
+  /**
+   * Подписка на вложенное поле по строковому пути ("address.city").
+   * Путь нельзя выразить в типах узла → value честно `unknown`, потребитель сужает.
+   */
+  watchFieldByPath(e, t) {
+    const i = this.getFieldByPath(e);
+    if (!i)
+      throw new Error(`GroupNode.watchFieldByPath: field "${e}" not found`);
+    const r = _(() => {
+      t(i.value.value);
+    }), n = k(w.WatchField);
     return this.disposers.add(n, r);
   }
   /**
@@ -1714,6 +1631,24 @@ let x = class ne extends I {
   attachBehaviorCleanup(e) {
     this._behaviorCleanup = e;
   }
+  /**
+   * Прикрепить валидацию уровня модели/схемы (M1). Вызывается `createForm({ model, schema })`,
+   * чтобы `validate()`/`submit()` прогоняли schema-валидаторы (`validateFormModel`), а не только
+   * пустые FieldNode. Возвращаемый флаг — валидна ли модель по схеме.
+   * @internal
+   */
+  attachModelValidator(e) {
+    this._modelValidate = e;
+  }
+  /**
+   * Связать листовую ноду-ребёнка с её сигналом модели (M1). Вызывается `createForm` для каждого
+   * листового поля на его владеющей группе — используется bulk-сеттерами для derived-guard (F9).
+   * @internal
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  registerFieldSignal(e, t) {
+    this._fieldSignals.set(e, t);
+  }
   /**
    * Очистить все ресурсы узла
    */
@@ -1722,7 +1657,7 @@ let x = class ne extends I {
       "dispose" in e && typeof e.dispose == "function" && e.dispose();
     });
   }
-}, Q = class extends I {
+}, te = class extends L {
   // ============================================================================
   // Приватные поля
   // ============================================================================
@@ -1760,7 +1695,7 @@ let x = class ne extends I {
     super(), this.itemSchema = e, this.initialItems = t, this.items = y([]);
     for (const r of t)
       this.push(r);
-    this.length = h(() => this.items.value.length), this.value = h(() => this.items.value.map((r) => r.value.value));
+    this.length = f(() => this.items.value.length), this.value = f(() => this.items.value.map((r) => r.value.value));
     const i = H({
       getChildren: () => this.items.value,
       ownErrors: this._arrayErrors
@@ -1787,12 +1722,12 @@ let x = class ne extends I {
    */
   removeAt(e) {
     if (e < 0 || e >= this.items.value.length) {
-      k.handle(
+      N.handle(
         new Error(
           `ArrayNode.removeAt: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.removeAt",
-        w.LOG
+        O.LOG
       );
       return;
     }
@@ -1806,12 +1741,12 @@ let x = class ne extends I {
    */
   insert(e, t) {
     if (e < 0 || e > this.items.value.length) {
-      k.handle(
+      N.handle(
         new Error(
           `ArrayNode.insert: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.insert",
-        w.LOG
+        O.LOG
       );
       return;
     }
@@ -1837,10 +1772,10 @@ let x = class ne extends I {
   move(e, t) {
     const i = this.items.value.length;
     if (e < 0 || e >= i || t < 0 || t >= i) {
-      k.handle(
+      N.handle(
         new Error(`ArrayNode.move: index out of bounds (from=${e}, to=${t}, length=${i})`),
         "ArrayNode.move",
-        w.LOG
+        O.LOG
       );
       return;
     }
@@ -1865,10 +1800,10 @@ let x = class ne extends I {
   swap(e, t) {
     const i = this.items.value.length;
     if (e < 0 || e >= i || t < 0 || t >= i) {
-      k.handle(
+      N.handle(
         new Error(`ArrayNode.swap: index out of bounds (a=${e}, b=${t}, length=${i})`),
         "ArrayNode.swap",
-        w.LOG
+        O.LOG
       );
       return;
     }
@@ -1906,7 +1841,7 @@ let x = class ne extends I {
   }
   setValue(e, t) {
     this.clear(), e.forEach((i) => this.push(i)), t?.emitEvent !== !1 && this.validate().catch((i) => {
-      k.handle(i, "ArrayNode.setValue", w.LOG);
+      N.handle(i, "ArrayNode.setValue", O.LOG);
     });
   }
   patchValue(e) {
@@ -1966,7 +1901,7 @@ let x = class ne extends I {
     this._arrayErrors.value = [], this.clear(), this.initialItems.forEach((e) => this.push(e));
   }
   async validate() {
-    return (await Promise.all(this.items.value.map((t) => t.validate()))).every(Boolean);
+    return (await Promise.all(this.items.value.map((t) => t.validate()))).every(Boolean) && this._arrayErrors.value.length === 0;
   }
   /**
    * Установить array-level validation errors
@@ -2064,7 +1999,7 @@ let x = class ne extends I {
    */
   createItem(e) {
     if (this.isGroupSchema(this.itemSchema)) {
-      const t = new x(this.itemSchema);
+      const t = new P(this.itemSchema);
       return e && t.patchValue(e), this.validationSchemaFn && "applyValidationSchema" in t && t.applyValidationSchema(this.validationSchemaFn), this.behaviorSchemaFn && "applyBehaviorSchema" in t && t.applyBehaviorSchema(this.behaviorSchemaFn), t;
     }
     throw new Error(
@@ -2153,11 +2088,11 @@ let x = class ne extends I {
   watchItems(e, t) {
     const i = _(() => {
       const n = this.items.value.map((a) => {
-        if (a instanceof x)
+        if (a instanceof P)
           return a.getFieldByPath(e)?.value.value;
       });
       t(n);
-    }), r = N(O.WatchItems);
+    }), r = k(w.WatchItems);
     return this.disposers.add(r, i);
   }
   /**
@@ -2186,7 +2121,7 @@ let x = class ne extends I {
     const t = _(() => {
       const r = this.length.value;
       e(r);
-    }), i = N(O.WatchLength);
+    }), i = k(w.WatchLength);
     return this.disposers.add(i, t);
   }
   /**
@@ -2250,7 +2185,7 @@ let x = class ne extends I {
     });
   }
 };
-class ke {
+class Ne {
   /**
    * Создает узел формы на основе конфигурации
    *
@@ -2300,16 +2235,14 @@ class ke {
     if (Array.isArray(e) && e.length >= 1)
       return this.createArrayNodeFromArray(e);
     if (this.isFieldConfig(e))
-      return new _e(e);
-    if (this.isArrayConfig(e)) {
-      const t = e;
-      return new Q(
-        t.schema,
-        t.initialItems
+      return new Se(e);
+    if (this.isArrayConfig(e))
+      return new te(
+        e.schema,
+        e.initialItems
       );
-    }
     if (this.isGroupConfig(e))
-      return new x(e);
+      return new P(e);
     throw new Error(
       `NodeFactory: Unknown node config. Expected FieldConfig, GroupConfig, or ArrayConfig, but got: ${JSON.stringify(
         e
@@ -2347,7 +2280,7 @@ class ke {
     this.isGroupConfig(t) && r.push(this.extractValues(t));
     for (const n of i)
       this.isGroupConfig(n) ? r.push(this.extractValues(n)) : r.push(n);
-    return new Q(t, r);
+    return new te(t, r);
   }
   /**
    * Извлечь значения из схемы (рекурсивно)
@@ -2411,7 +2344,7 @@ class ke {
    * ```
    */
   isFieldConfig(e) {
-    return e == null || typeof e != "object" ? !1 : "valueSignal" in e ? !0 : "value" in e && "component" in e;
+    return e == null || typeof e != "object" ? !1 : "valueSignal" in e ? !0 : "value" in e ? "component" in e || "componentProps" in e || "validators" in e || "asyncValidators" in e || "updateOn" in e || "debounce" in e : !1;
   }
   /**
    * Проверяет, является ли конфиг конфигурацией массива (ArrayConfig)
@@ -2466,28 +2399,28 @@ class ke {
     return e != null && typeof e == "object" && !this.isFieldConfig(e) && !this.isArrayConfig(e);
   }
 }
-function D(s) {
+function R(s) {
   return s == null ? !1 : typeof s == "object" && "value" in s && "setValue" in s && "getValue" in s && "validate" in s;
 }
-function Ve(s) {
-  return s == null ? !1 : D(s) && "validators" in s && "asyncValidators" in s && // FieldNode имеет markAsTouched метод
+function Oe(s) {
+  return s == null ? !1 : R(s) && "validators" in s && "asyncValidators" in s && // FieldNode имеет markAsTouched метод
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   typeof s.markAsTouched == "function" && // У FieldNode нет fields или items
   !("fields" in s) && !("items" in s);
 }
-function Oe(s) {
-  return s == null ? !1 : D(s) && "getFieldByPath" in s && "fields" in s && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
+function Fe(s) {
+  return s == null ? !1 : R(s) && "getFieldByPath" in s && "fields" in s && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
   !("items" in s) && !("push" in s) && !("removeAt" in s);
 }
-function Ne(s) {
-  return s == null ? !1 : D(s) && "items" in s && "length" in s && "push" in s && "removeAt" in s && "at" in s && // eslint-disable-next-line @typescript-eslint/no-explicit-any
+function Me(s) {
+  return s == null ? !1 : R(s) && "items" in s && "length" in s && "push" in s && "removeAt" in s && "at" in s && // eslint-disable-next-line @typescript-eslint/no-explicit-any
   typeof s.push == "function" && // eslint-disable-next-line @typescript-eslint/no-explicit-any
   typeof s.removeAt == "function";
 }
-function He(s) {
-  return Ve(s) ? "FieldNode" : Oe(s) ? "GroupNode" : Ne(s) ? "ArrayNode" : D(s) ? "FormNode" : "Unknown";
+function Qe(s) {
+  return Oe(s) ? "FieldNode" : Fe(s) ? "GroupNode" : Me(s) ? "ArrayNode" : R(s) ? "FormNode" : "Unknown";
 }
-class Fe extends I {
+class Pe extends L {
   /**
    * @param control Реактивный массив модели (`model.<path>`).
    * @param buildItem Строитель формы элемента по его под-модели (инъекция, чтобы избежать цикла
@@ -2495,15 +2428,21 @@ class Fe extends I {
    */
   constructor(e, t) {
     super(), this.control = e, this.buildItem = t, this.initial = e.toArray(), this.disposeSync = _(() => {
-      const r = e.length, n = [];
-      for (let a = 0; a < r; a++) {
-        const o = e.at(a);
-        if (!o) continue;
-        let l = this.cache.get(o);
-        l || (l = t(o), this.cache.set(o, l)), n.push(l);
+      const r = e.length, n = [], a = [];
+      for (let u = 0; u < r; u++) {
+        const d = e.at(u);
+        if (!d) continue;
+        let o = this.cache.get(d);
+        o || (o = t(d), this.cache.set(d, o)), n.push(d), a.push(o);
       }
-      this.itemNodes.value = n;
-    }), this.length = h(() => this.itemNodes.value.length), this.value = h(() => this.itemNodes.value.map((r) => r.value.value));
+      const l = new Set(n), c = [];
+      for (const u of this.mountedModels) {
+        if (l.has(u)) continue;
+        const d = this.cache.get(u);
+        this.cache.delete(u), d && c.push(d);
+      }
+      this.mountedModels = n, this.itemNodes.value = a, c.forEach((u) => this.disposeItemNode(u));
+    }), this.length = f(() => this.itemNodes.value.length), this.value = f(() => this.itemNodes.value.map((r) => r.value.value));
     const i = H({
       getChildren: () => this.itemNodes.value,
       ownErrors: this._arrayErrors
@@ -2513,6 +2452,9 @@ class Fe extends I {
   itemNodes = y([]);
   // Кэш per-item формы по идентичности фасада под-модели (фасады кэшируются в core).
   cache = /* @__PURE__ */ new WeakMap();
+  // Фасады под-моделей, для которых сейчас смонтированы формы — «предыдущий» набор для
+  // реконсиляции в disposeSync. Выпавшие из массива элементы диспозятся и вытесняются из кэша.
+  mountedModels = [];
   initial;
   _arrayErrors = y([]);
   disposeSync;
@@ -2598,21 +2540,132 @@ class Fe extends I {
     );
   }
   // ── Hooks (forward к элементам) ────────────────────────────────────────────
+  // Агрегатное состояние (touched/dirty/status) выводится из детей (createAggregateSignals), поэтому
+  // базовые сигналы бесполезны для чтения — состояние меняется ТОЛЬКО через per-item формы. Форвардим
+  // ВСЕ hook'и (как ArrayNode), иначе markAsUntouched/Pristine/Dirty/disable/enable молча no-op.
   onMarkAsTouched() {
     this.itemNodes.value.forEach(
       (e) => e.markAsTouched?.()
     );
   }
-  /** Очистка подписки синхронизации. */
+  onMarkAsUntouched() {
+    this.itemNodes.value.forEach(
+      (e) => e.markAsUntouched?.()
+    );
+  }
+  onMarkAsDirty() {
+    this.itemNodes.value.forEach(
+      (e) => e.markAsDirty?.()
+    );
+  }
+  onMarkAsPristine() {
+    this.itemNodes.value.forEach(
+      (e) => e.markAsPristine?.()
+    );
+  }
+  onDisable() {
+    this.itemNodes.value.forEach((e) => e.disable?.());
+  }
+  onEnable() {
+    this.itemNodes.value.forEach((e) => e.enable?.());
+  }
+  /** Диспозит форму элемента (эффекты/поведения/вложенные подписки); терпима к не-GroupNode. */
+  disposeItemNode(e) {
+    e.dispose?.();
+  }
+  /**
+   * Очистка подписки синхронизации И детерминированный teardown всех форм элементов.
+   * Без пробрасывания dispose в itemNodes эффекты/поведения каждой формы элемента (в т.ч. disposeSync
+   * вложенных ModelArrayNode) остались бы жить после teardown формы — утечка подписок.
+   */
   dispose() {
-    this.disposeSync();
+    this.disposeSync(), this.itemNodes.value.forEach((e) => this.disposeItemNode(e)), this.mountedModels = [];
   }
 }
-const ae = (s) => s !== null && typeof s == "object" && !Array.isArray(s) && !(s instanceof Date) && !(typeof Blob < "u" && s instanceof Blob) && !(typeof File < "u" && s instanceof File);
-function G(s, e, t) {
+const xe = (s) => {
+  const e = s.componentProps;
+  return e != null && typeof e == "object" && typeof e.itemComponent == "function" && e.control != null && typeof e.control.at == "function" && typeof e.control.length == "number";
+}, Ce = (s) => typeof s.when == "function" && Array.isArray(s.children);
+function F(s, e, t, i, r) {
   if (s == null || typeof s != "object") return;
   if (Array.isArray(s)) {
-    for (const n of s) G(n, e, t);
+    for (const a of s) F(a, e, t, i, r);
+    return;
+  }
+  const n = s;
+  if (Ce(n)) {
+    const a = i && !!n.when(e, t);
+    for (const l of n.children) F(l, e, t, a, r);
+    return;
+  }
+  if (xe(n)) {
+    const a = n.componentProps.control, l = n.componentProps.itemComponent, c = a.length;
+    for (let u = 0; u < c; u++) {
+      const d = a.at(u);
+      F(l(d), d, t, i, r);
+    }
+    return;
+  }
+  if (n.value instanceof oe) {
+    const a = n.validators ?? [], l = n.asyncValidators ?? [], c = l.length ? [...a, ...l] : a;
+    c.length > 0 && (i ? r.tasks.push({ signal: n.value, validators: c, scope: e }) : r.clearSignals.push(n.value));
+    for (const [u, d] of Object.entries(n))
+      u === "value" || u === "validators" || u === "asyncValidators" || F(d, e, t, i, r);
+    return;
+  }
+  for (const a of Object.values(n)) F(a, e, t, i, r);
+}
+function z(s, e) {
+  const t = { tasks: [], clearSignals: [] };
+  return F(e, s, s, !0, t), t;
+}
+const ce = (s, e, t) => {
+  (s[e] ??= []).push(t);
+}, J = (s) => {
+  for (const e of Object.values(s))
+    for (const t of e) if (t.severity !== "warning") return !0;
+  return !1;
+};
+function Xe(s, e) {
+  const { tasks: t } = z(s, e), i = {};
+  for (const { signal: r, validators: n, scope: a } of t) {
+    const l = r.peek();
+    for (const c of n) {
+      const u = c(l, a, s);
+      u && typeof u.then == "function" || u && ce(i, r.__path, u);
+    }
+  }
+  return { valid: !J(i), errors: i };
+}
+async function Ze(s, e) {
+  const { tasks: t } = z(s, e), i = await he(t, s);
+  return { valid: !J(i), errors: i };
+}
+async function he(s, e) {
+  const t = {};
+  return await Promise.all(
+    s.map(async ({ signal: i, validators: r, scope: n }) => {
+      const a = i.peek();
+      for (const l of r) {
+        const c = await l(a, n, e);
+        c && ce(t, i.__path, c);
+      }
+    })
+  ), t;
+}
+async function Te(s, e) {
+  const { tasks: t, clearSignals: i } = z(s, e), r = await he(t, s);
+  for (const { signal: n } of t)
+    X(n)?.setErrors(r[n.__path] ?? []);
+  for (const n of i)
+    X(n)?.setErrors([]);
+  return { valid: !J(r), errors: r };
+}
+const de = (s) => s !== null && typeof s == "object" && !Array.isArray(s) && !(s instanceof Date) && !(typeof Blob < "u" && s instanceof Blob) && !(typeof File < "u" && s instanceof File);
+function U(s, e, t) {
+  if (s == null || typeof s != "object") return;
+  if (Array.isArray(s)) {
+    for (const n of s) U(n, e, t);
     return;
   }
   const i = s, r = i.array;
@@ -2620,7 +2673,7 @@ function G(s, e, t) {
     t.set(r.__path, i.item);
     return;
   }
-  i.value instanceof ie && e.set(i.value, {
+  i.value instanceof oe ? e.set(i.value, {
     component: i.component,
     componentProps: i.componentProps,
     validators: i.validators,
@@ -2628,79 +2681,89 @@ function G(s, e, t) {
     updateOn: i.updateOn,
     disabled: i.disabled,
     debounce: i.debounce
-  });
+  }) : process.env.NODE_ENV !== "production" && i.component !== void 0 && ("valueSignal" in i || i.value != null) && console.warn(
+    "[reformer] createForm({ schema }): узел с `component` не распознан как поле — `value` не является сигналом модели. Ожидается `value: model.$.<path>`; проверьте, что не передан `value: model.<path>` (value-прокси) или `valueSignal:`."
+  );
   for (const [n, a] of Object.entries(i))
-    n !== "value" && G(a, e, t);
+    n !== "value" && U(a, e, t);
 }
-function oe(s, e, t, i) {
+function fe(s, e, t, i) {
   const r = {};
   for (const [n, a] of Object.entries(e)) {
-    const o = t === "" ? n : `${t}.${n}`;
+    const l = t === "" ? n : `${t}.${n}`;
     if (Array.isArray(a))
       continue;
-    if (ae(a)) {
-      r[n] = oe(s, a, o, i);
+    if (de(a)) {
+      r[n] = fe(s, a, l, i);
       continue;
     }
-    const l = s.signalAt(o);
-    if (!l) throw new Error(`createForm({ model }): не найден сигнал для пути "${o}"`);
-    const u = i.get(l) ?? {}, { validators: m, asyncValidators: c, ...f } = u;
-    r[n] = { ...f, valueSignal: l };
+    const c = s.signalAt(l);
+    if (!c) throw new Error(`createForm({ model }): не найден сигнал для пути "${l}"`);
+    const u = i.get(c) ?? {}, { validators: d, asyncValidators: o, ...v } = u;
+    r[n] = { ...v, valueSignal: c };
   }
   return r;
 }
-function le(s, e, t) {
+function pe(s, e, t) {
   for (const [i, r] of Object.entries(s)) {
     const n = e === "" ? i : `${e}.${i}`;
-    Array.isArray(r) || (ae(r) ? le(r, n, t) : t.push(n));
+    Array.isArray(r) || (de(r) ? pe(r, n, t) : t.push(n));
   }
 }
-function ue(s) {
+function ve(s) {
   const { model: e, schema: t, behavior: i } = s, r = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
-  t !== void 0 && G(t, r, n);
-  const a = oe(e, e.get(), "", r), o = new x(a), l = e.get();
-  for (const [c, f] of Object.entries(l)) {
-    if (!Array.isArray(f)) continue;
-    const d = n.get(c);
-    if (!d) continue;
-    const p = e[c], v = (b) => ue({ model: b, schema: d(b) }), g = new Fe(p, v);
-    o.fields.set(c, g);
-  }
-  const u = o.getProxy(), m = [];
-  le(e.get(), "", m);
-  for (const c of m) {
-    const f = e.signalAt(c), d = o.getFieldByPath(c);
-    f && d && ye(f, d);
-  }
-  return i && o.attachBehaviorCleanup(i.__run(e, u)), u;
+  t !== void 0 && U(t, r, n);
+  const a = fe(e, e.get(), "", r), l = new P(a), c = e.get();
+  for (const [o, v] of Object.entries(c)) {
+    if (!Array.isArray(v)) continue;
+    const h = n.get(o);
+    if (!h) continue;
+    const p = e[o], m = (g) => ve({ model: g, schema: h(g) }), b = new Pe(p, m);
+    l.fields.set(o, b);
+  }
+  const u = l.getProxy(), d = [];
+  pe(e.get(), "", d);
+  for (const o of d) {
+    const v = e.signalAt(o), h = l.getFieldByPath(o);
+    if (v && h) {
+      _e(v, h);
+      const p = o.lastIndexOf("."), m = p === -1 ? l : l.getFieldByPath(o.slice(0, p));
+      m instanceof P && m.registerFieldSignal(h, v);
+    }
+  }
+  if (t !== void 0) {
+    const o = t;
+    l.attachModelValidator(async () => (await Te(e, o)).valid);
+  }
+  return i && l.attachBehaviorCleanup(i.__run(e, u)), u;
 }
-const xe = (s) => s != null && typeof s == "object" && "model" in s && typeof s.model?.signalAt == "function";
-function ze(s) {
-  return xe(s) ? ue(s) : new x(s).getProxy();
+const Ie = (s) => s != null && typeof s == "object" && "model" in s && typeof s.model?.signalAt == "function";
+function et(s) {
+  return Ie(s) ? ve(s) : new P(s).getProxy();
 }
-const P = (s) => !(s === null || typeof s != "object" || Array.isArray(s) || s instanceof Date || typeof Blob < "u" && s instanceof Blob || typeof File < "u" && s instanceof File), E = (s, e) => s === "" ? String(e) : `${s}.${e}`, U = (s) => /^\d+$/.test(s), A = (s) => {
-  if (Array.isArray(s)) return s.map(A);
-  if (P(s)) {
+const T = (s) => !(s === null || typeof s != "object" || Array.isArray(s) || s instanceof Date || typeof Blob < "u" && s instanceof Blob || typeof File < "u" && s instanceof File), A = (s, e) => s === "" ? String(e) : `${s}.${e}`, W = (s) => /^\d+$/.test(s), S = (s) => {
+  if (Array.isArray(s)) return s.map(S);
+  if (T(s)) {
     const e = {};
-    for (const t of Object.keys(s)) e[t] = A(s[t]);
+    for (const t of Object.keys(s)) e[t] = S(s[t]);
     return e;
   }
   return s;
-}, C = (s, e) => {
+}, I = (s, e) => {
   if (s === e) return !0;
   if (Array.isArray(s) && Array.isArray(e))
-    return s.length !== e.length ? !1 : s.every((t, i) => C(t, e[i]));
-  if (P(s) && P(e)) {
+    return s.length !== e.length ? !1 : s.every((t, i) => I(t, e[i]));
+  if (T(s) && T(e)) {
     const t = Object.keys(s), i = Object.keys(e);
-    return t.length !== i.length ? !1 : t.every((r) => C(s[r], e[r]));
+    return t.length !== i.length ? !1 : t.every((r) => I(s[r], e[r]));
   }
   return !1;
 };
-class Me {
+class De {
   constructor(e, t) {
     this.path = t;
     const i = y(e);
-    i.__path = t, this.signal = i, this.initial = A(e);
+    i.__path = t, this.signal = i, this.initial = S(e);
   }
   kind = "leaf";
   signal;
@@ -2720,26 +2783,26 @@ class Me {
     this.signal.value = e;
   }
   resetToInitial() {
-    this.signal.value = A(this.initial);
+    this.signal.value = S(this.initial);
   }
   captureInitial() {
-    this.initial = A(this.signal.peek());
+    this.initial = S(this.signal.peek());
   }
   dirty() {
-    return !C(this.signal.peek(), this.initial);
+    return !I(this.signal.peek(), this.initial);
   }
 }
-class ce {
+class me {
   constructor(e, t) {
     this.path = t;
     for (const i of Object.keys(e))
-      this.children.set(i, F(e[i], E(t, i)));
+      this.children.set(i, x(e[i], A(t, i)));
   }
   kind = "group";
   children = /* @__PURE__ */ new Map();
   rebase(e) {
     this.path = e;
-    for (const [t, i] of this.children) i.rebase(E(e, t));
+    for (const [t, i] of this.children) i.rebase(A(e, t));
   }
   peek() {
     const e = {};
@@ -2750,7 +2813,7 @@ class ce {
     if (e == null || typeof e != "object") return;
     const t = e;
     for (const [i, r] of this.children)
-      i in t && (r.kind === "leaf" && B(r.signal) || r.set(t[i]));
+      i in t && (r.kind === "leaf" && G(r.signal) || r.set(t[i]));
   }
   resetToInitial() {
     for (const e of this.children.values()) e.resetToInitial();
@@ -2763,26 +2826,26 @@ class ce {
     return !1;
   }
 }
-class Pe {
+class Le {
   constructor(e, t) {
-    this.path = t, this.items = y(e.map((i, r) => F(i, E(t, r)))), this.initial = A(e);
+    this.path = t, this.items = y(e.map((i, r) => x(i, A(t, r)))), this.initial = S(e);
   }
   kind = "array";
   items;
   initial;
   rebase(e) {
-    this.path = e, this.items.peek().forEach((t, i) => t.rebase(E(e, i)));
+    this.path = e, this.items.peek().forEach((t, i) => t.rebase(A(e, i)));
   }
   reindex() {
-    this.items.peek().forEach((e, t) => e.rebase(E(this.path, t)));
+    this.items.peek().forEach((e, t) => e.rebase(A(this.path, t)));
   }
   push(e) {
     const t = this.items.peek();
-    this.items.value = [...t, F(e, E(this.path, t.length))];
+    this.items.value = [...t, x(e, A(this.path, t.length))];
   }
   insertAt(e, t) {
     const i = [...this.items.peek()];
-    i.splice(e, 0, F(t, E(this.path, e))), this.items.value = i, this.reindex();
+    i.splice(e, 0, x(t, A(this.path, e))), this.items.value = i, this.reindex();
   }
   removeAt(e) {
     const t = [...this.items.peek()];
@@ -2804,30 +2867,30 @@ class Pe {
   }
   set(e) {
     const t = Array.isArray(e) ? e : [];
-    this.items.value = t.map((i, r) => F(i, E(this.path, r)));
+    this.items.value = t.map((i, r) => x(i, A(this.path, r)));
   }
   resetToInitial() {
-    this.set(A(this.initial));
+    this.set(S(this.initial));
   }
   captureInitial() {
-    this.initial = A(this.peek());
+    this.initial = S(this.peek());
   }
   dirty() {
-    return !C(this.peek(), this.initial);
+    return !I(this.peek(), this.initial);
   }
 }
-function F(s, e) {
-  return Array.isArray(s) ? new Pe(s, e) : P(s) ? new ce(s, e) : new Me(s, e);
+function x(s, e) {
+  return Array.isArray(s) ? new Le(s, e) : T(s) ? new me(s, e) : new De(s, e);
 }
-function T(s) {
+function D(s) {
   if (s)
-    return s.kind === "leaf" ? s.read() : s.kind === "group" ? Ce(s) : he(s);
+    return s.kind === "leaf" ? s.read() : s.kind === "group" ? Re(s) : ye(s);
 }
-function Ce(s) {
+function Re(s) {
   return new Proxy(
     {},
     {
-      get: (e, t) => t === "__path" ? s.path : typeof t == "string" ? T(s.children.get(t)) : void 0,
+      get: (e, t) => t === "__path" ? s.path : typeof t == "string" ? D(s.children.get(t)) : void 0,
       set: (e, t, i) => {
         if (typeof t != "string") return !1;
         const r = s.children.get(t);
@@ -2839,11 +2902,11 @@ function Ce(s) {
     }
   );
 }
-function j(s) {
+function $(s) {
   if (s)
-    return s.kind === "group" ? de(s) : s.kind === "array" ? he(s) : s.read();
+    return s.kind === "group" ? ge(s) : s.kind === "array" ? ye(s) : s.read();
 }
-function he(s) {
+function ye(s) {
   const e = {
     get length() {
       return s.items.value.length;
@@ -2854,21 +2917,21 @@ function he(s) {
     move: (t, i) => s.move(t, i),
     swap: (t, i) => s.swap(t, i),
     clear: () => s.clear(),
-    at: (t) => j(s.items.value[t]),
-    map: (t) => s.items.value.map((i, r) => t(j(i), r)),
-    forEach: (t) => s.items.value.forEach((i, r) => t(j(i), r)),
+    at: (t) => $(s.items.value[t]),
+    map: (t) => s.items.value.map((i, r) => t($(i), r)),
+    forEach: (t) => s.items.value.forEach((i, r) => t($(i), r)),
     toArray: () => s.peek(),
     [Symbol.iterator]: function* () {
       const t = s.items.value;
-      for (let i = 0; i < t.length; i++) yield T(t[i]);
+      for (let i = 0; i < t.length; i++) yield D(t[i]);
     }
   };
   return new Proxy(e, {
-    get: (t, i, r) => i === "__path" ? s.path : typeof i == "string" && U(i) ? T(s.items.value[Number(i)]) : Reflect.get(t, i, r),
-    has: (t, i) => typeof i == "string" && U(i) ? Number(i) < s.items.value.length : Reflect.has(t, i)
+    get: (t, i, r) => i === "__path" ? s.path : typeof i == "string" && W(i) ? D(s.items.value[Number(i)]) : Reflect.get(t, i, r),
+    has: (t, i) => typeof i == "string" && W(i) ? Number(i) < s.items.value.length : Reflect.has(t, i)
   });
 }
-function W(s) {
+function q(s) {
   if (s.kind === "leaf") return s.signal;
   if (s.kind === "group")
     return new Proxy(
@@ -2878,7 +2941,7 @@ function W(s) {
           if (i === "__path") return s.path;
           if (typeof i != "string") return;
           const r = s.children.get(i);
-          return r ? W(r) : void 0;
+          return r ? q(r) : void 0;
         },
         has: (t, i) => typeof i == "string" && s.children.has(i),
         ownKeys: () => [...s.children.keys()],
@@ -2895,16 +2958,16 @@ function W(s) {
     {
       get: (t, i, r) => {
         if (i === "__path") return e.path;
-        if (typeof i == "string" && U(i)) {
+        if (typeof i == "string" && W(i)) {
           const n = e.items.value[Number(i)];
-          return n ? W(n) : void 0;
+          return n ? q(n) : void 0;
         }
         return Reflect.get(t, i, r);
       }
     }
   );
 }
-function Te(s, e) {
+function $e(s, e) {
   if (!e) return;
   let t = s;
   for (const i of e.split(".")) {
@@ -2915,7 +2978,7 @@ function Te(s, e) {
   }
   return t && t.kind === "leaf" ? t.signal : void 0;
 }
-const X = /* @__PURE__ */ new Set([
+const se = /* @__PURE__ */ new Set([
   "$",
   "get",
   "set",
@@ -2924,275 +2987,205 @@ const X = /* @__PURE__ */ new Set([
   "reset",
   "captureInitial",
   "signalAt"
-]), Z = /* @__PURE__ */ new WeakMap();
-function de(s) {
-  const e = Z.get(s);
+]), ie = /* @__PURE__ */ new WeakMap();
+function ge(s) {
+  const e = ie.get(s);
   if (e) return e;
   const t = {
-    $: W(s),
+    $: q(s),
     get: () => s.peek(),
     set: (r) => s.set(r),
     patch: (r) => s.set(r),
     isDirty: () => s.dirty(),
     reset: () => s.resetToInitial(),
     captureInitial: () => s.captureInitial(),
-    signalAt: (r) => Te(s, r)
+    signalAt: (r) => $e(s, r)
   }, i = new Proxy(
     {},
     {
       get: (r, n) => {
         if (typeof n != "string") return;
         const a = s.children.get(n);
-        if (a) return T(a);
-        if (X.has(n)) return t[n];
+        if (a) return D(a);
+        if (se.has(n)) return t[n];
       },
       set: (r, n, a) => {
         if (typeof n != "string") return !1;
-        const o = s.children.get(n);
-        return o ? (o.set(a), !0) : !1;
+        const l = s.children.get(n);
+        return l ? (l.set(a), !0) : !1;
       },
-      has: (r, n) => typeof n == "string" && (s.children.has(n) || X.has(n)),
+      has: (r, n) => typeof n == "string" && (s.children.has(n) || se.has(n)),
       ownKeys: () => [...s.children.keys()],
       getOwnPropertyDescriptor: (r, n) => typeof n == "string" && s.children.has(n) ? { enumerable: !0, configurable: !0 } : void 0
     }
   );
-  return Z.set(s, i), i;
-}
-function Je(s) {
-  const e = new ce(s, "");
-  return de(e);
-}
-const Ie = (s) => {
-  const e = s.componentProps;
-  return e != null && typeof e == "object" && typeof e.itemComponent == "function" && e.control != null && typeof e.control.at == "function" && typeof e.control.length == "number";
-}, De = (s) => typeof s.when == "function" && Array.isArray(s.children);
-function V(s, e, t, i, r) {
-  if (s == null || typeof s != "object") return;
-  if (Array.isArray(s)) {
-    for (const a of s) V(a, e, t, i, r);
-    return;
-  }
-  const n = s;
-  if (De(n)) {
-    const a = i && !!n.when(e, t);
-    for (const o of n.children) V(o, e, t, a, r);
-    return;
-  }
-  if (Ie(n)) {
-    const a = n.componentProps.control, o = n.componentProps.itemComponent, l = a.length;
-    for (let u = 0; u < l; u++) {
-      const m = a.at(u);
-      V(o(m), m, t, i, r);
-    }
-    return;
-  }
-  if (n.value instanceof ie) {
-    const a = n.validators ?? [];
-    a.length > 0 && (i ? r.tasks.push({ signal: n.value, validators: a, scope: e }) : r.clearSignals.push(n.value));
-    for (const [o, l] of Object.entries(n))
-      o === "value" || o === "validators" || V(l, e, t, i, r);
-    return;
-  }
-  for (const a of Object.values(n)) V(a, e, t, i, r);
+  return ie.set(s, i), i;
 }
-function z(s, e) {
-  const t = { tasks: [], clearSignals: [] };
-  return V(e, s, s, !0, t), t;
-}
-const fe = (s, e, t) => {
-  (s[e] ??= []).push(t);
-};
-function Ye(s, e) {
-  const { tasks: t } = z(s, e), i = {};
-  for (const { signal: r, validators: n, scope: a } of t) {
-    const o = r.peek();
-    for (const l of n) {
-      const u = l(o, a, s);
-      u && typeof u.then == "function" || u && fe(i, r.__path, u);
-    }
-  }
-  return { valid: Object.keys(i).length === 0, errors: i };
-}
-async function Qe(s, e) {
-  const { tasks: t } = z(s, e), i = await pe(t, s);
-  return { valid: Object.keys(i).length === 0, errors: i };
-}
-async function pe(s, e) {
-  const t = {};
-  return await Promise.all(
-    s.map(async ({ signal: i, validators: r, scope: n }) => {
-      const a = i.peek();
-      for (const o of r) {
-        const l = await o(a, n, e);
-        l && fe(t, i.__path, l);
-      }
-    })
-  ), t;
-}
-async function Xe(s, e) {
-  const { tasks: t, clearSignals: i } = z(s, e), r = await pe(t, s);
-  for (const { signal: n } of t)
-    Y(n)?.setErrors(r[n.__path] ?? []);
-  for (const n of i)
-    Y(n)?.setErrors([]);
-  return { valid: Object.keys(r).length === 0, errors: r };
+function tt(s) {
+  const e = new me(s, "");
+  return ge(e);
 }
-var M = { exports: {} }, R = {};
-var ee;
-function Le() {
-  if (ee) return R;
-  ee = 1;
-  var s = re;
-  function e(c, f) {
-    return c === f && (c !== 0 || 1 / c === 1 / f) || c !== c && f !== f;
+var C = { exports: {} }, j = {};
+var re;
+function je() {
+  if (re) return j;
+  re = 1;
+  var s = le;
+  function e(o, v) {
+    return o === v && (o !== 0 || 1 / o === 1 / v) || o !== o && v !== v;
   }
   var t = typeof Object.is == "function" ? Object.is : e, i = s.useState, r = s.useEffect, n = s.useLayoutEffect, a = s.useDebugValue;
-  function o(c, f) {
-    var d = f(), p = i({ inst: { value: d, getSnapshot: f } }), v = p[0].inst, g = p[1];
+  function l(o, v) {
+    var h = v(), p = i({ inst: { value: h, getSnapshot: v } }), m = p[0].inst, b = p[1];
     return n(
       function() {
-        v.value = d, v.getSnapshot = f, l(v) && g({ inst: v });
+        m.value = h, m.getSnapshot = v, c(m) && b({ inst: m });
       },
-      [c, d, f]
+      [o, h, v]
     ), r(
       function() {
-        return l(v) && g({ inst: v }), c(function() {
-          l(v) && g({ inst: v });
+        return c(m) && b({ inst: m }), o(function() {
+          c(m) && b({ inst: m });
         });
       },
-      [c]
-    ), a(d), d;
+      [o]
+    ), a(h), h;
   }
-  function l(c) {
-    var f = c.getSnapshot;
-    c = c.value;
+  function c(o) {
+    var v = o.getSnapshot;
+    o = o.value;
     try {
-      var d = f();
-      return !t(c, d);
+      var h = v();
+      return !t(o, h);
     } catch {
       return !0;
     }
   }
-  function u(c, f) {
-    return f();
+  function u(o, v) {
+    return v();
   }
-  var m = typeof window > "u" || typeof window.document > "u" || typeof window.document.createElement > "u" ? u : o;
-  return R.useSyncExternalStore = s.useSyncExternalStore !== void 0 ? s.useSyncExternalStore : m, R;
+  var d = typeof window > "u" || typeof window.document > "u" || typeof window.document.createElement > "u" ? u : l;
+  return j.useSyncExternalStore = s.useSyncExternalStore !== void 0 ? s.useSyncExternalStore : d, j;
 }
-var $ = {};
-var te;
-function je() {
-  return te || (te = 1, process.env.NODE_ENV !== "production" && (function() {
-    function s(d, p) {
-      return d === p && (d !== 0 || 1 / d === 1 / p) || d !== d && p !== p;
+var B = {};
+var ne;
+function Be() {
+  return ne || (ne = 1, process.env.NODE_ENV !== "production" && (function() {
+    function s(h, p) {
+      return h === p && (h !== 0 || 1 / h === 1 / p) || h !== h && p !== p;
     }
-    function e(d, p) {
-      m || r.startTransition === void 0 || (m = !0, console.error(
+    function e(h, p) {
+      d || r.startTransition === void 0 || (d = !0, console.error(
         "You are using an outdated, pre-release alpha of React 18 that does not support useSyncExternalStore. The use-sync-external-store shim will not work correctly. Upgrade to a newer pre-release."
       ));
-      var v = p();
-      if (!c) {
-        var g = p();
-        n(v, g) || (console.error(
+      var m = p();
+      if (!o) {
+        var b = p();
+        n(m, b) || (console.error(
           "The result of getSnapshot should be cached to avoid an infinite loop"
-        ), c = !0);
+        ), o = !0);
       }
-      g = a({
-        inst: { value: v, getSnapshot: p }
+      b = a({
+        inst: { value: m, getSnapshot: p }
       });
-      var b = g[0].inst, L = g[1];
-      return l(
+      var g = b[0].inst, V = b[1];
+      return c(
         function() {
-          b.value = v, b.getSnapshot = p, t(b) && L({ inst: b });
+          g.value = m, g.getSnapshot = p, t(g) && V({ inst: g });
         },
-        [d, v, p]
-      ), o(
+        [h, m, p]
+      ), l(
         function() {
-          return t(b) && L({ inst: b }), d(function() {
-            t(b) && L({ inst: b });
+          return t(g) && V({ inst: g }), h(function() {
+            t(g) && V({ inst: g });
           });
         },
-        [d]
-      ), u(v), v;
+        [h]
+      ), u(m), m;
     }
-    function t(d) {
-      var p = d.getSnapshot;
-      d = d.value;
+    function t(h) {
+      var p = h.getSnapshot;
+      h = h.value;
       try {
-        var v = p();
-        return !n(d, v);
+        var m = p();
+        return !n(h, m);
       } catch {
         return !0;
       }
     }
-    function i(d, p) {
+    function i(h, p) {
       return p();
     }
     typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStart(Error());
-    var r = re, n = typeof Object.is == "function" ? Object.is : s, a = r.useState, o = r.useEffect, l = r.useLayoutEffect, u = r.useDebugValue, m = !1, c = !1, f = typeof window > "u" || typeof window.document > "u" || typeof window.document.createElement > "u" ? i : e;
-    $.useSyncExternalStore = r.useSyncExternalStore !== void 0 ? r.useSyncExternalStore : f, typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(Error());
-  })()), $;
+    var r = le, n = typeof Object.is == "function" ? Object.is : s, a = r.useState, l = r.useEffect, c = r.useLayoutEffect, u = r.useDebugValue, d = !1, o = !1, v = typeof window > "u" || typeof window.document > "u" || typeof window.document.createElement > "u" ? i : e;
+    B.useSyncExternalStore = r.useSyncExternalStore !== void 0 ? r.useSyncExternalStore : v, typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ < "u" && typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop == "function" && __REACT_DEVTOOLS_GLOBAL_HOOK__.registerInternalModuleStop(Error());
+  })()), B;
 }
-var se;
-function Re() {
-  return se || (se = 1, process.env.NODE_ENV === "production" ? M.exports = Le() : M.exports = je()), M.exports;
+var ae;
+function Ge() {
+  return ae || (ae = 1, process.env.NODE_ENV === "production" ? C.exports = je() : C.exports = Be()), C.exports;
 }
-var J = Re();
-function $e(s, e) {
+var Y = Ge();
+function Ue(s, e) {
   if (s === e) return !0;
   if (s.length !== e.length) return !1;
   for (let t = 0; t < s.length; t++)
     if (s[t] !== e[t]) return !1;
   return !0;
 }
-function ve(s, e, t) {
-  const i = q(null);
-  if (i.current === null) {
-    const a = {};
+function Q(s, e, t, i) {
+  const r = M(null), n = M(s);
+  n.current = s;
+  const a = M(e);
+  a.current = e;
+  const l = M(t);
+  if (l.current = t, r.current === null) {
+    const d = {};
     for (const o in s)
-      a[o] = s[o].value;
-    i.current = { ...a, __snapshot: null };
+      d[o] = s[o].value;
+    r.current = { ...d, __snapshot: null };
   }
-  const r = S(
-    (a) => {
+  const c = E(
+    (d) => {
       let o = !0;
       return _(() => {
-        for (const u in s)
-          s[u].value;
+        const h = n.current;
+        for (const p in h)
+          h[p].value;
         if (o) {
           o = !1;
           return;
         }
-        a();
+        d();
       });
     },
-    [s]
-  ), n = S(() => {
-    const a = i.current, o = {};
-    for (const u in s)
-      o[u] = s[u].value;
-    let l = !1;
-    for (const u of e) {
-      const { key: m, useShallowArrayEqual: c } = u, f = o[m], d = a[m];
-      if (c) {
-        if (!$e(d, f)) {
-          l = !0;
+    [i]
+  ), u = E(() => {
+    const d = r.current, o = n.current, v = {};
+    for (const p in o)
+      v[p] = o[p].value;
+    let h = !1;
+    for (const p of a.current) {
+      const { key: m, useShallowArrayEqual: b } = p, g = v[m], V = d[m];
+      if (b) {
+        if (!Ue(V, g)) {
+          h = !0;
           break;
         }
-      } else if (d !== f) {
-        l = !0;
+      } else if (V !== g) {
+        h = !0;
         break;
       }
     }
-    if (!l && a.__snapshot)
-      return a.__snapshot;
-    for (const u in s)
-      a[u] = o[u];
-    return a.__snapshot = t(o), a.__snapshot;
-  }, [s, t]);
-  return J.useSyncExternalStore(r, n, n);
+    if (!h && d.__snapshot)
+      return d.__snapshot;
+    for (const p in o)
+      d[p] = v[p];
+    return d.__snapshot = l.current(v), d.__snapshot;
+  }, [i]);
+  return Y.useSyncExternalStore(c, u, u);
 }
-function Be(s) {
+function We(s) {
   const e = {
     value: s.value,
     disabled: s.disabled,
@@ -3201,6 +3194,7 @@ function Be(s) {
     valid: s.valid,
     invalid: s.invalid,
     touched: s.touched,
+    dirty: s.dirty,
     shouldShowError: s.shouldShowError,
     componentProps: s.componentProps
   }, t = [
@@ -3211,9 +3205,10 @@ function Be(s) {
     { key: "valid" },
     { key: "invalid" },
     { key: "touched" },
+    { key: "dirty" },
     { key: "shouldShowError" },
     { key: "componentProps" }
-  ], i = S(
+  ], i = E(
     (r) => ({
       value: r.value,
       pending: r.pending,
@@ -3222,14 +3217,15 @@ function Be(s) {
       valid: r.valid,
       invalid: r.invalid,
       touched: r.touched,
+      dirty: r.dirty,
       shouldShowError: r.shouldShowError,
       componentProps: r.componentProps
     }),
     []
   );
-  return ve(e, t, i);
+  return Q(e, t, i, s);
 }
-function Ge(s) {
+function qe(s) {
   const e = {
     value: s.value,
     length: s.length,
@@ -3238,7 +3234,8 @@ function Ge(s) {
     valid: s.valid,
     invalid: s.invalid,
     touched: s.touched,
-    dirty: s.dirty
+    dirty: s.dirty,
+    disabled: s.disabled
   }, t = [
     { key: "value" },
     { key: "length" },
@@ -3247,8 +3244,9 @@ function Ge(s) {
     { key: "valid" },
     { key: "invalid" },
     { key: "touched" },
-    { key: "dirty" }
-  ], i = S(
+    { key: "dirty" },
+    { key: "disabled" }
+  ], i = E(
     (r) => ({
       value: r.value,
       length: r.length,
@@ -3257,27 +3255,36 @@ function Ge(s) {
       valid: r.valid,
       invalid: r.invalid,
       touched: r.touched,
-      dirty: r.dirty
+      dirty: r.dirty,
+      disabled: r.disabled
+    }),
+    []
+  );
+  return Q(e, t, i, s);
+}
+function Ke() {
+  const s = E(
+    () => ({
+      value: [],
+      length: 0,
+      pending: !1,
+      errors: [],
+      valid: !0,
+      invalid: !1,
+      touched: !1,
+      dirty: !1,
+      disabled: !1
     }),
     []
   );
-  return ve(e, t, i);
+  return Q({}, [], s);
 }
-function Ze(s) {
+function st(s) {
   const e = s && "length" in s && "map" in s;
-  return s ? e ? Ge(s) : Be(s) : {
-    value: [],
-    length: 0,
-    pending: !1,
-    errors: [],
-    valid: !0,
-    invalid: !1,
-    touched: !1,
-    dirty: !1
-  };
+  return s ? e ? qe(s) : We(s) : Ke();
 }
-function et(s) {
-  const e = q({ value: s.value.value }), t = S(
+function it(s) {
+  const e = M({ value: s.value.value }), t = E(
     (r) => {
       let n = !0;
       return _(() => {
@@ -3289,14 +3296,14 @@ function et(s) {
       });
     },
     [s]
-  ), i = S(() => {
+  ), i = E(() => {
     const r = s.value.value;
     return e.current.value === r ? e.current.value : (e.current.value = r, r);
   }, [s]);
-  return J.useSyncExternalStore(t, i, i);
+  return Y.useSyncExternalStore(t, i, i);
 }
-function tt(s) {
-  const e = q({ length: s.length.value }), t = S(
+function rt(s) {
+  const e = M({ length: s.length.value }), t = E(
     (r) => {
       let n = !0;
       return _(() => {
@@ -3308,54 +3315,55 @@ function tt(s) {
       });
     },
     [s]
-  ), i = S(() => {
+  ), i = E(() => {
     const r = s.length.value;
     return e.current.length === r ? e.current.length : (e.current.length = r, r);
   }, [s]);
-  return J.useSyncExternalStore(t, i, i);
+  return Y.useSyncExternalStore(t, i, i);
 }
 export {
-  Q as ArrayNode,
-  w as ErrorStrategy,
-  _e as FieldNode,
-  k as FormErrorHandler,
-  I as FormNode,
-  be as FormStatusMachine,
-  Se as FormSubmitter,
-  x as GroupNode,
-  Fe as ModelArrayNode,
-  ke as NodeFactory,
+  te as ArrayNode,
+  O as ErrorStrategy,
+  Se as FieldNode,
+  N as FormErrorHandler,
+  L as FormNode,
+  Ae as FormStatusMachine,
+  ke as FormSubmitter,
+  P as GroupNode,
+  Pe as ModelArrayNode,
+  Ne as NodeFactory,
   K as SubscriptionManager,
-  rt as computeFrom,
-  nt as copyFrom,
-  ze as createForm,
-  ue as createFormFromModel,
-  Je as createModel,
-  at as disableWhen,
-  ot as enableWhen,
-  Y as getNodeForSignal,
-  He as getNodeType,
-  Ne as isArrayNode,
-  B as isDerived,
-  Ve as isFieldNode,
-  D as isFormNode,
-  Oe as isGroupNode,
-  lt as markDerived,
-  ye as registerSignalNode,
-  ut as resetWhen,
-  ct as revalidateWhen,
-  ht as runOutsideEffect,
-  dt as safeCallback,
-  ft as safeDebouncedCallback,
-  pt as syncFields,
-  vt as transformValue,
-  N as uniqueId,
-  tt as useArrayLength,
-  Ze as useFormControl,
-  et as useFormControlValue,
-  Xe as validateFormModel,
-  Qe as validateModel,
-  Ye as validateModelSync,
-  gt as validators,
-  mt as watchField
+  ot as computeFrom,
+  lt as copyFrom,
+  et as createForm,
+  ve as createFormFromModel,
+  tt as createModel,
+  ut as disableWhen,
+  ct as enableWhen,
+  X as getNodeForSignal,
+  Qe as getNodeType,
+  Me as isArrayNode,
+  G as isDerived,
+  Oe as isFieldNode,
+  R as isFormNode,
+  Fe as isGroupNode,
+  ht as markDerived,
+  _e as registerSignalNode,
+  dt as resetWhen,
+  ft as revalidateWhen,
+  pt as runOutsideEffect,
+  vt as safeCallback,
+  mt as safeDebouncedCallback,
+  yt as syncFields,
+  gt as transformValue,
+  k as uniqueId,
+  bt as unmarkDerived,
+  rt as useArrayLength,
+  st as useFormControl,
+  it as useFormControlValue,
+  Te as validateFormModel,
+  Ze as validateModel,
+  Xe as validateModelSync,
+  At as validators,
+  _t as watchField
 };