@reformer/core 11.0.0-beta.6 → 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 $, a as C, w as F, t as M, r as O, s as A, b as D } from "./behaviors-value-C7dSEhCc.js";
-import { i as G, m as k, u as x } from "./model-signals-proxy-mV3WGdlO.js";
-import { e as T } from "./node-DGEFMTQu.js";
-let p = null;
-function P(e) {
-  if (!p)
+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 p;
+  return m;
 }
-function s(e) {
-  P("onDispose").cleanups.push(e);
+function a(e) {
+  k("onDispose").cleanups.push(e);
 }
-function y() {
-  const e = P("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 I(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 = p;
-      p = 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 {
-        p = r;
+        m = c;
       }
       return () => {
-        for (const c of o.cleanups) c();
+        for (const s of r.cleanups) s();
       };
     }
   };
 }
-function h(e) {
-  s(j(e));
+function p(e) {
+  a(H(e));
 }
-function g(e) {
+function O(e) {
   $(e);
 }
-const m = (e) => typeof e == "object" && e !== null && typeof e.peek == "function" && !G(e), B = (e) => Array.isArray(e) ? e : [e];
-function E(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] = m(o) ? o.value : E(o);
+    t[n] = y(o) ? o.value : j(o);
   }
   return t;
 }
-function W(e, t) {
+function A(e, t) {
   for (const n of Object.keys(e)) {
     const o = e[n];
-    m(o) ? o.value = t?.[n] : W(o, t?.[n] ?? {});
+    y(o) ? o.value = t?.[n] : A(o, t?.[n] ?? {});
   }
 }
-function S(e) {
+function D(e) {
   return (t) => {
     try {
       t();
@@ -69,18 +81,10 @@ function S(e) {
     }
   };
 }
-function _(e, t) {
-  return t.split(".").reduce((n, o) => n?.[o], e);
-}
-function R(e) {
-  if (!e) return;
-  const { form: t } = y();
-  return t.getFieldByPath(e);
-}
-function X(e, t, n) {
-  k(e), s(() => x(e));
-  const o = S(e);
-  h(() => {
+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 X(e, t, n) {
     });
   });
 }
-function Y(e, t, n, o) {
-  k(t), s(() => x(t));
-  const r = S(t);
-  h(() => {
-    const c = e.map((f) => f.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 Z(e, t, n) {
-  if (m(e) && m(t)) {
-    s(C(e, t, n));
+function le(e, t, n) {
+  if (y(e) && y(t)) {
+    a(P(e, t, n));
     return;
   }
   const o = e, r = t;
-  h(() => {
-    const c = E(o);
-    n?.when && !n.when() || g(() => W(r, c));
+  p(() => {
+    const c = j(o);
+    n?.when && !n.when() || O(() => A(r, c));
   });
 }
-function q(e, t, n) {
+function X(e, t, n) {
   let o;
   const r = (c) => {
     o?.abort(), o = new AbortController();
-    const { signal: i } = o;
-    $(() => t(c, { signal: i }));
+    const { signal: s } = o;
+    $(() => t(c, { signal: s }));
   };
   if (!n?.debounce)
-    s(F(e, r, { immediate: n?.immediate }));
+    a(M(e, r, { immediate: n?.immediate }));
   else {
     let c;
-    const i = F(
+    const s = M(
       e,
-      (f) => {
-        c && clearTimeout(c), c = setTimeout(() => r(f), n.debounce);
+      (i) => {
+        c && clearTimeout(c), c = setTimeout(() => r(i), n.debounce);
       },
       { immediate: n?.immediate }
     );
-    s(() => {
-      c && clearTimeout(c), i();
+    a(() => {
+      c && clearTimeout(c), s();
     });
   }
-  s(() => o?.abort());
+  a(() => o?.abort());
 }
-function z(e, t, n) {
-  for (const o of B(e))
-    m(o) ? s(T(o, t, n)) : L(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 ee(e, t, n) {
-  z(e, () => !t(), n);
+function ue(e, t, n) {
+  Y(e, () => !t(), n);
 }
-function L(e, t, n) {
-  const o = R(e.__path);
-  o && h(() => {
+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 ne(e, t) {
-  s(M(e, t));
+function de(e, t) {
+  a(B(e, t));
 }
-function te(e, t, n) {
-  s(O(e, t, n));
+function me(e, t, n) {
+  a(T(e, t, n));
 }
-function oe(e, t, n) {
-  s(A(e, t, n));
+function pe(e, t, n) {
+  a(L(e, t, n));
 }
-function re(e, t) {
-  s(D(e, t));
+function he(e, t) {
+  a(N(e, t));
 }
-function V(e) {
-  return new Proxy(
-    {},
-    {
-      get: (t, n) => {
-        if (n === "$") return e;
-        if (typeof n != "string") return;
-        const o = e[n];
-        if (o != null)
-          return m(o) ? o.value : V(o);
-      }
-    }
-  );
-}
-function N(e) {
+const I = (e) => e.__path ?? "?", R = (e) => void F(e);
+function ee(e) {
   return new Proxy(
     {},
     {
@@ -192,111 +183,157 @@ function N(e) {
     }
   );
 }
-function H(e, t) {
-  const { model: n, form: o } = y(), r = e.__path;
-  if (!r) return;
-  const c = _(n, r);
-  if (!c) return;
-  const i = o.getFieldByPath(
-    r
-  ), f = i?.length, a = /* @__PURE__ */ new Map();
-  h(() => {
-    const d = f ? f.value : c.length, w = /* @__PURE__ */ new Set();
-    for (let u = 0; u < d; u++) {
-      const l = c.at(u);
-      if (l != null && (w.add(l), !a.has(l))) {
-        const b = i?.at?.(u) ?? N(r);
-        a.set(l, t.__run(l, b));
+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 a)
-      w.has(u) || (l(), a.delete(u));
-  }), s(() => {
-    for (const d of a.values()) d();
-    a.clear();
+    for (const [l, u] of f)
+      d.has(l) || (u(), f.delete(l));
+  }), a(() => {
+    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 ce(e, t) {
-  const { model: n } = y(), o = e.__path;
-  if (!o) return;
-  const r = _(n, o);
-  r && H(
-    e,
-    I(({ model: c }) => {
-      q(t(c), (i) => {
-        if (i)
-          for (let f = 0; f < r.length; f++) {
-            const a = r.at(f);
-            if (a && a !== c) {
-              const d = t(a);
-              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 ie(e, t) {
-  const { model: n } = y(), o = e.__path;
-  if (!o) return;
-  const r = _(n, o);
-  if (!r) return;
-  let c = !1, i = 0;
-  h(() => {
-    v(r), !c && (c = !0, g(() => {
-      c = !1;
-      const f = t(r.toArray());
-      let a = !1;
-      for (const { index: d, patch: w } of f) {
-        const u = r.at(d);
-        if (u)
-          for (const [l, b] of Object.entries(w))
-            u[l] !== b && (u[l] = b, a = !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 = a ? 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 } = 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));
+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 {
-  ie as aggregateInto,
-  fe as apply,
-  H as applyEach,
-  X as compute,
-  Y as computeFrom,
-  Z as copyFrom,
-  g as defer,
-  I as defineFormBehavior,
-  ee as disableWhen,
-  h as effect,
-  z as enableWhen,
-  ce as exclusiveFlag,
-  y as getScope,
-  q as onChange,
-  s as onDispose,
-  te as resetWhen,
-  re as revalidateWhen,
-  oe as syncFields,
-  ne as transformValue
+  _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,
+  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/en-CjAqn7h0.js

@@ -0,0 +1,41 @@
+const a = {
+  "format.fileSize.b": "{value} B",
+  "format.fileSize.kb": "{value} KB",
+  "format.fileSize.mb": "{value} MB",
+  "format.fileSize.gb": "{value} GB",
+  "format.fileSize.tb": "{value} TB",
+  "validation.required": "This field is required",
+  "validation.pattern": "Invalid format",
+  "validation.email": "Enter a valid email address",
+  "validation.url": "Enter a valid URL",
+  "validation.url_protocol": "The URL must use one of these protocols: {allowedProtocols}",
+  "validation.phone": "Enter a valid phone number",
+  "validation.min": "Must be at least {min}",
+  "validation.max": "Must be at most {max}",
+  "validation.minLength": "Enter at least {minLength, plural, one{# character} other{# characters}}",
+  "validation.maxLength": "Enter no more than {maxLength, plural, one{# character} other{# characters}}",
+  "validation.isNumber": "Enter a number",
+  "validation.integer": "Enter a whole number",
+  "validation.multipleOf": "Must be a multiple of {multipleOf}",
+  "validation.nonNegative": "Must not be negative",
+  "validation.nonZero": "Must not be zero",
+  "validation.date_invalid": "Enter a valid date",
+  "validation.date_min": "The date must not be earlier than {minDate}",
+  "validation.date_max": "The date must not be later than {maxDate}",
+  "validation.date_past": "The date must not be in the past",
+  "validation.date_future": "The date must not be in the future",
+  "validation.date_min_age": "Age must be at least {minAge}",
+  "validation.date_max_age": "Age must be at most {maxAge}",
+  "validation.fileType": "File {fileName} has a type that is not allowed. Allowed: {accept}",
+  "validation.maxFileSize": "File {fileName} is larger than {maxFileSize}",
+  "validation.minFileSize": "File {fileName} is smaller than {minFileSize}",
+  "validation.maxFiles": "No more than {maxFiles, plural, one{# file} other{# files}}",
+  "validation.minFiles": "At least {minFiles, plural, one{# file} other{# files}}",
+  "validation.maxTotalFileSize": "The total size of the files exceeds {maxTotalFileSize}",
+  "validation.fileExists": "File {fileName} has already been added",
+  "validation.uploadAborted": "Upload cancelled",
+  "validation.uploadFailed": "Failed to upload {fileName}"
+};
+export {
+  a as m
+};

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;