@companix/formkit 0.0.5 → 0.0.7

package/README.md

@@ -1,27 +1,37 @@
 ## Create form primitives
 
 ```tsx
-const SelectForm = (name: string, x: any) => {}
-const InputForm = (name: string, x: any) => {}
+const SelectForm = (name: string) => {
+  // select form code
+}
+const InputForm = (name: string) => {
+  // input form code
+}
 ```
 
 ## Create layouts
 
 ```tsx
-const Label = ({ name }) => {
-  return ({ children }) => <div></div>
-}
+export const Label = createLayout((label: React.ReactNode) => {
+  return ({ children }) => {
+    return <FormGroup label={label}>{children}</FormGroup>
+  }
+})
 
-const Double = () => {
-  return () => {
-    return <>{children}</>
+export const Double = createLayout(() => {
+  return ({ children }) => {
+    return <div className="form-double-primitive">{children}</div>
   }
-}
+})
 
-const Splitter = () => {}
+export const Splitter = createLayout(() => {
+  return () => {
+    return <div className="form-splitter" />
+  }
+})
 ```
 
-## Define a scheme
+## Create a scheme
 
 ```ts
 const scheme = [

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

package/dist/index.d.ts

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

package/dist/manager/manager.d.ts

@@ -18,6 +18,7 @@ export interface Forms {
     [name: string]: FormItem;
 }
 export interface FormManager<FlattenValues, ClonedValues> {
+    scheme: SchemeItems.All[];
     disabled?: boolean;
     activate: () => void;
     disactivate: () => void;

package/dist/useForm.d.ts

@@ -45,10 +45,7 @@ declare const useDynamicForm: (scheme: SchemeItems.All[], opts: MainOptions<Fiel
         [x: string]: any;
     };
     handleSubmit: () => Promise<void>;
-    control: {
-        manager: FormManager<FieldValues, FieldValues>;
-        scheme: [];
-    };
+    manager: FormManager<FieldValues, FieldValues>;
 };
 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>) => {
     useValue: <K extends keyof FlattenValues>(name: K) => FlattenValues[K];
@@ -60,17 +57,11 @@ declare const useForm: <Items extends SchemeItems.All[], Values extends ExtractV
     setValue: <K extends keyof FlattenValues>(name: K, value: FlattenValues[K]) => void;
     getValues: () => DeepPartial<Cloned>;
     handleSubmit: () => Promise<void>;
-    control: {
-        manager: FormManager<FlattenValues, Cloned>;
-        scheme: Items;
-    };
+    manager: FormManager<FlattenValues, Cloned>;
 };
 interface Props {
     className?: string;
-    control: {
-        manager: FormManager<any, any>;
-        scheme: SchemeItems.All[];
-    };
+    manager: FormManager<any, any>;
 }
-export declare const FormLayout: ({ control, className }: Props) => import("react/jsx-runtime").JSX.Element;
+export declare const FormLayout: ({ manager, className }: Props) => import("react/jsx-runtime").JSX.Element;
 export { useForm, useDynamicForm };

package/package.json

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