@companix/formkit 0.0.25 → 0.0.27

package/dist/bundle.es.js

@@ -39,7 +39,7 @@ const D = M({}), q = (o) => {
   $(() => () => {
     t();
   }, []);
-  const { value: g, error: m } = s.getForm(r);
+  const { value: g, error: V } = s.getForm(r);
   return /* @__PURE__ */ h(
     o,
     {
@@ -53,7 +53,7 @@ const D = M({}), q = (o) => {
         ref: l
       },
       isDirty: !1,
-      error: m,
+      error: V,
       disabled: s.disabled
     }
   );
@@ -68,7 +68,7 @@ const D = M({}), q = (o) => {
     return s.forEach(({ name: b }) => {
       t.getForm([...r, b].join(".")).value !== void 0 && f.push(b);
     }), f;
-  }, []), m = C(() => g(), []), [y, v] = w(m);
+  }, []), V = C(() => g(), []), [y, v] = w(V);
   $(() => {
     const { unregistry: f } = t.registryExtraForm(
       s.map(({ name: b }) => [...r, b].join(".")),
@@ -91,12 +91,12 @@ const D = M({}), q = (o) => {
   return /* @__PURE__ */ B(j, { children: [
     y.map((f) => {
       const b = l[f];
-      return /* @__PURE__ */ h(V, { path: r, scheme: [b] }, `param-form--${f}`);
+      return /* @__PURE__ */ h(E, { path: r, scheme: [b] }, `param-form--${f}`);
     }),
     e(d, y)
   ] });
-}, V = ({ scheme: o, path: r }) => /* @__PURE__ */ h(j, { children: o.map((e, s) => e.type === "layout" ? /* @__PURE__ */ h(e.Layout, { children: /* @__PURE__ */ h(V, { path: r, scheme: e.childs }) }, `layout-form--${s}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ h(
-  V,
+}, E = ({ scheme: o, path: r }) => /* @__PURE__ */ h(j, { children: o.map((e, s) => e.type === "layout" ? /* @__PURE__ */ h(e.Layout, { children: /* @__PURE__ */ h(E, { path: r, scheme: e.childs }) }, `layout-form--${s}-${r.length}`) : e.type === "context" ? /* @__PURE__ */ h(
+  E,
   {
     path: [...r, e.context],
     scheme: e.childs
@@ -107,39 +107,39 @@ const D = M({}), q = (o) => {
   {
     name: e.depended,
     canActivate: e.canActivate,
-    children: /* @__PURE__ */ h(V, { path: r, scheme: e.childs })
+    children: /* @__PURE__ */ h(E, { path: r, scheme: e.childs })
   },
   `condition--${s}-${e.depended}-${r.length}`
-) : e.type === "extra" ? /* @__PURE__ */ h(z, { path: r, item: e }, `partial-item--${s}-${r.length}`) : e.type === "visability" ? e.hidden ? null : /* @__PURE__ */ h(V, { path: r, scheme: e.childs }, `visability--${s}-${r.length}`) : /* @__PURE__ */ h(
+) : e.type === "extra" ? /* @__PURE__ */ h(z, { path: r, item: e }, `partial-item--${s}-${r.length}`) : e.type === "visability" ? e.hidden ? null : /* @__PURE__ */ h(E, { path: r, scheme: e.childs }, `visability--${s}-${r.length}`) : /* @__PURE__ */ h(
   U,
   {
     name: [...r, e.name].join("."),
     item: e
   },
   `form-item--${s}-${e.name}-${r.length}`
-)) }), E = (o, r, e, s) => {
+)) }), p = (o, r, e, s) => {
   o.forEach((t) => {
     if (t.type === "form" && s(t, [...r, t.name].join("."), e[t.name]), t.type === "context") {
-      E(t.childs, [...r, t.context], e[t.context] ?? {}, s);
+      p(t.childs, [...r, t.context], e[t.context] ?? {}, s);
       return;
     }
     if (t.type === "layout" || t.type === "condition" || t.type === "visability") {
-      E(t.childs, r, e, s);
+      p(t.childs, r, e, s);
       return;
     }
     t.type === "extra" && t.items.forEach(({ getForm: l, name: g }) => {
-      E([l(g, () => {
+      p([l(g, () => {
       })], r, e, s);
     });
   });
-}, p = ({ scheme: o, values: r, path: e, forms: s }) => {
+}, m = ({ 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 (t.type === "context") {
-      r[t.context] = {}, p({
+      r[t.context] = {}, m({
         scheme: t.childs,
         path: [...e, t.context],
         values: r[t.context],
@@ -148,26 +148,30 @@ const D = M({}), q = (o) => {
       return;
     }
     if (t.type === "layout") {
-      p({ scheme: t.childs, path: e, values: r, forms: s });
+      m({ scheme: t.childs, path: e, values: r, forms: s });
+      return;
+    }
+    if (t.type === "visability") {
+      m({ scheme: t.childs, path: e, values: r, forms: s });
       return;
     }
     if (t.type === "condition") {
       const l = s[t.depended]?.value;
       if (t.canActivate(l)) {
-        p({ scheme: t.childs, path: e, values: r, forms: s });
+        m({ scheme: t.childs, path: e, values: r, forms: s });
         return;
       }
     }
     t.type === "extra" && t.items.forEach(({ getForm: l, name: g }) => {
-      p({ scheme: [l(g, () => {
+      m({ scheme: [l(g, () => {
       })], path: e, values: r, forms: s });
     });
   });
 }, T = (o, r) => {
   const e = {};
-  return p({ scheme: o, path: [], values: e, forms: r }), e;
+  return m({ scheme: o, path: [], values: e, forms: r }), e;
 }, G = (o, r) => {
-  const { onSubmit: e, onEqual: s, disabled: t, onDirty: l, onFormDirty: g, onChangeEvent: m, defaultValues: y } = r, v = { onSubmit: e }, d = {
+  const { onSubmit: e, onEqual: s, disabled: t, onDirty: l, onFormDirty: g, onChangeEvent: V, defaultValues: y } = r, v = { onSubmit: e }, d = {
     isActive: !1,
     isSubmitted: !1,
     dirtyCount: 0
@@ -175,7 +179,7 @@ const D = M({}), q = (o) => {
     subscribers: [],
     names: {}
   };
-  E(o, [], y ?? {}, (n, u, i) => {
+  p(o, [], y ?? {}, (n, u, i) => {
     a[u] = {
       error: null,
       isDirty: !1,
@@ -254,7 +258,7 @@ const D = M({}), q = (o) => {
       }
     },
     reset(n, { asDirty: u }) {
-      E(o, [], n, (i, c, F) => {
+      p(o, [], n, (i, c, F) => {
         if (F === void 0 && a[c].value === void 0)
           return;
         if (f.names[c] && F === void 0) {
@@ -268,7 +272,7 @@ const D = M({}), q = (o) => {
       });
     },
     setAsDefault() {
-      E(o, [], {}, ({}, n) => {
+      p(o, [], {}, ({}, n) => {
         a[n].startValue = a[n].value, a[n].isDirty = !1;
       }), d.dirtyCount = 0, d.isSubmitted = !1;
     },
@@ -305,7 +309,7 @@ const D = M({}), q = (o) => {
     },
     onChange(n, u) {
       const i = this.getForm(n), c = !L(u, i.startValue);
-      i.isDirty !== c && b(n, c), i.isDirty = c, m?.({ name: n, value: u }), (i.error || d.isSubmitted) && (i.error = i.validate(u) || null);
+      i.isDirty !== c && b(n, c), i.isDirty = c, V?.({ name: n, value: u }), (i.error || d.isSubmitted) && (i.error = i.validate(u) || null);
       const F = i.value;
       i.value = u, i.rerender(), i.subscribers.forEach(({ callback: x }) => {
         x(u, F);
@@ -348,7 +352,7 @@ const D = M({}), q = (o) => {
   o.activate();
 }, []), $(() => () => {
   o.disactivate();
-}, []), /* @__PURE__ */ h(D.Provider, { value: o, children: /* @__PURE__ */ h(V, { scheme: o.scheme, path: [] }) })), S = (o) => {
+}, []), /* @__PURE__ */ h(D.Provider, { value: o, children: /* @__PURE__ */ h(E, { scheme: o.scheme, path: [] }) })), S = (o) => {
   try {
     o();
   } catch (r) {
@@ -363,14 +367,14 @@ const D = M({}), q = (o) => {
     };
   }
 }, X = (o) => (r, e) => {
-  const s = o.getRequireCheck(e), { $rules: t = {}, ...l } = e, { validate: g, required: m } = t;
+  const s = o.getRequireCheck(e), { $rules: t = {}, ...l } = e, { validate: g, required: V } = t;
   return {
     type: "form",
     name: r,
     defaultValue: o.defaultValue,
     Form: o.getForm(l),
     validate: (y) => {
-      if (m) {
+      if (V) {
         const v = S(() => s(y));
         if (v)
           return v;

package/dist/core/extract.d.ts

@@ -4,10 +4,10 @@ type ExtractValue<T> = T extends SchemeItems.Form<infer N, infer V> ? {
     [K in N]: V;
 } : T extends SchemeItems.Layout<infer C> ? ExtractValue<C[number]> : T extends SchemeItems.Context<infer N, infer C> ? {
     [K in N]: Compute<UnionToIntersection<ExtractValue<C[number]>>>;
-} : T extends SchemeItems.Condition<infer C> ? Partial<ExtractValue<C[number]>> : T extends SchemeItems.Extra<string, infer C> ? Partial<ExtractValue<ReturnType<C[number]['getForm']>>> : never;
+} : T extends SchemeItems.Condition<infer C> ? Partial<ExtractValue<C[number]>> : T extends SchemeItems.Visablility<infer C> ? Partial<ExtractValue<C[number]>> : T extends SchemeItems.Extra<string, infer C> ? Partial<ExtractValue<ReturnType<C[number]['getForm']>>> : never;
 type ExtractValues<T> = Compute<UnionToIntersection<ExtractValue<T>>>;
 type ExtractFlatValue<T, A extends string | null> = T extends SchemeItems.Form<infer N, infer V> ? {
     [K in A extends null ? N : `${A}.${N}`]: V;
-} : T extends SchemeItems.Layout<infer C> ? ExtractFlatValue<C[number], A> : T extends SchemeItems.Context<infer N, infer C> ? ExtractFlatValue<C[number], A extends null ? N : `${A}.${N}`> : T extends SchemeItems.Condition<infer C> ? Partial<ExtractFlatValue<C[number], A>> : T extends SchemeItems.Extra<string, infer C> ? Partial<ExtractValue<ReturnType<C[number]['getForm']>>> : never;
+} : T extends SchemeItems.Layout<infer C> ? ExtractFlatValue<C[number], A> : T extends SchemeItems.Context<infer N, infer C> ? ExtractFlatValue<C[number], A extends null ? N : `${A}.${N}`> : T extends SchemeItems.Condition<infer C> ? Partial<ExtractFlatValue<C[number], A>> : T extends SchemeItems.Visablility<infer C> ? Partial<ExtractFlatValue<C[number], A>> : T extends SchemeItems.Extra<string, infer C> ? Partial<ExtractValue<ReturnType<C[number]['getForm']>>> : never;
 type ExtractFlatValues<T> = Compute<UnionToIntersection<ExtractFlatValue<T, null>>>;
 export type { ExtractValues, ExtractFlatValues };

package/package.json

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