@effect-app/vue 1.9.2 → 1.9.4
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 +16 -0
- package/_cjs/query.cjs +21 -0
- package/_cjs/query.cjs.map +1 -1
- package/_cjs/runtime.cjs +1 -1
- package/_cjs/runtime.cjs.map +1 -1
- package/dist/query.d.ts +2 -3
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +23 -2
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +2 -2
- package/package.json +2 -2
- package/src/query.ts +24 -3
- package/src/runtime.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @effect-app/vue
|
|
2
2
|
|
|
3
|
+
## 1.9.4
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- d907a23: improve: do not retry dead ends
|
|
8
|
+
- Updated dependencies [d907a23]
|
|
9
|
+
- @effect-app/vue@1.9.4
|
|
10
|
+
|
|
11
|
+
## 1.9.3
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- a359cee: fix browser logger
|
|
16
|
+
- Updated dependencies [a359cee]
|
|
17
|
+
- @effect-app/vue@1.9.3
|
|
18
|
+
|
|
3
19
|
## 1.9.2
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
package/_cjs/query.cjs
CHANGED
|
@@ -8,6 +8,7 @@ exports.useSafeQuery_ = void 0;
|
|
|
8
8
|
var Result = _interopRequireWildcard(require("@effect-rx/rx/Result"));
|
|
9
9
|
var _vueQuery = require("@tanstack/vue-query");
|
|
10
10
|
var _effectApp = require("effect-app");
|
|
11
|
+
var _client = require("effect-app/client");
|
|
11
12
|
var _vue = require("vue");
|
|
12
13
|
var _internal = require("./internal.cjs");
|
|
13
14
|
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); }
|
|
@@ -60,6 +61,16 @@ const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
60
61
|
const handler = q.handler;
|
|
61
62
|
const r = (0, _vueQuery.useQuery)(_effectApp.Effect.isEffect(handler) ? {
|
|
62
63
|
...options,
|
|
64
|
+
retry: (_, error) => {
|
|
65
|
+
if (_effectApp.Runtime.isFiberFailure(error)) {
|
|
66
|
+
const cause = error[_effectApp.Runtime.FiberFailureCauseId];
|
|
67
|
+
const sq = _effectApp.Cause.squash(cause);
|
|
68
|
+
if (_effectApp.S.is(_client.UnauthorizedError)(sq) || _effectApp.S.is(_client.NotFoundError)(sq)) {
|
|
69
|
+
return false;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return true;
|
|
73
|
+
},
|
|
63
74
|
queryKey,
|
|
64
75
|
queryFn: ({
|
|
65
76
|
signal
|
|
@@ -68,6 +79,16 @@ const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
68
79
|
})
|
|
69
80
|
} : {
|
|
70
81
|
...options,
|
|
82
|
+
retry: (_, error) => {
|
|
83
|
+
if (_effectApp.Runtime.isFiberFailure(error)) {
|
|
84
|
+
const cause = error[_effectApp.Runtime.FiberFailureCauseId];
|
|
85
|
+
const sq = _effectApp.Cause.squash(cause);
|
|
86
|
+
if (_effectApp.S.is(_client.UnauthorizedError)(sq) || _effectApp.S.is(_client.NotFoundError)(sq)) {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
return true;
|
|
91
|
+
},
|
|
71
92
|
queryKey: [...queryKey, req],
|
|
72
93
|
queryFn: ({
|
|
73
94
|
signal
|
package/_cjs/query.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.cjs","names":["Result","_interopRequireWildcard","require","_vueQuery","_effectApp","_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","queryFn","signal","run","map","
|
|
1
|
+
{"version":3,"file":"query.cjs","names":["Result","_interopRequireWildcard","require","_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","_","error","Runtime","isFiberFailure","cause","FiberFailureCauseId","sq","Cause","squash","S","is","UnauthorizedError","NotFoundError","queryFn","signal","run","map","body","pipe","tapDefect","reportRuntimeError","withSpan","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/_cjs/runtime.cjs
CHANGED
|
@@ -31,7 +31,7 @@ function makeApiLayers(config) {
|
|
|
31
31
|
}
|
|
32
32
|
function makeAppRuntime(layer) {
|
|
33
33
|
return _effectApp.Effect.gen(function* ($) {
|
|
34
|
-
layer = layer.pipe(_effectApp.Layer.provide(_effectApp.Logger.replace(_effectApp.Logger.defaultLogger, _effectApp.Logger.withSpanAnnotations(_effectApp.Logger.
|
|
34
|
+
layer = layer.pipe(_effectApp.Layer.provide(_effectApp.Logger.replace(_effectApp.Logger.defaultLogger, _effectApp.Logger.withSpanAnnotations(_effectApp.Logger.prettyLogger()))));
|
|
35
35
|
const scope = yield* $(Scope.make());
|
|
36
36
|
const env = yield* $(layer.pipe(_effectApp.Layer.buildWithScope(scope)));
|
|
37
37
|
const runtime = yield* $(_effectApp.Effect.runtime().pipe(_effectApp.Effect.scoped, _effectApp.Effect.provide(env)));
|
package/_cjs/runtime.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.cjs","names":["HttpClient","_interopRequireWildcard","require","_effect","_effectApp","_client","Scope","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DefaultApiConfig","exports","Config","all","apiUrl","string","pipe","withDefault","headers","hashMap","option","makeApiLayers","config","layer","Layer","merge","ApiConfig","makeAppRuntime","Effect","gen","$","provide","Logger","replace","defaultLogger","withSpanAnnotations","
|
|
1
|
+
{"version":3,"file":"runtime.cjs","names":["HttpClient","_interopRequireWildcard","require","_effect","_effectApp","_client","Scope","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DefaultApiConfig","exports","Config","all","apiUrl","string","pipe","withDefault","headers","hashMap","option","makeApiLayers","config","layer","Layer","merge","ApiConfig","makeAppRuntime","Effect","gen","$","provide","Logger","replace","defaultLogger","withSpanAnnotations","prettyLogger","scope","make","env","buildWithScope","runtime","scoped","assign","runPromise","Runtime","runPromiseExit","runSync","runSyncExit","runFork","clean","close","Exit","void","initializeSync","initRuntime","initializeAsync","then"],"sources":["../src/runtime.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/query.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import * as Result from "@effect-rx/rx/Result";
|
|
2
2
|
import type { QueryKey, QueryObserverOptions, QueryObserverResult, RefetchOptions, UseQueryReturnType } from "@tanstack/vue-query";
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
5
|
-
import type { ApiConfig, FetchResponse } from "effect-app/client";
|
|
3
|
+
import { Cause, Effect, Runtime } from "effect-app";
|
|
4
|
+
import { type ApiConfig, type FetchResponse } from "effect-app/client";
|
|
6
5
|
import type { HttpClient } from "effect-app/http";
|
|
7
6
|
import type { ComputedRef, WatchSource } from "vue";
|
|
8
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"> {
|
package/dist/query.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAIA,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,
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
package/dist/query.js
CHANGED
|
@@ -4,7 +4,8 @@
|
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
5
5
|
import * as Result from "@effect-rx/rx/Result";
|
|
6
6
|
import { useQuery } from "@tanstack/vue-query";
|
|
7
|
-
import { Effect, Option, Runtime } from "effect-app";
|
|
7
|
+
import { Cause, Effect, Option, Runtime, S } from "effect-app";
|
|
8
|
+
import { NotFoundError, UnauthorizedError } from "effect-app/client";
|
|
8
9
|
import { computed, ref } from "vue";
|
|
9
10
|
import { makeQueryKey, reportRuntimeError, run } from "./internal.js";
|
|
10
11
|
export function useSafeQuery(self,
|
|
@@ -57,6 +58,16 @@ export const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
57
58
|
const r = useQuery(Effect.isEffect(handler)
|
|
58
59
|
? {
|
|
59
60
|
...options,
|
|
61
|
+
retry: (_, error) => {
|
|
62
|
+
if (Runtime.isFiberFailure(error)) {
|
|
63
|
+
const cause = error[Runtime.FiberFailureCauseId];
|
|
64
|
+
const sq = Cause.squash(cause);
|
|
65
|
+
if (S.is(UnauthorizedError)(sq) || S.is(NotFoundError)(sq)) {
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return true;
|
|
70
|
+
},
|
|
60
71
|
queryKey,
|
|
61
72
|
queryFn: ({ signal }) => run.value(Effect
|
|
62
73
|
.map(handler, (_) => _.body)
|
|
@@ -64,6 +75,16 @@ export const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
64
75
|
}
|
|
65
76
|
: {
|
|
66
77
|
...options,
|
|
78
|
+
retry: (_, error) => {
|
|
79
|
+
if (Runtime.isFiberFailure(error)) {
|
|
80
|
+
const cause = error[Runtime.FiberFailureCauseId];
|
|
81
|
+
const sq = Cause.squash(cause);
|
|
82
|
+
if (S.is(UnauthorizedError)(sq) || S.is(NotFoundError)(sq)) {
|
|
83
|
+
return false;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return true;
|
|
87
|
+
},
|
|
67
88
|
queryKey: [...queryKey, req],
|
|
68
89
|
queryFn: ({ signal }) => run
|
|
69
90
|
.value(Effect
|
|
@@ -87,4 +108,4 @@ function swrToQuery(r) {
|
|
|
87
108
|
}
|
|
88
109
|
return Result.initial(r.isValidating);
|
|
89
110
|
}
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcXVlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELHNEQUFzRDtBQUN0RCx3REFBd0Q7QUFDeEQsNERBQTREO0FBQzVELE9BQU8sS0FBSyxNQUFNLE1BQU0sc0JBQXNCLENBQUE7QUFROUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQzlDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlELE9BQU8sRUFBc0MsYUFBYSxFQUFFLGlCQUFpQixFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFFeEcsT0FBTyxFQUFFLFFBQVEsRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFFbkMsT0FBTyxFQUFFLFlBQVksRUFBRSxrQkFBa0IsRUFBRSxHQUFHLEVBQUUsTUFBTSxlQUFlLENBQUE7QUF3Q3JFLE1BQU0sVUFBVSxZQUFZLENBQzFCLElBQVM7QUFDVDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztFQXNCRTtBQUNGLFlBQWtCLEVBQ2xCLE9BQWE7SUFFYixPQUFPLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQztRQUNsQyxDQUFDLENBQUMsYUFBYSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUUsWUFBWSxDQUFDO1FBQzlDLENBQUMsQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLFlBQVksRUFBRSxPQUFPLENBQUMsQ0FBQTtBQUNoRCxDQUFDO0FBTUQsZ0JBQWdCO0FBQ2hCLHNSQUFzUjtBQUN0UiwyUkFBMlI7QUFDM1IsdVJBQXVSO0FBQ3ZSLE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBRyxDQUMzQixDQW9CRyxFQUNILEdBQXdCLEVBQ3hCLFVBQXdFLEVBQUUsQ0FBQyxPQUFPO0VBQ2xGLEVBQUU7SUFDRixNQUFN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
|
package/dist/runtime.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAI7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,eAAO,MAAM,gBAAgB;;;EAQ3B,CAAA;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,wEAK9C;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;AAI7C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,eAAO,MAAM,gBAAgB;;;EAQ3B,CAAA;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,wEAK9C;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;2BA0CmsD,CAAC;;;2BAAqd,CAAC;;;;;;;SAtBttE;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC;;;2BAoBspD,CAAC;;;2BAAqd,CAAC;;;;;;;EAbttE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,GAAG,SAAS,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC;;;2BAWqpD,CAAC;;;2BAAqd,CAAC;;;;;;;GADttE"}
|
package/dist/runtime.js
CHANGED
|
@@ -19,7 +19,7 @@ export function makeApiLayers(config) {
|
|
|
19
19
|
}
|
|
20
20
|
export function makeAppRuntime(layer) {
|
|
21
21
|
return Effect.gen(function* ($) {
|
|
22
|
-
layer = layer.pipe(Layer.provide(Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(Logger.
|
|
22
|
+
layer = layer.pipe(Layer.provide(Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(Logger.prettyLogger()))));
|
|
23
23
|
const scope = yield* $(Scope.make());
|
|
24
24
|
const env = yield* $(layer.pipe(Layer.buildWithScope(scope)));
|
|
25
25
|
const runtime = yield* $(Effect.runtime().pipe(Effect.scoped, Effect.provide(env)));
|
|
@@ -54,4 +54,4 @@ export function initializeAsync(layer) {
|
|
|
54
54
|
};
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ydW50aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxVQUFVLE1BQU0sNkJBQTZCLENBQUE7QUFDekQsT0FBTyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQzlDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNsRCxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sbUJBQW1CLENBQUE7QUFDN0MsT0FBTyxLQUFLLEtBQUssTUFBTSxjQUFjLENBQUE7QUFDckMsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUUzQyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sZUFBZSxDQUFBO0FBRTNDLE1BQU0sQ0FBQyxNQUFNLGdCQUFnQixHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUM7SUFDekMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDaEUsT0FBTyxFQUFFLE1BQU07U0FDWixPQUFPLENBQ04sTUFBTSxDQUFDLE1BQU0sRUFBRSxFQUNmLFNBQVMsQ0FDVjtTQUNBLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO0NBQ3ZCLENBQUMsQ0FBQTtBQUVGLE1BQU0sVUFBVSxhQUFhLENBQUMsTUFBaUI7SUFDN0MsT0FBTyxVQUFVO1NBQ2QsS0FBSztTQUNMLElBQUksQ0FBQyxLQUFLO1NBQ1IsS0FBSyxDQUFDLFNBQVMsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQ3RDLENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFVLEtBQXFCO0lBQzNELE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLEtBQUssR0FBRyxLQUFLLENBQUMsSUFBSSxDQUNoQixLQUFLLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsbUJBQW1CLENBQUMsTUFBTSxDQUFDLFlBQVksRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUN2RyxDQUFBO1FBQ0QsTUFBTSxLQUFLLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFBO1FBQ3BDLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzdELE1BQU0sT0FBTyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFLLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFFdEYsT0FBTztZQUNMLE9BQU8sRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRTtnQkFDOUIsVUFBVSxFQUFFLE9BQU8sQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDO2dCQUN2QyxjQUFjLEVBQUUsT0FBTyxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUM7Z0JBQy9DLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQztnQkFDakMsV0FBVyxFQUFFLE9BQU8sQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDO2dCQUN6QyxPQUFPLEVBQUUsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUM7YUFDbEMsQ0FBQztZQUNGLEtBQUssRUFBRSxLQUFLLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDO1NBQ3JDLENBQUE7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUFPLEtBQXFFO0lBQ3hHLE1BQU0sRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtJQUNoRSxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUE7SUFDcEIsT0FBTztRQUNMLE9BQU87UUFDUCxLQUFLLEVBQUUsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUM7S0FDbkMsQ0FBQTtBQUNILENBQUM7QUFFRCxNQUFNLFVBQVUsZUFBZSxDQUFPLEtBQXFFO0lBQ3pHLE9BQU8sTUFBTTtTQUNWLFVBQVUsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUM7U0FDakMsSUFBSSxDQUFDLENBQUMsRUFBRSxLQUFLLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRTtRQUMzQixXQUFXLENBQUMsT0FBTyxDQUFDLENBQUE7UUFDcEIsT0FBTztZQUNMLE9BQU87WUFDUCxLQUFLLEVBQUUsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUM7U0FDdEMsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/vue",
|
|
3
|
-
"version": "1.9.
|
|
3
|
+
"version": "1.9.4",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"query-string": "^9.1.0",
|
|
11
11
|
"@effect-app/core": "1.7.1",
|
|
12
12
|
"@effect-app/schema": "1.7.1",
|
|
13
|
-
"@effect-app/vue": "1.9.
|
|
13
|
+
"@effect-app/vue": "1.9.4",
|
|
14
14
|
"effect-app": "1.10.2"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
package/src/query.ts
CHANGED
|
@@ -11,9 +11,8 @@ import type {
|
|
|
11
11
|
UseQueryReturnType
|
|
12
12
|
} from "@tanstack/vue-query"
|
|
13
13
|
import { useQuery } from "@tanstack/vue-query"
|
|
14
|
-
import
|
|
15
|
-
import {
|
|
16
|
-
import type { ApiConfig, FetchResponse } from "effect-app/client"
|
|
14
|
+
import { Cause, Effect, Option, Runtime, S } from "effect-app"
|
|
15
|
+
import { type ApiConfig, type FetchResponse, NotFoundError, UnauthorizedError } from "effect-app/client"
|
|
17
16
|
import type { HttpClient } from "effect-app/http"
|
|
18
17
|
import { computed, ref } from "vue"
|
|
19
18
|
import type { ComputedRef, WatchSource } from "vue"
|
|
@@ -139,6 +138,17 @@ export const useSafeQuery_ = <I, A, E>(
|
|
|
139
138
|
Effect.isEffect(handler)
|
|
140
139
|
? {
|
|
141
140
|
...options,
|
|
141
|
+
retry: (_, error) => {
|
|
142
|
+
if (Runtime.isFiberFailure(error)) {
|
|
143
|
+
const cause = error[Runtime.FiberFailureCauseId]
|
|
144
|
+
const sq = Cause.squash(cause)
|
|
145
|
+
if (S.is(UnauthorizedError)(sq) || S.is(NotFoundError)(sq)) {
|
|
146
|
+
return false
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
return true
|
|
151
|
+
},
|
|
142
152
|
queryKey,
|
|
143
153
|
queryFn: ({ signal }) =>
|
|
144
154
|
run.value(
|
|
@@ -150,6 +160,17 @@ export const useSafeQuery_ = <I, A, E>(
|
|
|
150
160
|
}
|
|
151
161
|
: {
|
|
152
162
|
...options,
|
|
163
|
+
retry: (_, error) => {
|
|
164
|
+
if (Runtime.isFiberFailure(error)) {
|
|
165
|
+
const cause = error[Runtime.FiberFailureCauseId]
|
|
166
|
+
const sq = Cause.squash(cause)
|
|
167
|
+
if (S.is(UnauthorizedError)(sq) || S.is(NotFoundError)(sq)) {
|
|
168
|
+
return false
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
return true
|
|
173
|
+
},
|
|
153
174
|
queryKey: [...queryKey, req],
|
|
154
175
|
queryFn: ({ signal }) =>
|
|
155
176
|
run
|
package/src/runtime.ts
CHANGED
|
@@ -27,7 +27,7 @@ export function makeApiLayers(config: ApiConfig) {
|
|
|
27
27
|
export function makeAppRuntime<R, E, A>(layer: Layer<A, E, R>) {
|
|
28
28
|
return Effect.gen(function*($) {
|
|
29
29
|
layer = layer.pipe(
|
|
30
|
-
Layer.provide(Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(Logger.
|
|
30
|
+
Layer.provide(Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(Logger.prettyLogger())))
|
|
31
31
|
)
|
|
32
32
|
const scope = yield* $(Scope.make())
|
|
33
33
|
const env = yield* $(layer.pipe(Layer.buildWithScope(scope)))
|