@reformer/core 11.0.0-beta.2 → 11.0.0-beta.3

package/dist/validation.js

@@ -1,6 +1,54 @@
-import { signal as M, effect as E } from "@preact/signals-core";
-import { e as L } from "./form-model-DhW2HZOB.js";
+import { signal as A, effect as M } from "@preact/signals-core";
+import { e as E } from "./form-model-DhW2HZOB.js";
 import { g as p } from "./signal-node-registry-tiwel-TV.js";
+function B(e, n, t = {}) {
+  const { strategy: r = "submit", debounce: o = 0, liveAfterSubmit: i = "change" } = t, s = A(!1);
+  let a = 0, c = !1, d, l;
+  const w = async (u) => {
+    a++, s.value = !0;
+    try {
+      return await W(e, n, { touch: u });
+    } finally {
+      --a === 0 && (s.value = !1);
+    }
+  }, h = () => {
+    w(!1);
+  }, F = () => {
+    if (!o) {
+      h();
+      return;
+    }
+    l && clearTimeout(l), l = setTimeout(h, o);
+  }, k = (u, g) => {
+    let S = !0;
+    return M(() => {
+      if (E(e, u), S) {
+        S = !1;
+        return;
+      }
+      r === "afterFirstSubmit" && !c || g();
+    });
+  }, m = {
+    async validate() {
+      return c = !0, w(!0);
+    },
+    start() {
+      if (d) return () => m.dispose();
+      const u = r === "afterFirstSubmit" ? i : r;
+      return u === "change" ? d = k((g) => void g.value, F) : u === "blur" && (d = k((g) => void p(g)?.touched.value, h)), () => m.dispose();
+    },
+    dispose() {
+      l && (clearTimeout(l), l = void 0), d?.(), d = void 0;
+    },
+    get isValidating() {
+      return s.value;
+    },
+    get validating() {
+      return s;
+    }
+  };
+  return m;
+}
 let v = null;
 function f(e) {
   if (!v)
@@ -9,83 +57,83 @@ function f(e) {
     );
   return v;
 }
-function b(e, r) {
-  let t = e.errors.get(r);
-  return t || e.errors.set(r, t = []), t;
+function b(e, n) {
+  let t = e.errors.get(n);
+  return t || e.errors.set(n, t = []), t;
 }
-const y = (e) => e.whenStack.every((r) => r());
-function D(e, r) {
-  const t = f("validate"), n = b(t, e);
+const y = (e) => e.whenStack.every((n) => n());
+function D(e, n) {
+  const t = f("validate"), r = b(t, e);
   if (!y(t)) return;
   const o = e.peek();
-  for (const i of r) {
+  for (const i of n) {
     const s = i(o, t.model, t.model);
-    s && n.push(s);
+    s && r.push(s);
   }
 }
-function N(e, r) {
-  const t = f("validateAsync"), n = b(t, e);
+function N(e, n) {
+  const t = f("validateAsync"), r = b(t, e);
   if (!y(t)) return;
   const o = e.peek(), i = t.signal;
-  for (const s of r)
+  for (const s of n)
     t.pending.push(
       s(o, { signal: i }).then(
         (a) => {
-          a && !i.aborted && n.push(a);
+          a && !i.aborted && r.push(a);
         },
         () => {
         }
       )
     );
 }
-function R(e, r) {
+function R(e, n) {
   const t = f("validateWhen");
   t.whenStack.push(e);
   try {
-    r();
+    n();
   } finally {
     t.whenStack.pop();
   }
 }
-function _(e, r) {
-  const t = f("cross"), n = b(t, e);
+function _(e, n) {
+  const t = f("cross"), r = b(t, e);
   if (!y(t)) return;
-  const o = r(t.model.get());
-  o && n.push(o);
+  const o = n(t.model.get());
+  o && r.push(o);
 }
-function $(e, r) {
+function $(e, n) {
   f("each");
   const t = e.length;
-  for (let n = 0; n < t; n++) r(e.at(n));
+  for (let r = 0; r < t; r++) n(e.at(r));
 }
 function j(...e) {
   const t = f("apply").model;
-  for (const n of e) n({ model: t });
+  for (const r of e) r({ model: t });
 }
 function z(e) {
   return e;
 }
-const F = /* @__PURE__ */ new WeakMap();
-function P(e, r) {
-  let t = F.get(e);
-  t || F.set(e, t = /* @__PURE__ */ new WeakMap());
-  let n = t.get(r);
-  return n || t.set(r, n = { fields: /* @__PURE__ */ new Set(), ac: null }), n;
+const x = /* @__PURE__ */ new WeakMap();
+function L(e, n) {
+  let t = x.get(e);
+  t || x.set(e, t = /* @__PURE__ */ new WeakMap());
+  let r = t.get(n);
+  return r || t.set(n, r = { fields: /* @__PURE__ */ new Set(), ac: null }), r;
 }
-const T = (e) => {
-  for (const r of e.values()) for (const t of r) if (t.severity !== "warning") return !0;
+const P = (e) => {
+  for (const n of e.values()) for (const t of n) if (t.severity !== "warning") return !0;
   return !1;
 };
-function W(e) {
-  return e.aborted ? Promise.resolve() : new Promise((r) => {
-    e.addEventListener("abort", () => r(), { once: !0 });
+function T(e) {
+  return e.aborted ? Promise.resolve() : new Promise((n) => {
+    e.addEventListener("abort", () => n(), { once: !0 });
   });
 }
-async function V(e, r, t) {
-  const n = P(e, r);
-  n.ac?.abort();
+async function W(e, n, t) {
+  const r = L(e, n);
+  r.ac?.abort();
   const o = new AbortController();
-  n.ac = o;
+  r.ac = o;
   const i = {
     model: e,
     errors: /* @__PURE__ */ new Map(),
@@ -95,73 +143,25 @@ async function V(e, r, t) {
   }, s = v;
   v = i;
   try {
-    r({ model: e });
+    n({ model: e });
   } finally {
     v = s;
   }
-  if (i.pending.length && await Promise.race([Promise.all(i.pending), W(o.signal)]), o.signal.aborted) return !1;
+  if (i.pending.length && await Promise.race([Promise.all(i.pending), T(o.signal)]), o.signal.aborted) return !1;
   const a = new Set(i.errors.keys());
-  for (const c of n.fields) a.has(c) || p(c)?.setErrors([]);
+  for (const c of r.fields) a.has(c) || p(c)?.setErrors([]);
   for (const c of a) p(c)?.setErrors(i.errors.get(c) ?? []);
   if (t?.touch) for (const c of a) p(c)?.markAsTouched();
-  return n.fields = a, !T(i.errors);
-}
-function G(e, r, t = {}) {
-  const { strategy: n = "submit", debounce: o = 0, liveAfterSubmit: i = "change" } = t, s = M(!1);
-  let a = 0, c = !1, w = !1, d, l;
-  const k = async (u) => {
-    a++, s.value = !0;
-    try {
-      return await V(e, r, { touch: u });
-    } finally {
-      --a === 0 && (s.value = !1);
-    }
-  }, h = () => {
-    k(!1);
-  }, A = () => {
-    if (!o) {
-      h();
-      return;
-    }
-    l && clearTimeout(l), l = setTimeout(h, o);
-  }, S = (u, g) => {
-    let x = !0;
-    return E(() => {
-      if (L(e, u), x) {
-        x = !1;
-        return;
-      }
-      n === "afterFirstSubmit" && !c || g();
-    });
-  }, m = {
-    async validate() {
-      return c = !0, k(!0);
-    },
-    start() {
-      if (w || d) return () => m.dispose();
-      const u = n === "afterFirstSubmit" ? i : n;
-      return u === "change" ? d = S((g) => void g.value, A) : u === "blur" && (d = S((g) => void p(g)?.touched.value, h)), () => m.dispose();
-    },
-    dispose() {
-      w = !0, l && (clearTimeout(l), l = void 0), d?.(), d = void 0;
-    },
-    get isValidating() {
-      return s.value;
-    },
-    get validating() {
-      return s;
-    }
-  };
-  return m;
+  return r.fields = a, !P(i.errors);
 }
 export {
   j as apply,
-  G as createFormValidation,
+  B as createFormValidation,
   _ as cross,
   z as defineValidationSchema,
   $ as each,
   D as validate,
   N as validateAsync,
-  V as validateModel,
+  W as validateModel,
   R as validateWhen
 };

package/docs/llms/02-quick-start.md

@@ -7,14 +7,15 @@
 > `Checkbox`-обёртки с `label`-prop'ами — это anti-pattern. См.
 > `find_recipe(package="@reformer/ui-kit", topic="form-field-integration")`.
 
-Архитектура M1: сначала создаётся **модель данных** (`createModel`), затем **форма**
-(`createForm({ model, schema })`), где схема привязывает поля к сигналам модели
-(`model.$.field`). Layout-схема НЕ несёт валидаторов — валидация живёт в отдельной
+Архитектура M1: **модель данных** — источник истины, схема привязывает поля к её сигналам
+(`model.$.field`), а сборка идёт ОДНИМ вызовом `createCoreForm` (для рендера ui-kit;
+в рендерерах — `createReactForm` / `createJsonForm`), который создаёт модель, строит форму,
+запускает поведение и собирает валидацию. Layout-схема НЕ несёт валидаторов — валидация живёт в отдельной
 схеме `defineValidationSchema` из `@reformer/core/validation` и запускается внешним
 раннером `validateModel(model, schema)`.
 
 ```typescript
-import { createModel, createForm, type FormProxy } from '@reformer/core';
+import { createCoreForm, createModel, useFormBundle, type FormProxy } from '@reformer/core';
 import { defineValidationSchema, validate, validateModel } from '@reformer/core/validation';
 import { required, email } from '@reformer/core/validators';
 import { FormField, Input, Button } from '@reformer/ui-kit';
@@ -49,8 +50,14 @@ const contactValidation = defineValidationSchema<ContactForm>(({ model }) => {
   validate(model.$.email, [required({ message: 'Email is required' }), email({ message: 'Invalid email' })]);
 });
 
-// 5. Form — ноды поверх сигналов модели
-const form = createForm<ContactForm>({ model, schema });
+// 5. Сборка ОДНИМ вызовом: модель + ноды поверх её сигналов + валидация.
+//    В React оборачивают в useFormBundle — ленивый useState, фабрика зовётся один раз.
+const contact = createCoreForm<ContactForm>({
+  model,
+  schema: buildSchema,          // билдер (model) => tree
+  validation: contactValidation,
+});
+const form = contact.form;
 
 // 6. Use in React component — thin JSX, FormField does ALL heavy lifting
 function ContactFormComponent() {
@@ -121,7 +128,7 @@ const schema = {
   properties: { array: model.properties, item: propertyItem },
 };
 
-const form = createForm<MyForm>({ model, schema });
+const { form } = createCoreForm<MyForm>({ model, schema: () => schema });
 
 // Операции над массивом — на модели:
 model.properties.push({ type: 'apartment', description: '', estimatedValue: 0 });

package/docs/llms/15-project-structure.md

@@ -15,7 +15,7 @@ src/
 │
 ├── forms/
 │   └── [form-name]/              # Form module — flat, one file per concern
-│       ├── index.tsx             # entry + whole form: createModel→createForm→<FormWizard> with all steps inline; arrays via FormArraySection
+│       ├── index.tsx             # entry + whole form: ONE createCoreForm call → <FormWizard> with all steps inline; arrays via FormArraySection
 │       ├── types.ts              # form type + enums + { value, label } option type + constant dictionaries
 │       ├── model.ts              # createModel + initial values + empty-array-element factories
 │       ├── form.schema.ts        # FormSchema: { value: model.$.x, component, componentProps }
@@ -60,11 +60,15 @@ export const creditApplicationBehavior = defineFormBehavior<CreditApplicationFor
 });
 
 // forms/credit-application/index.tsx — entry: assembles the form, renders <FormWizard> with all steps inline
-import { createForm } from '@reformer/core';
-export const createCreditApplicationForm = () => {
-  const model = createCreditApplicationModel();
-  return createForm({ model, schema: creditApplicationSchema(model), behavior: creditApplicationBehavior });
-};
+import { createCoreForm } from '@reformer/core';
+// ONE call: model + form + behavior + validation. In the page: useFormBundle(createCreditApplicationForm).
+export const createCreditApplicationForm = () =>
+  createCoreForm({
+    model: createCreditApplicationModel(),
+    schema: creditApplicationSchema,          // builder (model) => tree
+    behavior: creditApplicationBehavior,
+    validation: creditApplicationValidation,  // { steps, extras } → bundle.validation
+  });
 ```
 
 ### Scaling up: folders (large forms)
@@ -90,10 +94,10 @@ forms/
     │
     ├── schema/                   # The form definition
     │   ├── model.ts             # createModel factory + initial values + array-element factories
-    │   ├── schema.ts            # createForm schema tree ({ value: model.$.x, component })
+    │   ├── schema.ts            # schema builder (model) => tree ({ value: model.$.x, component })
     │   ├── validation.ts        # defineValidationSchema + validateModel config ({ validateStep, validateAll })
     │   ├── behavior.ts          # defineFormBehavior(...)
-    │   └── create-form.ts       # Assembly: createForm({ model, schema, behavior })
+    │   └── create-form.ts       # Assembly: createCoreForm({ model, schema, behavior, validation })
     │
     └── components/
         ├── steps/               # One component per wizard step