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

package/README.md

@@ -31,7 +31,7 @@ npm install @reformer/core@beta # Active development is underway, so you can try
 ## Quick Start
 
 ReFormer is built around the **M1 architecture**: a reactive `FormModel` owns the values, a layout
-schema binds field config (component / props) to the model's signals, and `createForm({ model, schema })`
+schema binds field config (component / props) to the model's signals, and `createFormFromModel({ model, schema })`
 wires them into a typed form. Validation is a **separate** ambient contract — `defineValidationSchema`,
 run on demand by `validateModel(model, schema)` — so the layout schema carries no validators.
 
@@ -39,7 +39,8 @@ run on demand by `validateModel(model, schema)` — so the layout schema carries
 import { useMemo } from 'react';
 import {
   createModel,
-  createForm,
+  createFormFromModel,
+  createLegacyForm,
   useFormControl,
   type FieldNode,
   type ValidationError,
@@ -121,7 +122,10 @@ const behavior = defineFormBehavior<RegistrationForm>(({ model, form }) => {
 
 // 6. Registration form component
 function RegistrationFormExample() {
-  const form = useMemo(() => createForm<RegistrationForm>({ model, schema, behavior }), []);
+  const form = useMemo(
+    () => createFormFromModel<RegistrationForm>({ model, schema, behavior }),
+    []
+  );
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();

package/dist/behaviors.js

@@ -1,60 +1,72 @@
-import { effect as j } from "@preact/signals-core";
-import { d as k, a as A, w as $, t as C, r as O, s as D, b as G } from "./behaviors-value-C7dSEhCc.js";
-import { d as T, i as I, m as x, u as P } from "./model-signals-proxy-2vqS243J.js";
-import { e as R } from "./node-DGEFMTQu.js";
-let h = null;
-function B(e) {
-  if (!h)
+import { effect as H } from "@preact/signals-core";
+import { d as $, a as P, w as M, t as B, r as T, s as L, b as N } from "./behaviors-value-C7dSEhCc.js";
+import { c as U, e as q } from "./node-BeV_lV5i.js";
+import { j as z, i as J, c as E, u as S, h as b, m as _, g as K } from "./model-value-proxy-caTmAiUd.js";
+import { g as v } from "./signal-node-registry-tiwel-TV.js";
+let m = null;
+function k(e) {
+  if (!m)
     throw new Error(
       `[@reformer/core/behaviors] "${e}" вызван вне defineFormBehavior(...) — операторы поведения можно вызывать только внутри схемы.`
     );
-  return h;
+  return m;
 }
 function a(e) {
-  B("onDispose").cleanups.push(e);
+  k("onDispose").cleanups.push(e);
 }
-function p() {
-  const e = B("getScope");
-  return { model: e.model, form: e.form };
+function g(e) {
+  m?.cleanups.push(e);
+}
+function ie() {
+  const e = k("getScope");
+  return x(e);
 }
-function q(e) {
+function F(e = "getController") {
+  return k(e).controller;
+}
+const x = (e) => ({
+  model: e.model,
+  form: e.form,
+  schema: e.controller.scopeOf(e.model)
+});
+function Q(e) {
   return {
-    __run(t, n) {
-      const o = { cleanups: [], model: t, form: n }, r = h;
-      h = o;
+    __run(t, n, o = U()) {
+      const r = { cleanups: [], model: t, form: n, controller: o }, c = m;
+      m = r;
       try {
-        e({ model: t, form: n });
+        e(x(r));
       } finally {
-        h = r;
+        m = c;
       }
       return () => {
-        for (const c of o.cleanups) c();
+        for (const s of r.cleanups) s();
       };
     }
   };
 }
-function m(e) {
-  a(j(e));
+function p(e) {
+  a(H(e));
 }
-function g(e) {
-  k(e);
+function O(e) {
+  $(e);
 }
-const _ = (e) => typeof e == "object" && e !== null && typeof e.peek == "function" && !I(e), b = (e) => _(e) || T(e), E = (e) => Array.isArray(e) ? e : [e];
-function S(e) {
+const C = (e) => typeof e == "object" && e !== null && typeof e.peek == "function" && !J(e), y = (e) => C(e) || z(e), W = (e) => Array.isArray(e) ? e : [e];
+function j(e) {
   const t = {};
   for (const n of Object.keys(e)) {
     const o = e[n];
-    t[n] = b(o) ? o.value : S(o);
+    t[n] = y(o) ? o.value : j(o);
   }
   return t;
 }
-function V(e, t) {
+function A(e, t) {
   for (const n of Object.keys(e)) {
     const o = e[n];
-    b(o) ? o.value = t?.[n] : V(o, t?.[n] ?? {});
+    y(o) ? o.value = t?.[n] : A(o, t?.[n] ?? {});
   }
 }
-function W(e) {
+function D(e) {
   return (t) => {
     try {
       t();
@@ -69,18 +81,10 @@ function W(e) {
     }
   };
 }
-function F(e, t) {
-  return t.split(".").reduce((n, o) => n?.[o], e);
-}
-function z(e) {
-  if (!e) return;
-  const { form: t } = p();
-  return t.getFieldByPath(e);
-}
-function Z(e, t, n) {
-  x(e), a(() => P(e));
-  const o = W(e);
-  m(() => {
+function ae(e, t, n) {
+  E(e), a(() => S(e));
+  const o = D(e);
+  p(() => {
     if (n?.when && !n.when()) return;
     const r = t();
     e.peek() !== r && o(() => {
@@ -88,96 +92,83 @@ function Z(e, t, n) {
     });
   });
 }
-function ee(e, t, n, o) {
-  x(t), a(() => P(t));
-  const r = W(t);
-  m(() => {
-    const c = e.map((s) => s.value);
+function fe(e, t, n, o) {
+  E(t), a(() => S(t));
+  const r = D(t);
+  p(() => {
+    const c = e.map((i) => i.value);
     if (o?.when && !o.when(...c)) return;
-    const i = n(...c);
-    t.peek() !== i && r(() => {
-      t.value = i;
+    const s = n(...c);
+    t.peek() !== s && r(() => {
+      t.value = s;
     });
   });
 }
-function ne(e, t, n) {
-  if (b(e) && b(t)) {
-    a(A(e, t, n));
+function le(e, t, n) {
+  if (y(e) && y(t)) {
+    a(P(e, t, n));
     return;
   }
   const o = e, r = t;
-  m(() => {
-    const c = S(o);
-    n?.when && !n.when() || g(() => V(r, c));
+  p(() => {
+    const c = j(o);
+    n?.when && !n.when() || O(() => A(r, c));
   });
 }
-function H(e, t, n) {
+function X(e, t, n) {
   let o;
   const r = (c) => {
     o?.abort(), o = new AbortController();
-    const { signal: i } = o;
-    k(() => t(c, { signal: i }));
+    const { signal: s } = o;
+    $(() => t(c, { signal: s }));
   };
   if (!n?.debounce)
-    a($(e, r, { immediate: n?.immediate }));
+    a(M(e, r, { immediate: n?.immediate }));
   else {
     let c;
-    const i = $(
+    const s = M(
       e,
-      (s) => {
-        c && clearTimeout(c), c = setTimeout(() => r(s), n.debounce);
+      (i) => {
+        c && clearTimeout(c), c = setTimeout(() => r(i), n.debounce);
       },
       { immediate: n?.immediate }
     );
     a(() => {
-      c && clearTimeout(c), i();
+      c && clearTimeout(c), s();
     });
   }
   a(() => o?.abort());
 }
-function L(e, t, n) {
-  for (const o of E(e))
-    _(o) ? a(R(o, t, n)) : N(o, t, n);
+function Y(e, t, n) {
+  for (const o of W(e))
+    C(o) ? a(q(o, t, n)) : Z(o, t, n);
 }
-function te(e, t, n) {
-  L(e, () => !t(), n);
+function ue(e, t, n) {
+  Y(e, () => !t(), n);
 }
-function N(e, t, n) {
-  const o = z(e.__path);
-  o && m(() => {
+function Z(e, t, n) {
+  const o = v(e);
+  o && p(() => {
     const r = t();
-    g(() => {
+    O(() => {
       r ? o.enable() : (o.disable(), n?.resetOnDisable && o.reset());
     });
   });
 }
-function oe(e, t) {
-  a(C(e, t));
+function de(e, t) {
+  a(B(e, t));
 }
-function re(e, t, n) {
-  a(O(e, t, n));
+function me(e, t, n) {
+  a(T(e, t, n));
 }
-function ce(e, t, n) {
-  a(D(e, t, n));
+function pe(e, t, n) {
+  a(L(e, t, n));
 }
-function ie(e, t) {
-  a(G(e, t));
-}
-function M(e) {
-  return new Proxy(
-    {},
-    {
-      get: (t, n) => {
-        if (n === "$") return e;
-        if (typeof n != "string") return;
-        const o = e[n];
-        if (o != null)
-          return _(o) ? o.value : M(o);
-      }
-    }
-  );
+function he(e, t) {
+  a(N(e, t));
 }
-function J(e) {
+const I = (e) => e.__path ?? "?", R = (e) => void F(e);
+function ee(e) {
   return new Proxy(
     {},
     {
@@ -192,111 +183,157 @@ function J(e) {
     }
   );
 }
-function K(e, t) {
-  const { model: n, form: o } = p(), r = e.__path;
-  if (!r) return;
-  const c = F(n, r);
-  if (!c) return;
-  const i = o.getFieldByPath(
-    r
-  ), s = i?.length, f = /* @__PURE__ */ new Map();
-  m(() => {
-    const d = s ? s.value : c.length, y = /* @__PURE__ */ new Set();
-    for (let u = 0; u < d; u++) {
-      const l = c.at(u);
-      if (l != null && (y.add(l), !f.has(l))) {
-        const w = i?.at?.(u) ?? J(r);
-        f.set(l, t.__run(l, w));
+function te(e, t) {
+  const n = F("applyEach"), o = b(e);
+  if (!o) return;
+  const r = _(o), c = v(o), s = typeof c?.at == "function" ? c : void 0, i = s?.length, f = /* @__PURE__ */ new Map();
+  p(() => {
+    const h = i ? i.value : r.length, d = /* @__PURE__ */ new Set();
+    for (let l = 0; l < h; l++) {
+      const u = r.at(l);
+      if (u != null && (d.add(u), !f.has(u))) {
+        const G = s?.at?.(l) ?? ee(I(o));
+        f.set(u, t.__run(u, G, n));
       }
     }
-    for (const [u, l] of f)
-      y.has(u) || (l(), f.delete(u));
+    for (const [l, u] of f)
+      d.has(l) || (u(), f.delete(l));
   }), a(() => {
-    for (const d of f.values()) d();
+    for (const h of f.values()) h();
     f.clear();
   });
 }
-function v(e) {
+function w(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));
+    for (let o = 0; o < n; o++) w(t.at(o));
     return;
   }
-  for (const n of Object.keys(e)) v(e[n]);
+  for (const n of Object.keys(e)) w(e[n]);
 }
-function se(e, t) {
-  const { model: n } = p(), o = e.__path;
-  if (!o) return;
-  const r = F(n, o);
-  r && K(
-    e,
-    q(({ model: c }) => {
-      H(t(c), (i) => {
-        if (i)
-          for (let s = 0; s < r.length; s++) {
-            const f = r.at(s);
-            if (f && f !== c) {
-              const d = t(f);
-              d.peek() && (d.value = !1);
+function ye(e, t) {
+  R("exclusiveFlag");
+  const n = b(e);
+  if (!n) return;
+  const o = _(n);
+  te(
+    n,
+    Q(({ model: r }) => {
+      X(t(r), (c) => {
+        if (c)
+          for (let s = 0; s < o.length; s++) {
+            const i = o.at(s);
+            if (i && i !== r) {
+              const f = t(i);
+              f.peek() && (f.value = !1);
             }
           }
       });
     })
   );
 }
-function ae(e, t) {
-  const { model: n } = p(), o = e.__path;
-  if (!o) return;
-  const r = F(n, o);
-  if (!r) return;
-  let c = !1, i = 0;
-  m(() => {
-    v(r), !c && (c = !0, g(() => {
-      c = !1;
-      const s = t(r.toArray());
-      let f = !1;
-      for (const { index: d, patch: y } of s) {
-        const u = r.at(d);
-        if (u)
-          for (const [l, w] of Object.entries(y))
-            u[l] !== w && (u[l] = w, f = !0);
+function _e(e, t) {
+  R("aggregateInto");
+  const n = b(e);
+  if (!n) return;
+  const o = _(n);
+  let r = !1, c = 0;
+  p(() => {
+    w(o), !r && (r = !0, O(() => {
+      r = !1;
+      const s = t(o.toArray());
+      let i = !1;
+      for (const { index: f, patch: h } of s) {
+        const d = o.at(f);
+        if (d)
+          for (const [l, u] of Object.entries(h))
+            d[l] !== u && (d[l] = u, i = !0);
       }
-      if (i = f ? i + 1 : 0, i > 50)
-        throw i = 0, new Error(
-          `[@reformer/core/behaviors] aggregateInto("${o}"): запись не сходится (>50 проходов) — derive должна быть идемпотентной на фикспоинте.`
+      if (c = i ? c + 1 : 0, c > 50)
+        throw c = 0, new Error(
+          `[@reformer/core/behaviors] aggregateInto("${I(n)}"): запись не сходится (>50 проходов) — derive должна быть идемпотентной на фикспоинте.`
         );
     }));
   });
 }
-function fe(e, t) {
-  const { form: n } = p();
-  for (const o of E(e)) {
-    const r = o, c = r.__path;
-    if (!c) continue;
-    const i = n ? n.getFieldByPath(c) : void 0, s = i ? i.getProxy?.() ?? i : void 0;
-    a(t.__run(M(r), s));
+function ge(e, t) {
+  const n = F("apply");
+  for (const o of W(e)) {
+    const r = K(o);
+    if (!r) continue;
+    const c = _(r), s = v(r), i = s ? s.getProxy?.() ?? s : void 0;
+    a(t.__run(c, i, n));
   }
 }
+function we(e, t) {
+  const { conditionRegistry: n } = e.__overrideMaps;
+  n.set(e.__selector, t), g(() => {
+    n.get(e.__selector) === t && n.delete(e.__selector);
+  });
+}
+function be(e, t, n) {
+  const { callbackRegistry: o } = e.__overrideMaps;
+  let r = o.get(e.__selector);
+  r || (r = /* @__PURE__ */ new Map(), o.set(e.__selector, r)), r.set(t, n);
+  const c = r;
+  g(() => {
+    c.get(t) === n && c.delete(t);
+  });
+}
+function ve(e, t) {
+  const { effectRegistry: n } = e.__overrideMaps;
+  n.push(t), g(() => {
+    const o = n.indexOf(t);
+    o !== -1 && n.splice(o, 1);
+  });
+}
+function V(e, t, n) {
+  const { lifecycleRegistry: o } = e.__overrideMaps;
+  o.set(e.__selector, {
+    ...o.get(e.__selector) ?? {},
+    [t]: n
+  }), g(() => {
+    const r = o.get(e.__selector);
+    if (r?.[t] !== n) return;
+    const c = { ...r };
+    delete c[t], Object.keys(c).length === 0 ? o.delete(e.__selector) : o.set(e.__selector, c);
+  });
+}
+function ke(e, t) {
+  t();
+}
+function Fe(e, t) {
+  V(e, "onMount", t);
+}
+function Oe(e, t) {
+  V(e, "onUnmount", t);
+}
 export {
-  ae as aggregateInto,
-  fe as apply,
-  K as applyEach,
-  Z as compute,
-  ee as computeFrom,
-  ne as copyFrom,
-  g as defer,
-  q as defineFormBehavior,
-  te as disableWhen,
-  m as effect,
-  L as enableWhen,
-  se as exclusiveFlag,
-  p as getScope,
-  H as onChange,
+  _e as aggregateInto,
+  ge as apply,
+  te as applyEach,
+  ae as compute,
+  fe as computeFrom,
+  le as copyFrom,
+  O as defer,
+  Q as defineFormBehavior,
+  ue as disableWhen,
+  p as effect,
+  Y as enableWhen,
+  ye as exclusiveFlag,
+  ie as getScope,
+  we as hideWhen,
+  X as onChange,
+  be as onComponentEvent,
   a as onDispose,
-  re as resetWhen,
-  ie as revalidateWhen,
-  ce as syncFields,
-  oe as transformValue
+  ke as onInit,
+  Fe as onMount,
+  Oe as onUnmount,
+  ve as renderEffect,
+  me as resetWhen,
+  he as revalidateWhen,
+  pe as syncFields,
+  de as transformValue
 };

package/dist/create-model-BBRHhHwK.js

@@ -0,0 +1,30 @@
+import { G as f, e as c, r as t, s } from "./model-value-proxy-caTmAiUd.js";
+function n(o, e, a) {
+  if (o.kind === "leaf") {
+    e(o.signal);
+    return;
+  }
+  if (o.kind === "group") {
+    for (const r of o.children.values()) n(r, e, a);
+    return;
+  }
+  a && e(s(o));
+  for (const r of o.items.value) n(r, e, a);
+}
+function u(o, e) {
+  const a = t.get(o);
+  a && n(a, e, !1);
+}
+function i(o, e) {
+  const a = t.get(o);
+  a && n(a, e, !0);
+}
+function g(o) {
+  const e = new f(o, "");
+  return c(e);
+}
+export {
+  i as a,
+  g as c,
+  u as e
+};

package/dist/form/behaviors/collections.d.ts

@@ -12,10 +12,14 @@ import { FormBehavior } from './types';
  *   рендерится, а её сигналы зарегистрированы (`enableWhen` резолвит ноду). Без материализации доступ
  *   к `form.*` бросит понятную ошибку (см. {@link unmaterializedRowForm}).
  *
+ * Работает на любой глубине: массив в корне, в группе и в строке другого массива — в схеме строки
+ * можно снова вызвать `applyEach`.
+ *
  * @example
  * applyEach(model.$.items, defineFormBehavior<Item>(({ model: row, form }) => {
  *   compute(row.$.lineTotal, () => row.qty * row.price);    // value-op — всегда
  *   enableWhen(row.$.discount, () => row.qty > 10);          // node-op — нужна материализация массива
+ *   applyEach(row.$.phones, phoneBehavior);                  // массив внутри строки
  * }));
  */
 export declare function applyEach<TItem>(array: object, itemSchema: FormBehavior<TItem>): void;
@@ -46,5 +50,14 @@ export declare function aggregateInto<TItem>(array: object, derive: (rows: TItem
     index: number;
     patch: Partial<TItem>;
 }>): void;
-/** Применить под-схему к одному или нескольким полям-группам (переиспользование). */
+/**
+ * Применить под-схему к одному или нескольким полям-группам (переиспользование).
+ *
+ * Под-схема получает scope группы: `model` — настоящая под-модель (`model.$.field`, чтение и
+ * запись значений, `get`/`set`/`patch`), `form` — нода группы. Цель — ручка группы
+ * (`model.$.address`); работает и в корневой схеме, и в схеме строки массива.
+ *
+ * @example
+ * apply([model.$.registrationAddress, model.$.residenceAddress], addressBehavior);
+ */
 export declare function apply<TField>(targets: object | object[], subSchema: FormBehavior<TField>): void;

package/dist/form/behaviors/context.d.ts

@@ -1,18 +1,34 @@
 import { BehaviorCleanup } from '../../index';
+import { SchemaController } from '../schema-controller';
 import { BehaviorScope, FormBehavior } from './types';
 /** Зарегистрировать произвольную отписку в активной схеме. */
 export declare function onDispose(cleanup: BehaviorCleanup): void;
-/** Текущий scope ({ model, form }) активной схемы (escape hatch для кросс-операторов). */
+/**
+ * Зарегистрировать отписку, если оператор вызван внутри схемы поведения; вне схемы — ничего.
+ * Для операторов, которые работают и сами по себе (правила узлов схемы).
+ *
+ * @internal
+ */
+export declare function onDisposeIfActive(cleanup: BehaviorCleanup): void;
+/** Текущая область ({ model, form, schema }) активной схемы (escape hatch для кросс-операторов). */
 export declare function getScope<T>(): BehaviorScope<T>;
+/**
+ * Схема-контроллер сборки, в которой идёт активная схема: под-схемы (`apply`, `applyEach`)
+ * получают через него область своей под-модели.
+ *
+ * @internal
+ */
+export declare function getController(op?: string): SchemaController;
 /**
  * Описать поведение формы декларативно. Возвращает {@link FormBehavior} для `createForm({ behavior })`.
  *
  * @example
  * ```ts
- * export const myBehavior = defineFormBehavior<MyForm>(({ model, form }) => {
+ * export const myBehavior = defineFormBehavior<MyForm>(({ model, form, schema }) => {
  *   compute(model.$.total, () => model.price * model.qty);
  *   enableWhen([model.$.city], () => Boolean(model.country));
  *   onChange(model.$.country, async (c) => form.city.updateComponentProps({ options: await load(c) }));
+ *   hideWhen(schema.node('delivery'), () => model.country === '');
  * });
  * ```
  */

package/dist/form/behaviors/index.d.ts

@@ -2,7 +2,7 @@
  * Декларативный контракт схемы поведения формы — `@reformer/core/behaviors`.
  *
  * Свободные операторы (`compute`/`copyFrom`/`enableWhen`/`onChange`/…) вызываются внутри
- * `defineFormBehavior(({ model, form }) => { … })` и САМИ регистрируют свои отписки в ambient-стоке —
+ * `defineFormBehavior(({ model, form, schema }) => { … })` и САМИ регистрируют свои отписки в ambient-стоке —
  * автор схемы не видит ни массива `cleanups`, ни `.push`, ни вызовов через точку. Жизненным циклом
  * владеет форма (`createForm({ behavior })`). Операторы — тонкие обёртки над примитивами слоя данных
  * ({@link module:model/behaviors-value}); пользовательские операторы пишутся так же и неотличимы от встроенных.
@@ -26,3 +26,5 @@ export type { Signal, ReadonlySignal, BehaviorCleanup } from './types';
 export { onDispose, getScope, defineFormBehavior, effect, defer } from './context';
 export { compute, computeFrom, copyFrom, onChange, enableWhen, disableWhen, transformValue, resetWhen, syncFields, revalidateWhen, } from './operators';
 export { applyEach, exclusiveFlag, aggregateInto, apply } from './collections';
+export { hideWhen, onComponentEvent, renderEffect, onInit, onMount, onUnmount, } from './schema-operators';
+export type { SchemaScope, SchemaNodeControl } from '../schema-controller';

package/dist/form/behaviors/internals.d.ts

@@ -32,4 +32,3 @@ export declare function writeGroup(g: GroupSignals, val: Record<string, unknown>
  * синхронные мутации цикла не порождают → не затрагиваются.
  */
 export declare function makeCycleGuard(target: Signal<unknown>): (write: () => void) => void;
-export declare function getByPath(root: unknown, path: string): any;