@effect-app/vue 0.87.0-next.14 → 0.87.0-next.16

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @effect-app/vue
 
+## 0.87.0-next.16
+
+### Patch Changes
+
+- 660d57a: upd
+- Updated dependencies [660d57a]
+  - @effect-app/schema@0.150.0-next.11
+  - @effect-app/vue@0.87.0-next.16
+  - @effect-app/prelude@0.107.0-next.14
+
+## 0.87.0-next.15
+
+### Patch Changes
+
+- 5f76678: reimplement vue form
+- Updated dependencies [5f76678]
+  - @effect-app/vue@0.87.0-next.15
+
 ## 0.87.0-next.14
 
 ### Patch Changes

package/_cjs/form.cjs

@@ -3,12 +3,24 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.buildFieldInfoFromFields = buildFieldInfoFromFields;
+exports.buildFormFromSchema = void 0;
 exports.convertIn = convertIn;
 exports.convertOut = convertOut;
 exports.convertOutInt = convertOutInt;
-exports.translate = exports.customSchemaErrors = void 0;
+exports.customSchemaErrors = void 0;
+exports.getMetadataFromSchema = getMetadataFromSchema;
+exports.translate = void 0;
+var tsplus_module_1 = _interopRequireWildcard(require("@effect/schema/Parser"));
+var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/prelude"));
+var tsplus_module_3 = _interopRequireWildcard(require("effect/Either"));
+var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/Function"));
+var _schema = require("@effect-app/schema");
 var _intl = require("@formatjs/intl");
 var _vue = require("vue");
+var JSONSchema = _interopRequireWildcard(require("@effect/schema/JSONSchema"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function convertIn(v, type) {
   return v === null ? "" : type === "text" ? v : `${v}`;
 }
@@ -20,6 +32,14 @@ function convertOutInt(v, type) {
 function convertOut(v, set, type) {
   return set(convertOutInt(v, type));
 }
+function buildFieldInfoFromFields(fields) {
+  if (!_schema.AST.isTypeLiteral(fields.ast)) throw new Error("not a struct type");
+  return fields.ast.propertySignatures.reduce((prev, cur) => {
+    ;
+    prev[cur.name] = buildFieldInfo(cur);
+    return prev;
+  }, {});
+}
 const f = Symbol();
 class PhantomTypeParameter {}
 // type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
@@ -29,4 +49,125 @@ const defaultIntl = (0, _intl.createIntl)({
 });
 const translate = exports.translate = (0, _vue.ref)(defaultIntl.formatMessage.bind(defaultIntl));
 const customSchemaErrors = exports.customSchemaErrors = (0, _vue.ref)(new Map());
+function buildFieldInfo(property) {
+  const propertyKey = property.name;
+  const schema = _schema.S.make(property.type);
+  const metadata = getMetadataFromSchema(property.type); // TODO
+  const parse = tsplus_module_1.parseEither(schema);
+  const nullable = _schema.AST.isUnion(property.type) && property.type.types.includes(tsplus_module_2.Schema2.null.ast);
+  const realSelf = nullable && _schema.AST.isUnion(property.type) ? property.type.types.filter(_ => _ !== tsplus_module_2.Schema2.null.ast)[0] : property.type;
+  function renderError(e, v) {
+    const err = e.toString();
+    const custom = customSchemaErrors.value.get(realSelf);
+    return custom ? custom(err, e, v) : translate.value({
+      defaultMessage: "The entered value is not a valid {type}: {message}",
+      id: "validation.not_a_valid"
+    }, {
+      type: translate.value({
+        defaultMessage: (0, _vue.capitalize)(propertyKey.toString()),
+        id: `fieldNames.${String(propertyKey)}`
+      }),
+      message: err // TODO err.slice(err.indexOf("expected")) // TODO: this is not translated.
+    });
+  }
+  const stringRules = [v => v === null || metadata.minLength === undefined || v.length >= metadata.minLength || translate.value({
+    defaultMessage: "The field requires at least {minLength} characters",
+    id: "validation.string.minLength"
+  }, {
+    minLength: metadata.minLength
+  }), v => v === null || metadata.maxLength === undefined || v.length <= metadata.maxLength || translate.value({
+    defaultMessage: "The field cannot have more than {maxLength} characters",
+    id: "validation.string.maxLength"
+  }, {
+    maxLength: metadata.maxLength
+  })];
+  const numberRules = [v => v === null || metadata.minimum === undefined || metadata.minimumExclusive && v > metadata.minimum || !metadata.minimumExclusive && v >= metadata.minimum || translate.value({
+    defaultMessage: "The value should be {isExclusive, select, true {larger than} other {at least}} {minimum}",
+    id: "validation.number.min"
+  }, {
+    isExclusive: metadata.minimumExclusive,
+    minimum: metadata.minimum
+  }), v => v === null || metadata.maximum === undefined || metadata.maximumExclusive && v < metadata.maximum || !metadata.maximumExclusive && v <= metadata.maximum || translate.value({
+    defaultMessage: "The value should be {isExclusive, select, true {smaller than} other {at most}} {maximum}",
+    id: "validation.number.max"
+  }, {
+    isExclusive: metadata.maximumExclusive,
+    maximum: metadata.maximum
+  })];
+  const parseRule = v => tsplus_module_4.pipe(parse(v), _ => tsplus_module_3.match(_, {
+    onLeft: _ => renderError(_, v),
+    onRight: () => true
+  }));
+  const rules = [...(metadata.type === "text" ? stringRules : numberRules), parseRule];
+  const info = {
+    type: metadata.type,
+    rules: [v => !metadata.required || v !== "" || translate.value({
+      defaultMessage: "The field cannot be empty",
+      id: "validation.empty"
+    }), v => {
+      const converted = convertOutInt(v, metadata.type);
+      for (const r of rules) {
+        const res = r(converted);
+        if (res !== true) {
+          return res;
+        }
+      }
+      return true;
+    }],
+    metadata
+  };
+  return info;
+}
+const buildFormFromSchema = (s, state, onSubmit) => {
+  const fields = buildFieldInfoFromFields(s);
+  const parse = tsplus_module_1.parseSync(s);
+  const isDirty = (0, _vue.ref)(false);
+  const isValid = (0, _vue.ref)(true);
+  const submit1 = onSubmit => async e => {
+    const r = await e;
+    if (!r.valid) return;
+    return onSubmit(parse(state.value));
+  };
+  const submit = submit1(onSubmit);
+  (0, _vue.watch)(state, v => {
+    // TODO: do better
+    isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value);
+  }, {
+    deep: true
+  });
+  const submitFromState = () => submit(Promise.resolve({
+    valid: isValid.value
+  }));
+  return {
+    fields,
+    submit,
+    submitFromState,
+    isDirty,
+    isValid
+  };
+};
+exports.buildFormFromSchema = buildFormFromSchema;
+function getMetadataFromSchema(ast) {
+  const nullable = _schema.AST.isUnion(ast) && ast.types.includes(tsplus_module_2.Schema2.null.ast);
+  const realSelf = nullable && _schema.AST.isUnion(ast) ? ast.types.filter(_ => _ !== tsplus_module_2.Schema2.null.ast)[0] : ast;
+  let jschema;
+  try {
+    jschema = JSONSchema.to(_schema.S.make(realSelf));
+  } catch (err) {
+    jschema = {};
+    console.warn("error getting jsonschema from ", err, ast);
+  }
+  const isNumber = jschema.type === "number" || jschema.type === "integer";
+  const isInt = jschema.type === "integer";
+  return {
+    type: isInt ? "int" : isNumber ? "float" : "text",
+    minimum: jschema.minimum,
+    minimumExclusive: jschema.exclusiveMinimum,
+    maximum: jschema.maximum,
+    maximumExclusive: jschema.exclusiveMaximum,
+    minLength: jschema.minLength,
+    maxLength: jschema.maxLength,
+    required: !nullable
+  };
+}
 //# sourceMappingURL=form.cjs.map

package/_cjs/form.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"form.cjs","names":["_intl","require","_vue","convertIn","v","type","convertOutInt","trim","c","parseFloat","parseInt","convertOut","set","f","Symbol","PhantomTypeParameter","defaultIntl","createIntl","locale","translate","exports","ref","formatMessage","bind","customSchemaErrors","Map"],"sources":["../_src/form.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;AACA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAEM,SAAUE,SAASA,CAACC,CAAgB,EAAEC,IAA+B;EACzE,OAAOD,CAAC,KAAK,IAAI,GAAG,EAAE,GAAGC,IAAI,KAAK,MAAM,GAAGD,CAAC,GAAG,GAAGA,CAAC,EAAE;AACvD;AAEM,SAAUE,aAAaA,CAACF,CAAS,EAAEC,IAA+B;EACtED,CAAC,GAAGA,CAAC,IAAI,IAAI,GAAGA,CAAC,GAAGA,CAAC,CAACG,IAAI,EAAE;EAC5B,MAAMC,CAAC,GAAGJ,CAAC,KAAK,EAAE,GAAG,IAAI,GAAGC,IAAI,KAAK,OAAO,GAAGI,UAAU,CAACL,CAAC,CAAC,GAAGC,IAAI,KAAK,KAAK,GAAGK,QAAQ,CAACN,CAAC,CAAC,GAAGA,CAAC;EAC/F,OAAOI,CAAC;AACV;AAEM,SAAUG,UAAUA,CAACP,CAAS,EAAEQ,GAAgC,EAAEP,IAA+B;EACrG,OAAOO,GAAG,CAACN,aAAa,CAACF,CAAC,EAAEC,IAAI,CAAC,CAAC;AACpC;AAyBA,MAAMQ,CAAC,GAAGC,MAAM,EAAE;AAClB,MAAeC,oBAAoB;AAcnC;AACA;AAEA,MAAMC,WAAW,GAAG,IAAAC,gBAAU,EAAC;EAAEC,MAAM,EAAE;AAAI,CAAE,CAAC;AACzC,MAAMC,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAG,IAAAE,QAAG,EAAkCL,WAAW,CAACM,aAAa,CAACC,IAAI,CAACP,WAAW,CAAC,CAAC;AACnG,MAAMQ,kBAAkB,GAAAJ,OAAA,CAAAI,kBAAA,GAAG,IAAAH,QAAG,EACnC,IAAII,GAAG,EAAE,CACV"}
+{"version":3,"file":"form.cjs","names":["_schema","require","_intl","_vue","JSONSchema","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","convertIn","v","type","convertOutInt","trim","c","parseFloat","parseInt","convertOut","buildFieldInfoFromFields","fields","AST","isTypeLiteral","ast","Error","propertySignatures","reduce","prev","cur","name","buildFieldInfo","f","Symbol","PhantomTypeParameter","defaultIntl","createIntl","locale","translate","exports","ref","formatMessage","bind","customSchemaErrors","Map","property","propertyKey","schema","S","make","metadata","getMetadataFromSchema","parse","tsplus_module_1","parseEither","nullable","isUnion","types","includes","tsplus_module_2","Schema2","null","realSelf","filter","_","renderError","err","toString","custom","value","defaultMessage","id","capitalize","String","message","stringRules","minLength","undefined","length","maxLength","numberRules","minimum","minimumExclusive","isExclusive","maximum","maximumExclusive","parseRule","tsplus_module_4","pipe","tsplus_module_3","match","onLeft","onRight","rules","info","required","converted","res","buildFormFromSchema","s","state","onSubmit","parseSync","isDirty","isValid","submit1","valid","submit","watch","JSON","stringify","deep","submitFromState","Promise","resolve","jschema","to","console","warn","isNumber","isInt","exclusiveMinimum","exclusiveMaximum"],"sources":["../_src/form.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/form.ts

@@ -1,6 +1,11 @@
+import { AST, S } from "@effect-app/schema"
 import type { Schema } from "@effect-app/schema"
 import { createIntl, type IntlFormatters } from "@formatjs/intl"
-import { ref } from "vue"
+import type { Ref } from "vue"
+import { capitalize, ref, watch } from "vue"
+
+import * as JSONSchema from "@effect/schema/JSONSchema"
+import type { ParseError } from "@effect/schema/ParseResult"
 
 export function convertIn(v: string | null, type?: "text" | "float" | "int") {
   return v === null ? "" : type === "text" ? v : `${v}`
@@ -16,22 +21,20 @@ export function convertOut(v: string, set: (v: unknown | null) => void, type?: "
   return set(convertOutInt(v, type))
 }
 
-// export function buildFieldInfoFromFields<Fields extends StructFields>(
-//   fields: Fields
-// ) {
-//   return fields.$$.keys.reduce(
-//     (prev, cur) => {
-//       prev[cur] = buildFieldInfo(fields[cur] as AnyField, cur)
-//       return prev
-//     },
-//     {} as {
-//       [K in keyof Fields]: FieldInfo<
-//         Schema.From<GetSchemaFromProp<Fields[K]>>,
-//         Schema.To<GetSchemaFromProp<Fields[K]>>
-//       >
-//     }
-//   )
-// }
+export function buildFieldInfoFromFields<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(
+  fields: Schema<From, To>
+) {
+  if (!AST.isTypeLiteral(fields.ast)) throw new Error("not a struct type")
+  return fields.ast.propertySignatures.reduce(
+    (prev, cur) => {
+      ;(prev as any)[cur.name] = buildFieldInfo(cur)
+      return prev
+    },
+    {} as {
+      [K in keyof To]: FieldInfo<To[K]>
+    }
+  )
+}
 
 export interface FieldMetadata {
   minLength: number | undefined
@@ -48,7 +51,7 @@ abstract class PhantomTypeParameter<
     readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType
   }
 }
-export interface FieldInfo<Tin, Tout> extends PhantomTypeParameter<typeof f, { in: Tin; out: Tout }> {
+export interface FieldInfo<Tout> extends PhantomTypeParameter<typeof f, { out: Tout }> {
   rules: ((v: string) => boolean | string)[]
   metadata: FieldMetadata
   type: "text" | "float" | "int" // todo; multi-line vs single line text
@@ -59,162 +62,201 @@ export interface FieldInfo<Tin, Tout> extends PhantomTypeParameter<typeof f, { i
 
 const defaultIntl = createIntl({ locale: "en" })
 export const translate = ref<IntlFormatters["formatMessage"]>(defaultIntl.formatMessage.bind(defaultIntl))
-export const customSchemaErrors = ref<Map<Schema<any, any>, (message: string, e: unknown, v: unknown) => string>>(
+export const customSchemaErrors = ref<Map<AST.AST, (message: string, e: unknown, v: unknown) => string>>(
   new Map()
 )
 
-// function buildFieldInfo(
-//   propOrSchema: Schema<any, any>,
-//   fieldKey: PropertyKey
-// ): FieldInfo<any, any> {
-//   const metadata = getMetadataFromSchemaOrProp(propOrSchema) // TODO
-//   const schema = propOrSchema
-//   const parse = schema.parseEither
-
-//   const nullable = AST.isUnion(schema.ast) && schema.ast.types.includes(Schema2.null.ast)
-
-//   function renderError(e: any, v: unknown) {
-//     const err = drawError(e)
-//     const custom = customSchemaErrors.value.get(schema)
-//       ?? (nullable?.self ? customSchemaErrors.value.get(nullable.self) : undefined)
-//     return custom ? custom(err, e, v) : translate.value(
-//       { defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" },
-//       {
-//         type: translate.value({
-//           defaultMessage: capitalize(fieldKey.toString()),
-//           id: `fieldNames.${String(fieldKey)}`
-//         }),
-//         message: err.slice(err.indexOf("expected")) // TODO: this is not translated.
-//       }
-//     )
-//   }
-
-//   const stringRules = [
-//     (v: string | null) =>
-//       v === null
-//       || metadata.minLength === undefined
-//       || v.length >= metadata.minLength
-//       || translate.value({
-//         defaultMessage: "The field requires at least {minLength} characters",
-//         id: "validation.string.minLength"
-//       }, {
-//         minLength: metadata.minLength
-//       }),
-//     (v: string | null) =>
-//       v === null
-//       || metadata.maxLength === undefined
-//       || v.length <= metadata.maxLength
-//       || translate.value({
-//         defaultMessage: "The field cannot have more than {maxLength} characters",
-//         id: "validation.string.maxLength"
-//       }, {
-//         maxLength: metadata.maxLength
-//       })
-//   ]
-
-//   const numberRules = [
-//     (v: number | null) =>
-//       v === null
-//       || metadata.minimum === undefined
-//       || metadata.minimumExclusive && v > metadata.minimum
-//       || !metadata.minimumExclusive && v >= metadata.minimum
-//       || translate.value({
-//         defaultMessage: "The value should be {isExclusive, select, true {larger than} other {at least}} {minimum}",
-//         id: "validation.number.min"
-//       }, { isExclusive: metadata.minimumExclusive, minimum: metadata.minimum }),
-//     (v: number | null) =>
-//       v === null
-//       || metadata.maximum === undefined
-//       || metadata.maximumExclusive && v < metadata.maximum
-//       || !metadata.maximumExclusive && v <= metadata.maximum
-//       || translate.value({
-//         defaultMessage: "The value should be {isExclusive, select, true {smaller than} other {at most}} {maximum}",
-//         id: "validation.number.max"
-//       }, { isExclusive: metadata.maximumExclusive, maximum: metadata.maximum })
-//   ]
-
-//   const parseRule = (v: unknown) =>
-//     pipe(
-//       parse(v),
-//       (_) =>
-//         _.match(
-//           {
-//             onLeft: (_) => renderError(_, v),
-//             onRight: ([_, optErr]) =>
-//               optErr.isSome()
-//                 ? renderError(optErr.value, v)
-//                 : true
-//           }
-//         )
-//     )
-
-//   type UnknownRule = (v: unknown) => boolean | string
-//   const rules: UnknownRule[] = [
-//     ...(metadata.type === "text"
-//       ? stringRules
-//       : numberRules) as UnknownRule[],
-//     parseRule as UnknownRule
-//   ]
-
-//   const info = {
-//     type: metadata.type,
-//     rules: [
-//       (v: string) =>
-//         !metadata.required
-//         || v !== ""
-//         || translate.value({ defaultMessage: "The field cannot be empty", id: "validation.empty" }),
-//       (v: string) => {
-//         const converted = convertOutInt(v, metadata.type)
-
-//         for (const r of rules) {
-//           const res = r(converted)
-//           if (res !== true) {
-//             return res
-//           }
-//         }
-
-//         return true
-//       }
-//     ],
-//     metadata
-//   }
-
-//   return info as any
-// }
-
-// export const buildFormFromSchema = <
-//   Fields extends StructFields,
-//   OnSubmitA
-// >(
-//   s: Schema<
-//     Simplify<FromStruct<Fields>>,
-//     Simplify<ToStruct<Fields>>
-//   >,
-//   state: Ref<FromStruct<Fields>>,
-//   onSubmit: (a: ToStruct<Fields>) => Promise<OnSubmitA>
-// ) => {
-//   const fields = buildFieldInfoFromFields(s.Api.fields)
-//   const parse = s.parseSync
-//   const isDirty = ref(false)
-//   const isValid = ref(true)
-
-//   const submit1 = <A>(onSubmit: (a: To) => Promise<A>) => async <T extends Promise<{ valid: boolean }>>(e: T) => {
-//     const r = await e
-//     if (!r.valid) return
-//     return onSubmit(parse(state.value))
-//   }
-//   const submit = submit1(onSubmit)
-
-//   watch(
-//     state,
-//     (v) => {
-//       // TODO: do better
-//       isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value)
-//     },
-//     { deep: true }
-//   )
-
-//   const submitFromState = () => submit(Promise.resolve({ valid: isValid.value }))
-
-//   return { fields, submit, submitFromState, isDirty, isValid }
-// }
+function buildFieldInfo(
+  property: AST.PropertySignature
+): FieldInfo<any> {
+  const propertyKey = property.name
+  const schema = S.make(property.type)
+  const metadata = getMetadataFromSchema(property.type) // TODO
+  const parse = schema.parseEither
+
+  const nullable = AST.isUnion(property.type) && property.type.types.includes(Schema2.null.ast)
+  const realSelf = nullable && AST.isUnion(property.type)
+    ? property.type.types.filter((_) => _ !== Schema2.null.ast)[0]!
+    : property.type
+
+  function renderError(e: ParseError, v: unknown) {
+    const err = e.toString()
+    const custom = customSchemaErrors.value.get(realSelf)
+    return custom ? custom(err, e, v) : translate.value(
+      { defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" },
+      {
+        type: translate.value({
+          defaultMessage: capitalize(propertyKey.toString()),
+          id: `fieldNames.${String(propertyKey)}`
+        }),
+        message: err // TODO err.slice(err.indexOf("expected")) // TODO: this is not translated.
+      }
+    )
+  }
+
+  const stringRules = [
+    (v: string | null) =>
+      v === null
+      || metadata.minLength === undefined
+      || v.length >= metadata.minLength
+      || translate.value({
+        defaultMessage: "The field requires at least {minLength} characters",
+        id: "validation.string.minLength"
+      }, {
+        minLength: metadata.minLength
+      }),
+    (v: string | null) =>
+      v === null
+      || metadata.maxLength === undefined
+      || v.length <= metadata.maxLength
+      || translate.value({
+        defaultMessage: "The field cannot have more than {maxLength} characters",
+        id: "validation.string.maxLength"
+      }, {
+        maxLength: metadata.maxLength
+      })
+  ]
+
+  const numberRules = [
+    (v: number | null) =>
+      v === null
+      || metadata.minimum === undefined
+      || metadata.minimumExclusive && v > metadata.minimum
+      || !metadata.minimumExclusive && v >= metadata.minimum
+      || translate.value({
+        defaultMessage: "The value should be {isExclusive, select, true {larger than} other {at least}} {minimum}",
+        id: "validation.number.min"
+      }, { isExclusive: metadata.minimumExclusive, minimum: metadata.minimum }),
+    (v: number | null) =>
+      v === null
+      || metadata.maximum === undefined
+      || metadata.maximumExclusive && v < metadata.maximum
+      || !metadata.maximumExclusive && v <= metadata.maximum
+      || translate.value({
+        defaultMessage: "The value should be {isExclusive, select, true {smaller than} other {at most}} {maximum}",
+        id: "validation.number.max"
+      }, { isExclusive: metadata.maximumExclusive, maximum: metadata.maximum })
+  ]
+
+  const parseRule = (v: unknown) =>
+    pipe(
+      parse(v),
+      (_) =>
+        _.match(
+          {
+            onLeft: (_) => renderError(_, v),
+            onRight: () => true
+          }
+        )
+    )
+
+  type UnknownRule = (v: unknown) => boolean | string
+  const rules: UnknownRule[] = [
+    ...(metadata.type === "text"
+      ? stringRules
+      : numberRules) as UnknownRule[],
+    parseRule as UnknownRule
+  ]
+
+  const info = {
+    type: metadata.type,
+    rules: [
+      (v: string) =>
+        !metadata.required
+        || v !== ""
+        || translate.value({ defaultMessage: "The field cannot be empty", id: "validation.empty" }),
+      (v: string) => {
+        const converted = convertOutInt(v, metadata.type)
+
+        for (const r of rules) {
+          const res = r(converted)
+          if (res !== true) {
+            return res
+          }
+        }
+
+        return true
+      }
+    ],
+    metadata
+  }
+
+  return info as any
+}
+
+export const buildFormFromSchema = <
+  From extends Record<PropertyKey, any>,
+  To extends Record<PropertyKey, any>,
+  OnSubmitA
+>(
+  s: Schema<
+    From,
+    To
+  >,
+  state: Ref<From>,
+  onSubmit: (a: To) => Promise<OnSubmitA>
+) => {
+  const fields = buildFieldInfoFromFields(s)
+  const parse = s.parseSync
+  const isDirty = ref(false)
+  const isValid = ref(true)
+
+  const submit1 = <A>(onSubmit: (a: To) => Promise<A>) => async <T extends Promise<{ valid: boolean }>>(e: T) => {
+    const r = await e
+    if (!r.valid) return
+    return onSubmit(parse(state.value))
+  }
+  const submit = submit1(onSubmit)
+
+  watch(
+    state,
+    (v) => {
+      // TODO: do better
+      isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value)
+    },
+    { deep: true }
+  )
+
+  const submitFromState = () => submit(Promise.resolve({ valid: isValid.value }))
+
+  return { fields, submit, submitFromState, isDirty, isValid }
+}
+
+export function getMetadataFromSchema(
+  ast: AST.AST
+): {
+  type: "int" | "float" | "text"
+  minimum?: number
+  maximum?: number
+  minimumExclusive?: boolean
+  maximumExclusive?: boolean
+  minLength?: number
+  maxLength?: number
+  required: boolean
+} {
+  const nullable = AST.isUnion(ast) && ast.types.includes(Schema2.null.ast)
+  const realSelf = nullable && AST.isUnion(ast)
+    ? ast.types.filter((_) => _ !== Schema2.null.ast)[0]!
+    : ast
+
+  let jschema: any
+  try {
+    jschema = JSONSchema.to(S.make(realSelf)) as any
+  } catch (err) {
+    jschema = {}
+    console.warn("error getting jsonschema from ", err, ast)
+  }
+
+  const isNumber = jschema.type === "number" || jschema.type === "integer"
+  const isInt = jschema.type === "integer"
+  return {
+    type: isInt ? "int" as const : isNumber ? "float" as const : "text" as const,
+    minimum: jschema.minimum,
+    minimumExclusive: jschema.exclusiveMinimum,
+    maximum: jschema.maximum,
+    maximumExclusive: jschema.exclusiveMaximum,
+    minLength: jschema.minLength,
+    maxLength: jschema.maxLength,
+    required: !nullable
+  }
+}

package/dist/form.d.ts

@@ -1,7 +1,10 @@
+import { AST } from "@effect-app/schema";
 import type { Schema } from "@effect-app/schema";
+import type { Ref } from "vue";
 export declare function convertIn(v: string | null, type?: "text" | "float" | "int"): string;
 export declare function convertOutInt(v: string, type?: "text" | "float" | "int"): string | number | null;
 export declare function convertOut(v: string, set: (v: unknown | null) => void, type?: "text" | "float" | "int"): void;
+export declare function buildFieldInfoFromFields<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(fields: Schema<From, To>): { [K in keyof To]: FieldInfo<To[K]>; };
 export interface FieldMetadata {
     minLength: number | undefined;
     maxLength: number | undefined;
@@ -13,18 +16,36 @@ declare abstract class PhantomTypeParameter<Identifier extends keyof any, Instan
         readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType;
     };
 }
-export interface FieldInfo<Tin, Tout> extends PhantomTypeParameter<typeof f, {
-    in: Tin;
+export interface FieldInfo<Tout> extends PhantomTypeParameter<typeof f, {
     out: Tout;
 }> {
     rules: ((v: string) => boolean | string)[];
     metadata: FieldMetadata;
     type: "text" | "float" | "int";
 }
-export declare const translate: import("vue").Ref<{
+export declare const translate: Ref<{
     (descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>> | undefined, opts?: import("intl-messageformat").Options | undefined): string;
     <T extends unknown>(descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | T | import("intl-messageformat").FormatXMLElementFn<T>> | undefined, opts?: import("intl-messageformat").Options | undefined): string | T | (string | T)[];
 }>;
-export declare const customSchemaErrors: import("vue").Ref<Map<Schema<any, any>, (message: string, e: unknown, v: unknown) => string>>;
+export declare const customSchemaErrors: Ref<Map<AST.AST, (message: string, e: unknown, v: unknown) => string>>;
+export declare const buildFormFromSchema: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, OnSubmitA>(s: Schema<From, To>, state: Ref<From>, onSubmit: (a: To) => Promise<OnSubmitA>) => {
+    fields: { [K in keyof To]: FieldInfo<To[K]>; };
+    submit: <T extends Promise<{
+        valid: boolean;
+    }>>(e: T) => Promise<OnSubmitA | undefined>;
+    submitFromState: () => Promise<OnSubmitA | undefined>;
+    isDirty: Ref<boolean>;
+    isValid: Ref<boolean>;
+};
+export declare function getMetadataFromSchema(ast: AST.AST): {
+    type: "int" | "float" | "text";
+    minimum?: number;
+    maximum?: number;
+    minimumExclusive?: boolean;
+    maximumExclusive?: boolean;
+    minLength?: number;
+    maxLength?: number;
+    required: boolean;
+};
 export {};
 //# sourceMappingURL=form.d.ts.map

package/dist/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../_src/form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAIhD,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,UAE1E;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,0BAIvE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,QAEtG;AAmBD,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,QAAA,MAAM,CAAC,eAAW,CAAA;AAClB,uBAAe,oBAAoB,CACjC,UAAU,SAAS,MAAM,GAAG,EAC5B,gBAAgB;IAEhB,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;QAC7B,QAAQ,EAAE,KAAK,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE,gBAAgB,KAAK,gBAAgB;KAC1E,CAAA;CACF;AACD,MAAM,WAAW,SAAS,CAAC,GAAG,EAAE,IAAI,CAAE,SAAQ,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,EAAE,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAAC;IAClG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAAC,EAAE,CAAA;IAC1C,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,CAAA;CAC/B;AAMD,eAAO,MAAM,SAAS;;;EAAoF,CAAA;AAC1G,eAAO,MAAM,kBAAkB,oDAAuC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,EAE9G,CAAA"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../_src/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAK,MAAM,oBAAoB,CAAA;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAEhD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAM9B,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,UAE1E;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,0BAIvE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,QAEtG;AAED,wBAAgB,wBAAwB,CAAC,IAAI,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,EAAE,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EACjH,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,0CAYzB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,QAAA,MAAM,CAAC,eAAW,CAAA;AAClB,uBAAe,oBAAoB,CACjC,UAAU,SAAS,MAAM,GAAG,EAC5B,gBAAgB;IAEhB,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;QAC7B,QAAQ,EAAE,KAAK,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE,gBAAgB,KAAK,gBAAgB;KAC1E,CAAA;CACF;AACD,MAAM,WAAW,SAAS,CAAC,IAAI,CAAE,SAAQ,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,GAAG,EAAE,IAAI,CAAA;CAAE,CAAC;IACpF,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAAC,EAAE,CAAA;IAC1C,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,CAAA;CAC/B;AAMD,eAAO,MAAM,SAAS;;;EAAoF,CAAA;AAC1G,eAAO,MAAM,kBAAkB,6BAA8B,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,EAErG,CAAA;AAwHD,eAAO,MAAM,mBAAmB,6FAK3B,OACD,IAAI,EACJ,EAAE,CACH,SACM,IAAI,IAAI,CAAC,gBACF,EAAE,KAAK,QAAQ,SAAS,CAAC;;;eAOmD,OAAO;;;;;CAmBlG,CAAA;AAED,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,GAAG,CAAC,GAAG,GACX;IACD,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,CAAA;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;CAClB,CA0BA"}

package/dist/form.js

@@ -1,5 +1,11 @@
+import * as tsplus_module_1 from "@effect/schema/Parser";
+import * as tsplus_module_2 from "@effect-app/prelude";
+import * as tsplus_module_3 from "effect/Either";
+import * as tsplus_module_4 from "@effect-app/core/Function";
+import { AST, S } from "@effect-app/schema";
 import { createIntl } from "@formatjs/intl";
-import { ref } from "vue";
+import { capitalize, ref, watch } from "vue";
+import * as JSONSchema from "@effect/schema/JSONSchema";
 export function convertIn(v, type) {
     return v === null ? "" : type === "text" ? v : `${v}`;
 }
@@ -11,6 +17,15 @@ export function convertOutInt(v, type) {
 export function convertOut(v, set, type) {
     return set(convertOutInt(v, type));
 }
+export function buildFieldInfoFromFields(fields) {
+    if (!AST.isTypeLiteral(fields.ast))
+        throw new Error("not a struct type");
+    return fields.ast.propertySignatures.reduce((prev, cur) => {
+        ;
+        prev[cur.name] = buildFieldInfo(cur);
+        return prev;
+    }, {});
+}
 const f = Symbol();
 class PhantomTypeParameter {
 }
@@ -19,4 +34,138 @@ class PhantomTypeParameter {
 const defaultIntl = createIntl({ locale: "en" });
 export const translate = ref(defaultIntl.formatMessage.bind(defaultIntl));
 export const customSchemaErrors = ref(new Map());
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUF1QixNQUFNLGdCQUFnQixDQUFBO0FBQ2hFLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFFekIsTUFBTSxVQUFVLFNBQVMsQ0FBQyxDQUFnQixFQUFFLElBQStCO0lBQ3pFLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUE7QUFDdkQsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsQ0FBUyxFQUFFLElBQStCO0lBQ3RFLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM1QixNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0YsT0FBTyxDQUFDLENBQUE7QUFDVixDQUFDO0FBRUQsTUFBTSxVQUFVLFVBQVUsQ0FBQyxDQUFTLEVBQUUsR0FBZ0MsRUFBRSxJQUErQjtJQUNyRyxPQUFPLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDcEMsQ0FBQztBQXlCRCxNQUFNLENBQUMsR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQUNsQixNQUFlLG9CQUFvQjtDQU9sQztBQU9ELDBFQUEwRTtBQUMxRSxZQUFZO0FBRVosTUFBTSxXQUFXLEdBQUcsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7QUFDaEQsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBa0MsV0FBVyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQTtBQUMxRyxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxHQUFHLENBQ25DLElBQUksR0FBRyxFQUFFLENBQ1YsQ0FBQSJ9
+function buildFieldInfo(property) {
+    const propertyKey = property.name;
+    const schema = S.make(property.type);
+    const metadata = getMetadataFromSchema(property.type); // TODO
+    const parse = tsplus_module_1.parseEither(schema);
+    const nullable = AST.isUnion(property.type) && property.type.types.includes(tsplus_module_2.Schema2.null.ast);
+    const realSelf = nullable && AST.isUnion(property.type)
+        ? property.type.types.filter((_) => _ !== tsplus_module_2.Schema2.null.ast)[0]
+        : property.type;
+    function renderError(e, v) {
+        const err = e.toString();
+        const custom = customSchemaErrors.value.get(realSelf);
+        return custom ? custom(err, e, v) : translate.value({ defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" }, {
+            type: translate.value({
+                defaultMessage: capitalize(propertyKey.toString()),
+                id: `fieldNames.${String(propertyKey)}`
+            }),
+            message: err // TODO err.slice(err.indexOf("expected")) // TODO: this is not translated.
+        });
+    }
+    const stringRules = [
+        (v) => v === null
+            || metadata.minLength === undefined
+            || v.length >= metadata.minLength
+            || translate.value({
+                defaultMessage: "The field requires at least {minLength} characters",
+                id: "validation.string.minLength"
+            }, {
+                minLength: metadata.minLength
+            }),
+        (v) => v === null
+            || metadata.maxLength === undefined
+            || v.length <= metadata.maxLength
+            || translate.value({
+                defaultMessage: "The field cannot have more than {maxLength} characters",
+                id: "validation.string.maxLength"
+            }, {
+                maxLength: metadata.maxLength
+            })
+    ];
+    const numberRules = [
+        (v) => v === null
+            || metadata.minimum === undefined
+            || metadata.minimumExclusive && v > metadata.minimum
+            || !metadata.minimumExclusive && v >= metadata.minimum
+            || translate.value({
+                defaultMessage: "The value should be {isExclusive, select, true {larger than} other {at least}} {minimum}",
+                id: "validation.number.min"
+            }, { isExclusive: metadata.minimumExclusive, minimum: metadata.minimum }),
+        (v) => v === null
+            || metadata.maximum === undefined
+            || metadata.maximumExclusive && v < metadata.maximum
+            || !metadata.maximumExclusive && v <= metadata.maximum
+            || translate.value({
+                defaultMessage: "The value should be {isExclusive, select, true {smaller than} other {at most}} {maximum}",
+                id: "validation.number.max"
+            }, { isExclusive: metadata.maximumExclusive, maximum: metadata.maximum })
+    ];
+    const parseRule = (v) => tsplus_module_4.pipe(parse(v), (_) => tsplus_module_3.match(_, {
+        onLeft: (_) => renderError(_, v),
+        onRight: () => true
+    }));
+    const rules = [
+        ...(metadata.type === "text"
+            ? stringRules
+            : numberRules),
+        parseRule
+    ];
+    const info = {
+        type: metadata.type,
+        rules: [
+            (v) => !metadata.required
+                || v !== ""
+                || translate.value({ defaultMessage: "The field cannot be empty", id: "validation.empty" }),
+            (v) => {
+                const converted = convertOutInt(v, metadata.type);
+                for (const r of rules) {
+                    const res = r(converted);
+                    if (res !== true) {
+                        return res;
+                    }
+                }
+                return true;
+            }
+        ],
+        metadata
+    };
+    return info;
+}
+export const buildFormFromSchema = (s, state, onSubmit) => {
+    const fields = buildFieldInfoFromFields(s);
+    const parse = tsplus_module_1.parseSync(s);
+    const isDirty = ref(false);
+    const isValid = ref(true);
+    const submit1 = (onSubmit) => async (e) => {
+        const r = await e;
+        if (!r.valid)
+            return;
+        return onSubmit(parse(state.value));
+    };
+    const submit = submit1(onSubmit);
+    watch(state, (v) => {
+        // TODO: do better
+        isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value);
+    }, { deep: true });
+    const submitFromState = () => submit(Promise.resolve({ valid: isValid.value }));
+    return { fields, submit, submitFromState, isDirty, isValid };
+};
+export function getMetadataFromSchema(ast) {
+    const nullable = AST.isUnion(ast) && ast.types.includes(tsplus_module_2.Schema2.null.ast);
+    const realSelf = nullable && AST.isUnion(ast)
+        ? ast.types.filter((_) => _ !== tsplus_module_2.Schema2.null.ast)[0]
+        : ast;
+    let jschema;
+    try {
+        jschema = JSONSchema.to(S.make(realSelf));
+    }
+    catch (err) {
+        jschema = {};
+        console.warn("error getting jsonschema from ", err, ast);
+    }
+    const isNumber = jschema.type === "number" || jschema.type === "integer";
+    const isInt = jschema.type === "integer";
+    return {
+        type: isInt ? "int" : isNumber ? "float" : "text",
+        minimum: jschema.minimum,
+        minimumExclusive: jschema.exclusiveMinimum,
+        maximum: jschema.maximum,
+        maximumExclusive: jschema.exclusiveMaximum,
+        minLength: jschema.minLength,
+        maxLength: jschema.maxLength,
+        required: !nullable
+    };
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form.js","sourceRoot":"","sources":["../_src/form.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "0.87.0-next.14",
+  "version": "0.87.0-next.16",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -12,10 +12,10 @@
     "query-string": "^8.1.0",
     "swrv": "^1.0.4",
     "vue": "^3.3.13",
-    "@effect-app/prelude": "0.107.0-next.13",
-    "@effect-app/vue": "0.87.0-next.14",
-    "@effect-app/core": "0.97.0-next.4",
-    "@effect-app/schema": "0.150.0-next.10"
+    "@effect-app/schema": "0.150.0-next.11",
+    "@effect-app/vue": "0.87.0-next.16",
+    "@effect-app/prelude": "0.107.0-next.14",
+    "@effect-app/core": "0.97.0-next.4"
   },
   "devDependencies": {
     "@rollup/pluginutils": "^5.1.0",