@effect-app/vue 4.0.0-beta.177 → 4.0.0-beta.179
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 +36 -0
- package/dist/makeClient.d.ts +13 -3
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +69 -28
- package/dist/mutate.d.ts +28 -2
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +98 -7
- package/examples/streamMutation.ts +83 -0
- package/package.json +2 -2
- package/src/makeClient.ts +87 -2
- package/src/mutate.ts +151 -7
- package/test/dist/streamFinal.test.d.ts.map +1 -0
- package/test/dist/stubs.d.ts +362 -39
- package/test/dist/stubs.d.ts.map +1 -1
- package/test/dist/stubs.js +31 -2
- package/test/makeClient.test.ts +24 -0
- package/test/streamFinal.test.ts +110 -0
- package/test/stubs.ts +30 -1
- package/tsconfig.examples.json +20 -0
- package/tsconfig.json.bak +3 -0
package/dist/mutate.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { matchQuery } from "@tanstack/query-core";
|
|
3
3
|
import { useQueryClient } from "@tanstack/vue-query";
|
|
4
|
-
import { Effect, Option } from "effect-app";
|
|
4
|
+
import { Effect, Exit, Option } from "effect-app";
|
|
5
5
|
import { InvalidationKeysFromServer, makeInvalidationKeysService, makeQueryKey } from "effect-app/client";
|
|
6
6
|
import { tuple } from "effect-app/Function";
|
|
7
7
|
import * as Ref from "effect/Ref";
|
|
8
|
+
import * as Stream from "effect/Stream";
|
|
8
9
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
|
|
9
10
|
import { computed, shallowRef } from "vue";
|
|
10
11
|
export const getQueryKey = (h) => {
|
|
@@ -63,12 +64,44 @@ export const asResult = (handler) => {
|
|
|
63
64
|
.pipe(Effect.andThen(Effect.suspend(() => handler(...args).pipe(Effect.exit, Effect.tap((exit) => Effect.sync(() => (state.value = AsyncResult.fromExit(exit))))))));
|
|
64
65
|
return tuple(computed(() => state.value), act);
|
|
65
66
|
};
|
|
66
|
-
|
|
67
|
-
|
|
67
|
+
/**
|
|
68
|
+
* Like `asResult`, but for streams. The ref is updated with each emitted value
|
|
69
|
+
* (keeping `waiting: true`) and is finalised (with `waiting: false`) once the
|
|
70
|
+
* stream terminates successfully. Errors are surfaced as `AsyncResult.failure`.
|
|
71
|
+
*/
|
|
72
|
+
export const asStreamResult = (handler) => {
|
|
73
|
+
const state = shallowRef(AsyncResult.initial());
|
|
74
|
+
const runStream = (stream) => Effect
|
|
75
|
+
.sync(() => {
|
|
76
|
+
state.value = AsyncResult.initial(true);
|
|
77
|
+
})
|
|
78
|
+
.pipe(Effect.andThen(stream.pipe(Stream.runForEach((value) => Effect.sync(() => {
|
|
79
|
+
state.value = AsyncResult.success(value, { waiting: true });
|
|
80
|
+
})), Effect.exit, Effect.flatMap((exit) => Effect.sync(() => {
|
|
81
|
+
if (exit._tag === "Success") {
|
|
82
|
+
const current = state.value;
|
|
83
|
+
if (AsyncResult.isSuccess(current)) {
|
|
84
|
+
state.value = AsyncResult.success(current.value, { waiting: false });
|
|
85
|
+
}
|
|
86
|
+
else {
|
|
87
|
+
state.value = AsyncResult.initial(false);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
else {
|
|
91
|
+
state.value = AsyncResult.failure(exit.cause);
|
|
92
|
+
}
|
|
93
|
+
})))));
|
|
94
|
+
const act = Stream.isStream(handler)
|
|
95
|
+
? runStream(handler)
|
|
96
|
+
: (...args) => runStream(handler(...args));
|
|
97
|
+
return tuple(computed(() => state.value), act);
|
|
98
|
+
};
|
|
99
|
+
const buildInvalidateCache = (queryClient, self, queryInvalidation) => {
|
|
100
|
+
const invalidateQueriesFn = (filters, options) => Effect.currentSpan.pipe(Effect.orElseSucceed(() => null), Effect.flatMap((span) => Effect.promise(() => queryClient.invalidateQueries(filters, { ...options, updateMeta: { span } }))));
|
|
68
101
|
const getClientInvalidationTargets = (input, output) => {
|
|
69
102
|
const queryKey = getQueryKey(self);
|
|
70
|
-
if (
|
|
71
|
-
return
|
|
103
|
+
if (queryInvalidation) {
|
|
104
|
+
return queryInvalidation(queryKey, self.id, input, output).map((_) => ({
|
|
72
105
|
filters: _.filters,
|
|
73
106
|
options: _.options
|
|
74
107
|
}));
|
|
@@ -99,7 +132,7 @@ export const invalidateQueries = (queryClient, self, options) => {
|
|
|
99
132
|
}
|
|
100
133
|
}
|
|
101
134
|
return Effect
|
|
102
|
-
.andThen(Effect.annotateCurrentSpan({ clientTargets, serverKeys }), Effect.forEach(groups.values(), ({ options, refetchType, targets }) =>
|
|
135
|
+
.andThen(Effect.annotateCurrentSpan({ clientTargets, serverKeys }), Effect.forEach(groups.values(), ({ options, refetchType, targets }) => invalidateQueriesFn({
|
|
103
136
|
...(refetchType !== undefined ? { refetchType } : {}),
|
|
104
137
|
predicate: (query) => targets.some((t) => t.filters ? matchQuery(t.filters, query) : true)
|
|
105
138
|
}, options), { discard: true, concurrency: "inherit" }))
|
|
@@ -108,6 +141,10 @@ export const invalidateQueries = (queryClient, self, options) => {
|
|
|
108
141
|
// TODO: should we do this in general on any mutation, regardless of invalidation?
|
|
109
142
|
Effect.sleep(0)), Effect.withSpan("client.query.invalidation", {}, { captureStackTrace: false }));
|
|
110
143
|
});
|
|
144
|
+
return invalidateCache;
|
|
145
|
+
};
|
|
146
|
+
export const invalidateQueries = (queryClient, self, options) => {
|
|
147
|
+
const invalidateCache = buildInvalidateCache(queryClient, self, options?.queryInvalidation);
|
|
111
148
|
const select = options?.select;
|
|
112
149
|
const handle = (eff, input) => Effect.gen(function* () {
|
|
113
150
|
const keysRef = yield* Ref.make([]);
|
|
@@ -148,4 +185,58 @@ export const useMakeMutation = () => {
|
|
|
148
185
|
};
|
|
149
186
|
return useMutation;
|
|
150
187
|
};
|
|
151
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mutate.js","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAyE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC3H,OAAO,EAAc,MAAM,EAAa,MAAM,EAAE,MAAM,YAAY,CAAA;AAClE,OAAO,EAAwB,0BAA0B,EAAE,2BAA2B,EAAE,YAAY,EAAY,MAAM,mBAAmB,CAAA;AAEzI,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,OAAO,KAAK,GAAG,MAAM,YAAY,CAAA;AACjC,OAAO,KAAK,WAAW,MAAM,wCAAwC,CAAA;AACrE,OAAO,EAAE,QAAQ,EAAoB,UAAU,EAAE,MAAM,KAAK,CAAA;AAE5D,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAA6C,EAAE,EAAE;IAC3E,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;IAC3B,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/C,6FAA6F;IAC7F,oFAAoF;IACpF,MAAM,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IACjF,IAAI,CAAC,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,CAAC,CAAC,EAAE,CAAC,CAAA;IACvD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA;AAED,MAAM,UAAU,mBAAmB,CACjC,cAA6C;IAE7C,QAAQ,cAAc,CAAC,IAAI,EAAE,CAAC;QAC5B,KAAK,SAAS,EAAE,CAAC;YACf,OAAO,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;QAC/E,CAAC;QACD,KAAK,SAAS,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,cAAc,CAAC,KAAK;gBAC1B,KAAK,EAAE,SAAS;aACjB,CAAA;QACH,CAAC;QACD,KAAK,SAAS,EAAE,CAAC;YACf,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,cAAc,CAAC,KAAK;aAC5B,CAAA;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAQD,MAAM,UAAU,IAAI,CAAU,IAA4B;IACxD,MAAM,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,EAAmC,CAAC,CAAA;IAEjF,MAAM,OAAO,GAAG,MAAM;SACnB,IAAI,CAAC,GAAG,EAAE;QACT,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAClD,CAAC,CAAC;SACD,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EACpB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,EAChC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAC3D,CAAA;IAEH,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAE5F,OAAO,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;AAC9C,CAAC;AA6BD,MAAM,CAAC,MAAM,QAAQ,GAOjB,CACF,OAA6E,EAC7E,EAAE;IACF,MAAM,KAAK,GAAG,UAAU,CAAgC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAA;IAE9E,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;QAClC,CAAC,CAAC,MAAM;aACL,IAAI,CAAC,GAAG,EAAE;YACT,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACzC,CAAC,CAAC;aACD,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CACjC,OAAO,CAAC,IAAI,CACV,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CACpF,CACF,CAAC,CACH;QACH,CAAC,CAAC,CAAC,GAAG,IAAU,EAAE,EAAE,CAClB,MAAM;aACH,IAAI,CAAC,GAAG,EAAE;YACT,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QACzC,CAAC,CAAC;aACD,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CACjC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CACnB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CACpF,CACF,CAAC,CACH,CAAA;IAEP,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,CAAQ,CAAA;AACvD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,WAAwB,EACxB,IAAgD,EAChD,OAA6B,EAC7B,EAAE;IAMF,MAAM,iBAAiB,GAAG,CACxB,OAAgC,EAChC,OAA2B,EAC3B,EAAE,CACF,MAAM,CAAC,WAAW,CAAC,IAAI,CACrB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAChC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CACtB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CACnG,CACF,CAAA;IAEH,MAAM,4BAA4B,GAAG,CACnC,KAAc,EACd,MAAmC,EACA,EAAE;QACrC,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAElC,IAAI,OAAO,EAAE,iBAAiB,EAAE,CAAC;YAC/B,OAAO,OAAO,CAAC,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC7E,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,OAAO,EAAE,CAAC,CAAC,OAAO;aACnB,CAAC,CAAC,CAAA;QACL,CAAC;QAED,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,EAAE,CAAA;QACX,CAAC;QAED,OAAO,CAAC,EAAE,OAAO,EAAE,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;IACxD,CAAC,CAAA;IAED,MAAM,eAAe,GAAG,CACtB,KAAc,EACd,MAAmC,EACnC,UAA0C,EAC1C,EAAE,CACF,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QAClB,MAAM,aAAa,GAAG,4BAA4B,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QACjE,MAAM,aAAa,GAAsC,UAAU,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACrF,OAAO,EAAE,EAAE,QAAQ,EAAE;YACrB,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC,CAAA;QACH,MAAM,UAAU,GAAsC,CAAC,GAAG,aAAa,EAAE,GAAG,aAAa,CAAC,CAAA;QAE1F,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,MAAM,CAAC,IAAI,CAAA;QAS1C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAA;QACvC,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;YAChC,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,WAAW,IAAI,EAAE,IAAI,MAAM,CAAC,OAAO,EAAE,aAAa,IAAI,EAAE,IACrF,MAAM,CAAC,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAC9C,EAAE,CAAA;YACF,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChC,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAC/B,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;YAC3G,CAAC;QACH,CAAC;QAED,OAAO,MAAM;aACV,OAAO,CACN,MAAM,CAAC,mBAAmB,CAAC,EAAE,aAAa,EAAE,UAAU,EAAE,CAAC,EACzD,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,MAAM,EAAE,EACf,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,EAAE,CACpC,iBAAiB,CACf;YACE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SAC3F,EACD,OAAO,CACR,EACH,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,CAC1C,CACF;aACA,IAAI,CACH,MAAM,CAAC,GAAG;QACR,0EAA0E;QAC1E,kFAAkF;QAClF,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAChB,EACD,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAC/E,CAAA;IACL,CAAC,CAAC,CAAA;IAEJ,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,CAAA;IAE9B,MAAM,MAAM,GAAG,CAAU,GAA2B,EAAE,KAAe,EAAE,EAAE,CACvE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAAiC,EAAE,CAAC,CAAA;QACnE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,IAAI,CAC5B,MAAM,CAAC,cAAc,CAAC,0BAA0B,EAAE,2BAA2B,CAAC,OAAO,CAAC,CAAC,EACvF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YAClB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC1C,KAAK,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;QACjD,CAAC,CAAC,CACH,CACF,CAAA;QACD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;gBAC1C,KAAK,CAAC,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;YACjD,CAAC,CAAC,CACH,CACF,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC,CAAC,CAAA;IAEJ,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAiBD,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,WAAW,GAeb,CACF,IAA6F,EAC7F,EAAE;QACF,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,CAAC,OAA6B,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC;YAC3F,CAAC,CAAC,CAAC,CAAI,EAAE,OAA6B,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEzG,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAQ,CAAA;IACjD,CAAC,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAED,4BAA4B;AAC5B,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IAEpC,MAAM,WAAW,GAeb,CACF,IAA6F,EAC7F,EAAE;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YAChC,CAAC,CAAC,CAAC,OAA6B,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC;YAC3F,CAAC,CAAC,CAAC,CAAI,EAAE,OAA6B,EAAE,EAAE,CAAC,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEzG,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAQ,CAAA;IACjD,CAAC,CAAA;IACD,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA"}
|
|
188
|
+
/**
|
|
189
|
+
* Like `makeMutation`, but for stream-type request handlers.
|
|
190
|
+
* Returns a `[ref, execute]` tuple where `ref` is a reactive `AsyncResult` updated per
|
|
191
|
+
* stream element. Queries are invalidated once when the stream finishes, regardless of
|
|
192
|
+
* success or failure.
|
|
193
|
+
*
|
|
194
|
+
* When the request declares a `final` schema, `execute` resolves with the last emitted value
|
|
195
|
+
* typed as `Final`; otherwise it resolves with `void`.
|
|
196
|
+
*
|
|
197
|
+
* Must be called inside a Vue setup context (uses `useQueryClient` internally).
|
|
198
|
+
*/
|
|
199
|
+
export const makeStreamMutation = () => {
|
|
200
|
+
const queryClient = useQueryClient();
|
|
201
|
+
return (self, mergedInvalidation) => {
|
|
202
|
+
const state = shallowRef(AsyncResult.initial());
|
|
203
|
+
const runStream = (stream, input) => {
|
|
204
|
+
const invCache = buildInvalidateCache(queryClient, self, mergedInvalidation);
|
|
205
|
+
return Effect
|
|
206
|
+
.sync(() => {
|
|
207
|
+
state.value = AsyncResult.initial(true);
|
|
208
|
+
})
|
|
209
|
+
.pipe(Effect.andThen(stream.pipe(Stream.runForEach((value) => Effect.sync(() => {
|
|
210
|
+
state.value = AsyncResult.success(value, { waiting: true });
|
|
211
|
+
})), Effect.exit, Effect.tap((exit) => Effect.sync(() => {
|
|
212
|
+
if (exit._tag === "Success") {
|
|
213
|
+
const current = state.value;
|
|
214
|
+
if (AsyncResult.isSuccess(current)) {
|
|
215
|
+
state.value = AsyncResult.success(current.value, { waiting: false });
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
state.value = AsyncResult.initial(false);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
else {
|
|
222
|
+
state.value = AsyncResult.failure(exit.cause);
|
|
223
|
+
}
|
|
224
|
+
})), Effect.flatMap((exit) => {
|
|
225
|
+
const current = state.value;
|
|
226
|
+
const lastValue = AsyncResult.isSuccess(current) ? current.value : undefined;
|
|
227
|
+
const invExit = exit._tag === "Success" ? Exit.succeed(lastValue) : exit;
|
|
228
|
+
// Note: when the stream fails, `lastValue` is undefined. The failure is
|
|
229
|
+
// communicated via the reactive `state` ref (AsyncResult.failure). The
|
|
230
|
+
// execute effect always resolves successfully; callers should inspect the
|
|
231
|
+
// ref to distinguish success from failure.
|
|
232
|
+
return invCache(input, invExit, []).pipe(Effect.as(lastValue));
|
|
233
|
+
}))));
|
|
234
|
+
};
|
|
235
|
+
const handler = self.handler;
|
|
236
|
+
const act = Stream.isStream(handler)
|
|
237
|
+
? runStream(handler)
|
|
238
|
+
: (i) => runStream(handler(i), i);
|
|
239
|
+
return tuple(computed(() => state.value), act);
|
|
240
|
+
};
|
|
241
|
+
};
|
|
242
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mutate.js","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Example: stream-based mutation for a long-running operation.
|
|
3
|
+
*
|
|
4
|
+
* The server streams a tagged union of progress updates and a final result.
|
|
5
|
+
* The Vue ref is updated for every emitted value; `AsyncResult` stays in the
|
|
6
|
+
* `waiting` state until the stream ends.
|
|
7
|
+
*
|
|
8
|
+
* When using `makeClient` / `clientFor`, stream-type requests are exposed as
|
|
9
|
+
* `mutateStream` on the client object (and as `XxxStream` in `.helpers`).
|
|
10
|
+
* The example below shows both the low-level `asStreamResult` API and how the
|
|
11
|
+
* same functionality appears on the generated client.
|
|
12
|
+
*/
|
|
13
|
+
import { Effect, S, Stream } from "effect-app"
|
|
14
|
+
import { asStreamResult } from "../src/mutate.js"
|
|
15
|
+
|
|
16
|
+
// ---------------------------------------------------------------------------
|
|
17
|
+
// Domain model
|
|
18
|
+
// ---------------------------------------------------------------------------
|
|
19
|
+
|
|
20
|
+
/** Intermediate progress report, e.g. "5 of 400 items processed". */
|
|
21
|
+
export class OperationProgress extends S.TaggedClass<OperationProgress>()("OperationProgress", {
|
|
22
|
+
completed: S.NonNegativeInt,
|
|
23
|
+
total: S.NonNegativeInt
|
|
24
|
+
}) {}
|
|
25
|
+
|
|
26
|
+
/** The final result produced once the operation is complete. */
|
|
27
|
+
export class ExportComplete extends S.TaggedClass<ExportComplete>()("ExportComplete", {
|
|
28
|
+
fileUrl: S.NonEmptyString
|
|
29
|
+
}) {}
|
|
30
|
+
|
|
31
|
+
/** Tagged union emitted by the stream. */
|
|
32
|
+
export type ExportEvent = OperationProgress | ExportComplete
|
|
33
|
+
|
|
34
|
+
// ---------------------------------------------------------------------------
|
|
35
|
+
// Simulated stream (replace with a real RPC / SSE stream in production)
|
|
36
|
+
// ---------------------------------------------------------------------------
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Produces `total` progress updates followed by a single `ExportComplete`.
|
|
40
|
+
* Each step is separated by a 50 ms delay to simulate real async work.
|
|
41
|
+
*/
|
|
42
|
+
const makeExportStream = (total: S.NonNegativeInt): Stream.Stream<ExportEvent> =>
|
|
43
|
+
Stream.concat(
|
|
44
|
+
Stream.range(1, total).pipe(
|
|
45
|
+
Stream.map((completed) => new OperationProgress({ completed: S.NonNegativeInt(completed), total })),
|
|
46
|
+
Stream.tap(() => Effect.sleep("50 millis"))
|
|
47
|
+
),
|
|
48
|
+
Stream.make(new ExportComplete({ fileUrl: S.NonEmptyString("https://example.com/export.csv") }))
|
|
49
|
+
)
|
|
50
|
+
|
|
51
|
+
// ---------------------------------------------------------------------------
|
|
52
|
+
// Option A: low-level `asStreamResult` (call inside a `setup()` function)
|
|
53
|
+
// ---------------------------------------------------------------------------
|
|
54
|
+
|
|
55
|
+
export const useExportMutation = () => {
|
|
56
|
+
/**
|
|
57
|
+
* `result` - reactive ref, always reflects the latest stream event.
|
|
58
|
+
* `AsyncResult` tag:
|
|
59
|
+
* - Initial (waiting=true) - operation in progress
|
|
60
|
+
* - Success (waiting=true) - progress update received, still running
|
|
61
|
+
* - Success (waiting=false) - final result, operation complete
|
|
62
|
+
* - Failure - operation failed
|
|
63
|
+
*
|
|
64
|
+
* `execute` - call with the desired `total` to kick off the stream.
|
|
65
|
+
*/
|
|
66
|
+
const [result, execute] = asStreamResult((total: S.NonNegativeInt) => makeExportStream(total))
|
|
67
|
+
|
|
68
|
+
return { result, execute }
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
// ---------------------------------------------------------------------------
|
|
72
|
+
// Option B: via `makeClient` / `clientFor` (stream requests -> `mutateStream`)
|
|
73
|
+
//
|
|
74
|
+
// When a request schema has `type: "stream"`, `clientFor` exposes:
|
|
75
|
+
//
|
|
76
|
+
// client.exportData.mutateStream
|
|
77
|
+
// // -> [ComputedRef<AsyncResult<ExportEvent, E>>, (input: I) => Effect<void, never, R>]
|
|
78
|
+
//
|
|
79
|
+
// which is equivalent to calling `asStreamResult(client.exportData.handler)`.
|
|
80
|
+
//
|
|
81
|
+
// The `.helpers` object also includes `exportDataStream` (the camelCase key
|
|
82
|
+
// plus "Stream" suffix) with the same [ref, execute] tuple.
|
|
83
|
+
// ---------------------------------------------------------------------------
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/vue",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.179",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"@vueuse/core": "^14.2.1",
|
|
12
12
|
"change-case": "^5.4.4",
|
|
13
13
|
"query-string": "^9.3.1",
|
|
14
|
-
"effect-app": "4.0.0-beta.
|
|
14
|
+
"effect-app": "4.0.0-beta.179"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
17
|
"@effect/atom-vue": "^4.0.0-beta.59",
|
package/src/makeClient.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { type InvalidateOptions, type InvalidateQueryFilters, isCancelledError,
|
|
|
3
3
|
import { camelCase } from "change-case"
|
|
4
4
|
import { type Context, Effect, Exit, Hash, type Layer, type ManagedRuntime, S, Struct } from "effect-app"
|
|
5
5
|
import { type ApiClientFactory, type Req } from "effect-app/client"
|
|
6
|
-
import type { ExtractModuleName, RequestHandler, RequestHandlers, RequestHandlerWithInput, RequestInputFromMake, RequestsAny } from "effect-app/client/clientFor"
|
|
6
|
+
import type { ExtractModuleName, RequestHandler, RequestHandlers, RequestHandlerWithInput, RequestInputFromMake, RequestsAny, RequestStreamHandler, RequestStreamHandlerWithInput } from "effect-app/client/clientFor"
|
|
7
7
|
import type { InvalidationCallback } from "effect-app/client/makeClient"
|
|
8
8
|
import type * as ExitResult from "effect/Exit"
|
|
9
9
|
import { type Fiber } from "effect/Fiber"
|
|
@@ -12,7 +12,7 @@ import { type ComputedRef, onBeforeUnmount, ref, type WatchSource } from "vue"
|
|
|
12
12
|
import { type Commander, CommanderStatic } from "./commander.js"
|
|
13
13
|
import { type I18n } from "./intl.js"
|
|
14
14
|
import { type CommanderResolved, makeUseCommand } from "./makeUseCommand.js"
|
|
15
|
-
import { makeMutation, type MutationOptionsBase, useMakeMutation } from "./mutate.js"
|
|
15
|
+
import { makeMutation, makeStreamMutation, type MutationOptionsBase, useMakeMutation } from "./mutate.js"
|
|
16
16
|
import { type CustomUndefinedInitialQueryOptions, makeQuery } from "./query.js"
|
|
17
17
|
import { makeRunPromise } from "./runtime.js"
|
|
18
18
|
import { type Toast } from "./toast.js"
|
|
@@ -125,6 +125,13 @@ type CommandHandler<Req> = Req extends
|
|
|
125
125
|
? Request["type"] extends "command" ? RequestHandler<A, E, R, Request, Id> : never
|
|
126
126
|
: never
|
|
127
127
|
|
|
128
|
+
type StreamHandler<Req> = Req extends
|
|
129
|
+
RequestStreamHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id, infer Final>
|
|
130
|
+
? Request["type"] extends "stream" ? RequestStreamHandlerWithInput<I, A, E, R, Request, Id, Final> : never
|
|
131
|
+
: Req extends RequestStreamHandler<infer A, infer E, infer R, infer Request, infer Id, infer Final>
|
|
132
|
+
? Request["type"] extends "stream" ? RequestStreamHandler<A, E, R, Request, Id, Final> : never
|
|
133
|
+
: never
|
|
134
|
+
|
|
128
135
|
export interface MutationExtensions<RT, Id extends string, I, A, E, R> {
|
|
129
136
|
/** Defines a Command based on this mutation, taking the `id` of the mutation as the `id` of the Command.
|
|
130
137
|
* The Mutation function will be taken as the first member of the Command, the Command required input will be the Mutation input.
|
|
@@ -217,6 +224,19 @@ export type MutationWithExtensions<RT, Req> = Req extends
|
|
|
217
224
|
? MutationExt<RT, Id, A, E, R, S.Codec.Encoded<Request["success"]>>
|
|
218
225
|
: never
|
|
219
226
|
|
|
227
|
+
/**
|
|
228
|
+
* The `mutateStream` tuple for a stream-type request handler:
|
|
229
|
+
* `[resultRef, execute]` where `execute` updates the ref live with each emitted value.
|
|
230
|
+
* When the request declares a `final` schema, `execute` resolves with the last emitted value
|
|
231
|
+
* typed as `Final`; otherwise it resolves with `void`.
|
|
232
|
+
*/
|
|
233
|
+
export type StreamMutationWithExtensions<Req> = Req extends
|
|
234
|
+
RequestStreamHandlerWithInput<infer I, infer A, infer E, infer R, infer _Request, infer _Id, infer Final>
|
|
235
|
+
? readonly [ComputedRef<AsyncResult.AsyncResult<A, E>>, (input: I) => Effect.Effect<Final, never, R>]
|
|
236
|
+
: Req extends RequestStreamHandler<infer A, infer E, infer R, infer _Request, infer _Id, infer Final>
|
|
237
|
+
? readonly [ComputedRef<AsyncResult.AsyncResult<A, E>>, Effect.Effect<Final, never, R>]
|
|
238
|
+
: never
|
|
239
|
+
|
|
220
240
|
// we don't really care about the RT, as we are in charge of ensuring runtime safety anyway
|
|
221
241
|
// eslint-disable-next-line unused-imports/no-unused-vars
|
|
222
242
|
declare const useQuery_: QueryImpl<any>["useQuery"]
|
|
@@ -571,6 +591,9 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
571
591
|
let m: ReturnType<typeof useMutationInt>
|
|
572
592
|
const useMutation = () => m ??= useMutationInt()
|
|
573
593
|
|
|
594
|
+
let sm: ReturnType<typeof makeStreamMutation>
|
|
595
|
+
const useStreamMutation = () => sm ??= makeStreamMutation()
|
|
596
|
+
|
|
574
597
|
const query = new QueryImpl(getBaseRt)
|
|
575
598
|
const useQuery = query.useQuery
|
|
576
599
|
const useSuspenseQuery = query.useSuspenseQuery
|
|
@@ -739,6 +762,43 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
739
762
|
return mutations
|
|
740
763
|
}
|
|
741
764
|
|
|
765
|
+
const mapStreamMutation = <M extends RequestsAny>(
|
|
766
|
+
client: ClientFrom<M>,
|
|
767
|
+
queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>,
|
|
768
|
+
invalidationResources?: InvalidationResourcesFor<M>
|
|
769
|
+
) => {
|
|
770
|
+
const streamMutation = useStreamMutation()
|
|
771
|
+
const invalidation = queryInvalidation?.(client)
|
|
772
|
+
const queryResources = makeQueryResources(invalidationResources)
|
|
773
|
+
const streams = Struct.keys(client).reduce(
|
|
774
|
+
(acc, key) => {
|
|
775
|
+
if (client[key].Request.type !== "stream") {
|
|
776
|
+
return acc
|
|
777
|
+
}
|
|
778
|
+
const fromRequestConfig = client[key].Request.config?.["invalidatesQueries"] as
|
|
779
|
+
| InvalidationCallback<InvalidationResourcesFor<M>>
|
|
780
|
+
| undefined
|
|
781
|
+
const fromRequest = fromRequestConfig
|
|
782
|
+
? ((defaultKey: string[], _name: string, input?: unknown, output?: unknown) =>
|
|
783
|
+
fromRequestConfig(defaultKey, queryResources as never, input as never, output as never).map((entry) => ({
|
|
784
|
+
filters: entry.filters,
|
|
785
|
+
options: entry.options
|
|
786
|
+
})))
|
|
787
|
+
: undefined
|
|
788
|
+
const mergedInvalidation = mergeInvalidation(fromRequest, invalidation?.[key])
|
|
789
|
+
;(acc as any)[camelCase(key) + "Stream"] = streamMutation(client[key] as any, mergedInvalidation)
|
|
790
|
+
return acc
|
|
791
|
+
},
|
|
792
|
+
{} as {
|
|
793
|
+
[
|
|
794
|
+
Key in keyof typeof client as StreamHandler<typeof client[Key]> extends never ? never
|
|
795
|
+
: `${ToCamel<string & Key>}Stream`
|
|
796
|
+
]: StreamMutationWithExtensions<StreamHandler<typeof client[Key]>>
|
|
797
|
+
}
|
|
798
|
+
)
|
|
799
|
+
return streams
|
|
800
|
+
}
|
|
801
|
+
|
|
742
802
|
// make available .query, .suspense and .mutate for each operation
|
|
743
803
|
// and a .helpers with all mutations and queries
|
|
744
804
|
const mapClient = <M extends RequestsAny>(
|
|
@@ -750,6 +810,7 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
750
810
|
) => {
|
|
751
811
|
const Command = useCommand()
|
|
752
812
|
const mutation = useMutation()
|
|
813
|
+
const streamMutation = useStreamMutation()
|
|
753
814
|
const invalidation = queryInvalidation?.(client)
|
|
754
815
|
const queryResources = makeQueryResources(invalidationResources)
|
|
755
816
|
const extended = Struct.keys(client).reduce(
|
|
@@ -786,6 +847,27 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
786
847
|
}
|
|
787
848
|
}
|
|
788
849
|
}
|
|
850
|
+
: requestType === "stream"
|
|
851
|
+
? (() => {
|
|
852
|
+
const fromRequestConfig = client[key].Request.config?.["invalidatesQueries"] as
|
|
853
|
+
| InvalidationCallback<InvalidationResourcesFor<M>>
|
|
854
|
+
| undefined
|
|
855
|
+
const fromRequest = fromRequestConfig
|
|
856
|
+
? ((defaultKey: string[], _name: string, input?: unknown, output?: unknown) =>
|
|
857
|
+
fromRequestConfig(defaultKey, queryResources as never, input as never, output as never).map((
|
|
858
|
+
entry
|
|
859
|
+
) => ({
|
|
860
|
+
filters: entry.filters,
|
|
861
|
+
options: entry.options
|
|
862
|
+
})))
|
|
863
|
+
: undefined
|
|
864
|
+
const mergedInvalidation = mergeInvalidation(fromRequest, invalidation?.[key])
|
|
865
|
+
return {
|
|
866
|
+
...client[key],
|
|
867
|
+
request: h_,
|
|
868
|
+
mutateStream: streamMutation(client[key] as any, mergedInvalidation)
|
|
869
|
+
}
|
|
870
|
+
})()
|
|
789
871
|
: {
|
|
790
872
|
mutate: ((handler: any) => {
|
|
791
873
|
const fromRequestConfig = client[key].Request.config?.["invalidatesQueries"] as
|
|
@@ -844,6 +926,8 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
844
926
|
: CommandRequestWithExtensions<RT | RTHooks, CommandHandler<typeof client[Key]>>)
|
|
845
927
|
& (CommandHandler<typeof client[Key]> extends never ? {}
|
|
846
928
|
: { mutate: MutationWithExtensions<RT | RTHooks, CommandHandler<typeof client[Key]>> })
|
|
929
|
+
& (StreamHandler<typeof client[Key]> extends never ? {}
|
|
930
|
+
: { mutateStream: StreamMutationWithExtensions<StreamHandler<typeof client[Key]>> })
|
|
847
931
|
& { Input: typeof client[Key] extends RequestHandlerWithInput<infer I, any, any, any, any, any> ? I : never }
|
|
848
932
|
}
|
|
849
933
|
)
|
|
@@ -851,6 +935,7 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
851
935
|
helpers: {
|
|
852
936
|
...mapRequest(client),
|
|
853
937
|
...mapMutation(client, queryInvalidation, invalidationResources),
|
|
938
|
+
...mapStreamMutation(client, queryInvalidation, invalidationResources),
|
|
854
939
|
...mapQuery(client)
|
|
855
940
|
}
|
|
856
941
|
})
|
package/src/mutate.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { matchQuery } from "@tanstack/query-core"
|
|
3
3
|
import { type InvalidateOptions, type InvalidateQueryFilters, type QueryClient, useQueryClient } from "@tanstack/vue-query"
|
|
4
|
-
import { type Cause, Effect,
|
|
4
|
+
import { type Cause, Effect, Exit, Option } from "effect-app"
|
|
5
5
|
import { type InvalidationKey, InvalidationKeysFromServer, makeInvalidationKeysService, makeQueryKey, type Req } from "effect-app/client"
|
|
6
6
|
import type { ClientForOptions, RequestHandler, RequestHandlerWithInput } from "effect-app/client/clientFor"
|
|
7
7
|
import { tuple } from "effect-app/Function"
|
|
8
8
|
import * as Ref from "effect/Ref"
|
|
9
|
+
import * as Stream from "effect/Stream"
|
|
9
10
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
10
11
|
import { computed, type ComputedRef, shallowRef } from "vue"
|
|
11
12
|
|
|
@@ -137,17 +138,73 @@ export const asResult: {
|
|
|
137
138
|
return tuple(computed(() => state.value), act) as any
|
|
138
139
|
}
|
|
139
140
|
|
|
140
|
-
|
|
141
|
+
/**
|
|
142
|
+
* Like `asResult`, but for streams. The ref is updated with each emitted value
|
|
143
|
+
* (keeping `waiting: true`) and is finalised (with `waiting: false`) once the
|
|
144
|
+
* stream terminates successfully. Errors are surfaced as `AsyncResult.failure`.
|
|
145
|
+
*/
|
|
146
|
+
export const asStreamResult: {
|
|
147
|
+
<A, E, R>(
|
|
148
|
+
handler: Stream.Stream<A, E, R>
|
|
149
|
+
): readonly [ComputedRef<AsyncResult.AsyncResult<A, E>>, Effect.Effect<void, never, R>]
|
|
150
|
+
<Args extends readonly any[], A, E, R>(
|
|
151
|
+
handler: (...args: Args) => Stream.Stream<A, E, R>
|
|
152
|
+
): readonly [ComputedRef<AsyncResult.AsyncResult<A, E>>, (...args: Args) => Effect.Effect<void, never, R>]
|
|
153
|
+
} = <Args extends readonly any[], A, E, R>(
|
|
154
|
+
handler: Stream.Stream<A, E, R> | ((...args: Args) => Stream.Stream<A, E, R>)
|
|
155
|
+
) => {
|
|
156
|
+
const state = shallowRef<AsyncResult.AsyncResult<A, E>>(AsyncResult.initial())
|
|
157
|
+
|
|
158
|
+
const runStream = (stream: Stream.Stream<A, E, R>): Effect.Effect<void, never, R> =>
|
|
159
|
+
Effect
|
|
160
|
+
.sync(() => {
|
|
161
|
+
state.value = AsyncResult.initial(true)
|
|
162
|
+
})
|
|
163
|
+
.pipe(
|
|
164
|
+
Effect.andThen(
|
|
165
|
+
stream.pipe(
|
|
166
|
+
Stream.runForEach((value) =>
|
|
167
|
+
Effect.sync(() => {
|
|
168
|
+
state.value = AsyncResult.success(value, { waiting: true })
|
|
169
|
+
})
|
|
170
|
+
),
|
|
171
|
+
Effect.exit,
|
|
172
|
+
Effect.flatMap((exit) =>
|
|
173
|
+
Effect.sync(() => {
|
|
174
|
+
if (exit._tag === "Success") {
|
|
175
|
+
const current = state.value
|
|
176
|
+
if (AsyncResult.isSuccess(current)) {
|
|
177
|
+
state.value = AsyncResult.success(current.value, { waiting: false })
|
|
178
|
+
} else {
|
|
179
|
+
state.value = AsyncResult.initial(false)
|
|
180
|
+
}
|
|
181
|
+
} else {
|
|
182
|
+
state.value = AsyncResult.failure(exit.cause)
|
|
183
|
+
}
|
|
184
|
+
})
|
|
185
|
+
)
|
|
186
|
+
)
|
|
187
|
+
)
|
|
188
|
+
)
|
|
189
|
+
|
|
190
|
+
const act = Stream.isStream(handler)
|
|
191
|
+
? runStream(handler)
|
|
192
|
+
: (...args: Args) => runStream(handler(...args))
|
|
193
|
+
|
|
194
|
+
return tuple(computed(() => state.value), act) as any
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
const buildInvalidateCache = (
|
|
141
198
|
queryClient: QueryClient,
|
|
142
199
|
self: { id: string; options?: ClientForOptions },
|
|
143
|
-
|
|
200
|
+
queryInvalidation?: MutationOptionsBase["queryInvalidation"]
|
|
144
201
|
) => {
|
|
145
202
|
type InvalidationTarget = {
|
|
146
203
|
readonly filters: InvalidateQueryFilters | undefined
|
|
147
204
|
readonly options: InvalidateOptions | undefined
|
|
148
205
|
}
|
|
149
206
|
|
|
150
|
-
const
|
|
207
|
+
const invalidateQueriesFn = (
|
|
151
208
|
filters?: InvalidateQueryFilters,
|
|
152
209
|
options?: InvalidateOptions
|
|
153
210
|
) =>
|
|
@@ -164,8 +221,8 @@ export const invalidateQueries = (
|
|
|
164
221
|
): ReadonlyArray<InvalidationTarget> => {
|
|
165
222
|
const queryKey = getQueryKey(self)
|
|
166
223
|
|
|
167
|
-
if (
|
|
168
|
-
return
|
|
224
|
+
if (queryInvalidation) {
|
|
225
|
+
return queryInvalidation(queryKey, self.id, input, output).map((_) => ({
|
|
169
226
|
filters: _.filters,
|
|
170
227
|
options: _.options
|
|
171
228
|
}))
|
|
@@ -219,7 +276,7 @@ export const invalidateQueries = (
|
|
|
219
276
|
Effect.forEach(
|
|
220
277
|
groups.values(),
|
|
221
278
|
({ options, refetchType, targets }) =>
|
|
222
|
-
|
|
279
|
+
invalidateQueriesFn(
|
|
223
280
|
{
|
|
224
281
|
...(refetchType !== undefined ? { refetchType } : {}),
|
|
225
282
|
predicate: (query) => targets.some((t) => t.filters ? matchQuery(t.filters, query) : true)
|
|
@@ -239,6 +296,16 @@ export const invalidateQueries = (
|
|
|
239
296
|
)
|
|
240
297
|
})
|
|
241
298
|
|
|
299
|
+
return invalidateCache
|
|
300
|
+
}
|
|
301
|
+
|
|
302
|
+
export const invalidateQueries = (
|
|
303
|
+
queryClient: QueryClient,
|
|
304
|
+
self: { id: string; options?: ClientForOptions },
|
|
305
|
+
options?: MutationOptionsBase
|
|
306
|
+
) => {
|
|
307
|
+
const invalidateCache = buildInvalidateCache(queryClient, self, options?.queryInvalidation)
|
|
308
|
+
|
|
242
309
|
const select = options?.select
|
|
243
310
|
|
|
244
311
|
const handle = <A, E, R>(eff: Effect.Effect<A, E, R>, input?: unknown) =>
|
|
@@ -345,3 +412,80 @@ export const useMakeMutation = () => {
|
|
|
345
412
|
}
|
|
346
413
|
return useMutation
|
|
347
414
|
}
|
|
415
|
+
|
|
416
|
+
/**
|
|
417
|
+
* Like `makeMutation`, but for stream-type request handlers.
|
|
418
|
+
* Returns a `[ref, execute]` tuple where `ref` is a reactive `AsyncResult` updated per
|
|
419
|
+
* stream element. Queries are invalidated once when the stream finishes, regardless of
|
|
420
|
+
* success or failure.
|
|
421
|
+
*
|
|
422
|
+
* When the request declares a `final` schema, `execute` resolves with the last emitted value
|
|
423
|
+
* typed as `Final`; otherwise it resolves with `void`.
|
|
424
|
+
*
|
|
425
|
+
* Must be called inside a Vue setup context (uses `useQueryClient` internally).
|
|
426
|
+
*/
|
|
427
|
+
export const makeStreamMutation = () => {
|
|
428
|
+
const queryClient = useQueryClient()
|
|
429
|
+
|
|
430
|
+
return (
|
|
431
|
+
self: {
|
|
432
|
+
id: string
|
|
433
|
+
options?: ClientForOptions
|
|
434
|
+
handler: Stream.Stream<any, any, any> | ((i: any) => Stream.Stream<any, any, any>)
|
|
435
|
+
},
|
|
436
|
+
mergedInvalidation?: MutationOptionsBase["queryInvalidation"]
|
|
437
|
+
) => {
|
|
438
|
+
const state = shallowRef<AsyncResult.AsyncResult<any, any>>(AsyncResult.initial())
|
|
439
|
+
|
|
440
|
+
const runStream = (stream: Stream.Stream<any, any, any>, input?: unknown): Effect.Effect<any, never, any> => {
|
|
441
|
+
const invCache = buildInvalidateCache(queryClient, self, mergedInvalidation)
|
|
442
|
+
return Effect
|
|
443
|
+
.sync(() => {
|
|
444
|
+
state.value = AsyncResult.initial(true)
|
|
445
|
+
})
|
|
446
|
+
.pipe(
|
|
447
|
+
Effect.andThen(
|
|
448
|
+
stream.pipe(
|
|
449
|
+
Stream.runForEach((value) =>
|
|
450
|
+
Effect.sync(() => {
|
|
451
|
+
state.value = AsyncResult.success(value, { waiting: true })
|
|
452
|
+
})
|
|
453
|
+
),
|
|
454
|
+
Effect.exit,
|
|
455
|
+
Effect.tap((exit) =>
|
|
456
|
+
Effect.sync(() => {
|
|
457
|
+
if (exit._tag === "Success") {
|
|
458
|
+
const current = state.value
|
|
459
|
+
if (AsyncResult.isSuccess(current)) {
|
|
460
|
+
state.value = AsyncResult.success(current.value, { waiting: false })
|
|
461
|
+
} else {
|
|
462
|
+
state.value = AsyncResult.initial(false)
|
|
463
|
+
}
|
|
464
|
+
} else {
|
|
465
|
+
state.value = AsyncResult.failure(exit.cause)
|
|
466
|
+
}
|
|
467
|
+
})
|
|
468
|
+
),
|
|
469
|
+
Effect.flatMap((exit) => {
|
|
470
|
+
const current = state.value
|
|
471
|
+
const lastValue = AsyncResult.isSuccess(current) ? current.value : undefined
|
|
472
|
+
const invExit = exit._tag === "Success" ? Exit.succeed(lastValue) : exit
|
|
473
|
+
// Note: when the stream fails, `lastValue` is undefined. The failure is
|
|
474
|
+
// communicated via the reactive `state` ref (AsyncResult.failure). The
|
|
475
|
+
// execute effect always resolves successfully; callers should inspect the
|
|
476
|
+
// ref to distinguish success from failure.
|
|
477
|
+
return invCache(input, invExit, []).pipe(Effect.as(lastValue))
|
|
478
|
+
})
|
|
479
|
+
)
|
|
480
|
+
)
|
|
481
|
+
)
|
|
482
|
+
}
|
|
483
|
+
|
|
484
|
+
const handler = self.handler
|
|
485
|
+
const act = Stream.isStream(handler)
|
|
486
|
+
? runStream(handler)
|
|
487
|
+
: (i: any) => runStream((handler as (i: any) => Stream.Stream<any, any, any>)(i), i)
|
|
488
|
+
|
|
489
|
+
return tuple(computed(() => state.value), act)
|
|
490
|
+
}
|
|
491
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"streamFinal.test.d.ts","sourceRoot":"","sources":["../streamFinal.test.ts"],"names":[],"mappings":""}
|