@effect-app/vue-components 2.10.0 → 2.10.2

package/dist/vue-components.es38.js

@@ -1,34 +1,194 @@
-import { defineComponent as m, createElementBlock as d, openBlock as u, withModifiers as f, createElementVNode as l, unref as s, renderSlot as a } from "vue";
-import { useStore as b } from "@tanstack/vue-form";
-import { usePreventClose as p } from "./vue-components.es11.js";
-import { getOmegaStore as c } from "./vue-components.es53.js";
-const S = ["disabled"], V = /* @__PURE__ */ m({
-  __name: "OmegaWrapper",
+import { defineComponent as k, resolveComponent as b, createElementBlock as v, openBlock as a, createBlock as n, createCommentVNode as u, resolveDynamicComponent as g, mergeProps as o, createSlots as d, withCtx as r, renderSlot as m, normalizeProps as s, guardReactiveProps as P, unref as C, Fragment as V, renderList as U } from "vue";
+import { getInputType as c } from "./vue-components.es12.js";
+const w = /* @__PURE__ */ k({
+  inheritAttrs: !1,
+  __name: "OmegaInputVuetify",
   props: {
-    form: {},
-    disabled: { type: Boolean },
-    subscribe: {}
+    inputProps: {},
+    field: {},
+    state: {}
   },
-  setup(o) {
-    const e = o, i = b(
-      e.form.store,
-      (t) => t.isSubmitting
-    ), n = c(
-      e.form,
-      e.subscribe
-    );
-    return e.form.ignorePreventCloseEvents || p(() => e.form.useStore((t) => t.isDirty)), (t, r) => (u(), d("form", {
-      novalidate: "",
-      onSubmit: r[0] || (r[0] = f((v) => o.form.handleSubmit(), ["prevent", "stop"]))
-    }, [
-      l("fieldset", {
-        disabled: s(i) || o.disabled
+  emits: ["focus", "blur"],
+  setup(e) {
+    return (l, i) => {
+      const y = b("v-text-field"), p = b("v-textarea"), f = b("v-radio"), h = b("v-radio-group"), q = b("v-select"), $ = b("v-autocomplete");
+      return a(), v("div", {
+        class: "omega-input",
+        onFocusout: i[4] || (i[4] = (t) => l.$emit("blur", t)),
+        onFocusin: i[5] || (i[5] = (t) => l.$emit("focus", t))
       }, [
-        a(t.$slots, "default", { subscribedValues: s(n) }, void 0, !0)
-      ], 8, S)
-    ], 32));
+        e.inputProps.type === "boolean" || e.inputProps.type === "switch" ? (a(), n(g(e.inputProps.type === "boolean" ? "v-checkbox" : "v-switch"), o({
+          key: 0,
+          id: e.inputProps.id,
+          name: e.field.name,
+          label: e.inputProps.label,
+          "error-messages": e.inputProps.errorMessages,
+          error: e.inputProps.error,
+          ripple: ""
+        }, l.$attrs, {
+          "model-value": e.state.value,
+          onChange: i[0] || (i[0] = (t) => e.field.handleChange(t.target.checked))
+        }), d({ _: 2 }, [
+          l.$slots.label ? {
+            name: "label",
+            fn: r(() => [
+              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["id", "name", "label", "error-messages", "error", "model-value"])) : u("", !0),
+        e.inputProps.type === "email" || e.inputProps.type === "string" || e.inputProps.type === "password" || e.inputProps.type === "date" ? (a(), n(y, o({
+          key: 1,
+          id: e.inputProps.id,
+          required: e.inputProps.required,
+          "min-length": e.inputProps.minLength,
+          "max-length": e.inputProps.maxLength,
+          type: C(c)(e.inputProps.type),
+          name: e.field.name,
+          label: e.inputProps.label,
+          "error-messages": e.inputProps.errorMessages,
+          error: e.inputProps.error
+        }, l.$attrs, {
+          "model-value": e.state.value,
+          "onUpdate:modelValue": e.field.handleChange
+        }), d({ _: 2 }, [
+          l.$slots.label ? {
+            name: "label",
+            fn: r(() => [
+              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["id", "required", "min-length", "max-length", "type", "name", "label", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
+        e.inputProps.type === "text" ? (a(), n(p, o({
+          key: 2,
+          id: e.inputProps.id,
+          required: e.inputProps.required,
+          "min-length": e.inputProps.minLength,
+          "max-length": e.inputProps.maxLength,
+          name: e.field.name,
+          label: e.inputProps.label,
+          "error-messages": e.inputProps.errorMessages,
+          error: e.inputProps.error
+        }, l.$attrs, {
+          "model-value": e.state.value,
+          "onUpdate:modelValue": e.field.handleChange
+        }), d({ _: 2 }, [
+          l.$slots.label ? {
+            name: "label",
+            fn: r(() => [
+              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["id", "required", "min-length", "max-length", "name", "label", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
+        e.inputProps.type === "number" || e.inputProps.type === "range" ? (a(), n(g(e.inputProps.type === "range" ? "v-slider" : "v-text-field"), o({
+          key: 3,
+          id: e.inputProps.id,
+          required: e.inputProps.required,
+          min: e.inputProps.min,
+          max: e.inputProps.max,
+          type: e.inputProps.type,
+          name: e.field.name,
+          label: e.inputProps.label,
+          "error-messages": e.inputProps.errorMessages,
+          error: e.inputProps.error
+        }, l.$attrs, {
+          "model-value": e.state.value,
+          "onUpdate:modelValue": i[1] || (i[1] = (t) => {
+            t || t === 0 ? e.field.handleChange(Number(t)) : e.field.handleChange(void 0);
+          })
+        }), d({ _: 2 }, [
+          l.$slots.label ? {
+            name: "label",
+            fn: r(() => [
+              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["id", "required", "min", "max", "type", "name", "label", "error-messages", "error", "model-value"])) : u("", !0),
+        e.inputProps.type === "radio" ? (a(), n(h, o({
+          key: 4,
+          id: e.inputProps.id,
+          name: e.field.name,
+          label: e.inputProps.label,
+          "error-messages": e.inputProps.errorMessages,
+          error: e.inputProps.error
+        }, l.$attrs, {
+          "model-value": e.state.value,
+          "onUpdate:modelValue": e.field.handleChange
+        }), d({
+          default: r(() => [
+            (a(!0), v(V, null, U(e.inputProps.options, (t) => (a(), n(f, {
+              key: t.value,
+              label: t.title,
+              value: t.value
+            }, null, 8, ["label", "value"]))), 128))
+          ]),
+          _: 2
+        }, [
+          l.$slots.label ? {
+            name: "label",
+            fn: r(() => [
+              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["id", "name", "label", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
+        e.inputProps.type === "select" || e.inputProps.type === "multiple" ? (a(), n(q, o({
+          key: 5,
+          id: e.inputProps.id,
+          clearable: e.inputProps.type === "select",
+          required: e.inputProps.required,
+          multiple: e.inputProps.type === "multiple",
+          chips: e.inputProps.type === "multiple",
+          name: e.field.name,
+          label: e.inputProps.label,
+          items: e.inputProps.options,
+          "error-messages": e.inputProps.errorMessages,
+          error: e.inputProps.error
+        }, l.$attrs, {
+          "model-value": e.state.value,
+          onClear: i[2] || (i[2] = (t) => e.field.handleChange(void 0)),
+          "onUpdate:modelValue": e.field.handleChange
+        }), d({ _: 2 }, [
+          l.$slots.label ? {
+            name: "label",
+            fn: r(() => [
+              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["id", "clearable", "required", "multiple", "chips", "name", "label", "items", "error-messages", "error", "model-value", "onUpdate:modelValue"])) : u("", !0),
+        e.inputProps.type === "autocomplete" || e.inputProps.type === "autocompletemultiple" ? (a(), n($, o({
+          key: 6,
+          id: e.inputProps.id,
+          clearable: e.inputProps.type === "autocomplete",
+          multiple: e.inputProps.type === "autocompletemultiple",
+          required: e.inputProps.required,
+          name: e.field.name,
+          label: e.inputProps.label,
+          items: e.inputProps.options,
+          "error-messages": e.inputProps.errorMessages,
+          error: e.inputProps.error,
+          chips: e.inputProps.type === "autocompletemultiple"
+        }, l.$attrs, {
+          "model-value": e.state.value,
+          onClear: i[3] || (i[3] = (t) => e.field.handleChange(void 0)),
+          "onUpdate:modelValue": e.field.handleChange
+        }), d({ _: 2 }, [
+          l.$slots.label ? {
+            name: "label",
+            fn: r(() => [
+              m(l.$slots, "label", s(P({ required: e.inputProps.required, id: e.inputProps.id, label: e.inputProps.label })))
+            ]),
+            key: "0"
+          } : void 0
+        ]), 1040, ["id", "clearable", "multiple", "required", "name", "label", "items", "error-messages", "error", "chips", "model-value", "onUpdate:modelValue"])) : u("", !0)
+      ], 32);
+    };
   }
 });
 export {
-  V as default
+  w as default
 };

package/dist/vue-components.es40.js

@@ -1,5 +1,5 @@
 (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 o from "./vue-components.es30.js";
+import o from "./vue-components.es38.js";
 
 export {
   o as default

package/dist/vue-components.es7.js

@@ -1,7 +1,7 @@
 (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 $, computed as n, getCurrentInstance as N, useAttrs as S, useSlots as k, useId as q, renderSlot as u, normalizeProps as s, guardReactiveProps as d, createElementVNode as B, normalizeClass as w, createBlock as I, createCommentVNode as L, unref as A, openBlock as F, mergeProps as O, createSlots as R, withCtx as V } from "vue";
 import { useStore as z } from "@tanstack/vue-form";
-import T from "./vue-components.es30.js";
+import T from "./vue-components.es38.js";
 
 const H = /* @__PURE__ */ $({
   inheritAttrs: !1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.19.3",
@@ -53,8 +53,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "2.93.2",
-    "effect-app": "3.14.1"
+    "@effect-app/vue": "2.93.3",
+    "effect-app": "3.14.2"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/useOmegaForm.ts

@@ -4,7 +4,7 @@
 import * as api from "@opentelemetry/api"
 import { type DeepKeys, DeepValue, type FormAsyncValidateOrFn, type FormValidateOrFn, type StandardSchemaV1, StandardSchemaV1Issue, useForm, ValidationError, ValidationErrorMap } from "@tanstack/vue-form"
 import { Array, Data, Effect, Fiber, Option, Order, S } from "effect-app"
-import { runtimeFiberAsPromise } from "effect-app/utils"
+import { runtimeFiberAsPromise, UnionToTuples } from "effect-app/utils"
 import { Component, computed, ComputedRef, ConcreteComponent, h, type InjectionKey, onBeforeUnmount, onMounted, onUnmounted, Ref, ref, watch } from "vue"
 import { MergedInputProps } from "./InputProps"
 import OmegaArray from "./OmegaArray.vue"
@@ -147,6 +147,13 @@ const eHoc = (errorProps: {
   }
 }
 
+export type Policies = "local" | "session" | "querystring"
+export type defaultValuesPriorityUnion = "tanstack" | "persistency" | "schema"
+
+const includesPolicy = (arr: Policies[], policy: Policies) => {
+  return arr.includes(policy)
+}
+
 export type OmegaConfig<T> = {
   i18nNamespace?: string
 
@@ -155,8 +162,8 @@ export type OmegaConfig<T> = {
      * - "querystring": Highest priority when persisting
      * - "local" and then "session": Lower priority storage options
      */
-    policies?: ("local" | "session" | "querystring")[]
-    overrideDefaultValues?: boolean
+    policies?: UnionToTuples<Policies>
+    overrideDefaultValues?: "deprecated: use defaultValuesPriority"
     id?: string
   } & keysRule<T>
 
@@ -174,7 +181,15 @@ export type OmegaConfig<T> = {
 
   input?: any
 
-  defaultFromSchema?: "only" | "nope" | "merge"
+  /**
+   * Default values order is: Tanstack default values passed as second parameter to useOmegaForm, then persistency
+   * default values from querystring or local/session storage, then defaults from schema
+   * You can customize the order and  with omegaConfig.defaultValuesPriority
+   * default value = ['tanstack', 'persistency', 'schema']
+   */
+  defaultValuesPriority?: UnionToTuples<defaultValuesPriorityUnion>
+
+  defaultFromSchema?: "deprecated: use defaultValuesPriority"
 }
 
 export interface OF<From, To> extends OmegaFormApi<From, To> {
@@ -665,18 +680,18 @@ export const useOmegaForm = <
 
   const defaultValues = computed(() => {
     // will contain what we get from querystring or local/session storage
-    let defValuesPatch
+    let persistencyDefaultValues
 
     const persistency = omegaConfig?.persistency
 
     if (
       // query string has higher priority than local/session storage
       persistency?.policies
-      && !defValuesPatch
-      && (persistency.policies.includes("local")
-        || persistency.policies.includes("session"))
+      && !persistencyDefaultValues
+      && (includesPolicy(persistency.policies, "local")
+        || includesPolicy(persistency.policies, "session"))
     ) {
-      const storage = persistency.policies.includes("local")
+      const storage = includesPolicy(persistency.policies, "local")
         ? localStorage
         : sessionStorage
       if (storage) {
@@ -685,19 +700,19 @@ export const useOmegaForm = <
             storage.getItem(persistencyKey.value) || "{}"
           )
           storage.removeItem(persistencyKey.value)
-          defValuesPatch = value
+          persistencyDefaultValues = value
         } catch (error) {
           console.error(error)
         }
       }
     }
-    if (persistency?.policies && persistency.policies.includes("querystring")) {
+    if (persistency?.policies && includesPolicy(persistency.policies, "querystring")) {
       try {
         const params = new URLSearchParams(window.location.search)
         const value = params.get(persistencyKey.value)
         clearUrlParams()
         if (value) {
-          defValuesPatch = deepMerge(defValuesPatch || {}, JSON.parse(value))
+          persistencyDefaultValues = deepMerge(persistencyDefaultValues || {}, JSON.parse(value))
         }
       } catch (error) {
         console.error(error)
@@ -705,22 +720,23 @@ export const useOmegaForm = <
     }
 
     // to be sure we have a valid object at the end of the gathering process
-    defValuesPatch ??= {}
+    persistencyDefaultValues ??= {}
 
-    const defaultValuesFromSchema = (() => {
-      if (omegaConfig?.defaultFromSchema === "only") {
-        return defaultsValueFromSchema(schema)
-      }
-      if (omegaConfig?.defaultFromSchema === "nope") {
-        return tanstackFormOptions?.defaultValues || {}
-      }
-      return deepMerge(defaultsValueFromSchema(schema), tanstackFormOptions?.defaultValues || {})
-    })()
+    const defaults: Record<defaultValuesPriorityUnion, any> = {
+      tanstack: tanstackFormOptions?.defaultValues || {},
+      persistency: persistencyDefaultValues,
+      schema: defaultsValueFromSchema(schema)
+    }
 
-    // we just return what we gathered from the query/storage
-    return omegaConfig?.persistency?.overrideDefaultValues
-      ? deepMerge(defaultValuesFromSchema, defValuesPatch)
-      : deepMerge(defValuesPatch, defaultValuesFromSchema)
+    return (omegaConfig?.defaultValuesPriority || ["tanstack", "persistency", "schema"] as const).reverse().reduce(
+      (acc, m) => {
+        if (!Object.keys(acc).length) {
+          return defaults[m]
+        }
+        return deepMerge(acc, defaults[m])
+      },
+      {}
+    )
   })
 
   const wrapWithSpan = (span: api.Span | undefined, toWrap: () => any) => {
@@ -813,10 +829,10 @@ export const useOmegaForm = <
       return
     }
     if (
-      persistency.policies.includes("local")
-      || persistency.policies.includes("session")
+      includesPolicy(persistency.policies, "local")
+      || includesPolicy(persistency.policies, "session")
     ) {
-      const storage = persistency.policies.includes("local")
+      const storage = includesPolicy(persistency.policies, "local")
         ? localStorage
         : sessionStorage
       if (!storage) return
@@ -830,7 +846,7 @@ export const useOmegaForm = <
     if (!persistency?.policies || persistency.policies.length === 0) {
       return
     }
-    if (persistency.policies.includes("querystring")) {
+    if (includesPolicy(persistency.policies, "querystring")) {
       const values = persistFilter(persistency)
       const searchParams = new URLSearchParams(window.location.search)
       searchParams.set(persistencyKey.value, JSON.stringify(values))

package/dist/vue-components.es34.js

@@ -1,4 +0,0 @@
-import f from "./vue-components.es19.js";
-export {
-  f as default
-};

package/dist/vue-components.es37.js

@@ -1,9 +0,0 @@
-const s = (t, e) => {
-  const o = t.__vccOpts || t;
-  for (const [r, c] of e)
-    o[r] = c;
-  return o;
-};
-export {
-  s as default
-};