@companix/formkit 0.0.12 → 0.0.15

package/dist/bundle.es.js

@@ -1,8 +1,8 @@
-import { jsx as v, Fragment as j, jsxs as M } from "react/jsx-runtime";
+import { jsx as h, Fragment as j, jsxs as M } from "react/jsx-runtime";
 import { createContext as P, useState as R, useContext as q, useEffect as p, useMemo as A, useCallback as $, useRef as T } from "react";
 import L from "fast-deep-equal";
 const D = P({}), B = (n) => {
-  const [, r] = R([]), e = q(D), s = e.getForm(n);
+  const [, r] = R([]), e = q(D), o = e.getForm(n);
   return p(() => {
     const { unsubscribe: t } = e.subscribeToForm(n, () => {
       r([]);
@@ -10,18 +10,18 @@ const D = P({}), B = (n) => {
     return () => {
       t();
     };
-  }, []), s?.value;
+  }, []), o?.value;
 }, N = ({ canActivate: n, name: r, children: e }) => {
-  const s = B(r);
-  return n(s) ? /* @__PURE__ */ v(j, { children: e }) : null;
+  const o = B(r);
+  return n(o) ? /* @__PURE__ */ h(j, { children: e }) : null;
 }, z = ({ item: { Form: n }, name: r }) => {
-  const [, e] = R([]), s = q(D), { unregistry: t } = A(() => s.registry(r, () => {
+  const [, e] = R([]), o = q(D), { unregistry: t } = A(() => o.registry(r, () => {
     e([]);
   }), []), f = $(
     (y) => {
       if (y && y.focus) {
-        const F = s.getForm(r);
-        F.focus = () => {
+        const v = o.getForm(r);
+        v.focus = () => {
           y.focus();
         };
       }
@@ -31,41 +31,41 @@ const D = P({}), B = (n) => {
   p(() => () => {
     t();
   }, []);
-  const { value: h, error: m } = s.getForm(r);
-  return /* @__PURE__ */ v(
+  const { value: b, error: x } = o.getForm(r);
+  return /* @__PURE__ */ h(
     n,
     {
       field: {
-        value: h,
+        value: b,
         onChange: (y) => {
-          s.onChange(r, y);
+          o.onChange(r, y);
         },
         onBlur: () => {
         },
         ref: f
       },
       isDirty: !1,
-      error: m,
-      disabled: s.disabled
+      error: x,
+      disabled: o.disabled
     }
   );
 }, G = ({ item: n, path: r }) => {
-  const { getController: e, items: s } = n, t = q(D), f = A(() => {
+  const { getController: e, items: o } = n, t = q(D), f = A(() => {
     const l = {};
-    return s.forEach(({ name: g, getForm: o }) => {
-      l[g] = o(g, () => a(g));
+    return o.forEach(({ name: g, getForm: s }) => {
+      l[g] = s(g, () => a(g));
     }), l;
-  }, []), h = $(() => {
+  }, []), b = $(() => {
     const l = [];
-    return s.forEach(({ name: g }) => {
+    return o.forEach(({ name: g }) => {
       t.getForm([...r, g].join(".")).value !== void 0 && l.push(g);
     }), l;
-  }, []), m = A(() => h(), []), [y, F] = R(m);
+  }, []), x = A(() => b(), []), [y, v] = R(x);
   p(() => {
     const { unregistry: l } = t.registryExtraForm(
-      s.map(({ name: g }) => [...r, g].join(".")),
+      o.map(({ name: g }) => [...r, g].join(".")),
       () => {
-        F(h());
+        v(b());
       }
     );
     return () => {
@@ -74,92 +74,92 @@ const D = P({}), B = (n) => {
   }, []);
   const d = $(
     (l) => {
-      f[l] && !y.includes(l) && F((g) => [...g, l]);
+      f[l] && !y.includes(l) && v((g) => [...g, l]);
     },
     [y]
   ), a = $((l) => {
-    F((g) => g.filter((o) => o !== l));
+    v((g) => g.filter((s) => s !== l));
   }, []);
   return /* @__PURE__ */ M(j, { children: [
     y.map((l) => {
       const g = f[l];
-      return /* @__PURE__ */ v(E, { path: r, scheme: [g] }, `param-form--${l}`);
+      return /* @__PURE__ */ h(C, { path: r, scheme: [g] }, `param-form--${l}`);
     }),
     e(d, y)
   ] });
-}, E = ({ scheme: n, path: r }) => /* @__PURE__ */ v(j, { children: n.map((e, s) => e.type === "layout" ? /* @__PURE__ */ v(e.Layout, { children: /* @__PURE__ */ v(E, { path: r, scheme: e.childs }) }, `layout-form--${s}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ v(
-  E,
+}, C = ({ scheme: n, path: r }) => /* @__PURE__ */ h(j, { children: n.map((e, o) => e.type === "layout" ? /* @__PURE__ */ h(e.Layout, { children: /* @__PURE__ */ h(C, { path: r, scheme: e.childs }) }, `layout-form--${o}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ h(
+  C,
   {
     path: [...r, e.context],
     scheme: e.childs
   },
-  `context-form--${s}-${e.context}-${r.length}`
-) : e.type === "condition" ? /* @__PURE__ */ v(
+  `context-form--${o}-${e.context}-${r.length}`
+) : e.type === "condition" ? /* @__PURE__ */ h(
   N,
   {
     name: e.depended,
     canActivate: e.canActivate,
-    children: /* @__PURE__ */ v(E, { path: r, scheme: e.childs })
+    children: /* @__PURE__ */ h(C, { path: r, scheme: e.childs })
   },
-  `condition--${s}-${e.depended}-${r.length}`
-) : e.type === "extra" ? /* @__PURE__ */ v(G, { path: r, item: e }, `partial-item--${s}-${r.length}`) : /* @__PURE__ */ v(
+  `condition--${o}-${e.depended}-${r.length}`
+) : e.type === "extra" ? /* @__PURE__ */ h(G, { path: r, item: e }, `partial-item--${o}-${r.length}`) : /* @__PURE__ */ h(
   z,
   {
     name: [...r, e.name].join("."),
     item: e
   },
-  `form-item--${s}-${e.name}-${r.length}`
-)) }), C = (n, r, e, s) => {
+  `form-item--${o}-${e.name}-${r.length}`
+)) }), V = (n, r, e, o) => {
   n.forEach((t) => {
-    if (t.type === "form" && s(t, [...r, t.name].join("."), e[t.name]), t.type === "context") {
-      C(t.childs, [...r, t.context], e[t.context] ?? {}, s);
+    if (t.type === "form" && o(t, [...r, t.name].join("."), e[t.name]), t.type === "context") {
+      V(t.childs, [...r, t.context], e[t.context] ?? {}, o);
       return;
     }
     if (t.type === "layout" || t.type === "condition") {
-      C(t.childs, r, e, s);
+      V(t.childs, r, e, o);
       return;
     }
-    t.type === "extra" && t.items.forEach(({ getForm: f, name: h }) => {
-      C([f(h, () => {
-      })], r, e, s);
+    t.type === "extra" && t.items.forEach(({ getForm: f, name: b }) => {
+      V([f(b, () => {
+      })], r, e, o);
     });
   });
-}, V = ({ scheme: n, values: r, path: e, forms: s }) => {
+}, E = ({ scheme: n, values: r, path: e, forms: o }) => {
   n.forEach((t) => {
     if (t.type === "form") {
       const f = [...e, t.name].join(".");
-      s[f].value !== void 0 && (r[t.name] = s[f].value);
+      o[f].value !== void 0 && (r[t.name] = o[f].value);
     }
     if (t.type === "context") {
-      r[t.context] = {}, V({
+      r[t.context] = {}, E({
         scheme: t.childs,
         path: [...e, t.context],
         values: r[t.context],
-        forms: s
+        forms: o
       });
       return;
     }
     if (t.type === "layout") {
-      V({ scheme: t.childs, path: e, values: r, forms: s });
+      E({ scheme: t.childs, path: e, values: r, forms: o });
       return;
     }
     if (t.type === "condition") {
-      const f = s[t.depended]?.value;
+      const f = o[t.depended]?.value;
       if (t.canActivate(f)) {
-        V({ scheme: t.childs, path: e, values: r, forms: s });
+        E({ scheme: t.childs, path: e, values: r, forms: o });
         return;
       }
     }
-    t.type === "extra" && t.items.forEach(({ getForm: f, name: h }) => {
-      V({ scheme: [f(h, () => {
-      })], path: e, values: r, forms: s });
+    t.type === "extra" && t.items.forEach(({ getForm: f, name: b }) => {
+      E({ scheme: [f(b, () => {
+      })], path: e, values: r, forms: o });
     });
   });
 }, w = (n, r) => {
   const e = {};
-  return V({ scheme: n, path: [], values: e, forms: r }), e;
+  return E({ scheme: n, path: [], values: e, forms: r }), e;
 }, H = (n, r) => {
-  const { onSubmit: e, onEqual: s, disabled: t, onDirty: f, onFormDirty: h, onChangeEvent: m, defaultValues: y } = r, F = { onSubmit: e }, d = {
+  const { onSubmit: e, onEqual: o, disabled: t, onDirty: f, onFormDirty: b, onChangeEvent: x, defaultValues: y } = r, v = { onSubmit: e }, d = {
     isActive: !1,
     isSubmitted: !1,
     dirtyCount: 0
@@ -167,27 +167,27 @@ const D = P({}), B = (n) => {
     subscribers: [],
     names: {}
   };
-  C(n, [], y ?? {}, (o, u, i) => {
+  V(n, [], y ?? {}, (s, u, i) => {
     a[u] = {
       error: null,
       isDirty: !1,
       value: i,
       // текущее (динамическое) состояние поля. Значение равно переданному дефолтному, либо: определяется как дефолтное значение компонента формы в момент его монтирования, а до этого - undefined.
-      startValue: i ?? o.defaultValue,
+      startValue: i ?? s.defaultValue,
       // начальное (стартовое) значение (равно переданному дефолтному, либо значению формы по умолчанию). Исходя из сравнения текущего значения со стартовым, можно понять, модифицированно ли поле
-      defaultValue: o.defaultValue,
+      defaultValue: s.defaultValue,
       // дефолтное значение компонента формы
       rerender: () => {
       },
       subscribers: [],
-      validate: o.validate
+      validate: s.validate
     };
   });
-  const g = (o, u) => {
-    f?.({ name: o, isDirty: u }), u && d.dirtyCount === 0 && h?.(!0), !u && d.dirtyCount === 1 && h?.(!1), d.dirtyCount += u ? 1 : -1;
+  const g = (s, u) => {
+    f?.({ name: s, isDirty: u }), u && d.dirtyCount === 0 && b?.(!0), !u && d.dirtyCount === 1 && b?.(!1), d.dirtyCount += u ? 1 : -1;
   };
   return {
-    submitRef: F,
+    submitRef: v,
     scheme: n,
     disabled: t,
     activate() {
@@ -196,20 +196,20 @@ const D = P({}), B = (n) => {
     disactivate() {
       d.isActive = !1;
     },
-    setError(o, u) {
-      const i = this.getForm(o);
+    setError(s, u) {
+      const i = this.getForm(s);
       i && (i.error = {
         error: !0,
         messages: [u.message]
       }, i.rerender());
     },
-    setFocus(o) {
-      const u = this.getForm(o);
+    setFocus(s) {
+      const u = this.getForm(s);
       u && u.focus && u.focus();
     },
-    setValue(o, u) {
-      const i = this.getForm(o);
-      i && i.value !== u && this.onChange(o, u);
+    setValue(s, u) {
+      const i = this.getForm(s);
+      i && i.value !== u && this.onChange(s, u);
     },
     getValues() {
       return w(n, a);
@@ -218,71 +218,76 @@ const D = P({}), B = (n) => {
       if (t)
         return;
       d.isSubmitted = !0;
-      let o = !1, u = !1;
+      let s = !1, u = !1;
       for (const i in a) {
         const c = a[i];
         if (c.value !== void 0) {
-          const b = c.validate(c.value);
-          b && (u = !0, c.error = b, c.rerender(), !o && c.focus && (c.focus(), o = !0));
+          const F = c.validate(c.value);
+          F && (u = !0, c.error = F, c.rerender(), !s && c.focus && (c.focus(), s = !0));
         }
       }
       if (!u) {
         if (d.dirtyCount === 0) {
-          s?.();
+          o?.();
           return;
         }
         const i = w(n, a);
-        await F.onSubmit(i, {
-          setError: (c, b) => {
-            const x = this.getForm(c);
-            x.error = {
+        await v.onSubmit(i, {
+          setError: (c, F) => {
+            const m = this.getForm(c);
+            m.error = {
               error: !0,
-              messages: [b.message]
-            }, x.rerender();
+              messages: [F.message]
+            }, m.rerender();
           }
         });
       }
     },
-    reset(o, { asDirty: u }) {
-      C(n, [], o, (i, c, b) => {
-        if (b === void 0 && a[c].value === void 0)
+    reset(s, { asDirty: u }) {
+      V(n, [], s, (i, c, F) => {
+        if (F === void 0 && a[c].value === void 0)
           return;
-        if (l.names[c] && b === void 0) {
-          a[c].value = b;
+        if (l.names[c] && F === void 0) {
+          a[c].value = void 0;
           return;
         }
-        const x = b ?? i.defaultValue;
-        u || (a[c].startValue = x, a[c].isDirty = !1), a[c].value !== x && this.onChange(c, x);
+        const m = F ?? i.defaultValue;
+        u || (a[c].startValue = m, a[c].isDirty = !1), a[c].value !== m && this.onChange(c, m);
       }), u || (d.dirtyCount = 0, d.isSubmitted = !1), l.subscribers.forEach(({ visualizeEvalueatedForms: i }) => {
         i();
       });
     },
-    registry(o, u) {
-      return a[o].rerender = u, a[o].value === void 0 && (a[o].value = a[o].defaultValue), {
+    setAsDefault() {
+      V(n, [], {}, ({}, s) => {
+        a[s].startValue = a[s].value, a[s].isDirty = !1;
+      }), d.dirtyCount = 0, d.isSubmitted = !1;
+    },
+    registry(s, u) {
+      return a[s].rerender = u, a[s].value === void 0 && (a[s].value = a[s].defaultValue), {
         unregistry() {
-          if (a[o].rerender = () => {
-          }, a[o].focus = void 0, d.isActive) {
-            a[o].value = void 0;
-            const i = !L(a[o].startValue, a[o].defaultValue);
-            a[o].isDirty !== i && g(o, i), a[o].isDirty = i;
+          if (a[s].rerender = () => {
+          }, a[s].focus = void 0, d.isActive) {
+            a[s].value = void 0;
+            const i = !L(a[s].startValue, a[s].defaultValue);
+            a[s].isDirty !== i && g(s, i), a[s].isDirty = i;
           }
         }
       };
     },
-    getForm(o) {
-      return a[o];
+    getForm(s) {
+      return a[s];
     },
-    subscribeToForm(o, u) {
-      const i = { callback: u }, c = this.getForm(o);
+    subscribeToForm(s, u) {
+      const i = { callback: u }, c = this.getForm(s);
       return c.subscribers.push(i), {
         unsubscribe: () => {
-          c.subscribers = c.subscribers.filter((b) => b !== i);
+          c.subscribers = c.subscribers.filter((F) => F !== i);
         }
       };
     },
-    registryExtraForm(o, u) {
+    registryExtraForm(s, u) {
       const i = { visualizeEvalueatedForms: u };
-      return o.forEach((c) => {
+      return s.forEach((c) => {
         l.names[c] = !0;
       }), l.subscribers.push(i), {
         unregistry() {
@@ -290,44 +295,44 @@ const D = P({}), B = (n) => {
         }
       };
     },
-    onChange(o, u) {
-      const i = this.getForm(o), c = !L(u, i.startValue);
-      i.isDirty !== c && g(o, c), i.isDirty = c, m?.({ name: o, value: u }), (i.error || d.isSubmitted) && (i.error = i.validate(u) || null), i.value = u, i.rerender(), i.subscribers.forEach(({ callback: b }) => {
-        b();
+    onChange(s, u) {
+      const i = this.getForm(s), c = !L(u, i.startValue);
+      i.isDirty !== c && g(s, c), i.isDirty = c, x?.({ name: s, value: u }), (i.error || d.isSubmitted) && (i.error = i.validate(u) || null), i.value = u, i.rerender(), i.subscribers.forEach(({ callback: F }) => {
+        F();
       });
     }
   };
 }, Q = (n, r) => {
   const e = T(null);
   e.current === null && (e.current = H(n, r));
-  const s = e.current;
+  const o = e.current;
   return p(() => {
     e.current && (e.current.submitRef.onSubmit = r.onSubmit);
   }, [r.onSubmit]), {
-    manager: s,
+    manager: o,
     useValue: (t) => B(t),
     reset: (t, f = {}) => {
-      s.reset(t, f);
+      o.reset(t, f);
     },
     setFocus: (t) => {
-      s.setFocus(t);
+      o.setFocus(t);
     },
     setError: (t, f) => {
-      s.setError(t, f);
+      o.setError(t, f);
     },
     setValue: (t, f) => {
-      s.setValue(t, f);
+      o.setValue(t, f);
     },
-    getValues: () => s.getValues(),
+    getValues: () => o.getValues(),
     handleSubmit: async () => {
-      await s.handleSubmit();
+      await o.handleSubmit();
     }
   };
 }, U = ({ manager: n }) => (A(() => {
   n.activate();
 }, []), p(() => () => {
   n.disactivate();
-}, []), /* @__PURE__ */ v(D.Provider, { value: n, children: /* @__PURE__ */ v(E, { scheme: n.scheme, path: [] }) })), S = (n) => {
+}, []), /* @__PURE__ */ h(D.Provider, { value: n, children: /* @__PURE__ */ h(C, { scheme: n.scheme, path: [] }) })), S = (n) => {
   try {
     n();
   } catch (r) {
@@ -342,26 +347,26 @@ const D = P({}), B = (n) => {
     };
   }
 }, W = (n) => (r, e) => {
-  const s = n.getRequireCheck(e), { $rules: t = {}, ...f } = e, { validate: h, required: m } = t;
+  const o = n.getRequireCheck(e), { $rules: t = {}, ...f } = e, { validate: b, required: x } = t;
   return {
     type: "form",
     name: r,
     defaultValue: n.defaultValue,
     Form: n.getForm(f),
     validate: (y) => {
-      if (m) {
-        const F = S(() => s(y));
-        if (F)
-          return F;
-        if (h) {
-          const d = S(() => h(y));
+      if (x) {
+        const v = S(() => o(y));
+        if (v)
+          return v;
+        if (b) {
+          const d = S(() => b(y));
           if (d)
             return d;
         }
         return;
       }
-      if (h && !S(() => s(y))) {
-        const d = S(() => h(y));
+      if (b && !S(() => o(y))) {
+        const d = S(() => b(y));
         if (d)
           return d;
       }
@@ -376,7 +381,7 @@ const D = P({}), B = (n) => {
   getController: r
 }) => ({
   type: "extra",
-  items: n((e) => (s) => ({ type: "registry", name: e, getForm: s })),
+  items: n((e) => (o) => ({ type: "registry", name: e, getForm: o })),
   getController: r
 }), Z = (n) => (...r) => ({
   type: "context",

package/dist/index.d.ts

@@ -6,3 +6,4 @@ export { Condition, Context } from './core/builders/syntax';
 export type { FieldError } from './core/types';
 export type { FormManager } from './manager/manager';
 export type { FormControl } from './core/builders/create-form';
+export type { GetDefaultValues } from './useForm';

package/dist/manager/manager.d.ts

@@ -44,6 +44,7 @@ export interface FormManager<Values, FlattenValues, ClonedValues> {
     setValue: <K extends keyof FlattenValues>(name: K, value: FlattenValues[K]) => void;
     setError: SetError<FlattenValues>;
     reset: (v: DeepPartial<ClonedValues>, options: ResetOptions) => void;
+    setAsDefault: () => void;
     getValues: () => DeepPartial<ClonedValues>;
 }
 export declare const createFormManager: <Values extends FieldValues, Flatten, Cloned>(scheme: SchemeItems.All[], options: MainOptions<Values, Flatten, Cloned>) => FormManager<Values, Flatten, Cloned>;

package/dist/useForm.d.ts

@@ -32,6 +32,7 @@ export interface MainOptions<Values extends FieldValues, FlattenValues, ClonedVa
     onFormDirty?: (isDirty: boolean) => void;
     onSubmit: (values: Values, callbacks: SubmitCallbacls<FlattenValues>) => Promise<void>;
 }
+export type GetDefaultValues<Items extends SchemeItems.All[]> = DeepPartial<ExtractValues<Items[number]>>;
 declare const useDynamicForm: (scheme: SchemeItems.All[], opts: MainOptions<FieldValues, FieldValues, FieldValues>) => {
     manager: FormManager<FieldValues, FieldValues, FieldValues>;
     useValue: <K extends string>(name: K) => any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@companix/formkit",
-  "version": "0.0.12",
+  "version": "0.0.15",
   "module": "./dist/bundle.es.js",
   "types": "./dist/index.d.ts",
   "type": "module",