@effect-app/vue-components 3.0.7 → 3.2.0

package/src/components/OmegaForm/OmegaFormStuff.ts

@@ -246,11 +246,12 @@ export type StringFieldMeta = BaseFieldMeta & {
 }
 
 export type NumberFieldMeta = BaseFieldMeta & {
-  type: "number" | "int"
+  type: "number"
   minimum?: number
   maximum?: number
   exclusiveMinimum?: number
   exclusiveMaximum?: number
+  refinement?: "int"
 }
 
 export type SelectFieldMeta = BaseFieldMeta & {
@@ -682,7 +683,8 @@ export const createMeta = <T = any>(
     // if this is S.Int (a refinement), set the type and skip following "from"
     // otherwise we'd lose the "Int" information and get "number" instead
     if (titleType === "Int" || titleType === "int") {
-      meta["type"] = "int"
+      meta["type"] = "number"
+      meta["refinement"] = "int"
       // don't follow "from" for Int refinements
     } else if ("from" in property) {
       return createMeta<T>({
@@ -888,66 +890,28 @@ export const generateInputStandardSchemaFromFieldMeta = (
       }
       break
 
-    case "int": {
-      // create a custom integer schema with translations
-      // S.Number with empty message, then S.int with integer message
-      schema = S
-        .Number
-        .annotations({
-          message: () => trans("validation.empty")
-        })
-        .pipe(
-          S.int({ message: (issue) => trans("validation.integer.expected", { actualValue: String(issue.actual) }) })
-        )
-      if (typeof meta.minimum === "number") {
-        schema = schema.pipe(S.greaterThanOrEqualTo(meta.minimum)).annotations({
-          message: () =>
-            trans(meta.minimum === 0 ? "validation.number.positive" : "validation.number.min", {
-              minimum: meta.minimum,
-              isExclusive: true
-            })
-        })
-      }
-      if (typeof meta.maximum === "number") {
-        schema = schema.pipe(S.lessThanOrEqualTo(meta.maximum)).annotations({
-          message: () =>
-            trans("validation.number.max", {
-              maximum: meta.maximum,
-              isExclusive: true
-            })
-        })
-      }
-      if (typeof meta.exclusiveMinimum === "number") {
-        schema = schema.pipe(S.greaterThan(meta.exclusiveMinimum)).annotations({
-          message: () =>
-            trans(meta.exclusiveMinimum === 0 ? "validation.number.positive" : "validation.number.min", {
-              minimum: meta.exclusiveMinimum,
-              isExclusive: false
-            })
-        })
-      }
-      if (typeof meta.exclusiveMaximum === "number") {
-        schema = schema.pipe(S.lessThan(meta.exclusiveMaximum)).annotations({
-          message: () =>
-            trans("validation.number.max", {
-              maximum: meta.exclusiveMaximum,
-              isExclusive: false
-            })
-        })
-      }
-      break
-    }
-
     case "number":
-      schema = S.Number.annotations({
-        message: () => trans("validation.number.expected", { actualValue: "NaN" })
-      })
-
-      if (meta.required) {
-        schema.annotations({
-          message: () => trans("validation.empty")
+      if (meta.refinement === "int") {
+        schema = S
+          .Number
+          .annotations({
+            message: () => trans("validation.empty")
+          })
+          .pipe(
+            S.int({ message: (issue) => trans("validation.integer.expected", { actualValue: String(issue.actual) }) })
+          )
+      } else {
+        schema = S.Number.annotations({
+          message: () => trans("validation.number.expected", { actualValue: "NaN" })
         })
+
+        if (meta.required) {
+          schema.annotations({
+            message: () => trans("validation.empty")
+          })
+        }
       }
+
       if (typeof meta.minimum === "number") {
         schema = schema.pipe(S.greaterThanOrEqualTo(meta.minimum)).annotations({
           message: () =>

package/src/components/OmegaForm/OmegaInputVuetify.vue

@@ -81,12 +81,12 @@
     </v-textarea>
     <component
       :is="inputProps.type === 'range' ? 'v-slider' : 'v-text-field'"
-      v-if="inputProps.type === 'number' || inputProps.type === 'int' || inputProps.type === 'range'"
+      v-if="inputProps.type === 'number' || inputProps.type === 'range'"
       :id="inputProps.id"
       :required="inputProps.required"
       :min="inputProps.min"
       :max="inputProps.max"
-      :type="inputProps.type === 'int' ? 'number' : inputProps.type"
+      :type="inputProps.type"
       :name="field.name"
       :label="inputProps.label"
       :error-messages="inputProps.errorMessages"

package/src/components/OmegaForm/OmegaInternalInput.vue

@@ -162,10 +162,10 @@ const inputProps: ComputedRef<InputProps<From, Name>> = computed(() => ({
     required: isRequired.value,
     minLength: props.meta?.type === "string" && props.meta?.minLength,
     maxLength: props.meta?.type === "string" && props.meta?.maxLength,
-    max: (props.meta?.type === "number" || props.meta?.type === "int")
+    max: (props.meta?.type === "number")
       && (props.meta?.maximum
         ?? (typeof props.meta?.exclusiveMaximum === "number" && props.meta.exclusiveMaximum - 1)),
-    min: (props.meta?.type === "number" || props.meta?.type === "int")
+    min: (props.meta?.type === "number")
       && (props.meta?.minimum
         ?? (typeof props.meta?.exclusiveMinimum === "number" && props.meta.exclusiveMinimum + 1)),
     errorMessages: errors.value,

package/dist/vue-components.es31.js

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

package/dist/vue-components.es36.js

@@ -1,34 +0,0 @@
-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.es52.js";
-const S = ["disabled"], V = /* @__PURE__ */ m({
-  __name: "OmegaWrapper",
-  props: {
-    form: {},
-    disabled: { type: Boolean },
-    subscribe: {}
-  },
-  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
-      }, [
-        a(t.$slots, "default", { subscribedValues: s(n) }, void 0, !0)
-      ], 8, S)
-    ], 32));
-  }
-});
-export {
-  V as default
-};