@effect-app/vue-components 1.0.0-next.21 → 1.0.0-next.3

package/dist/vue-components.es8.js

@@ -1,352 +1,4 @@
-import { S as n, Option as c, pipe as L } from "effect-app";
-import { getTransformationFrom as U, useIntl as _ } from "./vue-components.es3.js";
-const N = n.NonEmptyArray(n.String), E = (e) => n.AST.isUnion(e) && e.types.find((i) => i._tag === "UndefinedKeyword" || i === n.Null.ast), g = (e) => !e || !n.AST.isUnion(e) ? !1 : e.types.find((i) => i._tag === "UndefinedKeyword") ? "undefined" : e.types.find((i) => i === n.Null.ast) ? "null" : !1, m = ({ meta: e = {}, parent: i = "", property: t, propertySignatures: p }, o = {}) => {
-  if (t && t._tag === "Transformation")
-    return m({
-      parent: i,
-      meta: e,
-      property: t.from
-    });
-  if (t?._tag === "TypeLiteral" && "propertySignatures" in t)
-    return m({
-      meta: e,
-      propertySignatures: t.propertySignatures
-    });
-  if (p) {
-    for (const r of p) {
-      const l = i ? `${i}.${r.name.toString()}` : r.name.toString(), a = g(r.type), u = !a, A = r.type;
-      if (n.AST.isUnion(r.type)) {
-        const T = r.type.types.filter(
-          (s) => s._tag !== "UndefinedKeyword" && s !== n.Null.ast
-        ).map(U);
-        if (T.some(
-          (s) => "propertySignatures" in s
-        )) {
-          if (!a) {
-            const s = m({
-              parent: l,
-              property: r.type,
-              meta: { required: u, nullableOrUndefined: a }
-            });
-            o[l] = s;
-          }
-          for (const s of T)
-            "propertySignatures" in s && Object.assign(
-              o,
-              m({
-                parent: l,
-                propertySignatures: s.propertySignatures,
-                meta: { required: u, nullableOrUndefined: a }
-              })
-            );
-        } else {
-          const s = T.filter(n.AST.isTupleType);
-          if (s.length > 0) {
-            const f = s[0];
-            if (o[l] = {
-              type: "multiple",
-              members: f.elements,
-              rest: f.rest,
-              required: u,
-              nullableOrUndefined: a
-            }, f.rest && f.rest.length > 0) {
-              const d = f.rest[0];
-              if (d.type._tag === "TypeLiteral" && "propertySignatures" in d.type)
-                for (const y of d.type.propertySignatures) {
-                  const b = `${l}.${y.name.toString()}`, S = m({
-                    parent: b,
-                    property: y.type,
-                    meta: {
-                      required: !g(y.type),
-                      nullableOrUndefined: g(y.type)
-                    }
-                  });
-                  if (S && typeof S == "object" && "type" in S && (o[b] = S, S.type === "multiple" && n.AST.isTupleType(y.type) && y.type.rest && y.type.rest.length > 0)) {
-                    const O = y.type.rest[0];
-                    if (O.type._tag === "TypeLiteral" && "propertySignatures" in O.type)
-                      for (const x of O.type.propertySignatures) {
-                        const M = `${b}.${x.name.toString()}`, v = m({
-                          parent: M,
-                          property: x.type,
-                          meta: {
-                            required: !g(x.type),
-                            nullableOrUndefined: g(x.type)
-                          }
-                        });
-                        v && typeof v == "object" && "type" in v && (o[M] = v);
-                      }
-                  }
-                }
-            }
-          } else {
-            const f = m({
-              parent: l,
-              property: r.type,
-              meta: { required: u, nullableOrUndefined: a }
-            });
-            o[l] = f;
-          }
-        }
-      } else if ("propertySignatures" in A)
-        Object.assign(
-          o,
-          m({
-            parent: l,
-            propertySignatures: A.propertySignatures,
-            meta: { required: u, nullableOrUndefined: a }
-          })
-        );
-      else if (n.AST.isTupleType(r.type))
-        if (r.type.rest.length > 0 && r.type.rest[0].type._tag === "TypeLiteral" && "propertySignatures" in r.type.rest[0].type) {
-          const h = r.type.rest[0].type;
-          if (h._tag === "TypeLiteral" && "propertySignatures" in h)
-            for (const s of h.propertySignatures) {
-              const f = `${l}.${s.name.toString()}`;
-              if (n.AST.isTupleType(s.type) && s.type.rest.length > 0) {
-                const d = s.type.rest[0].type;
-                if (d._tag === "TypeLiteral" && "propertySignatures" in d)
-                  for (const y of d.propertySignatures) {
-                    const b = `${f}.${y.name.toString()}`, S = m({
-                      parent: b,
-                      property: y.type,
-                      meta: {
-                        required: !g(y.type),
-                        nullableOrUndefined: g(y.type)
-                      }
-                    });
-                    o[b] = S;
-                  }
-                else
-                  o[f] = {
-                    type: "multiple",
-                    members: s.type.elements,
-                    rest: s.type.rest,
-                    required: !g(s.type),
-                    nullableOrUndefined: g(s.type)
-                  };
-              } else {
-                const d = m({
-                  parent: f,
-                  property: s.type,
-                  meta: {
-                    required: !g(s.type),
-                    nullableOrUndefined: g(s.type)
-                  }
-                });
-                o[f] = d;
-              }
-            }
-        } else
-          o[l] = {
-            type: "multiple",
-            members: r.type.elements,
-            rest: r.type.rest,
-            required: u,
-            nullableOrUndefined: a
-          };
-      else {
-        const T = m({
-          parent: l,
-          property: r.type,
-          meta: { required: u, nullableOrUndefined: a }
-        });
-        o[l] = T;
-      }
-    }
-    return o;
-  }
-  if (t) {
-    const r = E(t);
-    if (Object.hasOwnProperty.call(e, "required") || (e.required = !r), n.AST.isUnion(t)) {
-      const a = t.types.find(
-        (u) => u._tag !== "UndefinedKeyword" && u !== n.Null.ast
-      );
-      return "propertySignatures" in a ? m({
-        propertySignatures: a.propertySignatures,
-        parent: i,
-        meta: e
-      }) : t.types.every(n.AST.isLiteral) ? {
-        ...e,
-        type: "select",
-        members: t.types.map((u) => u.literal)
-      } : {
-        ...e,
-        ...m({
-          parent: i,
-          meta: e,
-          property: a
-        })
-      };
-    }
-    if (n.AST.isTupleType(t))
-      return {
-        ...e,
-        type: "multiple",
-        members: t.elements,
-        rest: t.rest
-      };
-    const l = n.AST.getAnnotation(
-      t,
-      n.AST.JSONSchemaAnnotationId
-    ).pipe(c.getOrElse(() => ({})));
-    return e = { ...e, ...l }, "from" in t ? m({
-      parent: i,
-      meta: e,
-      property: t.from
-    }) : (e.type = n.AST.getAnnotation(
-      t,
-      n.AST.TitleAnnotationId
-    ).pipe(
-      c.getOrElse(() => "unknown")
-    ), e);
-  }
-  return o;
-}, q = (e) => {
-  const i = e.ast, t = {};
-  if (i._tag === "Transformation" || i._tag === "Refinement")
-    return q(n.make(i.from));
-  if ("propertySignatures" in i) {
-    const p = m({
-      propertySignatures: i.propertySignatures
-    });
-    if (Object.values(p).every((r) => r && "type" in r))
-      return p;
-    const o = (r, l = "") => {
-      for (const a in r) {
-        const u = l ? `${l}.${a}` : a;
-        r[a] && typeof r[a] == "object" && "type" in r[a] ? t[u] = r[a] : r[a] && typeof r[a] == "object" && o(r[a], u);
-      }
-    };
-    o(p);
-  }
-  return t;
-}, I = (e) => n.extend(e, n.Struct({})), K = (e) => {
-  const i = q(e), t = L(
-    e.ast,
-    c.liftPredicate((p) => p._tag === "Refinement" && "filter" in p),
-    c.flatMap((p) => n.AST.getJSONSchemaAnnotation(p)),
-    c.filter((p) => "items" in p),
-    c.filterMap(({ items: p }) => n.decodeUnknownOption(N)(p)),
-    c.zipWith(
-      n.AST.getMessageAnnotation(e.ast),
-      (p, o) => ({
-        items: p,
-        message: o("")
-      })
-    ),
-    c.getOrUndefined
-  );
-  return { schema: e, meta: i, filterItems: t };
-}, P = (e) => {
-  const { trans: i } = _();
-  let t;
-  switch (e.type) {
-    case "string":
-      t = n.String.annotations({
-        message: () => i("validation.empty")
-      }), e.format === "email" && (t = n.compose(
-        t,
-        n.Email.annotations({
-          message: () => i("validation.email.invalid")
-        })
-      )), e.required && t.annotations({
-        message: () => i("validation.empty")
-      }), e.maxLength && (t = t.pipe(n.maxLength(e.maxLength)).annotations({
-        message: () => i("validation.string.maxLength", {
-          maxLength: e.maxLength
-        })
-      })), e.minLength && (t = t.pipe(n.minLength(e.minLength)).annotations({
-        message: () => i("validation.string.minLength", {
-          minLength: e.minLength
-        })
-      }));
-      break;
-    case "number":
-      t = n.Number.annotations({
-        message: () => i("validation.empty")
-      }), e.required && t.annotations({
-        message: () => i("validation.empty")
-      }), e.minimum && (t = t.pipe(n.greaterThanOrEqualTo(e.minimum)).annotations({
-        message: () => i("validation.number.min", {
-          minimum: e.minimum,
-          isExclusive: !0
-        })
-      })), e.maximum && (t = t.pipe(n.lessThanOrEqualTo(e.maximum)).annotations({
-        message: () => i("validation.number.max", {
-          maximum: e.maximum,
-          isExclusive: !0
-        })
-      })), e.exclusiveMinimum && (t = t.pipe(n.greaterThan(e.exclusiveMinimum)).annotations({
-        message: () => i("validation.number.min", {
-          minimum: e.exclusiveMinimum,
-          isExclusive: !1
-        })
-      })), e.exclusiveMaximum && (t = t.pipe(n.lessThan(e.exclusiveMaximum)).annotations({
-        message: () => i("validation.number.max", {
-          maximum: e.exclusiveMaximum,
-          isExclusive: !1
-        })
-      }));
-      break;
-    case "select":
-      t = n.Literal(...e.members).annotations({
-        message: () => ({
-          message: i("validation.not_a_valid", {
-            type: "select",
-            message: e.members.join(", ")
-          }),
-          override: !0
-        })
-      });
-      break;
-    case "multiple":
-      t = n.Array(n.String).annotations({
-        message: () => i("validation.not_a_valid", {
-          type: "multiple",
-          message: e.members.join(", ")
-        })
-      });
-      break;
-    case "boolean":
-      t = n.Boolean;
-      break;
-    // todo: switch must be exhaustive or have default case, otherwise falls through with schema undefined.
-    case "unknown":
-      t = n.Unknown;
-      break;
-  }
-  return e.required ? t.pipe(
-    n.annotations({
-      message: () => i("validation.empty")
-    })
-  ) : t = n.NullishOr(t), n.standardSchemaV1(t);
-}, j = (e, i) => n.NullOr(e).pipe(
-  n.transform(n.typeSchema(e), {
-    decode: (t) => t ?? i(),
-    encode: (t) => t
-  })
-), k = [
-  "button",
-  "checkbox",
-  "color",
-  "date",
-  "email",
-  "number",
-  "password",
-  "radio",
-  "range",
-  "search",
-  "submit",
-  "tel",
-  "text",
-  "time",
-  "url"
-], F = (e) => k.includes(e) ? e : "text";
+import f from "./vue-components.es4.js";
 export {
-  m as createMeta,
-  I as duplicateSchema,
-  P as generateInputStandardSchemaFromFieldMeta,
-  K as generateMetaFromSchema,
-  F as getInputType,
-  j as nullableInput
+  f as default
 };

package/dist/vue-components.es9.js

@@ -1,4 +1,12 @@
-import f from "./vue-components.es5.js";
+import { Exit as c, Runtime as s } from "effect";
+import { dual as n, isFunction as m } from "./vue-components.es18.js";
+const i = Symbol.for("clone-trait"), u = n(2, (e, t) => i in e ? e[i](t) : Object.setPrototypeOf(t, Object.getPrototypeOf(e)));
+n(2, (e, t) => u(e, { ...e, ...m(t) ? t(e) : t }));
+const b = (e) => new Promise((t, r) => e.addObserver((o) => {
+  c.isSuccess(o) ? t(o.value) : r(s.makeFiberFailure(o.cause));
+}));
 export {
-  f as default
+  u as clone,
+  i as cloneTrait,
+  b as runtimeFiberAsPromise
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "1.0.0-next.21",
+  "version": "1.0.0-next.3",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^3.17.13",
@@ -49,7 +49,7 @@
     "@tanstack/vue-form": "^1.23.0",
     "highlight.js": "^11.11.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "2.80.3-next.8",
+    "@effect-app/vue": "2.80.2",
     "effect-app": "3.8.0"
   },
   "scripts": {

package/src/components/OmegaForm/OmegaAutoGen.vue

@@ -22,8 +22,12 @@
 import { type DeepKeys } from "@tanstack/vue-form"
 import { Array as A, Order, pipe } from "effect-app"
 import { computed } from "vue"
-import { type FieldMeta, type OmegaAutoGenMeta, type OmegaInputProps } from "./OmegaFormStuff"
+import { type FieldMeta, type OmegaInputProps } from "./OmegaFormStuff"
 
+export type OmegaAutoGenMeta<
+  From extends Record<PropertyKey, string>,
+  To extends Record<PropertyKey, string>
+> = Omit<OmegaInputProps<From, To>, "form">
 type NewMeta = OmegaAutoGenMeta<From, To>
 
 const mapObject = <K extends string, A, B>(fn: (value: A, key: K) => B) => (obj: Record<K, A>): Record<K, B> =>

package/src/components/OmegaForm/OmegaFormInput.vue

@@ -26,7 +26,7 @@
 import { type DeepKeys } from "@tanstack/vue-form"
 import { inject } from "vue"
 import type { InputProps } from "./InputProps"
-import type { DefaultInputProps, OmegaInputProps } from "./OmegaFormStuff"
+import type { FieldValidators, OmegaInputProps, TypeOverride } from "./OmegaFormStuff"
 import OmegaInput from "./OmegaInput.vue"
 import { OmegaFormKey } from "./useOmegaForm"
 
@@ -39,11 +39,13 @@ if (!form) {
   throw new Error("OmegaFormInput must be used within an OmegaForm context")
 }
 
-defineProps<
-  {
-    name: Name
-  } & DefaultInputProps<From>
->()
+defineProps<{
+  name: Name
+  label?: string
+  validators?: FieldValidators<From>
+  options?: { title: string; value: string }[]
+  type?: TypeOverride
+}>()
 
 defineSlots<{
   default(props: InputProps<From, Name>): void

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -4,42 +4,21 @@ import { type DeepKeys, type FieldAsyncValidateOrFn, type FieldValidateOrFn, typ
 import { type RuntimeFiber } from "effect/Fiber"
 import { getTransformationFrom, useIntl } from "../../utils"
 import { type OmegaFieldInternalApi } from "./InputProps"
-import { type OF, type OmegaFormReturn } from "./useOmegaForm"
+import { type OmegaFormReturn } from "./useOmegaForm"
 
 export type ShowErrorsOn = "onChange" | "onBlur" | "onSubmit"
 
-export type DefaultInputProps<From> = {
-  label?: string
-  validators?: FieldValidators<From>
-  options?: {
-    title: string
-    value: string
-  }[]
-  type?: TypeOverride
-}
-
-export type OmegaInputPropsBase<
-  From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>
-> = {
-  form: OF<From, To> & {
+export type OmegaInputProps<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>> = {
+  form: OmegaFormReturn<From, To> & {
     meta: MetaRecord<From>
     i18nNamespace?: string
   }
   name: NestedKeyOf<From>
-} & DefaultInputProps<From>
-
-export type OmegaInputProps<
-  From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>,
-  InputProps = DefaultInputProps<From>
-> = {
-  form: OmegaFormReturn<From, To, InputProps> & {
-    meta: MetaRecord<From>
-    i18nNamespace?: string
-  }
-  name: NestedKeyOf<From>
-} & DefaultInputProps<From> // InputProps // TODO
+  validators?: FieldValidators<From>
+  label?: string
+  options?: { title: string; value: string }[]
+  type?: TypeOverride
+}
 
 export type TypeOverride =
   | "string"
@@ -48,7 +27,6 @@ export type TypeOverride =
   | "select"
   | "multiple"
   | "boolean"
-  | "radio"
   | "autocomplete"
   | "autocompletemultiple"
   | "switch"
@@ -804,29 +782,3 @@ export const nullableInput = <A, I, R>(
       encode: (input) => input
     })
   )
-
-export type OmegaAutoGenMeta<
-  From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>
-> = Omit<OmegaInputProps<From, To>, "form">
-
-const supportedInputs = [
-  "button",
-  "checkbox",
-  "color",
-  "date",
-  "email",
-  "number",
-  "password",
-  "radio",
-  "range",
-  "search",
-  "submit",
-  "tel",
-  "text",
-  "time",
-  "url"
-] as const
-export type SupportedInputs = typeof supportedInputs[number]
-export const getInputType = (input: string): SupportedInputs =>
-  (supportedInputs as readonly string[]).includes(input) ? input as SupportedInputs : "text"

package/src/components/OmegaForm/OmegaInput.vue

@@ -1,6 +1,5 @@
 <template>
-  <component
-    :is="form.Field"
+  <form.Field
     :name="name"
     :validators="{
       onChange: schema,
@@ -22,7 +21,7 @@
         </template>
       </OmegaInternalInput>
     </template>
-  </component>
+  </form.Field>
 </template>
 
 <script
@@ -36,10 +35,10 @@
 >
 import { computed, inject, type Ref } from "vue"
 import { useIntl } from "../../utils"
-import { type FieldMeta, generateInputStandardSchemaFromFieldMeta, type OmegaInputPropsBase } from "./OmegaFormStuff"
+import { type FieldMeta, generateInputStandardSchemaFromFieldMeta, type OmegaInputProps } from "./OmegaFormStuff"
 import OmegaInternalInput from "./OmegaInternalInput.vue"
 
-const props = defineProps<OmegaInputPropsBase<From, To>>()
+const props = defineProps<OmegaInputProps<From, To>>()
 
 defineOptions({
   inheritAttrs: false

package/src/components/OmegaForm/OmegaInputVuetify.vue

@@ -23,7 +23,7 @@
       :required="inputProps.required"
       :min-length="inputProps.minLength"
       :max-length="inputProps.maxLength"
-      :type="getInputType(inputProps.type)"
+      :type="inputProps.type"
       :name="inputProps.name"
       :label="inputProps.label"
       :error-messages="inputProps.errorMessages"
@@ -38,6 +38,7 @@
       :required="inputProps.required"
       :min-length="inputProps.minLength"
       :max-length="inputProps.maxLength"
+      :type="inputProps.type"
       :name="inputProps.name"
       :label="inputProps.label"
       :error-messages="inputProps.errorMessages"
@@ -68,25 +69,6 @@
         }
       }"
     />
-    <template v-if="inputProps.type === 'radio'">
-      <v-radio-group
-        :id="inputProps.id"
-        :name="inputProps.name"
-        :label="inputProps.label"
-        :error-messages="inputProps.errorMessages"
-        :error="inputProps.error"
-        v-bind="$attrs"
-        :model-value="vuetifyValue"
-        @update:model-value="inputProps.field.handleChange"
-      >
-        <v-radio
-          v-for="option in inputProps.options"
-          :key="option.value"
-          :label="option.title"
-          :value="option.value"
-        />
-      </v-radio-group>
-    </template>
     <v-select
       v-if="inputProps.type === 'select' || inputProps.type === 'multiple'"
       :id="inputProps.id"
@@ -132,7 +114,6 @@
   generic="From extends Record<PropertyKey, any>, Name extends DeepKeys<From>"
 >
 import { type DeepKeys } from "@tanstack/vue-form"
-import { getInputType } from "../OmegaForm/OmegaFormStuff"
 import type { InputProps } from "./InputProps"
 
 defineProps<{

package/src/components/OmegaForm/OmegaWrapper.vue

@@ -31,8 +31,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { useStore } from "@tanstack/vue-form"
 import { getOmegaStore } from "./getOmegaStore"
-import { type DefaultInputProps, type OmegaFormApi, type OmegaFormState } from "./OmegaFormStuff"
-import { type OmegaFormReturn } from "./useOmegaForm"
+import { type OmegaFormApi, type OmegaFormState } from "./OmegaFormStuff"
+import { type DefaultInputProps, type OmegaFormReturn } from "./useOmegaForm"
 
 type OmegaWrapperProps = {
   form: OmegaFormReturn<From, To, Props>

package/src/components/OmegaForm/index.ts

@@ -4,8 +4,4 @@ export * as OmegaErrorsContext from "./OmegaErrorsContext"
 export * from "./OmegaFormStuff"
 export { type OmegaFormReturn, useOmegaForm } from "./useOmegaForm"
 
-export { default as OmegaVuetifyInput } from "./OmegaInternalInput.vue"
-
-export { getInputType } from "./OmegaFormStuff"
-
 export { OmegaInput }