@companix/formkit 0.0.6 → 0.0.8

package/dist/SchemeBuilder.d.ts

@@ -2,6 +2,5 @@ import { SchemeItems } from './core/types';
 export interface SchemeBuilderProps {
     scheme: SchemeItems.All[];
     path: string[];
-    className?: string;
 }
-export declare const SchemeBuilder: ({ scheme, path, className }: SchemeBuilderProps) => import("react/jsx-runtime").JSX.Element;
+export declare const SchemeBuilder: ({ scheme, path }: SchemeBuilderProps) => import("react/jsx-runtime").JSX.Element;

package/dist/bundle.es.js

@@ -1,27 +1,27 @@
-import { jsx as h, Fragment as B, jsxs as T } from "react/jsx-runtime";
-import { createContext as N, useState as q, useContext as L, useEffect as D, useMemo as A, useCallback as S, useRef as P } from "react";
-import R from "fast-deep-equal";
-const j = N({}), M = (s) => {
-  const [, r] = q([]), o = L(j), t = o.getForm(s);
+import { jsx as b, Fragment as q, jsxs as P } from "react/jsx-runtime";
+import { createContext as T, useState as L, useContext as R, useEffect as D, useMemo as A, useCallback as S, useRef as N } from "react";
+import w from "fast-deep-equal";
+const j = T({}), M = (o) => {
+  const [, r] = L([]), e = R(j), s = e.getForm(o);
   return D(() => {
-    const { unsubscribe: e } = o.subscribeToForm(s, () => {
+    const { unsubscribe: t } = e.subscribeToForm(o, () => {
       r([]);
     });
     return () => {
-      e();
+      t();
     };
-  }, []), t?.value;
-}, _ = ({ canActivate: s, name: r, children: o }) => {
-  const t = M(r);
-  return s(t) ? /* @__PURE__ */ h(B, { children: o }) : null;
-}, z = ({ item: { Form: s }, name: r }) => {
-  const [, o] = q([]), t = L(j), { unregistry: e } = A(() => t.registry(r, () => {
-    o([]);
+  }, []), s?.value;
+}, _ = ({ canActivate: o, name: r, children: e }) => {
+  const s = M(r);
+  return o(s) ? /* @__PURE__ */ b(q, { children: e }) : null;
+}, z = ({ item: { Form: o }, name: r }) => {
+  const [, e] = L([]), s = R(j), { unregistry: t } = A(() => s.registry(r, () => {
+    e([]);
   }), []), l = S(
     (d) => {
       if (d && d.focus) {
-        const v = t.getForm(r);
-        v.focus = () => {
+        const g = s.getForm(r);
+        g.focus = () => {
           d.focus();
         };
       }
@@ -29,144 +29,144 @@ const j = N({}), M = (s) => {
     [r]
   );
   D(() => () => {
-    e();
+    t();
   }, []);
-  const { value: y, error: b } = t.getForm(r);
-  return /* @__PURE__ */ h(
-    s,
+  const { value: y, error: F } = s.getForm(r);
+  return /* @__PURE__ */ b(
+    o,
     {
       field: {
         value: y,
         onChange: (d) => {
-          t.onChange(r, d);
+          s.onChange(r, d);
         },
         onBlur: () => {
         },
         ref: l
       },
       isDirty: !1,
-      error: b,
-      disabled: t.disabled
+      error: F,
+      disabled: s.disabled
     }
   );
-}, G = ({ item: s, path: r }) => {
-  const { getController: o, items: t } = s, e = L(j), l = A(() => {
-    const i = {};
-    return t.forEach(({ name: f, getForm: F }) => {
-      i[f] = F(f, () => x(f));
-    }), i;
+}, G = ({ item: o, path: r }) => {
+  const { getController: e, items: s } = o, t = R(j), l = A(() => {
+    const c = {};
+    return s.forEach(({ name: f, getForm: x }) => {
+      c[f] = x(f, () => p(f));
+    }), c;
   }, []), y = S(() => {
-    const i = [];
-    return t.forEach(({ name: f }) => {
-      e.getForm([...r, f].join(".")).value !== void 0 && i.push(f);
-    }), i;
-  }, []), b = A(() => y(), []), [d, v] = q(b);
+    const c = [];
+    return s.forEach(({ name: f }) => {
+      t.getForm([...r, f].join(".")).value !== void 0 && c.push(f);
+    }), c;
+  }, []), F = A(() => y(), []), [d, g] = L(F);
   D(() => {
-    const { unregistry: i } = e.registryExtraForm(
-      t.map(({ name: f }) => [...r, f].join(".")),
+    const { unregistry: c } = t.registryExtraForm(
+      s.map(({ name: f }) => [...r, f].join(".")),
       () => {
-        v(y());
+        g(y());
       }
     );
     return () => {
-      i();
+      c();
     };
   }, []);
-  const C = S(
-    (i) => {
-      l[i] && !d.includes(i) && v((f) => [...f, i]);
+  const v = S(
+    (c) => {
+      l[c] && !d.includes(c) && g((f) => [...f, c]);
     },
     [d]
-  ), x = S((i) => {
-    v((f) => f.filter((F) => F !== i));
+  ), p = S((c) => {
+    g((f) => f.filter((x) => x !== c));
   }, []);
-  return /* @__PURE__ */ T(B, { children: [
-    d.map((i) => {
-      const f = l[i];
-      return /* @__PURE__ */ h(V, { path: r, scheme: [f] }, `param-form--${i}`);
+  return /* @__PURE__ */ P(q, { children: [
+    d.map((c) => {
+      const f = l[c];
+      return /* @__PURE__ */ b(V, { path: r, scheme: [f] }, `param-form--${c}`);
     }),
-    o(C, d)
+    e(v, d)
   ] });
-}, V = ({ scheme: s, path: r, className: o }) => /* @__PURE__ */ h("div", { className: o, children: s.map((t, e) => t.type === "layout" ? /* @__PURE__ */ h(t.Layout, { children: /* @__PURE__ */ h(V, { path: r, scheme: t.childs }) }, `layout-form--${e}-${r.length}`) : t.type === "context" ? /* @__PURE__ */ h(
+}, V = ({ scheme: o, path: r }) => /* @__PURE__ */ b(q, { children: o.map((e, s) => e.type === "layout" ? /* @__PURE__ */ b(e.Layout, { children: /* @__PURE__ */ b(V, { path: r, scheme: e.childs }) }, `layout-form--${s}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ b(
   V,
   {
-    path: [...r, t.context],
-    scheme: t.childs
+    path: [...r, e.context],
+    scheme: e.childs
   },
-  `context-form--${e}-${t.context}-${r.length}`
-) : t.type === "condition" ? /* @__PURE__ */ h(
+  `context-form--${s}-${e.context}-${r.length}`
+) : e.type === "condition" ? /* @__PURE__ */ b(
   _,
   {
-    name: t.depended,
-    canActivate: t.canActivate,
-    children: /* @__PURE__ */ h(V, { path: r, scheme: t.childs })
+    name: e.depended,
+    canActivate: e.canActivate,
+    children: /* @__PURE__ */ b(V, { path: r, scheme: e.childs })
   },
-  `condition--${e}-${t.depended}-${r.length}`
-) : t.type === "extra" ? /* @__PURE__ */ h(G, { path: r, item: t }, `partial-item--${e}-${r.length}`) : /* @__PURE__ */ h(
+  `condition--${s}-${e.depended}-${r.length}`
+) : e.type === "extra" ? /* @__PURE__ */ b(G, { path: r, item: e }, `partial-item--${s}-${r.length}`) : /* @__PURE__ */ b(
   z,
   {
-    name: [...r, t.name].join("."),
-    item: t
+    name: [...r, e.name].join("."),
+    item: e
   },
-  `form-item--${e}-${t.name}-${r.length}`
-)) }), m = (s, r, o, t) => {
-  s.forEach((e) => {
-    if (e.type === "form" && t(e, [...r, e.name].join("."), o[e.name]), e.type === "context") {
-      m(e.childs, [...r, e.context], o[e.context] ?? {}, t);
+  `form-item--${s}-${e.name}-${r.length}`
+)) }), C = (o, r, e, s) => {
+  o.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);
       return;
     }
-    if (e.type === "layout" || e.type === "condition") {
-      m(e.childs, r, o, t);
+    if (t.type === "layout" || t.type === "condition") {
+      C(t.childs, r, e, s);
       return;
     }
-    e.type === "extra" && e.items.forEach(({ getForm: l, name: y }) => {
-      m([l(y, () => {
-      })], r, o, t);
+    t.type === "extra" && t.items.forEach(({ getForm: l, name: y }) => {
+      C([l(y, () => {
+      })], r, e, s);
     });
   });
-}, E = ({ scheme: s, values: r, path: o, forms: t }) => {
-  s.forEach((e) => {
-    if (e.type === "form") {
-      const l = [...o, e.name].join(".");
-      t[l].value !== void 0 && (r[e.name] = t[l].value);
+}, E = ({ scheme: o, values: r, path: e, forms: s }) => {
+  o.forEach((t) => {
+    if (t.type === "form") {
+      const l = [...e, t.name].join(".");
+      s[l].value !== void 0 && (r[t.name] = s[l].value);
     }
-    if (e.type === "context") {
-      r[e.context] = {}, E({
-        scheme: e.childs,
-        path: [...o, e.context],
-        values: r[e.context],
-        forms: t
+    if (t.type === "context") {
+      r[t.context] = {}, E({
+        scheme: t.childs,
+        path: [...e, t.context],
+        values: r[t.context],
+        forms: s
       });
       return;
     }
-    if (e.type === "layout") {
-      E({ scheme: e.childs, path: o, values: r, forms: t });
+    if (t.type === "layout") {
+      E({ scheme: t.childs, path: e, values: r, forms: s });
       return;
     }
-    if (e.type === "condition") {
-      const l = t[e.depended]?.value;
-      if (e.canActivate(l)) {
-        E({ scheme: e.childs, path: o, values: r, forms: t });
+    if (t.type === "condition") {
+      const l = s[t.depended]?.value;
+      if (t.canActivate(l)) {
+        E({ scheme: t.childs, path: e, values: r, forms: s });
         return;
       }
     }
-    e.type === "extra" && e.items.forEach(({ getForm: l, name: y }) => {
+    t.type === "extra" && t.items.forEach(({ getForm: l, name: y }) => {
       E({ scheme: [l(y, () => {
-      })], path: o, values: r, forms: t });
+      })], path: e, values: r, forms: s });
     });
   });
-}, w = (s, r) => {
-  const o = {};
-  return E({ scheme: s, path: [], values: o, forms: r }), o;
-}, H = (s, r) => {
-  const { onSubmit: o, onEqual: t, disabled: e, onDirty: l, onFormDirty: y, onChangeEvent: b, defaultValues: d } = r;
-  let v = !1, C = !1, x = 0;
-  const i = {}, f = {
+}, B = (o, r) => {
+  const e = {};
+  return E({ scheme: o, path: [], values: e, forms: r }), e;
+}, H = (o, r) => {
+  const { onSubmit: e, onEqual: s, disabled: t, onDirty: l, onFormDirty: y, onChangeEvent: F, defaultValues: d } = r;
+  let g = !1, v = !1, p = 0;
+  const c = {}, f = {
     subscribers: [],
     names: {}
   };
-  m(s, [], d ?? {}, (n, c, u) => {
-    i[c] = {
+  C(o, [], d ?? {}, (n, i, u) => {
+    c[i] = {
       error: null,
       isDirty: !1,
       value: u,
@@ -178,105 +178,105 @@ const j = N({}), M = (s) => {
       validate: n.validate
     };
   });
-  const F = (n, c) => {
-    l?.({ name: n, isDirty: c }), c && x === 0 && y?.(!0), !c && x === 1 && y?.(!1), x += c ? 1 : -1;
+  const x = (n, i) => {
+    l?.({ name: n, isDirty: i }), i && p === 0 && y?.(!0), !i && p === 1 && y?.(!1), p += i ? 1 : -1;
   };
   return {
-    scheme: s,
-    disabled: e,
+    scheme: o,
+    disabled: t,
     activate() {
-      v = !0;
+      g = !0;
     },
     disactivate() {
-      v = !1;
+      g = !1;
     },
-    setError(n, c) {
+    setError(n, i) {
       const u = this.getForm(n);
       u && (u.error = {
         error: !0,
-        messages: [c.message]
+        messages: [i.message]
       }, u.rerender());
     },
     setFocus(n) {
-      const c = this.getForm(n);
-      c && c.focus && c.focus();
+      const i = this.getForm(n);
+      i && i.focus && i.focus();
     },
-    setValue(n, c) {
+    setValue(n, i) {
       const u = this.getForm(n);
-      u && u.value !== c && this.onChange(n, c);
+      u && u.value !== i && this.onChange(n, i);
     },
     getValues() {
-      return w(s, i);
+      return B(o, c);
     },
     async handleSubmit() {
-      if (e)
+      if (t)
         return;
-      C = !0;
-      let n = !1, c = !1;
-      for (const u in i) {
-        const a = i[u];
+      v = !0;
+      let n = !1, i = !1;
+      for (const u in c) {
+        const a = c[u];
         if (a.value !== void 0) {
-          const g = a.validate(a.value);
-          g && (c = !0, a.error = g, a.rerender(), !n && a.focus && (a.focus(), n = !0));
+          const h = a.validate(a.value);
+          h && (i = !0, a.error = h, a.rerender(), !n && a.focus && (a.focus(), n = !0));
         }
       }
-      if (!c) {
-        if (x === 0) {
-          t?.();
+      if (!i) {
+        if (p === 0) {
+          s?.();
           return;
         }
-        const u = w(s, i);
-        await o(u, {
-          setError: (a, g) => {
-            const p = this.getForm(a);
-            p.error = {
+        const u = B(o, c);
+        await e(u, {
+          setError: (a, h) => {
+            const m = this.getForm(a);
+            m.error = {
               error: !0,
-              messages: [g.message]
-            }, p.rerender();
+              messages: [h.message]
+            }, m.rerender();
           }
         });
       }
     },
     reset(n) {
-      const c = [];
-      m(s, [], n, (u, a, g) => {
-        if (g === void 0 && i[a].value === void 0)
+      const i = [];
+      C(o, [], n, (u, a, h) => {
+        if (h === void 0 && c[a].value === void 0)
           return;
-        if (f.names[a] && g === void 0) {
-          c.push(a), i[a].value = g;
+        if (f.names[a] && h === void 0) {
+          i.push(a), c[a].value = h;
           return;
         }
-        const p = g ?? u.defaultValue;
-        i[a].value !== p && (c.push(a), this.onChange(a, p));
-      }), c.some((u) => f.names[u]) && f.subscribers.forEach(({ callback: u }) => {
+        const m = h ?? u.defaultValue;
+        c[a].value !== m && (i.push(a), this.onChange(a, m));
+      }), i.some((u) => f.names[u]) && f.subscribers.forEach(({ callback: u }) => {
         u();
       });
     },
-    registry(n, c) {
-      return i[n].rerender = c, i[n].value === void 0 && (i[n].value = i[n].defaultValue), {
+    registry(n, i) {
+      return c[n].rerender = i, c[n].value === void 0 && (c[n].value = c[n].defaultValue), {
         unregistry() {
-          if (i[n].rerender = () => {
-          }, i[n].focus = void 0, v) {
-            i[n].value = void 0;
-            const u = !R(i[n].defaultValue, i[n].initValue);
-            i[n].isDirty !== u && F(n, u), i[n].isDirty = u;
+          if (c[n].rerender = () => {
+          }, c[n].focus = void 0, g) {
+            c[n].value = void 0;
+            const u = !w(c[n].defaultValue, c[n].initValue);
+            c[n].isDirty !== u && x(n, u), c[n].isDirty = u;
           }
         }
       };
     },
     getForm(n) {
-      return i[n];
+      return c[n];
     },
-    subscribeToForm(n, c) {
-      const u = { callback: c }, a = this.getForm(n);
+    subscribeToForm(n, i) {
+      const u = { callback: i }, a = this.getForm(n);
       return a.subscribers.push(u), {
         unsubscribe: () => {
-          a.subscribers = a.subscribers.filter((g) => g !== u);
+          a.subscribers = a.subscribers.filter((h) => h !== u);
         }
       };
     },
-    registryExtraForm(n, c) {
-      const u = { callback: c };
+    registryExtraForm(n, i) {
+      const u = { callback: i };
       return n.forEach((a) => {
         f.names[a] = !0;
       }), f.subscribers.push(u), {
@@ -285,105 +285,105 @@ const j = N({}), M = (s) => {
         }
       };
     },
-    onChange(n, c) {
-      const u = this.getForm(n), a = !R(c, u.initValue);
-      u.isDirty !== a && F(n, a), u.isDirty = a, b?.({ name: n, value: c }), (u.error || C) && (u.error = u.validate(c) || null), u.value = c, u.rerender(), u.subscribers.forEach(({ callback: g }) => {
-        g();
+    onChange(n, i) {
+      const u = this.getForm(n), a = !w(i, u.initValue);
+      u.isDirty !== a && x(n, a), u.isDirty = a, F?.({ name: n, value: i }), (u.error || v) && (u.error = u.validate(i) || null), u.value = i, u.rerender(), u.subscribers.forEach(({ callback: h }) => {
+        h();
       });
     }
   };
-}, Q = (s, r) => {
-  const o = P(null);
-  o.current === null && (o.current = H(s, r));
-  const t = o.current;
+}, Q = (o, r) => {
+  const e = N(null);
+  e.current === null && (e.current = H(o, r));
+  const s = e.current;
   return {
-    useValue: (e) => M(e),
-    reset: (e) => {
-      t.reset(e);
+    useValue: (t) => M(t),
+    reset: (t) => {
+      s.reset(t);
     },
-    setFocus: (e) => {
-      t.setFocus(e);
+    setFocus: (t) => {
+      s.setFocus(t);
     },
-    setError: (e, l) => {
-      t.setError(e, l);
+    setError: (t, l) => {
+      s.setError(t, l);
     },
-    setValue: (e, l) => {
-      t.setValue(e, l);
+    setValue: (t, l) => {
+      s.setValue(t, l);
     },
-    getValues: () => t.getValues(),
+    getValues: () => s.getValues(),
     handleSubmit: async () => {
-      await t.handleSubmit();
+      await s.handleSubmit();
     },
-    manager: t
+    manager: s
   };
-}, U = ({ manager: s, className: r }) => (A(() => {
-  s.activate();
+}, U = ({ manager: o }) => (A(() => {
+  o.activate();
 }, []), D(() => () => {
-  s.disactivate();
-}, []), /* @__PURE__ */ h(j.Provider, { value: s, children: /* @__PURE__ */ h(V, { className: r, scheme: s.scheme, path: [] }) })), $ = (s) => {
+  o.disactivate();
+}, []), /* @__PURE__ */ b(j.Provider, { value: o, children: /* @__PURE__ */ b(V, { scheme: o.scheme, path: [] }) })), $ = (o) => {
   try {
-    s();
+    o();
   } catch (r) {
     return r && typeof r == "string" ? {
       error: !0,
       messages: [r]
-    } : r instanceof Array && r.every((o) => o && typeof o == "string") ? {
+    } : r instanceof Array && r.every((e) => e && typeof e == "string") ? {
       error: !0,
       messages: r
     } : {
       error: !0
     };
   }
-}, W = (s) => (r, o) => {
-  const t = s.getRequireCheck(o), { validate: e, required: l } = o.$rules ?? {};
+}, W = (o) => (r, e) => {
+  const s = o.getRequireCheck(e), { $rules: t = {}, ...l } = e, { validate: y, required: F } = t;
   return {
     type: "form",
     name: r,
-    defaultValue: s.defaultValue,
-    Form: s.getForm(o),
-    validate: (y) => {
-      if (l) {
-        const b = $(() => t(y));
-        if (b)
-          return b;
-        if (e) {
-          const d = $(() => e(y));
-          if (d)
-            return d;
+    defaultValue: o.defaultValue,
+    Form: o.getForm(l),
+    validate: (d) => {
+      if (F) {
+        const g = $(() => s(d));
+        if (g)
+          return g;
+        if (y) {
+          const v = $(() => y(d));
+          if (v)
+            return v;
         }
         return;
       }
-      if (e && !$(() => t(y))) {
-        const d = $(() => e(y));
-        if (d)
-          return d;
+      if (y && !$(() => s(d))) {
+        const v = $(() => y(d));
+        if (v)
+          return v;
       }
     }
   };
-}, X = (s) => (r) => (...o) => ({
+}, X = (o) => (r) => (...e) => ({
   type: "layout",
-  Layout: s(r),
-  childs: o
+  Layout: o(r),
+  childs: e
 }), Y = ({
-  getItems: s,
+  getItems: o,
   getController: r
 }) => ({
   type: "extra",
-  items: s((o) => (t) => ({
+  items: o((e) => (s) => ({
     type: "registry",
-    name: o,
-    getForm: t
+    name: e,
+    getForm: s
   })),
   getController: r
-}), Z = (s) => (...r) => ({
+}), Z = (o) => (...r) => ({
   type: "context",
-  context: s,
+  context: o,
   childs: r
-}), k = (s, r) => (...o) => ({
+}), k = (o, r) => (...e) => ({
   type: "condition",
-  depended: s,
+  depended: o,
   canActivate: r.canActivate,
-  childs: o
+  childs: e
 });
 export {
   k as Condition,

package/dist/useForm.d.ts

@@ -60,8 +60,7 @@ declare const useForm: <Items extends SchemeItems.All[], Values extends ExtractV
     manager: FormManager<FlattenValues, Cloned>;
 };
 interface Props {
-    className?: string;
     manager: FormManager<any, any>;
 }
-export declare const FormLayout: ({ manager, className }: Props) => import("react/jsx-runtime").JSX.Element;
+export declare const FormLayout: ({ manager }: Props) => import("react/jsx-runtime").JSX.Element;
 export { useForm, useDynamicForm };

package/package.json

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