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

package/dist/form-model-DhW2HZOB.js

@@ -0,0 +1,323 @@
+import { batch as k, signal as _, computed as O } from "@preact/signals-core";
+const h = /* @__PURE__ */ new WeakMap();
+function F(e) {
+  h.set(e, (h.get(e) ?? 0) + 1);
+}
+function K(e) {
+  const t = h.get(e);
+  t !== void 0 && (t <= 1 ? h.delete(e) : h.set(e, t - 1));
+}
+function P(e) {
+  return h.has(e);
+}
+const p = (e) => !(e === null || typeof e != "object" || Array.isArray(e) || e instanceof Date || typeof Blob < "u" && e instanceof Blob || typeof File < "u" && e instanceof File), c = (e, t) => e === "" ? String(t) : `${e}.${t}`, m = (e) => /^\d+$/.test(e), l = (e) => {
+  if (Array.isArray(e)) return e.map(l);
+  if (p(e)) {
+    const t = {};
+    for (const i of Object.keys(e)) t[i] = l(e[i]);
+    return t;
+  }
+  return e;
+}, g = (e, t) => {
+  if (e === t) return !0;
+  if (Array.isArray(e) && Array.isArray(t))
+    return e.length !== t.length ? !1 : e.every((i, r) => g(i, t[r]));
+  if (p(e) && p(t)) {
+    const i = Object.keys(e), r = Object.keys(t);
+    return i.length !== r.length ? !1 : i.every((n) => g(e[n], t[n]));
+  }
+  return !1;
+};
+class j {
+  constructor(t, i) {
+    this.path = i;
+    const r = _(t);
+    r.__path = i, this.signal = r, this.initial = l(t);
+  }
+  kind = "leaf";
+  signal;
+  initial;
+  rebase(t) {
+    this.path = t, this.signal.__path = t;
+  }
+  /** Реактивное чтение (внутри effect/computed создаёт зависимость). */
+  read() {
+    return this.signal.value;
+  }
+  /** Нереактивный снимок. */
+  peek() {
+    return this.signal.peek();
+  }
+  set(t) {
+    this.signal.value = t;
+  }
+  resetToInitial() {
+    this.signal.value = l(this.initial);
+  }
+  captureInitial() {
+    this.initial = l(this.signal.peek());
+  }
+  dirty() {
+    return !g(this.signal.peek(), this.initial);
+  }
+}
+class x {
+  constructor(t, i) {
+    this.path = i;
+    for (const r of Object.keys(t))
+      this.children.set(r, d(t[r], c(i, r)));
+  }
+  kind = "group";
+  children = /* @__PURE__ */ new Map();
+  rebase(t) {
+    this.path = t;
+    for (const [i, r] of this.children) r.rebase(c(t, i));
+  }
+  /** Реактивное чтение поддерева (внутри effect/computed подписывает на все листья группы). */
+  read() {
+    const t = {};
+    for (const [i, r] of this.children) t[i] = r.read();
+    return t;
+  }
+  peek() {
+    const t = {};
+    for (const [i, r] of this.children) t[i] = r.peek();
+    return t;
+  }
+  set(t) {
+    if (t == null || typeof t != "object") return;
+    const i = t;
+    k(() => {
+      for (const [r, n] of this.children)
+        r in i && (n.kind === "leaf" && P(n.signal) || n.set(i[r]));
+    });
+  }
+  resetToInitial() {
+    k(() => {
+      for (const t of this.children.values()) t.resetToInitial();
+    });
+  }
+  captureInitial() {
+    for (const t of this.children.values()) t.captureInitial();
+  }
+  dirty() {
+    for (const t of this.children.values()) if (t.dirty()) return !0;
+    return !1;
+  }
+}
+class N {
+  constructor(t, i) {
+    this.path = i, this.items = _(t.map((r, n) => d(r, c(i, n)))), this.initial = l(t);
+  }
+  kind = "array";
+  items;
+  initial;
+  rebase(t) {
+    this.path = t, this.items.peek().forEach((i, r) => i.rebase(c(t, r)));
+  }
+  reindex() {
+    this.items.peek().forEach((t, i) => t.rebase(c(this.path, i)));
+  }
+  push(t) {
+    const i = this.items.peek();
+    this.items.value = [...i, d(t, c(this.path, i.length))];
+  }
+  insertAt(t, i) {
+    const r = [...this.items.peek()];
+    r.splice(t, 0, d(i, c(this.path, t))), this.items.value = r, this.reindex();
+  }
+  removeAt(t) {
+    const i = [...this.items.peek()];
+    i.splice(t, 1), this.items.value = i, this.reindex();
+  }
+  move(t, i) {
+    const r = [...this.items.peek()], [n] = r.splice(t, 1);
+    n && r.splice(i, 0, n), this.items.value = r, this.reindex();
+  }
+  swap(t, i) {
+    const r = [...this.items.peek()];
+    t < 0 || i < 0 || t >= r.length || i >= r.length || t === i || ([r[t], r[i]] = [r[i], r[t]], this.items.value = r, this.reindex());
+  }
+  clear() {
+    this.items.value = [];
+  }
+  /**
+   * Реактивное чтение массива. Читаем `items.value` (а не `.peek()`) — внутри effect/computed это
+   * подписка на СОСТАВ массива, поэтому push/removeAt/move ретригерят наравне с правкой элемента.
+   */
+  read() {
+    return this.items.value.map((t) => t.read());
+  }
+  peek() {
+    return this.items.peek().map((t) => t.peek());
+  }
+  set(t) {
+    const i = Array.isArray(t) ? t : [];
+    this.items.value = i.map((r, n) => d(r, c(this.path, n)));
+  }
+  resetToInitial() {
+    this.set(l(this.initial));
+  }
+  captureInitial() {
+    this.initial = l(this.peek());
+  }
+  dirty() {
+    return !g(this.peek(), this.initial);
+  }
+}
+function d(e, t) {
+  return Array.isArray(e) ? new N(e, t) : p(e) ? new x(e, t) : new j(e, t);
+}
+function f(e) {
+  if (e)
+    return e.kind === "group" ? S(e) : e.kind === "array" ? E(e) : e.read();
+}
+function E(e) {
+  const t = {
+    get length() {
+      return e.items.value.length;
+    },
+    push: (i) => e.push(i),
+    insertAt: (i, r) => e.insertAt(i, r),
+    removeAt: (i) => e.removeAt(i),
+    move: (i, r) => e.move(i, r),
+    swap: (i, r) => e.swap(i, r),
+    clear: () => e.clear(),
+    at: (i) => f(e.items.value[i]),
+    map: (i) => e.items.value.map((r, n) => i(f(r), n)),
+    forEach: (i) => e.items.value.forEach((r, n) => i(f(r), n)),
+    toArray: () => e.peek(),
+    [Symbol.iterator]: function* () {
+      const i = e.items.value;
+      for (let r = 0; r < i.length; r++) yield f(i[r]);
+    }
+  };
+  return new Proxy(t, {
+    get: (i, r, n) => r === "__path" ? e.path : typeof r == "string" && m(r) ? f(e.items.value[Number(r)]) : Reflect.get(i, r, n),
+    has: (i, r) => typeof r == "string" && m(r) ? Number(r) < e.items.value.length : Reflect.has(i, r)
+  });
+}
+const A = /* @__PURE__ */ new WeakMap();
+function M(e) {
+  const t = O(() => e.read());
+  return {
+    get value() {
+      return t.value;
+    },
+    peek: () => t.peek(),
+    subscribe: (i) => t.subscribe(i),
+    valueOf: () => t.value,
+    toString: () => String(t.value),
+    toJSON: () => t.value,
+    brand: t.brand
+  };
+}
+function I(e) {
+  if (e.kind === "leaf") return e.signal;
+  const t = A.get(e);
+  if (t) return t;
+  const i = M(e), r = e.kind === "group", n = (o) => r ? e.children.get(o) : m(o) ? e.items.value[Number(o)] : void 0, s = r ? {} : {
+    get length() {
+      return e.items.value.length;
+    }
+  }, u = new Proxy(s, {
+    get: (o, a, D) => {
+      if (a === "__path") return e.path;
+      if (a === "__kind") return e.kind;
+      if (typeof a != "string") return Reflect.get(i, a, i);
+      const v = n(a);
+      return v ? I(v) : !r && Reflect.has(o, a) ? Reflect.get(o, a, D) : Reflect.get(i, a, i);
+    },
+    has: (o, a) => typeof a == "string" && (n(a) !== void 0 || !r && Reflect.has(o, a)),
+    ownKeys: () => r ? [...e.children.keys()] : Reflect.ownKeys(s),
+    getOwnPropertyDescriptor: (o, a) => typeof a == "string" && n(a) ? { enumerable: !0, configurable: !0 } : r ? void 0 : Reflect.getOwnPropertyDescriptor(o, a)
+  });
+  return A.set(e, u), u;
+}
+function W(e) {
+  if (e == null || typeof e != "object") return !1;
+  const t = e.__kind;
+  return t === "group" || t === "array";
+}
+function T(e, t) {
+  if (!t) return;
+  let i = e;
+  for (const r of t.split(".")) {
+    if (!i) return;
+    if (i.kind === "group") i = i.children.get(r);
+    else if (i.kind === "array") i = i.items.peek()[Number(r)];
+    else return;
+  }
+  return i && i.kind === "leaf" ? i.signal : void 0;
+}
+const b = /* @__PURE__ */ new Set([
+  "$",
+  "get",
+  "set",
+  "patch",
+  "isDirty",
+  "reset",
+  "captureInitial",
+  "signalAt"
+]), w = /* @__PURE__ */ new WeakMap(), R = /* @__PURE__ */ new WeakMap();
+function S(e) {
+  const t = w.get(e);
+  if (t) return t;
+  const i = {
+    $: I(e),
+    get: () => e.peek(),
+    set: (n) => e.set(n),
+    patch: (n) => e.set(n),
+    isDirty: () => e.dirty(),
+    reset: () => e.resetToInitial(),
+    captureInitial: () => e.captureInitial(),
+    signalAt: (n) => T(e, n)
+  }, r = new Proxy(
+    {},
+    {
+      get: (n, s) => {
+        if (s === "__path") return e.path;
+        if (typeof s != "string") return;
+        const u = e.children.get(s);
+        if (u) return f(u);
+        if (b.has(s)) return i[s];
+      },
+      set: (n, s, u) => {
+        if (typeof s != "string") return !1;
+        const o = e.children.get(s);
+        return o ? (o.set(u), !0) : !1;
+      },
+      has: (n, s) => typeof s == "string" && (e.children.has(s) || b.has(s)),
+      ownKeys: () => [...e.children.keys()],
+      getOwnPropertyDescriptor: (n, s) => typeof s == "string" && e.children.has(s) ? { enumerable: !0, configurable: !0 } : void 0
+    }
+  );
+  return w.set(e, r), R.set(r, e), r;
+}
+function y(e, t) {
+  if (e.kind === "leaf") {
+    t(e.signal);
+    return;
+  }
+  if (e.kind === "group") {
+    for (const i of e.children.values()) y(i, t);
+    return;
+  }
+  for (const i of e.items.value) y(i, t);
+}
+function B(e, t) {
+  const i = R.get(e);
+  i && y(i, t);
+}
+function C(e) {
+  const t = new x(e, "");
+  return S(t);
+}
+export {
+  P as a,
+  C as c,
+  B as e,
+  W as i,
+  F as m,
+  K as u
+};

package/dist/index.js

@@ -1,7 +1,6 @@
-import { c as Le } from "./form-model-DYCzGGKF.js";
-import { c as $e, a as Ge, r as je, b as Ue, d as Be, e as We, f as qe, s as Ke, t as He, w as ze } from "./behaviors-value-C7dSEhCc.js";
-import { i as $ } from "./derived-registry-CluZCQ7U.js";
-import { m as Ye, u as Qe } from "./derived-registry-CluZCQ7U.js";
+import { a as $ } from "./form-model-DhW2HZOB.js";
+import { c as Le, i as Re, m as $e, u as Ge } from "./form-model-DhW2HZOB.js";
+import { c as Ue, a as Be, r as We, b as qe, d as Ke, e as He, f as ze, s as Je, t as Ye, w as Qe } from "./behaviors-value-C7dSEhCc.js";
 import { S as I } from "./subscription-manager-705bls97.js";
 import { signal as g, computed as f, effect as _, batch as X, Signal as G } from "@preact/signals-core";
 import { r as Z } from "./signal-node-registry-tiwel-TV.js";
@@ -288,7 +287,7 @@ let re = 0;
 function N(i) {
   return `${i}-${++re}`;
 }
-var A = /* @__PURE__ */ ((i) => (i.THROW = "throw", i.LOG = "log", i.CONVERT = "convert", i))(A || {});
+var S = /* @__PURE__ */ ((i) => (i.THROW = "throw", i.LOG = "log", i.CONVERT = "convert", i))(S || {});
 class k {
   static handle(e, t, s = "throw") {
     const r = this.extractMessage(e);
@@ -716,7 +715,7 @@ class ne extends M {
               return k.handle(
                 u,
                 "FieldNode AsyncValidator",
-                A.CONVERT
+                S.CONVERT
               );
             }
           })
@@ -1080,7 +1079,7 @@ function le(i) {
   }
   return e;
 }
-class S extends M {
+class A extends M {
   // ============================================================================
   // Приватные поля
   // ============================================================================
@@ -1365,7 +1364,7 @@ class S extends M {
       return;
     let s = this;
     for (const r of t) {
-      if (!(s instanceof S) || (s = s.getField(r.key), !s)) return;
+      if (!(s instanceof A) || (s = s.getField(r.key), !s)) return;
       if (r.index !== void 0)
         if ("at" in s && "length" in s && typeof s.at == "function") {
           const n = s.at(r.index);
@@ -1567,7 +1566,7 @@ class B extends M {
           `ArrayNode.removeAt: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.removeAt",
-        A.LOG
+        S.LOG
       );
       return;
     }
@@ -1586,7 +1585,7 @@ class B extends M {
           `ArrayNode.insert: index ${e} out of bounds (length: ${this.items.value.length})`
         ),
         "ArrayNode.insert",
-        A.LOG
+        S.LOG
       );
       return;
     }
@@ -1615,7 +1614,7 @@ class B extends M {
       k.handle(
         new Error(`ArrayNode.move: index out of bounds (from=${e}, to=${t}, length=${s})`),
         "ArrayNode.move",
-        A.LOG
+        S.LOG
       );
       return;
     }
@@ -1643,7 +1642,7 @@ class B extends M {
       k.handle(
         new Error(`ArrayNode.swap: index out of bounds (a=${e}, b=${t}, length=${s})`),
         "ArrayNode.swap",
-        A.LOG
+        S.LOG
       );
       return;
     }
@@ -1681,7 +1680,7 @@ class B extends M {
   }
   setValue(e, t) {
     this.clear(), e.forEach((s) => this.push(s)), t?.emitEvent !== !1 && this.validate().catch((s) => {
-      k.handle(s, "ArrayNode.setValue", A.LOG);
+      k.handle(s, "ArrayNode.setValue", S.LOG);
     });
   }
   patchValue(e) {
@@ -1839,7 +1838,7 @@ class B extends M {
    */
   createItem(e) {
     if (this.isGroupSchema(this.itemSchema)) {
-      const t = new S(this.itemSchema);
+      const t = new A(this.itemSchema);
       return e && t.patchValue(e), t;
     }
     throw new Error(
@@ -1974,7 +1973,7 @@ class ue {
         e.initialItems
       );
     if (this.isGroupConfig(e))
-      return new S(e);
+      return new A(e);
     throw new Error(
       `NodeFactory: Unknown node config. Expected FieldConfig, GroupConfig, or ArrayConfig, but got: ${JSON.stringify(
         e
@@ -2343,7 +2342,7 @@ function Y(i, e, t) {
 function Q(i) {
   const { model: e, schema: t, behavior: s } = i, r = /* @__PURE__ */ new Map(), n = /* @__PURE__ */ new Map();
   t !== void 0 && D(t, r, n);
-  const a = J(e, e.get(), "", r), l = new S(a), d = e.get();
+  const a = J(e, e.get(), "", r), l = new A(a), d = e.get();
   for (const [o, m] of Object.entries(d)) {
     if (!Array.isArray(m)) continue;
     const c = n.get(o);
@@ -2358,35 +2357,35 @@ function Q(i) {
     if (m && c) {
       Z(m, c);
       const h = o.lastIndexOf("."), p = h === -1 ? l : l.getFieldByPath(o.slice(0, h));
-      p instanceof S && p.registerFieldSignal(c, m);
+      p instanceof A && p.registerFieldSignal(c, m);
     }
   }
   return s && l.attachBehaviorCleanup(s.__run(e, u)), u;
 }
 const ce = (i) => i != null && typeof i == "object" && "model" in i && typeof i.model?.signalAt == "function";
 function Ne(i) {
-  return ce(i) ? Q(i) : new S(i).getProxy();
+  return ce(i) ? Q(i) : new A(i).getProxy();
 }
-function x(i) {
+function C(i) {
   return i == null ? !1 : typeof i == "object" && "value" in i && "setValue" in i && "getValue" in i && "validate" in i;
 }
 function he(i) {
-  return x(i) && "validators" in i && "asyncValidators" in i && // FieldNode имеет markAsTouched метод
+  return C(i) && "validators" in i && "asyncValidators" in i && // FieldNode имеет markAsTouched метод
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   typeof i.markAsTouched == "function" && // У FieldNode нет fields или items
   !("fields" in i) && !("items" in i);
 }
 function fe(i) {
-  return x(i) && "getFieldByPath" in i && "fields" in i && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
+  return C(i) && "getFieldByPath" in i && "fields" in i && // GroupNode НЕ имеет items/push/removeAt (это ArrayNode/ModelArrayNode)
   !("items" in i) && !("push" in i) && !("removeAt" in i);
 }
 function ve(i) {
-  return x(i) && "items" in i && "length" in i && "push" in i && "removeAt" in i && "at" in i && // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return C(i) && "items" in i && "length" in i && "push" in i && "removeAt" in i && "at" in i && // eslint-disable-next-line @typescript-eslint/no-explicit-any
   typeof i.push == "function" && // eslint-disable-next-line @typescript-eslint/no-explicit-any
   typeof i.removeAt == "function";
 }
 function Fe(i) {
-  return he(i) ? "FieldNode" : fe(i) ? "GroupNode" : ve(i) ? "ArrayNode" : x(i) ? "FormNode" : "Unknown";
+  return he(i) ? "FieldNode" : fe(i) ? "GroupNode" : ve(i) ? "ArrayNode" : C(i) ? "FormNode" : "Unknown";
 }
 var F = { exports: {} }, P = {};
 var W;
@@ -2488,7 +2487,7 @@ var K;
 function ye() {
   return K || (K = 1, process.env.NODE_ENV === "production" ? F.exports = me() : F.exports = pe()), F.exports;
 }
-var C = ye();
+var x = ye();
 function ge(i, e) {
   if (i === e) return !0;
   if (i.length !== e.length) return !1;
@@ -2546,7 +2545,7 @@ function R(i, e, t, s) {
       v[h] = m[h];
     return v.__snapshot = l.current(m), v.__snapshot;
   }, [s]);
-  return C.useSyncExternalStore(d, u, u);
+  return x.useSyncExternalStore(d, u, u);
 }
 function Ee(i) {
   const e = {
@@ -2646,7 +2645,7 @@ function Me(i) {
   const e = i && "length" in i && "map" in i;
   return i ? e ? be(i) : Ee(i) : _e();
 }
-function xe(i) {
+function Ce(i) {
   const e = V({ value: i.value.value }), t = b(
     (r) => {
       let n = !0;
@@ -2663,9 +2662,9 @@ function xe(i) {
     const r = i.value.value;
     return e.current.value === r ? e.current.value : (e.current.value = r, r);
   }, [i]);
-  return C.useSyncExternalStore(t, s, s);
+  return x.useSyncExternalStore(t, s, s);
 }
-function Ce(i) {
+function xe(i) {
   const e = V({ length: i.length.value }), t = b(
     (r) => {
       let n = !0;
@@ -2682,7 +2681,7 @@ function Ce(i) {
     const r = i.length.value;
     return e.current.length === r ? e.current.length : (e.current.length = r, r);
   }, [i]);
-  return C.useSyncExternalStore(t, s, s);
+  return x.useSyncExternalStore(t, s, s);
 }
 function Pe(i) {
   const { model: e, schema: t, strategy: s, debounce: r, liveAfterSubmit: n } = i, a = ee(
@@ -2690,7 +2689,7 @@ function Pe(i) {
     [e, t, s, r, n]
   );
   te(() => a.start(), [a]);
-  const l = C.useSyncExternalStore(
+  const l = x.useSyncExternalStore(
     b((u) => a.validating.subscribe(u), [a]),
     () => a.validating.peek(),
     () => !1
@@ -2702,17 +2701,17 @@ const Te = Object.freeze({ runtime: "reformer-core", v: 1 });
 export {
   B as ArrayNode,
   Te as CORE_RUNTIME_TOKEN,
-  A as ErrorStrategy,
+  S as ErrorStrategy,
   ne as FieldNode,
   k as FormErrorHandler,
   M as FormNode,
   oe as FormSubmitter,
-  S as GroupNode,
+  A as GroupNode,
   de as ModelArrayNode,
   ue as NodeFactory,
   I as SubscriptionManager,
-  $e as computeFrom,
-  Ge as copyFrom,
+  Ue as computeFrom,
+  Be as copyFrom,
   Ne as createForm,
   Q as createFormFromModel,
   Le as createModel,
@@ -2723,21 +2722,22 @@ export {
   ve as isArrayNode,
   $ as isDerived,
   he as isFieldNode,
-  x as isFormNode,
+  C as isFormNode,
   fe as isGroupNode,
-  Ye as markDerived,
+  Re as isModelContainerSignal,
+  $e as markDerived,
   Z as registerSignalNode,
-  je as resetWhen,
-  Ue as revalidateWhen,
-  Be as runOutsideEffect,
-  We as safeCallback,
-  qe as safeDebouncedCallback,
-  Ke as syncFields,
-  He as transformValue,
-  Qe as unmarkDerived,
-  Ce as useArrayLength,
+  We as resetWhen,
+  qe as revalidateWhen,
+  Ke as runOutsideEffect,
+  He as safeCallback,
+  ze as safeDebouncedCallback,
+  Je as syncFields,
+  Ye as transformValue,
+  Ge as unmarkDerived,
+  xe as useArrayLength,
   Me as useFormControl,
-  xe as useFormControlValue,
+  Ce as useFormControlValue,
   Pe as useFormValidation,
-  ze as watchField
+  Qe as watchField
 };

package/dist/state/form-model.d.ts

@@ -1,4 +1,18 @@
 import { FormModel, PathAwareSignal } from './types';
+/**
+ * Узел дерева `model.$` — контейнер (группа/массив), а не лист?
+ *
+ * Контейнерный узел структурно совместим с `ReadonlySignal` (`peek`/`value`/`subscribe`), поэтому
+ * duck-typing «есть `peek` ⇒ это лист» на нём даёт ложное срабатывание. Этот guard — надёжный
+ * способ различить: обходчикам дерева нужно спускаться в контейнер, а не читать его целиком.
+ *
+ * @group Model
+ * @example
+ * ```typescript
+ * const isLeaf = (v: unknown) => isSignalLike(v) && !isModelContainerSignal(v);
+ * ```
+ */
+export declare function isModelContainerSignal(value: unknown): boolean;
 /**
  * Обойти ВСЕ листовые сигналы модели (включая элементы массивов), вызвав `visit` на каждом.
  *

package/dist/state/index.d.ts

@@ -23,7 +23,8 @@
  * @module state
  */
 export { createModel } from './form-model';
-export type { FormModel, ModelArray, ModelObject, ModelValue, ModelSignals, ModelApi, PathAwareSignal, } from './types';
+export type { FormModel, ModelArray, ModelArraySignals, ModelGroupSignals, ModelObject, ModelValue, ModelSignals, ModelApi, PathAwareSignal, } from './types';
+export { isModelContainerSignal } from './form-model';
 export { computeFrom, copyFrom, watchField, transformValue, resetWhen, syncFields, revalidateWhen, } from './behaviors-value';
 export type { BehaviorCleanup } from './behaviors-value';
 export { markDerived, isDerived, unmarkDerived } from './derived-registry';