@effect-app/vue 0.87.0-next.2 → 0.87.0-next.21

package/CHANGELOG.md

@@ -1,5 +1,181 @@
 # @effect-app/vue
 
+## 0.87.0-next.21
+
+### Patch Changes
+
+- Updated dependencies [c234016]
+  - @effect-app/schema@0.150.0-next.14
+  - @effect-app/prelude@0.107.0-next.17
+  - @effect-app/vue@0.87.0-next.21
+
+## 0.87.0-next.20
+
+### Patch Changes
+
+- 5d53b26: fix exclusive min/max
+- Updated dependencies [5d53b26]
+  - @effect-app/schema@0.150.0-next.13
+  - @effect-app/vue@0.87.0-next.20
+  - @effect-app/prelude@0.107.0-next.16
+
+## 0.87.0-next.19
+
+### Patch Changes
+
+- fd785c2: improve error
+- Updated dependencies [fd785c2]
+  - @effect-app/vue@0.87.0-next.19
+
+## 0.87.0-next.18
+
+### Patch Changes
+
+- 99310c3: fix error message
+- Updated dependencies [99310c3]
+  - @effect-app/vue@0.87.0-next.18
+
+## 0.87.0-next.17
+
+### Patch Changes
+
+- Updated dependencies [147bc14]
+  - @effect-app/schema@0.150.0-next.12
+  - @effect-app/prelude@0.107.0-next.15
+  - @effect-app/vue@0.87.0-next.17
+
+## 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
+
+- 20076e0: update
+- Updated dependencies [20076e0]
+  - @effect-app/prelude@0.107.0-next.13
+  - @effect-app/schema@0.150.0-next.10
+  - @effect-app/vue@0.87.0-next.14
+
+## 0.87.0-next.13
+
+### Patch Changes
+
+- Updated dependencies
+  - @effect-app/core@0.97.0-next.4
+  - @effect-app/prelude@0.107.0-next.12
+  - @effect-app/schema@0.150.0-next.9
+  - @effect-app/vue@0.87.0-next.13
+
+## 0.87.0-next.12
+
+### Patch Changes
+
+- ac35466: use schema fork
+- Updated dependencies [ac35466]
+  - @effect-app/prelude@0.107.0-next.11
+  - @effect-app/schema@0.150.0-next.8
+  - @effect-app/vue@0.87.0-next.12
+
+## 0.87.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [4f8ade3]
+  - @effect-app/core@0.97.0-next.3
+  - @effect-app/prelude@0.107.0-next.10
+  - @effect-app/schema@0.150.0-next.7
+  - @effect-app/vue@0.87.0-next.11
+
+## 0.87.0-next.10
+
+### Patch Changes
+
+- Updated dependencies [8897586]
+  - @effect-app/schema@0.150.0-next.6
+  - @effect-app/prelude@0.107.0-next.9
+  - @effect-app/vue@0.87.0-next.10
+
+## 0.87.0-next.9
+
+### Patch Changes
+
+- c550ee5: updates
+- Updated dependencies [c550ee5]
+  - @effect-app/prelude@0.107.0-next.8
+  - @effect-app/schema@0.150.0-next.5
+  - @effect-app/core@0.97.0-next.2
+  - @effect-app/vue@0.87.0-next.9
+
+## 0.87.0-next.8
+
+### Patch Changes
+
+- Updated dependencies [82b3ca0]
+  - @effect-app/prelude@0.107.0-next.7
+  - @effect-app/vue@0.87.0-next.8
+
+## 0.87.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [ace7afb]
+  - @effect-app/schema@0.150.0-next.4
+  - @effect-app/prelude@0.107.0-next.6
+  - @effect-app/vue@0.87.0-next.7
+
+## 0.87.0-next.6
+
+### Patch Changes
+
+- 3320864: cleanup schema ext
+- Updated dependencies [3320864]
+  - @effect-app/prelude@0.107.0-next.5
+  - @effect-app/schema@0.150.0-next.3
+  - @effect-app/vue@0.87.0-next.6
+
+## 0.87.0-next.5
+
+### Patch Changes
+
+- 52da734: mini form
+- Updated dependencies [52da734]
+  - @effect-app/vue@0.87.0-next.5
+
+## 0.87.0-next.4
+
+### Patch Changes
+
+- Updated dependencies [fde3e90]
+  - @effect-app/schema@0.150.0-next.2
+  - @effect-app/core@0.97.0-next.1
+  - @effect-app/prelude@0.107.0-next.4
+  - @effect-app/vue@0.87.0-next.4
+
+## 0.87.0-next.3
+
+### Patch Changes
+
+- Updated dependencies [3d9e1ab]
+- Updated dependencies [47d0151]
+  - @effect-app/prelude@0.107.0-next.3
+  - @effect-app/vue@0.87.0-next.3
+
 ## 0.87.0-next.2
 
 ### Patch Changes

package/_cjs/form.cjs

@@ -0,0 +1,174 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildFieldInfoFromFields = buildFieldInfoFromFields;
+exports.buildFormFromSchema = void 0;
+exports.convertIn = convertIn;
+exports.convertOut = convertOut;
+exports.convertOutInt = convertOutInt;
+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}`;
+}
+function convertOutInt(v, type) {
+  v = v == null ? v : v.trim();
+  const c = v === "" ? null : type === "float" ? parseFloat(v) : type === "int" ? parseInt(v) : v;
+  return c;
+}
+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
+//   : never
+const defaultIntl = (0, _intl.createIntl)({
+  locale: "en"
+});
+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: metadata.description ? "expected " + metadata.description : 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.exclusiveMinimum === undefined || metadata.exclusiveMinimum !== undefined && v > metadata.exclusiveMinimum || metadata.minimum !== undefined && 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.exclusiveMinimum !== undefined,
+    minimum: metadata.exclusiveMinimum ?? metadata.maximum
+  }), v => v === null || metadata.maximum === undefined && metadata.exclusiveMaximum === undefined || metadata.exclusiveMaximum !== undefined && v < metadata.exclusiveMaximum || metadata.maximum !== undefined && 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.exclusiveMaximum !== undefined,
+    maximum: metadata.exclusiveMaximum ?? 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,
+    exclusiveMinimum: jschema.exclusiveMinimum,
+    maximum: jschema.maximum,
+    exclusiveMaximum: jschema.exclusiveMaximum,
+    minLength: jschema.minLength,
+    maxLength: jschema.maxLength,
+    description: jschema.description,
+    required: !nullable
+  };
+}
+//# sourceMappingURL=form.cjs.map

package/_cjs/form.cjs.map

@@ -0,0 +1 @@
+{"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","description","slice","indexOf","stringRules","minLength","undefined","length","maxLength","numberRules","minimum","exclusiveMinimum","isExclusive","maximum","exclusiveMaximum","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"],"sources":["../_src/form.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/hooks.cjs

@@ -73,10 +73,16 @@ function useSafeQueryWithArg(self, arg, config) {
   return useSafeQueryWithArg_(self, self.mapPath, arg, config);
 }
 function useSafeQuery(self, config) {
-  return useSafeQuery_(self.mapPath, self, config);
+  return useSafeQuery_(self.mapPath, () => self, config);
 }
 function useSafeQueryWithArg_(self, mapPath, arg, config) {
-  return useSafeQuery_(mapPath(arg), self(arg), config);
+  const arr = arg;
+  const r = typeof arr === "function" ? {
+    get value() {
+      return arr();
+    }
+  } : (0, _vue.ref)(arg);
+  return useSafeQuery_((0, _vue.computed)(() => mapPath(r.value)), () => self(r.value), config);
 }
 function useSafeQuery_(key, self, config) {
   // const [result, latestSuccess, execute] = make(self)
@@ -107,7 +113,7 @@ function useSafeQuery_(key, self, config) {
   //     })
   // }
   // const swr = useSWRV<A, E>(key, () => execWithInterruption().then(_ => _?.body as any)) // Effect.runPromise(self.provide(Layers))
-  const swr = useSWRV(key, () => _internal.run.value(self).then(_ => _.body), config);
+  const swr = useSWRV(key, () => _internal.run.value(self()).then(_ => _.body), config);
   const result = (0, _vue.computed)(() => swrToQuery({
     data: swr.data.value,
     error: swr.error.value,

package/_cjs/hooks.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.cjs","names":["swrv","_interopRequireWildcard","require","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","useSWRV","mutate","exports","swrToQuery","error","isValidating","tsplus_module_1","Refreshing","fail","data","Done","undefined","succeed","Loading","Initial","useMutate","self","fn","run","value","then","_","body","mapPath","useMutateWithArg","arg","useSafeQueryWithArg","config","useSafeQueryWithArg_","useSafeQuery","useSafeQuery_","key","swr","result","computed","latestSuccess","tsplus_module_2","isSuccess","tsplus_module_3","isRight","current","right","tsplus_module_4","isSome","previous","tsplus_module_5","tuple","useSafeQueryLegacy","execute","make","sem","tsplus_module_6","unsafeMakeSemaphore","withPermit","withPermits","fib","runNew","tap","fork","newFiber","sync","ex","flatMap","suspend","zipRight","tsplus_module_7","interrupt","pipe","await","exec","catch","err","JSON","stringify","includes","shallowRef","isInitializing","queryResult","map","hasValue","useMutation","state","ref","_tag","handleExit","exit","tsplus_module_8","tsplus_module_9","failureOption","cause","left","died","dieOption","tsplus_module_10","getOrUndefined","interrupted","interruptOption","InterruptedException","Error","fst","snd","effect","abortSignal","f","cancel","addEventListener","console","join"],"sources":["../_src/hooks.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"hooks.cjs","names":["swrv","_interopRequireWildcard","require","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","useSWRV","mutate","exports","swrToQuery","error","isValidating","tsplus_module_1","Refreshing","fail","data","Done","undefined","succeed","Loading","Initial","useMutate","self","fn","run","value","then","_","body","mapPath","useMutateWithArg","arg","useSafeQueryWithArg","config","useSafeQueryWithArg_","useSafeQuery","useSafeQuery_","arr","ref","computed","key","swr","result","latestSuccess","tsplus_module_2","isSuccess","tsplus_module_3","isRight","current","right","tsplus_module_4","isSome","previous","tsplus_module_5","tuple","useSafeQueryLegacy","execute","make","sem","tsplus_module_6","unsafeMakeSemaphore","withPermit","withPermits","fib","runNew","tap","fork","newFiber","sync","ex","flatMap","suspend","zipRight","tsplus_module_7","interrupt","pipe","await","exec","catch","err","JSON","stringify","includes","shallowRef","isInitializing","queryResult","map","hasValue","useMutation","state","_tag","handleExit","exit","tsplus_module_8","tsplus_module_9","failureOption","cause","left","died","dieOption","tsplus_module_10","getOrUndefined","interrupted","interruptOption","InterruptedException","Error","fst","snd","effect","abortSignal","f","cancel","addEventListener","console","join"],"sources":["../_src/hooks.ts"],"sourcesContent":[null],"mappings":"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"}

package/_src/{form.ts.bak → form.ts}

@@ -1,11 +1,12 @@
-import { type drawError, type Field, getMetadataFromSchemaOrProp } from "@effect-app/prelude/schema"
-import type { AnyField, FromStruct, Schema, StructFields, To, ToStruct } from "@effect-app/schema"
-import { AST } from "@effect-app/schema/schema"
+import { AST, S } from "@effect-app/schema"
+import type { Schema } from "@effect-app/schema"
 import { createIntl, type IntlFormatters } from "@formatjs/intl"
-import type { Simplify } from "effect/Types"
 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}`
 }
@@ -20,19 +21,17 @@ export function convertOut(v: string, set: (v: unknown | null) => void, type?: "
   return set(convertOutInt(v, type))
 }
 
-export function buildFieldInfoFromFields<Fields extends StructFields>(
-  fields: Fields
+export function buildFieldInfoFromFields<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(
+  fields: Schema<From, To>
 ) {
-  return fields.$$.keys.reduce(
+  if (!AST.isTypeLiteral(fields.ast)) throw new Error("not a struct type")
+  return fields.ast.propertySignatures.reduce(
     (prev, cur) => {
-      prev[cur] = buildFieldInfo(fields[cur] as AnyField, cur)
+      ;(prev as any)[cur.name] = buildFieldInfo(cur)
       return prev
     },
     {} as {
-      [K in keyof Fields]: FieldInfo<
-        Schema.From<GetSchemaFromProp<Fields[K]>>,
-        Schema.To<GetSchemaFromProp<Fields[K]>>
-      >
+      [K in keyof To]: FieldInfo<To[K]>
     }
   )
 }
@@ -52,43 +51,45 @@ 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
 }
 
-type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
-  : never
+// type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
+//   : never
 
 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
+  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(schema.ast) && schema.ast.types.includes(Schema2.null.ast)
+  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: any, v: unknown) {
-    const err = drawError(e)
-    const custom = customSchemaErrors.value.get(schema)
-      ?? (nullable?.self ? customSchemaErrors.value.get(nullable.self) : undefined)
+  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(fieldKey.toString()),
-          id: `fieldNames.${String(fieldKey)}`
+          defaultMessage: capitalize(propertyKey.toString()),
+          id: `fieldNames.${String(propertyKey)}`
         }),
-        message: err.slice(err.indexOf("expected")) // TODO: this is not translated.
+        message: metadata.description ? "expected " + metadata.description : err.slice(err.indexOf("Expected")) // TODO: this is not translated.
       }
     )
   }
@@ -119,22 +120,28 @@ function buildFieldInfo(
   const numberRules = [
     (v: number | null) =>
       v === null
-      || metadata.minimum === undefined
-      || metadata.minimumExclusive && v > metadata.minimum
-      || !metadata.minimumExclusive && v >= metadata.minimum
+      || (metadata.minimum === undefined && metadata.exclusiveMinimum === undefined)
+      || metadata.exclusiveMinimum !== undefined && v > metadata.exclusiveMinimum
+      || metadata.minimum !== undefined && 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 }),
+      }, {
+        isExclusive: metadata.exclusiveMinimum !== undefined,
+        minimum: metadata.exclusiveMinimum ?? metadata.maximum
+      }),
     (v: number | null) =>
       v === null
-      || metadata.maximum === undefined
-      || metadata.maximumExclusive && v < metadata.maximum
-      || !metadata.maximumExclusive && v <= metadata.maximum
+      || (metadata.maximum === undefined && metadata.exclusiveMaximum === undefined)
+      || metadata.exclusiveMaximum !== undefined && v < metadata.exclusiveMaximum
+      || metadata.maximum !== undefined && 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 })
+      }, {
+        isExclusive: metadata.exclusiveMaximum !== undefined,
+        maximum: metadata.exclusiveMaximum ?? metadata.maximum
+      })
   ]
 
   const parseRule = (v: unknown) =>
@@ -144,10 +151,7 @@ function buildFieldInfo(
         _.match(
           {
             onLeft: (_) => renderError(_, v),
-            onRight: ([_, optErr]) =>
-              optErr.isSome()
-                ? renderError(optErr.value, v)
-                : true
+            onRight: () => true
           }
         )
     )
@@ -187,17 +191,18 @@ function buildFieldInfo(
 }
 
 export const buildFormFromSchema = <
-  Fields extends StructFields,
+  From extends Record<PropertyKey, any>,
+  To extends Record<PropertyKey, any>,
   OnSubmitA
 >(
   s: Schema<
-    Simplify<FromStruct<Fields>>,
-    Simplify<ToStruct<Fields>>
+    From,
+    To
   >,
-  state: Ref<FromStruct<Fields>>,
-  onSubmit: (a: ToStruct<Fields>) => Promise<OnSubmitA>
+  state: Ref<From>,
+  onSubmit: (a: To) => Promise<OnSubmitA>
 ) => {
-  const fields = buildFieldInfoFromFields(s.Api.fields)
+  const fields = buildFieldInfoFromFields(s)
   const parse = s.parseSync
   const isDirty = ref(false)
   const isValid = ref(true)
@@ -222,3 +227,44 @@ export const buildFormFromSchema = <
 
   return { fields, submit, submitFromState, isDirty, isValid }
 }
+
+export function getMetadataFromSchema(
+  ast: AST.AST
+): {
+  type: "int" | "float" | "text"
+  minimum?: number
+  maximum?: number
+  exclusiveMinimum?: number
+  exclusiveMaximum?: number
+  minLength?: number
+  maxLength?: number
+  required: boolean
+  description?: string
+} {
+  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,
+    exclusiveMinimum: jschema.exclusiveMinimum,
+    maximum: jschema.maximum,
+    exclusiveMaximum: jschema.exclusiveMaximum,
+    minLength: jschema.minLength,
+    maxLength: jschema.maxLength,
+    description: jschema.description,
+    required: !nullable
+  }
+}

package/_src/hooks.ts

@@ -3,7 +3,7 @@ import type { ApiConfig, FetchResponse } from "@effect-app/prelude/client"
 import { InterruptedException } from "effect/Cause"
 import * as swrv from "swrv"
 import type { fetcherFn, IKey, IResponse } from "swrv/dist/types.js"
-import type { Ref } from "vue"
+import type { ComputedRef, Ref } from "vue"
 import { computed, ref, shallowRef } from "vue"
 import { run } from "./internal.js"
 
@@ -64,10 +64,12 @@ export function useMutateWithArg<Arg, E, A>(
   return (arg: Arg) => mutate(self.mapPath(arg), fn(arg))
 }
 
+export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T)
+
 // TODO: same trick with mutations/actions
 export function useSafeQueryWithArg<Arg, E, A>(
   self: ((arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>) & { mapPath: (arg: Arg) => string },
-  arg: Arg,
+  arg: Arg | WatchSource<Arg>,
   config?: swrv.IConfig<A, fetcherFn<A>> | undefined
 ) {
   return useSafeQueryWithArg_(self, self.mapPath, arg, config)
@@ -77,21 +79,29 @@ export function useSafeQuery<E, A>(
   self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>> & { mapPath: string },
   config?: swrv.IConfig<A, fetcherFn<A>> | undefined
 ) {
-  return useSafeQuery_(self.mapPath, self, config)
+  return useSafeQuery_(self.mapPath, () => self, config)
 }
 
 export function useSafeQueryWithArg_<Arg, E, A>(
   self: (arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>,
   mapPath: (arg: Arg) => string,
-  arg: Arg,
+  arg: Arg | WatchSource<Arg>,
   config?: swrv.IConfig<A, fetcherFn<A>> | undefined
 ) {
-  return useSafeQuery_(mapPath(arg), self(arg), config)
+  const arr = arg
+  const r: { value: Arg } = typeof arr === "function"
+    ? {
+      get value() {
+        return (arr as any)()
+      }
+    } as any
+    : ref(arg)
+  return useSafeQuery_(computed(() => mapPath(r.value)), () => self(r.value), config)
 }
 
 export function useSafeQuery_<E, A>(
-  key: string,
-  self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>,
+  key: string | WatchSource<string>,
+  self: () => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>,
   config?: swrv.IConfig<A, fetcherFn<A>> | undefined
 ) {
   // const [result, latestSuccess, execute] = make(self)
@@ -125,7 +135,7 @@ export function useSafeQuery_<E, A>(
   // }
 
   // const swr = useSWRV<A, E>(key, () => execWithInterruption().then(_ => _?.body as any)) // Effect.runPromise(self.provide(Layers))
-  const swr = useSWRV<A, E>(key, () => run.value(self).then((_) => _.body), config)
+  const swr = useSWRV<A, E>(key, () => run.value(self()).then((_) => _.body), config)
   const result = computed(() =>
     swrToQuery({ data: swr.data.value, error: swr.error.value, isValidating: swr.isValidating.value })
   ) // ref<QueryResult<E, A>>()

package/_src/routeParams.ts

@@ -1,4 +1,4 @@
-import type { REST, Schema } from "@effect-app/prelude/schema"
+import type { REST, Schema } from "@effect-app/schema"
 import type { ParsedQuery } from "query-string"
 
 export function getQueryParam(search: ParsedQuery, param: string) {

package/dist/form.d.ts

@@ -0,0 +1,52 @@
+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;
+    required: boolean;
+}
+declare const f: unique symbol;
+declare abstract class PhantomTypeParameter<Identifier extends keyof any, InstantiatedType> {
+    protected abstract readonly _: {
+        readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType;
+    };
+}
+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: 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: 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;
+    exclusiveMinimum?: number;
+    exclusiveMaximum?: number;
+    minLength?: number;
+    maxLength?: number;
+    required: boolean;
+    description?: string;
+};
+export {};
+//# sourceMappingURL=form.d.ts.map

package/dist/form.d.ts.map

@@ -0,0 +1 @@
+{"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;AA8HD,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,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CA2BA"}

package/dist/form.js

@@ -0,0 +1,178 @@
+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 { capitalize, ref, watch } from "vue";
+import * as JSONSchema from "@effect/schema/JSONSchema";
+export function convertIn(v, type) {
+    return v === null ? "" : type === "text" ? v : `${v}`;
+}
+export function convertOutInt(v, type) {
+    v = v == null ? v : v.trim();
+    const c = v === "" ? null : type === "float" ? parseFloat(v) : type === "int" ? parseInt(v) : v;
+    return c;
+}
+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 {
+}
+// type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
+//   : never
+const defaultIntl = createIntl({ locale: "en" });
+export const translate = ref(defaultIntl.formatMessage.bind(defaultIntl));
+export const customSchemaErrors = ref(new Map());
+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: metadata.description ? "expected " + metadata.description : 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.exclusiveMinimum === undefined)
+            || metadata.exclusiveMinimum !== undefined && v > metadata.exclusiveMinimum
+            || metadata.minimum !== undefined && 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.exclusiveMinimum !== undefined,
+                minimum: metadata.exclusiveMinimum ?? metadata.maximum
+            }),
+        (v) => v === null
+            || (metadata.maximum === undefined && metadata.exclusiveMaximum === undefined)
+            || metadata.exclusiveMaximum !== undefined && v < metadata.exclusiveMaximum
+            || metadata.maximum !== undefined && 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.exclusiveMaximum !== undefined,
+                maximum: metadata.exclusiveMaximum ?? 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,
+        exclusiveMinimum: jschema.exclusiveMinimum,
+        maximum: jschema.maximum,
+        exclusiveMaximum: jschema.exclusiveMaximum,
+        minLength: jschema.minLength,
+        maxLength: jschema.maxLength,
+        description: jschema.description,
+        required: !nullable
+    };
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form.js","sourceRoot":"","sources":["../_src/form.ts"],"names":[],"mappings":"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"}

package/dist/hooks.d.ts

@@ -8,7 +8,7 @@ import { Done, Initial, Loading } from "@effect-app/prelude/client";
 import type { ApiConfig, FetchResponse } from "@effect-app/prelude/client";
 import * as swrv from "swrv";
 import type { fetcherFn, IResponse } from "swrv/dist/types.js";
-import type { Ref } from "vue";
+import type { ComputedRef, Ref } from "vue";
 export { isFailed, isInitializing, isSuccess } from "@effect-app/prelude/client";
 type MutateType = {
     <Data>(key: string, res: Data | Promise<Data>, cache?: swrv.SWRVCache<Omit<IResponse<any, any>, "mutate">>, ttl?: number): Promise<{
@@ -32,16 +32,17 @@ export declare function useMutateWithArg<Arg, E, A>(self: ((arg: Arg) => Effect<
     error: any;
     isValidating: any;
 }>;
+export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T);
 export declare function useSafeQueryWithArg<Arg, E, A>(self: ((arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>) & {
     mapPath: (arg: Arg) => string;
-}, arg: Arg, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [import("vue").ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, import("vue").ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
+}, arg: Arg | WatchSource<Arg>, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
 export declare function useSafeQuery<E, A>(self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>> & {
     mapPath: string;
-}, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [import("vue").ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, import("vue").ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
-export declare function useSafeQueryWithArg_<Arg, E, A>(self: (arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>, mapPath: (arg: Arg) => string, arg: Arg, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [import("vue").ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, import("vue").ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
-export declare function useSafeQuery_<E, A>(key: string, self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [import("vue").ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, import("vue").ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
-export declare function useSafeQueryLegacy<E, A>(self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>, import("vue").ComputedRef<A | undefined>, () => Promise<void | import("effect/Exit").Exit<never, Initial | Loading | import("@effect-app/prelude/client").Refreshing<E, A> | Done<E, A>>>];
-export declare function make<R, E, A>(self: Effect<R, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>, import("vue").ComputedRef<A | undefined>, import("effect/Effect").Effect<R, never, Initial | Loading | import("@effect-app/prelude/client").Refreshing<E, A> | Done<E, A>>];
+}, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
+export declare function useSafeQueryWithArg_<Arg, E, A>(self: (arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>, mapPath: (arg: Arg) => string, arg: Arg | WatchSource<Arg>, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
+export declare function useSafeQuery_<E, A>(key: string | WatchSource<string>, self: () => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
+export declare function useSafeQueryLegacy<E, A>(self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void | import("effect/Exit").Exit<never, Initial | Loading | import("@effect-app/prelude/client").Refreshing<E, A> | Done<E, A>>>];
+export declare function make<R, E, A>(self: Effect<R, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, import("effect/Effect").Effect<R, never, Initial | Loading | import("@effect-app/prelude/client").Refreshing<E, A> | Done<E, A>>];
 export interface MutationInitial {
     readonly _tag: "Initial";
 }

package/dist/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":"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"}

package/dist/hooks.js

@@ -43,10 +43,18 @@ export function useSafeQueryWithArg(self, arg, config) {
     return useSafeQueryWithArg_(self, self.mapPath, arg, config);
 }
 export function useSafeQuery(self, config) {
-    return useSafeQuery_(self.mapPath, self, config);
+    return useSafeQuery_(self.mapPath, () => self, config);
 }
 export function useSafeQueryWithArg_(self, mapPath, arg, config) {
-    return useSafeQuery_(mapPath(arg), self(arg), config);
+    const arr = arg;
+    const r = typeof arr === "function"
+        ? {
+            get value() {
+                return arr();
+            }
+        }
+        : ref(arg);
+    return useSafeQuery_(computed(() => mapPath(r.value)), () => self(r.value), config);
 }
 export function useSafeQuery_(key, self, config) {
     // const [result, latestSuccess, execute] = make(self)
@@ -77,7 +85,7 @@ export function useSafeQuery_(key, self, config) {
     //     })
     // }
     // const swr = useSWRV<A, E>(key, () => execWithInterruption().then(_ => _?.body as any)) // Effect.runPromise(self.provide(Layers))
-    const swr = useSWRV(key, () => run.value(self).then((_) => _.body), config);
+    const swr = useSWRV(key, () => run.value(self()).then((_) => _.body), config);
     const result = computed(() => swrToQuery({ data: swr.data.value, error: swr.error.value, isValidating: swr.isValidating.value })); // ref<QueryResult<E, A>>()
     const latestSuccess = computed(() => {
         const value = result.value;
@@ -184,4 +192,4 @@ export const useMutation = (self) => {
     };
     return tsplus_module_5.tuple(state, exec);
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAG5B,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAsBhF,sEAAsE;AACtE,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAA2B,CAAA;AACtG,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAA0B,CAAA;AAExG,SAAS,UAAU,CACjB,CAAuE;IAEvE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,CAAC,CAAC,YAAY;YACnB,CAAC,CAAC,gBAAA,UAAU,CAAC,IAAI,CAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC;YACxC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;IACD,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,CAAC,CAAC,YAAY;YACnB,CAAC,CAAC,gBAAA,UAAU,CAAC,OAAO,CAAO,CAAC,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAO,CAAC,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAED,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAA;AACvD,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,IAAuF;IAEvF,MAAM,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACpD,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAqH;IAErH,MAAM,EAAE,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACjE,OAAO,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AACzD,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,mBAAmB,CACjC,IAAqH,EACrH,GAAQ,EACR,MAAkD;IAElD,OAAO,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;AAC9D,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,IAAuF,EACvF,MAAkD;IAElD,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAA+E,EAC/E,OAA6B,EAC7B,GAAQ,EACR,MAAkD;IAElD,OAAO,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAA;AACvD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAW,EACX,IAAiE,EACjE,MAAkD;IAElD,sDAAsD;IAEtD,kCAAkC;IAClC,sCAAsC;IACtC,kCAAkC;IAClC,2EAA2E;IAC3E,uBAAuB;IACvB,gCAAgC;IAChC,qBAAqB;IACrB,0BAA0B;IAC1B,uBAAuB;IACvB,SAAS;IACT,MAAM;IAEN,mBAAmB;IACnB,2BAA2B;IAC3B,iBAAiB;IACjB,gDAAgD;IAChD,iBAAiB;IACjB,OAAO;IACP,yBAAyB;IACzB,oCAAoC;IACpC,8BAA8B;IAC9B,oBAAoB;IACpB,sBAAsB;IACtB,0DAA0D;IAC1D,yBAAyB;IACzB,SAAS;IACT,IAAI;IAEJ,oIAAoI;IACpI,MAAM,GAAG,GAAG,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;IACjF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC3B,UAAU,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CACnG,CAAA,CAAC,2BAA2B;IAC7B,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,EAAE;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QAC1B,OAAO,0BAAA,KAAK,CAAY;YACtB,CAAC,CAAC,wBAAA,KAAK,CAAC,OAAO,CAAU;gBACvB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK;gBACrB,CAAC,CAAC,uBAAA,KAAK,CAAC,QAAQ,CAAS;oBACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK;oBACtB,CAAC,CAAC,SAAS;YACb,CAAC,CAAC,SAAS,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,OAAO,gBAAA,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAA;AAC9D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAO,IAAiE;IACxG,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;IAEnD,MAAM,GAAG,GAAG,oCAAqB,CAAC,CAAC,CAAA;IACnC,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACrC,IAAI,GAAG,GAAgD,SAAS,CAAA;IAChE,MAAM,MAAM,GAAG,yCAAA,OAAO,GAEf,CAAC,QAAQ,EAAE,EAAE,CAChB,qBAAY,GAAG,EAAE;QACf,GAAG,GAAG,QAAQ,CAAA;IAChB,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,EAAE,GAAG,wBAAA,wBACA,GAAG,EAAE;QACZ,OAAO,GAAG;YACR,CAAC,CAAC,mDAAA,GAAG,GAAoB,MAAM,CAAC;YAChC,CAAC,CAAC,MAAM,CAAA;IACZ,CAAC,CAAC;SACD,IAAI,CAAC,UAAU,CAAC,EACR,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAE1B,SAAS,IAAI;QACX,OAAO,GAAG;aACP,KAAK,CAAC,EAAE,CAAC;aACT,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO;YACP,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC;gBAAE,MAAM,GAAG,CAAA;QACtE,CAAC,CAAC,CAAA;IACN,CAAC;IAED,OAAO,gBAAA,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;AAC3C,CAAC;AAED,MAAM,UAAU,IAAI,CAAU,IAAoC;IAChE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,OAAO,EAAuB,CAAC,CAAA;IAE7D,MAAM,OAAO,GAAG,wBAAA,yBAAA,qBACR,GAAG,EAAE;QACT,MAAM,CAAC,KAAK,GAAG,+BAAA,MAAM,CAAC,KAAK,CAAiB;YAC1C,CAAC,CAAC,IAAI,OAAO,EAAE;YACf,CAAC,CAAC,oBAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAClC,CAAC,CAAC,8BACQ,oBAAA,IAAI,EAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAe,EACvC,CAAC,CAAC,EAAE,EAAE,CAAC,2BAAO,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAA;IAE3C,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,EAAE;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QAC1B,OAAO,yBAAA,KAAK,CAAW;YACrB,CAAC,CAAC,wBAAA,KAAK,CAAC,OAAO,CAAU;gBACvB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK;gBACrB,CAAC,CAAC,uBAAA,KAAK,CAAC,QAAQ,CAAS;oBACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK;oBACtB,CAAC,CAAC,SAAS;YACb,CAAC,CAAC,SAAS,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,OAAO,gBAAA,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;AAC9C,CAAC;AAsBD;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAcpB,CACF,IAA6G,EAC7G,EAAE;IACF,MAAM,KAAK,GAA8B,GAAG,CAAuB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAQ,CAAA;IAE9F,SAAS,UAAU,CAAC,IAAgB;QAClC,OAAO,qBAAY,GAAG,EAAE;YACtB,IAAI,0BAAA,IAAI,CAAY,EAAE,CAAC;gBACrB,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAA;gBACnD,OAAO,sBAAO,IAAI,CAAC,KAAK,CAAC,CAAA;YAC3B,CAAC;YAED,MAAM,GAAG,iCAAG,IAAI,CAAC,KAAK,CAAc,CAAA;YACpC,IAAI,uBAAA,GAAG,CAAS,EAAE,CAAC;gBACjB,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAA;gBACjD,OAAO,qBAAY,GAAG,CAAC,KAAK,CAAC,CAAA;YAC/B,CAAC;YAED,MAAM,IAAI,6BAAG,IAAI,CAAC,KAAK,CAAU,CAAA;YACjC,oCAAI,IAAI,GAAQ,CAAC;gBACf,sCAAM,IAAI,EAAM;YAClB,CAAC;YACD,MAAM,WAAW,mCAAG,IAAI,CAAC,KAAK,CAAgB,CAAA;YAC9C,oCAAI,WAAW,GAAQ,CAAC;gBACtB,MAAM,IAAI,oBAAoB,EAAE,CAAA;YAClC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,GAAqB,EAAE,GAAiB,EAAE,EAAE;QACxD,IAAI,MAAoD,CAAA;QACxD,IAAI,WAAoC,CAAA;QACxC,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,GAAG,IAAI,CAAC,GAAQ,CAAC,CAAA;YACvB,WAAW,GAAG,GAAG,CAAA;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,IAAI,CAAA;YACb,WAAW,GAAG,GAA8B,CAAA;QAC9C,CAAC;QAED,OAAO,GAAG,CAAC,KAAK,CACd,6CAAA,6CAAA,yBAAA,qBACQ,GAAG,EAAE;YACT,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;QACnC,CAAC,CAAC,EACQ,MAAM,CAAC,GAER,UAAU,CAAC,GAEX,CAAC,CAAC,EAAE,EAAE;YACb,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,2BAAC,CAAC,EAAW,CAAA;YAC3C,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;YAChF,4BAAO,CAAC,EAAK;QACf,CAAC,CAAC,CACL,CAAA;IACH,CAAC,CAAA;IAED,OAAO,gBAAA,KAAK,CACV,KAAK,EACL,IAAI,CACL,CAAA;AACH,CAAC,CAAA"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":"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"}

package/dist/routeParams.d.ts

@@ -1,5 +1,5 @@
 import { Option } from "@effect-app/core/Option";
-import type { REST, Schema } from "@effect-app/prelude/schema";
+import type { REST, Schema } from "@effect-app/schema";
 import type { ParsedQuery } from "query-string";
 export declare function getQueryParam(search: ParsedQuery, param: string): string | null | undefined;
 export declare const getQueryParamO: (search: ParsedQuery, param: string) => import("effect/Option").Option<string>;

package/dist/routeParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routeParams.d.ts","sourceRoot":"","sources":["../_src/routeParams.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,6BAM/D;AAED,eAAO,MAAM,cAAc,gFAA2C,CAAA;AAEtE,eAAO,MAAM,QAAQ,YAAa,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,uJAMlD,CAAA;AAED,eAAO,MAAM,eAAe,YAAa,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,uJAMzD,CAAA;AAED,wBAAgB,sBAAsB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACjF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5C,CAYA;AAED,wBAAgB,gBAAgB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAC3E,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACpC,CAYA"}
+{"version":3,"file":"routeParams.d.ts","sourceRoot":"","sources":["../_src/routeParams.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,6BAM/D;AAED,eAAO,MAAM,cAAc,gFAA2C,CAAA;AAEtE,eAAO,MAAM,QAAQ,YAAa,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,uJAMlD,CAAA;AAED,eAAO,MAAM,eAAe,YAAa,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,uJAMzD,CAAA;AAED,wBAAgB,sBAAsB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACjF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5C,CAYA;AAED,wBAAgB,gBAAgB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAC3E,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACpC,CAYA"}

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "@effect-app/vue",
-  "version": "0.87.0-next.2",
+  "version": "0.87.0-next.21",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@effect/platform-browser": "^0.25.0",
-    "@effect/schema": "^0.56.1",
+    "@effect/schema": "npm:@effect-app/schema-fork@0.0.0-20231227111019",
     "@fp-ts/optic": "^0.21.0",
     "@formatjs/intl": "^2.9.9",
     "effect": "^2.0.0-next.62",
     "query-string": "^8.1.0",
     "swrv": "^1.0.4",
     "vue": "^3.3.13",
-    "@effect-app/prelude": "0.107.0-next.2",
-    "@effect-app/vue": "0.87.0-next.2",
-    "@effect-app/core": "0.97.0-next.0",
-    "@effect-app/schema": "0.150.0-next.1"
+    "@effect-app/prelude": "0.107.0-next.17",
+    "@effect-app/vue": "0.87.0-next.21",
+    "@effect-app/core": "0.97.0-next.4",
+    "@effect-app/schema": "0.150.0-next.14"
   },
   "devDependencies": {
     "@rollup/pluginutils": "^5.1.0",
@@ -56,6 +56,16 @@
         "default": "./_cjs/_global.cjs"
       }
     },
+    "./form": {
+      "import": {
+        "types": "./dist/form.d.ts",
+        "default": "./dist/form.js"
+      },
+      "require": {
+        "types": "./dist/form.d.ts",
+        "default": "./_cjs/form.cjs"
+      }
+    },
     "./hooks": {
       "import": {
         "types": "./dist/hooks.d.ts",