@effect-app/vue 4.0.0-beta.163 → 4.0.0-beta.165
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 +20 -0
- package/dist/lib.d.ts +7 -9
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +3 -7
- package/dist/makeClient.d.ts +21 -4
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +61 -9
- package/dist/mutate.d.ts +3 -3
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +7 -7
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +3 -2
- package/package.json +2 -2
- package/src/lib.ts +7 -13
- package/src/makeClient.ts +122 -11
- package/src/mutate.ts +40 -32
- package/src/query.ts +2 -2
- package/test/dist/stubs.d.ts +1253 -355
- package/test/dist/stubs.d.ts.map +1 -1
- package/test/dist/stubs.js +21 -3
- package/test/makeClient.test.ts +96 -14
- package/test/stubs.ts +25 -2
package/dist/mutate.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { useQueryClient } from "@tanstack/vue-query";
|
|
3
3
|
import { Effect, Option } from "effect-app";
|
|
4
|
+
import { makeQueryKey } from "effect-app/client";
|
|
4
5
|
import { tuple } from "effect-app/Function";
|
|
5
6
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
|
|
6
7
|
import { computed, shallowRef } from "vue";
|
|
7
|
-
import { makeQueryKey } from "./lib.js";
|
|
8
8
|
export const getQueryKey = (h) => {
|
|
9
9
|
const key = makeQueryKey(h);
|
|
10
10
|
const ns = key.filter((_) => _.startsWith("$"));
|
|
@@ -73,10 +73,10 @@ export const asResult = (handler) => {
|
|
|
73
73
|
};
|
|
74
74
|
export const invalidateQueries = (queryClient, self, options) => {
|
|
75
75
|
const invalidateQueries = (filters, options) => Effect.currentSpan.pipe(Effect.orElseSucceed(() => null), Effect.flatMap((span) => Effect.promise(() => queryClient.invalidateQueries(filters, { ...options, updateMeta: { span } }))));
|
|
76
|
-
const invalidateCache = Effect.suspend(() => {
|
|
76
|
+
const invalidateCache = (input, output) => Effect.suspend(() => {
|
|
77
77
|
const queryKey = getQueryKey(self);
|
|
78
78
|
if (options) {
|
|
79
|
-
const opts = options(queryKey, self.id);
|
|
79
|
+
const opts = options(queryKey, self.id, input, output);
|
|
80
80
|
if (!opts.length) {
|
|
81
81
|
return Effect.void;
|
|
82
82
|
}
|
|
@@ -93,7 +93,7 @@ export const invalidateQueries = (queryClient, self, options) => {
|
|
|
93
93
|
// TODO: should we do this in general on any mutation, regardless of invalidation?
|
|
94
94
|
Effect.sleep(0)), Effect.withSpan("client.query.invalidation", {}, { captureStackTrace: false }));
|
|
95
95
|
});
|
|
96
|
-
const handle = (self) => Effect.
|
|
96
|
+
const handle = (self, input) => self.pipe(Effect.onExit((exit) => invalidateCache(input, exit)));
|
|
97
97
|
return handle;
|
|
98
98
|
};
|
|
99
99
|
export const makeMutation = () => {
|
|
@@ -101,7 +101,7 @@ export const makeMutation = () => {
|
|
|
101
101
|
const queryClient = useQueryClient();
|
|
102
102
|
const handle = invalidateQueries(queryClient, self, options?.queryInvalidation);
|
|
103
103
|
const handler = self.handler;
|
|
104
|
-
const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i));
|
|
104
|
+
const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i), i);
|
|
105
105
|
return Object.assign(r, { id: self.id });
|
|
106
106
|
};
|
|
107
107
|
return useMutation;
|
|
@@ -112,9 +112,9 @@ export const useMakeMutation = () => {
|
|
|
112
112
|
const useMutation = (self, options) => {
|
|
113
113
|
const handle = invalidateQueries(queryClient, self, options?.queryInvalidation);
|
|
114
114
|
const handler = self.handler;
|
|
115
|
-
const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i));
|
|
115
|
+
const r = Effect.isEffect(handler) ? handle(handler) : (i) => handle(handler(i), i);
|
|
116
116
|
return Object.assign(r, { id: self.id });
|
|
117
117
|
};
|
|
118
118
|
return useMutation;
|
|
119
119
|
};
|
|
120
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
120
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"mutate.js","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAyE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AAC3H,OAAO,EAAc,MAAM,EAAa,MAAM,EAAE,MAAM,YAAY,CAAA;AAClE,OAAO,EAAE,YAAY,EAAY,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAC3C,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;AAwBD,wDAAwD;AACxD,8DAA8D;AAC9D,2FAA2F;AAC3F,MAAM;AACN;;;;;kBAKkB;AAElB,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,OAAkD,EAClD,EAAE;IACF,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,eAAe,GAAG,CAAC,KAAc,EAAE,MAAmC,EAAE,EAAE,CAC9E,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QAClB,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;QAElC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;YACtD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACjB,OAAO,MAAM,CAAC,IAAI,CAAA;YACpB,CAAC;YACD,OAAO,MAAM;iBACV,OAAO,CACN,MAAM,CAAC,mBAAmB,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAC9C,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CACjG;iBACA,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;QACzF,CAAC;QAED,IAAI,CAAC,QAAQ;YAAE,OAAO,MAAM,CAAC,IAAI,CAAA;QAEjC,OAAO,MAAM;aACV,OAAO,CACN,MAAM,CAAC,mBAAmB,CAAC,EAAE,QAAQ,EAAE,CAAC,EACxC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAChC;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,CAAU,IAA4B,EAAE,KAAe,EAAE,EAAE,CACxE,IAAI,CAAC,IAAI,CACP,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CACrB,eAAe,CACb,KAAK,EACL,IAAI,CACL,CACF,CACF,CAAA;IAEH,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,WAAW,GAiBb,CACF,IAA6F,EAC7F,OAA6B,EAC7B,EAAE;QACF,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;QACpC,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAA;QAC/E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEtF,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,GAiBb,CACF,IAA6F,EAC7F,OAA6B,EAC7B,EAAE;QACF,MAAM,MAAM,GAAG,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAA;QAC/E,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAEtF,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"}
|
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,EAAE,KAAK,YAAY,EAAE,KAAK,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,iBAAiB,EAAE,KAAK,uBAAuB,EAAE,KAAK,QAAQ,EAAE,KAAK,oBAAoB,EAAE,KAAK,mBAAmB,EAAE,KAAK,cAAc,EAAgD,KAAK,yBAAyB,EAAE,KAAK,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACrV,OAAO,EAAgB,KAAK,OAAO,EAAE,MAAM,EAAa,MAAM,YAAY,CAAA;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
package/dist/query.js
CHANGED
|
@@ -4,11 +4,12 @@
|
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
5
5
|
import { useQuery as useTanstackQuery, useQueryClient } from "@tanstack/vue-query";
|
|
6
6
|
import { Array, Cause, Effect, Option, S } from "effect-app";
|
|
7
|
+
import { makeQueryKey } from "effect-app/client";
|
|
7
8
|
import { CauseException, ServiceUnavailableError } from "effect-app/client/errors";
|
|
8
9
|
import { isHttpClientError } from "effect/unstable/http/HttpClientError";
|
|
9
10
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
|
|
10
11
|
import { computed, ref, shallowRef, watch } from "vue";
|
|
11
|
-
import {
|
|
12
|
+
import { reportRuntimeError } from "./lib.js";
|
|
12
13
|
import { makeRunPromise } from "./runtime.js";
|
|
13
14
|
export const makeQuery = (getRuntime) => {
|
|
14
15
|
const useQuery_ = (q) => (arg,
|
|
@@ -155,4 +156,4 @@ export const useUpdateQuery = () => {
|
|
|
155
156
|
};
|
|
156
157
|
return f;
|
|
157
158
|
};
|
|
158
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
159
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,sDAAsD;AACtD,wDAAwD;AACxD,4DAA4D;AAC5D,OAAO,EAA4M,QAAQ,IAAI,gBAAgB,EAAE,cAAc,EAA2D,MAAM,qBAAqB,CAAA;AACrV,OAAO,EAAE,KAAK,EAAE,KAAK,EAAgB,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAC1E,OAAO,EAAE,YAAY,EAAY,MAAM,mBAAmB,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAA;AACxE,OAAO,KAAK,WAAW,MAAM,wCAAwC,CAAA;AACrE,OAAO,EAAE,QAAQ,EAA2C,GAAG,EAAE,UAAU,EAAE,KAAK,EAAoB,MAAM,KAAK,CAAA;AACjH,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AA+D7C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,UAAoC,EAAE,EAAE;IACnE,MAAM,SAAS,GAoCX,CACF,CAE0C,EAC1C,EAAE,CACJ,CACE,GAAmC;IACnC,qGAAqG;IACrG,OAAa;IACb,OAAO;MACP,EAAE;QACF,qFAAqF;QACrF,MAAM,UAAU,GAAG,cAAc,CAAC,UAAU,EAAE,CAAC,CAAA;QAC/C,MAAM,GAAG,GAAG,GAAG,CAAA;QACf,MAAM,GAAG,GAAiB,CAAC,GAAG;YAC5B,CAAC,CAAC,SAAgB;YAClB,CAAC,CAAC,OAAO,GAAG,KAAK,UAAU;gBAC3B,CAAC,CAAC,CAAC;oBACD,IAAI,KAAK;wBACP,OAAQ,GAAW,EAAE,CAAA;oBACvB,CAAC;iBACF,CAAC;gBACF,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACZ,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,CAAA;QAChC,MAAM,cAAc,GAAI,CAAyC,CAAC,sBAAsB,CAAA;QACxF,MAAM,YAAY,GAAG,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,cAAc,CAAC,CAAA;QAC5F,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAA;QAEzB,MAAM,cAAc,GAAG;YACrB,qGAAqG;YACrG,+SAA+S;YAC/S,sLAAsL;YACtL,0GAA0G;YAC1G,uEAAuE;YACvE,mJAAmJ;YACnJ,YAAY,EAAE,KAAK;SACpB,CAAA;QAED,MAAM,CAAC,GAAG,gBAAgB,CACxB,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YACtB,CAAC,CAAC;gBACA,GAAG,cAAc;gBACjB,GAAG,OAAO;gBACV,KAAK,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;oBAC3B,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;wBACpC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;4BACnF,OAAO,KAAK,CAAA;wBACd,CAAC;oBACH,CAAC;oBAED,OAAO,UAAU,GAAG,CAAC,CAAA;gBACvB,CAAC;gBACD,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAC5B,UAAU,CACR,OAAO;qBACJ,IAAI,CACH,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EACtE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAClE,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACxE,EACH,EAAE,MAAM,EAAE,CACX;aACJ;YACD,CAAC,CAAC;gBACA,GAAG,cAAc;gBACjB,GAAG,OAAO;gBACV,KAAK,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;oBAC3B,IAAI,KAAK,YAAY,cAAc,EAAE,CAAC;wBACpC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;4BACnF,OAAO,KAAK,CAAA;wBACd,CAAC;oBACH,CAAC;oBAED,OAAO,UAAU,GAAG,CAAC,CAAA;gBACvB,CAAC;gBACD,QAAQ,EAAE,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,EAAE,cAAc,CAAC;gBAChG,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAC5B,UAAU,CACR,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;qBACf,IAAI,CACH,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,EACtE,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAClE,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CACxE,EACH,EAAE,MAAM,EAAE,CACX;aACJ,CACJ,CAAA;QAED,MAAM,aAAa,GAAG,UAAU,EAAS,CAAA;QACzC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAsC,EAAE,CAC9D,UAAU,CAAC;YACT,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,SAAS;YACjC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,uFAAuF;YAC9J,YAAY,EAAE,CAAC,CAAC,UAAU,CAAC,KAAK;SACjC,CAAC,CACH,CAAA;QACD,6DAA6D;QAC7D,KAAK,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAEpH,OAAO;YACL,MAAM;YACN,QAAQ,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC;YACnC,qGAAqG;YACrG,2FAA2F;YAC3F,+DAA+D;YAC/D,CAAC,OAAwB,EAAE,EAAE,CAC3B,MAAM,CAAC,WAAW,CAAC,IAAI,CACrB,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,EAChC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAChG;YACH,CAAC;SACK,CAAA;IACV,CAAC,CAAA;IAED,SAAS,UAAU,CAAO,CAIzB;QACC,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,WAAW,CAAC,mBAAmB,CACpC,CAAC,CAAC,KAAK,CAAC,aAAa,EACrB;gBACE,QAAQ,EAAE,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACzF,OAAO,EAAE,CAAC,CAAC,YAAY;aACxB,CACF,CAAA;QACH,CAAC;QACD,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,WAAW,CAAC,OAAO,CAAO,CAAC,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC,CAAA;QACvE,CAAC;QAED,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAA;IAC5C,CAAC;IAED,MAAM,QAAQ,GAsFV,CACF,IAAS,EACT,EAAE;QACF,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAEzB,OAAO,CAAC,YAAkB,EAAE,OAAa,EAAE,EAAE,CAC3C,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;YAC3B,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,YAAY,CAAC;YAC5B,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC,CAAA;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAKD,SAAS,UAAU,CAAO,MAAqC;IAC7D,OAAO,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC3E,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QAChF,CAAC,CAAC,MAAM,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,cAAc,CAG5B,OAAU,EACV,uBAAiC;IAWjC,MAAM,MAAM,GAAG,uBAAuB;QACpC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC;QACxC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;IAChD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,KAAK,CAAA;IACd,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACrG,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC,KAAK,CAAA;IACtB,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACtH,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC,KAAK,CAAA;IACtB,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAElD,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9D,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAA;QAC1C,OAAO,IAAI,CAAA;IACb,CAAC,EAAE,EAAS,CAAC,CAAA;IACb,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAA;IAEpC,MAAM,CAAC,GAUH,CAAC,KAAU,EAAE,aAAkB,EAAE,YAAkB,EAAE,EAAE;QACzD,MAAM,OAAO,GAAG,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,aAAa,CAAA;QACzE,MAAM,GAAG,GAAG,YAAY,KAAK,SAAS;YACpC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,EAAE,aAAa,CAAC;YACzC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;QACvB,MAAM,IAAI,GAAG,WAAW,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;QAC1C,IAAI,IAAI,EAAE,CAAC;YACT,WAAW,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QACxC,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,IAAI,CAAC,sBAAsB,GAAG,YAAY,EAAE,GAAG,CAAC,CAAA;QAC1D,CAAC;IACH,CAAC,CAAA;IACD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA"}
|
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.165",
|
|
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.165"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
17
|
"@effect/atom-vue": "^4.0.0-beta.59",
|
package/src/lib.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import type {
|
|
1
|
+
import { useIntervalFn } from "@vueuse/core"
|
|
2
|
+
import type { Pausable, UseIntervalFnOptions } from "@vueuse/core"
|
|
3
|
+
import { Cause } from "effect-app"
|
|
4
|
+
import type { Effect } from "effect-app"
|
|
5
|
+
import type { Req } from "effect-app/client"
|
|
6
|
+
import type { RequestHandler, RequestHandlerWithInput } from "effect-app/client/clientFor"
|
|
5
7
|
import { isHttpClientError } from "effect/unstable/http/HttpClientError"
|
|
6
8
|
import type { MaybeRefOrGetter } from "vue"
|
|
7
9
|
import { reportError } from "./errorReporter.js"
|
|
@@ -31,15 +33,7 @@ const determineLevel = (cause: Cause.Cause<unknown>) => {
|
|
|
31
33
|
export const reportRuntimeError = (cause: Cause.Cause<unknown>, extras?: Record<string, unknown>) =>
|
|
32
34
|
reportRuntimeError_(cause, extras, determineLevel(cause))
|
|
33
35
|
|
|
34
|
-
|
|
35
|
-
// -> "$Project", "$Configuration", "Index"
|
|
36
|
-
export const makeQueryKey = ({ id, options }: { id: string; options?: ClientForOptions }) =>
|
|
37
|
-
pipe(
|
|
38
|
-
id.split("/"),
|
|
39
|
-
(split) => split.filter((_) => !options || !options?.skipQueryKey?.includes(_)).map((_) => "$" + _)
|
|
40
|
-
)
|
|
41
|
-
.join(".")
|
|
42
|
-
.split(".")
|
|
36
|
+
export { makeQueryKey } from "effect-app/client"
|
|
43
37
|
|
|
44
38
|
export function pauseWhileProcessing(
|
|
45
39
|
iv: Pausable,
|
package/src/makeClient.ts
CHANGED
|
@@ -3,7 +3,9 @@ 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 {
|
|
6
|
+
import type { ExtractModuleName, RequestHandler, RequestHandlers, RequestHandlerWithInput, RequestInputFromMake, RequestsAny } from "effect-app/client/clientFor"
|
|
7
|
+
import type { InvalidationCallback } from "effect-app/client/makeClient"
|
|
8
|
+
import type * as ExitResult from "effect/Exit"
|
|
7
9
|
import { type Fiber } from "effect/Fiber"
|
|
8
10
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
9
11
|
import { type ComputedRef, onBeforeUnmount, ref, type WatchSource } from "vue"
|
|
@@ -481,6 +483,35 @@ const managedRuntimeRt = <A, E>(mrt: ManagedRuntime.ManagedRuntime<A, E>) => mrt
|
|
|
481
483
|
|
|
482
484
|
type Base = I18n | Toast
|
|
483
485
|
type Mix = ApiClientFactory | Commander | Base
|
|
486
|
+
|
|
487
|
+
type InvalidationResources = Record<string, Record<string, { readonly type: "command" | "query" }>>
|
|
488
|
+
type UnionToIntersection<U> = (U extends unknown ? (arg: U) => void : never) extends ((arg: infer I) => void) ? I
|
|
489
|
+
: never
|
|
490
|
+
|
|
491
|
+
type CommandInvalidationResources<Req> = Req extends {
|
|
492
|
+
readonly type: "command"
|
|
493
|
+
readonly config?: infer Config
|
|
494
|
+
} ? Config extends {
|
|
495
|
+
readonly invalidationResources?: infer Resources
|
|
496
|
+
} ? Resources extends InvalidationResources ? Resources : never
|
|
497
|
+
: never
|
|
498
|
+
: never
|
|
499
|
+
|
|
500
|
+
type InvalidationResourcesForUnion<M extends RequestsAny> = {
|
|
501
|
+
[K in keyof M]: CommandInvalidationResources<M[K]>
|
|
502
|
+
}[keyof M]
|
|
503
|
+
|
|
504
|
+
type InvalidationResourcesFor<M extends RequestsAny> = [InvalidationResourcesForUnion<M>] extends [never] ? never
|
|
505
|
+
: UnionToIntersection<InvalidationResourcesForUnion<M>> extends infer R ? R extends InvalidationResources ? R
|
|
506
|
+
: never
|
|
507
|
+
: never
|
|
508
|
+
|
|
509
|
+
type QueryInvalidationFactory<M extends RequestsAny> = (client: ClientFrom<M>) => QueryInvalidation<M>
|
|
510
|
+
|
|
511
|
+
type ClientForArgs<M extends RequestsAny> = [InvalidationResourcesFor<M>] extends [never]
|
|
512
|
+
? [queryInvalidation?: QueryInvalidationFactory<M>, invalidationResources?: InvalidationResourcesFor<M>]
|
|
513
|
+
: [queryInvalidation: QueryInvalidationFactory<M> | undefined, invalidationResources: InvalidationResourcesFor<M>]
|
|
514
|
+
|
|
484
515
|
export const makeClient = <RT_, RTHooks>(
|
|
485
516
|
// global, but only accessible after startup has completed
|
|
486
517
|
getBaseMrt: () => ManagedRuntime.ManagedRuntime<RT_ | Mix, never>,
|
|
@@ -500,6 +531,37 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
500
531
|
const useQuery = query.useQuery
|
|
501
532
|
const useSuspenseQuery = query.useSuspenseQuery
|
|
502
533
|
|
|
534
|
+
const mergeInvalidation = (
|
|
535
|
+
a?: MutationOptionsBase["queryInvalidation"],
|
|
536
|
+
b?: MutationOptionsBase["queryInvalidation"]
|
|
537
|
+
): MutationOptionsBase["queryInvalidation"] | undefined => {
|
|
538
|
+
if (!a && !b) {
|
|
539
|
+
return undefined
|
|
540
|
+
}
|
|
541
|
+
return (defaultKey, name, input, output) => [
|
|
542
|
+
...(a?.(defaultKey, name, input, output) ?? []),
|
|
543
|
+
...(b?.(defaultKey, name, input, output) ?? [])
|
|
544
|
+
]
|
|
545
|
+
}
|
|
546
|
+
|
|
547
|
+
const makeQueryResources = <Resources extends InvalidationResources>(resources: Resources | undefined) => {
|
|
548
|
+
if (!resources) {
|
|
549
|
+
return {} as Record<string, Record<string, unknown>>
|
|
550
|
+
}
|
|
551
|
+
|
|
552
|
+
return Struct.keys(resources).reduce((acc, resourceName) => {
|
|
553
|
+
const resource = resources[resourceName]!
|
|
554
|
+
;(acc as any)[resourceName] = Struct.keys(resource).reduce((moduleAcc, requestName) => {
|
|
555
|
+
const request = resource[requestName]!
|
|
556
|
+
if (request.type === "query") {
|
|
557
|
+
;(moduleAcc as any)[requestName] = request
|
|
558
|
+
}
|
|
559
|
+
return moduleAcc
|
|
560
|
+
}, {} as Record<string, unknown>)
|
|
561
|
+
return acc
|
|
562
|
+
}, {} as Record<string, Record<string, unknown>>)
|
|
563
|
+
}
|
|
564
|
+
|
|
503
565
|
const mapQuery = <M extends RequestsAny>(
|
|
504
566
|
client: ClientFrom<M>
|
|
505
567
|
) => {
|
|
@@ -572,17 +634,35 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
572
634
|
}
|
|
573
635
|
|
|
574
636
|
const mapMutation = <M extends RequestsAny>(
|
|
575
|
-
client: ClientFrom<M
|
|
637
|
+
client: ClientFrom<M>,
|
|
638
|
+
queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>,
|
|
639
|
+
invalidationResources?: InvalidationResourcesFor<M>
|
|
576
640
|
) => {
|
|
577
641
|
const Command = useCommand()
|
|
578
642
|
const mutation = useMutation()
|
|
643
|
+
const invalidation = queryInvalidation?.(client)
|
|
644
|
+
const queryResources = makeQueryResources(invalidationResources)
|
|
579
645
|
const mutations = Struct.keys(client).reduce(
|
|
580
646
|
(acc, key) => {
|
|
581
647
|
if (client[key].Request.type !== "command") {
|
|
582
648
|
return acc
|
|
583
649
|
}
|
|
650
|
+
const fromRequestConfig = client[key].Request.config?.invalidatesQueries as
|
|
651
|
+
| InvalidationCallback<InvalidationResourcesFor<M>>
|
|
652
|
+
| undefined
|
|
653
|
+
const fromRequest = fromRequestConfig
|
|
654
|
+
? ((defaultKey: string[], _name: string, input?: unknown, output?: unknown) =>
|
|
655
|
+
fromRequestConfig(defaultKey, queryResources as never, input as never, output as never).map((entry) => ({
|
|
656
|
+
filters: entry.filters as InvalidateQueryFilters | undefined,
|
|
657
|
+
options: entry.options as InvalidateOptions | undefined
|
|
658
|
+
})))
|
|
659
|
+
: undefined
|
|
660
|
+
const mergedInvalidation = mergeInvalidation(fromRequest, invalidation?.[key])
|
|
584
661
|
const makeProjectedMutation = (handler: any): any => {
|
|
585
|
-
const mut: any = mutation(
|
|
662
|
+
const mut: any = mutation(
|
|
663
|
+
handler,
|
|
664
|
+
mergedInvalidation ? { queryInvalidation: mergedInvalidation } : undefined
|
|
665
|
+
)
|
|
586
666
|
const wrap = Command.wrap({ mutate: Effect.isEffect(mut) ? () => mut : mut, id: client[key].id })
|
|
587
667
|
return Object.assign(mut, {
|
|
588
668
|
wrap,
|
|
@@ -614,7 +694,8 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
614
694
|
// make available .query, .suspense and .mutate for each operation
|
|
615
695
|
// and a .helpers with all mutations and queries
|
|
616
696
|
const mapClient = <M extends RequestsAny>(
|
|
617
|
-
queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M
|
|
697
|
+
queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>,
|
|
698
|
+
invalidationResources?: InvalidationResourcesFor<M>
|
|
618
699
|
) =>
|
|
619
700
|
(
|
|
620
701
|
client: ClientFrom<M>
|
|
@@ -622,6 +703,7 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
622
703
|
const Command = useCommand()
|
|
623
704
|
const mutation = useMutation()
|
|
624
705
|
const invalidation = queryInvalidation?.(client)
|
|
706
|
+
const queryResources = makeQueryResources(invalidationResources)
|
|
625
707
|
const extended = Struct.keys(client).reduce(
|
|
626
708
|
(acc, key) => {
|
|
627
709
|
const requestType = client[key].Request.type
|
|
@@ -658,10 +740,23 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
658
740
|
}
|
|
659
741
|
: {
|
|
660
742
|
mutate: ((handler: any) => {
|
|
743
|
+
const fromRequestConfig = client[key].Request.config?.invalidatesQueries as
|
|
744
|
+
| InvalidationCallback<InvalidationResourcesFor<M>>
|
|
745
|
+
| undefined
|
|
746
|
+
const fromRequest = fromRequestConfig
|
|
747
|
+
? ((defaultKey: string[], _name: string, input?: unknown, output?: unknown) =>
|
|
748
|
+
fromRequestConfig(defaultKey, queryResources as never, input as never, output as never).map((
|
|
749
|
+
entry
|
|
750
|
+
) => ({
|
|
751
|
+
filters: entry.filters as InvalidateQueryFilters | undefined,
|
|
752
|
+
options: entry.options as InvalidateOptions | undefined
|
|
753
|
+
})))
|
|
754
|
+
: undefined
|
|
755
|
+
const mergedInvalidation = mergeInvalidation(fromRequest, invalidation?.[key])
|
|
661
756
|
const makeProjectedMutation = (h: any): any => {
|
|
662
757
|
const mutate = mutation(
|
|
663
758
|
h,
|
|
664
|
-
|
|
759
|
+
mergedInvalidation ? { queryInvalidation: mergedInvalidation } : undefined
|
|
665
760
|
) as any
|
|
666
761
|
return Object.assign(
|
|
667
762
|
mutate,
|
|
@@ -706,26 +801,37 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
706
801
|
& { Input: typeof client[Key] extends RequestHandlerWithInput<infer I, any, any, any, any, any> ? I : never }
|
|
707
802
|
}
|
|
708
803
|
)
|
|
709
|
-
return Object.assign(extended, {
|
|
804
|
+
return Object.assign(extended, {
|
|
805
|
+
helpers: {
|
|
806
|
+
...mapRequest(client),
|
|
807
|
+
...mapMutation(client, queryInvalidation, invalidationResources),
|
|
808
|
+
...mapQuery(client)
|
|
809
|
+
}
|
|
810
|
+
})
|
|
710
811
|
}
|
|
711
812
|
|
|
712
813
|
// TODO: Clean up this delay initialisation messs
|
|
713
814
|
// TODO; invalidateQueries should perhaps be configured in the Request impl themselves?
|
|
714
815
|
const clientFor__ = <M extends RequestsAny>(
|
|
715
816
|
m: M,
|
|
716
|
-
queryInvalidation?:
|
|
717
|
-
|
|
817
|
+
queryInvalidation?: QueryInvalidationFactory<M>,
|
|
818
|
+
invalidationResources?: InvalidationResourcesFor<M>
|
|
819
|
+
) => getBaseMrt().runSync(clientFor_(m).pipe(Effect.map(mapClient(queryInvalidation, invalidationResources))))
|
|
718
820
|
|
|
719
821
|
// delay client creation until first access
|
|
720
822
|
// the idea is that we don't need the useNuxtApp().$runtime (only available at later initialisation stage)
|
|
721
823
|
// until we are at a place where it is available..
|
|
722
824
|
const clientFor = <M extends RequestsAny>(
|
|
723
825
|
m: M,
|
|
724
|
-
|
|
826
|
+
...args: ClientForArgs<M>
|
|
725
827
|
) => {
|
|
828
|
+
const [queryInvalidation, invalidationResources] = args as [
|
|
829
|
+
QueryInvalidationFactory<M> | undefined,
|
|
830
|
+
InvalidationResourcesFor<M> | undefined
|
|
831
|
+
]
|
|
726
832
|
type Client = ReturnType<typeof clientFor__<M>>
|
|
727
833
|
let client: Client | undefined = undefined
|
|
728
|
-
const getOrMakeClient = () => (client ??= clientFor__(m, queryInvalidation))
|
|
834
|
+
const getOrMakeClient = () => (client ??= clientFor__(m, queryInvalidation, invalidationResources))
|
|
729
835
|
|
|
730
836
|
// initialize on first use..
|
|
731
837
|
const proxy = Struct.keys(m).concat(["helpers"]).reduce((acc, key) => {
|
|
@@ -762,7 +868,12 @@ export const makeClient = <RT_, RTHooks>(
|
|
|
762
868
|
}
|
|
763
869
|
|
|
764
870
|
export type QueryInvalidation<M> = {
|
|
765
|
-
[K in keyof M]?: (
|
|
871
|
+
[K in keyof M]?: (
|
|
872
|
+
defaultKey: string[],
|
|
873
|
+
name: string,
|
|
874
|
+
input?: unknown,
|
|
875
|
+
output?: ExitResult.Exit<unknown, unknown>
|
|
876
|
+
) => {
|
|
766
877
|
filters?: InvalidateQueryFilters | undefined
|
|
767
878
|
options?: InvalidateOptions | undefined
|
|
768
879
|
}[]
|
package/src/mutate.ts
CHANGED
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
import { type InvalidateOptions, type InvalidateQueryFilters, type QueryClient, useQueryClient } from "@tanstack/vue-query"
|
|
3
3
|
import { type Cause, Effect, type Exit, Option } from "effect-app"
|
|
4
|
-
import { type Req } from "effect-app/client"
|
|
4
|
+
import { makeQueryKey, type Req } from "effect-app/client"
|
|
5
5
|
import type { ClientForOptions, RequestHandler, RequestHandlerWithInput } from "effect-app/client/clientFor"
|
|
6
6
|
import { tuple } from "effect-app/Function"
|
|
7
7
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
8
8
|
import { computed, type ComputedRef, shallowRef } from "vue"
|
|
9
|
-
import { makeQueryKey } from "./lib.js"
|
|
10
9
|
|
|
11
10
|
export const getQueryKey = (h: { id: string; options?: ClientForOptions }) => {
|
|
12
11
|
const key = makeQueryKey(h)
|
|
@@ -72,7 +71,7 @@ export interface MutationOptionsBase {
|
|
|
72
71
|
* By default we invalidate one level of the query key, e.g $project/$configuration.get, we invalidate $project.
|
|
73
72
|
* This can be overridden by providing a function that returns an array of filters and options.
|
|
74
73
|
*/
|
|
75
|
-
queryInvalidation?: (defaultKey: string[], name: string) => {
|
|
74
|
+
queryInvalidation?: (defaultKey: string[], name: string, input?: unknown, output?: Exit.Exit<unknown, unknown>) => {
|
|
76
75
|
filters?: InvalidateQueryFilters | undefined
|
|
77
76
|
options?: InvalidateOptions | undefined
|
|
78
77
|
}[]
|
|
@@ -158,40 +157,49 @@ export const invalidateQueries = (
|
|
|
158
157
|
)
|
|
159
158
|
)
|
|
160
159
|
|
|
161
|
-
const invalidateCache =
|
|
162
|
-
|
|
160
|
+
const invalidateCache = (input: unknown, output: Exit.Exit<unknown, unknown>) =>
|
|
161
|
+
Effect.suspend(() => {
|
|
162
|
+
const queryKey = getQueryKey(self)
|
|
163
163
|
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
164
|
+
if (options) {
|
|
165
|
+
const opts = options(queryKey, self.id, input, output)
|
|
166
|
+
if (!opts.length) {
|
|
167
|
+
return Effect.void
|
|
168
|
+
}
|
|
169
|
+
return Effect
|
|
170
|
+
.andThen(
|
|
171
|
+
Effect.annotateCurrentSpan({ queryKey, opts }),
|
|
172
|
+
Effect.forEach(opts, (_) => invalidateQueries(_.filters, _.options), { concurrency: "inherit" })
|
|
173
|
+
)
|
|
174
|
+
.pipe(Effect.withSpan("client.query.invalidation", {}, { captureStackTrace: false }))
|
|
168
175
|
}
|
|
176
|
+
|
|
177
|
+
if (!queryKey) return Effect.void
|
|
178
|
+
|
|
169
179
|
return Effect
|
|
170
180
|
.andThen(
|
|
171
|
-
Effect.annotateCurrentSpan({ queryKey
|
|
172
|
-
|
|
181
|
+
Effect.annotateCurrentSpan({ queryKey }),
|
|
182
|
+
invalidateQueries({ queryKey })
|
|
173
183
|
)
|
|
174
|
-
.pipe(
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
184
|
+
.pipe(
|
|
185
|
+
Effect.tap(
|
|
186
|
+
// hand over control back to the event loop so that state can be updated..
|
|
187
|
+
// TODO: should we do this in general on any mutation, regardless of invalidation?
|
|
188
|
+
Effect.sleep(0)
|
|
189
|
+
),
|
|
190
|
+
Effect.withSpan("client.query.invalidation", {}, { captureStackTrace: false })
|
|
191
|
+
)
|
|
192
|
+
})
|
|
178
193
|
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
// hand over control back to the event loop so that state can be updated..
|
|
187
|
-
// TODO: should we do this in general on any mutation, regardless of invalidation?
|
|
188
|
-
Effect.sleep(0)
|
|
189
|
-
),
|
|
190
|
-
Effect.withSpan("client.query.invalidation", {}, { captureStackTrace: false })
|
|
194
|
+
const handle = <A, E, R>(self: Effect.Effect<A, E, R>, input?: unknown) =>
|
|
195
|
+
self.pipe(
|
|
196
|
+
Effect.onExit((exit) =>
|
|
197
|
+
invalidateCache(
|
|
198
|
+
input,
|
|
199
|
+
exit
|
|
200
|
+
)
|
|
191
201
|
)
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
const handle = <A, E, R>(self: Effect.Effect<A, E, R>) => Effect.ensuring(self, invalidateCache)
|
|
202
|
+
)
|
|
195
203
|
|
|
196
204
|
return handle
|
|
197
205
|
}
|
|
@@ -221,7 +229,7 @@ export const makeMutation = () => {
|
|
|
221
229
|
const queryClient = useQueryClient()
|
|
222
230
|
const handle = invalidateQueries(queryClient, self, options?.queryInvalidation)
|
|
223
231
|
const handler = self.handler
|
|
224
|
-
const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i))
|
|
232
|
+
const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i), i)
|
|
225
233
|
|
|
226
234
|
return Object.assign(r, { id: self.id }) as any
|
|
227
235
|
}
|
|
@@ -255,7 +263,7 @@ export const useMakeMutation = () => {
|
|
|
255
263
|
) => {
|
|
256
264
|
const handle = invalidateQueries(queryClient, self, options?.queryInvalidation)
|
|
257
265
|
const handler = self.handler
|
|
258
|
-
const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i))
|
|
266
|
+
const r = Effect.isEffect(handler) ? handle(handler) : (i: I) => handle(handler(i), i)
|
|
259
267
|
|
|
260
268
|
return Object.assign(r, { id: self.id }) as any
|
|
261
269
|
}
|
package/src/query.ts
CHANGED
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
5
5
|
import { type DefaultError, type Enabled, type InitialDataFunction, type NonUndefinedGuard, type PlaceholderDataFunction, type QueryKey, type QueryObserverOptions, type QueryObserverResult, type RefetchOptions, useQuery as useTanstackQuery, useQueryClient, type UseQueryDefinedReturnType, type UseQueryReturnType } from "@tanstack/vue-query"
|
|
6
6
|
import { Array, Cause, type Context, Effect, Option, S } from "effect-app"
|
|
7
|
-
import { type Req } from "effect-app/client"
|
|
7
|
+
import { makeQueryKey, type Req } from "effect-app/client"
|
|
8
8
|
import type { RequestHandler, RequestHandlerWithInput } from "effect-app/client/clientFor"
|
|
9
9
|
import { CauseException, ServiceUnavailableError } from "effect-app/client/errors"
|
|
10
10
|
import { type Span } from "effect/Tracer"
|
|
11
11
|
import { isHttpClientError } from "effect/unstable/http/HttpClientError"
|
|
12
12
|
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
13
13
|
import { computed, type ComputedRef, type MaybeRefOrGetter, ref, shallowRef, watch, type WatchSource } from "vue"
|
|
14
|
-
import {
|
|
14
|
+
import { reportRuntimeError } from "./lib.js"
|
|
15
15
|
import { makeRunPromise } from "./runtime.js"
|
|
16
16
|
|
|
17
17
|
// we must use interface extends, or we get the dreaded typescript error of isn't portable blabla @tanstack/vue-query/build/modern/types.js
|