@effect-app/vue-components 2.10.8 → 2.10.9

package/dist/vue-components.es12.js

@@ -1,11 +1,11 @@
-import { S as r, Option as q } from "effect-app";
+import { S as i, Option as q } from "effect-app";
 import { getMetadataFromSchema as k } from "@effect-app/vue/form";
 import { useIntl as V, getTransformationFrom as _ } from "./vue-components.es3.js";
 import { isObject as E } from "./vue-components.es16.js";
-const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKeyword" || n === r.Null.ast), g = (e) => !e || !r.AST.isUnion(e) ? !1 : e.types.find((n) => n._tag === "UndefinedKeyword") ? "undefined" : e.types.find((n) => n === r.Null.ast) ? "null" : !1, L = (e) => {
+const $ = (e) => i.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKeyword" || n === i.Null.ast), g = (e) => !e || !i.AST.isUnion(e) ? !1 : e.types.find((n) => n._tag === "UndefinedKeyword") ? "undefined" : e.types.find((n) => n === i.Null.ast) ? "null" : !1, L = (e) => {
   const n = [];
   for (const t of e)
-    if (r.AST.isUnion(t)) {
+    if (i.AST.isUnion(t)) {
       const p = L(t.types);
       n.push(...p);
     } else
@@ -25,24 +25,24 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
     });
   if (p) {
     for (const s of p) {
-      const i = n ? `${n}.${s.name.toString()}` : s.name.toString(), l = g(s.type);
+      const r = n ? `${n}.${s.name.toString()}` : s.name.toString(), l = g(s.type);
       let a;
       e._isNullableDiscriminatedUnion && s.name.toString() === "_tag" || e.required === !1 ? a = !1 : a = !l;
       const m = s.type;
-      if (r.AST.isUnion(s.type)) {
+      if (i.AST.isUnion(s.type)) {
         const c = L(s.type.types).filter(
-          (u) => u._tag !== "UndefinedKeyword" && u !== r.Null.ast
+          (u) => u._tag !== "UndefinedKeyword" && u !== i.Null.ast
         ).map(_);
         if (c.some(
           (u) => "propertySignatures" in u
         )) {
           if (!l) {
             const u = f({
-              parent: i,
+              parent: r,
               property: s.type,
               meta: { required: a, nullableOrUndefined: l }
             });
-            o[i] = u;
+            o[r] = u;
           }
           for (const u of c)
             if ("propertySignatures" in u) {
@@ -50,17 +50,17 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
               Object.assign(
                 o,
                 f({
-                  parent: i,
+                  parent: r,
                   propertySignatures: u.propertySignatures,
                   meta: y ? { _isNullableDiscriminatedUnion: !0 } : {}
                 })
               );
             }
         } else {
-          const u = c.filter(r.AST.isTupleType);
+          const u = c.filter(i.AST.isTupleType);
           if (u.length > 0) {
             const y = u[0];
-            if (o[i] = {
+            if (o[r] = {
               type: "multiple",
               members: y.elements,
               rest: y.rest,
@@ -70,7 +70,7 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
               const S = y.rest[0];
               if (S.type._tag === "TypeLiteral" && "propertySignatures" in S.type)
                 for (const d of S.type.propertySignatures) {
-                  const h = `${i}.${d.name.toString()}`, T = f({
+                  const h = `${r}.${d.name.toString()}`, T = f({
                     parent: h,
                     property: d.type,
                     meta: {
@@ -78,7 +78,7 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
                       nullableOrUndefined: g(d.type)
                     }
                   });
-                  if (T && typeof T == "object" && "type" in T && (o[h] = T, T.type === "multiple" && r.AST.isTupleType(d.type) && d.type.rest && d.type.rest.length > 0)) {
+                  if (T && typeof T == "object" && "type" in T && (o[h] = T, T.type === "multiple" && i.AST.isTupleType(d.type) && d.type.rest && d.type.rest.length > 0)) {
                     const w = d.type.rest[0];
                     if (w.type._tag === "TypeLiteral" && "propertySignatures" in w.type)
                       for (const A of w.type.propertySignatures) {
@@ -97,11 +97,11 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
             }
           } else {
             const y = f({
-              parent: i,
+              parent: r,
               property: s.type,
               meta: { required: a, nullableOrUndefined: l }
             });
-            o[i] = y;
+            o[r] = y;
           }
         }
       } else {
@@ -110,18 +110,18 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
           Object.assign(
             o,
             f({
-              parent: i,
+              parent: r,
               propertySignatures: b.propertySignatures,
               meta: { required: a, nullableOrUndefined: l }
             })
           );
-        else if (r.AST.isTupleType(s.type))
+        else if (i.AST.isTupleType(s.type))
           if (s.type.rest.length > 0 && s.type.rest[0].type._tag === "TypeLiteral" && "propertySignatures" in s.type.rest[0].type) {
             const v = s.type.rest[0].type;
             if (v._tag === "TypeLiteral" && "propertySignatures" in v)
               for (const u of v.propertySignatures) {
-                const y = `${i}.${u.name.toString()}`;
-                if (r.AST.isTupleType(u.type) && u.type.rest.length > 0) {
+                const y = `${r}.${u.name.toString()}`;
+                if (i.AST.isTupleType(u.type) && u.type.rest.length > 0) {
                   const S = u.type.rest[0].type;
                   if (S._tag === "TypeLiteral" && "propertySignatures" in S)
                     for (const d of S.propertySignatures) {
@@ -156,7 +156,7 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
                 }
               }
           } else
-            o[i] = {
+            o[r] = {
               type: "multiple",
               members: s.type.elements,
               rest: s.type.rest,
@@ -165,7 +165,7 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
             };
         else {
           const c = f({
-            parent: i,
+            parent: r,
             property: s.type,
             meta: {
               // an empty string is valid for a S.String field, so we should not mark it as required
@@ -174,7 +174,7 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
               nullableOrUndefined: l
             }
           });
-          o[i] = c;
+          o[r] = c;
         }
       }
     }
@@ -182,15 +182,15 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
   }
   if (t) {
     const s = $(t);
-    if (Object.hasOwnProperty.call(e, "required") || (e.required = !s), r.AST.isUnion(t)) {
+    if (Object.hasOwnProperty.call(e, "required") || (e.required = !s), i.AST.isUnion(t)) {
       const l = L(t.types), a = l.find(
-        (m) => m._tag !== "UndefinedKeyword" && m !== r.Null.ast
+        (m) => m._tag !== "UndefinedKeyword" && m !== i.Null.ast
       );
       return "propertySignatures" in a ? f({
         propertySignatures: a.propertySignatures,
         parent: n,
         meta: e
-      }) : l.every(r.AST.isLiteral) ? {
+      }) : l.every(i.AST.isLiteral) ? {
         ...e,
         type: "select",
         members: l.map((m) => m.literal)
@@ -203,43 +203,40 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
         })
       };
     }
-    if (r.AST.isTupleType(t))
-      return {
-        ...e,
-        type: "multiple",
-        members: t.elements,
-        rest: t.rest
-      };
-    const i = r.AST.getAnnotation(
+    return i.AST.isTupleType(t) ? {
+      ...e,
+      type: "multiple",
+      members: t.elements,
+      rest: t.rest
+    } : (e = { ...i.AST.getAnnotation(
       t,
-      r.AST.JSONSchemaAnnotationId
-    ).pipe(q.getOrElse(() => ({})));
-    return e = { ...e, ...i }, "from" in t ? f({
+      i.AST.JSONSchemaAnnotationId
+    ).pipe(q.getOrElse(() => ({}))), ...e }, "from" in t ? f({
       parent: n,
       meta: e,
       property: t.from
-    }) : (e.type = r.AST.getAnnotation(
+    }) : (e.type = i.AST.getAnnotation(
       t,
-      r.AST.TitleAnnotationId
+      i.AST.TitleAnnotationId
     ).pipe(
       q.getOrElse(() => "unknown")
-    ), e);
+    ), e));
   }
   return o;
 }, N = (e) => {
   const n = e.ast, t = {}, p = {};
   if (n._tag === "Transformation" || n._tag === "Refinement")
-    return N(r.make(n.from));
+    return N(i.make(n.from));
   if (n._tag === "Union") {
-    const i = (n.types || []).filter((a) => a._tag !== "UndefinedKeyword" && a !== r.Null.ast).map(_);
-    if (i.every((a) => a._tag === "TypeLiteral" && "propertySignatures" in a) && i.length > 0) {
+    const r = (n.types || []).filter((a) => a._tag !== "UndefinedKeyword" && a !== i.Null.ast).map(_);
+    if (r.every((a) => a._tag === "TypeLiteral" && "propertySignatures" in a) && r.length > 0) {
       const a = [];
-      for (const m of i)
+      for (const m of r)
         if ("propertySignatures" in m) {
           const b = m.propertySignatures.find(
             (v) => v.name.toString() === "_tag"
           );
-          b && r.AST.isLiteral(b.type) && a.push(b.type.literal);
+          b && i.AST.isLiteral(b.type) && a.push(b.type.literal);
           const c = f({
             propertySignatures: m.propertySignatures
           });
@@ -256,67 +253,67 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
     const o = f({
       propertySignatures: n.propertySignatures
     });
-    if (Object.values(o).every((i) => i && "type" in i))
+    if (Object.values(o).every((r) => r && "type" in r))
       return { meta: o, defaultValues: p };
-    const s = (i, l = "") => {
-      for (const a in i) {
+    const s = (r, l = "") => {
+      for (const a in r) {
         const m = l ? `${l}.${a}` : a;
-        i[a] && typeof i[a] == "object" && "type" in i[a] ? t[m] = i[a] : i[a] && typeof i[a] == "object" && s(i[a], m);
+        r[a] && typeof r[a] == "object" && "type" in r[a] ? t[m] = r[a] : r[a] && typeof r[a] == "object" && s(r[a], m);
       }
     };
     s(o);
   }
   return { meta: t, defaultValues: p };
-}, B = (e) => r.extend(e, r.Struct({})), J = (e) => {
+}, J = (e) => i.extend(e, i.Struct({})), z = (e) => {
   const { meta: n } = N(e);
   return { schema: e, meta: n };
-}, z = (e) => {
+}, B = (e) => {
   const { trans: n } = V();
   let t;
   switch (e.type) {
     case "string":
-      t = r.String.annotations({
+      t = i.String.annotations({
         message: () => n("validation.empty")
-      }), e.format === "email" && (t = r.compose(
+      }), e.format === "email" && (t = i.compose(
         t,
-        r.Email.annotations({
+        i.Email.annotations({
           message: () => n("validation.email.invalid")
         })
       )), e.required && (t = t.annotations({
         message: () => n("validation.empty")
-      }).pipe(r.minLength(1)).annotations({
+      }).pipe(i.minLength(1)).annotations({
         message: () => n("validation.empty")
-      })), typeof e.maxLength == "number" && (t = t.pipe(r.maxLength(e.maxLength)).annotations({
+      })), typeof e.maxLength == "number" && (t = t.pipe(i.maxLength(e.maxLength)).annotations({
         message: () => n("validation.string.maxLength", {
           maxLength: e.maxLength
         })
-      })), typeof e.minLength == "number" && (t = t.pipe(r.minLength(e.minLength)).annotations({
+      })), typeof e.minLength == "number" && (t = t.pipe(i.minLength(e.minLength)).annotations({
         message: () => n("validation.string.minLength", {
           minLength: e.minLength
         })
       }));
       break;
     case "number":
-      t = r.Number.annotations({
+      t = i.Number.annotations({
         message: () => n("validation.empty")
       }), e.required && t.annotations({
         message: () => n("validation.empty")
-      }), typeof e.minimum == "number" && (t = t.pipe(r.greaterThanOrEqualTo(e.minimum)).annotations({
+      }), typeof e.minimum == "number" && (console.log("pippocazzo", e), t = t.pipe(i.greaterThanOrEqualTo(e.minimum)).annotations({
         message: () => n(e.minimum === 0 ? "validation.number.positive" : "validation.number.min", {
           minimum: e.minimum,
           isExclusive: !0
         })
-      })), typeof e.maximum == "number" && (t = t.pipe(r.lessThanOrEqualTo(e.maximum)).annotations({
+      })), typeof e.maximum == "number" && (t = t.pipe(i.lessThanOrEqualTo(e.maximum)).annotations({
         message: () => n("validation.number.max", {
           maximum: e.maximum,
           isExclusive: !0
         })
-      })), typeof e.exclusiveMinimum == "number" && (t = t.pipe(r.greaterThan(e.exclusiveMinimum)).annotations({
+      })), typeof e.exclusiveMinimum == "number" && (t = t.pipe(i.greaterThan(e.exclusiveMinimum)).annotations({
         message: () => n(e.exclusiveMinimum === 0 ? "validation.number.positive" : "validation.number.min", {
           minimum: e.exclusiveMinimum,
           isExclusive: !1
         })
-      })), typeof e.exclusiveMaximum == "number" && (t = t.pipe(r.lessThan(e.exclusiveMaximum)).annotations({
+      })), typeof e.exclusiveMaximum == "number" && (t = t.pipe(i.lessThan(e.exclusiveMaximum)).annotations({
         message: () => n("validation.number.max", {
           maximum: e.exclusiveMaximum,
           isExclusive: !1
@@ -324,7 +321,7 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
       }));
       break;
     case "select":
-      t = r.Literal(...e.members).annotations({
+      t = i.Literal(...e.members).annotations({
         message: () => ({
           message: n("validation.not_a_valid", {
             type: "select",
@@ -335,7 +332,7 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
       });
       break;
     case "multiple":
-      t = r.Array(r.String).annotations({
+      t = i.Array(i.String).annotations({
         message: () => n("validation.not_a_valid", {
           type: "multiple",
           message: e.members.join(", ")
@@ -343,22 +340,22 @@ const $ = (e) => r.AST.isUnion(e) && e.types.find((n) => n._tag === "UndefinedKe
       });
       break;
     case "boolean":
-      t = r.Boolean;
+      t = i.Boolean;
       break;
     case "unknown":
-      t = r.Unknown;
+      t = i.Unknown;
       break;
     default:
-      console.warn(`Unhandled field type: ${e}`), t = r.Unknown;
+      console.warn(`Unhandled field type: ${e}`), t = i.Unknown;
       break;
   }
   return e.required ? t.pipe(
-    r.annotations({
+    i.annotations({
       message: () => n("validation.empty")
     })
-  ) : t = r.NullishOr(t), r.standardSchemaV1(t);
-}, C = (e, n) => r.NullOr(e).pipe(
-  r.transform(r.typeSchema(e), {
+  ) : t = i.NullishOr(t), i.standardSchemaV1(t);
+}, C = (e, n) => i.NullOr(e).pipe(
+  i.transform(i.typeSchema(e), {
     decode: (t) => t ?? n(),
     encode: (t) => t
   })
@@ -401,10 +398,10 @@ const x = (e, n = {}) => {
     if (U(e)) {
       const p = {};
       for (const [o, s] of Object.entries(e.fields)) {
-        const i = s?.ast;
-        if (i?.defaultValue)
+        const r = s?.ast;
+        if (r?.defaultValue)
           try {
-            p[o] = i.defaultValue();
+            p[o] = r.defaultValue();
             continue;
           } catch {
           }
@@ -416,33 +413,33 @@ const x = (e, n = {}) => {
     if (e?.from && U(e.from))
       return x(e.from, n);
     if (F(e)) {
-      const p = e.members.reduce((o, s) => (U(s) && Object.entries(s.fields).forEach(([i, l]) => {
-        const a = l.ast, m = o[i]?.ast;
-        (!o[i] || a?.defaultValue && !m?.defaultValue) && (o[i] = l);
+      const p = e.members.reduce((o, s) => (U(s) && Object.entries(s.fields).forEach(([r, l]) => {
+        const a = l.ast, m = o[r]?.ast;
+        (!o[r] || a?.defaultValue && !m?.defaultValue) && (o[r] = l);
       }), o), {});
-      return Object.entries(p).reduce((o, [s, i]) => (o[s] = x(i, n[s] || {}), o), n);
+      return Object.entries(p).reduce((o, [s, r]) => (o[s] = x(r, n[s] || {}), o), n);
     }
     if (Object.keys(n).length === 0)
       switch (e.ast._tag) {
         case "Refinement":
-          return x(r.make(e.ast.from), n);
+          return x(i.make(e.ast.from), n);
         case "Transformation": {
-          const p = r.make(e.ast.from);
+          const p = i.make(e.ast.from);
           return x(p, n);
         }
         case "TypeLiteral": {
           const p = { ...n };
           for (const o of t.propertySignatures) {
-            const s = o.name.toString(), i = o.type;
-            if (i._tag === "Transformation" && i.defaultValue) {
-              p[s] = i.defaultValue();
+            const s = o.name.toString(), r = o.type;
+            if (r._tag === "Transformation" && r.defaultValue) {
+              p[s] = r.defaultValue();
               continue;
             }
-            if (i.defaultValue) {
-              p[s] = i.defaultValue();
+            if (r.defaultValue) {
+              p[s] = r.defaultValue();
               continue;
             }
-            const l = r.make(i), a = x(l, n[s] || {});
+            const l = i.make(r), a = x(l, n[s] || {});
             a !== void 0 && (p[s] = a);
           }
           return p;
@@ -458,9 +455,9 @@ export {
   f as createMeta,
   j as deepMerge,
   x as defaultsValueFromSchema,
-  B as duplicateSchema,
-  z as generateInputStandardSchemaFromFieldMeta,
-  J as generateMetaFromSchema,
+  J as duplicateSchema,
+  B as generateInputStandardSchemaFromFieldMeta,
+  z as generateMetaFromSchema,
   G as getInputType,
   g as isNullableOrUndefined,
   C as nullableInput

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "2.10.8",
+  "version": "2.10.9",
   "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.6",
-    "effect-app": "3.15.1"
+    "effect-app": "3.15.1",
+    "@effect-app/vue": "2.93.6"
   },
   "scripts": {
     "build": "pnpm build:run",

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -653,7 +653,7 @@ export const createMeta = <T = any>(
       )
       .pipe(Option.getOrElse(() => ({}))) as Record<string, unknown>
 
-    meta = { ...meta, ...JSONAnnotation }
+    meta = { ...JSONAnnotation, ...meta }
 
     if ("from" in property) {
       return createMeta<T>({
@@ -850,6 +850,7 @@ export const generateInputStandardSchemaFromFieldMeta = (
         })
       }
       if (typeof meta.minimum === "number") {
+        console.log("pippocazzo", meta)
         schema = schema.pipe(S.greaterThanOrEqualTo(meta.minimum)).annotations({
           message: () =>
             trans(meta.minimum === 0 ? "validation.number.positive" : "validation.number.min", {