@effect-app/vue 1.17.0 → 1.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,25 @@
1
1
  # @effect-app/vue
2
2
 
3
+ ## 1.18.0
4
+
5
+ ### Minor Changes
6
+
7
+ - c2487d4: remove legacy FetchResponse
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [c2487d4]
12
+ - effect-app@1.22.0
13
+ - @effect-app/vue@1.18.0
14
+
15
+ ## 1.17.1
16
+
17
+ ### Patch Changes
18
+
19
+ - Updated dependencies [66086f3]
20
+ - effect-app@1.21.1
21
+ - @effect-app/vue@1.17.1
22
+
3
23
  ## 1.17.0
4
24
 
5
25
  ### Minor Changes
package/_cjs/mutate.cjs CHANGED
@@ -23,7 +23,7 @@ function make(self) {
23
23
  const result = (0, _vue.shallowRef)(Result.initial());
24
24
  const execute = _effectApp.Effect.sync(() => {
25
25
  result.value = Result.waiting(result.value);
26
- }).pipe(_effectApp.Effect.andThen(_effectApp.Effect.map(self, _ => _.body)), _effectApp.Effect.exit, _effectApp.Effect.andThen(Result.fromExit), _effectApp.Effect.flatMap(r => _effectApp.Effect.sync(() => result.value = r)));
26
+ }).pipe(_effectApp.Effect.andThen(self), _effectApp.Effect.exit, _effectApp.Effect.andThen(Result.fromExit), _effectApp.Effect.flatMap(r => _effectApp.Effect.sync(() => result.value = r)));
27
27
  const latestSuccess = (0, _vue.computed)(() => _effectApp.Option.getOrUndefined(Result.value(result.value)));
28
28
  return (0, _Function.tuple)(result, latestSuccess, execute);
29
29
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mutate.cjs","names":["_Function","require","Result","_interopRequireWildcard","_vueQuery","_effectApp","_utils","_Cause","Either","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","make","self","result","shallowRef","initial","execute","Effect","sync","value","waiting","pipe","andThen","map","_","body","exit","fromExit","flatMap","latestSuccess","computed","Option","getOrUndefined","tuple","getQueryKey","name","key","makeQueryKey","ns","filter","startsWith","k","length","slice","undefined","Error","exports","useSafeMutation","options","queryClient","useQueryClient","state","ref","_tag","onSuccess","invalidateQueries","filters","promise","handleExit","Exit","isSuccess","data","right","err","Cause","failureOption","cause","isSome","error","left","died","dieOption","interrupted","interruptOption","InterruptedException","exec","fst","snd","effect","signal","isEffect","handler","run","tap","suspend","queryKey","queryInvalidation","opts","void","annotateCurrentSpan","forEach","concurrency","withSpan","captureStackTrace","tapDefect","reportRuntimeError","dropUndefinedT"],"sources":["../src/mutate.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"mutate.cjs","names":["_Function","require","Result","_interopRequireWildcard","_vueQuery","_effectApp","_utils","_Cause","Either","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","make","self","result","shallowRef","initial","execute","Effect","sync","value","waiting","pipe","andThen","exit","fromExit","flatMap","latestSuccess","computed","Option","getOrUndefined","tuple","getQueryKey","name","key","makeQueryKey","ns","filter","_","startsWith","k","length","slice","undefined","Error","exports","useSafeMutation","options","queryClient","useQueryClient","state","ref","_tag","onSuccess","invalidateQueries","filters","promise","handleExit","Exit","isSuccess","data","right","err","Cause","failureOption","cause","isSome","error","left","died","dieOption","interrupted","interruptOption","InterruptedException","exec","fst","snd","effect","signal","isEffect","handler","run","tap","suspend","queryKey","queryInvalidation","opts","void","annotateCurrentSpan","forEach","concurrency","withSpan","captureStackTrace","tapDefect","reportRuntimeError","dropUndefinedT"],"sources":["../src/mutate.ts"],"sourcesContent":[null],"mappings":";;;;;;;;AACA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAC,uBAAA,CAAAF,OAAA;AAGA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AAEA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AACA,IAAAO,MAAA,GAAAL,uBAAA,CAAAF,OAAA;AAEA,IAAAQ,IAAA,GAAAR,OAAA;AACA,IAAAS,SAAA,GAAAT,OAAA;AAAqE,SAAAU,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAT,wBAAAS,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAbrE;;AAgBM,SAAUW,IAAIA,CAAUC,IAAqB;EACjD,MAAMC,MAAM,GAAG,IAAAC,eAAU,EAAChC,MAAM,CAACiC,OAAO,EAAyB,CAAC;EAElE,MAAMC,OAAO,GAAGC,iBAAM,CACnBC,IAAI,CAAC,MAAK;IACTL,MAAM,CAACM,KAAK,GAAGrC,MAAM,CAACsC,OAAO,CAACP,MAAM,CAACM,KAAK,CAAC;EAC7C,CAAC,CAAC,CACDE,IAAI,CACHJ,iBAAM,CAACK,OAAO,CAACV,IAAI,CAAC,EACpBK,iBAAM,CAACM,IAAI,EACXN,iBAAM,CAACK,OAAO,CAACxC,MAAM,CAAC0C,QAAQ,CAAC,EAC/BP,iBAAM,CAACQ,OAAO,CAAE/B,CAAC,IAAKuB,iBAAM,CAACC,IAAI,CAAC,MAAML,MAAM,CAACM,KAAK,GAAGzB,CAAC,CAAC,CAAC,CAC3D;EAEH,MAAMgC,aAAa,GAAG,IAAAC,aAAQ,EAAC,MAAMC,iBAAM,CAACC,cAAc,CAAC/C,MAAM,CAACqC,KAAK,CAACN,MAAM,CAACM,KAAK,CAAC,CAAC,CAAC;EAEvF,OAAO,IAAAW,eAAK,EAACjB,MAAM,EAAEa,aAAa,EAAEV,OAAO,CAAC;AAC9C;AA8CO,MAAMe,WAAW,GAAIC,IAAY,IAAI;EAC1C,MAAMC,GAAG,GAAG,IAAAC,sBAAY,EAACF,IAAI,CAAC;EAC9B,MAAMG,EAAE,GAAGF,GAAG,CAACG,MAAM,CAAEC,CAAC,IAAKA,CAAC,CAACC,UAAU,CAAC,GAAG,CAAC,CAAC;EAC/C;EACA;EACA,MAAMC,CAAC,GAAGJ,EAAE,CAACK,MAAM,GAAGL,EAAE,CAACK,MAAM,GAAG,CAAC,GAAGL,EAAE,CAACM,KAAK,CAAC,CAAC,EAAEN,EAAE,CAACK,MAAM,GAAG,CAAC,CAAC,GAAGL,EAAE,GAAGO,SAAS;EACjF,IAAI,CAACH,CAAC,EAAE,MAAM,IAAII,KAAK,CAAC,uBAAuB,GAAGX,IAAI,CAAC;EACvD,OAAOO,CAAC;AACV,CAAC;AACD;AACA;AACA;AACA;AACA;;;;;;AAOA;;;;AAAAK,OAAA,CAAAb,WAAA,GAAAA,WAAA;AAIO,MAAMc,eAAe,GAcxBA,CACFjC,IAKC,EACDkC,OAA4B,KAC1B;EACF,MAAMC,WAAW,GAAG,IAAAC,wBAAc,GAAE;EACpC,MAAMC,KAAK,GAA8B,IAAAC,QAAG,EAAuB;IAAEC,IAAI,EAAE;EAAS,CAAE,CAAQ;EAC9F,MAAMC,SAAS,GAAGN,OAAO,EAAEM,SAAS;EAEpC,MAAMC,iBAAiB,GAAGA,CACxBC,OAA8C,EAC9CR,OAAyC,KACtC7B,iBAAM,CAACsC,OAAO,CAAC,MAAMR,WAAW,CAACM,iBAAiB,CAACC,OAAO,EAAER,OAAO,CAAC,CAAC;EAE1E,SAASU,UAAUA,CAACjC,IAAqB;IACvC,OAAON,iBAAM,CAACC,IAAI,CAAC,MAAK;MACtB,IAAIuC,eAAI,CAACC,SAAS,CAACnC,IAAI,CAAC,EAAE;QACxB0B,KAAK,CAAC9B,KAAK,GAAG;UAAEgC,IAAI,EAAE,SAAS;UAAEQ,IAAI,EAAEpC,IAAI,CAACJ;QAAK,CAAE;QACnD,OAAO/B,MAAM,CAACwE,KAAK,CAACrC,IAAI,CAACJ,KAAK,CAAC;MACjC;MAEA,MAAM0C,GAAG,GAAGC,gBAAK,CAACC,aAAa,CAACxC,IAAI,CAACyC,KAAK,CAAC;MAC3C,IAAIpC,iBAAM,CAACqC,MAAM,CAACJ,GAAG,CAAC,EAAE;QACtBZ,KAAK,CAAC9B,KAAK,GAAG;UAAEgC,IAAI,EAAE,OAAO;UAAEe,KAAK,EAAEL,GAAG,CAAC1C;QAAK,CAAE;QACjD,OAAO/B,MAAM,CAAC+E,IAAI,CAACN,GAAG,CAAC1C,KAAK,CAAC;MAC/B;MAEA,MAAMiD,IAAI,GAAGN,gBAAK,CAACO,SAAS,CAAC9C,IAAI,CAACyC,KAAK,CAAC;MACxC,IAAIpC,iBAAM,CAACqC,MAAM,CAACG,IAAI,CAAC,EAAE;QACvB,MAAMA,IAAI,CAACjD,KAAK;MAClB;MACA,MAAMmD,WAAW,GAAGR,gBAAK,CAACS,eAAe,CAAChD,IAAI,CAACyC,KAAK,CAAC;MACrD,IAAIpC,iBAAM,CAACqC,MAAM,CAACK,WAAW,CAAC,EAAE;QAC9B,MAAM,IAAIE,2BAAoB,EAAE;MAClC;MACA,MAAM,IAAI7B,KAAK,CAAC,eAAe,CAAC;IAClC,CAAC,CAAC;EACJ;EAEA,MAAM8B,IAAI,GAAGA,CAACC,GAAqB,EAAEC,GAAiB,KAAI;IACxD,IAAIC,MAA+D;IACnE,IAAIC,MAA+B;IACnC,IAAI5D,iBAAM,CAAC6D,QAAQ,CAAClE,IAAI,CAACmE,OAAO,CAAC,EAAE;MACjCH,MAAM,GAAGhE,IAAI,CAACmE,OAAc;MAC5BF,MAAM,GAAGH,GAA8B;IACzC,CAAC,MAAM;MACLE,MAAM,GAAGhE,IAAI,CAACmE,OAAO,CAACL,GAAQ,CAAC;MAC/BG,MAAM,GAAGF,GAAG;IACd;IAEA,OAAOK,aAAG,CAAC7D,KAAK,CACdF,iBAAM,CACHC,IAAI,CAAC,MAAK;MACT+B,KAAK,CAAC9B,KAAK,GAAG;QAAEgC,IAAI,EAAE;MAAS,CAAE;IACnC,CAAC,CAAC,CACD9B,IAAI,CACHJ,iBAAM,CAACK,OAAO,CAACsD,MAAM,CAAC,EACtB3D,iBAAM,CAACgE,GAAG,CAAC,MACThE,iBAAM,CACHiE,OAAO,CAAC,MAAK;MACZ,MAAMC,QAAQ,GAAGpD,WAAW,CAACnB,IAAI,CAACoB,IAAI,CAAC;MAEvC,IAAIc,OAAO,EAAEsC,iBAAiB,EAAE;QAC9B,MAAMC,IAAI,GAAGvC,OAAO,CAACsC,iBAAiB,CAACD,QAAQ,EAAEvE,IAAI,CAACoB,IAAI,CAAC;QAC3D,IAAI,CAACqD,IAAI,CAAC7C,MAAM,EAAE;UAChB,OAAOvB,iBAAM,CAACqE,IAAI;QACpB;QACA,OAAOrE,iBAAM,CACVK,OAAO,CACNL,iBAAM,CAACsE,mBAAmB,CAAC;UAAEJ,QAAQ;UAAEE;QAAI,CAAE,CAAC,EAC9CpE,iBAAM,CAACuE,OAAO,CAACH,IAAI,EAAGhD,CAAC,IAAKgB,iBAAiB,CAAChB,CAAC,CAACiB,OAAO,EAAEjB,CAAC,CAACS,OAAO,CAAC,EAAE;UAAE2C,WAAW,EAAE;QAAS,CAAE,CAAC,CACjG,CACApE,IAAI,CAACJ,iBAAM,CAACyE,QAAQ,CAAC,2BAA2B,EAAE;UAAEC,iBAAiB,EAAE;QAAK,CAAE,CAAC,CAAC;MACrF;MAEA,IAAI,CAACR,QAAQ,EAAE,OAAOlE,iBAAM,CAACqE,IAAI;MAEjC,OAAOrE,iBAAM,CACVK,OAAO,CACNL,iBAAM,CAACsE,mBAAmB,CAAC;QAAEJ;MAAQ,CAAE,CAAC,EACxC9B,iBAAiB,CAAC;QAAE8B;MAAQ,CAAE,CAAC,CAChC,CACA9D,IAAI,CAACJ,iBAAM,CAACyE,QAAQ,CAAC,2BAA2B,EAAE;QAAEC,iBAAiB,EAAE;MAAK,CAAE,CAAC,CAAC;IACrF,CAAC,CAAC,CACL,EACD1E,iBAAM,CAAC2E,SAAS,CAACC,4BAAkB,CAAC,EACpC5E,iBAAM,CAACgE,GAAG,CAAExE,CAAC,IAAK2C,SAAS,GAAGnC,iBAAM,CAACsC,OAAO,CAAC,MAAMH,SAAS,CAAC3C,CAAC,CAAC,CAAC,GAAGQ,iBAAM,CAACqE,IAAI,CAAC,EAC/ErE,iBAAM,CAACM,IAAI,EACXN,iBAAM,CAACQ,OAAO,CAAC+B,UAAU,CAAC,EAC1BvC,iBAAM,CAACyE,QAAQ,CAAC,YAAY9E,IAAI,CAACoB,IAAI,EAAE,EAAE;MAAE2D,iBAAiB,EAAE;IAAK,CAAE,CAAC,CACvE,EACH,IAAAG,qBAAc,EAAC;MAAEjB;IAAM,CAAE,CAAC,CAC3B;EACH,CAAC;EAED,OAAO,IAAA/C,eAAK,EACVmB,KAAK,EACLwB,IAAI,CACL;AACH,CAAC;AAAA7B,OAAA,CAAAC,eAAA,GAAAA,eAAA","ignoreList":[]}
package/_cjs/query.cjs CHANGED
@@ -26,7 +26,7 @@ q:
26
26
  handler: (
27
27
  req: I
28
28
  ) => Effect<
29
- FetchResponse<A>,
29
+ A,
30
30
  E,
31
31
  ApiConfig | HttpClient.HttpClient.Service
32
32
  >
@@ -35,7 +35,7 @@ q:
35
35
  }
36
36
  | {
37
37
  handler: Effect<
38
- FetchResponse<A>,
38
+ A,
39
39
  E,
40
40
  ApiConfig | HttpClient.HttpClient.Service
41
41
  >
@@ -75,7 +75,7 @@ const useSafeQuery_ = (q, arg, options = {} // TODO
75
75
  queryKey,
76
76
  queryFn: ({
77
77
  signal
78
- }) => _internal.run.value(_effectApp.Effect.map(handler, _ => _.body).pipe(_effectApp.Effect.tapDefect(_internal.reportRuntimeError), _effectApp.Effect.withSpan(`query ${q.name}`, {
78
+ }) => _internal.run.value(handler.pipe(_effectApp.Effect.tapDefect(_internal.reportRuntimeError), _effectApp.Effect.withSpan(`query ${q.name}`, {
79
79
  captureStackTrace: false
80
80
  })), {
81
81
  signal
@@ -95,7 +95,7 @@ const useSafeQuery_ = (q, arg, options = {} // TODO
95
95
  queryKey: [...queryKey, req],
96
96
  queryFn: ({
97
97
  signal
98
- }) => _internal.run.value(_effectApp.Effect.map(handler(req.value), _ => _.body).pipe(_effectApp.Effect.tapDefect(_internal.reportRuntimeError), _effectApp.Effect.withSpan(`query ${q.name}`, {
98
+ }) => _internal.run.value(handler(req.value).pipe(_effectApp.Effect.tapDefect(_internal.reportRuntimeError), _effectApp.Effect.withSpan(`query ${q.name}`, {
99
99
  captureStackTrace: false
100
100
  })), {
101
101
  signal
@@ -1 +1 @@
1
- {"version":3,"file":"query.cjs","names":["_httpClient","require","Result","_interopRequireWildcard","_vueQuery","_effectApp","_client","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useSafeQuery","self","argOrOptions","options","Effect","isEffect","handler","useSafeQuery_","undefined","q","arg","arr","req","value","ref","queryKey","makeQueryKey","name","useQuery","retry","retryCount","error","Runtime","isFiberFailure","cause","FiberFailureCauseId","sq","Cause","squash","isHttpRequestError","isHttpResponseError","S","is","ServiceUnavailableError","queryFn","signal","run","map","_","body","pipe","tapDefect","reportRuntimeError","withSpan","captureStackTrace","result","computed","swrToQuery","data","isValidating","isFetching","latestSuccess","Option","getOrUndefined","refetch","exports","failureWithPrevious","none","some","success","initial"],"sources":["../src/query.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"query.cjs","names":["_httpClient","require","Result","_interopRequireWildcard","_vueQuery","_effectApp","_client","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","useSafeQuery","self","argOrOptions","options","Effect","isEffect","handler","useSafeQuery_","undefined","q","arg","arr","req","value","ref","queryKey","makeQueryKey","name","useQuery","retry","retryCount","error","Runtime","isFiberFailure","cause","FiberFailureCauseId","sq","Cause","squash","isHttpRequestError","isHttpResponseError","S","is","ServiceUnavailableError","queryFn","signal","run","pipe","tapDefect","reportRuntimeError","withSpan","captureStackTrace","result","computed","swrToQuery","data","isValidating","isFetching","latestSuccess","Option","getOrUndefined","refetch","exports","failureWithPrevious","none","some","success","initial"],"sources":["../src/query.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
package/dist/mutate.d.ts CHANGED
@@ -2,11 +2,11 @@ import * as Result from "@effect-rx/rx/Result";
2
2
  import type * as HttpClient from "@effect/platform/HttpClient";
3
3
  import type { InvalidateOptions, InvalidateQueryFilters } from "@tanstack/vue-query";
4
4
  import { Effect } from "effect-app";
5
- import type { ApiConfig, FetchResponse } from "effect-app/client";
5
+ import type { ApiConfig } from "effect-app/client";
6
6
  import * as Either from "effect/Either";
7
7
  import type { ComputedRef, Ref } from "vue";
8
8
  export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T);
9
- export declare function make<A, E, R>(self: Effect<FetchResponse<A>, E, R>): readonly [import("vue").ShallowRef<Result.Result<A, E>, Result.Result<A, E>>, ComputedRef<A | undefined>, Effect.Effect<Result.Success<A, E> | Result.Failure<A, E>, never, R>];
9
+ export declare function make<A, E, R>(self: Effect<A, E, R>): readonly [import("vue").ShallowRef<Result.Result<A, E>, Result.Result<A, E>>, ComputedRef<A | undefined>, Effect.Effect<Result.Success<A, E> | Result.Failure<A, E>, never, R>];
10
10
  export interface MutationInitial {
11
11
  readonly _tag: "Initial";
12
12
  }
@@ -1 +1 @@
1
- {"version":3,"file":"mutate.d.ts","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mutate.d.ts","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"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"}
package/dist/mutate.js CHANGED
@@ -14,7 +14,7 @@ export function make(self) {
14
14
  .sync(() => {
15
15
  result.value = Result.waiting(result.value);
16
16
  })
17
- .pipe(Effect.andThen(Effect.map(self, (_) => _.body)), Effect.exit, Effect.andThen(Result.fromExit), Effect.flatMap((r) => Effect.sync(() => result.value = r)));
17
+ .pipe(Effect.andThen(self), Effect.exit, Effect.andThen(Result.fromExit), Effect.flatMap((r) => Effect.sync(() => result.value = r)));
18
18
  const latestSuccess = computed(() => Option.getOrUndefined(Result.value(result.value)));
19
19
  return tuple(result, latestSuccess, execute);
20
20
  }
@@ -105,4 +105,4 @@ export const useSafeMutation = (self, options) => {
105
105
  };
106
106
  return tuple(state, exec);
107
107
  };
108
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXV0YXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL211dGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ2pELE9BQU8sS0FBSyxNQUFNLE1BQU0sc0JBQXNCLENBQUE7QUFHOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ3BELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFeEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ2pELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGVBQWUsQ0FBQTtBQUV2QyxPQUFPLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFDL0MsT0FBTyxFQUFFLFlBQVksRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFHckUsTUFBTSxVQUFVLElBQUksQ0FBVSxJQUFvQztJQUNoRSxNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBeUIsQ0FBQyxDQUFBO0lBRWxFLE1BQU0sT0FBTyxHQUFHLE1BQU07U0FDbkIsSUFBSSxDQUFDLEdBQUcsRUFBRTtRQUNULE1BQU0sQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDN0MsQ0FBQyxDQUFDO1NBQ0QsSUFBSSxDQUNILE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FB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
108
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXV0YXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL211dGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ2pELE9BQU8sS0FBSyxNQUFNLE1BQU0sc0JBQXNCLENBQUE7QUFHOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ3BELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFeEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBQ2pELE9BQU8sRUFBRSxvQkFBb0IsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUNuRCxPQUFPLEtBQUssTUFBTSxNQUFNLGVBQWUsQ0FBQTtBQUV2QyxPQUFPLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxVQUFVLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFDL0MsT0FBTyxFQUFFLFlBQVksRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUE7QUFHckUsTUFBTSxVQUFVLElBQUksQ0FBVSxJQUFxQjtJQUNqRCxNQUFNLE1BQU0sR0FBRyxVQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBeUIsQ0FBQyxDQUFBO0lBRWxFLE1BQU0sT0FBTyxHQUFHLE1BQU07U0FDbkIsSUFBSSxDQUFDLEdBQUcsRUFBRTtRQUNULE1BQU0sQ0FBQyxLQUFLLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDN0MsQ0FBQyxDQUFDO1NBQ0QsSUFBSSxDQUNILE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQ3BCLE1BQU0sQ0FBQyxJQUFJLEVBQ1gsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVB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QUEyQixFQUFFLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ3JGLENBQUMsQ0FBQyxDQUNMLEVBQ0QsTUFBTSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxFQUNwQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFDL0UsTUFBTSxDQUFDLElBQUksRUFDWCxNQUFNLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUMxQixNQUFNLENBQUMsUUFBUSxDQUFDLFlBQVksSUFBSSxDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FDdkUsRUFDSCxjQUFjLENBQUMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxDQUMzQixDQUFBO0lBQ0gsQ0FBQyxDQUFBO0lBRUQsT0FBTyxLQUFLLENBQ1YsS0FBSyxFQUNMLElBQUksQ0FDTCxDQUFBO0FBQ0gsQ0FBQyxDQUFBIn0=
package/dist/query.d.ts CHANGED
@@ -1,13 +1,13 @@
1
1
  import * as Result from "@effect-rx/rx/Result";
2
2
  import type { QueryKey, QueryObserverOptions, QueryObserverResult, RefetchOptions, UseQueryReturnType } from "@tanstack/vue-query";
3
3
  import { Cause, Effect, Runtime } from "effect-app";
4
- import { type ApiConfig, type FetchResponse } from "effect-app/client";
4
+ import { type ApiConfig } from "effect-app/client";
5
5
  import type { HttpClient } from "effect-app/http";
6
6
  import type { ComputedRef, WatchSource } from "vue";
7
7
  export interface QueryObserverOptionsCustom<TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = never> extends Omit<QueryObserverOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey, TPageParam>, "queryKey" | "queryFn"> {
8
8
  }
9
9
  export declare function useSafeQuery<E, A>(self: {
10
- handler: Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>;
10
+ handler: Effect<A, E, ApiConfig | HttpClient.HttpClient.Service>;
11
11
  mapPath: string;
12
12
  name: string;
13
13
  }, options?: QueryObserverOptionsCustom): readonly [
@@ -17,7 +17,7 @@ export declare function useSafeQuery<E, A>(self: {
17
17
  UseQueryReturnType<any, any>
18
18
  ];
19
19
  export declare function useSafeQuery<Arg, E, A>(self: {
20
- handler: (arg: Arg) => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>;
20
+ handler: (arg: Arg) => Effect<A, E, ApiConfig | HttpClient.HttpClient.Service>;
21
21
  mapPath: (arg: Arg) => string;
22
22
  name: string;
23
23
  }, arg: Arg | WatchSource<Arg>, options?: QueryObserverOptionsCustom): readonly [
@@ -30,11 +30,11 @@ export interface KnownFiberFailure<E> extends Runtime.FiberFailure {
30
30
  readonly [Runtime.FiberFailureCauseId]: Cause.Cause<E>;
31
31
  }
32
32
  export declare const useSafeQuery_: <I, A, E>(q: {
33
- readonly handler: (req: I) => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>;
33
+ readonly handler: (req: I) => Effect<A, E, ApiConfig | HttpClient.HttpClient.Service>;
34
34
  mapPath: (req: I) => string;
35
35
  name: string;
36
36
  } | {
37
- readonly handler: Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>;
37
+ readonly handler: Effect<A, E, ApiConfig | HttpClient.HttpClient.Service>;
38
38
  mapPath: string;
39
39
  name: string;
40
40
  }, arg?: I | WatchSource<I>, options?: QueryObserverOptionsCustom<unknown, KnownFiberFailure<E>, A>) => readonly [ComputedRef<Result.Result<A, E>>, ComputedRef<A | undefined>, (options?: RefetchOptions) => Promise<QueryObserverResult<A, KnownFiberFailure<E>>>, UseQueryReturnType<A, KnownFiberFailure<E>>];
@@ -1 +1 @@
1
- {"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAC9C,OAAO,KAAK,EACV,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EACnB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAU,OAAO,EAAK,MAAM,YAAY,CAAA;AAC9D,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,aAAa,EAA2B,MAAM,mBAAmB,CAAA;AAC/F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,KAAK,CAAA;AAGnD,MAAM,WAAW,0BAA0B,CACzC,YAAY,GAAG,OAAO,EACtB,MAAM,GAAG,KAAK,EACd,KAAK,GAAG,YAAY,EACpB,UAAU,GAAG,YAAY,EACzB,SAAS,SAAS,QAAQ,GAAG,QAAQ,EACrC,UAAU,GAAG,KAAK,CAClB,SACA,IAAI,CAAC,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;CAClH;AAEF,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAC/B,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC/E,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,EACD,OAAO,CAAC,EAAE,0BAA0B,GACnC,SAAS;IACV,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChC,WAAW,CAAC,CAAC,GAAG,SAAS,CAAC;IAC1B,CAAC,OAAO,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;CAC7B,CAAA;AACD,wBAAgB,YAAY,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EACpC,IAAI,EAAE;IACJ,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC7F,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,MAAM,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAA;CACb,EACD,GAAG,EAAE,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,EAC3B,OAAO,CAAC,EAAE,0BAA0B,GACnC,SAAS;IACV,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChC,WAAW,CAAC,CAAC,GAAG,SAAS,CAAC;IAC1B,CAAC,OAAO,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACpE,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC;CAC7B,CAAA;AAkCD,MAAM,WAAW,iBAAiB,CAAC,CAAC,CAAE,SAAQ,OAAO,CAAC,YAAY;IAChE,QAAQ,CAAC,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;CACvD;AAMD,eAAO,MAAM,aAAa,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,KAE/B;IACA,QAAQ,CAAC,OAAO,EAAE,CAChB,GAAG,EAAE,CAAC,KACH,MAAM,CACT,aAAa,CAAC,CAAC,CAAC,EAChB,CAAC,EACD,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAC1C,CAAA;IACD,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,MAAM,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;CACb,GACC;IACA,QAAQ,CAAC,OAAO,EAAE,MAAM,CACtB,aAAa,CAAC,CAAC,CAAC,EAChB,CAAC,EACD,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAC1C,CAAA;IACD,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,QACG,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,YACf,0BAA0B,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,8MA8EtE,CAAA"}
1
+ {"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
package/dist/query.js CHANGED
@@ -16,7 +16,7 @@ q:
16
16
  handler: (
17
17
  req: I
18
18
  ) => Effect<
19
- FetchResponse<A>,
19
+ A,
20
20
  E,
21
21
  ApiConfig | HttpClient.HttpClient.Service
22
22
  >
@@ -25,7 +25,7 @@ q:
25
25
  }
26
26
  | {
27
27
  handler: Effect<
28
- FetchResponse<A>,
28
+ A,
29
29
  E,
30
30
  ApiConfig | HttpClient.HttpClient.Service
31
31
  >
@@ -70,8 +70,7 @@ export const useSafeQuery_ = (q, arg, options = {} // TODO
70
70
  return retryCount < 5;
71
71
  },
72
72
  queryKey,
73
- queryFn: ({ signal }) => run.value(Effect
74
- .map(handler, (_) => _.body)
73
+ queryFn: ({ signal }) => run.value(handler
75
74
  .pipe(Effect.tapDefect(reportRuntimeError), Effect.withSpan(`query ${q.name}`, { captureStackTrace: false })), { signal })
76
75
  }
77
76
  : {
@@ -88,8 +87,7 @@ export const useSafeQuery_ = (q, arg, options = {} // TODO
88
87
  },
89
88
  queryKey: [...queryKey, req],
90
89
  queryFn: ({ signal }) => run
91
- .value(Effect
92
- .map(handler(req.value), (_) => _.body)
90
+ .value(handler(req.value)
93
91
  .pipe(Effect.tapDefect(reportRuntimeError), Effect.withSpan(`query ${q.name}`, { captureStackTrace: false })), { signal })
94
92
  });
95
93
  const result = computed(() => swrToQuery({
@@ -109,4 +107,4 @@ function swrToQuery(r) {
109
107
  }
110
108
  return Result.initial(r.isValidating);
111
109
  }
112
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcXVlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELHNEQUFzRDtBQUN0RCx3REFBd0Q7QUFDeEQsNERBQTREO0FBQzVELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFBO0FBQzNGLE9BQU8sS0FBSyxNQUFNLE1BQU0sc0JBQXNCLENBQUE7QUFROUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQzlDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlELE9BQU8sRUFBc0MsdUJBQXVCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUUvRixPQUFPLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxNQUFNLEtBQUssQ0FBQTtBQUVuQyxPQUFPLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQXdDckUsTUFBTSxVQUFVLFlBQVksQ0FDMUIsSUFBUztBQUNUOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBc0JFO0FBQ0YsWUFBa0IsRUFDbEIsT0FBYTtJQUViLE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ2xDLENBQUMsQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUM7UUFDOUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0FBQ2hELENBQUM7QUFNRCxnQkFBZ0I7QUFDaEIsc1JBQXNSO0FBQ3RSLDJSQUEyUjtBQUMzUix1UkFBdVI7QUFDdlIsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFHLENBQzNCLENBb0JHLEVBQ0gsR0FBd0Is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
110
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcXVlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELHNEQUFzRDtBQUN0RCx3REFBd0Q7QUFDeEQsNERBQTREO0FBQzVELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFBO0FBQzNGLE9BQU8sS0FBSyxNQUFNLE1BQU0sc0JBQXNCLENBQUE7QUFROUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQzlDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlELE9BQU8sRUFBa0IsdUJBQXVCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUUzRSxPQUFPLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxNQUFNLEtBQUssQ0FBQTtBQUVuQyxPQUFPLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQXlDckUsTUFBTSxVQUFVLFlBQVksQ0FDMUIsSUFBUztBQUNUOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBc0JFO0FBQ0YsWUFBa0IsRUFDbEIsT0FBYTtJQUViLE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ2xDLENBQUMsQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUM7UUFDOUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0FBQ2hELENBQUM7QUFNRCxnQkFBZ0I7QUFDaEIsc1JBQXNSO0FBQ3RSLDJSQUEyUjtBQUMzUix1UkFBdVI7QUFDdlIsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFHLENBQzNCLENBb0JHLEVBQ0gsR0FBd0IsRUFDeEIsVUFBd0UsRUFBRSxDQUFDLE9BQU87RUFDbEYsRUFBRTtJQUNGLE1BQU0sR0FBRyxHQUFHLEdBQUcsQ0FBQTtJQUNmLE1BQU0sR0FBRyxHQUFpQixDQUFDLEdBQUc7UUFDNUIsQ0FBQyxDQUFDLFNBQVM7UUFDWCxDQUFDLENBQUMsT0FBTyxHQUFHLEtBQUssVUFBVTtZQUMzQixDQUFDLENBQUU7Z0JBQ0QsSUFBSSxLQUFLO29CQUNQLE9BQVEsR0FBVyxFQUFFLENBQUE7Z0JBQ3ZCLENBQUM7YUFDTTtZQUNULENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDWixNQUFNLFFBQVEsR0FBRyxZQUFZLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3JDLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUE7SUFDekIsTUFBTSxDQUFDLEdBQUcsUUFBUSxDQUNoQixNQUFNLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQztRQUN0QixDQUFDLENBQUM7WUFDQSxHQUFHLE9BQU87WUFDVixLQUFLLEVBQUUsQ0FBQyxVQUFVLEVBQUUsS0FBSyxFQUFFLEVBQUU7Z0JBQzNCLElBQUksT0FBTyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDO29CQUNsQyxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLENBQUE7b0JBQ2hELE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7b0JBQzlCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUM7d0JBQzlGLE9BQU8sS0FBSyxDQUFBO29CQUNkLENBQUM7Z0JBQ0gsQ0FBQztnQkFFRCxPQUFPLFVBQVUsR0FBRyxDQUFDLENBQUE7WUFDdkIsQ0FBQztZQUNELFFBQVE7WUFDUixPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsQ0FDdEIsR0FBRyxDQUFDLEtBQUssQ0FDUCxPQUFPO2lCQUNKLElBQUksQ0FDSCxNQUFNLENBQUMsU0FBUyxDQUFDLGtCQUFrQixDQUFDLEVBQ3BDLE1BQU0sQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUNqRSxFQUNILEVBQUUsTUFBTSxFQUFFLENBQ1g7U0FDSjtRQUNELENBQUMsQ0FBQztZQUNBLEdBQUcsT0FBTztZQUNWLEtBQUssRUFBRSxDQUFDLFVBQVUsRUFBRSxLQUFLLEVBQUUsRUFBRTtnQkFDM0IsSUFBSSxPQUFPLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7b0JBQ2xDLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsbUJBQW1CLENBQUMsQ0FBQTtvQkFDaEQsTUFBTSxFQUFFLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtvQkFDOUIsSUFBSSxDQUFDLGtCQUFrQixDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsbUJBQW1CLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLHVCQUF1QixDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQzt3QkFDOUYsT0FBTyxLQUFLLENBQUE7b0JBQ2QsQ0FBQztnQkFDSCxDQUFDO2dCQUVELE9BQU8sVUFBVSxHQUFHLENBQUMsQ0FBQTtZQUN2QixDQUFDO1lBQ0QsUUFBUSxFQUFFLENBQUMsR0FBRyxRQUFRLEVBQUUsR0FBRyxDQUFDO1lBQzVCLE9BQU8sRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxDQUN0QixHQUFHO2lCQUNBLEtBQUssQ0FDSixPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQztpQkFDZixJQUFJLENBQ0gsTUFBTSxDQUFDLFNBQVMsQ0FBQyxrQkFBa0IsQ0FBQyxFQUNwQyxNQUFNLENBQUMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FDakUsRUFDSCxFQUFFLE1BQU0sRUFBRSxDQUNYO1NBQ04sQ0FDSixDQUFBO0lBRUQsTUFBTSxNQUFNLEdBQUcsUUFBUSxDQUFDLEdBQUcsRUFBRSxDQUMzQixVQUFVLENBQUM7UUFDVCxLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxLQUFLLElBQUksU0FBUztRQUNqQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxLQUFLO1FBQ2xCLFlBQVksRUFBRSxDQUFDLENBQUMsVUFBVSxDQUFDLEtBQUs7S0FDakMsQ0FBQyxDQUNILENBQUE7SUFDRCxNQUFNLGFBQWEsR0FBRyxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLGNBQWMsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDdkYsT0FBTyxDQUFDLE1BQU0sRUFBRSxhQUFhLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxDQUFDLENBQVUsQ0FBQTtBQUN2RCxDQUFDLENBQUE7QUFFRCxTQUFTLFVBQVUsQ0FBTyxDQUl6QjtJQUNDLElBQUksQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1osT0FBTyxNQUFNLENBQUMsbUJBQW1CLENBQy9CLENBQUMsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEVBQ3BDLENBQUMsQ0FBQyxJQUFJLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsRUFDMUUsQ0FBQyxDQUFDLFlBQVksQ0FDZixDQUFBO0lBQ0gsQ0FBQztJQUNELElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUN6QixPQUFPLE1BQU0sQ0FBQyxPQUFPLENBQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUE7SUFDckQsQ0FBQztJQUVELE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLENBQUE7QUFDdkMsQ0FBQyJ9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/vue",
3
- "version": "1.17.0",
3
+ "version": "1.18.0",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
@@ -9,9 +9,9 @@
9
9
  "@tanstack/vue-query": "^5.59.1",
10
10
  "query-string": "^9.1.0",
11
11
  "@effect-app/core": "1.12.0",
12
- "@effect-app/vue": "1.17.0",
13
12
  "@effect-app/schema": "1.15.0",
14
- "effect-app": "1.21.0"
13
+ "@effect-app/vue": "1.18.0",
14
+ "effect-app": "1.22.0"
15
15
  },
16
16
  "peerDependencies": {
17
17
  "@effect/platform": "^0.67.1",
package/src/mutate.ts CHANGED
@@ -5,7 +5,7 @@ import type * as HttpClient from "@effect/platform/HttpClient"
5
5
  import type { InvalidateOptions, InvalidateQueryFilters } from "@tanstack/vue-query"
6
6
  import { useQueryClient } from "@tanstack/vue-query"
7
7
  import { Cause, Effect, Exit, Option } from "effect-app"
8
- import type { ApiConfig, FetchResponse } from "effect-app/client"
8
+ import type { ApiConfig } from "effect-app/client"
9
9
  import { dropUndefinedT } from "effect-app/utils"
10
10
  import { InterruptedException } from "effect/Cause"
11
11
  import * as Either from "effect/Either"
@@ -14,7 +14,7 @@ import { computed, ref, shallowRef } from "vue"
14
14
  import { makeQueryKey, reportRuntimeError, run } from "./internal.js"
15
15
 
16
16
  export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T)
17
- export function make<A, E, R>(self: Effect<FetchResponse<A>, E, R>) {
17
+ export function make<A, E, R>(self: Effect<A, E, R>) {
18
18
  const result = shallowRef(Result.initial() as Result.Result<A, E>)
19
19
 
20
20
  const execute = Effect
@@ -22,7 +22,7 @@ export function make<A, E, R>(self: Effect<FetchResponse<A>, E, R>) {
22
22
  result.value = Result.waiting(result.value)
23
23
  })
24
24
  .pipe(
25
- Effect.andThen(Effect.map(self, (_) => _.body)),
25
+ Effect.andThen(self),
26
26
  Effect.exit,
27
27
  Effect.andThen(Result.fromExit),
28
28
  Effect.flatMap((r) => Effect.sync(() => result.value = r))
package/src/query.ts CHANGED
@@ -13,12 +13,13 @@ import type {
13
13
  } from "@tanstack/vue-query"
14
14
  import { useQuery } from "@tanstack/vue-query"
15
15
  import { Cause, Effect, Option, Runtime, S } from "effect-app"
16
- import { type ApiConfig, type FetchResponse, ServiceUnavailableError } from "effect-app/client"
16
+ import { type ApiConfig, ServiceUnavailableError } from "effect-app/client"
17
17
  import type { HttpClient } from "effect-app/http"
18
18
  import { computed, ref } from "vue"
19
19
  import type { ComputedRef, WatchSource } from "vue"
20
20
  import { makeQueryKey, reportRuntimeError, run } from "./internal.js"
21
21
 
22
+ // eslint-disable-next-line @typescript-eslint/no-empty-object-type
22
23
  export interface QueryObserverOptionsCustom<
23
24
  TQueryFnData = unknown,
24
25
  TError = Error,
@@ -32,7 +33,7 @@ export interface QueryObserverOptionsCustom<
32
33
 
33
34
  export function useSafeQuery<E, A>(
34
35
  self: {
35
- handler: Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>
36
+ handler: Effect<A, E, ApiConfig | HttpClient.HttpClient.Service>
36
37
  mapPath: string
37
38
  name: string
38
39
  },
@@ -45,7 +46,7 @@ export function useSafeQuery<E, A>(
45
46
  ]
46
47
  export function useSafeQuery<Arg, E, A>(
47
48
  self: {
48
- handler: (arg: Arg) => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>
49
+ handler: (arg: Arg) => Effect<A, E, ApiConfig | HttpClient.HttpClient.Service>
49
50
  mapPath: (arg: Arg) => string
50
51
  name: string
51
52
  },
@@ -65,7 +66,7 @@ export function useSafeQuery(
65
66
  handler: (
66
67
  req: I
67
68
  ) => Effect<
68
- FetchResponse<A>,
69
+ A,
69
70
  E,
70
71
  ApiConfig | HttpClient.HttpClient.Service
71
72
  >
@@ -74,7 +75,7 @@ export function useSafeQuery(
74
75
  }
75
76
  | {
76
77
  handler: Effect<
77
- FetchResponse<A>,
78
+ A,
78
79
  E,
79
80
  ApiConfig | HttpClient.HttpClient.Service
80
81
  >
@@ -104,7 +105,7 @@ export const useSafeQuery_ = <I, A, E>(
104
105
  readonly handler: (
105
106
  req: I
106
107
  ) => Effect<
107
- FetchResponse<A>,
108
+ A,
108
109
  E,
109
110
  ApiConfig | HttpClient.HttpClient.Service
110
111
  >
@@ -113,7 +114,7 @@ export const useSafeQuery_ = <I, A, E>(
113
114
  }
114
115
  | {
115
116
  readonly handler: Effect<
116
- FetchResponse<A>,
117
+ A,
117
118
  E,
118
119
  ApiConfig | HttpClient.HttpClient.Service
119
120
  >
@@ -153,8 +154,7 @@ export const useSafeQuery_ = <I, A, E>(
153
154
  queryKey,
154
155
  queryFn: ({ signal }) =>
155
156
  run.value(
156
- Effect
157
- .map(handler, (_) => _.body)
157
+ handler
158
158
  .pipe(
159
159
  Effect.tapDefect(reportRuntimeError),
160
160
  Effect.withSpan(`query ${q.name}`, { captureStackTrace: false })
@@ -179,8 +179,7 @@ export const useSafeQuery_ = <I, A, E>(
179
179
  queryFn: ({ signal }) =>
180
180
  run
181
181
  .value(
182
- Effect
183
- .map(handler(req.value), (_) => _.body)
182
+ handler(req.value)
184
183
  .pipe(
185
184
  Effect.tapDefect(reportRuntimeError),
186
185
  Effect.withSpan(`query ${q.name}`, { captureStackTrace: false })
package/src/swrv.bak DELETED
@@ -1,196 +0,0 @@
1
- /* eslint-disable @typescript-eslint/no-explicit-any */
2
- import { tuple } from "@effect-app/core/Function"
3
- import type * as HttpClient from "@effect/platform/Http/Client"
4
- import { Cause, Effect, Exit, Fiber, Option } from "effect-app"
5
- import { Done, hasValue, Initial, isInitializing, isSuccess, Loading, queryResult, Refreshing } from "effect-app/client"
6
- import type { ApiConfig, FetchResponse, QueryResult } from "effect-app/client"
7
- import { InterruptedException } from "effect/Cause"
8
- import * as Either from "effect/Either"
9
- import { FiberFailureCauseId, isFiberFailure } from "effect/Runtime"
10
- import * as swrv from "swrv"
11
- import type { fetcherFn, IKey, IResponse } from "swrv/dist/types.js"
12
- import type { ComputedRef, Ref } from "vue"
13
- import { computed, ref, shallowRef } from "vue"
14
- import { run } from "./internal.js"
15
-
16
- // madness - workaround different import behavior on server and client
17
- const useSWRV = (swrv.default.default ? swrv.default.default : swrv.default) as unknown as useSWRVType
18
- export const mutate = (swrv.default.mutate ? swrv.default.mutate : swrv.mutate) as unknown as MutateType
19
-
20
-
21
- type useSWRVType = {
22
- <Data, Error>(key: IKey): IResponse<Data, Error>
23
- <Data, Error>(
24
- key: IKey,
25
- fn?: fetcherFn<Data>,
26
- config?: swrv.IConfig<Data, fetcherFn<Data>>
27
- ): IResponse<Data, Error>
28
- }
29
- type MutateType = {
30
- <Data>(
31
- key: string,
32
- res: Data | Promise<Data>,
33
- cache?: swrv.SWRVCache<Omit<IResponse<any, any>, "mutate">>,
34
- ttl?: number
35
- ): Promise<{
36
- data: any
37
- error: any
38
- isValidating: any
39
- }>
40
- }
41
-
42
- function swrToQuery<E, A>(
43
- r: { error: E | undefined; data: A | undefined; isValidating: boolean }
44
- ): QueryResult<E, A> {
45
- if (r.error) {
46
- return r.isValidating
47
- ? Refreshing.fail<E, A>(r.error, r.data)
48
- : Done.fail<E, A>(r.error, r.data)
49
- }
50
- if (r.data !== undefined) {
51
- return r.isValidating
52
- ? Refreshing.succeed<A, E>(r.data)
53
- : Done.succeed<A, E>(r.data)
54
- }
55
-
56
- return r.isValidating ? new Loading() : new Initial()
57
- }
58
-
59
-
60
- export function useSafeQuery<E, A>(
61
- self: {
62
- handler: Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>
63
- mapPath: string
64
- },
65
- config?: swrv.IConfig<A, fetcherFn<A>> | undefined
66
- ): readonly [ComputedRef<QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>]
67
- export function useSafeQuery<Arg, E, A>(
68
- self: {
69
- handler: (arg: Arg) => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>
70
- mapPath: (arg: Arg) => string
71
- },
72
- arg: Arg | WatchSource<Arg>,
73
- config?: swrv.IConfig<A, fetcherFn<A>> | undefined
74
- ): readonly [ComputedRef<QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>]
75
- export function useSafeQuery(
76
- self: any, // {
77
- // handler: (arg: Arg) => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>
78
- // mapPath: (arg: Arg) => string
79
- // } | {
80
- // handler: Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>
81
- // mapPath: string
82
- // },
83
- arg?: any, // Arg | WatchSource<Arg> | swrv.IConfig<A, fetcherFn<A>> | undefined,
84
- config?: any // swrv.IConfig<A, fetcherFn<A>> | undefined
85
- ) {
86
- return Effect.isEffect(self.handler)
87
- ? useSafeQuery_(self.mapPath, () => self.handler, arg)
88
- : useSafeQueryWithArg_(self.handler, self.mapPath, arg, config)
89
- }
90
-
91
- export function useSafeQueryWithArg_<Arg, E, A>(
92
- self: (arg: Arg) => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>,
93
- mapPath: (arg: Arg) => string,
94
- arg: Arg | WatchSource<Arg>,
95
- config?: swrv.IConfig<A, fetcherFn<A>> | undefined
96
- ) {
97
- const arr = arg
98
- const r: { value: Arg } = typeof arr === "function"
99
- ? {
100
- get value() {
101
- return (arr as any)()
102
- }
103
- } as any
104
- : ref(arg)
105
- return useSafeQuery_(computed(() => mapPath(r.value)), () => self(r.value), config)
106
- }
107
-
108
- export function useSafeQuery_<E, A>(
109
- key: string | WatchSource<string>,
110
- self: () => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>,
111
- config?: swrv.IConfig<A, fetcherFn<A>> | undefined
112
- ) {
113
- // const [result, latestSuccess, execute] = make(self)
114
-
115
- // TODO: support with interruption
116
- // const sem = Semaphore.unsafeMake(1)
117
- // const lock = sem.withPermits(1)
118
- // let fib: Fiber.FiberContext<E, FetchResponse<A>> | undefined = undefined
119
- // const execute = self
120
- // const runNew = execute.fork()
121
- // .tap(newFiber =>
122
- // Effect.sync(() => {
123
- // fib = newFiber
124
- // })
125
- // )
126
-
127
- // const ex = lock(
128
- // Effect.suspend(() => {
129
- // return fib
130
- // ? Fiber.interrupt(fib).zipRight(runNew)
131
- // : runNew
132
- // })
133
- // ).flatMap(Fiber.await)
134
- // function execWithInterruption() {
135
- // return ex.provide(Layers)
136
- // .runPromise()
137
- // .catch(err => {
138
- // if (!Cause.isInterruptedException(err)) throw err
139
- // return undefined
140
- // })
141
- // }
142
-
143
- // const swr = useSWRV<A, E>(key, () => execWithInterruption().then(_ => _?.body as any)) // Effect.runPromise(self.provide(Layers))
144
- const swr = useSWRV<A, E>(key, () =>
145
- run
146
- .value(self())
147
- .then((_) => _.body)
148
- .catch((_) => {
149
- if (!isFiberFailure(_)) throw _
150
- const cause = _[FiberFailureCauseId]
151
- throw Cause.squash(cause)
152
- }), config)
153
- const result = computed(() =>
154
- swrToQuery({ data: swr.data.value, error: swr.error.value, isValidating: swr.isValidating.value })
155
- ) // ref<QueryResult<E, A>>()
156
- const latestSuccess = computed(() => {
157
- const value = result.value
158
- return isSuccess(value)
159
- ? Either.isRight(value.current)
160
- ? value.current.right
161
- : Option.isSome(value.previous)
162
- ? value.previous.value
163
- : undefined
164
- : undefined
165
- })
166
-
167
- return tuple(result, latestSuccess, () => swr.mutate(), swr)
168
- }
169
-
170
-
171
- export function useMutate<E, A>(
172
- self: { handler: Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>; mapPath: string }
173
- ) {
174
- const fn = () =>
175
- run.value(self.handler).then((_) => _.body).catch((_) => {
176
- if (!isFiberFailure(_)) throw _
177
- const cause = _[FiberFailureCauseId]
178
- throw Cause.squash(cause)
179
- })
180
- return () => swrv.mutate(self.mapPath, fn)
181
- }
182
-
183
- export function useMutateWithArg<Arg, E, A>(
184
- self: {
185
- handler: (arg: Arg) => Effect<FetchResponse<A>, E, ApiConfig | HttpClient.HttpClient.Service>
186
- mapPath: (arg: Arg) => string
187
- }
188
- ) {
189
- const fn = (arg: Arg) =>
190
- run.value(self.handler(arg)).then((_) => _.body).catch((_) => {
191
- if (!isFiberFailure(_)) throw _
192
- const cause = _[FiberFailureCauseId]
193
- throw Cause.squash(cause)
194
- })
195
- return (arg: Arg) => swrv.mutate(self.mapPath(arg), fn(arg))
196
- }