@effect-app/vue 2.56.4 → 2.58.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 +12 -0
- package/dist/makeClient.d.ts +16 -8
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +33 -17
- package/dist/mutate.d.ts +13 -10
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +4 -9
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +7 -7
- package/package.json +1 -1
- package/src/makeClient.ts +53 -31
- package/src/mutate.ts +32 -30
- package/src/query.ts +6 -6
package/CHANGELOG.md
CHANGED
package/dist/makeClient.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { type ComputedRef, type Ref, type WatchSource } from "vue";
|
|
|
9
9
|
import { Commander } from "./experimental/commander.js";
|
|
10
10
|
import { I18n } from "./experimental/intl.js";
|
|
11
11
|
import { Toast } from "./experimental/toast.js";
|
|
12
|
-
import { type MutationOptions, type Res } from "./mutate.js";
|
|
12
|
+
import { type MutationOptions, type MutationOptionsBase, type Res } from "./mutate.js";
|
|
13
13
|
import { type KnownFiberFailure, type QueryObserverOptionsCustom } from "./query.js";
|
|
14
14
|
/**
|
|
15
15
|
* Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
|
|
@@ -49,11 +49,16 @@ type ActResp<A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
|
|
|
49
49
|
WithAction<Effect.Effect<Exit.Exit<A, E>, never, R>>
|
|
50
50
|
];
|
|
51
51
|
export declare const suppressToast: import("effect/Function").LazyArg<Effect.Effect<undefined, never, never>>;
|
|
52
|
-
declare const
|
|
53
|
-
<I, E, A, R, Request extends TaggedRequestClassAny
|
|
54
|
-
<E, A, R, Request extends TaggedRequestClassAny
|
|
52
|
+
declare const _useMutation: {
|
|
53
|
+
<I, E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandlerWithInput<I, A, E, R, Request>, options?: MutationOptionsBase): (i: I) => Effect.Effect<A, E, R>;
|
|
54
|
+
<E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandler<A, E, R, Request>, options?: MutationOptionsBase): Effect.Effect<A, E, R>;
|
|
55
55
|
};
|
|
56
|
-
|
|
56
|
+
/**
|
|
57
|
+
* Pass an Effect or a function that returns an Effect, e.g from a client action
|
|
58
|
+
* Executes query cache invalidation based on default rules or provided option.
|
|
59
|
+
* adds a span with the mutation name
|
|
60
|
+
*/
|
|
61
|
+
export declare const useMutation: typeof _useMutation;
|
|
57
62
|
declare const LegacyMutation_base: Effect.Service.Class<LegacyMutation, "LegacyMutation", {
|
|
58
63
|
readonly effect: Effect.Effect<(<R>(runtime: Runtime.Runtime<R>) => {
|
|
59
64
|
/** @deprecated use Command.fn */
|
|
@@ -86,7 +91,10 @@ declare const LegacyMutation_base: Effect.Service.Class<LegacyMutation, "LegacyM
|
|
|
86
91
|
<I, E_5 extends ResponseErrors, A_10, R_11, Request_10 extends TaggedRequestClassAny, A2_10 = A_10, E2_10 extends ResponseErrors = E_5, R2_10 = R_11, ESuccess_8 = never, RSuccess_8 = never, EError_8 = never, RError_8 = never, EDefect_8 = never, RDefect_8 = never>(self: RequestHandlerWithInput<I, A_10, E_5, R_11, Request_10>, action: string, options?: Opts<A_10, E_5, R_11, I, A2_10, E2_10, R2_10, ESuccess_8, RSuccess_8, EError_8, RError_8, EDefect_8, RDefect_8>): Resp<I, A2_10, E2_10, R2_10>;
|
|
87
92
|
<E_6 extends ResponseErrors, A_11, Request_11 extends TaggedRequestClassAny, A2_11 = A_11, E2_11 extends ResponseErrors = E_6, R2_11 = R, ESuccess_9 = never, RSuccess_9 = never, EError_9 = never, RError_9 = never, EDefect_9 = never, RDefect_9 = never>(self: RequestHandler<A_11, E_6, R, Request_11>, action: string, options?: Opts<A_11, E_6, R, void, A2_11, E2_11, R2_11, ESuccess_9, RSuccess_9, EError_9, RError_9, EDefect_9, RDefect_9>): ActResp<A2_11, E2_11, R2_11>;
|
|
88
93
|
};
|
|
89
|
-
/**
|
|
94
|
+
/**
|
|
95
|
+
* handles errors as toasts and reports defects
|
|
96
|
+
* @deprecated use Command.fn
|
|
97
|
+
*/
|
|
90
98
|
useHandleRequestWithToast: () => <A_12, E_6 extends ResponseErrors, R_12, I = void, A2_12 = A_12, E2_12 extends ResponseErrors = E_6, R2_12 = R_12, ESuccess_10 = never, RSuccess_10 = never, EError_10 = never, RError_10 = never, EDefect_10 = never, RDefect_10 = never>(f: Effect.Effect<Exit.Exit<A2_12, E2_12>, never, R2_12> | ((i: I) => Effect.Effect<Exit.Exit<A2_12, E2_12>, never, R2_12>), name: string, action: string, options?: Opts<A_12, E_6, R_12, I, A2_12, E2_12, R2_12, ESuccess_10, RSuccess_10, EError_10, RError_10, EDefect_10, RDefect_10>) => (Effect.Effect<Exit.Exit<A2_12, E2_12>, ESuccess_10 | EError_10 | EDefect_10, Exclude<R2_12, import("effect/Tracer").ParentSpan> | Exclude<RSuccess_10, import("effect/Tracer").ParentSpan> | Exclude<RError_10, import("effect/Tracer").ParentSpan> | Exclude<RDefect_10, import("effect/Tracer").ParentSpan>> | ((i: any) => Effect.Effect<Exit.Exit<A2_12, E2_12>, ESuccess_10 | EError_10 | EDefect_10, Exclude<R2_12, import("effect/Tracer").ParentSpan> | Exclude<RSuccess_10, import("effect/Tracer").ParentSpan> | Exclude<RError_10, import("effect/Tracer").ParentSpan> | Exclude<RDefect_10, import("effect/Tracer").ParentSpan>>)) & {
|
|
91
99
|
action: string;
|
|
92
100
|
};
|
|
@@ -181,7 +189,7 @@ export declare const makeClient: <RT, RE, RL>(baseMrt: ManagedRuntime.ManagedRun
|
|
|
181
189
|
<I_1, E_7, A_12, R_12, Request_12 extends TaggedRequestClassAny, A2_13 = A_12, E2_13 = E_7, R2_13 = R_12>(self: RequestHandlerWithInput<I_1, A_12, E_7, R_12, Request_12>, options?: MutationOptions<A_12, E_7, R_12, A2_13, E2_13, R2_13, I_1> | undefined): readonly [ComputedRef<Result.Result<A2_13, E2_13>>, (i: I_1) => Effect.Effect<Exit.Exit<A2_13, E2_13>, never, R2_13>];
|
|
182
190
|
<E_8, A_13, R_13, Request_13 extends TaggedRequestClassAny, A2_14 = A_13, E2_14 = E_8, R2_14 = R_13>(self: RequestHandler<A_13, E_8, R_13, Request_13>, options?: MutationOptions<A_13, E_8, R_13, A2_14, E2_14, R2_14, void> | undefined): readonly [ComputedRef<Result.Result<A2_14, E2_14>>, Effect.Effect<Exit.Exit<A2_14, E2_14>, never, R2_14>];
|
|
183
191
|
};
|
|
184
|
-
|
|
192
|
+
useQuery: {
|
|
185
193
|
<E_8, A_14, Request_14 extends TaggedRequestClassAny>(self: RequestHandler<A_14, E_8, RT, Request_14>, options: QueryObserverOptionsCustom<A_14, KnownFiberFailure<E_8>, A_14, A_14, readonly unknown[]> & {
|
|
186
194
|
initialData: A_14 | InitialDataFunction<A_14>;
|
|
187
195
|
}): readonly [ComputedRef<Result.Result<A_14, E_8>>, ComputedRef<A_14>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_14, KnownFiberFailure<E_8>>, never, never>, UseQueryReturnType<any, any>];
|
|
@@ -191,7 +199,7 @@ export declare const makeClient: <RT, RE, RL>(baseMrt: ManagedRuntime.ManagedRun
|
|
|
191
199
|
<E_9, A_16, Request_16 extends TaggedRequestClassAny>(self: RequestHandler<A_16, E_9, RT, Request_16>, options?: QueryObserverOptionsCustom<A_16, KnownFiberFailure<E_9>, A_16, A_16, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_16, E_9>>, ComputedRef<A_16 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_16, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
|
|
192
200
|
<Arg, E_9, A_17, Request_17 extends TaggedRequestClassAny>(self: RequestHandlerWithInput<Arg, A_17, E_9, RT, Request_17>, arg: Arg | WatchSource<Arg>, options?: QueryObserverOptionsCustom<A_17, KnownFiberFailure<E_9>, A_17, A_17, readonly unknown[]> | undefined): readonly [ComputedRef<Result.Result<A_17, E_9>>, ComputedRef<A_17 | undefined>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_17, KnownFiberFailure<E_9>>, never, never>, UseQueryReturnType<any, any>];
|
|
193
201
|
};
|
|
194
|
-
|
|
202
|
+
useSuspenseQuery: {
|
|
195
203
|
<E_10, A_18, Request_18 extends TaggedRequestClassAny>(self: RequestHandler<A_18, E_10, RT, Request_18>, options?: (QueryObserverOptionsCustom<A_18, E_10, A_18, A_18, readonly unknown[]> & {
|
|
196
204
|
initialData: A_18 | InitialDataFunction<A_18>;
|
|
197
205
|
}) | undefined): Effect.Effect<readonly [ComputedRef<Result.Result<A_18, E_10>>, ComputedRef<A_18>, (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<A_18, KnownFiberFailure<E_10>>, never, never>, UseQueryReturnType<any, any>], never, never>;
|
package/dist/makeClient.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"makeClient.d.ts","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"makeClient.d.ts","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}
|
package/dist/makeClient.js
CHANGED
|
@@ -3,7 +3,7 @@ import * as Result from "@effect-atom/atom/Result";
|
|
|
3
3
|
import { isCancelledError } from "@tanstack/vue-query";
|
|
4
4
|
import { Cause, Effect, Exit, Layer, ManagedRuntime, Match, Option, Runtime, S, Struct } from "effect-app";
|
|
5
5
|
import { ErrorSilenced } from "effect-app/client/errors";
|
|
6
|
-
import { constant, pipe, tuple } from "effect-app/Function";
|
|
6
|
+
import { constant, identity, pipe, tuple } from "effect-app/Function";
|
|
7
7
|
import { OperationSuccess } from "effect-app/Operations";
|
|
8
8
|
import { dropUndefinedT } from "effect-app/utils";
|
|
9
9
|
import { computed, getCurrentInstance, onBeforeUnmount, onUnmounted, ref, shallowRef, watch } from "vue";
|
|
@@ -16,7 +16,7 @@ import { buildFieldInfoFromFieldsRoot } from "./form.js";
|
|
|
16
16
|
import { reportRuntimeError } from "./lib.js";
|
|
17
17
|
import { asResult, makeMutation, mutationResultToVue } from "./mutate.js";
|
|
18
18
|
import { makeQuery } from "./query.js";
|
|
19
|
-
const
|
|
19
|
+
const mapHandler = (handler, map) => Effect.isEffect(handler) ? map(handler, undefined) : (i) => map(handler(i), i);
|
|
20
20
|
/**
|
|
21
21
|
* Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
|
|
22
22
|
*/
|
|
@@ -25,6 +25,7 @@ export class SuppressErrors extends Cause.YieldableError {
|
|
|
25
25
|
[ErrorSilenced] = true;
|
|
26
26
|
}
|
|
27
27
|
export const suppressToast = constant(Effect.succeed(undefined));
|
|
28
|
+
/** handles errors as specified and reports defects */
|
|
28
29
|
function handleRequest(f, name, action, options) {
|
|
29
30
|
const handleEffect = (i) => (self) => self.pipe(Effect.tap(Exit.matchEffect({
|
|
30
31
|
onSuccess: (r) => options.onSuccess(r, i),
|
|
@@ -56,8 +57,13 @@ function handleRequest(f, name, action, options) {
|
|
|
56
57
|
? pipe(f, handleEffect(void 0))
|
|
57
58
|
: (i) => pipe(f(i), handleEffect(i)), { action });
|
|
58
59
|
}
|
|
59
|
-
const
|
|
60
|
-
|
|
60
|
+
const _useMutation = makeMutation();
|
|
61
|
+
/**
|
|
62
|
+
* Pass an Effect or a function that returns an Effect, e.g from a client action
|
|
63
|
+
* Executes query cache invalidation based on default rules or provided option.
|
|
64
|
+
* adds a span with the mutation name
|
|
65
|
+
*/
|
|
66
|
+
export const useMutation = (self, options) => mapHandler(_useMutation(self, options), Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false }));
|
|
61
67
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
62
68
|
export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
63
69
|
effect: Effect.gen(function* () {
|
|
@@ -69,13 +75,15 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
69
75
|
* you should use the result ref to render errors!
|
|
70
76
|
*/
|
|
71
77
|
const _useSafeMutation = (self, options) => {
|
|
72
|
-
const unsafe =
|
|
73
|
-
const
|
|
78
|
+
const unsafe = _useMutation(self, options);
|
|
79
|
+
const mh = options?.mapHandler ?? identity;
|
|
80
|
+
const [a, b] = asResult(mapHandler(mapHandler(unsafe, mh), Effect.tapDefect(reportRuntimeError)));
|
|
74
81
|
return [
|
|
75
82
|
a,
|
|
76
|
-
|
|
83
|
+
mapHandler(b, Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false }))
|
|
77
84
|
];
|
|
78
85
|
};
|
|
86
|
+
/** handles errors as toasts and reports defects */
|
|
79
87
|
const _useHandleRequestWithToast = () => {
|
|
80
88
|
return handleRequestWithToast;
|
|
81
89
|
/**
|
|
@@ -174,12 +182,15 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
174
182
|
const _useAndHandleMutationResult = (self, action, options) => {
|
|
175
183
|
const handleRequestWithToast = _useHandleRequestWithToast();
|
|
176
184
|
const handler = self.handler;
|
|
177
|
-
const
|
|
185
|
+
const unsafe = _useMutation({
|
|
178
186
|
...self,
|
|
179
187
|
handler: Effect.isEffect(handler)
|
|
180
188
|
? pipe(Effect.annotateCurrentSpan({ action }), Effect.zipRight(handler))
|
|
181
189
|
: (...args) => pipe(Effect.annotateCurrentSpan({ action }), Effect.zipRight(handler(...args)))
|
|
182
|
-
}, options ? dropUndefinedT(options) : undefined)
|
|
190
|
+
}, options ? dropUndefinedT(options) : undefined);
|
|
191
|
+
const mh = options?.mapHandler ?? identity;
|
|
192
|
+
// Effect.tapDefect(reportRuntimeError) handled in toast handler,
|
|
193
|
+
const [a, b] = asResult(mapHandler(unsafe, mh));
|
|
183
194
|
return tuple(a, handleRequestWithToast(b, self.name, action, options));
|
|
184
195
|
};
|
|
185
196
|
//
|
|
@@ -210,12 +221,14 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
210
221
|
* Actions for success, error and defect can be provided in the Options.
|
|
211
222
|
*/
|
|
212
223
|
const _useAndHandleMutationCustom = (self, action, options) => {
|
|
213
|
-
const
|
|
224
|
+
const unsafe = _useMutation({
|
|
214
225
|
...self,
|
|
215
226
|
handler: Effect.isEffect(self.handler)
|
|
216
227
|
? pipe(Effect.annotateCurrentSpan({ action }), Effect.andThen(self.handler))
|
|
217
228
|
: (...args) => pipe(Effect.annotateCurrentSpan({ action }), Effect.andThen(self.handler(...args)))
|
|
218
|
-
}, options ? dropUndefinedT(options) : undefined)
|
|
229
|
+
}, options ? dropUndefinedT(options) : undefined);
|
|
230
|
+
const mh = options?.mapHandler ?? identity;
|
|
231
|
+
const [a, b] = asResult(mapHandler(mapHandler(unsafe, mh), Effect.tapDefect(reportRuntimeError)));
|
|
219
232
|
return tuple(computed(() => mutationResultToVue(a.value)), handleRequest(b, self.name, action, {
|
|
220
233
|
onSuccess: suppressToast,
|
|
221
234
|
onDefect: suppressToast,
|
|
@@ -284,7 +297,10 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
284
297
|
useAndHandleMutationCustom: _useAndHandleMutationCustom,
|
|
285
298
|
/** @deprecated use Command.fn */
|
|
286
299
|
makeUseAndHandleMutation: _makeUseAndHandleMutation,
|
|
287
|
-
/**
|
|
300
|
+
/**
|
|
301
|
+
* handles errors as toasts and reports defects
|
|
302
|
+
* @deprecated use Command.fn
|
|
303
|
+
*/
|
|
288
304
|
useHandleRequestWithToast: _useHandleRequestWithToast,
|
|
289
305
|
/** @deprecated use OmegaForm */
|
|
290
306
|
buildFormFromSchema: _buildFormFromSchema,
|
|
@@ -301,9 +317,9 @@ const mkQuery = (runtime) => {
|
|
|
301
317
|
* Effect results are passed to the caller, including errors.
|
|
302
318
|
*/
|
|
303
319
|
// TODO
|
|
304
|
-
const
|
|
305
|
-
function
|
|
306
|
-
const [resultRef, latestRef, fetch, uqrt] =
|
|
320
|
+
const _useQuery = makeQuery(shallowRef(runtime));
|
|
321
|
+
function useSuspenseQuery(self, argOrOptions, options) {
|
|
322
|
+
const [resultRef, latestRef, fetch, uqrt] = _useQuery(self, argOrOptions, { ...options, suspense: true } // experimental_prefetchInRender: true }
|
|
307
323
|
);
|
|
308
324
|
const isMounted = ref(true);
|
|
309
325
|
onBeforeUnmount(() => {
|
|
@@ -339,7 +355,7 @@ const mkQuery = (runtime) => {
|
|
|
339
355
|
return [resultRef, latestRef, fetch, uqrt];
|
|
340
356
|
});
|
|
341
357
|
}
|
|
342
|
-
return {
|
|
358
|
+
return { useQuery: _useQuery, useSuspenseQuery };
|
|
343
359
|
};
|
|
344
360
|
// somehow mrt.runtimeEffect doesnt work sync, but this workaround works fine? not sure why though as the layers are generally only sync
|
|
345
361
|
const managedRuntimeRt = (mrt) => mrt.runSync(Effect.runtime());
|
|
@@ -405,4 +421,4 @@ export const makeClient = (baseMrt, rootLayer) => {
|
|
|
405
421
|
}, {})
|
|
406
422
|
};
|
|
407
423
|
};
|
|
408
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient.js","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}
|
|
424
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient.js","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}
|
package/dist/mutate.d.ts
CHANGED
|
@@ -14,12 +14,7 @@ export interface Res<A, E> {
|
|
|
14
14
|
}
|
|
15
15
|
export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T);
|
|
16
16
|
export declare function make<A, E, R>(self: Effect.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>];
|
|
17
|
-
export interface
|
|
18
|
-
/**
|
|
19
|
-
* Map the handler; cache invalidation is already done in this handler.
|
|
20
|
-
* This is useful for e.g navigating, as you know caches have already updated.
|
|
21
|
-
*/
|
|
22
|
-
mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>;
|
|
17
|
+
export interface MutationOptionsBase {
|
|
23
18
|
/**
|
|
24
19
|
* By default we invalidate one level of the query key, e.g $project/$configuration.get, we invalidate $project.
|
|
25
20
|
* This can be overridden by providing a function that returns an array of filters and options.
|
|
@@ -29,14 +24,22 @@ export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> {
|
|
|
29
24
|
options?: InvalidateOptions | undefined;
|
|
30
25
|
}[];
|
|
31
26
|
}
|
|
27
|
+
/** @deprecated prefer more basic @see MutationOptionsBase and separate useMutation from Command.fn */
|
|
28
|
+
export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> extends MutationOptionsBase {
|
|
29
|
+
/**
|
|
30
|
+
* Map the handler; cache invalidation is already done in this handler.
|
|
31
|
+
* This is useful for e.g navigating, as you know caches have already updated.
|
|
32
|
+
*
|
|
33
|
+
* @deprecated use `Command.fn` instead of `useMutation*` with `mapHandler` option.
|
|
34
|
+
*/
|
|
35
|
+
mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>;
|
|
36
|
+
}
|
|
32
37
|
export declare const asResult: {
|
|
33
38
|
<A, E, R>(handler: Effect.Effect<A, E, R>): readonly [ComputedRef<Result.Result<A, E>>, Effect.Effect<Exit.Exit<A, E>, never, R>];
|
|
34
39
|
<Args extends readonly any[], A, E, R>(handler: (...args: Args) => Effect.Effect<A, E, R>): readonly [ComputedRef<Result.Result<A, E>>, (...args: Args) => Effect.Effect<Exit.Exit<A, E>, never, R>];
|
|
35
40
|
};
|
|
36
41
|
export declare const makeMutation: () => {
|
|
37
|
-
<I, E, A, R, Request extends TaggedRequestClassAny
|
|
38
|
-
<E, A, R, Request extends TaggedRequestClassAny
|
|
42
|
+
<I, E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandlerWithInput<I, A, E, R, Request>, options?: MutationOptionsBase): (i: I) => Effect.Effect<A, E, R>;
|
|
43
|
+
<E, A, R, Request extends TaggedRequestClassAny>(self: RequestHandler<A, E, R, Request>, options?: MutationOptionsBase): Effect.Effect<A, E, R>;
|
|
39
44
|
};
|
|
40
|
-
export interface MakeMutation2 extends ReturnType<typeof makeMutation> {
|
|
41
|
-
}
|
|
42
45
|
//# sourceMappingURL=mutate.d.ts.map
|
package/dist/mutate.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutate.d.ts","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,0BAA0B,CAAA;AAClD,OAAO,EAAE,KAAK,iBAAiB,EAAE,KAAK,sBAAsB,EAAkB,MAAM,qBAAqB,CAAA;AACzG,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,EAAU,MAAM,YAAY,CAAA;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEjH,OAAO,EAAY,KAAK,WAAW,EAAE,KAAK,GAAG,EAAc,MAAM,KAAK,CAAA;AAGtE,eAAO,MAAM,WAAW,GAAI,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,aAQ9C,CAAA;AAED,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACtC,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAClC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAoBX;AAED,MAAM,WAAW,GAAG,CAAC,CAAC,EAAE,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;IACzB,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,SAAS,CAAA;IAC5B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;CAC3C;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;AACtE,wBAAgB,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,mLAiBzD;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"mutate.d.ts","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"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"}
|
package/dist/mutate.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import * as Result from "@effect-atom/atom/Result";
|
|
3
3
|
import { useQueryClient } from "@tanstack/vue-query";
|
|
4
4
|
import { Effect, Option } from "effect-app";
|
|
5
|
-
import {
|
|
5
|
+
import { tuple } from "effect-app/Function";
|
|
6
6
|
import { computed, shallowRef } from "vue";
|
|
7
7
|
import { makeQueryKey } from "./lib.js";
|
|
8
8
|
export const getQueryKey = (h) => {
|
|
@@ -72,10 +72,6 @@ export const asResult = (handler) => {
|
|
|
72
72
|
return tuple(computed(() => state.value), act);
|
|
73
73
|
};
|
|
74
74
|
export const makeMutation = () => {
|
|
75
|
-
/**
|
|
76
|
-
* Pass a function that returns an Effect, e.g from a client action, or an Effect
|
|
77
|
-
* Returns a tuple with state ref and execution function which reports errors as Toast.
|
|
78
|
-
*/
|
|
79
75
|
const useMutation = (self, options) => {
|
|
80
76
|
const queryClient = useQueryClient();
|
|
81
77
|
const invalidateQueries = (filters, options) => Effect.currentSpan.pipe(Effect.orElseSucceed(() => null), Effect.flatMap((span) => Effect.promise(() => queryClient.invalidateQueries(filters, { ...options, updateMeta: { span } }))));
|
|
@@ -96,12 +92,11 @@ export const makeMutation = () => {
|
|
|
96
92
|
.andThen(Effect.annotateCurrentSpan({ queryKey }), invalidateQueries({ queryKey }))
|
|
97
93
|
.pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }));
|
|
98
94
|
});
|
|
99
|
-
const
|
|
100
|
-
const handle = (self, i = void 0) => (mapHandler(Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache }), i));
|
|
95
|
+
const handle = (self) => Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache });
|
|
101
96
|
const handler = self.handler;
|
|
102
|
-
const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i)
|
|
97
|
+
const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i));
|
|
103
98
|
return r;
|
|
104
99
|
};
|
|
105
100
|
return useMutation;
|
|
106
101
|
};
|
|
107
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXV0YXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL211dGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxLQUFLLE1BQU0sTUFBTSwwQkFBMEIsQ0FBQTtBQUNsRCxPQUFPLEVBQXVELGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ3pHLE9BQU8sRUFBYyxNQUFNLEVBQWEsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRWxFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsUUFBUSxFQUE4QixVQUFVLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFDdEUsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUV2QyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBQyxDQUFtQixFQUFFLEVBQUU7SUFDakQsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzNCLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUMvQyw2RkFBNkY7SUFDN0Ysb0ZBQW9GO0lBQ3BGLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQTtJQUNqRixJQUFJLENBQUMsQ0FBQztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3pELE9B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
|
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,0BAA0B,CAAA;AAElD,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,KAAK,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,KAAK,cAAc,
|
|
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,7 @@
|
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
5
5
|
import * as Result from "@effect-atom/atom/Result";
|
|
6
6
|
import { isHttpClientError } from "@effect/platform/HttpClientError";
|
|
7
|
-
import {
|
|
7
|
+
import { useQueryClient } from "@tanstack/vue-query";
|
|
8
8
|
import { Array, Cause, Effect, Option, Runtime, S } from "effect-app";
|
|
9
9
|
import { ServiceUnavailableError } from "effect-app/client/errors";
|
|
10
10
|
import { computed, ref, shallowRef, watch } from "vue";
|
|
@@ -14,7 +14,7 @@ export const makeQuery = (runtime) => {
|
|
|
14
14
|
// declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: QueryClient): UseQueryReturnType<TData, TError>;
|
|
15
15
|
// declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: QueryClient): UseQueryDefinedReturnType<TData, TError>;
|
|
16
16
|
// declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>, queryClient?: QueryClient): UseQueryReturnType<TData, TError>;
|
|
17
|
-
const
|
|
17
|
+
const useQuery_ = (q, arg, options = {} // TODO
|
|
18
18
|
) => {
|
|
19
19
|
const runPromise = Runtime.runPromise(getRuntime(runtime));
|
|
20
20
|
const arr = arg;
|
|
@@ -92,10 +92,10 @@ export const makeQuery = (runtime) => {
|
|
|
92
92
|
}
|
|
93
93
|
return Result.initial(r.isValidating);
|
|
94
94
|
}
|
|
95
|
-
const
|
|
96
|
-
?
|
|
97
|
-
:
|
|
98
|
-
return
|
|
95
|
+
const useQuery = (self, argOrOptions, options) => Effect.isEffect(self.handler)
|
|
96
|
+
? useQuery_(self, undefined, argOrOptions)
|
|
97
|
+
: useQuery_(self, argOrOptions, options);
|
|
98
|
+
return useQuery;
|
|
99
99
|
};
|
|
100
100
|
function orPrevious(result) {
|
|
101
101
|
return Result.isFailure(result) && Option.isSome(result.previousSuccess)
|
|
@@ -142,4 +142,4 @@ export const useUpdateQuery = () => {
|
|
|
142
142
|
};
|
|
143
143
|
return f;
|
|
144
144
|
};
|
|
145
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
145
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/makeClient.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { type InitialDataFunction, isCancelledError, type QueryObserverResult, t
|
|
|
4
4
|
import { Cause, Effect, Exit, Layer, ManagedRuntime, Match, Option, Runtime, S, Struct } from "effect-app"
|
|
5
5
|
import type { RequestHandler, RequestHandlerWithInput, TaggedRequestClassAny } from "effect-app/client/clientFor"
|
|
6
6
|
import { ErrorSilenced, type SupportedErrors } from "effect-app/client/errors"
|
|
7
|
-
import { constant, pipe, tuple } from "effect-app/Function"
|
|
7
|
+
import { constant, identity, pipe, tuple } from "effect-app/Function"
|
|
8
8
|
import { type OperationFailure, OperationSuccess } from "effect-app/Operations"
|
|
9
9
|
import type { Schema } from "effect-app/Schema"
|
|
10
10
|
import { dropUndefinedT } from "effect-app/utils"
|
|
@@ -16,13 +16,13 @@ import { makeUseCommand } from "./experimental/makeUseCommand.js"
|
|
|
16
16
|
import { Toast } from "./experimental/toast.js"
|
|
17
17
|
import { buildFieldInfoFromFieldsRoot } from "./form.js"
|
|
18
18
|
import { reportRuntimeError } from "./lib.js"
|
|
19
|
-
import { asResult, makeMutation, type MutationOptions, mutationResultToVue, type Res } from "./mutate.js"
|
|
19
|
+
import { asResult, makeMutation, type MutationOptions, type MutationOptionsBase, mutationResultToVue, type Res } from "./mutate.js"
|
|
20
20
|
import { type KnownFiberFailure, makeQuery, type QueryObserverOptionsCustom } from "./query.js"
|
|
21
21
|
|
|
22
|
-
const
|
|
22
|
+
const mapHandler = <A, E, R, I = void, A2 = A, E2 = E, R2 = R>(
|
|
23
23
|
handler: Effect.Effect<A, E, R> | ((i: I) => Effect.Effect<A, E, R>),
|
|
24
|
-
map: (self: Effect.Effect<A, E, R
|
|
25
|
-
) => Effect.isEffect(handler) ? map(handler) : (i: I) => map(handler(i))
|
|
24
|
+
map: (self: Effect.Effect<A, E, R>, i: I) => Effect.Effect<A2, E2, R2>
|
|
25
|
+
) => Effect.isEffect(handler) ? map(handler, undefined as any) : (i: I) => map(handler(i), i)
|
|
26
26
|
|
|
27
27
|
/**
|
|
28
28
|
* Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
|
|
@@ -112,6 +112,7 @@ type ActResp<A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
|
|
|
112
112
|
|
|
113
113
|
export const suppressToast = constant(Effect.succeed(undefined))
|
|
114
114
|
|
|
115
|
+
/** handles errors as specified and reports defects */
|
|
115
116
|
function handleRequest<
|
|
116
117
|
E extends ResponseErrors,
|
|
117
118
|
A,
|
|
@@ -184,23 +185,25 @@ function handleRequest<
|
|
|
184
185
|
)
|
|
185
186
|
}
|
|
186
187
|
|
|
187
|
-
const
|
|
188
|
+
const _useMutation = makeMutation()
|
|
188
189
|
|
|
189
|
-
|
|
190
|
+
/**
|
|
191
|
+
* Pass an Effect or a function that returns an Effect, e.g from a client action
|
|
192
|
+
* Executes query cache invalidation based on default rules or provided option.
|
|
193
|
+
* adds a span with the mutation name
|
|
194
|
+
*/
|
|
195
|
+
export const useMutation: typeof _useMutation = <
|
|
190
196
|
I,
|
|
191
197
|
E,
|
|
192
198
|
A,
|
|
193
199
|
R,
|
|
194
|
-
Request extends TaggedRequestClassAny
|
|
195
|
-
A2 = A,
|
|
196
|
-
E2 = E,
|
|
197
|
-
R2 = R
|
|
200
|
+
Request extends TaggedRequestClassAny
|
|
198
201
|
>(
|
|
199
202
|
self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
|
|
200
|
-
options?:
|
|
203
|
+
options?: MutationOptionsBase
|
|
201
204
|
) =>
|
|
202
|
-
|
|
203
|
-
|
|
205
|
+
mapHandler(
|
|
206
|
+
_useMutation(self as any, options),
|
|
204
207
|
Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false })
|
|
205
208
|
) as any
|
|
206
209
|
|
|
@@ -209,6 +212,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
209
212
|
effect: Effect.gen(function*() {
|
|
210
213
|
const intl = yield* I18n
|
|
211
214
|
const toast = yield* Toast
|
|
215
|
+
|
|
212
216
|
return <R>(runtime: Runtime.Runtime<R>) => {
|
|
213
217
|
/**
|
|
214
218
|
* Effect results are converted to Exit, so errors are ignored by default.
|
|
@@ -233,18 +237,22 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
233
237
|
self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
|
|
234
238
|
options?: MutationOptions<A, E, R, A2, E2, R2, I>
|
|
235
239
|
) => {
|
|
236
|
-
const unsafe =
|
|
240
|
+
const unsafe = _useMutation(self as any, options)
|
|
241
|
+
|
|
242
|
+
type MH = NonNullable<NonNullable<typeof options>["mapHandler"]>
|
|
243
|
+
const mh = options?.mapHandler ?? identity as MH
|
|
237
244
|
|
|
238
|
-
const [a, b] = asResult(
|
|
245
|
+
const [a, b] = asResult(mapHandler(mapHandler(unsafe as any, mh), Effect.tapDefect(reportRuntimeError)) as any)
|
|
239
246
|
return [
|
|
240
247
|
a,
|
|
241
|
-
|
|
248
|
+
mapHandler(
|
|
242
249
|
b,
|
|
243
250
|
Effect.withSpan(`mutation ${self.name}`, { captureStackTrace: false })
|
|
244
251
|
)
|
|
245
252
|
] as const as any
|
|
246
253
|
}
|
|
247
254
|
|
|
255
|
+
/** handles errors as toasts and reports defects */
|
|
248
256
|
const _useHandleRequestWithToast = () => {
|
|
249
257
|
return handleRequestWithToast
|
|
250
258
|
/**
|
|
@@ -427,7 +435,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
427
435
|
): any => {
|
|
428
436
|
const handleRequestWithToast = _useHandleRequestWithToast()
|
|
429
437
|
const handler = self.handler
|
|
430
|
-
const
|
|
438
|
+
const unsafe = _useMutation({
|
|
431
439
|
...self,
|
|
432
440
|
handler: Effect.isEffect(handler)
|
|
433
441
|
? (pipe(
|
|
@@ -439,7 +447,13 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
439
447
|
Effect.annotateCurrentSpan({ action }),
|
|
440
448
|
Effect.zipRight(handler(...args))
|
|
441
449
|
)
|
|
442
|
-
}, options ? dropUndefinedT(options) : undefined)
|
|
450
|
+
}, options ? dropUndefinedT(options) : undefined)
|
|
451
|
+
|
|
452
|
+
type MH = NonNullable<NonNullable<typeof options>["mapHandler"]>
|
|
453
|
+
const mh = options?.mapHandler ?? identity as MH
|
|
454
|
+
|
|
455
|
+
// Effect.tapDefect(reportRuntimeError) handled in toast handler,
|
|
456
|
+
const [a, b] = asResult(mapHandler(unsafe, mh) as any)
|
|
443
457
|
|
|
444
458
|
return tuple(
|
|
445
459
|
a,
|
|
@@ -651,7 +665,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
651
665
|
options?: LowOptsOptional<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
|
|
652
666
|
): ActResp<A2, E2, R2>
|
|
653
667
|
} = (self: any, action: string, options: any) => {
|
|
654
|
-
const
|
|
668
|
+
const unsafe = _useMutation({
|
|
655
669
|
...self,
|
|
656
670
|
handler: Effect.isEffect(self.handler)
|
|
657
671
|
? (pipe(
|
|
@@ -663,7 +677,12 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
663
677
|
Effect.annotateCurrentSpan({ action }),
|
|
664
678
|
Effect.andThen(self.handler(...args))
|
|
665
679
|
)
|
|
666
|
-
}, options ? dropUndefinedT(options) : undefined)
|
|
680
|
+
}, options ? dropUndefinedT(options) : undefined)
|
|
681
|
+
|
|
682
|
+
type MH = NonNullable<NonNullable<typeof options>["mapHandler"]>
|
|
683
|
+
const mh = options?.mapHandler ?? identity as MH
|
|
684
|
+
|
|
685
|
+
const [a, b] = asResult(mapHandler(mapHandler(unsafe as any, mh), Effect.tapDefect(reportRuntimeError)) as any)
|
|
667
686
|
|
|
668
687
|
return tuple(
|
|
669
688
|
computed(() => mutationResultToVue(a.value)),
|
|
@@ -783,7 +802,10 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
783
802
|
useAndHandleMutationCustom: _useAndHandleMutationCustom,
|
|
784
803
|
/** @deprecated use Command.fn */
|
|
785
804
|
makeUseAndHandleMutation: _makeUseAndHandleMutation,
|
|
786
|
-
/**
|
|
805
|
+
/**
|
|
806
|
+
* handles errors as toasts and reports defects
|
|
807
|
+
* @deprecated use Command.fn
|
|
808
|
+
*/
|
|
787
809
|
useHandleRequestWithToast: _useHandleRequestWithToast,
|
|
788
810
|
/** @deprecated use OmegaForm */
|
|
789
811
|
buildFormFromSchema: _buildFormFromSchema,
|
|
@@ -800,14 +822,14 @@ const mkQuery = <R>(runtime: Runtime.Runtime<R>) => {
|
|
|
800
822
|
* Effect results are passed to the caller, including errors.
|
|
801
823
|
*/
|
|
802
824
|
// TODO
|
|
803
|
-
const
|
|
825
|
+
const _useQuery = makeQuery(shallowRef(runtime))
|
|
804
826
|
|
|
805
827
|
/**
|
|
806
|
-
* The difference with
|
|
828
|
+
* The difference with useQuery is that this function will return a Promise you can await in the Setup,
|
|
807
829
|
* which ensures that either there always is a latest value, or an error occurs on load.
|
|
808
830
|
* So that Suspense and error boundaries can be used.
|
|
809
831
|
*/
|
|
810
|
-
function
|
|
832
|
+
function useSuspenseQuery<
|
|
811
833
|
E,
|
|
812
834
|
A,
|
|
813
835
|
Request extends TaggedRequestClassAny
|
|
@@ -826,7 +848,7 @@ const mkQuery = <R>(runtime: Runtime.Runtime<R>) => {
|
|
|
826
848
|
UseQueryReturnType<any, any>
|
|
827
849
|
]
|
|
828
850
|
>
|
|
829
|
-
function
|
|
851
|
+
function useSuspenseQuery<
|
|
830
852
|
Arg,
|
|
831
853
|
E,
|
|
832
854
|
A,
|
|
@@ -847,7 +869,7 @@ const mkQuery = <R>(runtime: Runtime.Runtime<R>) => {
|
|
|
847
869
|
UseQueryReturnType<any, any>
|
|
848
870
|
]
|
|
849
871
|
>
|
|
850
|
-
function
|
|
872
|
+
function useSuspenseQuery<
|
|
851
873
|
E,
|
|
852
874
|
A,
|
|
853
875
|
Request extends TaggedRequestClassAny
|
|
@@ -864,7 +886,7 @@ const mkQuery = <R>(runtime: Runtime.Runtime<R>) => {
|
|
|
864
886
|
UseQueryReturnType<any, any>
|
|
865
887
|
]
|
|
866
888
|
>
|
|
867
|
-
function
|
|
889
|
+
function useSuspenseQuery<
|
|
868
890
|
Arg,
|
|
869
891
|
E,
|
|
870
892
|
A,
|
|
@@ -883,12 +905,12 @@ const mkQuery = <R>(runtime: Runtime.Runtime<R>) => {
|
|
|
883
905
|
UseQueryReturnType<any, any>
|
|
884
906
|
]
|
|
885
907
|
>
|
|
886
|
-
function
|
|
908
|
+
function useSuspenseQuery(
|
|
887
909
|
self: any,
|
|
888
910
|
argOrOptions?: any,
|
|
889
911
|
options?: any
|
|
890
912
|
) {
|
|
891
|
-
const [resultRef, latestRef, fetch, uqrt] =
|
|
913
|
+
const [resultRef, latestRef, fetch, uqrt] = _useQuery(
|
|
892
914
|
self,
|
|
893
915
|
argOrOptions,
|
|
894
916
|
{ ...options, suspense: true } // experimental_prefetchInRender: true }
|
|
@@ -936,7 +958,7 @@ const mkQuery = <R>(runtime: Runtime.Runtime<R>) => {
|
|
|
936
958
|
})
|
|
937
959
|
}
|
|
938
960
|
|
|
939
|
-
return {
|
|
961
|
+
return { useQuery: _useQuery, useSuspenseQuery }
|
|
940
962
|
}
|
|
941
963
|
|
|
942
964
|
// somehow mrt.runtimeEffect doesnt work sync, but this workaround works fine? not sure why though as the layers are generally only sync
|
package/src/mutate.ts
CHANGED
|
@@ -3,7 +3,7 @@ import * as Result from "@effect-atom/atom/Result"
|
|
|
3
3
|
import { type InvalidateOptions, type InvalidateQueryFilters, useQueryClient } from "@tanstack/vue-query"
|
|
4
4
|
import { type Cause, Effect, type Exit, Option } from "effect-app"
|
|
5
5
|
import type { RequestHandler, RequestHandlerWithInput, TaggedRequestClassAny } from "effect-app/client/clientFor"
|
|
6
|
-
import {
|
|
6
|
+
import { tuple } from "effect-app/Function"
|
|
7
7
|
import { computed, type ComputedRef, type Ref, shallowRef } from "vue"
|
|
8
8
|
import { makeQueryKey } from "./lib.js"
|
|
9
9
|
|
|
@@ -67,12 +67,7 @@ export function make<A, E, R>(self: Effect.Effect<A, E, R>) {
|
|
|
67
67
|
return tuple(result, latestSuccess, execute)
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
export interface
|
|
71
|
-
/**
|
|
72
|
-
* Map the handler; cache invalidation is already done in this handler.
|
|
73
|
-
* This is useful for e.g navigating, as you know caches have already updated.
|
|
74
|
-
*/
|
|
75
|
-
mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>
|
|
70
|
+
export interface MutationOptionsBase {
|
|
76
71
|
/**
|
|
77
72
|
* By default we invalidate one level of the query key, e.g $project/$configuration.get, we invalidate $project.
|
|
78
73
|
* This can be overridden by providing a function that returns an array of filters and options.
|
|
@@ -83,6 +78,17 @@ export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> {
|
|
|
83
78
|
}[]
|
|
84
79
|
}
|
|
85
80
|
|
|
81
|
+
/** @deprecated prefer more basic @see MutationOptionsBase and separate useMutation from Command.fn */
|
|
82
|
+
export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> extends MutationOptionsBase {
|
|
83
|
+
/**
|
|
84
|
+
* Map the handler; cache invalidation is already done in this handler.
|
|
85
|
+
* This is useful for e.g navigating, as you know caches have already updated.
|
|
86
|
+
*
|
|
87
|
+
* @deprecated use `Command.fn` instead of `useMutation*` with `mapHandler` option.
|
|
88
|
+
*/
|
|
89
|
+
mapHandler?: (handler: Effect.Effect<A, E, R>, input: I) => Effect.Effect<A2, E2, R2>
|
|
90
|
+
}
|
|
91
|
+
|
|
86
92
|
// TODO: more efficient invalidation, including args etc
|
|
87
93
|
// return Effect.promise(() => queryClient.invalidateQueries({
|
|
88
94
|
// predicate: (_) => nses.includes(_.queryKey.filter((_) => _.startsWith("$")).join("/"))
|
|
@@ -137,22 +143,26 @@ export const asResult: {
|
|
|
137
143
|
}
|
|
138
144
|
|
|
139
145
|
export const makeMutation = () => {
|
|
140
|
-
/**
|
|
141
|
-
* Pass a function that returns an Effect, e.g from a client action, or an Effect
|
|
142
|
-
* Returns a tuple with state ref and execution function which reports errors as Toast.
|
|
143
|
-
*/
|
|
144
146
|
const useMutation: {
|
|
145
|
-
|
|
147
|
+
/**
|
|
148
|
+
* Pass a function that returns an Effect, e.g from a client action
|
|
149
|
+
* Executes query cache invalidation based on default rules or provided option.
|
|
150
|
+
*/
|
|
151
|
+
<I, E, A, R, Request extends TaggedRequestClassAny>(
|
|
146
152
|
self: RequestHandlerWithInput<I, A, E, R, Request>,
|
|
147
|
-
options?:
|
|
148
|
-
): (i: I) => Effect.Effect<
|
|
149
|
-
|
|
153
|
+
options?: MutationOptionsBase
|
|
154
|
+
): (i: I) => Effect.Effect<A, E, R>
|
|
155
|
+
/**
|
|
156
|
+
* Pass an Effect, e.g from a client action
|
|
157
|
+
* Executes query cache invalidation based on default rules or provided option.
|
|
158
|
+
*/
|
|
159
|
+
<E, A, R, Request extends TaggedRequestClassAny>(
|
|
150
160
|
self: RequestHandler<A, E, R, Request>,
|
|
151
|
-
options?:
|
|
152
|
-
): Effect.Effect<
|
|
153
|
-
} = <I, E, A, R, Request extends TaggedRequestClassAny
|
|
161
|
+
options?: MutationOptionsBase
|
|
162
|
+
): Effect.Effect<A, E, R>
|
|
163
|
+
} = <I, E, A, R, Request extends TaggedRequestClassAny>(
|
|
154
164
|
self: RequestHandlerWithInput<I, A, E, R, Request> | RequestHandler<A, E, R, Request>,
|
|
155
|
-
options?:
|
|
165
|
+
options?: MutationOptionsBase
|
|
156
166
|
) => {
|
|
157
167
|
const queryClient = useQueryClient()
|
|
158
168
|
|
|
@@ -193,21 +203,13 @@ export const makeMutation = () => {
|
|
|
193
203
|
.pipe(Effect.withSpan("client.query.invalidation", { captureStackTrace: false }))
|
|
194
204
|
})
|
|
195
205
|
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
const handle = (self: Effect.Effect<A, E, R>, i: I | void = void 0) => (mapHandler(
|
|
200
|
-
Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache }),
|
|
201
|
-
i as I
|
|
202
|
-
))
|
|
206
|
+
const handle = (self: Effect.Effect<A, E, R>) =>
|
|
207
|
+
Effect.tapBoth(self, { onFailure: () => invalidateCache, onSuccess: () => invalidateCache })
|
|
203
208
|
|
|
204
209
|
const handler = self.handler
|
|
205
|
-
const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i)
|
|
210
|
+
const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i))
|
|
206
211
|
|
|
207
212
|
return r as any
|
|
208
213
|
}
|
|
209
214
|
return useMutation
|
|
210
215
|
}
|
|
211
|
-
|
|
212
|
-
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
|
|
213
|
-
export interface MakeMutation2 extends ReturnType<typeof makeMutation> {}
|
package/src/query.ts
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
5
5
|
import * as Result from "@effect-atom/atom/Result"
|
|
6
6
|
import { isHttpClientError } from "@effect/platform/HttpClientError"
|
|
7
|
-
import { type Enabled, type InitialDataFunction, type QueryKey, type QueryObserverOptions, type QueryObserverResult, type RefetchOptions,
|
|
7
|
+
import { type Enabled, type InitialDataFunction, type QueryKey, type QueryObserverOptions, type QueryObserverResult, type RefetchOptions, useQueryClient, type UseQueryReturnType } from "@tanstack/vue-query"
|
|
8
8
|
import { Array, Cause, Effect, Option, Runtime, S } from "effect-app"
|
|
9
9
|
import type { RequestHandler, RequestHandlerWithInput, TaggedRequestClassAny } from "effect-app/client/clientFor"
|
|
10
10
|
import { ServiceUnavailableError } from "effect-app/client/errors"
|
|
@@ -33,7 +33,7 @@ export const makeQuery = <R>(runtime: ShallowRef<Runtime.Runtime<R> | undefined>
|
|
|
33
33
|
// declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UndefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: QueryClient): UseQueryReturnType<TData, TError>;
|
|
34
34
|
// declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: DefinedInitialQueryOptions<TQueryFnData, TError, TData, TQueryKey>, queryClient?: QueryClient): UseQueryDefinedReturnType<TData, TError>;
|
|
35
35
|
// declare function useQuery<TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey>(options: UseQueryOptions<TQueryFnData, TError, TData, TQueryFnData, TQueryKey>, queryClient?: QueryClient): UseQueryReturnType<TData, TError>;
|
|
36
|
-
const
|
|
36
|
+
const useQuery_ = <I, A, E, Request extends TaggedRequestClassAny>(
|
|
37
37
|
q:
|
|
38
38
|
| RequestHandlerWithInput<I, A, E, R, Request>
|
|
39
39
|
| RequestHandler<A, E, R, Request>,
|
|
@@ -155,7 +155,7 @@ export const makeQuery = <R>(runtime: ShallowRef<Runtime.Runtime<R> | undefined>
|
|
|
155
155
|
return Result.initial(r.isValidating)
|
|
156
156
|
}
|
|
157
157
|
|
|
158
|
-
const
|
|
158
|
+
const useQuery: {
|
|
159
159
|
// required options, with initialData
|
|
160
160
|
<E, A, Request extends TaggedRequestClassAny>(
|
|
161
161
|
self: RequestHandler<A, E, R, Request>,
|
|
@@ -207,9 +207,9 @@ export const makeQuery = <R>(runtime: ShallowRef<Runtime.Runtime<R> | undefined>
|
|
|
207
207
|
options?: any
|
|
208
208
|
) =>
|
|
209
209
|
Effect.isEffect(self.handler)
|
|
210
|
-
?
|
|
211
|
-
:
|
|
212
|
-
return
|
|
210
|
+
? useQuery_(self, undefined, argOrOptions)
|
|
211
|
+
: useQuery_(self, argOrOptions, options)
|
|
212
|
+
return useQuery
|
|
213
213
|
}
|
|
214
214
|
|
|
215
215
|
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
|