@effect-app/vue 0.17.2 → 0.18.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @effect-app/vue
 
+## 0.18.0
+
+### Minor Changes
+
+- Update annotations, drop Aspects for now
+
+### Patch Changes
+
+- Updated dependencies
+  - @effect-app/core@0.22.0
+  - @effect-app/prelude@0.21.0
+  - @effect-app/schema@0.18.0
+  - @effect-app/vue@0.18.0
+
+## 0.17.3
+
+### Patch Changes
+
+- Updated dependencies [e3e768a5]
+  - @effect-app/core@0.21.3
+  - @effect-app/prelude@0.20.3
+  - @effect-app/schema@0.17.3
+  - @effect-app/vue@0.17.3
+
 ## 0.17.2
 
 ### Patch Changes

package/_cjs/form.cjs

@@ -35,7 +35,7 @@ function buildFieldInfo(propOrSchema, fieldKey) {
   const parse = _schema.Parser.for(schema);
   const info = {
     type: "text",
-    rules: [v => !metadata.required || v !== "" || "The field cannot be empty", v => v === "" || metadata.minLength === undefined || v.length >= metadata.minLength || `The field requires at least ${metadata.minLength} characters`, v => v === "" || metadata.maxLength === undefined || v.length <= metadata.maxLength || `The field cannot have more than ${metadata.maxLength} characters`, v => tsplus_module_4.pipe(parse(v === "" ? null : v), _schema.These.result, _ => tsplus_module_3.match(() => `The entered value is not a valid ${(0, _vue.capitalize)(fieldKey.toString())}`, ([_, optErr]) => tsplus_module_2.isSome(optErr) ? `The entered value is not a valid ${(0, _vue.capitalize)(fieldKey.toString())}` : true)(_))],
+    rules: [v => !metadata.required || v !== "" || "The field cannot be empty", v => v === "" || metadata.minLength === undefined || v.length >= metadata.minLength || `The field requires at least ${metadata.minLength} characters`, v => v === "" || metadata.maxLength === undefined || v.length <= metadata.maxLength || `The field cannot have more than ${metadata.maxLength} characters`, v => tsplus_module_4.pipe(parse(v === "" ? null : v), _schema.These.result, _ => tsplus_module_3.match(_, () => `The entered value is not a valid ${(0, _vue.capitalize)(fieldKey.toString())}`, ([_, optErr]) => tsplus_module_2.isSome(optErr) ? `The entered value is not a valid ${(0, _vue.capitalize)(fieldKey.toString())}` : true))],
     metadata
   };
   return info;

package/_cjs/form.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"form.cjs","mappings":";;;;;;;;;;;;AAAA;AASA;AAAgC;AAAA;AAE1B,SAAUA,SAAS,CAACC,CAAgB;EACxC,OAAOA,CAAC,KAAK,IAAI,GAAG,EAAE,GAAGA,CAAC;AAC5B;AAEM,SAAUC,UAAU,CAACD,CAAS,EAAEE,GAA+B;EACnEF,CAAC,GAAGA,CAAC,CAACG,IAAI,EAAE;EACZ,OAAOD,GAAG,CAACF,CAAC,KAAK,EAAE,GAAG,IAAI,GAAGA,CAAC,CAAC;AACjC;AAEM,SAAUI,uBAAuB,CACrCC,KAAY;EAEZ,OAAOC,wDAAK,GAASC,MAAM,CACzB,CAACC,IAAI,EAAEC,GAAG,KAAI;IACZD,IAAI,CAACC,GAAG,CAAC,GAAGC,cAAc,CAACL,KAAK,CAACI,GAAG,CAAgB,EAAEA,GAAG,CAAC;IAC1D,OAAOD,IAAI;EACb,CAAC,EACD,EAKC,CACF;AACH;AAQA,MAAMG,CAAC,GAAGC,MAAM,EAAE;AAClB,MAAeC,oBAAoB;AAiBnC,SAASH,cAAc,CACrBI,YAAqC,EACrCC,QAAqB;EAErB,MAAMC,QAAQ,GAAG,uCAA2B,EAACF,YAAY,CAAC;EAC1D,MAAMG,MAAM,GAAG,oBAAQ,EAACH,YAAY,CAAC,GAAGA,YAAY,GAAGA,YAAY,CAACI,OAAO;EAC3E,MAAMC,KAAK,GAAGC,cAAM,CAACC,GAAG,CAACJ,MAAM,CAAC;EAEhC,MAAMK,IAAI,GAAG;IACXC,IAAI,EAAE,MAAM;IACZC,KAAK,EAAE,CACJxB,CAAS,IAAK,CAACgB,QAAQ,CAACS,QAAQ,IAAIzB,CAAC,KAAK,EAAE,IAAI,2BAA2B,EAC3EA,CAAS,IACRA,CAAC,KAAK,EAAE,IACRgB,QAAQ,CAACU,SAAS,KAAKC,SAAS,IAChC3B,CAAC,CAAC4B,MAAM,IAAIZ,QAAQ,CAACU,SAAS,IAC9B,+BAA+BV,QAAQ,CAACU,SAAS,aAAa,EAC/D1B,CAAS,IACRA,CAAC,KAAK,EAAE,IACRgB,QAAQ,CAACa,SAAS,KAAKF,SAAS,IAChC3B,CAAC,CAAC4B,MAAM,IAAIZ,QAAQ,CAACa,SAAS,IAC9B,mCAAmCb,QAAQ,CAACa,SAAS,aAAa,EACnE7B,CAAU,IACT8B,oBAAI,CACFX,KAAK,CAACnB,CAAC,KAAK,EAAE,GAAG,IAAI,GAAGA,CAAC,CAAC,EAC1B+B,aAAK,CAACC,MAAM,EACZC,CAAC,IACCC,sBACE,MACE,oCACE,mBAAU,EACRnB,QAAQ,CAACoB,QAAQ,EAAE,CAEvB,EAAE,EACJ,CAAC,CAACF,CAAC,EAAEG,MAAM,CAAC,KACVC,6BAAM,CAAS,GACX,oCACA,mBAAU,EACRtB,QAAQ,CAACoB,QAAQ,EAAE,CAEvB,EAAE,GACA,IAAI,EAdZF,CAAC,CAeA,CACJ,CACJ;IACDjB;GACD;EAED,OAAOM,IAAW;AACpB","names":["convertIn","v","convertOut","set","trim","buildFieldInfoFromProps","props","tsplus_module_1","reduce","prev","cur","buildFieldInfo","f","Symbol","PhantomTypeParameter","propOrSchema","fieldKey","metadata","schema","_schema","parse","Parser","for","info","type","rules","required","minLength","undefined","length","maxLength","tsplus_module_4","These","result","_","tsplus_module_3","toString","optErr","tsplus_module_2"],"sourceRoot":"","sources":["../_src/form.ts"],"sourcesContent":[null]}
+{"version":3,"file":"form.cjs","mappings":";;;;;;;;;;;;AAAA;AASA;AAAgC;AAAA;AAE1B,SAAUA,SAAS,CAACC,CAAgB;EACxC,OAAOA,CAAC,KAAK,IAAI,GAAG,EAAE,GAAGA,CAAC;AAC5B;AAEM,SAAUC,UAAU,CAACD,CAAS,EAAEE,GAA+B;EACnEF,CAAC,GAAGA,CAAC,CAACG,IAAI,EAAE;EACZ,OAAOD,GAAG,CAACF,CAAC,KAAK,EAAE,GAAG,IAAI,GAAGA,CAAC,CAAC;AACjC;AAEM,SAAUI,uBAAuB,CACrCC,KAAY;EAEZ,OAAOC,wDAAK,GAASC,MAAM,CACzB,CAACC,IAAI,EAAEC,GAAG,KAAI;IACZD,IAAI,CAACC,GAAG,CAAC,GAAGC,cAAc,CAACL,KAAK,CAACI,GAAG,CAAgB,EAAEA,GAAG,CAAC;IAC1D,OAAOD,IAAI;EACb,CAAC,EACD,EAKC,CACF;AACH;AAQA,MAAMG,CAAC,GAAGC,MAAM,EAAE;AAClB,MAAeC,oBAAoB;AAiBnC,SAASH,cAAc,CACrBI,YAAqC,EACrCC,QAAqB;EAErB,MAAMC,QAAQ,GAAG,uCAA2B,EAACF,YAAY,CAAC;EAC1D,MAAMG,MAAM,GAAG,oBAAQ,EAACH,YAAY,CAAC,GAAGA,YAAY,GAAGA,YAAY,CAACI,OAAO;EAC3E,MAAMC,KAAK,GAAGC,cAAM,CAACC,GAAG,CAACJ,MAAM,CAAC;EAEhC,MAAMK,IAAI,GAAG;IACXC,IAAI,EAAE,MAAM;IACZC,KAAK,EAAE,CACJxB,CAAS,IAAK,CAACgB,QAAQ,CAACS,QAAQ,IAAIzB,CAAC,KAAK,EAAE,IAAI,2BAA2B,EAC3EA,CAAS,IACRA,CAAC,KAAK,EAAE,IACRgB,QAAQ,CAACU,SAAS,KAAKC,SAAS,IAChC3B,CAAC,CAAC4B,MAAM,IAAIZ,QAAQ,CAACU,SAAS,IAC9B,+BAA+BV,QAAQ,CAACU,SAAS,aAAa,EAC/D1B,CAAS,IACRA,CAAC,KAAK,EAAE,IACRgB,QAAQ,CAACa,SAAS,KAAKF,SAAS,IAChC3B,CAAC,CAAC4B,MAAM,IAAIZ,QAAQ,CAACa,SAAS,IAC9B,mCAAmCb,QAAQ,CAACa,SAAS,aAAa,EACnE7B,CAAU,IACT8B,oBAAI,CACFX,KAAK,CAACnB,CAAC,KAAK,EAAE,GAAG,IAAI,GAAGA,CAAC,CAAC,EAC1B+B,aAAK,CAACC,MAAM,EACZC,CAAC,IACCC,uBAAC,EACC,MACE,oCACE,mBAAU,EACRnB,QAAQ,CAACoB,QAAQ,EAAE,CAEvB,EAAE,EACJ,CAAC,CAACF,CAAC,EAAEG,MAAM,CAAC,KACVC,6BAAM,CAAS,GACX,oCACA,mBAAU,EACRtB,QAAQ,CAACoB,QAAQ,EAAE,CAEvB,EAAE,GACA,IAAI,CACX,CACJ,CACJ;IACDnB;GACD;EAED,OAAOM,IAAW;AACpB","names":["convertIn","v","convertOut","set","trim","buildFieldInfoFromProps","props","tsplus_module_1","reduce","prev","cur","buildFieldInfo","f","Symbol","PhantomTypeParameter","propOrSchema","fieldKey","metadata","schema","_schema","parse","Parser","for","info","type","rules","required","minLength","undefined","length","maxLength","tsplus_module_4","These","result","_","tsplus_module_3","toString","optErr","tsplus_module_2"],"sourceRoot":"","sources":["../_src/form.ts"],"sourcesContent":[null]}

package/_cjs/hooks.cjs

@@ -125,12 +125,12 @@ function useSafeQueryLegacy(self) {
   const sem = tsplus_module_6.unsafeMakeSemaphore(1);
   const withPermit = sem.withPermits(1);
   let fib = undefined;
-  const runNew = tsplus_module_6.tap(newFiber => tsplus_module_6.sync(() => {
+  const runNew = tsplus_module_6.tap(tsplus_module_6.fork(execute), newFiber => tsplus_module_6.sync(() => {
     fib = newFiber;
-  }))(tsplus_module_6.fork(execute));
-  const ex = tsplus_module_6.flatMap(_ => tsplus_module_6.done(_))(tsplus_module_6.flatMap(_ => _.await())(withPermit(tsplus_module_6.suspendSucceed(() => {
-    return fib ? tsplus_module_6.zipRight(runNew)(tsplus_module_7.interrupt(fib)) : runNew;
-  }))));
+  }));
+  const ex = tsplus_module_6.flatMap(tsplus_module_6.flatMap(withPermit(tsplus_module_6.suspendSucceed(() => {
+    return fib ? tsplus_module_6.zipRight(tsplus_module_7.interrupt(fib), runNew) : runNew;
+  })), _ => _.await()), _ => tsplus_module_6.done(_));
   function exec() {
     return _internal.run.value(ex).catch(err => {
       // TODO
@@ -141,9 +141,9 @@ function useSafeQueryLegacy(self) {
 }
 function make(self) {
   const result = (0, _vue.shallowRef)(new tsplus_module_1.Initial());
-  const execute = tsplus_module_6.flatMap(r => tsplus_module_6.sync(() => result.value = r))(tsplus_module_6.zipRight(tsplus_module_2.queryResult(tsplus_module_6.map(_ => _.body)(self)))(tsplus_module_6.sync(() => {
+  const execute = tsplus_module_6.flatMap(tsplus_module_6.zipRight(tsplus_module_6.sync(() => {
     result.value = tsplus_module_2.isInitializing(result.value) ? new tsplus_module_1.Loading() : new tsplus_module_1.Refreshing(result.value);
-  })));
+  }), tsplus_module_2.queryResult(tsplus_module_6.map(self, _ => _.body))), r => tsplus_module_6.sync(() => result.value = r));
   const latestSuccess = (0, _vue.computed)(() => {
     const value = result.value;
     return tsplus_module_2.hasValue(value) ? tsplus_module_3.isRight(value.current) ? value.current.right : tsplus_module_4.isSome(value.previous) ? value.previous.value : undefined : undefined;
@@ -159,15 +159,15 @@ function useMutation(self) {
   const error = (0, _vue.ref)();
   const value = (0, _vue.ref)();
   const handle = handleExit(loading, error, value);
-  const exec = (i, abortSignal) => _internal.run.value(tsplus_module_6.flatMap(f => {
-    const cancel = () => _internal.run.value(tsplus_module_7.interrupt(f));
-    abortSignal?.addEventListener("abort", () => void cancel().catch(console.error));
-    return tsplus_module_7.join(f);
-  })(tsplus_module_6.fork(tsplus_module_6.flatMap(exit => tsplus_module_6.sync(() => handle(exit)))(tsplus_module_6.exit(tsplus_module_6.zipRight(self(i))(tsplus_module_6.sync(() => {
+  const exec = (i, abortSignal) => _internal.run.value(tsplus_module_6.flatMap(tsplus_module_6.fork(tsplus_module_6.flatMap(tsplus_module_6.exit(tsplus_module_6.zipRight(tsplus_module_6.sync(() => {
     loading.value = true;
     value.value = undefined;
     error.value = undefined;
-  })))))));
+  }), self(i))), exit => tsplus_module_6.sync(() => handle(exit)))), f => {
+    const cancel = () => _internal.run.value(tsplus_module_7.interrupt(f));
+    abortSignal?.addEventListener("abort", () => void cancel().catch(console.error));
+    return tsplus_module_7.join(f);
+  }));
   const state = (0, _vue.computed)(() => ({
     loading: loading.value,
     value: value.value,
@@ -185,11 +185,11 @@ function useAction(self) {
   const handle = handleExit(loading, error, value);
   const exec = abortSignal => {
     loading.value = true;
-    return _internal.run.value(tsplus_module_6.flatMap(f => {
+    return _internal.run.value(tsplus_module_6.flatMap(tsplus_module_6.fork(tsplus_module_6.flatMap(tsplus_module_6.exit(self), exit => tsplus_module_6.sync(() => handle(exit)))), f => {
       const cancel = () => tsplus_module_6.runPromise(tsplus_module_7.interrupt(f));
       abortSignal?.addEventListener("abort", () => void cancel().catch(console.error));
       return tsplus_module_7.join(f);
-    })(tsplus_module_6.fork(tsplus_module_6.flatMap(exit => tsplus_module_6.sync(() => handle(exit)))(tsplus_module_6.exit(self)))));
+    }));
   };
   const state = (0, _vue.computed)(() => ({
     loading: loading.value,

package/_cjs/hooks.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.cjs","mappings":"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","names":["useSWRV","swrv","default","mutate","swrToQuery","r","error","isValidating","tsplus_module_1","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","latestSuccess","tsplus_module_2","tsplus_module_3","current","right","tsplus_module_4","previous","tsplus_module_5","useSafeQueryLegacy","execute","make","sem","tsplus_module_6","withPermit","withPermits","fib","runNew","newFiber","ex","await","exec","catch","err","JSON","stringify","includes","Refreshing","useMutation","loading","handle","handleExit","i","abortSignal","f","cancel","addEventListener","console","exit","state","useAction","tsplus_module_8","cause","died","interrupted","Error"],"sourceRoot":"","sources":["../_src/hooks.ts"],"sourcesContent":[null]}
+{"version":3,"file":"hooks.cjs","mappings":"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","names":["useSWRV","swrv","default","mutate","swrToQuery","r","error","isValidating","tsplus_module_1","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","latestSuccess","tsplus_module_2","tsplus_module_3","current","right","tsplus_module_4","previous","tsplus_module_5","useSafeQueryLegacy","execute","make","sem","tsplus_module_6","withPermit","withPermits","fib","runNew","newFiber","ex","await","exec","catch","err","JSON","stringify","includes","Refreshing","useMutation","loading","handle","handleExit","i","abortSignal","exit","f","cancel","addEventListener","console","state","useAction","tsplus_module_8","cause","died","interrupted","Error"],"sourceRoot":"","sources":["../_src/hooks.ts"],"sourcesContent":[null]}

package/_cjs/routeParams.cjs

@@ -37,7 +37,7 @@ function parseRouteParamsOption(query, t // enforce non empty
 ) {
   return tsplus_module_4.RecordKeys(tsplus_module_4.object$(t)).reduce((prev, cur) => {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    prev[cur] = tsplus_module_1.flatMap(parseOpt(t[cur]))(getQueryParamO(query, cur));
+    prev[cur] = tsplus_module_1.flatMap(getQueryParamO(query, cur), parseOpt(t[cur]));
     return prev;
   }, {});
 }

package/_cjs/routeParams.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routeParams.cjs","mappings":";;;;;;;;;;;;;AACA;AAAuE;AAAA;AAGjE,SAAUA,aAAa,CAACC,MAAmB,EAAEC,KAAa;EAC9D,MAAMC,CAAC,GAAGF,MAAM,CAACC,KAAK,CAAC;EACvB,IAAIE,KAAK,CAACC,OAAO,CAACF,CAAC,CAAC,EAAE;IACpB,OAAOA,CAAC,CAAC,CAAC,CAAC;;EAEb,OAAOA,CAAC,IAAI,IAAI;AAClB;AAEO,MAAMG,cAAc,GAAGC,oBAAI,CAACP,aAAa,+BAAsB;AAAA;AAE/D,MAAMQ,QAAQ,GAAUC,CAAe,IAAI;EAChD,MAAMC,GAAG,GAAGH,oBAAI,CAAC,sBAAU,EAACE,CAAC,CAAC,EAAEE,CAAC,IAC/BA,CAAC,CAACC,MAAM,CAACC,IAAI,KAAK,OAAO,GACrBF,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAACD,IAAI,KAAK,MAAM,GAC/BE,qBAAOJ,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAAC,GAC1BE,oBAAY,GACdA,oBAAY,CAAC;EAClB,OAAON,GAAG;AACZ,CAAC;AAAA;AAEM,MAAMO,eAAe,GAAUR,CAAe,IAAI;EACvD,MAAMC,GAAG,GAAGH,oBAAI,CAACW,cAAM,CAACC,GAAG,CAACV,CAAC,CAAC,EAAEE,CAAC,IAC/BA,CAAC,CAACC,MAAM,CAACC,IAAI,KAAK,OAAO,GACrBF,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAACD,IAAI,KAAK,MAAM,GAC/BE,qBAAOJ,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAAC,GAC1BE,oBAAY,GACdA,oBAAY,CAAC;EAClB,OAAON,GAAG;AACZ,CAAC;AAAA;AAEK,SAAUU,sBAAsB,CACpCC,KAA0B,EAC1BZ,CAAM,CAAC;AAAA;EAIP,OAAOa,oDAAC,GAASC,MAAM,CACrB,CAACC,IAAI,EAAEC,GAAG,KAAI;IACZ;IACAD,IAAI,CAACC,GAAG,CAAC,GAAGV,wBAA6CP,QAAQ,CAACC,CAAC,CAACgB,GAAG,CAAE,CAAC,EAA9DnB,cAAc,CAACe,KAAK,EAAEI,GAAa,CAAC,CAA2B;IAE3E,OAAOD,IAAI;EACb,CAAC,EACD,EAEC,CACF;AACH;AAEM,SAAUE,gBAAgB,CAC9BL,KAA0B,EAC1BZ,CAAM,CAAC;AAAA;EAIP,OAAOa,oDAAC,GAASC,MAAM,CACrB,CAACC,IAAI,EAAEC,GAAG,KAAI;IACZ;IACAD,IAAI,CAACC,GAAG,CAAC,GAAG,kBAAM,EAAC,sBAAU,EAAChB,CAAC,CAACgB,GAAG,CAAE,CAAC,CAAC,CAACJ,KAAK,CAACI,GAAU,CAAC,CAAC;IAE1D,OAAOD,IAAI;EACb,CAAC,EACD,EAEC,CACF;AACH","names":["getQueryParam","search","param","v","Array","isArray","getQueryParamO","tsplus_module_2","parseOpt","t","dec","x","effect","_tag","right","tsplus_module_1","tsplus_module_3","parseOptUnknown","Parser","for","parseRouteParamsOption","query","tsplus_module_4","reduce","prev","cur","parseRouteParams"],"sourceRoot":"","sources":["../_src/routeParams.ts"],"sourcesContent":[null]}
+{"version":3,"file":"routeParams.cjs","mappings":";;;;;;;;;;;;;AACA;AAAuE;AAAA;AAGjE,SAAUA,aAAa,CAACC,MAAmB,EAAEC,KAAa;EAC9D,MAAMC,CAAC,GAAGF,MAAM,CAACC,KAAK,CAAC;EACvB,IAAIE,KAAK,CAACC,OAAO,CAACF,CAAC,CAAC,EAAE;IACpB,OAAOA,CAAC,CAAC,CAAC,CAAC;;EAEb,OAAOA,CAAC,IAAI,IAAI;AAClB;AAEO,MAAMG,cAAc,GAAGC,oBAAI,CAACP,aAAa,+BAAsB;AAAA;AAE/D,MAAMQ,QAAQ,GAAUC,CAAe,IAAI;EAChD,MAAMC,GAAG,GAAGH,oBAAI,CAAC,sBAAU,EAACE,CAAC,CAAC,EAAEE,CAAC,IAC/BA,CAAC,CAACC,MAAM,CAACC,IAAI,KAAK,OAAO,GACrBF,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAACD,IAAI,KAAK,MAAM,GAC/BE,qBAAOJ,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAAC,GAC1BE,oBAAY,GACdA,oBAAY,CAAC;EAClB,OAAON,GAAG;AACZ,CAAC;AAAA;AAEM,MAAMO,eAAe,GAAUR,CAAe,IAAI;EACvD,MAAMC,GAAG,GAAGH,oBAAI,CAACW,cAAM,CAACC,GAAG,CAACV,CAAC,CAAC,EAAEE,CAAC,IAC/BA,CAAC,CAACC,MAAM,CAACC,IAAI,KAAK,OAAO,GACrBF,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAACD,IAAI,KAAK,MAAM,GAC/BE,qBAAOJ,CAAC,CAACC,MAAM,CAACE,KAAK,CAAC,CAAC,CAAC,CAAC,GAC1BE,oBAAY,GACdA,oBAAY,CAAC;EAClB,OAAON,GAAG;AACZ,CAAC;AAAA;AAEK,SAAUU,sBAAsB,CACpCC,KAA0B,EAC1BZ,CAAM,CAAC;AAAA;EAIP,OAAOa,oDAAC,GAASC,MAAM,CACrB,CAACC,IAAI,EAAEC,GAAG,KAAI;IACZ;IACAD,IAAI,CAACC,GAAG,CAAC,GAAGV,sCAAc,CAACM,KAAK,EAAEI,GAAa,CAAC,EAASjB,QAAQ,CAACC,CAAC,CAACgB,GAAG,CAAE,CAAC,CAAC;IAE3E,OAAOD,IAAI;EACb,CAAC,EACD,EAEC,CACF;AACH;AAEM,SAAUE,gBAAgB,CAC9BL,KAA0B,EAC1BZ,CAAM,CAAC;AAAA;EAIP,OAAOa,oDAAC,GAASC,MAAM,CACrB,CAACC,IAAI,EAAEC,GAAG,KAAI;IACZ;IACAD,IAAI,CAACC,GAAG,CAAC,GAAG,kBAAM,EAAC,sBAAU,EAAChB,CAAC,CAACgB,GAAG,CAAE,CAAC,CAAC,CAACJ,KAAK,CAACI,GAAU,CAAC,CAAC;IAE1D,OAAOD,IAAI;EACb,CAAC,EACD,EAEC,CACF;AACH","names":["getQueryParam","search","param","v","Array","isArray","getQueryParamO","tsplus_module_2","parseOpt","t","dec","x","effect","_tag","right","tsplus_module_1","tsplus_module_3","parseOptUnknown","Parser","for","parseRouteParamsOption","query","tsplus_module_4","reduce","prev","cur","parseRouteParams"],"sourceRoot":"","sources":["../_src/routeParams.ts"],"sourcesContent":[null]}

package/_cjs/runtime.cjs

@@ -25,7 +25,7 @@ var _internal = require("./internal.cjs");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const DefaultApiConfig = tsplus_module_1.struct({
-  apiUrl: tsplus_module_1.withDefault("/api")(tsplus_module_1.string("apiUrl")),
+  apiUrl: tsplus_module_1.withDefault(tsplus_module_1.string("apiUrl"), "/api"),
   headers: tsplus_module_1.optional(tsplus_module_1.table(tsplus_module_1.string(), "headers"))
 });
 function makeApiLayers(config = DefaultApiConfig) {
@@ -34,8 +34,8 @@ function makeApiLayers(config = DefaultApiConfig) {
 function makeAppRuntime(layer) {
   return tsplus_module_4.gen(function* ($) {
     const scope = yield* $(tsplus_module_3.make());
-    const env = yield* $(tsplus_module_2.buildWithScope(scope)(layer));
-    const runtime = yield* $(tsplus_module_4.provideContext(env)(tsplus_module_4.scoped(tsplus_module_4.runtime())));
+    const env = yield* $(tsplus_module_2.buildWithScope(layer, scope));
+    const runtime = yield* $(tsplus_module_4.provideContext(tsplus_module_4.scoped(tsplus_module_4.runtime()), env));
     return {
       runtime,
       clean: tsplus_module_3.close(scope, tsplus_module_5.ex_unit)

package/_cjs/runtime.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.cjs","mappings":";;;;;;;;;;;;;;;;;;;;AACA;AACA;AACA;AACA;AAA2C;AAAA;AAI3C,MAAMA,gBAAgB,GAAGC,uBAAc;EACrCC,MAAM,EAAED,4BAAoC,MAAM,EAA1CA,uBAAc,QAAQ,CAAC,CAAoB;EACnDE,OAAO,2BAAEF,8CAAe,EACf,SAAS,CAAC;CACpB,CAAC;AAEI,SAAUG,aAAa,CAACC,SAA4BL,gBAAgB;EACxE,6BAA0BM,iBAAS,CAACC,IAAI,CAACF,MAAM,CAAC,EAAzCG,EAAE,CAACC,MAAM,CAACC,iBAAK,CAAC;AACzB;AAEM,SAAUC,cAAc,CAAUC,KAAqB;EAC3D,OAAOC,oBAAW,WAAUC,CAAC;IAC3B,MAAMC,KAAK,GAAG,OAAOD,CAAC,CAACE,sBAAY,CAAC;IACpC,MAAMC,GAAG,GAAG,OAAOH,CAAC,CAACI,+BAAqBH,KAAK,EAA1BH,KAAK,CAAsB,CAAC;IACjD,MAAMO,OAAO,GAAG,OAAOL,CAAC,CAACD,+BAA0CI,GAAG,yBAA7CJ,yBAAmB,EAA2B,CAAC;IAExE,OAAO;MACLM,OAAO;MACPC,KAAK,EAAEJ,2BAAK;KACb;EACH,CAAC,CAAC;AACJ;AAEM,SAAUK,cAAc,CAAOT,KAA4C;EAC/E,MAAM;IAAEQ,KAAK;IAAED;EAAO,CAAE,2BAAGR,cAAc,CAACC,KAAK,CAAC,CAAQ;EACxD,yBAAW,EAACO,OAAO,CAAC;EACpB,OAAO;IACLA,OAAO;IACPC,KAAK,EAAE,MAAKP,wBAACO,KAAK;GACnB;AACH;AAEM,SAAUE,eAAe,CAAOV,KAA4C;EAChF,OAAOC,yCAAc,CAACD,KAAK,CAAC,EACzBW,IAAI,CAAC,CAAC;IAAEH,KAAK;IAAED;EAAO,CAAE,KAAI;IAC3B,yBAAW,EAACA,OAAO,CAAC;IACpB,OAAO;MACLA,OAAO;MACPC,KAAK,EAAE,MAAKP,2BAACO,KAAK;KACnB;EACH,CAAC,CAAC;AACN","names":["DefaultApiConfig","tsplus_module_1","apiUrl","headers","makeApiLayers","config","ApiConfig","Live","HF","Client","fetch","makeAppRuntime","layer","tsplus_module_4","$","scope","tsplus_module_3","env","tsplus_module_2","runtime","clean","initializeSync","initializeAsync","then"],"sourceRoot":"","sources":["../_src/runtime.ts"],"sourcesContent":[null]}
+{"version":3,"file":"runtime.cjs","mappings":";;;;;;;;;;;;;;;;;;;;AACA;AACA;AACA;AACA;AAA2C;AAAA;AAI3C,MAAMA,gBAAgB,GAAGC,uBAAc;EACrCC,MAAM,EAAED,mDAAc,QAAQ,CAAC,EAAa,MAAM,CAAC;EACnDE,OAAO,2BAAEF,8CAAe,EACf,SAAS,CAAC;CACpB,CAAC;AAEI,SAAUG,aAAa,CAACC,SAA4BL,gBAAgB;EACxE,6BAA0BM,iBAAS,CAACC,IAAI,CAACF,MAAM,CAAC,EAAzCG,EAAE,CAACC,MAAM,CAACC,iBAAK,CAAC;AACzB;AAEM,SAAUC,cAAc,CAAUC,KAAqB;EAC3D,OAAOC,oBAAW,WAAUC,CAAC;IAC3B,MAAMC,KAAK,GAAG,OAAOD,CAAC,CAACE,sBAAY,CAAC;IACpC,MAAMC,GAAG,GAAG,OAAOH,CAAC,CAACI,oCAAK,EAAgBH,KAAK,CAAC,CAAC;IACjD,MAAMI,OAAO,GAAG,OAAOL,CAAC,CAACD,+EAAmB,GAAuBI,GAAG,CAAC,CAAC;IAExE,OAAO;MACLE,OAAO;MACPC,KAAK,EAAEJ,2BAAK;KACb;EACH,CAAC,CAAC;AACJ;AAEM,SAAUK,cAAc,CAAOT,KAA4C;EAC/E,MAAM;IAAEQ,KAAK;IAAED;EAAO,CAAE,2BAAGR,cAAc,CAACC,KAAK,CAAC,CAAQ;EACxD,yBAAW,EAACO,OAAO,CAAC;EACpB,OAAO;IACLA,OAAO;IACPC,KAAK,EAAE,MAAKP,wBAACO,KAAK;GACnB;AACH;AAEM,SAAUE,eAAe,CAAOV,KAA4C;EAChF,OAAOC,yCAAc,CAACD,KAAK,CAAC,EACzBW,IAAI,CAAC,CAAC;IAAEH,KAAK;IAAED;EAAO,CAAE,KAAI;IAC3B,yBAAW,EAACA,OAAO,CAAC;IACpB,OAAO;MACLA,OAAO;MACPC,KAAK,EAAE,MAAKP,2BAACO,KAAK;KACnB;EACH,CAAC,CAAC;AACN","names":["DefaultApiConfig","tsplus_module_1","apiUrl","headers","makeApiLayers","config","ApiConfig","Live","HF","Client","fetch","makeAppRuntime","layer","tsplus_module_4","$","scope","tsplus_module_3","env","tsplus_module_2","runtime","clean","initializeSync","initializeAsync","then"],"sourceRoot":"","sources":["../_src/runtime.ts"],"sourcesContent":[null]}

package/dist/form.js

@@ -36,12 +36,12 @@ function buildFieldInfo(propOrSchema, fieldKey) {
                 metadata.maxLength === undefined ||
                 v.length <= metadata.maxLength ||
                 `The field cannot have more than ${metadata.maxLength} characters`,
-            (v) => tsplus_module_4.pipe(parse(v === "" ? null : v), These.result, _ => tsplus_module_3.match(() => `The entered value is not a valid ${capitalize(fieldKey.toString())}`, ([_, optErr]) => tsplus_module_2.isSome(optErr)
+            (v) => tsplus_module_4.pipe(parse(v === "" ? null : v), These.result, _ => tsplus_module_3.match(_, () => `The entered value is not a valid ${capitalize(fieldKey.toString())}`, ([_, optErr]) => tsplus_module_2.isSome(optErr)
                 ? `The entered value is not a valid ${capitalize(fieldKey.toString())}`
-                : true)(_))
+                : true))
         ],
         metadata
     };
     return info;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxFQUFFLDJCQUEyQixFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sNEJBQTRCLENBQUE7QUFTakcsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEtBQUssQ0FBQTtBQUVoQyxNQUFNLFVBQVUsU0FBUyxDQUFDLENBQWdCO0lBQ3hDLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDNUIsQ0FBQztBQUVELE1BQU0sVUFBVSxVQUFVLENBQUMsQ0FBUyxFQUFFLEdBQStCO0lBQ25FLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDWixPQUFPLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2pDLENBQUM7QUFFRCxNQUFNLFVBQVUsdUJBQXVCLENBQ3JDLEtBQVk7SUFFWixPQUFPLG1EQUFBLEtBQUssR0FBUyxNQUFNLENBQ3pCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFnQixFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQzFELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBS0MsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQVFELE1BQU0sQ0FBQyxHQUFHLE1BQU0sRUFBRSxDQUFBO0FBQ2xCLE1BQWUsb0JBQW9CO0NBT2xDO0FBVUQsU0FBUyxjQUFjLENBQ3JCLFlBQXFDLEVBQ3JDLFFBQXFCO0lBRXJCLE1BQU0sUUFBUSxHQUFHLDJCQUEyQixDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQzFELE1BQU0sTUFBTSxHQUFHLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFBO0lBQzNFLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUE7SUFFaEMsTUFBTSxJQUFJLEdBQUc7UUFDWCxJQUFJLEVBQUUsTUFBTTtRQUNaLEtBQUssRUFBRTtZQUNMLENBQUMsQ0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSwyQkFBMkI7WUFDNUUsQ0FBQyxDQUFTLEVBQUUsRUFBRSxDQUNaLENBQUMsS0FBSyxFQUFFO2dCQUNSLFFBQVEsQ0FBQyxTQUFTLEtBQUssU0FBUztnQkFDaEMsQ0FBQyxDQUFDLE1BQU0sSUFBSSxRQUFRLENBQUMsU0FBUztnQkFDOUIsK0JBQStCLFFBQVEsQ0FBQyxTQUFTLGFBQWE7WUFDaEUsQ0FBQyxDQUFTLEVBQUUsRUFBRSxDQUNaLENBQUMsS0FBSyxFQUFFO2dCQUNSLFFBQVEsQ0FBQyxTQUFTLEtBQUssU0FBUztnQkFDaEMsQ0FBQyxDQUFDLE1BQU0sSUFBSSxRQUFRLENBQUMsU0FBUztnQkFDOUIsbUNBQW1DLFFBQVEsQ0FBQyxTQUFTLGFBQWE7WUFDcEUsQ0FBQyxDQUFVLEVBQUUsRUFBRSxDQUNiLGdCQUFBLElBQUksQ0FDRixLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFDMUIsS0FBSyxDQUFDLE1BQU0sRUFDWixDQUFDLENBQUMsRUFBRSxDQUNGLHNCQUNFLEdBQUcsRUFBRSxDQUNILG9DQUNFLFVBQVUsQ0FDUixRQUFRLENBQUMsUUFBUSxFQUFFLENBRXZCLEVBQUUsRUFDSixDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FDZCx1QkFBQSxNQUFNLENBQVM7Z0JBQ2IsQ0FBQyxDQUFDLG9DQUNBLFVBQVUsQ0FDUixRQUFRLENBQUMsUUFBUSxFQUFFLENBRXZCLEVBQUU7Z0JBQ0YsQ0FBQyxDQUFDLElBQUksRUFkWixDQUFDLENBZUEsQ0FDSjtTQUNKO1FBQ0QsUUFBUTtLQUNULENBQUE7SUFFRCxPQUFPLElBQVcsQ0FBQTtBQUNwQixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxFQUFFLDJCQUEyQixFQUFFLFFBQVEsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sNEJBQTRCLENBQUE7QUFTakcsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLEtBQUssQ0FBQTtBQUVoQyxNQUFNLFVBQVUsU0FBUyxDQUFDLENBQWdCO0lBQ3hDLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7QUFDNUIsQ0FBQztBQUVELE1BQU0sVUFBVSxVQUFVLENBQUMsQ0FBUyxFQUFFLEdBQStCO0lBQ25FLENBQUMsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDWixPQUFPLEdBQUcsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ2pDLENBQUM7QUFFRCxNQUFNLFVBQVUsdUJBQXVCLENBQ3JDLEtBQVk7SUFFWixPQUFPLG1EQUFBLEtBQUssR0FBUyxNQUFNLENBQ3pCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osSUFBSSxDQUFDLEdBQUcsQ0FBQyxHQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFnQixFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQzFELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBS0MsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQVFELE1BQU0sQ0FBQyxHQUFHLE1BQU0sRUFBRSxDQUFBO0FBQ2xCLE1BQWUsb0JBQW9CO0NBT2xDO0FBVUQsU0FBUyxjQUFjLENBQ3JCLFlBQXFDLEVBQ3JDLFFBQXFCO0lBRXJCLE1BQU0sUUFBUSxHQUFHLDJCQUEyQixDQUFDLFlBQVksQ0FBQyxDQUFBO0lBQzFELE1BQU0sTUFBTSxHQUFHLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsT0FBTyxDQUFBO0lBQzNFLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLENBQUE7SUFFaEMsTUFBTSxJQUFJLEdBQUc7UUFDWCxJQUFJLEVBQUUsTUFBTTtRQUNaLEtBQUssRUFBRTtZQUNMLENBQUMsQ0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxRQUFRLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSwyQkFBMkI7WUFDNUUsQ0FBQyxDQUFTLEVBQUUsRUFBRSxDQUNaLENBQUMsS0FBSyxFQUFFO2dCQUNSLFFBQVEsQ0FBQyxTQUFTLEtBQUssU0FBUztnQkFDaEMsQ0FBQyxDQUFDLE1BQU0sSUFBSSxRQUFRLENBQUMsU0FBUztnQkFDOUIsK0JBQStCLFFBQVEsQ0FBQyxTQUFTLGFBQWE7WUFDaEUsQ0FBQyxDQUFTLEVBQUUsRUFBRSxDQUNaLENBQUMsS0FBSyxFQUFFO2dCQUNSLFFBQVEsQ0FBQyxTQUFTLEtBQUssU0FBUztnQkFDaEMsQ0FBQyxDQUFDLE1BQU0sSUFBSSxRQUFRLENBQUMsU0FBUztnQkFDOUIsbUNBQW1DLFFBQVEsQ0FBQyxTQUFTLGFBQWE7WUFDcEUsQ0FBQyxDQUFVLEVBQUUsRUFBRSxDQUNiLGdCQUFBLElBQUksQ0FDRixLQUFLLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFDMUIsS0FBSyxDQUFDLE1BQU0sRUFDWixDQUFDLENBQUMsRUFBRSxDQUNGLHNCQUFBLENBQUMsRUFDQyxHQUFHLEVBQUUsQ0FDSCxvQ0FDRSxVQUFVLENBQ1IsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUV2QixFQUFFLEVBQ0osQ0FBQyxDQUFDLENBQUMsRUFBRSxNQUFNLENBQUMsRUFBRSxFQUFFLENBQ2QsdUJBQUEsTUFBTSxDQUFTO2dCQUNiLENBQUMsQ0FBQyxvQ0FDQSxVQUFVLENBQ1IsUUFBUSxDQUFDLFFBQVEsRUFBRSxDQUV2QixFQUFFO2dCQUNGLENBQUMsQ0FBQyxJQUFJLENBQ1gsQ0FDSjtTQUNKO1FBQ0QsUUFBUTtLQUNULENBQUE7SUFFRCxPQUFPLElBQVcsQ0FBQTtBQUNwQixDQUFDIn0=

package/dist/hooks.js

@@ -97,14 +97,14 @@ export function useSafeQueryLegacy(self) {
     const sem = tsplus_module_6.unsafeMakeSemaphore(1);
     const withPermit = sem.withPermits(1);
     let fib = undefined;
-    const runNew = tsplus_module_6.tap(newFiber => tsplus_module_6.sync(() => {
+    const runNew = tsplus_module_6.tap(tsplus_module_6.fork(execute), newFiber => tsplus_module_6.sync(() => {
         fib = newFiber;
-    }))(tsplus_module_6.fork(execute));
-    const ex = tsplus_module_6.flatMap(_ => tsplus_module_6.done(_))(tsplus_module_6.flatMap(_ => _.await())(withPermit(tsplus_module_6.suspendSucceed(() => {
+    }));
+    const ex = tsplus_module_6.flatMap(tsplus_module_6.flatMap(withPermit(tsplus_module_6.suspendSucceed(() => {
         return fib
-            ? tsplus_module_6.zipRight(runNew)(tsplus_module_7.interrupt(fib))
+            ? tsplus_module_6.zipRight(tsplus_module_7.interrupt(fib), runNew)
             : runNew;
-    }))));
+    })), _ => _.await()), _ => tsplus_module_6.done(_));
     function exec() {
         return run.value(ex)
             .catch(err => {
@@ -117,11 +117,11 @@ export function useSafeQueryLegacy(self) {
 }
 export function make(self) {
     const result = shallowRef(new tsplus_module_1.Initial());
-    const execute = tsplus_module_6.flatMap(r => tsplus_module_6.sync(() => result.value = r))(tsplus_module_6.zipRight(tsplus_module_2.queryResult(tsplus_module_6.map(_ => _.body)(self)))(tsplus_module_6.sync(() => {
+    const execute = tsplus_module_6.flatMap(tsplus_module_6.zipRight(tsplus_module_6.sync(() => {
         result.value = tsplus_module_2.isInitializing(result.value)
             ? new tsplus_module_1.Loading()
             : new tsplus_module_1.Refreshing(result.value);
-    })));
+    }), tsplus_module_2.queryResult(tsplus_module_6.map(self, _ => _.body))), r => tsplus_module_6.sync(() => result.value = r));
     const latestSuccess = computed(() => {
         const value = result.value;
         return tsplus_module_2.hasValue(value) ?
@@ -143,15 +143,15 @@ export function useMutation(self) {
     const error = ref();
     const value = ref();
     const handle = handleExit(loading, error, value);
-    const exec = (i, abortSignal) => run.value(tsplus_module_6.flatMap(f => {
-        const cancel = () => run.value(tsplus_module_7.interrupt(f));
-        abortSignal?.addEventListener("abort", () => void cancel().catch(console.error));
-        return tsplus_module_7.join(f);
-    })(tsplus_module_6.fork(tsplus_module_6.flatMap(exit => tsplus_module_6.sync(() => handle(exit)))(tsplus_module_6.exit(tsplus_module_6.zipRight(self(i))(tsplus_module_6.sync(() => {
+    const exec = (i, abortSignal) => run.value(tsplus_module_6.flatMap(tsplus_module_6.fork(tsplus_module_6.flatMap(tsplus_module_6.exit(tsplus_module_6.zipRight(tsplus_module_6.sync(() => {
         loading.value = true;
         value.value = undefined;
         error.value = undefined;
-    })))))));
+    }), self(i))), exit => tsplus_module_6.sync(() => handle(exit)))), f => {
+        const cancel = () => run.value(tsplus_module_7.interrupt(f));
+        abortSignal?.addEventListener("abort", () => void cancel().catch(console.error));
+        return tsplus_module_7.join(f);
+    }));
     const state = computed(() => ({ loading: loading.value, value: value.value, error: error.value }));
     return tsplus_module_5.tuple(state, exec);
 }
@@ -165,11 +165,11 @@ export function useAction(self) {
     const handle = handleExit(loading, error, value);
     const exec = (abortSignal) => {
         loading.value = true;
-        return run.value(tsplus_module_6.flatMap(f => {
+        return run.value(tsplus_module_6.flatMap(tsplus_module_6.fork(tsplus_module_6.flatMap(tsplus_module_6.exit(self), exit => tsplus_module_6.sync(() => handle(exit)))), f => {
             const cancel = () => tsplus_module_6.runPromise(tsplus_module_7.interrupt(f));
             abortSignal?.addEventListener("abort", () => void cancel().catch(console.error));
             return tsplus_module_7.join(f);
-        })(tsplus_module_6.fork(tsplus_module_6.flatMap(exit => tsplus_module_6.sync(() => handle(exit)))(tsplus_module_6.exit(self)))));
+        }));
     };
     const state = computed(() => ({ loading: loading.value, value: value.value, error: error.value }));
     return tsplus_module_5.tuple(state, exec);
@@ -199,4 +199,4 @@ function handleExit(loading, error, value) {
         throw new Error("Invalid state");
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":"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"}

package/dist/routeParams.js

@@ -31,7 +31,7 @@ export function parseRouteParamsOption(query, t // enforce non empty
 ) {
     return tsplus_module_4.RecordKeys(tsplus_module_4.object$(t)).reduce((prev, cur) => {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        prev[cur] = tsplus_module_1.flatMap(parseOpt(t[cur]))(getQueryParamO(query, cur));
+        prev[cur] = tsplus_module_1.flatMap(getQueryParamO(query, cur), parseOpt(t[cur]));
         return prev;
     }, {});
 }
@@ -43,4 +43,4 @@ export function parseRouteParams(query, t // enforce non empty
         return prev;
     }, {});
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVQYXJhbXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL3JvdXRlUGFyYW1zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQTtBQUd2RSxNQUFNLFVBQVUsYUFBYSxDQUFDLE1BQW1CLEVBQUUsS0FBYTtJQUM5RCxNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDdkIsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQ3BCLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ1o7SUFDRCxPQUFPLENBQUMsSUFBSSxJQUFJLENBQUE7QUFDbEIsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxnQkFBQSxJQUFJLENBQUMsYUFBYSwrQkFBc0IsQ0FBQTtBQUV0RSxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FBTyxDQUFlLEVBQUUsRUFBRTtJQUNoRCxNQUFNLEdBQUcsR0FBRyxnQkFBQSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQ2xDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLE9BQU87UUFDdkIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxNQUFNO1lBQ2pDLENBQUMsQ0FBQyxxQkFBTyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzQixDQUFDLHFCQUFZO1FBQ2YsQ0FBQyxxQkFBWSxDQUFDLENBQUE7SUFDbEIsT0FBTyxHQUFHLENBQUE7QUFDWixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBTyxDQUFlLEVBQUUsRUFBRTtJQUN2RCxNQUFNLEdBQUcsR0FBRyxnQkFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUNsQyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxPQUFPO1FBQ3ZCLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssTUFBTTtZQUNqQyxDQUFDLENBQUMscUJBQU8sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0IsQ0FBQyxxQkFBWTtRQUNmLENBQUMscUJBQVksQ0FBQyxDQUFBO0lBQ2xCLE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQyxDQUFBO0FBRUQsTUFBTSxVQUFVLHNCQUFzQixDQUNwQyxLQUEwQixFQUMxQixDQUFNLENBQUMsb0JBQW9COztJQUkzQixPQUFPLG1EQUFBLENBQUMsR0FBUyxNQUFNLENBQ3JCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osb0VBQW9FO1FBQ3BFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyx3QkFBNkMsUUFBUSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUUsQ0FBQyxFQUE5RCxjQUFjLENBQUMsS0FBSyxFQUFFLEdBQWEsQ0FBQyxDQUEyQixDQUFBO1FBRTNFLE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBRUMsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FDOUIsS0FBMEIsRUFDMUIsQ0FBTSxDQUFDLG9CQUFvQjs7SUFJM0IsT0FBTyxtREFBQSxDQUFDLEdBQVMsTUFBTSxDQUNyQixDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNaLG9FQUFvRTtRQUNwRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFVLENBQUMsQ0FBQyxDQUFBO1FBRTFELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBRUMsQ0FDRixDQUFBO0FBQ0gsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVQYXJhbXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL3JvdXRlUGFyYW1zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7QUFDQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQTtBQUd2RSxNQUFNLFVBQVUsYUFBYSxDQUFDLE1BQW1CLEVBQUUsS0FBYTtJQUM5RCxNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDdkIsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQ3BCLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0tBQ1o7SUFDRCxPQUFPLENBQUMsSUFBSSxJQUFJLENBQUE7QUFDbEIsQ0FBQztBQUVELE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FBRyxnQkFBQSxJQUFJLENBQUMsYUFBYSwrQkFBc0IsQ0FBQTtBQUV0RSxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FBTyxDQUFlLEVBQUUsRUFBRTtJQUNoRCxNQUFNLEdBQUcsR0FBRyxnQkFBQSxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQ2xDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxLQUFLLE9BQU87UUFDdkIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxNQUFNO1lBQ2pDLENBQUMsQ0FBQyxxQkFBTyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzQixDQUFDLHFCQUFZO1FBQ2YsQ0FBQyxxQkFBWSxDQUFDLENBQUE7SUFDbEIsT0FBTyxHQUFHLENBQUE7QUFDWixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsQ0FBTyxDQUFlLEVBQUUsRUFBRTtJQUN2RCxNQUFNLEdBQUcsR0FBRyxnQkFBQSxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsRUFBRSxDQUNsQyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksS0FBSyxPQUFPO1FBQ3ZCLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssTUFBTTtZQUNqQyxDQUFDLENBQUMscUJBQU8sQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0IsQ0FBQyxxQkFBWTtRQUNmLENBQUMscUJBQVksQ0FBQyxDQUFBO0lBQ2xCLE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQyxDQUFBO0FBRUQsTUFBTSxVQUFVLHNCQUFzQixDQUNwQyxLQUEwQixFQUMxQixDQUFNLENBQUMsb0JBQW9COztJQUkzQixPQUFPLG1EQUFBLENBQUMsR0FBUyxNQUFNLENBQ3JCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osb0VBQW9FO1FBQ3BFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyx3QkFBQSxjQUFjLENBQUMsS0FBSyxFQUFFLEdBQWEsQ0FBQyxFQUFTLFFBQVEsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFFLENBQUMsQ0FBQyxDQUFBO1FBRTNFLE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBRUMsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FDOUIsS0FBMEIsRUFDMUIsQ0FBTSxDQUFDLG9CQUFvQjs7SUFJM0IsT0FBTyxtREFBQSxDQUFDLEdBQVMsTUFBTSxDQUNyQixDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNaLG9FQUFvRTtRQUNwRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFFLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFVLENBQUMsQ0FBQyxDQUFBO1FBRTFELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBRUMsQ0FDRixDQUFBO0FBQ0gsQ0FBQyJ9

package/dist/runtime.js

@@ -9,7 +9,7 @@ import { fetch } from "cross-fetch";
 import { initRuntime } from "./internal.js";
 export { initRuntime } from "./internal.js";
 const DefaultApiConfig = tsplus_module_1.struct({
-    apiUrl: tsplus_module_1.withDefault("/api")(tsplus_module_1.string("apiUrl")),
+    apiUrl: tsplus_module_1.withDefault(tsplus_module_1.string("apiUrl"), "/api"),
     headers: tsplus_module_1.optional(tsplus_module_1.table(tsplus_module_1.string(), "headers"))
 });
 export function makeApiLayers(config = DefaultApiConfig) {
@@ -18,8 +18,8 @@ export function makeApiLayers(config = DefaultApiConfig) {
 export function makeAppRuntime(layer) {
     return tsplus_module_4.gen(function* ($) {
         const scope = yield* $(tsplus_module_3.make());
-        const env = yield* $(tsplus_module_2.buildWithScope(scope)(layer));
-        const runtime = yield* $(tsplus_module_4.provideContext(env)(tsplus_module_4.scoped(tsplus_module_4.runtime())));
+        const env = yield* $(tsplus_module_2.buildWithScope(layer, scope));
+        const runtime = yield* $(tsplus_module_4.provideContext(tsplus_module_4.scoped(tsplus_module_4.runtime()), env));
         return {
             runtime,
             clean: tsplus_module_3.close(scope, tsplus_module_5.ex_unit)
@@ -43,4 +43,4 @@ export function initializeAsync(layer) {
         };
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvcnVudGltZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0seUNBQXlDLENBQUE7QUFDN0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBQ3RELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDbkMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUUzQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTNDLE1BQU0sZ0JBQWdCLEdBQUcsdUJBQWM7SUFDckMsTUFBTSxFQUFFLDRCQUFvQyxNQUFNLEVBQTFDLHVCQUFjLFFBQVEsQ0FBQyxDQUFvQjtJQUNuRCxPQUFPLDJCQUFFLHNCQUFBLHdCQUFlLEVBQ2YsU0FBUyxDQUFDLENBQVM7Q0FDN0IsQ0FBQyxDQUFBO0FBRUYsTUFBTSxVQUFVLGFBQWEsQ0FBQyxTQUE0QixnQkFBZ0I7SUFDeEUsNkJBQTBCLFNBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQXpDLEVBQUUsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQXlCO0FBQ2xELENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFVLEtBQXFCO0lBQzNELE9BQU8sb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsc0JBQVksQ0FBQyxDQUFBO1FBQ3BDLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQywrQkFBcUIsS0FBSyxFQUExQixLQUFLLENBQXNCLENBQUMsQ0FBQTtRQUNqRCxNQUFNLE9BQU8sR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsK0JBQTBDLEdBQUcseUJBQTdDLHlCQUFtQixFQUEyQixDQUFDLENBQUE7UUFFeEUsT0FBTztZQUNMLE9BQU87WUFDUCxLQUFLLEVBQUUsc0JBQUEsS0FBSywwQkFBaUI7U0FDOUIsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQU8sS0FBNEM7SUFDL0UsTUFBTSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsMkJBQUcsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFRLENBQUE7SUFDeEQsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFBO0lBQ3BCLE9BQU87UUFDTCxPQUFPO1FBQ1AsS0FBSyxFQUFFLEdBQUcsRUFBRSx5QkFBQyxLQUFLLENBQVE7S0FDM0IsQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsZUFBZSxDQUFPLEtBQTRDO0lBQ2hGLE9BQU8sMkJBQUEsY0FBYyxDQUFDLEtBQUssQ0FBQyxFQUN6QixJQUFJLENBQUMsQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxFQUFFO1FBQzNCLFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQTtRQUNwQixPQUFPO1lBQ0wsT0FBTztZQUNQLEtBQUssRUFBRSxHQUFHLEVBQUUsNEJBQUMsS0FBSyxDQUFXO1NBQzlCLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNOLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvcnVudGltZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUNBLE9BQU8sS0FBSyxFQUFFLE1BQU0seUNBQXlDLENBQUE7QUFDN0QsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBQ3RELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDbkMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUUzQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTNDLE1BQU0sZ0JBQWdCLEdBQUcsdUJBQWM7SUFDckMsTUFBTSxFQUFFLDRCQUFBLHVCQUFjLFFBQVEsQ0FBQyxFQUFhLE1BQU0sQ0FBQztJQUNuRCxPQUFPLDJCQUFFLHNCQUFBLHdCQUFlLEVBQ2YsU0FBUyxDQUFDLENBQVM7Q0FDN0IsQ0FBQyxDQUFBO0FBRUYsTUFBTSxVQUFVLGFBQWEsQ0FBQyxTQUE0QixnQkFBZ0I7SUFDeEUsNkJBQTBCLFNBQVMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQXpDLEVBQUUsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQXlCO0FBQ2xELENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFVLEtBQXFCO0lBQzNELE9BQU8sb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsc0JBQVksQ0FBQyxDQUFBO1FBQ3BDLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQywrQkFBQSxLQUFLLEVBQWdCLEtBQUssQ0FBQyxDQUFDLENBQUE7UUFDakQsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLHNEQUFBLHlCQUFtQixHQUF1QixHQUFHLENBQUMsQ0FBQyxDQUFBO1FBRXhFLE9BQU87WUFDTCxPQUFPO1lBQ1AsS0FBSyxFQUFFLHNCQUFBLEtBQUssMEJBQWlCO1NBQzlCLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFPLEtBQTRDO0lBQy9FLE1BQU0sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLDJCQUFHLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBUSxDQUFBO0lBQ3hELFdBQVcsQ0FBQyxPQUFPLENBQUMsQ0FBQTtJQUNwQixPQUFPO1FBQ0wsT0FBTztRQUNQLEtBQUssRUFBRSxHQUFHLEVBQUUseUJBQUMsS0FBSyxDQUFRO0tBQzNCLENBQUE7QUFDSCxDQUFDO0FBRUQsTUFBTSxVQUFVLGVBQWUsQ0FBTyxLQUE0QztJQUNoRixPQUFPLDJCQUFBLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFDekIsSUFBSSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRTtRQUMzQixXQUFXLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDcEIsT0FBTztZQUNMLE9BQU87WUFDUCxLQUFLLEVBQUUsR0FBRyxFQUFFLDRCQUFDLEtBQUssQ0FBVztTQUM5QixDQUFBO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDTixDQUFDIn0=

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@effect-app/vue",
-  "version": "0.17.2",
+  "version": "0.18.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@effect/io": "^0.1.11",
-    "@fp-ts/core": "^0.2.0",
+    "@fp-ts/core": "^0.2.1",
     "@effect/data": "^0.1.0",
     "@fp-ts/optic": "^0.1.0",
     "query-string": "^8.1.0",
     "swrv": "^1.0.3",
     "vue": "^3.2.47",
-    "@effect-app/prelude": "0.20.2",
-    "@effect-app/vue": "0.17.2",
-    "@effect-app/core": "0.21.2",
-    "@effect-app/schema": "0.17.2"
+    "@effect-app/vue": "0.18.0",
+    "@effect-app/prelude": "0.21.0",
+    "@effect-app/core": "0.22.0",
+    "@effect-app/schema": "0.18.0"
   },
   "devDependencies": {
     "@rollup/pluginutils": "^5.0.2",
@@ -26,7 +26,7 @@
     "vite": "^4.1.1",
     "vitest": "^0.28.4",
     "vue": "^3.2.47",
-    "@effect-app/compiler": "0.11.1"
+    "@effect-app/compiler": "0.12.0"
   },
   "typesVersions": {
     "*": {