@reformer/core 11.0.0-beta.7 → 11.0.0-beta.8

package/dist/index.js

@@ -1,16 +1,17 @@
-import { c as K } from "./create-model-B8U-COv-.js";
-import { e as He, a as Ke } from "./create-model-B8U-COv-.js";
-import { b as R, d as L, a as $ } from "./model-signals-proxy-2vqS243J.js";
-import { i as Ye, m as Je, u as Qe } from "./model-signals-proxy-2vqS243J.js";
-import { c as Ze, a as et, r as tt, b as st, d as it, e as rt, f as nt, s as at, t as ot, w as lt } from "./behaviors-value-C7dSEhCc.js";
-import { signal as m, computed as h, effect as g, batch as z, Signal as Y } from "@preact/signals-core";
-import { r as J } from "./signal-node-registry-tiwel-TV.js";
-import { g as dt } from "./signal-node-registry-tiwel-TV.js";
-import { f as Q, h as P, g as X, d as Z } from "./strategy-BXS_gBfz.js";
-import { d as ht, e as ft } from "./node-DGEFMTQu.js";
-import { useRef as _, useCallback as y, useMemo as ee, useEffect as U, useState as te, useImperativeHandle as se } from "react";
-import { s as F } from "./index-BrNkQj1y.js";
-class N {
+import { c as te } from "./create-model-BBRHhHwK.js";
+import { e as dt, a as ct } from "./create-model-BBRHhHwK.js";
+import { d as G, m as Y, b as D, i as j, f as W, h as L, p as se, g as re, j as ie } from "./model-value-proxy-caTmAiUd.js";
+import { a as ft, c as vt, u as mt } from "./model-value-proxy-caTmAiUd.js";
+import { c as yt, a as gt, r as bt, b as Et, d as _t, e as wt, f as At, s as Vt, t as kt, w as St } from "./behaviors-value-C7dSEhCc.js";
+import { signal as m, computed as h, effect as g, batch as ne, Signal as ae } from "@preact/signals-core";
+import { r as N } from "./signal-node-registry-tiwel-TV.js";
+import { g as Nt } from "./signal-node-registry-tiwel-TV.js";
+import { c as oe, u as le } from "./node-BeV_lV5i.js";
+import { b as Ct, a as Pt, d as xt, e as Ot } from "./node-BeV_lV5i.js";
+import { g as ue, i as I, h as de, d as ce } from "./strategy-DgzELWno.js";
+import { useRef as E, useCallback as y, useMemo as he, useEffect as Q, useState as fe, createContext as ve, useContext as me, useImperativeHandle as pe } from "react";
+import { s as P } from "./index-BrNkQj1y.js";
+class x {
   // ============================================================================
   // Protected состояние (для Template Method паттерна)
   // ============================================================================
@@ -275,7 +276,7 @@ class N {
   onEnable() {
   }
 }
-class x {
+class $ {
   /**
    * Хранилище подписок
    * Ключ: уникальный идентификатор подписки
@@ -453,11 +454,11 @@ const k = {
   /** GroupNode.watchField() */
   WatchField: "watchField"
 };
-let ie = 0;
-function V(s) {
-  return `${s}-${++ie}`;
+let ye = 0;
+function S(s) {
+  return `${s}-${++ye}`;
 }
-var E = /* @__PURE__ */ ((s) => (s.THROW = "throw", s.LOG = "log", s.CONVERT = "convert", s))(E || {});
+var b = /* @__PURE__ */ ((s) => (s.THROW = "throw", s.LOG = "log", s.CONVERT = "convert", s))(b || {});
 class w {
   static handle(e, t, i = "throw") {
     const r = this.extractMessage(e);
@@ -551,7 +552,7 @@ class w {
     return typeof e == "object" && e !== null && "code" in e && "message" in e && typeof e.code == "string" && typeof e.message == "string";
   }
 }
-class re {
+class ge {
   /** Внутренний сигнал статуса */
   _status;
   /** Публичный read-only сигнал статуса */
@@ -651,7 +652,7 @@ class re {
     this._status.value = e ? "invalid" : "valid";
   }
 }
-class ne extends N {
+class be extends x {
   // ============================================================================
   // Приватные сигналы
   // ============================================================================
@@ -703,13 +704,13 @@ class ne extends N {
    * Менеджер подписок для централизованного cleanup
    * Использует SubscriptionManager вместо массива для управления подписками
    */
-  disposers = new x();
+  disposers = new $();
   component;
   // ============================================================================
   // Конструктор
   // ============================================================================
   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 ?? m(e.value), this.initialValue = this._value.peek(), this._errors = m([]), this._componentProps = m(e.componentProps || {}), this.statusMachine = new re(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 ?? m(e.value), this.initialValue = this._value.peek(), this._errors = m([]), this._componentProps = m(e.componentProps || {}), this.statusMachine = new ge(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(
       () => this.statusMachine.invalid.value && (this._touched.value || this._dirty.value)
     );
   }
@@ -885,7 +886,7 @@ class ne extends N {
               return w.handle(
                 l,
                 "FieldNode AsyncValidator",
-                E.CONVERT
+                b.CONVERT
               );
             }
           })
@@ -967,10 +968,10 @@ class ne extends N {
    *
    * @example
    * Пример node-level: плоская схема с инлайн-значениями (back-compat путь до M1). В layout-схеме
-   * `createForm({ model, schema })` поля `validators` нет — правила живут в `defineValidationSchema`.
+   * `createFormFromModel({ model, schema })` поля `validators` нет — правила живут в `defineValidationSchema`.
    * ```typescript
    * // Сценарий 1: Instant feedback после submit
-   * const form = createForm({
+   * const form = createLegacyForm({
    *   email: {
    *     value: '',
    *     component: Input,
@@ -1031,7 +1032,7 @@ class ne extends N {
     const t = new AbortController(), i = g(() => {
       const n = this.value.value;
       e(n, t.signal);
-    }), r = V(k.Watch);
+    }), r = S(k.Watch);
     return this.disposers.add(r, () => {
       t.abort(), i();
     });
@@ -1062,7 +1063,7 @@ class ne extends N {
     const i = g(() => {
       const n = e.map((u) => u.value), a = t(...n);
       this.setValue(a, { emitEvent: !1 });
-    }), r = V(k.ComputeFrom);
+    }), r = S(k.ComputeFrom);
     return this.disposers.add(r, i);
   }
   /**
@@ -1093,7 +1094,7 @@ class ne extends N {
     }
   }
 }
-function O(s) {
+function R(s) {
   const { getChildren: e, ownErrors: t, disabled: i } = s, r = h(() => t.value.length > 0 ? !1 : e().every((o) => o.disabled.value || o.valid.value)), n = h(() => !r.value), a = h(() => e().some((o) => o.pending.value)), u = h(() => e().some((o) => o.touched.value)), d = h(() => e().some((o) => o.dirty.value)), l = h(() => {
     const o = [...t.value];
     for (const f of e())
@@ -1110,34 +1111,34 @@ function O(s) {
     status: c
   };
 }
-function B(s) {
+function U(s) {
   return typeof s == "object" && s !== null && "getProxy" in s && typeof s.getProxy == "function";
 }
-const G = "$";
-function ae(s, e) {
+const H = "$";
+function Ee(s, e) {
   let t;
   const i = () => {
     if (!t) {
       const r = {};
       e.forEach((n, a) => {
-        r[a] = n && B(n) ? n.getProxy() : n;
+        r[a] = n && U(n) ? n.getProxy() : n;
       }), t = r;
     }
     return t;
   };
   return new Proxy(s, {
     get: (r, n) => {
-      if (n === G)
+      if (n === H)
         return i();
       if (n in r)
         return r[n];
       if (typeof n == "string" && e.has(n)) {
         const a = e.get(n);
-        return a && B(a) ? a.getProxy() : a;
+        return a && U(a) ? a.getProxy() : a;
       }
     },
     set: (r, n, a) => typeof n == "string" && e.has(n) ? !1 : (r[n] = a, !0),
-    has: (r, n) => n === G || typeof n == "string" && e.has(n) ? !0 : n in r,
+    has: (r, n) => n === H || 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])];
@@ -1145,7 +1146,7 @@ function ae(s, e) {
     getOwnPropertyDescriptor: (r, n) => typeof n == "string" && e.has(n) ? { enumerable: !0, configurable: !0 } : Reflect.getOwnPropertyDescriptor(r, n)
   });
 }
-class oe {
+class _e {
   /**
    * @param form - Форма для отправки
    */
@@ -1242,7 +1243,7 @@ class oe {
     }
   }
 }
-function le(s) {
+function we(s) {
   const e = [];
   for (const t of s.split(".")) {
     const i = /^([^[\]]+)(?:\[(\d+)\])?$/.exec(t);
@@ -1251,7 +1252,7 @@ function le(s) {
   }
   return e;
 }
-class A extends N {
+class _ extends x {
   // ============================================================================
   // Приватные поля
   // ============================================================================
@@ -1264,7 +1265,7 @@ class A extends N {
   /**
    * Менеджер подписок для централизованного cleanup
    */
-  disposers = new x();
+  disposers = new $();
   /**
    * Ссылка на Proxy-инстанс
    */
@@ -1276,7 +1277,7 @@ class A extends N {
   /**
    * Фабрика для создания узлов формы
    */
-  nodeFactory = new ue();
+  nodeFactory = new Ae();
   // ============================================================================
   // Приватные сигналы состояния (inline из StateManager)
   // ============================================================================
@@ -1307,7 +1308,7 @@ class A extends N {
   status;
   submitting;
   constructor(e) {
-    super(), this.formSubmitter = new oe(this);
+    super(), this.formSubmitter = new _e(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 [u, d] of Object.entries(n)) {
       const l = this.createNode(d);
@@ -1319,7 +1320,7 @@ class A extends N {
         u[l] = d.value.value;
       }), u;
     });
-    const a = O({
+    const a = R({
       getChildren: () => Array.from(this._fields.values()),
       ownErrors: this._formErrors,
       disabled: this._disabled
@@ -1334,7 +1335,7 @@ class A extends N {
    * @see buildFormProxy
    */
   buildProxy() {
-    return ae(this, this._fields);
+    return Ee(this, this._fields);
   }
   // ============================================================================
   // Реализация абстрактных методов FormNode
@@ -1350,18 +1351,18 @@ class A extends N {
       const n = this._fields.get(i);
       if (n) {
         const a = this._fieldSignals.get(n) ?? n.value;
-        if (R(a)) continue;
+        if (G(a)) continue;
         n.setValue(r, t);
       }
     }
   }
   patchValue(e) {
-    z(() => {
+    ne(() => {
       for (const [t, i] of Object.entries(e)) {
         const r = this._fields.get(t);
         if (r && i !== void 0) {
           const n = this._fieldSignals.get(r) ?? r.value;
-          if (R(n)) continue;
+          if (G(n)) continue;
           r.setValue(i, { emitEvent: !1 });
         }
       }
@@ -1531,12 +1532,12 @@ class A extends N {
   getFieldByPath(e) {
     if (e.startsWith(".") || e.endsWith("."))
       return;
-    const t = le(e);
+    const t = we(e);
     if (t.length === 0)
       return;
     let i = this;
     for (const r of t) {
-      if (!(i instanceof A) || (i = i.getField(r.key), !i)) return;
+      if (!(i instanceof _) || (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);
@@ -1583,7 +1584,7 @@ class A extends N {
     const a = g(() => {
       const d = r.value.value, l = i ? i(d) : d;
       n.setValue(l, { emitEvent: !1 });
-    }), u = V(k.LinkFields);
+    }), u = S(k.LinkFields);
     return this.disposers.add(u, a);
   }
   /**
@@ -1620,7 +1621,7 @@ class A extends N {
       throw new Error(`GroupNode.watchField: field "${e}" not found`);
     const r = g(() => {
       t(i.value.value);
-    }), n = V(k.WatchField);
+    }), n = S(k.WatchField);
     return this.disposers.add(n, r);
   }
   /**
@@ -1633,7 +1634,7 @@ class A extends N {
       throw new Error(`GroupNode.watchFieldByPath: field "${e}" not found`);
     const r = g(() => {
       t(i.value.value);
-    }), n = V(k.WatchField);
+    }), n = S(k.WatchField);
     return this.disposers.add(n, r);
   }
   /**
@@ -1673,7 +1674,7 @@ class A extends N {
     });
   }
 }
-class j extends N {
+class q extends x {
   // ============================================================================
   // Приватные поля
   // ============================================================================
@@ -1684,7 +1685,7 @@ class j extends N {
    * Менеджер подписок для централизованного cleanup
    * Использует SubscriptionManager вместо массива для управления подписками
    */
-  disposers = new x();
+  disposers = new $();
   /** Array-level validation errors (e.g., "минимум 1 элемент") */
   _arrayErrors = m([]);
   // ============================================================================
@@ -1707,7 +1708,7 @@ class j extends N {
     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 = O({
+    const i = R({
       getChildren: () => this.items.value,
       ownErrors: this._arrayErrors
     });
@@ -1738,7 +1739,7 @@ class j extends N {
           `ArrayNode.removeAt: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.removeAt",
-        E.LOG
+        b.LOG
       );
       return;
     }
@@ -1757,7 +1758,7 @@ class j extends N {
           `ArrayNode.insert: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.insert",
-        E.LOG
+        b.LOG
       );
       return;
     }
@@ -1786,7 +1787,7 @@ class j extends N {
       w.handle(
         new Error(`ArrayNode.move: index out of bounds (from=${e}, to=${t}, length=${i})`),
         "ArrayNode.move",
-        E.LOG
+        b.LOG
       );
       return;
     }
@@ -1814,7 +1815,7 @@ class j extends N {
       w.handle(
         new Error(`ArrayNode.swap: index out of bounds (a=${e}, b=${t}, length=${i})`),
         "ArrayNode.swap",
-        E.LOG
+        b.LOG
       );
       return;
     }
@@ -1852,7 +1853,7 @@ class j extends N {
   }
   setValue(e, t) {
     this.clear(), e.forEach((i) => this.push(i)), t?.emitEvent !== !1 && this.validate().catch((i) => {
-      w.handle(i, "ArrayNode.setValue", E.LOG);
+      w.handle(i, "ArrayNode.setValue", b.LOG);
     });
   }
   patchValue(e) {
@@ -2010,7 +2011,7 @@ class j extends N {
    */
   createItem(e) {
     if (this.isGroupSchema(this.itemSchema)) {
-      const t = new A(this.itemSchema);
+      const t = new _(this.itemSchema);
       return e && t.patchValue(e), t;
     }
     throw new Error(
@@ -2088,7 +2089,7 @@ class j extends N {
     });
   }
 }
-class ue {
+class Ae {
   /**
    * Создает узел формы на основе конфигурации
    *
@@ -2139,14 +2140,14 @@ class ue {
     if (Array.isArray(e) && e.length >= 1)
       return this.createArrayNodeFromArray(e);
     if (this.isFieldConfig(e))
-      return new ne(e);
+      return new be(e);
     if (this.isArrayConfig(e))
-      return new j(
+      return new q(
         e.schema,
         e.initialItems
       );
     if (this.isGroupConfig(e))
-      return new A(e);
+      return new _(e);
     throw new Error(
       `NodeFactory: Unknown node config. Expected FieldConfig, GroupConfig, or ArrayConfig, but got: ${JSON.stringify(
         e
@@ -2184,7 +2185,7 @@ class ue {
     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 j(t, r);
+    return new q(t, r);
   }
   /**
    * Извлечь значения из схемы (рекурсивно)
@@ -2303,11 +2304,11 @@ class ue {
     return e != null && typeof e == "object" && !this.isFieldConfig(e) && !this.isArrayConfig(e);
   }
 }
-class de extends N {
+class Ve extends x {
   /**
    * @param control Реактивный массив модели (`model.<path>`).
    * @param buildItem Строитель формы элемента по его под-модели (инъекция, чтобы избежать цикла
-   *   импорта с `create-form`). Обычно `(item) => createForm({ model: item, schema: itemSchema(item) })`.
+   *   импорта с `create-form`). Обычно `(item) => createFormFromModel({ model: item, schema: itemSchema(item) })`.
    */
   constructor(e, t) {
     super(), this.control = e, this.buildItem = t, this.initial = e.toArray(), this.disposeSync = g(() => {
@@ -2326,7 +2327,7 @@ class de extends N {
       }
       this.mountedModels = n, this.itemNodes.value = a, d.forEach((l) => this.disposeItemNode(l));
     }), this.length = h(() => this.itemNodes.value.length), this.value = h(() => this.itemNodes.value.map((r) => r.value.value));
-    const i = O({
+    const i = R({
       getChildren: () => this.itemNodes.value,
       ownErrors: this._arrayErrors
     });
@@ -2368,11 +2369,16 @@ class de extends N {
     this.itemNodes.value.forEach((t, i) => e(t, i));
   }
   // ── Мутации (делегируют массиву модели; effect пересоберёт itemNodes) ──────
+  /**
+   * Добавить элемент. Без значения — элемент по шаблону массива модели (`arrayOf(blank)` либо
+   * `initialValue` узла-массива схемы); шаблона нет — ошибка модели.
+   */
   push(e) {
-    this.control.push(e ?? {});
+    this.control.push(e);
   }
+  /** Вставить элемент по индексу; без значения — по шаблону, как у {@link push}. */
   insert(e, t) {
-    this.control.insertAt(e, t ?? {});
+    this.control.insertAt(e, t);
   }
   removeAt(e) {
     this.control.removeAt(e);
@@ -2465,52 +2471,79 @@ class de extends N {
     this.disposeSync(), this.itemNodes.value.forEach((e) => this.disposeItemNode(e)), this.mountedModels = [];
   }
 }
-function C(s, e, t) {
-  if (s == null || typeof s != "object" || $(s)) return;
-  if (typeof s.getProxy == "function") {
+const K = /* @__PURE__ */ new WeakMap();
+function X(s, e) {
+  let t = K.get(e);
+  return t || (t = /* @__PURE__ */ new Map(), K.set(e, t)), t.has(s) || t.set(s, s(e)), t.get(s);
+}
+function M(s, e, t, i) {
+  if (s == null || typeof s != "object" || D(s) || j(s) || W(s) || s.$$typeof !== void 0 || i.has(s)) return;
+  if (i.add(s), typeof s.getProxy == "function") {
     process.env.NODE_ENV !== "production" && console.warn(
       "[reformer] createForm({ schema }): в схему попал узел формы (FormProxy) — он пропущен. Стройте дерево для createForm БЕЗ формы, а форму донесите до узла вторым проходом (билдер `(model, form?) => …`) либо через render-behavior `patchProps({ form })`."
     );
     return;
   }
   if (Array.isArray(s)) {
-    for (const n of s) C(n, e, t);
+    for (const a of s) M(a, e, t, i);
     return;
   }
-  const i = s, r = i.array;
-  if (r && typeof r.__path == "string" && typeof i.item == "function") {
-    t.set(r.__path, i.item);
-    return;
+  const r = s;
+  if (typeof r.item == "function") {
+    const a = L(r.model) ?? L(r.array);
+    if (a) {
+      t.set(a, r.item), r.initialValue !== void 0 && se(a, r.initialValue);
+      return;
+    }
+    if (r.array != null) {
+      process.env.NODE_ENV !== "production" && console.warn(
+        "[reformer] createForm({ schema }): у узла-массива `array` — не массив модели, узел пропущен. Ожидается `model: model.$.<массив>`."
+      );
+      return;
+    }
+  }
+  if (typeof r.part == "function") {
+    const a = re(r.model);
+    if (a) {
+      const u = Y(a), d = X(r.part, u);
+      M(d, e, t, i);
+      return;
+    }
   }
-  $(i.value) ? e.set(i.value, {
-    component: i.component,
-    componentProps: i.componentProps,
-    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:`."
+  const n = D(r.model) ? r.model : r.value;
+  D(n) ? e.set(n, {
+    component: r.component,
+    componentProps: r.componentProps,
+    updateOn: r.updateOn,
+    disabled: r.disabled,
+    debounce: r.debounce
+  }) : process.env.NODE_ENV !== "production" && r.component !== void 0 && ("valueSignal" in r || r.value != null || W(r.model) || j(r.model)) && console.warn(
+    "[reformer] createForm({ schema }): узел с `component` не распознан как поле — привязка не является сигналом модели. Ожидается `model: model.$.<path>` (лист или массив); проверьте, что не передан `model: model.<path>` (value-прокси), группа без `part` или `valueSignal:`."
   );
-  for (const [n, a] of Object.entries(i))
-    n !== "value" && C(a, e, t);
+  for (const a of Object.values(r)) M(a, e, t, i);
 }
-function q(s, e, t, i, r) {
+function Z(s, e, t, i, r) {
   const n = {};
   for (const a of Object.keys(s)) {
     const u = e === "" ? a : `${e}.${a}`, d = s[a];
-    if (L(d)) {
-      const l = i.has(u) ? void 0 : t.get(d);
-      if (l !== void 0) {
-        const c = d;
-        n[a] = { ...l, valueSignal: c }, r.push({ path: u, signal: c });
+    if (ie(d)) {
+      const l = i.get(d);
+      if (l) {
+        r.arrays.push({ path: u, handle: d, item: l });
+        continue;
+      }
+      const c = t.get(d);
+      if (c !== void 0) {
+        const o = d;
+        n[a] = { ...c, valueSignal: o }, r.fields.push({ path: u, signal: o });
       }
       continue;
     }
-    if (d instanceof Y) {
-      n[a] = { ...t.get(d) ?? {}, valueSignal: d }, r.push({ path: u, signal: d });
+    if (d instanceof ae) {
+      n[a] = { ...t.get(d) ?? {}, valueSignal: d }, r.fields.push({ path: u, signal: d });
       continue;
     }
-    n[a] = q(
+    r.groups.push({ path: u, handle: d }), n[a] = Z(
       d,
       u,
       t,
@@ -2520,42 +2553,47 @@ function q(s, e, t, i, r) {
   }
   return n;
 }
-function H(s) {
+function z(s, e) {
+  const t = e.lastIndexOf(".");
+  if (t === -1) return s;
+  const i = s.getFieldByPath(e.slice(0, t));
+  return i instanceof _ ? i : void 0;
+}
+function ee(s) {
   const { model: e, schema: t, behavior: i } = s, r = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
-  t !== void 0 && C(t, r, n);
-  const a = e.$, u = [], d = q(a, "", r, n, u), l = new A(d);
-  for (const o of Object.keys(a)) {
-    if (!L(a[o])) continue;
-    const f = n.get(o);
-    if (!f) continue;
-    const p = e[o], v = (S) => H({ model: S, schema: f(S) }), b = new de(p, v);
-    l.fields.set(o, b);
+  t !== void 0 && M(t, r, n, /* @__PURE__ */ new WeakSet());
+  const a = e.$, u = { fields: [], groups: [], arrays: [] }, d = Z(a, "", r, n, u), l = new _(d);
+  for (const { path: o, handle: f, item: v } of u.arrays) {
+    const p = z(l, o);
+    if (!p) continue;
+    const F = (V) => ee({ model: V, schema: X(v, V) }), T = Y(f), A = new Ve(T, F);
+    p.fields.set(o.slice(o.lastIndexOf(".") + 1), A), N(f, A);
   }
   const c = l.getProxy();
-  for (const { path: o, signal: f } of u) {
-    const p = l.getFieldByPath(o);
-    if (p) {
-      J(f, p);
-      const v = o.lastIndexOf("."), b = v === -1 ? l : l.getFieldByPath(o.slice(0, v));
-      b instanceof A && b.registerFieldSignal(p, f);
-    }
+  N(e.$, l);
+  for (const { path: o, handle: f } of u.groups) {
+    const v = l.getFieldByPath(o);
+    v && N(f, v);
+  }
+  for (const { path: o, signal: f } of u.fields) {
+    const v = l.getFieldByPath(o);
+    v && (N(f, v), z(l, o)?.registerFieldSignal(v, f));
   }
-  return i && l.attachBehaviorCleanup(i.__run(e, c)), c;
+  return i && l.attachBehaviorCleanup(i.__run(e, c, s.schemaController)), c;
 }
-const ce = (s) => s != null && typeof s == "object" && "model" in s && typeof s.model?.signalAt == "function";
-function he(s) {
-  return ce(s) ? H(s) : new A(s).getProxy();
+function Je(s) {
+  return new _(s).getProxy();
 }
-const fe = () => {
+const ke = () => {
 };
-function ve(s, e) {
+function Se(s, e) {
   if (!e) return;
-  const t = typeof e == "function" ? { schema: e } : e, i = Object.keys(t.steps ?? {}), r = i.map((o) => t.steps?.[o]).filter((o) => o != null), n = t.schema ?? Q(
-    () => Z(...r, ...t.extras ? [t.extras] : [])
+  const t = typeof e == "function" ? { schema: e } : e, i = Object.keys(t.steps ?? {}), r = i.map((o) => t.steps?.[o]).filter((o) => o != null), n = t.schema ?? ue(
+    () => ce(...r, ...t.extras ? [t.extras] : [])
   ), a = (o) => {
     const f = typeof o == "number" ? i[o - 1] : o;
     return (f != null ? t.steps?.[f] : null) ?? null;
-  }, { strategy: u, debounce: d, liveAfterSubmit: l } = t, c = P(s, n, {
+  }, { strategy: u, debounce: d, liveAfterSubmit: l } = t, c = I(s, n, {
     strategy: u,
     debounce: d,
     liveAfterSubmit: l
@@ -2565,62 +2603,101 @@ function ve(s, e) {
     stepSelectors: i,
     validate: () => c.validate(),
     validateAll: () => c.validate(),
-    validateStep: (o) => X(s, a(o) ?? fe, { touch: !0 }),
+    validateStep: (o) => de(s, a(o) ?? ke, { touch: !0 }),
     createStepController: (o) => {
       if (!u || u === "submit") return null;
       const f = a(o);
-      return f ? P(s, f, { strategy: u, debounce: d, liveAfterSubmit: l }) : null;
+      return f ? I(s, f, { strategy: u, debounce: d, liveAfterSubmit: l }) : null;
     },
     controller: c,
     validating: c.validating
   };
 }
-function Oe(s) {
-  if (!s.model && s.initial === void 0)
-    throw new Error("createCoreForm: provide either `initial` (to create a model) or `model`.");
-  const e = s.model ?? K(s.initial);
-  s.seed?.(e);
-  const t = he({
-    model: e,
-    ...s.schema ? { schema: s.schema(e) } : {},
-    ...s.behavior ? { behavior: s.behavior } : {}
-  }), i = ve(e, s.validation), r = { model: e, form: t, ...i ? { validation: i } : {} };
-  return s.setup?.(r), r;
+const C = "[@reformer/core] createForm";
+function Fe(s, e) {
+  const { schema: t, registry: i } = s;
+  if (t == null) return {};
+  if (typeof t == "function")
+    return { tree: t(e) };
+  if (i == null)
+    throw new Error(
+      `${C}: \`schema\` — готовое дерево, а не билдер \`(model) => узел\`. Передайте билдер; документу схемы (JSON) нужен \`registry\`. Форму из модели и готового дерева без сборки собирает \`createFormFromModel({ model, schema })\`.`
+    );
+  if (typeof i.resolveSchema != "function")
+    throw new Error(
+      `${C}: \`registry\` не умеет собирать дерево из документа схемы — у него нет метода \`resolveSchema\`. Возьмите реестр \`@reformer/renderer-json\` (\`createComponentRegistry\`).`
+    );
+  return i.resolveSchema(t, e);
+}
+function Ne(s) {
+  if (typeof s?.model?.signalAt != "function" && s?.initial === void 0)
+    throw new Error(
+      `${C}: нужна модель — \`model\` либо \`initial\`. Форму без модели — из плоской схемы полей (\`{ email: { value: '', component } }\`) или конфига группы — собирает \`createLegacyForm(...)\`.`
+    );
+  const t = s.model ?? te(s.initial);
+  s.seed?.(t);
+  const { tree: i, fieldWrapper: r, errorBoundary: n } = Fe(s, t), a = oe(), u = a.scopeOf(t), d = ee({
+    model: t,
+    ...i !== void 0 ? { schema: i } : {},
+    ...s.behavior ? { behavior: s.behavior, schemaController: a } : {}
+  });
+  if (process.env.NODE_ENV !== "production") {
+    const o = le(u.__overrideMaps, i);
+    o.length > 0 && console.warn(
+      `${C}: поведение обращается к узлам схемы, которых нет в корневом дереве: ${o.map((f) => `"${f}"`).join(", ")}. Правило ничего не сделает. Узлы строки массива и подформы адресуются из их поведения — через \`applyEach\` / \`apply\`.`
+    );
+  }
+  const l = Se(t, s.validation), c = {
+    model: t,
+    form: d,
+    ...l ? { validation: l } : {},
+    render: {
+      tree: i,
+      controller: a,
+      node: (o) => u.node(o),
+      ...r !== void 0 ? { fieldWrapper: r } : {},
+      ...n !== void 0 ? { errorBoundary: n } : {}
+    }
+  };
+  return s.setup?.(c), c;
+}
+function Ye(s) {
+  return Ne(s);
 }
-function M(s) {
+function O(s) {
   return s == null ? !1 : typeof s == "object" && "value" in s && "setValue" in s && "getValue" in s && "validate" in s;
 }
-function me(s) {
-  return M(s) && "validators" in s && "asyncValidators" in s && // FieldNode имеет markAsTouched метод
+function Me(s) {
+  return O(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 pe(s) {
-  return M(s) && "getFieldByPath" in s && "fields" in s && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
+function Ce(s) {
+  return O(s) && "getFieldByPath" in s && "fields" in s && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
   !("items" in s) && !("push" in s) && !("removeAt" in s);
 }
-function ye(s) {
-  return M(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 Pe(s) {
+  return O(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 Te(s) {
-  return me(s) ? "FieldNode" : pe(s) ? "GroupNode" : ye(s) ? "ArrayNode" : M(s) ? "FormNode" : "Unknown";
+function Qe(s) {
+  return Me(s) ? "FieldNode" : Ce(s) ? "GroupNode" : Pe(s) ? "ArrayNode" : O(s) ? "FormNode" : "Unknown";
 }
-function ge(s, e) {
+function xe(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 T(s, e, t, i) {
-  const r = _(null), n = _(s);
+function B(s, e, t, i) {
+  const r = E(null), n = E(s);
   n.current = s;
-  const a = _(e);
+  const a = E(e);
   a.current = e;
-  const u = _(t);
+  const u = E(t);
   if (u.current = t, r.current === null) {
     const c = {};
     for (const o in s)
@@ -2631,9 +2708,9 @@ function T(s, e, t, i) {
     (c) => {
       let o = !0;
       return g(() => {
-        const p = n.current;
-        for (const v in p)
-          p[v].value;
+        const v = n.current;
+        for (const p in v)
+          v[p].value;
         if (o) {
           o = !1;
           return;
@@ -2649,30 +2726,30 @@ function T(s, e, t, i) {
     [i]
   ), l = y(() => {
     const c = r.current, o = n.current, f = {};
-    for (const v in o)
-      f[v] = o[v].value;
-    let p = !1;
-    for (const v of a.current) {
-      const { key: b, useShallowArrayEqual: S } = v, D = f[b], I = c[b];
-      if (S) {
-        if (!ge(I, D)) {
-          p = !0;
+    for (const p in o)
+      f[p] = o[p].value;
+    let v = !1;
+    for (const p of a.current) {
+      const { key: F, useShallowArrayEqual: T } = p, A = f[F], V = c[F];
+      if (T) {
+        if (!xe(V, A)) {
+          v = !0;
           break;
         }
-      } else if (I !== D) {
-        p = !0;
+      } else if (V !== A) {
+        v = !0;
         break;
       }
     }
-    if (!p && c.__snapshot)
+    if (!v && c.__snapshot)
       return c.__snapshot;
-    for (const v in o)
-      c[v] = f[v];
+    for (const p in o)
+      c[p] = f[p];
     return c.__snapshot = u.current(f), c.__snapshot;
   }, [i]);
-  return F.useSyncExternalStore(d, l, l);
+  return P.useSyncExternalStore(d, l, l);
 }
-function be(s) {
+function Oe(s) {
   const e = {
     value: s.value,
     disabled: s.disabled,
@@ -2710,9 +2787,9 @@ function be(s) {
     }),
     []
   );
-  return T(e, t, i, s);
+  return B(e, t, i, s);
 }
-function Ee(s) {
+function Te(s) {
   const e = {
     value: s.value,
     length: s.length,
@@ -2747,9 +2824,9 @@ function Ee(s) {
     }),
     []
   );
-  return T(e, t, i, s);
+  return B(e, t, i, s);
 }
-function _e() {
+function De() {
   const s = y(
     () => ({
       value: [],
@@ -2764,14 +2841,14 @@ function _e() {
     }),
     []
   );
-  return T({}, [], s);
+  return B({}, [], s);
 }
-function De(s) {
+function Xe(s) {
   const e = s && "length" in s && "map" in s;
-  return s ? e ? Ee(s) : be(s) : _e();
+  return s ? e ? Te(s) : Oe(s) : De();
 }
-function Ie(s) {
-  const e = _({ value: s.value.value }), t = y(
+function Ze(s) {
+  const e = E({ value: s.value.value }), t = y(
     (r) => {
       let n = !0;
       return g(() => {
@@ -2787,10 +2864,10 @@ function Ie(s) {
     const r = s.value.value;
     return e.current.value === r ? e.current.value : (e.current.value = r, r);
   }, [s]);
-  return F.useSyncExternalStore(t, i, i);
+  return P.useSyncExternalStore(t, i, i);
 }
-function Re(s) {
-  const e = _({ length: s.length.value }), t = y(
+function et(s) {
+  const e = E({ length: s.length.value }), t = y(
     (r) => {
       let n = !0;
       return g(() => {
@@ -2806,15 +2883,15 @@ function Re(s) {
     const r = s.length.value;
     return e.current.length === r ? e.current.length : (e.current.length = r, r);
   }, [s]);
-  return F.useSyncExternalStore(t, i, i);
+  return P.useSyncExternalStore(t, i, i);
 }
-function $e(s) {
-  const { model: e, schema: t, strategy: i, debounce: r, liveAfterSubmit: n } = s, a = ee(
-    () => P(e, t, { strategy: i, debounce: r, liveAfterSubmit: n }),
+function tt(s) {
+  const { model: e, schema: t, strategy: i, debounce: r, liveAfterSubmit: n } = s, a = he(
+    () => I(e, t, { strategy: i, debounce: r, liveAfterSubmit: n }),
     [e, t, i, r, n]
   );
-  U(() => a.start(), [a]);
-  const u = F.useSyncExternalStore(
+  Q(() => a.start(), [a]);
+  const u = P.useSyncExternalStore(
     y((l) => a.validating.subscribe(l), [a]),
     () => a.validating.peek(),
     () => !1
@@ -2822,31 +2899,35 @@ function $e(s) {
   ), d = y(() => a.validate(), [a]);
   return { submit: d, validate: d, isValidating: u };
 }
-function Be(s) {
-  const [e] = te(s), t = e.validation?.controller;
-  return U(() => t?.start(), [t]), e;
+function st(s) {
+  const [e] = fe(s), t = e.validation?.controller;
+  return Q(() => t?.start(), [t]), e;
 }
-const Ae = ["labelTooltip"];
-function Ge(s) {
+const Ie = ve(null);
+function rt() {
+  return me(Ie);
+}
+const $e = ["labelTooltip"];
+function it(s) {
   if (!(s == null || typeof s != "function" && typeof s != "object"))
     return s.reformerAdapter;
 }
-const W = (s) => s;
-function je(s, e, t = {}) {
+const J = (s) => s;
+function nt(s, e, t = {}) {
   const i = { ...t };
-  for (const n of Ae) delete i[n];
+  for (const n of $e) delete i[n];
   for (const n of s?.strip ?? []) delete i[n];
   if (!s)
     return { ...i, value: e.value, onChange: e.onChange, onBlur: e.onBlur };
-  const r = s.fromEmit ?? W;
+  const r = s.fromEmit ?? J;
   return {
     ...i,
-    [s.valueProp ?? "value"]: (s.toValue ?? W)(e.value),
+    [s.valueProp ?? "value"]: (s.toValue ?? J)(e.value),
     [s.changeProp ?? "onChange"]: (n) => e.onChange(r(n, i)),
     ...s.bindBlur ? s.bindBlur(e.onBlur) : { onBlur: e.onBlur }
   };
 }
-function we(s) {
+function Re(s) {
   return {
     focus: () => s.current?.focus(),
     blur: () => s.current?.blur(),
@@ -2854,69 +2935,79 @@ function we(s) {
     getElement: () => s.current
   };
 }
-function ke(s) {
+function Be(s) {
   return typeof s == "object" && s !== null && s.nodeType === 1;
 }
-function We(s) {
-  const e = _(null);
-  return se(s, () => Ve(e)), e;
+function at(s) {
+  const e = E(null);
+  return pe(s, () => Ge(e)), e;
 }
-function Ve(s) {
+function Ge(s) {
   const e = s.current;
-  return e == null || ke(e) ? we(s) : e;
+  return e == null || Be(e) ? Re(s) : e;
 }
-const Le = Object.freeze({ runtime: "reformer-core", v: 1 });
+const ot = Object.freeze({ runtime: "reformer-core", v: 1 });
 export {
-  j as ArrayNode,
-  Le as CORE_RUNTIME_TOKEN,
-  E as ErrorStrategy,
-  Ae as FIELD_WRAPPER_ONLY_PROPS,
-  ne as FieldNode,
+  q as ArrayNode,
+  ot as CORE_RUNTIME_TOKEN,
+  b as ErrorStrategy,
+  $e as FIELD_WRAPPER_ONLY_PROPS,
+  be as FieldNode,
+  Ie as FormBundleContext,
   w as FormErrorHandler,
-  N as FormNode,
-  oe as FormSubmitter,
-  A as GroupNode,
-  de as ModelArrayNode,
-  ue as NodeFactory,
-  x as SubscriptionManager,
-  je as bindFieldProps,
-  ve as buildValidation,
-  Ze as computeFrom,
-  et as copyFrom,
-  Oe as createCoreForm,
-  he as createForm,
-  H as createFormFromModel,
-  K as createModel,
-  ht as disableWhen,
-  He as eachLeafSignal,
-  Ke as eachValueSignal,
-  ft as enableWhen,
-  Ge as getFieldAdapter,
-  dt as getNodeForSignal,
-  Te as getNodeType,
-  ye as isArrayNode,
-  R as isDerived,
-  me as isFieldNode,
-  M as isFormNode,
-  pe as isGroupNode,
-  Ye as isModelContainerSignal,
-  $ as isValueSignal,
-  we as makeElementFieldHandle,
-  Je as markDerived,
-  J as registerSignalNode,
-  tt as resetWhen,
-  st as revalidateWhen,
-  it as runOutsideEffect,
-  rt as safeCallback,
-  nt as safeDebouncedCallback,
-  at as syncFields,
-  ot as transformValue,
-  Qe as unmarkDerived,
-  Re as useArrayLength,
-  We as useFieldHandleRef,
-  Be as useFormBundle,
-  De as useFormControl,
-  Ie as useFormControlValue,
-  $e as useFormValidation,
-  lt as watchField
+  x as FormNode,
+  _e as FormSubmitter,
+  _ as GroupNode,
+  Ve as ModelArrayNode,
+  Ae as NodeFactory,
+  $ as SubscriptionManager,
+  ft as arrayOf,
+  nt as bindFieldProps,
+  Se as buildValidation,
+  yt as computeFrom,
+  gt as copyFrom,
+  Ye as createCoreForm,
+  Ne as createForm,
+  ee as createFormFromModel,
+  Je as createLegacyForm,
+  te as createModel,
+  oe as createSchemaController,
+  Ct as createSchemaOverrideMaps,
+  Pt as createSchemaScope,
+  xt as disableWhen,
+  dt as eachLeafSignal,
+  ct as eachValueSignal,
+  Ot as enableWhen,
+  it as getFieldAdapter,
+  Nt as getNodeForSignal,
+  Qe as getNodeType,
+  Pe as isArrayNode,
+  G as isDerived,
+  Me as isFieldNode,
+  O as isFormNode,
+  Ce as isGroupNode,
+  j as isModelContainerSignal,
+  D as isValueSignal,
+  Re as makeElementFieldHandle,
+  vt as markDerived,
+  Y as modelOf,
+  N as registerSignalNode,
+  bt as resetWhen,
+  Et as revalidateWhen,
+  _t as runOutsideEffect,
+  wt as safeCallback,
+  At as safeDebouncedCallback,
+  X as schemaSubtree,
+  Vt as syncFields,
+  kt as transformValue,
+  le as unknownSchemaSelectors,
+  mt as unmarkDerived,
+  et as useArrayLength,
+  at as useFieldHandleRef,
+  st as useFormBundle,
+  rt as useFormBundleContext,
+  Xe as useFormControl,
+  Ze as useFormControlValue,
+  tt as useFormValidation,
+  St as watchField
 };