@reformer/core 8.0.0 → 9.0.0-beta.1

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 h, effect as _, batch as me, Signal as re } from "@preact/signals-core";
+import { i as B, d as ye, g as Q } from "./behaviors-O9a1Djj9.js";
+import { j as nt, c as at, k as ot, e as lt, m as ut, a as ct, b as ht, r as dt, f as ft, h as pt, s as vt, t as mt, w as yt } from "./behaviors-O9a1Djj9.js";
+import ne, { useRef as q, useCallback as E } from "react";
+import { default as bt } from "./validators.js";
+class D {
   // ============================================================================
   // Protected состояние (для Template Method паттерна)
   // ============================================================================
@@ -97,17 +97,17 @@ class I {
    */
   getErrors(e) {
     const t = this.errors.value;
-    return e ? t.filter((i) => {
-      if (e.code !== void 0 && !(Array.isArray(e.code) ? e.code : [e.code]).includes(i.code) || e.message !== void 0 && !i.message.toLowerCase().includes(e.message.toLowerCase()))
+    return e ? t.filter((s) => {
+      if (e.code !== void 0 && !(Array.isArray(e.code) ? e.code : [e.code]).includes(s.code) || e.message !== void 0 && !s.message.toLowerCase().includes(e.message.toLowerCase()))
         return !1;
       if (e.params !== void 0) {
-        if (!i.params)
+        if (!s.params)
           return !1;
         for (const [r, n] of Object.entries(e.params))
-          if (i.params[r] !== n)
+          if (s.params[r] !== n)
             return !1;
       }
-      return !(e.predicate !== void 0 && !e.predicate(i));
+      return !(e.predicate !== void 0 && !e.predicate(s));
     }) : t;
   }
   // ============================================================================
@@ -448,7 +448,7 @@ class K {
     this.clear();
   }
 }
-const O = {
+const k = {
   /** FieldNode.watch() */
   Watch: "watch",
   /** FieldNode.computeFrom() */
@@ -463,53 +463,14 @@ const O = {
   WatchLength: "watchLength"
 };
 let ge = 0;
-function N(s) {
-  return `${s}-${++ge}`;
+function V(i) {
+  return `${i}-${++ge}`;
 }
-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") {
+var S = /* @__PURE__ */ ((i) => (i.THROW = "throw", i.LOG = "log", i.CONVERT = "convert", i))(S || {});
+class O {
+  static handle(e, t, s = "throw") {
     const r = this.extractMessage(e);
-    switch (i) {
+    switch (s) {
       case "throw":
         throw e;
       case "log":
@@ -573,11 +534,11 @@ class k {
    * // { code: 'required', message: 'This field is required', field: 'email' }
    * ```
    */
-  static createValidationError(e, t, i) {
+  static createValidationError(e, t, s) {
     return {
       code: e,
       message: t,
-      params: i ? { field: i } : void 0
+      params: s ? { field: s } : void 0
     };
   }
   /**
@@ -649,7 +610,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 +705,7 @@ class be {
     return this._status.value !== "disabled";
   }
 }
-class _e extends I {
+class _e extends D {
   // ============================================================================
   // Приватные сигналы
   // ============================================================================
@@ -752,7 +713,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 +732,6 @@ class _e extends I {
   disabled;
   // touched, dirty наследуются от FormNode
   errors;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   componentProps;
   /**
    * Вычисляемое свойство: нужно ли показывать ошибку
@@ -817,12 +776,12 @@ class _e extends I {
   setValue(e, t) {
     if (this._value.value = e, this._dirty.value = !0, t?.emitEvent === !1)
       return;
-    const i = this.validators.length > 0 || this.asyncValidators.length > 0, r = this._errors.value.length > 0;
+    const s = this.validators.length > 0 || this.asyncValidators.length > 0, r = this._errors.value.length > 0;
     if (this.updateOn === "change") {
       this.validate();
       return;
     }
-    r && i && this.validate();
+    r && s && this.validate();
   }
   patchValue(e) {
     this.setValue(e);
@@ -915,17 +874,17 @@ class _e extends I {
     const t = e?.debounce ?? this.debounceMs;
     if (this.cancelPendingValidation(), t <= 0 || this.asyncValidators.length === 0)
       return this.validateImmediate();
-    const i = new AbortController();
+    const s = new AbortController();
     return new Promise((r) => {
-      this.pendingValidation = { resolve: r, abortController: i }, this.validateDebounceTimer = setTimeout(async () => {
-        if (this.validateDebounceTimer = void 0, i.signal.aborted) {
+      this.pendingValidation = { resolve: r, abortController: s }, this.validateDebounceTimer = setTimeout(async () => {
+        if (this.validateDebounceTimer = void 0, s.signal.aborted) {
           r(!1);
           return;
         }
         this.pendingValidation = void 0;
-        const n = await this.validateImmediate(i);
+        const n = await this.validateImmediate(s);
         r(n);
-      }, t), i.signal.addEventListener(
+      }, t), s.signal.addEventListener(
         "abort",
         () => {
           this.validateDebounceTimer && (clearTimeout(this.validateDebounceTimer), this.validateDebounceTimer = void 0), r(!1);
@@ -947,12 +906,12 @@ class _e extends I {
   async validateImmediate(e) {
     const t = e ?? new AbortController();
     e || this.currentAbortController?.abort(), this.currentAbortController = t;
-    const { signal: i } = t, r = [];
+    const { signal: s } = t, r = [];
     for (const a of this.validators) {
       const o = a(this._value.value);
       o && r.push(o);
     }
-    if (i.aborted)
+    if (s.aborted)
       return !1;
     if (r.length > 0) {
       this._errors.value = r;
@@ -961,33 +920,33 @@ class _e extends I {
         return !1;
     }
     if (this.asyncValidators.length > 0) {
-      if (i.aborted)
+      if (s.aborted)
         return !1;
       this.statusMachine.startValidation();
       try {
         const a = await Promise.all(
           this.asyncValidators.map(async (l) => {
-            if (i.aborted)
+            if (s.aborted)
               throw new DOMException("Validation aborted", "AbortError");
             try {
-              const u = await l(this._value.value, { signal: i });
-              if (i.aborted)
+              const u = await l(this._value.value, { signal: s });
+              if (s.aborted)
                 throw new DOMException("Validation aborted", "AbortError");
               return u;
             } catch (u) {
               if (u instanceof DOMException && u.name === "AbortError")
                 throw u;
-              return k.handle(
+              return O.handle(
                 u,
                 "FieldNode AsyncValidator",
-                w.CONVERT
+                S.CONVERT
               );
             }
           })
         );
-        if (i.aborted)
+        if (s.aborted)
           return !1;
-        const o = a.filter(Boolean);
+        const o = a.filter((l) => l !== null);
         if (o.length > 0) {
           this._errors.value = o;
           const l = o.some((u) => u.severity !== "warning");
@@ -1000,11 +959,11 @@ class _e extends I {
         throw a;
       }
     }
-    return i.aborted ? !1 : ((this.validators.length > 0 || this.asyncValidators.length > 0) && (this._errors.value = [], this.statusMachine.completeValidation(!1)), !this._errors.value.some((a) => a.severity !== "warning"));
+    return s.aborted ? !1 : ((this.validators.length > 0 || this.asyncValidators.length > 0) && (this._errors.value = [], this.statusMachine.completeValidation(!1)), !this._errors.value.some((a) => a.severity !== "warning"));
   }
   setErrors(e) {
     this._errors.value = e;
-    const t = e.some((i) => i.severity !== "warning");
+    const t = e.some((s) => s.severity !== "warning");
     this.statusMachine.setErrors(t);
   }
   clearErrors() {
@@ -1048,7 +1007,6 @@ class _e extends I {
    * });
    * ```
    */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   updateComponentProps(e) {
     this._componentProps.value = {
       ...this._componentProps.value,
@@ -1122,12 +1080,12 @@ class _e extends I {
    * ```
    */
   watch(e) {
-    const t = new AbortController(), i = _(() => {
+    const t = new AbortController(), s = _(() => {
       const n = this.value.value;
       e(n, t.signal);
-    }), r = N(O.Watch);
+    }), r = V(k.Watch);
     return this.disposers.add(r, () => {
-      t.abort(), i();
+      t.abort(), s();
     });
   }
   /**
@@ -1153,11 +1111,11 @@ class _e extends I {
    * ```
    */
   computeFrom(e, t) {
-    const i = _(() => {
+    const s = _(() => {
       const n = e.map((o) => o.value), a = t(...n);
       this.setValue(a, { emitEvent: !1 });
-    }), r = N(O.ComputeFrom);
-    return this.disposers.add(r, i);
+    }), r = V(k.ComputeFrom);
+    return this.disposers.add(r, s);
   }
   /**
    * Очистить все ресурсы и таймеры
@@ -1187,13 +1145,13 @@ 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(() => {
+function H(i) {
+  const { getChildren: e, ownErrors: t, disabled: s } = i, 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");
+  }), m = h(() => s?.value ? "disabled" : a.value ? "pending" : n.value ? "invalid" : "valid");
   return {
     valid: r,
     invalid: n,
@@ -1204,29 +1162,29 @@ function H(s) {
     status: m
   };
 }
-function Ee(s) {
-  return typeof s == "object" && s !== null && "getProxy" in s && typeof s.getProxy == "function";
+function Ee(i) {
+  return typeof i == "object" && i !== null && "getProxy" in i && typeof i.getProxy == "function";
 }
-function Ae(s, e) {
-  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);
+function Ae(i, e) {
+  return new Proxy(i, {
+    get: (t, s) => {
+      if (s in t)
+        return t[s];
+      if (typeof s == "string" && e.has(s)) {
+        const r = e.get(s);
         return r && Ee(r) ? r.getProxy() : r;
       }
     },
-    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,
+    set: (t, s, r) => typeof s == "string" && e.has(s) ? !1 : (t[s] = r, !0),
+    has: (t, s) => typeof s == "string" && e.has(s) ? !0 : s in t,
     ownKeys: (t) => {
-      const i = Reflect.ownKeys(t), r = Array.from(e.keys());
-      return [.../* @__PURE__ */ new Set([...i, ...r])];
+      const s = Reflect.ownKeys(t), r = Array.from(e.keys());
+      return [.../* @__PURE__ */ new Set([...s, ...r])];
     },
-    getOwnPropertyDescriptor: (t, i) => typeof i == "string" && e.has(i) ? { enumerable: !0, configurable: !0 } : Reflect.getOwnPropertyDescriptor(t, i)
+    getOwnPropertyDescriptor: (t, s) => typeof s == "string" && e.has(s) ? { enumerable: !0, configurable: !0 } : Reflect.getOwnPropertyDescriptor(t, s)
   });
 }
-class Se {
+class we {
   /**
    * @param form - Форма для отправки
    */
@@ -1266,8 +1224,8 @@ class Se {
    * ```
    */
   async submit(e, t) {
-    const { skipValidation: i = !1, skipTouch: r = !1 } = t || {};
-    if (r || this.form.markAsTouched(), !i && !await this.form.validate())
+    const { skipValidation: s = !1, skipTouch: r = !1 } = t || {};
+    if (r || this.form.markAsTouched(), !s && !await this.form.validate())
       return null;
     this._submitting.value = !0;
     try {
@@ -1301,8 +1259,8 @@ class Se {
    * ```
    */
   async submitWithResult(e, t) {
-    const { skipValidation: i = !1, skipTouch: r = !1 } = t || {};
-    if (r || this.form.markAsTouched(), !i && !await this.form.validate())
+    const { skipValidation: s = !1, skipTouch: r = !1 } = t || {};
+    if (r || this.form.markAsTouched(), !s && !await this.form.validate())
       return { success: !1, data: null };
     this._submitting.value = !0;
     try {
@@ -1324,16 +1282,16 @@ class Se {
     return this._submitting.value;
   }
 }
-function we(s) {
+function Se(i) {
   const e = [];
-  for (const t of s.split(".")) {
-    const i = /^([^[\]]+)(?:\[(\d+)\])?$/.exec(t);
-    if (!i) return [];
-    e.push(i[2] !== void 0 ? { key: i[1], index: Number(i[2]) } : { key: i[1] });
+  for (const t of i.split(".")) {
+    const s = /^([^[\]]+)(?:\[(\d+)\])?$/.exec(t);
+    if (!s) return [];
+    e.push(s[2] !== void 0 ? { key: s[1], index: Number(s[2]) } : { key: s[1] });
   }
   return e;
 }
-let x = class ne extends I {
+let x = class ae extends D {
   // ============================================================================
   // Приватные поля
   // ============================================================================
@@ -1382,9 +1340,9 @@ 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)) {
+    super(), this.formSubmitter = new we(this);
+    const s = "form" in e ? e.form : e;
+    for (const [n, a] of Object.entries(s)) {
       const o = this.createNode(a);
       this._fields.set(n, o);
     }
@@ -1416,13 +1374,13 @@ let x = class ne extends I {
   // ============================================================================
   getValue() {
     const e = {};
-    return this._fields.forEach((t, i) => {
-      e[i] = t.getValue();
+    return this._fields.forEach((t, s) => {
+      e[s] = t.getValue();
     }), e;
   }
   setValue(e, t) {
-    for (const [i, r] of Object.entries(e)) {
-      const n = this._fields.get(i);
+    for (const [s, r] of Object.entries(e)) {
+      const n = this._fields.get(s);
       if (n) {
         if (B(n.value)) continue;
         n.setValue(r, t);
@@ -1431,11 +1389,11 @@ let x = class ne extends I {
   }
   patchValue(e) {
     me(() => {
-      for (const [t, i] of Object.entries(e)) {
+      for (const [t, s] of Object.entries(e)) {
         const r = this._fields.get(t);
-        if (r && i !== void 0) {
+        if (r && s !== void 0) {
           if (B(r.value)) continue;
-          r.setValue(i, { emitEvent: !1 });
+          r.setValue(s, { emitEvent: !1 });
         }
       }
     });
@@ -1458,8 +1416,8 @@ let x = class ne extends I {
    * ```
    */
   reset(e) {
-    this._fields.forEach((t, i) => {
-      const r = e?.[i];
+    this._fields.forEach((t, s) => {
+      const r = e?.[s];
       t.reset(r);
     });
   }
@@ -1603,21 +1561,21 @@ let x = class ne extends I {
   getFieldByPath(e) {
     if (e.startsWith(".") || e.endsWith("."))
       return;
-    const t = we(e);
+    const t = Se(e);
     if (t.length === 0)
       return;
-    let i = this;
+    let s = this;
     for (const r of t) {
-      if (!(i instanceof ne) || (i = i.getField(r.key), !i)) return;
+      if (!(s instanceof ae) || (s = s.getField(r.key), !s)) return;
       if (r.index !== void 0)
-        if ("at" in i && "length" in i && typeof i.at == "function") {
-          const n = i.at(r.index);
+        if ("at" in s && "length" in s && typeof s.at == "function") {
+          const n = s.at(r.index);
           if (!n) return;
-          i = n;
+          s = n;
         } else
           return;
     }
-    return i;
+    return s;
   }
   // ============================================================================
   // Private методы для создания узлов
@@ -1646,16 +1604,16 @@ let x = class ne extends I {
   /**
    * Связывает два поля: при изменении source автоматически обновляется target
    */
-  linkFields(e, t, i) {
+  linkFields(e, t, s) {
     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 a = _(() => {
-      const l = r.value.value, u = i ? i(l) : l;
+      const l = r.value.value, u = s ? s(l) : l;
       n.setValue(u, { emitEvent: !1 });
-    }), o = N(O.LinkFields);
+    }), o = V(k.LinkFields);
     return this.disposers.add(o, a);
   }
   /**
@@ -1685,14 +1643,27 @@ let x = class ne extends I {
    * useEffect(() => dispose, []);
    * ```
    */
+  /** Подписка на top-level поле — value типизирован как `T[K]`. */
   watchField(e, t) {
-    const i = this.getFieldByPath(e);
-    if (!i)
+    const s = this.getFieldByPath(e);
+    if (!s)
       throw new Error(`GroupNode.watchField: field "${e}" not found`);
     const r = _(() => {
-      const a = i.value.value;
-      t(a);
-    }), n = N(O.WatchField);
+      t(s.value.value);
+    }), n = V(k.WatchField);
+    return this.disposers.add(n, r);
+  }
+  /**
+   * Подписка на вложенное поле по строковому пути ("address.city").
+   * Путь нельзя выразить в типах узла → value честно `unknown`, потребитель сужает.
+   */
+  watchFieldByPath(e, t) {
+    const s = this.getFieldByPath(e);
+    if (!s)
+      throw new Error(`GroupNode.watchFieldByPath: field "${e}" not found`);
+    const r = _(() => {
+      t(s.value.value);
+    }), n = V(k.WatchField);
     return this.disposers.add(n, r);
   }
   /**
@@ -1722,7 +1693,7 @@ let x = class ne extends I {
       "dispose" in e && typeof e.dispose == "function" && e.dispose();
     });
   }
-}, Q = class extends I {
+}, X = class extends D {
   // ============================================================================
   // Приватные поля
   // ============================================================================
@@ -1761,11 +1732,11 @@ let x = class ne extends I {
     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));
-    const i = H({
+    const s = H({
       getChildren: () => this.items.value,
       ownErrors: this._arrayErrors
     });
-    this.valid = i.valid, this.invalid = i.invalid, this.pending = i.pending, this.touched = i.touched, this.dirty = i.dirty, this.errors = i.errors, this.status = i.status;
+    this.valid = s.valid, this.invalid = s.invalid, this.pending = s.pending, this.touched = s.touched, this.dirty = s.dirty, this.errors = s.errors, this.status = s.status;
   }
   // ============================================================================
   // CRUD операции
@@ -1787,17 +1758,17 @@ let x = class ne extends I {
    */
   removeAt(e) {
     if (e < 0 || e >= this.items.value.length) {
-      k.handle(
+      O.handle(
         new Error(
           `ArrayNode.removeAt: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.removeAt",
-        w.LOG
+        S.LOG
       );
       return;
     }
     const t = this.items.value[e];
-    this.items.value = this.items.value.filter((i, r) => r !== e), t && "dispose" in t && typeof t.dispose == "function" && t.dispose();
+    this.items.value = this.items.value.filter((s, r) => r !== e), t && "dispose" in t && typeof t.dispose == "function" && t.dispose();
   }
   /**
    * Вставить элемент в массив
@@ -1806,17 +1777,17 @@ let x = class ne extends I {
    */
   insert(e, t) {
     if (e < 0 || e > this.items.value.length) {
-      k.handle(
+      O.handle(
         new Error(
           `ArrayNode.insert: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.insert",
-        w.LOG
+        S.LOG
       );
       return;
     }
-    const i = this.createItem(t), r = [...this.items.value];
-    r.splice(e, 0, i), this.items.value = r;
+    const s = this.createItem(t), r = [...this.items.value];
+    r.splice(e, 0, s), this.items.value = r;
   }
   /**
    * Переместить элемент массива с позиции `from` на позицию `to`
@@ -1835,12 +1806,12 @@ 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(
-        new Error(`ArrayNode.move: index out of bounds (from=${e}, to=${t}, length=${i})`),
+    const s = this.items.value.length;
+    if (e < 0 || e >= s || t < 0 || t >= s) {
+      O.handle(
+        new Error(`ArrayNode.move: index out of bounds (from=${e}, to=${t}, length=${s})`),
         "ArrayNode.move",
-        w.LOG
+        S.LOG
       );
       return;
     }
@@ -1863,12 +1834,12 @@ 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(
-        new Error(`ArrayNode.swap: index out of bounds (a=${e}, b=${t}, length=${i})`),
+    const s = this.items.value.length;
+    if (e < 0 || e >= s || t < 0 || t >= s) {
+      O.handle(
+        new Error(`ArrayNode.swap: index out of bounds (a=${e}, b=${t}, length=${s})`),
         "ArrayNode.swap",
-        w.LOG
+        S.LOG
       );
       return;
     }
@@ -1905,13 +1876,13 @@ let x = class ne extends I {
     return this.items.value.map((e) => e.getValue());
   }
   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);
+    this.clear(), e.forEach((s) => this.push(s)), t?.emitEvent !== !1 && this.validate().catch((s) => {
+      O.handle(s, "ArrayNode.setValue", S.LOG);
     });
   }
   patchValue(e) {
-    e.forEach((t, i) => {
-      this.items.value[i] && t !== void 0 && this.items.value[i].patchValue(t);
+    e.forEach((t, s) => {
+      this.items.value[s] && t !== void 0 && this.items.value[s].patchValue(t);
     });
   }
   /**
@@ -2039,9 +2010,9 @@ let x = class ne extends I {
    * @param callback - Функция, вызываемая для каждого элемента с типизированным GroupNode proxy
    */
   forEach(e) {
-    this.items.value.forEach((t, i) => {
+    this.items.value.forEach((t, s) => {
       const r = t.getProxy();
-      e(r, i);
+      e(r, s);
     });
   }
   /**
@@ -2050,9 +2021,9 @@ let x = class ne extends I {
    * @returns Новый массив результатов
    */
   map(e) {
-    return this.items.value.map((t, i) => {
+    return this.items.value.map((t, s) => {
       const r = t.getProxy();
-      return e(r, i);
+      return e(r, s);
     });
   }
   // ============================================================================
@@ -2151,14 +2122,14 @@ let x = class ne extends I {
    * ```
    */
   watchItems(e, t) {
-    const i = _(() => {
+    const s = _(() => {
       const n = this.items.value.map((a) => {
         if (a instanceof x)
           return a.getFieldByPath(e)?.value.value;
       });
       t(n);
-    }), r = N(O.WatchItems);
-    return this.disposers.add(r, i);
+    }), r = V(k.WatchItems);
+    return this.disposers.add(r, s);
   }
   /**
    * Подписка на изменение длины массива
@@ -2186,8 +2157,8 @@ let x = class ne extends I {
     const t = _(() => {
       const r = this.length.value;
       e(r);
-    }), i = N(O.WatchLength);
-    return this.disposers.add(i, t);
+    }), s = V(k.WatchLength);
+    return this.disposers.add(s, t);
   }
   /**
    * Очистить все ресурсы узла
@@ -2301,13 +2272,11 @@ class ke {
       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
+    if (this.isArrayConfig(e))
+      return new X(
+        e.schema,
+        e.initialItems
       );
-    }
     if (this.isGroupConfig(e))
       return new x(e);
     throw new Error(
@@ -2343,11 +2312,11 @@ class ke {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   createArrayNodeFromArray(e) {
-    const [t, ...i] = e, r = [];
+    const [t, ...s] = e, r = [];
     this.isGroupConfig(t) && r.push(this.extractValues(t));
-    for (const n of i)
+    for (const n of s)
       this.isGroupConfig(n) ? r.push(this.extractValues(n)) : r.push(n);
-    return new Q(t, r);
+    return new X(t, r);
   }
   /**
    * Извлечь значения из схемы (рекурсивно)
@@ -2385,8 +2354,8 @@ class ke {
       return e.map((t) => this.extractValues(t));
     if (this.isGroupConfig(e)) {
       const t = {};
-      for (const [i, r] of Object.entries(e))
-        t[i] = this.extractValues(r);
+      for (const [s, r] of Object.entries(e))
+        t[s] = this.extractValues(r);
       return t;
     }
     return e;
@@ -2466,28 +2435,28 @@ class ke {
     return e != null && typeof e == "object" && !this.isFieldConfig(e) && !this.isArrayConfig(e);
   }
 }
-function D(s) {
-  return s == null ? !1 : typeof s == "object" && "value" in s && "setValue" in s && "getValue" in s && "validate" in s;
+function I(i) {
+  return i == null ? !1 : typeof i == "object" && "value" in i && "setValue" in i && "getValue" in i && "validate" in i;
 }
-function Ve(s) {
-  return s == null ? !1 : D(s) && "validators" in s && "asyncValidators" in s && // FieldNode имеет markAsTouched метод
+function Ve(i) {
+  return i == null ? !1 : I(i) && "validators" in i && "asyncValidators" in i && // FieldNode имеет markAsTouched метод
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  typeof s.markAsTouched == "function" && // У FieldNode нет fields или items
-  !("fields" in s) && !("items" in s);
+  typeof i.markAsTouched == "function" && // У FieldNode нет fields или items
+  !("fields" in i) && !("items" in i);
 }
-function Oe(s) {
-  return s == null ? !1 : D(s) && "getFieldByPath" in s && "fields" in s && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
-  !("items" in s) && !("push" in s) && !("removeAt" in s);
+function Oe(i) {
+  return i == null ? !1 : I(i) && "getFieldByPath" in i && "fields" in i && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
+  !("items" in i) && !("push" in i) && !("removeAt" in i);
 }
-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
-  typeof s.push == "function" && // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  typeof s.removeAt == "function";
+function Ne(i) {
+  return i == null ? !1 : I(i) && "items" in i && "length" in i && "push" in i && "removeAt" in i && "at" in i && // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  typeof i.push == "function" && // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  typeof i.removeAt == "function";
 }
-function He(s) {
-  return Ve(s) ? "FieldNode" : Oe(s) ? "GroupNode" : Ne(s) ? "ArrayNode" : D(s) ? "FormNode" : "Unknown";
+function ze(i) {
+  return Ve(i) ? "FieldNode" : Oe(i) ? "GroupNode" : Ne(i) ? "ArrayNode" : I(i) ? "FormNode" : "Unknown";
 }
-class Fe extends I {
+class Fe extends D {
   /**
    * @param control Реактивный массив модели (`model.<path>`).
    * @param buildItem Строитель формы элемента по его под-модели (инъекция, чтобы избежать цикла
@@ -2504,11 +2473,11 @@ class Fe extends I {
       }
       this.itemNodes.value = n;
     }), this.length = h(() => this.itemNodes.value.length), this.value = h(() => this.itemNodes.value.map((r) => r.value.value));
-    const i = H({
+    const s = H({
       getChildren: () => this.itemNodes.value,
       ownErrors: this._arrayErrors
     });
-    this.valid = i.valid, this.invalid = i.invalid, this.pending = i.pending, this.touched = i.touched, this.dirty = i.dirty, this.errors = i.errors, this.status = i.status;
+    this.valid = s.valid, this.invalid = s.invalid, this.pending = s.pending, this.touched = s.touched, this.dirty = s.dirty, this.errors = s.errors, this.status = s.status;
   }
   itemNodes = y([]);
   // Кэш per-item формы по идентичности фасада под-модели (фасады кэшируются в core).
@@ -2537,10 +2506,10 @@ class Fe extends I {
     return this.itemNodes.value[e];
   }
   map(e) {
-    return this.itemNodes.value.map((t, i) => e(t, i));
+    return this.itemNodes.value.map((t, s) => e(t, s));
   }
   forEach(e) {
-    this.itemNodes.value.forEach((t, i) => e(t, i));
+    this.itemNodes.value.forEach((t, s) => e(t, s));
   }
   // ── Мутации (делегируют массиву модели; effect пересоберёт itemNodes) ──────
   push(e) {
@@ -2598,109 +2567,133 @@ 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?.());
+  }
   /** Очистка подписки синхронизации. */
   dispose() {
     this.disposeSync();
   }
 }
-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) {
-  if (s == null || typeof s != "object") return;
-  if (Array.isArray(s)) {
-    for (const n of s) G(n, e, t);
+const oe = (i) => i !== null && typeof i == "object" && !Array.isArray(i) && !(i instanceof Date) && !(typeof Blob < "u" && i instanceof Blob) && !(typeof File < "u" && i instanceof File);
+function G(i, e, t) {
+  if (i == null || typeof i != "object") return;
+  if (Array.isArray(i)) {
+    for (const n of i) G(n, e, t);
     return;
   }
-  const i = s, r = i.array;
-  if (r && typeof r.__path == "string" && typeof i.item == "function") {
-    t.set(r.__path, i.item);
+  const s = i, r = s.array;
+  if (r && typeof r.__path == "string" && typeof s.item == "function") {
+    t.set(r.__path, s.item);
     return;
   }
-  i.value instanceof ie && e.set(i.value, {
-    component: i.component,
-    componentProps: i.componentProps,
-    validators: i.validators,
-    asyncValidators: i.asyncValidators,
-    updateOn: i.updateOn,
-    disabled: i.disabled,
-    debounce: i.debounce
+  s.value instanceof re && e.set(s.value, {
+    component: s.component,
+    componentProps: s.componentProps,
+    validators: s.validators,
+    asyncValidators: s.asyncValidators,
+    updateOn: s.updateOn,
+    disabled: s.disabled,
+    debounce: s.debounce
   });
-  for (const [n, a] of Object.entries(i))
+  for (const [n, a] of Object.entries(s))
     n !== "value" && G(a, e, t);
 }
-function oe(s, e, t, i) {
+function le(i, e, t, s) {
   const r = {};
   for (const [n, a] of Object.entries(e)) {
     const o = t === "" ? n : `${t}.${n}`;
     if (Array.isArray(a))
       continue;
-    if (ae(a)) {
-      r[n] = oe(s, a, o, i);
+    if (oe(a)) {
+      r[n] = le(i, a, o, s);
       continue;
     }
-    const l = s.signalAt(o);
+    const l = i.signalAt(o);
     if (!l) throw new Error(`createForm({ model }): не найден сигнал для пути "${o}"`);
-    const u = i.get(l) ?? {}, { validators: m, asyncValidators: c, ...f } = u;
+    const u = s.get(l) ?? {}, { validators: m, asyncValidators: c, ...f } = u;
     r[n] = { ...f, valueSignal: l };
   }
   return r;
 }
-function le(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));
+function ue(i, e, t) {
+  for (const [s, r] of Object.entries(i)) {
+    const n = e === "" ? s : `${e}.${s}`;
+    Array.isArray(r) || (oe(r) ? ue(r, n, t) : t.push(n));
   }
 }
-function ue(s) {
-  const { model: e, schema: t, behavior: i } = s, r = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
+function ce(i) {
+  const { model: e, schema: t, behavior: s } = i, 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();
+  const a = le(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);
+    const p = e[c], v = (b) => ce({ model: b, schema: d(b) }), g = new Fe(p, v);
     o.fields.set(c, g);
   }
   const u = o.getProxy(), m = [];
-  le(e.get(), "", m);
+  ue(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;
+  return s && o.attachBehaviorCleanup(s.__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 xe = (i) => i != null && typeof i == "object" && "model" in i && typeof i.model?.signalAt == "function";
+function Je(i) {
+  return xe(i) ? ce(i) : new x(i).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 M = (i) => !(i === null || typeof i != "object" || Array.isArray(i) || i instanceof Date || typeof Blob < "u" && i instanceof Blob || typeof File < "u" && i instanceof File), A = (i, e) => i === "" ? String(e) : `${i}.${e}`, U = (i) => /^\d+$/.test(i), w = (i) => {
+  if (Array.isArray(i)) return i.map(w);
+  if (M(i)) {
     const e = {};
-    for (const t of Object.keys(s)) e[t] = A(s[t]);
+    for (const t of Object.keys(i)) e[t] = w(i[t]);
     return e;
   }
-  return s;
-}, C = (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)) {
-    const t = Object.keys(s), i = Object.keys(e);
-    return t.length !== i.length ? !1 : t.every((r) => C(s[r], e[r]));
+  return i;
+}, C = (i, e) => {
+  if (i === e) return !0;
+  if (Array.isArray(i) && Array.isArray(e))
+    return i.length !== e.length ? !1 : i.every((t, s) => C(t, e[s]));
+  if (M(i) && M(e)) {
+    const t = Object.keys(i), s = Object.keys(e);
+    return t.length !== s.length ? !1 : t.every((r) => C(i[r], e[r]));
   }
   return !1;
 };
-class Me {
+class Pe {
   constructor(e, t) {
     this.path = t;
-    const i = y(e);
-    i.__path = t, this.signal = i, this.initial = A(e);
+    const s = y(e);
+    s.__path = t, this.signal = s, this.initial = w(e);
   }
   kind = "leaf";
   signal;
@@ -2720,37 +2713,37 @@ class Me {
     this.signal.value = e;
   }
   resetToInitial() {
-    this.signal.value = A(this.initial);
+    this.signal.value = w(this.initial);
   }
   captureInitial() {
-    this.initial = A(this.signal.peek());
+    this.initial = w(this.signal.peek());
   }
   dirty() {
     return !C(this.signal.peek(), this.initial);
   }
 }
-class ce {
+class he {
   constructor(e, t) {
     this.path = t;
-    for (const i of Object.keys(e))
-      this.children.set(i, F(e[i], E(t, i)));
+    for (const s of Object.keys(e))
+      this.children.set(s, F(e[s], A(t, s)));
   }
   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, s] of this.children) s.rebase(A(e, t));
   }
   peek() {
     const e = {};
-    for (const [t, i] of this.children) e[t] = i.peek();
+    for (const [t, s] of this.children) e[t] = s.peek();
     return e;
   }
   set(e) {
     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]));
+    for (const [s, r] of this.children)
+      s in t && (r.kind === "leaf" && B(r.signal) || r.set(t[s]));
   }
   resetToInitial() {
     for (const e of this.children.values()) e.resetToInitial();
@@ -2763,38 +2756,38 @@ class ce {
     return !1;
   }
 }
-class Pe {
+class Me {
   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((s, r) => F(s, A(t, r)))), this.initial = w(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, s) => t.rebase(A(e, s)));
   }
   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, F(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();
+    const s = [...this.items.peek()];
+    s.splice(e, 0, F(t, A(this.path, e))), this.items.value = s, this.reindex();
   }
   removeAt(e) {
     const t = [...this.items.peek()];
     t.splice(e, 1), this.items.value = t, this.reindex();
   }
   move(e, t) {
-    const i = [...this.items.peek()], [r] = i.splice(e, 1);
-    r && i.splice(t, 0, r), this.items.value = i, this.reindex();
+    const s = [...this.items.peek()], [r] = s.splice(e, 1);
+    r && s.splice(t, 0, r), this.items.value = s, this.reindex();
   }
   swap(e, t) {
-    const i = [...this.items.peek()];
-    e < 0 || t < 0 || e >= i.length || t >= i.length || e === t || ([i[e], i[t]] = [i[t], i[e]], this.items.value = i, this.reindex());
+    const s = [...this.items.peek()];
+    e < 0 || t < 0 || e >= s.length || t >= s.length || e === t || ([s[e], s[t]] = [s[t], s[e]], this.items.value = s, this.reindex());
   }
   clear() {
     this.items.value = [];
@@ -2804,88 +2797,88 @@ 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((s, r) => F(s, A(this.path, r)));
   }
   resetToInitial() {
-    this.set(A(this.initial));
+    this.set(w(this.initial));
   }
   captureInitial() {
-    this.initial = A(this.peek());
+    this.initial = w(this.peek());
   }
   dirty() {
     return !C(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 F(i, e) {
+  return Array.isArray(i) ? new Me(i, e) : M(i) ? new he(i, e) : new Pe(i, e);
 }
-function T(s) {
-  if (s)
-    return s.kind === "leaf" ? s.read() : s.kind === "group" ? Ce(s) : he(s);
+function T(i) {
+  if (i)
+    return i.kind === "leaf" ? i.read() : i.kind === "group" ? Ce(i) : de(i);
 }
-function Ce(s) {
+function Ce(i) {
   return new Proxy(
     {},
     {
-      get: (e, t) => t === "__path" ? s.path : typeof t == "string" ? T(s.children.get(t)) : void 0,
-      set: (e, t, i) => {
+      get: (e, t) => t === "__path" ? i.path : typeof t == "string" ? T(i.children.get(t)) : void 0,
+      set: (e, t, s) => {
         if (typeof t != "string") return !1;
-        const r = s.children.get(t);
-        return r && r.set(i), !0;
+        const r = i.children.get(t);
+        return r && r.set(s), !0;
       },
-      has: (e, t) => typeof t == "string" && s.children.has(t),
-      ownKeys: () => [...s.children.keys()],
-      getOwnPropertyDescriptor: (e, t) => typeof t == "string" && s.children.has(t) ? { enumerable: !0, configurable: !0 } : void 0
+      has: (e, t) => typeof t == "string" && i.children.has(t),
+      ownKeys: () => [...i.children.keys()],
+      getOwnPropertyDescriptor: (e, t) => typeof t == "string" && i.children.has(t) ? { enumerable: !0, configurable: !0 } : void 0
     }
   );
 }
-function j(s) {
-  if (s)
-    return s.kind === "group" ? de(s) : s.kind === "array" ? he(s) : s.read();
+function j(i) {
+  if (i)
+    return i.kind === "group" ? fe(i) : i.kind === "array" ? de(i) : i.read();
 }
-function he(s) {
+function de(i) {
   const e = {
     get length() {
-      return s.items.value.length;
+      return i.items.value.length;
     },
-    push: (t) => s.push(t),
-    insertAt: (t, i) => s.insertAt(t, i),
-    removeAt: (t) => s.removeAt(t),
-    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)),
-    toArray: () => s.peek(),
+    push: (t) => i.push(t),
+    insertAt: (t, s) => i.insertAt(t, s),
+    removeAt: (t) => i.removeAt(t),
+    move: (t, s) => i.move(t, s),
+    swap: (t, s) => i.swap(t, s),
+    clear: () => i.clear(),
+    at: (t) => j(i.items.value[t]),
+    map: (t) => i.items.value.map((s, r) => t(j(s), r)),
+    forEach: (t) => i.items.value.forEach((s, r) => t(j(s), r)),
+    toArray: () => i.peek(),
     [Symbol.iterator]: function* () {
-      const t = s.items.value;
-      for (let i = 0; i < t.length; i++) yield T(t[i]);
+      const t = i.items.value;
+      for (let s = 0; s < t.length; s++) yield T(t[s]);
     }
   };
   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, s, r) => s === "__path" ? i.path : typeof s == "string" && U(s) ? T(i.items.value[Number(s)]) : Reflect.get(t, s, r),
+    has: (t, s) => typeof s == "string" && U(s) ? Number(s) < i.items.value.length : Reflect.has(t, s)
   });
 }
-function W(s) {
-  if (s.kind === "leaf") return s.signal;
-  if (s.kind === "group")
+function W(i) {
+  if (i.kind === "leaf") return i.signal;
+  if (i.kind === "group")
     return new Proxy(
       {},
       {
-        get: (t, i) => {
-          if (i === "__path") return s.path;
-          if (typeof i != "string") return;
-          const r = s.children.get(i);
+        get: (t, s) => {
+          if (s === "__path") return i.path;
+          if (typeof s != "string") return;
+          const r = i.children.get(s);
           return r ? W(r) : void 0;
         },
-        has: (t, i) => typeof i == "string" && s.children.has(i),
-        ownKeys: () => [...s.children.keys()],
-        getOwnPropertyDescriptor: (t, i) => typeof i == "string" && s.children.has(i) ? { enumerable: !0, configurable: !0 } : void 0
+        has: (t, s) => typeof s == "string" && i.children.has(s),
+        ownKeys: () => [...i.children.keys()],
+        getOwnPropertyDescriptor: (t, s) => typeof s == "string" && i.children.has(s) ? { enumerable: !0, configurable: !0 } : void 0
       }
     );
-  const e = s;
+  const e = i;
   return new Proxy(
     {
       get length() {
@@ -2893,29 +2886,29 @@ function W(s) {
       }
     },
     {
-      get: (t, i, r) => {
-        if (i === "__path") return e.path;
-        if (typeof i == "string" && U(i)) {
-          const n = e.items.value[Number(i)];
+      get: (t, s, r) => {
+        if (s === "__path") return e.path;
+        if (typeof s == "string" && U(s)) {
+          const n = e.items.value[Number(s)];
           return n ? W(n) : void 0;
         }
-        return Reflect.get(t, i, r);
+        return Reflect.get(t, s, r);
       }
     }
   );
 }
-function Te(s, e) {
+function Te(i, e) {
   if (!e) return;
-  let t = s;
-  for (const i of e.split(".")) {
+  let t = i;
+  for (const s of e.split(".")) {
     if (!t) return;
-    if (t.kind === "group") t = t.children.get(i);
-    else if (t.kind === "array") t = t.items.peek()[Number(i)];
+    if (t.kind === "group") t = t.children.get(s);
+    else if (t.kind === "array") t = t.items.peek()[Number(s)];
     else return;
   }
   return t && t.kind === "leaf" ? t.signal : void 0;
 }
-const X = /* @__PURE__ */ new Set([
+const Z = /* @__PURE__ */ new Set([
   "$",
   "get",
   "set",
@@ -2924,131 +2917,131 @@ const X = /* @__PURE__ */ new Set([
   "reset",
   "captureInitial",
   "signalAt"
-]), Z = /* @__PURE__ */ new WeakMap();
-function de(s) {
-  const e = Z.get(s);
+]), ee = /* @__PURE__ */ new WeakMap();
+function fe(i) {
+  const e = ee.get(i);
   if (e) return e;
   const t = {
-    $: W(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)
-  }, i = new Proxy(
+    $: W(i),
+    get: () => i.peek(),
+    set: (r) => i.set(r),
+    patch: (r) => i.set(r),
+    isDirty: () => i.dirty(),
+    reset: () => i.resetToInitial(),
+    captureInitial: () => i.captureInitial(),
+    signalAt: (r) => Te(i, r)
+  }, s = new Proxy(
     {},
     {
       get: (r, n) => {
         if (typeof n != "string") return;
-        const a = s.children.get(n);
+        const a = i.children.get(n);
         if (a) return T(a);
-        if (X.has(n)) return t[n];
+        if (Z.has(n)) return t[n];
       },
       set: (r, n, a) => {
         if (typeof n != "string") return !1;
-        const o = s.children.get(n);
+        const o = i.children.get(n);
         return o ? (o.set(a), !0) : !1;
       },
-      has: (r, n) => typeof n == "string" && (s.children.has(n) || X.has(n)),
-      ownKeys: () => [...s.children.keys()],
-      getOwnPropertyDescriptor: (r, n) => typeof n == "string" && s.children.has(n) ? { enumerable: !0, configurable: !0 } : void 0
+      has: (r, n) => typeof n == "string" && (i.children.has(n) || Z.has(n)),
+      ownKeys: () => [...i.children.keys()],
+      getOwnPropertyDescriptor: (r, n) => typeof n == "string" && i.children.has(n) ? { enumerable: !0, configurable: !0 } : void 0
     }
   );
-  return Z.set(s, i), i;
+  return ee.set(i, s), s;
 }
-function Je(s) {
-  const e = new ce(s, "");
-  return de(e);
+function Ye(i) {
+  const e = new he(i, "");
+  return fe(e);
 }
-const Ie = (s) => {
-  const e = s.componentProps;
+const De = (i) => {
+  const e = i.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);
+}, Ie = (i) => typeof i.when == "function" && Array.isArray(i.children);
+function N(i, e, t, s, r) {
+  if (i == null || typeof i != "object") return;
+  if (Array.isArray(i)) {
+    for (const a of i) N(a, e, t, s, 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);
+  const n = i;
+  if (Ie(n)) {
+    const a = s && !!n.when(e, t);
+    for (const o of n.children) N(o, e, t, a, r);
     return;
   }
-  if (Ie(n)) {
+  if (De(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);
+      N(o(m), m, t, s, r);
     }
     return;
   }
-  if (n.value instanceof ie) {
+  if (n.value instanceof re) {
     const a = n.validators ?? [];
-    a.length > 0 && (i ? r.tasks.push({ signal: n.value, validators: a, scope: e }) : r.clearSignals.push(n.value));
+    a.length > 0 && (s ? 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);
+      o === "value" || o === "validators" || N(l, e, t, s, r);
     return;
   }
-  for (const a of Object.values(n)) V(a, e, t, i, r);
+  for (const a of Object.values(n)) N(a, e, t, s, r);
 }
-function z(s, e) {
+function z(i, e) {
   const t = { tasks: [], clearSignals: [] };
-  return V(e, s, s, !0, t), t;
+  return N(e, i, i, !0, t), t;
 }
-const fe = (s, e, t) => {
-  (s[e] ??= []).push(t);
+const pe = (i, e, t) => {
+  (i[e] ??= []).push(t);
 };
-function Ye(s, e) {
-  const { tasks: t } = z(s, e), i = {};
+function Qe(i, e) {
+  const { tasks: t } = z(i, e), s = {};
   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);
+      const u = l(o, a, i);
+      u && typeof u.then == "function" || u && pe(s, r.__path, u);
     }
   }
-  return { valid: Object.keys(i).length === 0, errors: i };
+  return { valid: Object.keys(s).length === 0, errors: s };
 }
-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 Xe(i, e) {
+  const { tasks: t } = z(i, e), s = await ve(t, i);
+  return { valid: Object.keys(s).length === 0, errors: s };
 }
-async function pe(s, e) {
+async function ve(i, e) {
   const t = {};
   return await Promise.all(
-    s.map(async ({ signal: i, validators: r, scope: n }) => {
-      const a = i.peek();
+    i.map(async ({ signal: s, validators: r, scope: n }) => {
+      const a = s.peek();
       for (const o of r) {
         const l = await o(a, n, e);
-        l && fe(t, i.__path, l);
+        l && pe(t, s.__path, l);
       }
     })
   ), t;
 }
-async function Xe(s, e) {
-  const { tasks: t, clearSignals: i } = z(s, e), r = await pe(t, s);
+async function Ze(i, e) {
+  const { tasks: t, clearSignals: s } = z(i, e), r = await ve(t, i);
   for (const { signal: n } of t)
-    Y(n)?.setErrors(r[n.__path] ?? []);
-  for (const n of i)
-    Y(n)?.setErrors([]);
+    Q(n)?.setErrors(r[n.__path] ?? []);
+  for (const n of s)
+    Q(n)?.setErrors([]);
   return { valid: Object.keys(r).length === 0, errors: r };
 }
-var M = { exports: {} }, R = {};
-var ee;
+var P = { exports: {} }, R = {};
+var te;
 function Le() {
-  if (ee) return R;
-  ee = 1;
-  var s = re;
+  if (te) return R;
+  te = 1;
+  var i = ne;
   function e(c, f) {
     return c === f && (c !== 0 || 1 / c === 1 / f) || c !== c && f !== f;
   }
-  var t = typeof Object.is == "function" ? Object.is : e, i = s.useState, r = s.useEffect, n = s.useLayoutEffect, a = s.useDebugValue;
+  var t = typeof Object.is == "function" ? Object.is : e, s = i.useState, r = i.useEffect, n = i.useLayoutEffect, a = i.useDebugValue;
   function o(c, f) {
-    var d = f(), p = i({ inst: { value: d, getSnapshot: f } }), v = p[0].inst, g = p[1];
+    var d = f(), p = s({ inst: { value: d, getSnapshot: f } }), v = p[0].inst, g = p[1];
     return n(
       function() {
         v.value = d, v.getSnapshot = f, l(v) && g({ inst: v });
@@ -3077,13 +3070,13 @@ function Le() {
     return f();
   }
   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;
+  return R.useSyncExternalStore = i.useSyncExternalStore !== void 0 ? i.useSyncExternalStore : m, R;
 }
 var $ = {};
-var te;
+var se;
 function je() {
-  return te || (te = 1, process.env.NODE_ENV !== "production" && (function() {
-    function s(d, p) {
+  return se || (se = 1, process.env.NODE_ENV !== "production" && (function() {
+    function i(d, p) {
       return d === p && (d !== 0 || 1 / d === 1 / p) || d !== d && p !== p;
     }
     function e(d, p) {
@@ -3125,40 +3118,40 @@ function je() {
         return !0;
       }
     }
-    function i(d, p) {
+    function s(d, 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;
+    var r = ne, n = typeof Object.is == "function" ? Object.is : i, 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" ? s : 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 se;
+var ie;
 function Re() {
-  return se || (se = 1, process.env.NODE_ENV === "production" ? M.exports = Le() : M.exports = je()), M.exports;
+  return ie || (ie = 1, process.env.NODE_ENV === "production" ? P.exports = Le() : P.exports = je()), P.exports;
 }
 var J = Re();
-function $e(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;
+function $e(i, e) {
+  if (i === e) return !0;
+  if (i.length !== e.length) return !1;
+  for (let t = 0; t < i.length; t++)
+    if (i[t] !== e[t]) return !1;
   return !0;
 }
-function ve(s, e, t) {
-  const i = q(null);
-  if (i.current === null) {
+function Y(i, e, t) {
+  const s = q(null);
+  if (s.current === null) {
     const a = {};
-    for (const o in s)
-      a[o] = s[o].value;
-    i.current = { ...a, __snapshot: null };
+    for (const o in i)
+      a[o] = i[o].value;
+    s.current = { ...a, __snapshot: null };
   }
-  const r = S(
+  const r = E(
     (a) => {
       let o = !0;
       return _(() => {
-        for (const u in s)
-          s[u].value;
+        for (const u in i)
+          i[u].value;
         if (o) {
           o = !1;
           return;
@@ -3166,11 +3159,11 @@ function ve(s, e, t) {
         a();
       });
     },
-    [s]
-  ), n = S(() => {
-    const a = i.current, o = {};
-    for (const u in s)
-      o[u] = s[u].value;
+    [i]
+  ), n = E(() => {
+    const a = s.current, o = {};
+    for (const u in i)
+      o[u] = i[u].value;
     let l = !1;
     for (const u of e) {
       const { key: m, useShallowArrayEqual: c } = u, f = o[m], d = a[m];
@@ -3186,23 +3179,23 @@ function ve(s, e, t) {
     }
     if (!l && a.__snapshot)
       return a.__snapshot;
-    for (const u in s)
+    for (const u in i)
       a[u] = o[u];
     return a.__snapshot = t(o), a.__snapshot;
-  }, [s, t]);
+  }, [i, t]);
   return J.useSyncExternalStore(r, n, n);
 }
-function Be(s) {
+function Be(i) {
   const e = {
-    value: s.value,
-    disabled: s.disabled,
-    errors: s.errors,
-    pending: s.pending,
-    valid: s.valid,
-    invalid: s.invalid,
-    touched: s.touched,
-    shouldShowError: s.shouldShowError,
-    componentProps: s.componentProps
+    value: i.value,
+    disabled: i.disabled,
+    errors: i.errors,
+    pending: i.pending,
+    valid: i.valid,
+    invalid: i.invalid,
+    touched: i.touched,
+    shouldShowError: i.shouldShowError,
+    componentProps: i.componentProps
   }, t = [
     { key: "value" },
     { key: "disabled" },
@@ -3213,7 +3206,7 @@ function Be(s) {
     { key: "touched" },
     { key: "shouldShowError" },
     { key: "componentProps" }
-  ], i = S(
+  ], s = E(
     (r) => ({
       value: r.value,
       pending: r.pending,
@@ -3227,18 +3220,18 @@ function Be(s) {
     }),
     []
   );
-  return ve(e, t, i);
+  return Y(e, t, s);
 }
-function Ge(s) {
+function Ge(i) {
   const e = {
-    value: s.value,
-    length: s.length,
-    errors: s.errors,
-    pending: s.pending,
-    valid: s.valid,
-    invalid: s.invalid,
-    touched: s.touched,
-    dirty: s.dirty
+    value: i.value,
+    length: i.length,
+    errors: i.errors,
+    pending: i.pending,
+    valid: i.valid,
+    invalid: i.invalid,
+    touched: i.touched,
+    dirty: i.dirty
   }, t = [
     { key: "value" },
     { key: "length" },
@@ -3248,7 +3241,7 @@ function Ge(s) {
     { key: "invalid" },
     { key: "touched" },
     { key: "dirty" }
-  ], i = S(
+  ], s = E(
     (r) => ({
       value: r.value,
       length: r.length,
@@ -3261,101 +3254,108 @@ function Ge(s) {
     }),
     []
   );
-  return ve(e, t, i);
+  return Y(e, t, s);
 }
-function Ze(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
-  };
+function Ue() {
+  const i = E(
+    () => ({
+      value: [],
+      length: 0,
+      pending: !1,
+      errors: [],
+      valid: !0,
+      invalid: !1,
+      touched: !1,
+      dirty: !1
+    }),
+    []
+  );
+  return Y({}, [], i);
+}
+function et(i) {
+  const e = i && "length" in i && "map" in i;
+  return i ? e ? Ge(i) : Be(i) : Ue();
 }
-function et(s) {
-  const e = q({ value: s.value.value }), t = S(
+function tt(i) {
+  const e = q({ value: i.value.value }), t = E(
     (r) => {
       let n = !0;
       return _(() => {
-        if (s.value.value, n) {
+        if (i.value.value, n) {
           n = !1;
           return;
         }
         r();
       });
     },
-    [s]
-  ), i = S(() => {
-    const r = s.value.value;
+    [i]
+  ), s = E(() => {
+    const r = i.value.value;
     return e.current.value === r ? e.current.value : (e.current.value = r, r);
-  }, [s]);
-  return J.useSyncExternalStore(t, i, i);
+  }, [i]);
+  return J.useSyncExternalStore(t, s, s);
 }
-function tt(s) {
-  const e = q({ length: s.length.value }), t = S(
+function st(i) {
+  const e = q({ length: i.length.value }), t = E(
     (r) => {
       let n = !0;
       return _(() => {
-        if (s.length.value, n) {
+        if (i.length.value, n) {
           n = !1;
           return;
         }
         r();
       });
     },
-    [s]
-  ), i = S(() => {
-    const r = s.length.value;
+    [i]
+  ), s = E(() => {
+    const r = i.length.value;
     return e.current.length === r ? e.current.length : (e.current.length = r, r);
-  }, [s]);
-  return J.useSyncExternalStore(t, i, i);
+  }, [i]);
+  return J.useSyncExternalStore(t, s, s);
 }
 export {
-  Q as ArrayNode,
-  w as ErrorStrategy,
+  X as ArrayNode,
+  S as ErrorStrategy,
   _e as FieldNode,
-  k as FormErrorHandler,
-  I as FormNode,
+  O as FormErrorHandler,
+  D as FormNode,
   be as FormStatusMachine,
-  Se as FormSubmitter,
+  we as FormSubmitter,
   x as GroupNode,
   Fe as ModelArrayNode,
   ke 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,
+  nt as computeFrom,
+  at as copyFrom,
+  Je as createForm,
+  ce as createFormFromModel,
+  Ye as createModel,
+  ot as disableWhen,
+  lt as enableWhen,
+  Q as getNodeForSignal,
+  ze as getNodeType,
   Ne as isArrayNode,
   B as isDerived,
   Ve as isFieldNode,
-  D as isFormNode,
+  I as isFormNode,
   Oe as isGroupNode,
-  lt as markDerived,
+  ut 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
+  ct as resetWhen,
+  ht as revalidateWhen,
+  dt as runOutsideEffect,
+  ft as safeCallback,
+  pt as safeDebouncedCallback,
+  vt as syncFields,
+  mt as transformValue,
+  V as uniqueId,
+  st as useArrayLength,
+  et as useFormControl,
+  tt as useFormControlValue,
+  Ze as validateFormModel,
+  Xe as validateModel,
+  Qe as validateModelSync,
+  bt as validators,
+  yt as watchField
 };