@reformer/core 10.0.0 → 10.2.0

package/dist/{behaviors-node-DUrqAqp1.js → behaviors-node-DGEFMTQu.js}

@@ -1,6 +1,6 @@
 import { effect as i } from "@preact/signals-core";
 import { g as s } from "./signal-node-registry-tiwel-TV.js";
-import { d as f } from "./behaviors-value-lCpqicfa.js";
+import { d as f } from "./behaviors-value-C7dSEhCc.js";
 function a(n, r, t) {
   return i(() => {
     const o = r(), e = s(n);

package/dist/{behaviors-value-lCpqicfa.js → behaviors-value-C7dSEhCc.js}

@@ -1,57 +1,46 @@
 import { effect as f } from "@preact/signals-core";
-const a = /* @__PURE__ */ new WeakMap();
-function h(e) {
-  a.set(e, (a.get(e) ?? 0) + 1);
-}
-function y(e) {
-  const n = a.get(e);
-  n !== void 0 && (n <= 1 ? a.delete(e) : a.set(e, n - 1));
-}
-function E(e) {
-  return a.has(e);
-}
-const m = "runOutsideEffect";
-function v(e, n) {
+const d = "runOutsideEffect";
+function i(e, n) {
   process.env.NODE_ENV !== "production" && console.error(`[${n}]`, e);
 }
-function p(e) {
+function m(e) {
   return typeof e == "object" && e !== null && typeof e.then == "function";
 }
-function d(e, n) {
+function v(e, n) {
   try {
     const t = e();
-    p(t) && t.then(void 0, (r) => v(r, n));
+    m(t) && t.then(void 0, (r) => i(r, n));
   } catch (t) {
-    v(t, n);
+    i(t, n);
   }
 }
-function D(e) {
+function y(e) {
   return (...n) => {
-    s(() => e(...n));
+    a(() => e(...n));
   };
 }
-function s(e) {
+function a(e) {
   let n = !1;
   return queueMicrotask(() => {
-    n || d(e, m);
+    n || v(e, d);
   }), () => {
     n = !0;
   };
 }
-function w(e, n) {
+function h(e, n) {
   return () => {
-    n(() => d(e, "safeDebouncedCallback"));
+    n(() => v(e, "safeDebouncedCallback"));
   };
 }
-function b(e, n, t, r) {
+function k(e, n, t, r) {
   return f(() => {
     const u = e.map((c) => c.value);
     if (r?.when && !r.when(...u)) return;
-    const o = t(...u);
-    n.peek() !== o && (n.value = o);
+    const s = t(...u);
+    n.peek() !== s && (n.value = s);
   });
 }
-function F(e, n, t) {
+function E(e, n, t) {
   return f(() => {
     const r = e.value;
     if (t?.when && !t.when()) return;
@@ -59,18 +48,18 @@ function F(e, n, t) {
     n.peek() !== u && (n.value = u);
   });
 }
-function x(e, n, t) {
+function w(e, n, t) {
   let r = !0;
   return f(() => {
     const u = e.value;
     r && (r = !1, !t?.immediate) || n(u);
   });
 }
-function C(e, n) {
+function b(e, n) {
   let t = !1;
   return f(() => {
     const r = e.value;
-    t || s(() => {
+    t || a(() => {
       const u = n(r);
       if (e.peek() !== u) {
         t = !0;
@@ -83,66 +72,63 @@ function C(e, n) {
     });
   });
 }
-function O(e, n, t) {
+function D(e, n, t) {
   const r = t?.resetValue ?? null;
   return f(() => {
     const u = n();
-    s(() => {
+    a(() => {
       u && e.peek() !== r && (e.value = r);
     });
   });
 }
-function V(e, n, t) {
+function F(e, n, t) {
   const r = t?.transform;
   let u = !1;
-  const o = f(() => {
-    const i = e.value;
-    u || s(() => {
+  const s = f(() => {
+    const l = e.value;
+    u || a(() => {
       u = !0;
       try {
-        const l = r ? r(i) : i;
-        n.peek() !== l && (n.value = l);
+        const o = r ? r(l) : l;
+        n.peek() !== o && (n.value = o);
       } finally {
         u = !1;
       }
     });
   }), c = f(() => {
-    const i = n.value;
-    u || s(() => {
+    const l = n.value;
+    u || a(() => {
       u = !0;
       try {
-        e.peek() !== i && (e.value = i);
+        e.peek() !== l && (e.value = l);
       } finally {
         u = !1;
       }
     });
   });
   return () => {
-    o(), c();
+    s(), c();
   };
 }
-function N(e, n) {
+function x(e, n) {
   let t = !0;
   return f(() => {
     if (e.forEach((r) => r.value), t) {
       t = !1;
       return;
     }
-    s(() => n());
+    a(() => n());
   });
 }
 export {
-  F as a,
-  N as b,
-  b as c,
-  s as d,
-  D as e,
-  w as f,
-  E as i,
-  h as m,
-  O as r,
-  V as s,
-  C as t,
-  y as u,
-  x as w
+  E as a,
+  x as b,
+  k as c,
+  a as d,
+  y as e,
+  h as f,
+  D as r,
+  F as s,
+  b as t,
+  w
 };

package/dist/behaviors.js

@@ -1,6 +1,7 @@
 import { effect as O } from "@preact/signals-core";
-import { d as $, m as k, u as x, a as S, w as F, t as A, r as C, s as D, b as M } from "./behaviors-value-lCpqicfa.js";
-import { e as G } from "./behaviors-node-DUrqAqp1.js";
+import { d as $, a as S, w as F, t as A, r as C, s as D, b as M } from "./behaviors-value-C7dSEhCc.js";
+import { m as k, u as x } from "./derived-registry-CluZCQ7U.js";
+import { e as G } from "./behaviors-node-DGEFMTQu.js";
 let p = null;
 function P(e) {
   if (!p)
@@ -18,11 +19,11 @@ function y() {
 }
 function T(e) {
   return {
-    __run(t, n) {
-      const o = { cleanups: [], model: t, form: n }, r = p;
+    __run(n, t) {
+      const o = { cleanups: [], model: n, form: t }, r = p;
       p = o;
       try {
-        e({ model: t, form: n });
+        e({ model: n, form: t });
       } finally {
         p = r;
       }
@@ -32,112 +33,112 @@ function T(e) {
     }
   };
 }
-function m(e) {
+function h(e) {
   s(O(e));
 }
 function _(e) {
   $(e);
 }
-const h = (e) => typeof e == "object" && e !== null && typeof e.peek == "function", B = (e) => Array.isArray(e) ? e : [e];
+const m = (e) => typeof e == "object" && e !== null && typeof e.peek == "function", B = (e) => Array.isArray(e) ? e : [e];
 function E(e) {
-  const t = {};
-  for (const n of Object.keys(e)) {
-    const o = e[n];
-    t[n] = h(o) ? o.value : E(o);
+  const n = {};
+  for (const t of Object.keys(e)) {
+    const o = e[t];
+    n[t] = m(o) ? o.value : E(o);
   }
-  return t;
+  return n;
 }
-function W(e, t) {
-  for (const n of Object.keys(e)) {
-    const o = e[n];
-    h(o) ? o.value = t?.[n] : W(o, t?.[n] ?? {});
+function W(e, n) {
+  for (const t of Object.keys(e)) {
+    const o = e[t];
+    m(o) ? o.value = n?.[t] : W(o, n?.[t] ?? {});
   }
 }
 function I(e) {
   if (!e) return;
-  const { form: t } = y();
-  return t.getFieldByPath(e);
+  const { form: n } = y();
+  return n.getFieldByPath(e);
 }
 function V(e) {
   return new Proxy(
     {},
     {
-      get: (t, n) => {
-        if (n === "$") return e;
-        if (typeof n != "string") return;
-        const o = e[n];
+      get: (n, t) => {
+        if (t === "$") return e;
+        if (typeof t != "string") return;
+        const o = e[t];
         if (o != null)
-          return h(o) ? o.value : V(o);
+          return m(o) ? o.value : V(o);
       }
     }
   );
 }
 function j(e) {
-  return (t) => {
+  return (n) => {
     try {
-      t();
-    } catch (n) {
-      if (n instanceof Error && /cycle detected/i.test(n.message)) {
+      n();
+    } catch (t) {
+      if (t instanceof Error && /cycle detected/i.test(t.message)) {
         const o = e.__path ?? "?";
         throw new Error(
           `[@reformer/core/behaviors] compute("${o}"): расходящийся цикл пересчёта — взаимные compute/computeFrom без стабилизации. Проверьте зависимости или добавьте стабилизирующее условие (when) / разорвите цикл через peek.`
         );
       }
-      throw n;
+      throw t;
     }
   };
 }
-function Q(e, t, n) {
+function U(e, n, t) {
   k(e), s(() => x(e));
   const o = j(e);
-  m(() => {
-    if (n?.when && !n.when()) return;
-    const r = t();
+  h(() => {
+    if (t?.when && !t.when()) return;
+    const r = n();
     e.peek() !== r && o(() => {
       e.value = r;
     });
   });
 }
-function U(e, t, n, o) {
-  k(t), s(() => x(t));
-  const r = j(t);
-  m(() => {
+function X(e, n, t, o) {
+  k(n), s(() => x(n));
+  const r = j(n);
+  h(() => {
     const c = e.map((f) => f.value);
     if (o?.when && !o.when(...c)) return;
-    const i = n(...c);
-    t.peek() !== i && r(() => {
-      t.value = i;
+    const i = t(...c);
+    n.peek() !== i && r(() => {
+      n.value = i;
     });
   });
 }
-function X(e, t, n) {
-  if (h(e) && h(t)) {
-    s(S(e, t, n));
+function Y(e, n, t) {
+  if (m(e) && m(n)) {
+    s(S(e, n, t));
     return;
   }
-  const o = e, r = t;
-  m(() => {
+  const o = e, r = n;
+  h(() => {
     const c = E(o);
-    n?.when && !n.when() || _(() => W(r, c));
+    t?.when && !t.when() || _(() => W(r, c));
   });
 }
-function R(e, t, n) {
+function R(e, n, t) {
   let o;
   const r = (c) => {
     o?.abort(), o = new AbortController();
     const { signal: i } = o;
-    $(() => t(c, { signal: i }));
+    $(() => n(c, { signal: i }));
   };
-  if (!n?.debounce)
-    s(F(e, r, { immediate: n?.immediate }));
+  if (!t?.debounce)
+    s(F(e, r, { immediate: t?.immediate }));
   else {
     let c;
     const i = F(
       e,
       (f) => {
-        c && clearTimeout(c), c = setTimeout(() => r(f), n.debounce);
+        c && clearTimeout(c), c = setTimeout(() => r(f), t.debounce);
       },
-      { immediate: n?.immediate }
+      { immediate: t?.immediate }
     );
     s(() => {
       c && clearTimeout(c), i();
@@ -145,67 +146,67 @@ function R(e, t, n) {
   }
   s(() => o?.abort());
 }
-function q(e, t, n) {
+function q(e, n, t) {
   for (const o of B(e))
-    h(o) ? s(G(o, t, n)) : z(o, t, n);
+    m(o) ? s(G(o, n, t)) : z(o, n, t);
 }
-function Y(e, t, n) {
-  q(e, () => !t(), n);
+function Z(e, n, t) {
+  q(e, () => !n(), t);
 }
-function z(e, t, n) {
+function z(e, n, t) {
   const o = I(e.__path);
-  o && m(() => {
-    const r = t();
+  o && h(() => {
+    const r = n();
     _(() => {
-      r ? o.enable() : (o.disable(), n?.resetOnDisable && o.reset());
+      r ? o.enable() : (o.disable(), t?.resetOnDisable && o.reset());
     });
   });
 }
-function Z(e, t) {
-  s(A(e, t));
+function ee(e, n) {
+  s(A(e, n));
 }
-function ee(e, t, n) {
-  s(C(e, t, n));
+function te(e, n, t) {
+  s(C(e, n, t));
 }
-function ne(e, t, n) {
-  s(D(e, t, n));
+function ne(e, n, t) {
+  s(D(e, n, t));
 }
-function te(e, t) {
-  s(M(e, t));
+function oe(e, n) {
+  s(M(e, n));
 }
-function g(e, t) {
-  return t.split(".").reduce((n, o) => n?.[o], e);
+function g(e, n) {
+  return n.split(".").reduce((t, o) => t?.[o], e);
 }
 function N(e) {
   return new Proxy(
     {},
     {
-      get(t, n) {
-        if (!(typeof n == "symbol" || n === "then"))
+      get(n, t) {
+        if (!(typeof t == "symbol" || t === "then"))
           throw new Error(
             `[@reformer/core/behaviors] applyEach: форма строки массива "${e}" недоступна (form.${String(
-              n
+              t
             )}) — массив не материализован в схеме формы. Per-row node-операции (enableWhen/updateComponentProps/reset) требуют узла { array, item } в схеме; value-операции (row.$.*: compute/copyFrom/transformValue) работают и без материализации.`
           );
       }
     }
   );
 }
-function H(e, t) {
-  const { model: n, form: o } = y(), r = e.__path;
+function H(e, n) {
+  const { model: t, form: o } = y(), r = e.__path;
   if (!r) return;
-  const c = g(n, r);
+  const c = g(t, r);
   if (!c) return;
   const i = o.getFieldByPath(
     r
   ), f = i?.length, u = /* @__PURE__ */ new Map();
-  m(() => {
+  h(() => {
     const d = f ? f.value : c.length, w = /* @__PURE__ */ new Set();
     for (let a = 0; a < d; a++) {
       const l = c.at(a);
       if (l != null && (w.add(l), !u.has(l))) {
         const b = i?.at?.(a) ?? N(r);
-        u.set(l, t.__run(l, b));
+        u.set(l, n.__run(l, b));
       }
     }
     for (const [a, l] of u)
@@ -217,27 +218,27 @@ function H(e, t) {
 }
 function v(e) {
   if (e == null || typeof e != "object") return;
-  const t = e;
-  if (typeof t.at == "function" && typeof t.length == "number") {
-    const n = t.length;
-    for (let o = 0; o < n; o++) v(t.at(o));
+  const n = e;
+  if (typeof n.at == "function" && typeof n.length == "number") {
+    const t = n.length;
+    for (let o = 0; o < t; o++) v(n.at(o));
     return;
   }
-  for (const n of Object.keys(e)) v(e[n]);
+  for (const t of Object.keys(e)) v(e[t]);
 }
-function oe(e, t) {
-  const { model: n } = y(), o = e.__path;
+function re(e, n) {
+  const { model: t } = y(), o = e.__path;
   if (!o) return;
-  const r = g(n, o);
+  const r = g(t, o);
   r && H(
     e,
     T(({ model: c }) => {
-      R(t(c), (i) => {
+      R(n(c), (i) => {
         if (i)
           for (let f = 0; f < r.length; f++) {
             const u = r.at(f);
             if (u && u !== c) {
-              const d = t(u);
+              const d = n(u);
               d.peek() && (d.value = !1);
             }
           }
@@ -245,16 +246,16 @@ function oe(e, t) {
     })
   );
 }
-function re(e, t) {
-  const { model: n } = y(), o = e.__path;
+function ce(e, n) {
+  const { model: t } = y(), o = e.__path;
   if (!o) return;
-  const r = g(n, o);
+  const r = g(t, o);
   if (!r) return;
   let c = !1, i = 0;
-  m(() => {
+  h(() => {
     v(r), !c && (c = !0, _(() => {
       c = !1;
-      const f = t(r.toArray());
+      const f = n(r.toArray());
       let u = !1;
       for (const { index: d, patch: w } of f) {
         const a = r.at(d);
@@ -269,33 +270,33 @@ function re(e, t) {
     }));
   });
 }
-function ce(e, t) {
-  const { form: n } = y();
+function ie(e, n) {
+  const { form: t } = y();
   for (const o of B(e)) {
     const r = o, c = r.__path;
     if (!c) continue;
-    const i = n ? n.getFieldByPath(c) : void 0, f = i ? i.getProxy?.() ?? i : void 0;
-    s(t.__run(V(r), f));
+    const i = t ? t.getFieldByPath(c) : void 0, f = i ? i.getProxy?.() ?? i : void 0;
+    s(n.__run(V(r), f));
   }
 }
 export {
-  re as aggregateInto,
-  ce as apply,
+  ce as aggregateInto,
+  ie as apply,
   H as applyEach,
-  Q as compute,
-  U as computeFrom,
-  X as copyFrom,
+  U as compute,
+  X as computeFrom,
+  Y as copyFrom,
   _ as defer,
   T as defineFormBehavior,
-  Y as disableWhen,
-  m as effect,
+  Z as disableWhen,
+  h as effect,
   q as enableWhen,
-  oe as exclusiveFlag,
+  re as exclusiveFlag,
   y as getScope,
   R as onChange,
   s as onDispose,
-  ee as resetWhen,
-  te as revalidateWhen,
+  te as resetWhen,
+  oe as revalidateWhen,
   ne as syncFields,
-  Z as transformValue
+  ee as transformValue
 };

package/dist/derived-registry-CluZCQ7U.js

@@ -0,0 +1,16 @@
+const t = /* @__PURE__ */ new WeakMap();
+function n(e) {
+  t.set(e, (t.get(e) ?? 0) + 1);
+}
+function i(e) {
+  const r = t.get(e);
+  r !== void 0 && (r <= 1 ? t.delete(e) : t.set(e, r - 1));
+}
+function o(e) {
+  return t.has(e);
+}
+export {
+  o as i,
+  n as m,
+  i as u
+};

package/dist/form/hooks/use-form-validation.d.ts

@@ -0,0 +1,48 @@
+import { FormModel } from '../../index';
+import { ValidationSchema } from '../validation-schema';
+import { ValidationStrategyKind } from '../validation-strategy';
+export interface UseFormValidationArgs<T> {
+    /** Модель данных формы. */
+    model: FormModel<T>;
+    /** Схема валидации. **Стабильная ссылка** (module-level `const` / `useMemo`) — иначе ломается дедуп раннера. */
+    schema: ValidationSchema<T>;
+    /** Стратегия запуска. Default `'submit'`. */
+    strategy?: ValidationStrategyKind;
+    /** Debounce (мс) для live-фаз (`change` / live-часть `afterFirstSubmit`). */
+    debounce?: number;
+    /** Режим live-фазы для `afterFirstSubmit`. Default `'change'`. */
+    liveAfterSubmit?: 'change' | 'blur';
+}
+export interface UseFormValidationResult {
+    /** Полный прогон + раскрытие ошибок (`touch:true`); для `onSubmit`. Стабильная ссылка. */
+    submit: () => Promise<boolean>;
+    /** Алиас `submit` для не-submit сценариев. */
+    validate: () => Promise<boolean>;
+    /** Идёт ли прогон (submit или live) — для блокировки кнопки. */
+    isValidating: boolean;
+}
+/**
+ * Декларативный выбор стратегии валидации формы: одна точка вместо ручной разводки
+ * `validateModel`/`revalidateWhen`. Собирает стабильный {@link createFormValidation}-контроллер,
+ * армит реактивную стратегию на клиенте (`useEffect` → SSR-safe) и отдаёт `submit`/`isValidating`.
+ *
+ * Схема-валидации — **стабильная ссылка** (обязанность вызывающего): контроллер мемоизируется по
+ * `[model, schema, strategy, debounce, liveAfterSubmit]`.
+ *
+ * @example
+ * ```tsx
+ * const validation = defineValidationSchema<Form>(({ model }) => { ... }); // module-level
+ *
+ * function MyForm() {
+ *   const { submit, isValidating } = useFormValidation({
+ *     model, schema: validation, strategy: 'afterFirstSubmit', debounce: 300,
+ *   });
+ *   const onSubmit = async (e: React.FormEvent) => {
+ *     e.preventDefault();
+ *     if (await submit()) await api.save(model.get());
+ *   };
+ *   return <form onSubmit={onSubmit}>{ ... }<button disabled={isValidating}>Отправить</button></form>;
+ * }
+ * ```
+ */
+export declare function useFormValidation<T>(args: UseFormValidationArgs<T>): UseFormValidationResult;

package/dist/form/index.d.ts

@@ -31,4 +31,6 @@ export { uniqueId } from './unique-id';
 export { useFormControl } from './hooks/useFormControl';
 export { useFormControlValue } from './hooks/useFormControlValue';
 export { useArrayLength } from './hooks/useArrayLength';
+export { useFormValidation } from './hooks/use-form-validation';
+export type { UseFormValidationArgs, UseFormValidationResult } from './hooks/use-form-validation';
 export type { FieldControlState, ArrayControlState } from './hooks/types';

package/dist/form/validation-schema.d.ts

@@ -84,10 +84,23 @@ export declare function defineValidationSchema<T>(schema: ValidationSchema<T>):
  * Инлайн-стрелка (`validateModel(model, ({ model }) => …)`) каждый раз создаёт НОВЫЙ прогон без дедупликации —
  * держите схемы в `const` / `defineValidationSchema`.
  *
+ * `options.touch` (§6): по завершении помечает `touched` ИМЕННО поля, которые схема проверяла
+ * (не всё поддерево). Ошибки становятся видимыми (`shouldShowError = invalid && (touched||dirty)`)
+ * без ручного `form.markAsTouched()`; при пошаговой валидации следующий шаг не показывается
+ * «тронутым» до ввода. Валидные проверенные поля тоже метятся — это безвредно (ошибка не покажется).
+ *
+ * @param model - Модель данных формы.
+ * @param schema - Схема валидации (стабильная ссылка).
+ * @param options - `{ touch }` — пометить провалидированные поля `touched` для показа ошибок.
+ *
  * @example
  * ```ts
- * const ok = await validateModel(model, step2Validation);   // один шаг
- * const all = await validateModel(model, formValidation);   // вся форма
+ * const ok = await validateModel(model, step2Validation);              // один шаг
+ * const all = await validateModel(model, formValidation);              // вся форма
+ * const stepOk = await validateModel(model, step2Validation, { touch: true }); // + показать ошибки шага
  * ```
  */
-export declare function validateModel<T>(model: FormModel<T>, schema: ValidationSchema<T>): Promise<boolean>;
+export declare function validateModel<T>(model: FormModel<T>, schema: ValidationSchema<T>, options?: {
+    touch?: boolean;
+}): Promise<boolean>;
+export * from './validation-strategy';