@effect-app/vue 1.9.5 → 1.10.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 +13 -0
- package/_cjs/query.cjs +5 -4
- package/_cjs/query.cjs.map +1 -1
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +7 -6
- package/dist/runtime.d.ts +13 -13
- package/package.json +4 -4
- package/src/query.ts +6 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# @effect-app/vue
|
|
2
2
|
|
|
3
|
+
## 1.10.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 24f0c0f: feat: allow custom errors per endpoint.
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [24f0c0f]
|
|
12
|
+
- effect-app@1.11.0
|
|
13
|
+
- @effect-app/schema@1.8.0
|
|
14
|
+
- @effect-app/vue@1.10.0
|
|
15
|
+
|
|
3
16
|
## 1.9.5
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
package/_cjs/query.cjs
CHANGED
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.useSafeQuery = useSafeQuery;
|
|
7
7
|
exports.useSafeQuery_ = void 0;
|
|
8
|
+
var _httpClient = require("@effect-app/core/http/http-client");
|
|
8
9
|
var Result = _interopRequireWildcard(require("@effect-rx/rx/Result"));
|
|
9
10
|
var _vueQuery = require("@tanstack/vue-query");
|
|
10
11
|
var _effectApp = require("effect-app");
|
|
@@ -65,11 +66,11 @@ const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
65
66
|
if (_effectApp.Runtime.isFiberFailure(error)) {
|
|
66
67
|
const cause = error[_effectApp.Runtime.FiberFailureCauseId];
|
|
67
68
|
const sq = _effectApp.Cause.squash(cause);
|
|
68
|
-
if (
|
|
69
|
+
if (!(0, _httpClient.isHttpRequestError)(sq) && !(0, _httpClient.isHttpResponseError)(sq) && !_effectApp.S.is(_client.ServiceUnavailableError)(sq)) {
|
|
69
70
|
return false;
|
|
70
71
|
}
|
|
71
72
|
}
|
|
72
|
-
return retryCount <
|
|
73
|
+
return retryCount < 5;
|
|
73
74
|
},
|
|
74
75
|
queryKey,
|
|
75
76
|
queryFn: ({
|
|
@@ -83,11 +84,11 @@ const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
83
84
|
if (_effectApp.Runtime.isFiberFailure(error)) {
|
|
84
85
|
const cause = error[_effectApp.Runtime.FiberFailureCauseId];
|
|
85
86
|
const sq = _effectApp.Cause.squash(cause);
|
|
86
|
-
if (
|
|
87
|
+
if (!(0, _httpClient.isHttpRequestError)(sq) && !(0, _httpClient.isHttpResponseError)(sq) && !_effectApp.S.is(_client.ServiceUnavailableError)(sq)) {
|
|
87
88
|
return false;
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
|
-
return retryCount <
|
|
91
|
+
return retryCount < 5;
|
|
91
92
|
},
|
|
92
93
|
queryKey: [...queryKey, req],
|
|
93
94
|
queryFn: ({
|
package/_cjs/query.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.cjs","names":["
|
|
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","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/query.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"
|
|
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,GAAG,SAAS,GAC/C,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,GAAG,SAAS,KAAK,OAAO,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAChF,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,GAAG,SAAS,GAC/C,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,GAAG,SAAS,KAAK,OAAO,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAChF,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,8MAwEtE,CAAA"}
|
package/dist/query.js
CHANGED
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
3
3
|
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
5
|
+
import { isHttpRequestError, isHttpResponseError } from "@effect-app/core/http/http-client";
|
|
5
6
|
import * as Result from "@effect-rx/rx/Result";
|
|
6
7
|
import { useQuery } from "@tanstack/vue-query";
|
|
7
8
|
import { Cause, Effect, Option, Runtime, S } from "effect-app";
|
|
8
|
-
import {
|
|
9
|
+
import { ServiceUnavailableError } from "effect-app/client";
|
|
9
10
|
import { computed, ref } from "vue";
|
|
10
11
|
import { makeQueryKey, reportRuntimeError, run } from "./internal.js";
|
|
11
12
|
export function useSafeQuery(self,
|
|
@@ -62,11 +63,11 @@ export const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
62
63
|
if (Runtime.isFiberFailure(error)) {
|
|
63
64
|
const cause = error[Runtime.FiberFailureCauseId];
|
|
64
65
|
const sq = Cause.squash(cause);
|
|
65
|
-
if (
|
|
66
|
+
if (!isHttpRequestError(sq) && !isHttpResponseError(sq) && !S.is(ServiceUnavailableError)(sq)) {
|
|
66
67
|
return false;
|
|
67
68
|
}
|
|
68
69
|
}
|
|
69
|
-
return retryCount <
|
|
70
|
+
return retryCount < 5;
|
|
70
71
|
},
|
|
71
72
|
queryKey,
|
|
72
73
|
queryFn: ({ signal }) => run.value(Effect
|
|
@@ -79,11 +80,11 @@ export const useSafeQuery_ = (q, arg, options = {} // TODO
|
|
|
79
80
|
if (Runtime.isFiberFailure(error)) {
|
|
80
81
|
const cause = error[Runtime.FiberFailureCauseId];
|
|
81
82
|
const sq = Cause.squash(cause);
|
|
82
|
-
if (
|
|
83
|
+
if (!isHttpRequestError(sq) && !isHttpResponseError(sq) && !S.is(ServiceUnavailableError)(sq)) {
|
|
83
84
|
return false;
|
|
84
85
|
}
|
|
85
86
|
}
|
|
86
|
-
return retryCount <
|
|
87
|
+
return retryCount < 5;
|
|
87
88
|
},
|
|
88
89
|
queryKey: [...queryKey, req],
|
|
89
90
|
queryFn: ({ signal }) => run
|
|
@@ -108,4 +109,4 @@ function swrToQuery(r) {
|
|
|
108
109
|
}
|
|
109
110
|
return Result.initial(r.isValidating);
|
|
110
111
|
}
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcXVlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELHNEQUFzRDtBQUN0RCx3REFBd0Q7QUFDeEQsNERBQTREO0FBQzVELE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxtQkFBbUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFBO0FBQzNGLE9BQU8sS0FBSyxNQUFNLE1BQU0sc0JBQXNCLENBQUE7QUFROUMsT0FBTyxFQUFFLFFBQVEsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQzlDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzlELE9BQU8sRUFBc0MsdUJBQXVCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUUvRixPQUFPLEVBQUUsUUFBUSxFQUFFLEdBQUcsRUFBRSxNQUFNLEtBQUssQ0FBQTtBQUVuQyxPQUFPLEVBQUUsWUFBWSxFQUFFLGtCQUFrQixFQUFFLEdBQUcsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQXdDckUsTUFBTSxVQUFVLFlBQVksQ0FDMUIsSUFBUztBQUNUOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0VBc0JFO0FBQ0YsWUFBa0IsRUFDbEIsT0FBYTtJQUViLE9BQU8sTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDO1FBQ2xDLENBQUMsQ0FBQyxhQUFhLENBQUMsSUFBSSxFQUFFLFNBQVMsRUFBRSxZQUFZLENBQUM7UUFDOUMsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxJQUFJLEVBQUUsWUFBWSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0FBQ2hELENBQUM7QUFNRCxnQkFBZ0I7QUFDaEIsc1JBQXNSO0FBQ3RSLDJSQUEyUjtBQUMzUix1UkFBdVI7QUFDdlIsTUFBTSxDQUFDLE1BQU0sYUFBYSxHQUFHLENBQzNCLENBb0JHLEVBQ0gsR0FBd0Is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
|
package/dist/runtime.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export declare const DefaultApiConfig: Config.Config<{
|
|
|
7
7
|
apiUrl: string;
|
|
8
8
|
headers: import("effect/Option").Option<import("effect/HashMap").HashMap<string, string>>;
|
|
9
9
|
}>;
|
|
10
|
-
export declare function makeApiLayers(config: ApiConfig): Layer.Layer<HttpClient.HttpClient.Default
|
|
10
|
+
export declare function makeApiLayers(config: ApiConfig): Layer.Layer<ApiConfig | HttpClient.HttpClient.Default, never, never>;
|
|
11
11
|
export declare function makeAppRuntime<R, E, A>(layer: Layer<A, E, R>): Effect.Effect<{
|
|
12
12
|
runtime: Runtime.Runtime<A> & {
|
|
13
13
|
runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: {
|
|
@@ -23,30 +23,30 @@ export declare function makeAppRuntime<R, E, A>(layer: Layer<A, E, R>): Effect.E
|
|
|
23
23
|
clean: Effect.Effect<void, never, never>;
|
|
24
24
|
}, E, R>;
|
|
25
25
|
export declare function initializeSync<E, A>(layer: Layer<A | ApiConfig | HttpClient.HttpClient.Default, E, never>): {
|
|
26
|
-
runtime: Runtime.Runtime<HttpClient.HttpClient.Default |
|
|
27
|
-
runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
26
|
+
runtime: Runtime.Runtime<ApiConfig | HttpClient.HttpClient.Default | A> & {
|
|
27
|
+
runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>, options?: {
|
|
28
28
|
readonly signal?: AbortSignal;
|
|
29
29
|
} | undefined) => Promise<A_1>;
|
|
30
|
-
runPromiseExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
30
|
+
runPromiseExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>, options?: {
|
|
31
31
|
readonly signal?: AbortSignal;
|
|
32
32
|
} | undefined) => Promise<Exit.Exit<A_1, E_1>>;
|
|
33
|
-
runSync: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
34
|
-
runSyncExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
35
|
-
runFork: <A_1, E_1>(self: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
33
|
+
runSync: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>) => A_1;
|
|
34
|
+
runSyncExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>) => Exit.Exit<A_1, E_1>;
|
|
35
|
+
runFork: <A_1, E_1>(self: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>, options?: Runtime.RunForkOptions) => import("effect/Fiber").RuntimeFiber<A_1, E_1>;
|
|
36
36
|
};
|
|
37
37
|
clean: () => void;
|
|
38
38
|
};
|
|
39
39
|
export declare function initializeAsync<E, A>(layer: Layer<A | ApiConfig | HttpClient.HttpClient.Default, E, never>): Promise<{
|
|
40
|
-
runtime: Runtime.Runtime<HttpClient.HttpClient.Default |
|
|
41
|
-
runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
40
|
+
runtime: Runtime.Runtime<ApiConfig | HttpClient.HttpClient.Default | A> & {
|
|
41
|
+
runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>, options?: {
|
|
42
42
|
readonly signal?: AbortSignal;
|
|
43
43
|
} | undefined) => Promise<A_1>;
|
|
44
|
-
runPromiseExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
44
|
+
runPromiseExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>, options?: {
|
|
45
45
|
readonly signal?: AbortSignal;
|
|
46
46
|
} | undefined) => Promise<Exit.Exit<A_1, E_1>>;
|
|
47
|
-
runSync: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
48
|
-
runSyncExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
49
|
-
runFork: <A_1, E_1>(self: Effect.Effect<A_1, E_1, HttpClient.HttpClient.Default |
|
|
47
|
+
runSync: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>) => A_1;
|
|
48
|
+
runSyncExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>) => Exit.Exit<A_1, E_1>;
|
|
49
|
+
runFork: <A_1, E_1>(self: Effect.Effect<A_1, E_1, ApiConfig | HttpClient.HttpClient.Default | A>, options?: Runtime.RunForkOptions) => import("effect/Fiber").RuntimeFiber<A_1, E_1>;
|
|
50
50
|
};
|
|
51
51
|
clean: () => Promise<void>;
|
|
52
52
|
}>;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/vue",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.10.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
|
|
@@ -8,10 +8,10 @@
|
|
|
8
8
|
"@formatjs/intl": "^2.10.4",
|
|
9
9
|
"@tanstack/vue-query": "^5.54.2",
|
|
10
10
|
"query-string": "^9.1.0",
|
|
11
|
+
"@effect-app/vue": "1.10.0",
|
|
12
|
+
"@effect-app/schema": "1.8.0",
|
|
11
13
|
"@effect-app/core": "1.7.1",
|
|
12
|
-
"
|
|
13
|
-
"effect-app": "1.10.2",
|
|
14
|
-
"@effect-app/vue": "1.9.5"
|
|
14
|
+
"effect-app": "1.11.0"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
17
|
"@effect/platform": "^0.63.3",
|
package/src/query.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
3
3
|
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
5
|
+
import { isHttpRequestError, isHttpResponseError } from "@effect-app/core/http/http-client"
|
|
5
6
|
import * as Result from "@effect-rx/rx/Result"
|
|
6
7
|
import type {
|
|
7
8
|
QueryKey,
|
|
@@ -12,7 +13,7 @@ import type {
|
|
|
12
13
|
} from "@tanstack/vue-query"
|
|
13
14
|
import { useQuery } from "@tanstack/vue-query"
|
|
14
15
|
import { Cause, Effect, Option, Runtime, S } from "effect-app"
|
|
15
|
-
import { type ApiConfig, type FetchResponse,
|
|
16
|
+
import { type ApiConfig, type FetchResponse, ServiceUnavailableError } from "effect-app/client"
|
|
16
17
|
import type { HttpClient } from "effect-app/http"
|
|
17
18
|
import { computed, ref } from "vue"
|
|
18
19
|
import type { ComputedRef, WatchSource } from "vue"
|
|
@@ -142,12 +143,12 @@ export const useSafeQuery_ = <I, A, E>(
|
|
|
142
143
|
if (Runtime.isFiberFailure(error)) {
|
|
143
144
|
const cause = error[Runtime.FiberFailureCauseId]
|
|
144
145
|
const sq = Cause.squash(cause)
|
|
145
|
-
if (
|
|
146
|
+
if (!isHttpRequestError(sq) && !isHttpResponseError(sq) && !S.is(ServiceUnavailableError)(sq)) {
|
|
146
147
|
return false
|
|
147
148
|
}
|
|
148
149
|
}
|
|
149
150
|
|
|
150
|
-
return retryCount <
|
|
151
|
+
return retryCount < 5
|
|
151
152
|
},
|
|
152
153
|
queryKey,
|
|
153
154
|
queryFn: ({ signal }) =>
|
|
@@ -164,12 +165,12 @@ export const useSafeQuery_ = <I, A, E>(
|
|
|
164
165
|
if (Runtime.isFiberFailure(error)) {
|
|
165
166
|
const cause = error[Runtime.FiberFailureCauseId]
|
|
166
167
|
const sq = Cause.squash(cause)
|
|
167
|
-
if (
|
|
168
|
+
if (!isHttpRequestError(sq) && !isHttpResponseError(sq) && !S.is(ServiceUnavailableError)(sq)) {
|
|
168
169
|
return false
|
|
169
170
|
}
|
|
170
171
|
}
|
|
171
172
|
|
|
172
|
-
return retryCount <
|
|
173
|
+
return retryCount < 5
|
|
173
174
|
},
|
|
174
175
|
queryKey: [...queryKey, req],
|
|
175
176
|
queryFn: ({ signal }) =>
|