@effect-app/vue-components 4.0.0-beta.10 → 4.0.0-beta.13

package/dist/vue-components.es7.js

@@ -1,9 +1,9 @@
 (function(){"use strict";try{if(typeof document<"u"){var i=document.createElement("style");if(i.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),document.head.appendChild(i),window.customElements){const e=window.customElements.define;window.customElements.define=function(s,t){const n=t.prototype.connectedCallback;return t.prototype.connectedCallback=function(){if(n&&n.call(this),this.shadowRoot){const a=document.createElement("style");a.appendChild(document.createTextNode(".omega-input .v-input__details:has(.v-messages:empty){grid-template-rows:0fr;transition:all .2s}.omega-input .v-messages:empty{min-height:0}.omega-input .v-input__details:has(.v-messages){transition:all .2s;overflow:hidden;min-height:0;display:grid;grid-template-rows:1fr}.omega-input .v-messages{transition:all .2s}.omega-input .v-messages>*{transition-duration:0s!important}.omega-input [role=alert]:has(.v-messages:empty){padding:0}.omega-input .v-btn{cursor:pointer;width:auto;appearance:none;box-shadow:none;display:block;min-width:auto;height:auto;padding:.5em .5em .5em 1em}")),this.shadowRoot.appendChild(a)}},e.call(window.customElements,s,t)}}}}catch(e){console.error("vite-plugin-css-injected-by-js",e)}})();
-import { defineComponent as N, computed as n, getCurrentInstance as k, useAttrs as q, useSlots as B, useId as S, renderSlot as d, normalizeProps as s, guardReactiveProps as p, createElementVNode as w, normalizeClass as F, createBlock as I, createCommentVNode as L, unref as A, openBlock as O, mergeProps as R, createSlots as V, withCtx as z } from "vue";
-import { useStore as f } from "@tanstack/vue-form";
-import T from "./vue-components.es61.js";
+import { defineComponent as k, computed as a, getCurrentInstance as q, useAttrs as B, useSlots as S, useId as w, renderSlot as p, normalizeProps as s, guardReactiveProps as f, createElementVNode as F, normalizeClass as I, createBlock as L, createCommentVNode as A, unref as O, openBlock as R, mergeProps as V, createSlots as z, withCtx as T } from "vue";
+import { useStore as c } from "@tanstack/vue-form";
+import U from "./vue-components.es39.js";
 
-const H = /* @__PURE__ */ N({
+const J = /* @__PURE__ */ k({
   inheritAttrs: !1,
   __name: "OmegaInternalInput",
   props: {
@@ -18,31 +18,31 @@ const H = /* @__PURE__ */ N({
     register: {},
     options: { default: void 0 }
   },
-  setup(c) {
-    const e = c, l = n(() => e.required ?? e?.meta?.required), g = k()?.appContext.components.VTextField, v = q(), y = B(), h = n(() => {
-      const { class: t, ...a } = v;
-      return a;
-    }), i = S(), o = e.field;
-    f(o.store, (t) => t);
-    const b = f(o.form.store, (t) => t.fieldMeta), C = n(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown");
-    e.register(n(() => ({ name: e.field.name, label: e.label, id: i })));
-    const x = n(() => b.value[e.field.name]?.errors ?? []), m = n(
+  setup(g) {
+    const e = g, l = a(() => e.required ?? e?.meta?.required), v = q()?.appContext.components.VTextField, o = B(), y = S(), h = a(() => {
+      const { class: t, ...n } = o;
+      return n;
+    }), b = a(() => o.class), i = w(), m = e.field;
+    c(m.store, (t) => t);
+    const C = c(m.form.store, (t) => t.fieldMeta), x = a(() => e.type ? e.type : e.meta?.type === "string" ? e.meta.format === "email" ? "email" : "string" : e.meta?.type || "unknown");
+    e.register(a(() => ({ name: e.field.name, label: e.label, id: i })));
+    const M = a(() => C.value[e.field.name]?.errors ?? []), u = a(
       () => (
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        x.value.map((t) => t?.message).filter(Boolean)
+        M.value.map((t) => t?.message).filter(Boolean)
       )
-    ), M = (t) => t == null || t === !1 || t === "" || Number.isNaN(t), _ = (t) => {
-      M(t) && e.meta?.type !== "boolean" && e.meta?.nullableOrUndefined ? e.field.handleChange(
+    ), _ = (t) => t == null || t === !1 || t === "" || Number.isNaN(t), P = (t) => {
+      _(t) && e.meta?.type !== "boolean" && e.meta?.nullableOrUndefined ? e.field.handleChange(
         e.meta.nullableOrUndefined === "undefined" ? void 0 : null
-      ) : e.field.handleChange(t), e.field.setMeta((a) => ({ ...a, errorMap: { ...a.errorMap, onSubmit: void 0 } }));
-    }, P = (t) => {
-      const a = {
-        get(E, $, W) {
-          return $ === "handleChange" ? _ : Reflect.get(...arguments);
+      ) : e.field.handleChange(t), e.field.setMeta((n) => ({ ...n, errorMap: { ...n.errorMap, onSubmit: void 0 } }));
+    }, N = (t) => {
+      const n = {
+        get(W, $, Z) {
+          return $ === "handleChange" ? P : Reflect.get(...arguments);
         }
       };
-      return new Proxy(t, a);
-    }, r = n(() => ({
+      return new Proxy(t, n);
+    }, r = a(() => ({
       inputProps: {
         id: i,
         required: l.value,
@@ -50,34 +50,34 @@ const H = /* @__PURE__ */ N({
         maxLength: e.meta?.type === "string" && e.meta?.maxLength,
         max: e.meta?.type === "number" && (e.meta?.maximum ?? (typeof e.meta?.exclusiveMaximum == "number" && e.meta.exclusiveMaximum - 1)),
         min: e.meta?.type === "number" && (e.meta?.minimum ?? (typeof e.meta?.exclusiveMinimum == "number" && e.meta.exclusiveMinimum + 1)),
-        errorMessages: m.value,
-        error: !!m.value.length,
-        type: C.value,
+        errorMessages: u.value,
+        error: !!u.value.length,
+        type: x.value,
         // Only add asterisk if label slot is not provided (slot has full control)
         label: y.label ? e.label : `${e.label}${l.value ? " *" : ""}`,
         options: e.options,
         inputClass: e.inputClass
       },
       state: e.state,
-      field: P(e.field)
+      field: N(e.field)
     }));
-    return (t, a) => d(t.$slots, "default", s(p({ ...r.value.inputProps, field: r.value.field, state: r.value.state })), () => [
-      w("div", {
-        class: F(t.$attrs.class)
+    return (t, n) => p(t.$slots, "default", s(f({ ...r.value.inputProps, field: r.value.field, state: r.value.state })), () => [
+      F("div", {
+        class: I(b.value)
       }, [
-        A(g) ? (O(), I(T, s(R({ key: 0 }, { ...h.value, ...r.value, class: e.inputClass })), V({ _: 2 }, [
+        O(v) ? (R(), L(U, s(V({ key: 0 }, { ...h.value, ...r.value, class: e.inputClass })), z({ _: 2 }, [
           t.$slots.label ? {
             name: "label",
-            fn: z((u) => [
-              d(t.$slots, "label", s(p(u)))
+            fn: T((d) => [
+              p(t.$slots, "label", s(f(d)))
             ]),
             key: "0"
           } : void 0
-        ]), 1040)) : L("", !0)
+        ]), 1040)) : A("", !0)
       ], 2)
     ]);
   }
 });
 export {
-  H as default
+  J as default
 };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "4.0.0-beta.10",
+  "version": "4.0.0-beta.13",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
-    "effect": "^4.0.0-beta.27",
+    "effect": "^4.0.0-beta.31",
     "intl-messageformat": "^11.1.2",
     "mdi-js": "^1.0.1",
     "primeflex": "^4.0.0",
@@ -53,8 +53,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "4.0.0-beta.10",
-    "effect-app": "4.0.0-beta.10"
+    "@effect-app/vue": "4.0.0-beta.13",
+    "effect-app": "4.0.0-beta.13"
   },
   "scripts": {
     "check": "vue-tsc",

package/src/components/OmegaForm/OmegaAutoGen.vue

@@ -20,8 +20,7 @@
   Name extends DeepKeys<From>"
 >
 import { type DeepKeys } from "@tanstack/vue-form"
-import { pipe } from "effect/Function"
-import * as Order from "effect/Order"
+import { Order } from "effect-app"
 import { computed } from "vue"
 import { type FieldMeta, type FieldPath, type OmegaAutoGenMeta, type OmegaInputProps } from "./OmegaFormStuff"
 
@@ -71,37 +70,33 @@ const orderBy: Order.Order<NewMeta> = Order.mapInput(
   (x: NewMeta) => namePosition(x.name, props.order || [])
 )
 
-const children = computed<NewMeta[]>(() =>
-  pipe(
-    props.form.meta as Record<DeepKeys<From>, FieldMeta | undefined>,
-    // include / exclude
-    filterRecord((_, metaKey) =>
+const children = computed<NewMeta[]>(() => {
+  const included = filterRecord((value, metaKey) =>
+    Boolean(value)
+    && (
       props.pick
         ? props.pick.includes(metaKey) && !props.omit?.includes(metaKey)
         : !props.omit?.includes(metaKey)
-    ),
-    (x: Record<DeepKeys<From>, FieldMeta | undefined>) => x,
-    // labelMap and adding name
-    mapObject((metaValue, metaKey) => ({
-      name: metaKey as Name,
-      label: props.labelMap?.(metaKey) || metaKey,
-      ...(metaValue ?? {})
-    })),
-    // filterMap
-    props.filterMap
-      ? filterMapRecord((m: NewMeta) => {
-        const result = props.filterMap?.(m.name!, m as NewMeta)
-        return result === undefined || result === true ? m : result
-      })
-      : (x: Record<DeepKeys<From>, NewMeta>) => x,
-    // transform to array
-    (obj: Record<DeepKeys<From>, NewMeta>) => Object.values(obj) as NewMeta[],
-    // order
-    (items: NewMeta[]) => [...items].sort((a, b) => orderBy(a, b)),
-    // sort
-    props.sort ? (items: NewMeta[]) => [...items].sort((a, b) => props.sort!(a, b)) : (x: NewMeta[]) => x
-  )
-)
+    )
+  )(props.form.meta as Record<DeepKeys<From>, FieldMeta | undefined>) as Record<DeepKeys<From>, FieldMeta>
+
+  const withLabels = mapObject((metaValue: FieldMeta, metaKey) => ({
+    name: metaKey,
+    label: props.labelMap?.(metaKey) || metaKey,
+    ...metaValue
+  }))(included) as unknown as Record<DeepKeys<From>, NewMeta>
+
+  const filtered = props.filterMap
+    ? filterMapRecord((m: NewMeta) => {
+      const result = props.filterMap?.(m.name, m)
+      return result === undefined || result === true ? m : result
+    })(withLabels) as Record<DeepKeys<From>, NewMeta>
+    : withLabels
+
+  const sorted = [...Object.values(filtered) as NewMeta[]].sort(orderBy)
+
+  return props.sort ? sorted.sort(props.sort) : sorted
+})
 
 defineSlots<{
   default(props: { child: NewMeta }): void

package/src/components/OmegaForm/OmegaErrorsInternal.vue

@@ -130,10 +130,9 @@ const showedGeneralErrors = computed(() => {
         .flatMap((issues) =>
           issues
             .filter(
-              (issue): issue is StandardSchemaV1Issue & { message: string } =>
-                typeof (issue as { message?: unknown })?.message === "string"
+              (issue): issue is StandardSchemaV1Issue & { message: string } => Boolean(issue?.message)
             )
-            .map((issue) => (issue as StandardSchemaV1Issue & { message: string }).message)
+            .map((issue) => issue.message)
         )
     )
 })