@effect-app/vue-components 0.18.14 → 0.18.16

package/dist/types/components/OmegaForm/OmegaFormStuff.d.ts

@@ -28,7 +28,7 @@ export type FormProps<From, To> = Omit<FormOptions<From, FormValidateOrFn<From>
         formApi: OmegaFormParams<From, To>;
         meta: any;
         value: To;
-    }) => Promise<any> | RuntimeFiber<any, any>;
+    }) => Promise<any> | RuntimeFiber<any, any> | Effect.Effect<RuntimeFiber<any, any>, any, never>;
 };
 export type OmegaFormParams<From, To> = FormApi<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, StandardSchemaV1<From, To>, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, Record<string, any> | undefined>;
 export type OmegaFormState<From, To> = FormState<From, FormValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, StandardSchemaV1<From, To>, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined, FormAsyncValidateOrFn<From> | undefined>;

package/dist/types/components/OmegaForm/useOmegaForm.d.ts

@@ -1,5 +1,5 @@
 import { type DeepKeys } from "@tanstack/vue-form";
-import { S } from "effect-app";
+import { Effect, S } from "effect-app";
 import { type InjectionKey } from "vue";
 import { type InputProps } from "./InputProps";
 import { type FieldValidators, type FilterItems, type FormProps, type MetaRecord, type NestedKeyOf, type OmegaFormApi, type TypeOverride } from "./OmegaFormStuff";
@@ -24,7 +24,8 @@ export type OmegaConfig<T> = {
 interface OF<From, To> extends OmegaFormApi<From, To> {
     meta: MetaRecord<From>;
     filterItems?: FilterItems;
-    clear: () => void;
+    /** @experimental */
+    handleSubmitEffect: (meta?: Record<string, any>) => Effect.Effect<void, never, never>;
 }
 export declare const OmegaFormKey: InjectionKey<OF<any, any>>;
 type __VLS_PrettifyLocal<T> = {

package/dist/vue-components.es9.js

@@ -1,127 +1,139 @@
-import { useForm as F } from "@tanstack/vue-form";
-import { S as P, Fiber as v } from "effect-app";
-import { runtimeFiberAsPromise as E } from "./vue-components.es22.js";
-import { isObject as O } from "./vue-components.es23.js";
-import { computed as S, onUnmounted as I, onMounted as R, onBeforeUnmount as A, provide as N } from "vue";
-import D from "./vue-components.es6.js";
-import { generateMetaFromSchema as J } from "./vue-components.es10.js";
-const K = Symbol("OmegaForm"), k = (d, i, n) => {
-  if (!d) throw new Error("Schema is required");
-  const b = P.standardSchemaV1(d), { filterItems: g, meta: a } = J(d), o = S(() => {
-    if (n?.persistency?.id)
-      return n.persistency.id;
-    const e = window.location.pathname, r = Object.keys(a);
+import { useForm as U } from "@tanstack/vue-form";
+import { S as F, Fiber as p, Effect as o, Option as O } from "effect-app";
+import { runtimeFiberAsPromise as I } from "./vue-components.es22.js";
+import { isObject as R } from "./vue-components.es23.js";
+import { computed as b, onUnmounted as A, onMounted as M, onBeforeUnmount as N, provide as D } from "vue";
+import J from "./vue-components.es6.js";
+import { generateMetaFromSchema as K } from "./vue-components.es10.js";
+const q = Symbol("OmegaForm"), G = (f, s, a) => {
+  if (!f) throw new Error("Schema is required");
+  const g = F.standardSchemaV1(f), { filterItems: V, meta: u } = K(f), l = b(() => {
+    if (a?.persistency?.id)
+      return a.persistency.id;
+    const e = window.location.pathname, r = Object.keys(u);
     return `${e}-${r.join("-")}`;
-  }), V = () => {
+  }), E = () => {
     const e = new URLSearchParams(window.location.search);
-    e.delete(o.value);
+    e.delete(l.value);
     const r = new URL(window.location.href);
     r.search = e.toString(), window.history.replaceState({}, "", r.toString());
   };
-  function m(e, r) {
-    for (const s in r)
-      r[s] && O(r[s]) ? (e[s] || (e[s] = {}), m(e[s], r[s])) : e[s] = r[s];
+  function S(e, r) {
+    for (const t in r)
+      r[t] && R(r[t]) ? (e[t] || (e[t] = {}), S(e[t], r[t])) : e[t] = r[t];
     return e;
   }
-  const L = S(() => {
-    if (i?.defaultValues && !n?.persistency?.overrideDefaultValues)
-      return i?.defaultValues;
+  const P = b(() => {
+    if (s?.defaultValues && !a?.persistency?.overrideDefaultValues)
+      return s?.defaultValues;
     let e;
-    const r = n?.persistency;
+    const r = a?.persistency;
     if (!r?.policies || r.policies.length === 0) return {};
     if (r.policies.includes("querystring"))
       try {
-        const t = new URLSearchParams(window.location.search).get(o.value);
-        V(), t && (e = JSON.parse(t));
-      } catch (s) {
-        console.error(s);
+        const i = new URLSearchParams(window.location.search).get(l.value);
+        E(), i && (e = JSON.parse(i));
+      } catch (t) {
+        console.error(t);
       }
     if (
       // query string has higher priority than local/session storage
       !e && (r.policies.includes("local") || r.policies.includes("session"))
     ) {
-      const s = r.policies.includes("local") ? localStorage : sessionStorage;
-      if (s)
+      const t = r.policies.includes("local") ? localStorage : sessionStorage;
+      if (t)
         try {
-          const t = JSON.parse(
-            s.getItem(o.value) || "{}"
+          const i = JSON.parse(
+            t.getItem(l.value) || "{}"
           );
-          s.removeItem(o.value), e = t;
-        } catch (t) {
-          console.error(t);
+          t.removeItem(l.value), e = i;
+        } catch (i) {
+          console.error(i);
         }
     }
-    if (e ??= {}, i?.defaultValues == null)
+    if (e ??= {}, s?.defaultValues == null)
       return e;
     {
-      const s = i?.defaultValues;
-      return m(s, e);
+      const t = s?.defaultValues;
+      return S(t, e);
     }
-  }), l = F({
-    ...i,
+  }), c = U({
+    ...s,
     validators: {
-      onSubmit: b,
-      ...i?.validators || {}
+      onSubmit: g,
+      ...s?.validators || {}
     },
-    onSubmit: i?.onSubmit ? ({ formApi: e, meta: r, value: s }) => {
-      const t = i.onSubmit({
+    onSubmit: s?.onSubmit ? ({ formApi: e, meta: r, value: t }) => {
+      const i = s.onSubmit({
         formApi: e,
         meta: r,
-        value: s
+        value: t
       });
-      return v.isFiber(t) && v.isRuntimeFiber(t) ? E(t) : t;
+      return p.isFiber(i) && p.isRuntimeFiber(i) ? I(i) : o.isEffect(i) ? o.runPromise(
+        i.pipe(
+          r?.currentSpan ? o.withParentSpan(r.currentSpan) : (n) => n,
+          o.flatMap((n) => p.join(n))
+        )
+      ) : i;
     } : void 0,
-    defaultValues: L.value
-  }), U = () => {
-    Object.keys(a).forEach((e) => {
-      l.setFieldValue(e, void 0);
+    defaultValues: P.value
+  }), j = () => {
+    Object.keys(u).forEach((e) => {
+      c.setFieldValue(e, void 0);
     });
-  }, p = (e) => e.reduce((r, s) => {
-    const t = s.split(".");
-    return t.reduce((c, u, j) => (j === t.length - 1 ? c[u] = l.getFieldValue(s) : c[u] = c[u] ?? {}, c[u]), r), r;
-  }, {}), w = (e) => {
+  }, w = (e) => e.reduce((r, t) => {
+    const i = t.split(".");
+    return i.reduce((n, d, L) => (L === i.length - 1 ? n[d] = c.getFieldValue(t) : n[d] = n[d] ?? {}, n[d]), r), r;
+  }, {}), h = (e) => {
     if (e) {
       if (Array.isArray(e.keys))
-        return p(e.keys);
+        return w(e.keys);
       if (Array.isArray(e.banKeys)) {
-        const r = Object.keys(a).filter((s) => e.banKeys?.includes(s));
-        return p(r);
+        const r = Object.keys(u).filter((t) => e.banKeys?.includes(t));
+        return w(r);
       }
-      return l.store.state.values;
+      return c.store.state.values;
     }
-  }, f = () => {
-    const e = n?.persistency;
+  }, m = () => {
+    const e = a?.persistency;
     if (!(!e?.policies || e.policies.length === 0) && (e.policies.includes("local") || e.policies.includes("session"))) {
       const r = e.policies.includes("local") ? localStorage : sessionStorage;
       if (!r) return;
-      const s = w(e);
-      return r.setItem(o.value, JSON.stringify(s));
+      const t = h(e);
+      return r.setItem(l.value, JSON.stringify(t));
     }
   }, y = () => {
-    const e = n?.persistency;
+    const e = a?.persistency;
     if (!(!e?.policies || e.policies.length === 0) && e.policies.includes("querystring")) {
-      const r = w(e), s = new URLSearchParams(window.location.search);
-      s.set(o.value, JSON.stringify(r));
-      const t = new URL(window.location.href);
-      t.search = s.toString(), window.history.replaceState({}, "", t.toString());
+      const r = h(e), t = new URLSearchParams(window.location.search);
+      t.set(l.value, JSON.stringify(r));
+      const i = new URL(window.location.href);
+      i.search = t.toString(), window.history.replaceState({}, "", i.toString());
     }
   };
-  I(f), R(() => {
-    window.addEventListener("beforeunload", f), window.addEventListener("blur", y);
-  }), A(() => {
-    window.removeEventListener("beforeunload", f), window.removeEventListener("blur", y);
+  A(m), M(() => {
+    window.addEventListener("beforeunload", m), window.addEventListener("blur", y);
+  }), N(() => {
+    window.removeEventListener("beforeunload", m), window.removeEventListener("blur", y);
   });
-  const h = Object.assign(l, {
-    meta: a,
-    filterItems: g,
-    clear: U
+  const v = Object.assign(c, {
+    meta: u,
+    filterItems: V,
+    clear: j,
+    /** @experimental */
+    handleSubmitEffect: (e) => o.currentSpan.pipe(
+      o.option,
+      o.flatMap(
+        (r) => o.promise(() => c.handleSubmit(O.isSome(r) ? { currentSpan: r.value, ...e } : e))
+      )
+    )
   });
-  return N(K, h), Object.assign(h, {
-    Input: D,
-    Field: l.Field
+  return D(q, v), Object.assign(v, {
+    Input: J,
+    Field: c.Field
   });
 };
 export {
-  K as OmegaFormKey,
-  k as useOmegaForm
+  q as OmegaFormKey,
+  G as useOmegaForm
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "0.18.14",
+  "version": "0.18.16",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "@tanstack/vue-form": "1.2.4",
@@ -53,7 +53,7 @@
   "dependencies": {
     "highlight.js": "^11.11.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "2.55.7",
+    "@effect-app/vue": "2.55.8",
     "effect-app": "3.3.4"
   },
   "scripts": {

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -60,7 +60,7 @@ export type FormProps<From, To> =
       formApi: OmegaFormParams<From, To>
       meta: any
       value: To
-    }) => Promise<any> | RuntimeFiber<any, any>
+    }) => Promise<any> | RuntimeFiber<any, any> | Effect.Effect<RuntimeFiber<any, any>, any, never>
   }
 
 export type OmegaFormParams<From, To> = FormApi<

package/src/components/OmegaForm/useOmegaForm.ts

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { type DeepKeys, type FormAsyncValidateOrFn, type FormValidateOrFn, type StandardSchemaV1, useForm } from "@tanstack/vue-form"
-import { Fiber, S } from "effect-app"
+import { Effect, Fiber, Option, S } from "effect-app"
 import { runtimeFiberAsPromise } from "effect-app/utils"
 import { isObject } from "effect/Predicate"
 import { computed, type InjectionKey, onBeforeUnmount, onMounted, onUnmounted, provide } from "vue"
@@ -35,7 +35,8 @@ export type OmegaConfig<T> = {
 interface OF<From, To> extends OmegaFormApi<From, To> {
   meta: MetaRecord<From>
   filterItems?: FilterItems
-  clear: () => void
+  /** @experimental */
+  handleSubmitEffect: (meta?: Record<string, any>) => Effect.Effect<void, never, never>
 }
 
 export const OmegaFormKey = Symbol("OmegaForm") as InjectionKey<OF<any, any>>
@@ -226,6 +227,16 @@ export const useOmegaForm = <
         if (Fiber.isFiber(r) && Fiber.isRuntimeFiber(r)) {
           return runtimeFiberAsPromise(r)
         }
+        if (Effect.isEffect(r)) {
+          return Effect.runPromise(
+            r.pipe(
+              meta?.currentSpan
+                ? Effect.withParentSpan(meta.currentSpan)
+                : (_) => _,
+              Effect.flatMap((_) => Fiber.join(_))
+            )
+          )
+        }
         return r
       }
       : undefined,
@@ -311,7 +322,16 @@ export const useOmegaForm = <
   const formWithExtras: OF<From, To> = Object.assign(form, {
     meta,
     filterItems,
-    clear
+    clear,
+    /** @experimental */
+    handleSubmitEffect: (meta?: Record<string, any>) =>
+      Effect.currentSpan.pipe(
+        Effect.option,
+        Effect
+          .flatMap((span) =>
+            Effect.promise(() => form.handleSubmit(Option.isSome(span) ? { currentSpan: span.value, ...meta } : meta))
+          )
+      )
   })
 
   provide(OmegaFormKey, formWithExtras)