@companix/formkit 0.0.18 → 0.0.20

package/dist/bundle.es.js

@@ -39,12 +39,12 @@ const D = M({}), q = (n) => {
   S(() => () => {
     t();
   }, []);
-  const { value: g, error: m } = s.getForm(e);
+  const { value: b, error: x } = s.getForm(e);
   return /* @__PURE__ */ h(
     n,
     {
       field: {
-        value: g,
+        value: b,
         onChange: (y) => {
           s.onChange(e, y);
         },
@@ -53,27 +53,27 @@ const D = M({}), q = (n) => {
         ref: f
       },
       isDirty: !1,
-      error: m,
+      error: x,
       disabled: s.disabled
     }
   );
 }, z = ({ item: n, path: e }) => {
   const { getController: r, items: s } = n, t = R(D), f = p(() => {
     const l = {};
-    return s.forEach(({ name: b, getForm: o }) => {
-      l[b] = o(b, () => a(b));
+    return s.forEach(({ name: g, getForm: o }) => {
+      l[g] = o(g, () => a(g));
     }), l;
-  }, []), g = A(() => {
+  }, []), b = A(() => {
     const l = [];
-    return s.forEach(({ name: b }) => {
-      t.getForm([...e, b].join(".")).value !== void 0 && l.push(b);
+    return s.forEach(({ name: g }) => {
+      t.getForm([...e, g].join(".")).value !== void 0 && l.push(g);
     }), l;
-  }, []), m = p(() => g(), []), [y, v] = w(m);
+  }, []), x = p(() => b(), []), [y, v] = w(x);
   S(() => {
     const { unregistry: l } = t.registryExtraForm(
-      s.map(({ name: b }) => [...e, b].join(".")),
+      s.map(({ name: g }) => [...e, g].join(".")),
       () => {
-        v(g());
+        v(b());
       }
     );
     return () => {
@@ -82,16 +82,16 @@ const D = M({}), q = (n) => {
   }, []);
   const d = A(
     (l) => {
-      f[l] && !y.includes(l) && v((b) => [...b, l]);
+      f[l] && !y.includes(l) && v((g) => [...g, l]);
     },
     [y]
   ), a = A((l) => {
-    v((b) => b.filter((o) => o !== l));
+    v((g) => g.filter((o) => o !== l));
   }, []);
   return /* @__PURE__ */ B(j, { children: [
     y.map((l) => {
-      const b = f[l];
-      return /* @__PURE__ */ h(C, { path: e, scheme: [b] }, `param-form--${l}`);
+      const g = f[l];
+      return /* @__PURE__ */ h(C, { path: e, scheme: [g] }, `param-form--${l}`);
     }),
     r(d, y)
   ] });
@@ -127,8 +127,8 @@ const D = M({}), q = (n) => {
       V(t.childs, e, r, s);
       return;
     }
-    t.type === "extra" && t.items.forEach(({ getForm: f, name: g }) => {
-      V([f(g, () => {
+    t.type === "extra" && t.items.forEach(({ getForm: f, name: b }) => {
+      V([f(b, () => {
       })], e, r, s);
     });
   });
@@ -158,8 +158,8 @@ const D = M({}), q = (n) => {
         return;
       }
     }
-    t.type === "extra" && t.items.forEach(({ getForm: f, name: g }) => {
-      E({ scheme: [f(g, () => {
+    t.type === "extra" && t.items.forEach(({ getForm: f, name: b }) => {
+      E({ scheme: [f(b, () => {
       })], path: r, values: e, forms: s });
     });
   });
@@ -167,7 +167,7 @@ const D = M({}), q = (n) => {
   const r = {};
   return E({ scheme: n, path: [], values: r, forms: e }), r;
 }, G = (n, e) => {
-  const { onSubmit: r, onEqual: s, disabled: t, onDirty: f, onFormDirty: g, onChangeEvent: m, defaultValues: y } = e, v = { onSubmit: r }, d = {
+  const { onSubmit: r, onEqual: s, disabled: t, onDirty: f, onFormDirty: b, onChangeEvent: x, defaultValues: y } = e, v = { onSubmit: r }, d = {
     isActive: !1,
     isSubmitted: !1,
     dirtyCount: 0
@@ -175,13 +175,13 @@ const D = M({}), q = (n) => {
     subscribers: [],
     names: {}
   };
-  V(n, [], y ?? {}, (o, u, i) => {
-    a[u] = {
+  V(n, [], y ?? {}, (o, i, u) => {
+    a[i] = {
       error: null,
       isDirty: !1,
-      value: i,
+      value: u,
       // текущее (динамическое) состояние поля. Значение равно переданному дефолтному, либо: определяется как дефолтное значение компонента формы в момент его монтирования, а до этого - undefined.
-      startValue: i ?? o.defaultValue,
+      startValue: u ?? o.defaultValue,
       // начальное (стартовое) значение (равно переданному дефолтному, либо значению формы по умолчанию). Исходя из сравнения текущего значения со стартовым, можно понять, модифицированно ли поле
       defaultValue: o.defaultValue,
       // дефолтное значение компонента формы
@@ -191,8 +191,8 @@ const D = M({}), q = (n) => {
       validate: o.validate
     };
   });
-  const b = (o, u) => {
-    f?.({ name: o, isDirty: u }), u && d.dirtyCount === 0 && g?.(!0), !u && d.dirtyCount === 1 && g?.(!1), d.dirtyCount += u ? 1 : -1;
+  const g = (o, i) => {
+    f?.({ name: o, isDirty: i }), i && d.dirtyCount === 0 && b?.(!0), !i && d.dirtyCount === 1 && b?.(!1), d.dirtyCount += i ? 1 : -1;
   };
   return {
     submitRef: v,
@@ -204,20 +204,20 @@ const D = M({}), q = (n) => {
     disactivate() {
       d.isActive = !1;
     },
-    setError(o, u) {
-      const i = this.getForm(o);
-      i && (i.error = {
+    setError(o, i) {
+      const u = this.getForm(o);
+      u && (u.error = {
         error: !0,
-        messages: [u.message]
-      }, i.rerender());
+        messages: [i.message]
+      }, u.rerender());
     },
     setFocus(o) {
-      const u = this.getForm(o);
-      u && u.focus && u.focus();
-    },
-    setValue(o, u) {
       const i = this.getForm(o);
-      i && i.value !== u && this.onChange(o, u);
+      i && i.focus && i.focus();
+    },
+    setValue(o, i) {
+      const u = this.getForm(o);
+      u && u.value !== i && this.onChange(o, i);
     },
     getValues() {
       return T(n, a);
@@ -226,43 +226,43 @@ const D = M({}), q = (n) => {
       if (t)
         return;
       d.isSubmitted = !0;
-      let o = !1, u = !1;
-      for (const i in a) {
-        const c = a[i];
+      let o = !1, i = !1;
+      for (const u in a) {
+        const c = a[u];
         if (c.value !== void 0) {
           const F = c.validate(c.value);
-          F && (u = !0, c.error = F, c.rerender(), !o && c.focus && (c.focus(), o = !0));
+          F && (i = !0, c.error = F, c.rerender(), !o && c.focus && (c.focus(), o = !0));
         }
       }
-      if (!u) {
+      if (!i) {
         if (d.dirtyCount === 0) {
           s?.();
           return;
         }
-        const i = T(n, a);
-        await v.onSubmit(i, {
+        const u = T(n, a);
+        await v.onSubmit(u, {
           setError: (c, F) => {
-            const x = this.getForm(c);
-            x.error = {
+            const m = this.getForm(c);
+            m.error = {
               error: !0,
               messages: [F.message]
-            }, x.rerender();
+            }, m.rerender();
           }
         });
       }
     },
-    reset(o, { asDirty: u }) {
-      V(n, [], o, (i, c, F) => {
+    reset(o, { asDirty: i }) {
+      V(n, [], o, (u, c, F) => {
         if (F === void 0 && a[c].value === void 0)
           return;
         if (l.names[c] && F === void 0) {
           a[c].value = void 0;
           return;
         }
-        const x = F ?? i.defaultValue;
-        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();
+        const m = F ?? u.defaultValue;
+        i || (a[c].startValue = m, a[c].isDirty = !1), a[c].value !== m && this.onChange(c, m);
+      }), i || (d.dirtyCount = 0, d.isSubmitted = !1), l.subscribers.forEach(({ visualizeEvalueatedForms: u }) => {
+        u();
       });
     },
     setAsDefault() {
@@ -270,14 +270,14 @@ const D = M({}), q = (n) => {
         a[o].startValue = a[o].value, a[o].isDirty = !1;
       }), d.dirtyCount = 0, d.isSubmitted = !1;
     },
-    registry(o, u) {
-      return a[o].rerender = u, a[o].value === void 0 && (a[o].value = a[o].defaultValue), {
+    registry(o, i) {
+      return a[o].rerender = i, a[o].value === void 0 && (a[o].value = a[o].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 && b(o, i), a[o].isDirty = i;
+            const u = !L(a[o].startValue, a[o].defaultValue);
+            a[o].isDirty !== u && g(o, u), a[o].isDirty = u;
           }
         }
       };
@@ -285,26 +285,28 @@ const D = M({}), q = (n) => {
     getForm(o) {
       return a[o];
     },
-    subscribeToForm(o, u) {
-      const i = { callback: u }, c = this.getForm(o);
-      return c.subscribers.push(i), () => {
-        c.subscribers = c.subscribers.filter((F) => F !== i);
+    subscribeToForm(o, i) {
+      const u = { callback: i }, c = this.getForm(o);
+      return c.subscribers.push(u), () => {
+        c.subscribers = c.subscribers.filter((F) => F !== u);
       };
     },
-    registryExtraForm(o, u) {
-      const i = { visualizeEvalueatedForms: u };
+    registryExtraForm(o, i) {
+      const u = { visualizeEvalueatedForms: i };
       return o.forEach((c) => {
         l.names[c] = !0;
-      }), l.subscribers.push(i), {
+      }), l.subscribers.push(u), {
         unregistry() {
-          l.subscribers = l.subscribers.filter((c) => c !== i);
+          l.subscribers = l.subscribers.filter((c) => c !== u);
         }
       };
     },
-    onChange(o, u) {
-      const i = this.getForm(o), c = !L(u, i.startValue);
-      i.isDirty !== c && b(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: F }) => {
-        F(u);
+    onChange(o, i) {
+      const u = this.getForm(o), c = !L(i, u.startValue);
+      u.isDirty !== c && g(o, c), u.isDirty = c, x?.({ name: o, value: i }), (u.error || d.isSubmitted) && (u.error = u.validate(i) || null);
+      const F = u.value;
+      u.value = i, u.rerender(), u.subscribers.forEach(({ callback: m }) => {
+        m(i, F);
       });
     }
   };
@@ -332,6 +334,7 @@ const D = M({}), q = (n) => {
     setValue: (t, f) => {
       s.setValue(t, f);
     },
+    getValue: (t) => s.getForm(t).value,
     getValues: () => s.getValues(),
     handleSubmit: async () => {
       await s.handleSubmit();
@@ -358,26 +361,26 @@ const D = M({}), q = (n) => {
     };
   }
 }, X = (n) => (e, r) => {
-  const s = n.getRequireCheck(r), { $rules: t = {}, ...f } = r, { validate: g, required: m } = t;
+  const s = n.getRequireCheck(r), { $rules: t = {}, ...f } = r, { validate: b, required: x } = t;
   return {
     type: "form",
     name: e,
     defaultValue: n.defaultValue,
     Form: n.getForm(f),
     validate: (y) => {
-      if (m) {
+      if (x) {
         const v = $(() => s(y));
         if (v)
           return v;
-        if (g) {
-          const d = $(() => g(y));
+        if (b) {
+          const d = $(() => b(y));
           if (d)
             return d;
         }
         return;
       }
-      if (g && !$(() => s(y))) {
-        const d = $(() => g(y));
+      if (b && !$(() => s(y))) {
+        const d = $(() => b(y));
         if (d)
           return d;
       }

package/dist/manager/manager.d.ts

@@ -11,7 +11,7 @@ interface FormItem {
     focus?: () => void;
     validate: (value: any) => FieldError | void;
     subscribers: {
-        callback: (value: any) => void;
+        callback: (value: any, prevValue: any) => void;
     }[];
 }
 export interface Forms {
@@ -32,7 +32,7 @@ export interface FormManager<Values, FlattenValues, ClonedValues> {
     registry: (name: string, callback: () => void) => {
         unregistry: () => void;
     };
-    subscribeToForm: <K extends keyof FlattenValues>(name: K & string, callback: (value: FlattenValues[K]) => void) => () => void;
+    subscribeToForm: <K extends keyof FlattenValues>(name: K & string, callback: (value: FlattenValues[K], prevValue: FlattenValues[K]) => void) => () => void;
     registryExtraForm: (names: string[], callback: () => void) => {
         unregistry: () => void;
     };

package/dist/useForm.d.ts

@@ -45,11 +45,12 @@ declare const useDynamicForm: (scheme: SchemeItems.All[], opts: MainOptions<Fiel
         message: string;
     }) => void;
     setValue: <K extends string>(name: K, value: any) => void;
+    getValue: <K extends string>(name: K) => any;
     getValues: () => {
         [x: string]: any;
     };
     handleSubmit: () => Promise<void>;
-    subscribe: <K extends string>(name: K, callback: (value: any) => void) => () => void;
+    subscribe: <K extends string>(name: K, callback: (value: any, prevValue: any) => void) => () => void;
 };
 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>;
@@ -61,9 +62,10 @@ declare const useForm: <Items extends SchemeItems.All[], Values extends ExtractV
         message: string;
     }) => void;
     setValue: <K extends keyof FlattenValues>(name: K, value: FlattenValues[K]) => void;
+    getValue: <K extends keyof FlattenValues>(name: K & string) => FlattenValues[K];
     getValues: () => DeepPartial<Cloned>;
     handleSubmit: () => Promise<void>;
-    subscribe: <K extends keyof FlattenValues>(name: K & string, callback: (value: FlattenValues[K]) => void) => () => void;
+    subscribe: <K extends keyof FlattenValues>(name: K & string, callback: (value: FlattenValues[K], prevValue: FlattenValues[K]) => void) => () => void;
 };
 interface Props {
     manager: FormManager<any, any, any>;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@companix/formkit",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "module": "./dist/bundle.es.js",
   "types": "./dist/index.d.ts",
   "type": "module",
-  "author": "Pavel Victorov.",
+  "author": "Pavel Victorov",
   "files": [
     "dist"
   ],