@companix/formkit 0.0.10 → 0.0.12

package/dist/bundle.es.js

@@ -1,9 +1,9 @@
 import { jsx as v, Fragment as j, jsxs as M } from "react/jsx-runtime";
-import { createContext as P, useState as R, useContext as q, useEffect as C, useMemo as A, useCallback as $, useRef as T } from "react";
+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);
-  return C(() => {
+  return p(() => {
     const { unsubscribe: t } = e.subscribeToForm(n, () => {
       r([]);
     });
@@ -14,81 +14,81 @@ const D = P({}), B = (n) => {
 }, N = ({ canActivate: n, name: r, children: e }) => {
   const s = B(r);
   return n(s) ? /* @__PURE__ */ v(j, { children: e }) : null;
-}, _ = ({ item: { Form: n }, name: r }) => {
+}, z = ({ item: { Form: n }, name: r }) => {
   const [, e] = R([]), s = q(D), { unregistry: t } = A(() => s.registry(r, () => {
     e([]);
-  }), []), l = $(
-    (d) => {
-      if (d && d.focus) {
-        const m = s.getForm(r);
-        m.focus = () => {
-          d.focus();
+  }), []), f = $(
+    (y) => {
+      if (y && y.focus) {
+        const F = s.getForm(r);
+        F.focus = () => {
+          y.focus();
         };
       }
     },
     [r]
   );
-  C(() => () => {
+  p(() => () => {
     t();
   }, []);
-  const { value: h, error: F } = s.getForm(r);
+  const { value: h, error: m } = s.getForm(r);
   return /* @__PURE__ */ v(
     n,
     {
       field: {
         value: h,
-        onChange: (d) => {
-          s.onChange(r, d);
+        onChange: (y) => {
+          s.onChange(r, y);
         },
         onBlur: () => {
         },
-        ref: l
+        ref: f
       },
       isDirty: !1,
-      error: F,
+      error: m,
       disabled: s.disabled
     }
   );
-}, z = ({ item: n, path: r }) => {
-  const { getController: e, items: s } = n, t = q(D), l = A(() => {
-    const a = {};
+}, G = ({ item: n, path: r }) => {
+  const { getController: e, items: s } = n, t = q(D), f = A(() => {
+    const l = {};
     return s.forEach(({ name: g, getForm: o }) => {
-      a[g] = o(g, () => f(g));
-    }), a;
+      l[g] = o(g, () => a(g));
+    }), l;
   }, []), h = $(() => {
-    const a = [];
+    const l = [];
     return s.forEach(({ name: g }) => {
-      t.getForm([...r, g].join(".")).value !== void 0 && a.push(g);
-    }), a;
-  }, []), F = A(() => h(), []), [d, m] = R(F);
-  C(() => {
-    const { unregistry: a } = t.registryExtraForm(
+      t.getForm([...r, g].join(".")).value !== void 0 && l.push(g);
+    }), l;
+  }, []), m = A(() => h(), []), [y, F] = R(m);
+  p(() => {
+    const { unregistry: l } = t.registryExtraForm(
       s.map(({ name: g }) => [...r, g].join(".")),
       () => {
-        m(h());
+        F(h());
       }
     );
     return () => {
-      a();
+      l();
     };
   }, []);
-  const y = $(
-    (a) => {
-      l[a] && !d.includes(a) && m((g) => [...g, a]);
+  const d = $(
+    (l) => {
+      f[l] && !y.includes(l) && F((g) => [...g, l]);
     },
-    [d]
-  ), f = $((a) => {
-    m((g) => g.filter((o) => o !== a));
+    [y]
+  ), a = $((l) => {
+    F((g) => g.filter((o) => o !== l));
   }, []);
   return /* @__PURE__ */ M(j, { children: [
-    d.map((a) => {
-      const g = l[a];
-      return /* @__PURE__ */ v(V, { path: r, scheme: [g] }, `param-form--${a}`);
+    y.map((l) => {
+      const g = f[l];
+      return /* @__PURE__ */ v(E, { path: r, scheme: [g] }, `param-form--${l}`);
     }),
-    e(y, d)
+    e(d, y)
   ] });
-}, V = ({ scheme: n, path: r }) => /* @__PURE__ */ v(j, { children: n.map((e, s) => e.type === "layout" ? /* @__PURE__ */ v(e.Layout, { children: /* @__PURE__ */ v(V, { path: r, scheme: e.childs }) }, `layout-form--${s}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ v(
-  V,
+}, 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,
   {
     path: [...r, e.context],
     scheme: e.childs
@@ -99,39 +99,39 @@ const D = P({}), B = (n) => {
   {
     name: e.depended,
     canActivate: e.canActivate,
-    children: /* @__PURE__ */ v(V, { path: r, scheme: e.childs })
+    children: /* @__PURE__ */ v(E, { path: r, scheme: e.childs })
   },
   `condition--${s}-${e.depended}-${r.length}`
-) : e.type === "extra" ? /* @__PURE__ */ v(z, { path: r, item: e }, `partial-item--${s}-${r.length}`) : /* @__PURE__ */ v(
-  _,
+) : e.type === "extra" ? /* @__PURE__ */ v(G, { path: r, item: e }, `partial-item--${s}-${r.length}`) : /* @__PURE__ */ v(
+  z,
   {
     name: [...r, e.name].join("."),
     item: e
   },
   `form-item--${s}-${e.name}-${r.length}`
-)) }), p = (n, r, e, s) => {
+)) }), C = (n, r, e, s) => {
   n.forEach((t) => {
     if (t.type === "form" && s(t, [...r, t.name].join("."), e[t.name]), t.type === "context") {
-      p(t.childs, [...r, t.context], e[t.context] ?? {}, s);
+      C(t.childs, [...r, t.context], e[t.context] ?? {}, s);
       return;
     }
     if (t.type === "layout" || t.type === "condition") {
-      p(t.childs, r, e, s);
+      C(t.childs, r, e, s);
       return;
     }
-    t.type === "extra" && t.items.forEach(({ getForm: l, name: h }) => {
-      p([l(h, () => {
+    t.type === "extra" && t.items.forEach(({ getForm: f, name: h }) => {
+      C([f(h, () => {
       })], r, e, s);
     });
   });
-}, E = ({ scheme: n, values: r, path: e, forms: s }) => {
+}, V = ({ scheme: n, values: r, path: e, forms: s }) => {
   n.forEach((t) => {
     if (t.type === "form") {
-      const l = [...e, t.name].join(".");
-      s[l].value !== void 0 && (r[t.name] = s[l].value);
+      const f = [...e, t.name].join(".");
+      s[f].value !== void 0 && (r[t.name] = s[f].value);
     }
     if (t.type === "context") {
-      r[t.context] = {}, E({
+      r[t.context] = {}, V({
         scheme: t.childs,
         path: [...e, t.context],
         values: r[t.context],
@@ -140,40 +140,43 @@ const D = P({}), B = (n) => {
       return;
     }
     if (t.type === "layout") {
-      E({ scheme: t.childs, path: e, values: r, forms: s });
+      V({ scheme: t.childs, path: e, values: r, forms: s });
       return;
     }
     if (t.type === "condition") {
-      const l = s[t.depended]?.value;
-      if (t.canActivate(l)) {
-        E({ scheme: t.childs, path: e, values: r, forms: s });
+      const f = s[t.depended]?.value;
+      if (t.canActivate(f)) {
+        V({ scheme: t.childs, path: e, values: r, forms: s });
         return;
       }
     }
-    t.type === "extra" && t.items.forEach(({ getForm: l, name: h }) => {
-      E({ scheme: [l(h, () => {
+    t.type === "extra" && t.items.forEach(({ getForm: f, name: h }) => {
+      V({ scheme: [f(h, () => {
       })], path: e, values: r, forms: s });
     });
   });
 }, w = (n, r) => {
   const e = {};
-  return E({ scheme: n, path: [], values: e, forms: r }), e;
-}, G = (n, r) => {
-  const { onSubmit: e, onEqual: s, disabled: t, onDirty: l, onFormDirty: h, onChangeEvent: F, defaultValues: d } = r, m = { onSubmit: e }, y = {
+  return V({ 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 = {
     isActive: !1,
     isSubmitted: !1,
     dirtyCount: 0
-  }, f = {}, a = {
+  }, a = {}, l = {
     subscribers: [],
     names: {}
   };
-  p(n, [], d ?? {}, (o, u, i) => {
-    f[u] = {
+  C(n, [], y ?? {}, (o, u, i) => {
+    a[u] = {
       error: null,
       isDirty: !1,
       value: i,
-      initValue: i ?? o.defaultValue,
+      // текущее (динамическое) состояние поля. Значение равно переданному дефолтному, либо: определяется как дефолтное значение компонента формы в момент его монтирования, а до этого - undefined.
+      startValue: i ?? o.defaultValue,
+      // начальное (стартовое) значение (равно переданному дефолтному, либо значению формы по умолчанию). Исходя из сравнения текущего значения со стартовым, можно понять, модифицированно ли поле
       defaultValue: o.defaultValue,
+      // дефолтное значение компонента формы
       rerender: () => {
       },
       subscribers: [],
@@ -181,17 +184,17 @@ const D = P({}), B = (n) => {
     };
   });
   const g = (o, u) => {
-    l?.({ name: o, isDirty: u }), u && y.dirtyCount === 0 && h?.(!0), !u && y.dirtyCount === 1 && h?.(!1), y.dirtyCount += u ? 1 : -1;
+    f?.({ name: o, isDirty: u }), u && d.dirtyCount === 0 && h?.(!0), !u && d.dirtyCount === 1 && h?.(!1), d.dirtyCount += u ? 1 : -1;
   };
   return {
-    submitRef: m,
+    submitRef: F,
     scheme: n,
     disabled: t,
     activate() {
-      y.isActive = !0;
+      d.isActive = !0;
     },
     disactivate() {
-      y.isActive = !1;
+      d.isActive = !1;
     },
     setError(o, u) {
       const i = this.getForm(o);
@@ -209,27 +212,27 @@ const D = P({}), B = (n) => {
       i && i.value !== u && this.onChange(o, u);
     },
     getValues() {
-      return w(n, f);
+      return w(n, a);
     },
     async handleSubmit() {
       if (t)
         return;
-      y.isSubmitted = !0;
+      d.isSubmitted = !0;
       let o = !1, u = !1;
-      for (const i in f) {
-        const c = f[i];
+      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));
         }
       }
       if (!u) {
-        if (y.dirtyCount === 0) {
+        if (d.dirtyCount === 0) {
           s?.();
           return;
         }
-        const i = w(n, f);
-        await m.onSubmit(i, {
+        const i = w(n, a);
+        await F.onSubmit(i, {
           setError: (c, b) => {
             const x = this.getForm(c);
             x.error = {
@@ -240,35 +243,34 @@ const D = P({}), B = (n) => {
         });
       }
     },
-    reset(o) {
-      const u = [];
-      p(n, [], o, (i, c, b) => {
-        if (b === void 0 && f[c].value === void 0)
+    reset(o, { asDirty: u }) {
+      C(n, [], o, (i, c, b) => {
+        if (b === void 0 && a[c].value === void 0)
           return;
-        if (a.names[c] && b === void 0) {
-          u.push(c), f[c].value = b;
+        if (l.names[c] && b === void 0) {
+          a[c].value = b;
           return;
         }
         const x = b ?? i.defaultValue;
-        f[c].value !== x && (u.push(c), this.onChange(c, x));
-      }), u.some((i) => a.names[i]) && a.subscribers.forEach(({ callback: i }) => {
+        u || (a[c].startValue = x, a[c].isDirty = !1), a[c].value !== x && this.onChange(c, x);
+      }), u || (d.dirtyCount = 0, d.isSubmitted = !1), l.subscribers.forEach(({ visualizeEvalueatedForms: i }) => {
         i();
       });
     },
     registry(o, u) {
-      return f[o].rerender = u, f[o].value === void 0 && (f[o].value = f[o].defaultValue), {
+      return a[o].rerender = u, a[o].value === void 0 && (a[o].value = a[o].defaultValue), {
         unregistry() {
-          if (f[o].rerender = () => {
-          }, f[o].focus = void 0, y.isActive) {
-            f[o].value = void 0;
-            const i = !L(f[o].defaultValue, f[o].initValue);
-            f[o].isDirty !== i && g(o, i), f[o].isDirty = i;
+          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;
           }
         }
       };
     },
     getForm(o) {
-      return f[o];
+      return a[o];
     },
     subscribeToForm(o, u) {
       const i = { callback: u }, c = this.getForm(o);
@@ -279,53 +281,53 @@ const D = P({}), B = (n) => {
       };
     },
     registryExtraForm(o, u) {
-      const i = { callback: u };
+      const i = { visualizeEvalueatedForms: u };
       return o.forEach((c) => {
-        a.names[c] = !0;
-      }), a.subscribers.push(i), {
+        l.names[c] = !0;
+      }), l.subscribers.push(i), {
         unregistry() {
-          a.subscribers = a.subscribers.filter((c) => c !== i);
+          l.subscribers = l.subscribers.filter((c) => c !== i);
         }
       };
     },
     onChange(o, u) {
-      const i = this.getForm(o), c = !L(u, i.initValue);
-      i.isDirty !== c && g(o, c), i.isDirty = c, F?.({ name: o, value: u }), (i.error || y.isSubmitted) && (i.error = i.validate(u) || null), i.value = u, i.rerender(), i.subscribers.forEach(({ callback: b }) => {
+      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();
       });
     }
   };
-}, O = (n, r) => {
+}, Q = (n, r) => {
   const e = T(null);
-  e.current === null && (e.current = G(n, r));
+  e.current === null && (e.current = H(n, r));
   const s = e.current;
-  return C(() => {
+  return p(() => {
     e.current && (e.current.submitRef.onSubmit = r.onSubmit);
   }, [r.onSubmit]), {
     manager: s,
     useValue: (t) => B(t),
-    reset: (t) => {
-      s.reset(t);
+    reset: (t, f = {}) => {
+      s.reset(t, f);
     },
     setFocus: (t) => {
       s.setFocus(t);
     },
-    setError: (t, l) => {
-      s.setError(t, l);
+    setError: (t, f) => {
+      s.setError(t, f);
     },
-    setValue: (t, l) => {
-      s.setValue(t, l);
+    setValue: (t, f) => {
+      s.setValue(t, f);
     },
     getValues: () => s.getValues(),
     handleSubmit: async () => {
       await s.handleSubmit();
     }
   };
-}, Q = ({ manager: n }) => (A(() => {
+}, U = ({ manager: n }) => (A(() => {
   n.activate();
-}, []), C(() => () => {
+}, []), p(() => () => {
   n.disactivate();
-}, []), /* @__PURE__ */ v(D.Provider, { value: n, children: /* @__PURE__ */ v(V, { scheme: n.scheme, path: [] }) })), S = (n) => {
+}, []), /* @__PURE__ */ v(D.Provider, { value: n, children: /* @__PURE__ */ v(E, { scheme: n.scheme, path: [] }) })), S = (n) => {
   try {
     n();
   } catch (r) {
@@ -339,59 +341,59 @@ const D = P({}), B = (n) => {
       error: !0
     };
   }
-}, U = (n) => (r, e) => {
-  const s = n.getRequireCheck(e), { $rules: t = {}, ...l } = e, { validate: h, required: F } = t;
+}, W = (n) => (r, e) => {
+  const s = n.getRequireCheck(e), { $rules: t = {}, ...f } = e, { validate: h, required: m } = t;
   return {
     type: "form",
     name: r,
     defaultValue: n.defaultValue,
-    Form: n.getForm(l),
-    validate: (d) => {
-      if (F) {
-        const m = S(() => s(d));
-        if (m)
-          return m;
+    Form: n.getForm(f),
+    validate: (y) => {
+      if (m) {
+        const F = S(() => s(y));
+        if (F)
+          return F;
         if (h) {
-          const y = S(() => h(d));
-          if (y)
-            return y;
+          const d = S(() => h(y));
+          if (d)
+            return d;
         }
         return;
       }
-      if (h && !S(() => s(d))) {
-        const y = S(() => h(d));
-        if (y)
-          return y;
+      if (h && !S(() => s(y))) {
+        const d = S(() => h(y));
+        if (d)
+          return d;
       }
     }
   };
-}, W = (n) => (r) => (...e) => ({
+}, X = (n) => (r) => (...e) => ({
   type: "layout",
   Layout: n(r),
   childs: e
-}), X = ({
+}), Y = ({
   getItems: n,
   getController: r
 }) => ({
   type: "extra",
   items: n((e) => (s) => ({ type: "registry", name: e, getForm: s })),
   getController: r
-}), Y = (n) => (...r) => ({
+}), Z = (n) => (...r) => ({
   type: "context",
   context: n,
   childs: r
-}), Z = (n, r) => (...e) => ({
+}), _ = (n, r) => (...e) => ({
   type: "condition",
   depended: n,
   canActivate: r.canActivate,
   childs: e
 });
 export {
-  Z as Condition,
-  Y as Context,
-  Q as FormLayout,
-  X as createExtraForm,
-  U as createForm,
-  W as createLayout,
-  O as useForm
+  _ as Condition,
+  Z as Context,
+  U as FormLayout,
+  Y as createExtraForm,
+  W as createForm,
+  X as createLayout,
+  Q as useForm
 };

package/dist/index.d.ts

@@ -5,3 +5,4 @@ export { createExtraForm } from './core/builders/create-extra-form';
 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';

package/dist/manager/manager.d.ts

@@ -4,7 +4,7 @@ import { MainOptions, SetError, SubmitCallbacls } from '../useForm';
 interface FormItem {
     isDirty: boolean;
     error: FieldError | null;
-    initValue: any;
+    startValue: any;
     defaultValue: any;
     value: any;
     rerender: () => void;
@@ -17,6 +17,9 @@ interface FormItem {
 export interface Forms {
     [name: string]: FormItem;
 }
+export interface ResetOptions {
+    asDirty?: boolean;
+}
 export interface FormManager<Values, FlattenValues, ClonedValues> {
     submitRef: {
         onSubmit: (values: Values, callbacks: SubmitCallbacls<FlattenValues>) => void;
@@ -40,7 +43,7 @@ export interface FormManager<Values, FlattenValues, ClonedValues> {
     setFocus: (name: keyof FlattenValues) => void;
     setValue: <K extends keyof FlattenValues>(name: K, value: FlattenValues[K]) => void;
     setError: SetError<FlattenValues>;
-    reset: (v: DeepPartial<ClonedValues>) => void;
+    reset: (v: DeepPartial<ClonedValues>, options: ResetOptions) => 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

@@ -1,6 +1,6 @@
 import { ExtractValues, ExtractFlatValues } from './core/extract';
 import { SchemeItems } from './core/types';
-import { FormManager } from './manager/manager';
+import { FormManager, ResetOptions } from './manager/manager';
 import { DeepPartial, FieldValues } from './types';
 export type Copy<T> = {
     [K in keyof T]: T[K];
@@ -37,7 +37,7 @@ declare const useDynamicForm: (scheme: SchemeItems.All[], opts: MainOptions<Fiel
     useValue: <K extends string>(name: K) => any;
     reset: (values: {
         [x: string]: any;
-    }) => void;
+    }, options?: ResetOptions) => void;
     setFocus: (name: string) => void;
     setError: (name: string, error: {
         message: string;
@@ -51,7 +51,7 @@ declare const useDynamicForm: (scheme: SchemeItems.All[], opts: MainOptions<Fiel
 declare const useForm: <Items extends SchemeItems.All[], Values extends ExtractValues<Items[number]>, FlattenValues extends ExtractFlatValues<Items[number]>, Cloned extends Copy<Values>>(scheme: Items, opts: MainOptions<Values, FlattenValues, Cloned>) => {
     manager: FormManager<Values, FlattenValues, Cloned>;
     useValue: <K extends keyof FlattenValues>(name: K) => FlattenValues[K];
-    reset: (values: DeepPartial<Cloned>) => void;
+    reset: (values: DeepPartial<Cloned>, options?: ResetOptions) => void;
     setFocus: (name: keyof FlattenValues) => void;
     setError: (name: keyof FlattenValues, error: {
         message: string;

package/package.json

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