@effect-app/vue 2.66.0 → 2.67.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/experimental/commander.d.ts +8 -4
- package/dist/experimental/commander.d.ts.map +1 -1
- package/dist/experimental/commander.js +9 -6
- package/dist/experimental/makeUseCommand.d.ts +8 -4
- package/dist/experimental/makeUseCommand.d.ts.map +1 -1
- package/dist/lib.d.ts +2 -2
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +2 -2
- package/dist/makeClient.d.ts +12 -8
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +10 -10
- package/dist/mutate.d.ts +1 -1
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +3 -3
- package/dist/query.js +3 -3
- package/package.json +2 -2
- package/src/experimental/commander.ts +15 -7
- package/src/lib.ts +2 -2
- package/src/makeClient.ts +9 -9
- package/src/mutate.ts +3 -3
- package/src/query.ts +2 -2
- package/test/Mutation.test.ts +26 -4
- package/test/dist/stubs.d.ts +8 -4
- package/test/dist/stubs.d.ts.map +1 -1
package/dist/makeClient.js
CHANGED
|
@@ -26,7 +26,7 @@ export class SuppressErrors extends Cause.YieldableError {
|
|
|
26
26
|
}
|
|
27
27
|
export const suppressToast = constant(Effect.succeed(undefined));
|
|
28
28
|
/** handles errors as specified and reports defects */
|
|
29
|
-
function handleRequest(f,
|
|
29
|
+
function handleRequest(f, id, action, options) {
|
|
30
30
|
const handleEffect = (i) => (self) => self.pipe(Effect.tap(Exit.matchEffect({
|
|
31
31
|
onSuccess: (r) => options.onSuccess(r, i),
|
|
32
32
|
onFailure: (cause) => Effect.gen(function* () {
|
|
@@ -52,7 +52,7 @@ function handleRequest(f, name, action, options) {
|
|
|
52
52
|
yield* reportRuntimeError(cause, extra);
|
|
53
53
|
yield* options.onDefect(cause, i);
|
|
54
54
|
})
|
|
55
|
-
})), Effect.withSpan(`mutation ${
|
|
55
|
+
})), Effect.withSpan(`mutation ${id}`, { captureStackTrace: false }));
|
|
56
56
|
return Object.assign(Effect.isEffect(f)
|
|
57
57
|
? pipe(f, handleEffect(void 0))
|
|
58
58
|
: (i) => pipe(f(i), handleEffect(i)), { action });
|
|
@@ -61,9 +61,9 @@ const _useMutation = makeMutation();
|
|
|
61
61
|
/**
|
|
62
62
|
* Pass an Effect or a function that returns an Effect, e.g from a client action
|
|
63
63
|
* Executes query cache invalidation based on default rules or provided option.
|
|
64
|
-
* adds a span with the mutation
|
|
64
|
+
* adds a span with the mutation id
|
|
65
65
|
*/
|
|
66
|
-
export const useMutation = (self, options) => mapHandler(_useMutation(self, options), Effect.withSpan(`mutation ${self.
|
|
66
|
+
export const useMutation = (self, options) => mapHandler(_useMutation(self, options), Effect.withSpan(`mutation ${self.id}`, { captureStackTrace: false }));
|
|
67
67
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
68
68
|
export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
69
69
|
effect: Effect.gen(function* () {
|
|
@@ -80,7 +80,7 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
80
80
|
const [a, b] = asResult(mapHandler(mapHandler(unsafe, mh), Effect.tapDefect(reportRuntimeError)));
|
|
81
81
|
return [
|
|
82
82
|
a,
|
|
83
|
-
mapHandler(b, Effect.withSpan(`mutation ${self.
|
|
83
|
+
mapHandler(b, Effect.withSpan(`mutation ${self.id}`, { captureStackTrace: false }))
|
|
84
84
|
];
|
|
85
85
|
};
|
|
86
86
|
/** handles errors as toasts and reports defects */
|
|
@@ -90,12 +90,12 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
90
90
|
* Pass a function that returns a Promise.
|
|
91
91
|
* Returns an execution function which reports errors as Toast.
|
|
92
92
|
*/
|
|
93
|
-
function handleRequestWithToast(f,
|
|
93
|
+
function handleRequestWithToast(f, id, action, options = {}) {
|
|
94
94
|
const actionMessage = intl.formatMessage({ id: `action.${action}`, defaultMessage: action });
|
|
95
95
|
const defaultWarnMessage = intl.formatMessage({ id: "handle.with_warnings" }, { action: actionMessage });
|
|
96
96
|
const defaultSuccessMessage = intl.formatMessage({ id: "handle.success" }, { action: actionMessage });
|
|
97
97
|
const defaultErrorMessage = intl.formatMessage({ id: "handle.with_errors" }, { action: actionMessage });
|
|
98
|
-
return handleRequest(f,
|
|
98
|
+
return handleRequest(f, id, action, {
|
|
99
99
|
onSuccess: Effect.fnUntraced(function* (a, i) {
|
|
100
100
|
const message = options.successMessage ? yield* options.successMessage(a, i) : defaultSuccessMessage
|
|
101
101
|
+ (S.is(OperationSuccess)(a) && a.message
|
|
@@ -191,7 +191,7 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
191
191
|
const mh = options?.mapHandler ?? identity;
|
|
192
192
|
// Effect.tapDefect(reportRuntimeError) handled in toast handler,
|
|
193
193
|
const [a, b] = asResult(mapHandler(unsafe, mh));
|
|
194
|
-
return tuple(a, handleRequestWithToast(b, self.
|
|
194
|
+
return tuple(a, handleRequestWithToast(b, self.id, action, options));
|
|
195
195
|
};
|
|
196
196
|
//
|
|
197
197
|
/**
|
|
@@ -229,7 +229,7 @@ export class LegacyMutation extends Effect.Service()("LegacyMutation", {
|
|
|
229
229
|
}, options ? dropUndefinedT(options) : undefined);
|
|
230
230
|
const mh = options?.mapHandler ?? identity;
|
|
231
231
|
const [a, b] = asResult(mapHandler(mapHandler(unsafe, mh), Effect.tapDefect(reportRuntimeError)));
|
|
232
|
-
return tuple(computed(() => mutationResultToVue(a.value)), handleRequest(b, self.
|
|
232
|
+
return tuple(computed(() => mutationResultToVue(a.value)), handleRequest(b, self.id, action, {
|
|
233
233
|
onSuccess: suppressToast,
|
|
234
234
|
onDefect: suppressToast,
|
|
235
235
|
onFail: suppressToast,
|
|
@@ -433,4 +433,4 @@ export const makeClient = (getBaseMrt, rootLayer) => {
|
|
|
433
433
|
}, {})
|
|
434
434
|
};
|
|
435
435
|
};
|
|
436
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient.js","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}
|
|
436
|
+
//# 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
|
@@ -4,7 +4,7 @@ import { type Cause, Effect, type Exit } from "effect-app";
|
|
|
4
4
|
import type { RequestHandler, RequestHandlerWithInput, TaggedRequestClassAny } from "effect-app/client/clientFor";
|
|
5
5
|
import { type ComputedRef } from "vue";
|
|
6
6
|
export declare const getQueryKey: (h: {
|
|
7
|
-
|
|
7
|
+
id: string;
|
|
8
8
|
}) => string[];
|
|
9
9
|
export declare function mutationResultToVue<A, E>(mutationResult: Result.Result<A, E>): Res<A, E>;
|
|
10
10
|
export interface Res<A, E> {
|
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,EAAc,MAAM,KAAK,CAAA;AAG5D,eAAO,MAAM,WAAW,GAAI,GAAG;IAAE,
|
|
1
|
+
{"version":3,"file":"mutate.d.ts","sourceRoot":"","sources":["../src/mutate.ts"],"names":[],"mappings":"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"}
|
package/dist/mutate.js
CHANGED
|
@@ -12,7 +12,7 @@ export const getQueryKey = (h) => {
|
|
|
12
12
|
// for $project/$configuration/$something.get, we invalidate $project/$configuration
|
|
13
13
|
const k = ns.length ? ns.length > 1 ? ns.slice(0, ns.length - 1) : ns : undefined;
|
|
14
14
|
if (!k)
|
|
15
|
-
throw new Error("empty query key for: " + h.
|
|
15
|
+
throw new Error("empty query key for: " + h.id);
|
|
16
16
|
return k;
|
|
17
17
|
};
|
|
18
18
|
export function mutationResultToVue(mutationResult) {
|
|
@@ -78,7 +78,7 @@ export const makeMutation = () => {
|
|
|
78
78
|
const invalidateCache = Effect.suspend(() => {
|
|
79
79
|
const queryKey = getQueryKey(self);
|
|
80
80
|
if (options?.queryInvalidation) {
|
|
81
|
-
const opts = options.queryInvalidation(queryKey, self.
|
|
81
|
+
const opts = options.queryInvalidation(queryKey, self.id);
|
|
82
82
|
if (!opts.length) {
|
|
83
83
|
return Effect.void;
|
|
84
84
|
}
|
|
@@ -99,4 +99,4 @@ export const makeMutation = () => {
|
|
|
99
99
|
};
|
|
100
100
|
return useMutation;
|
|
101
101
|
};
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibXV0YXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL211dGF0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1REFBdUQ7QUFDdkQsT0FBTyxLQUFLLE1BQU0sTUFBTSwwQkFBMEIsQ0FBQTtBQUNsRCxPQUFPLEVBQXVELGNBQWMsRUFBRSxNQUFNLHFCQUFxQixDQUFBO0FBQ3pHLE9BQU8sRUFBYyxNQUFNLEVBQWEsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRWxFLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsUUFBUSxFQUFvQixVQUFVLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFDNUQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUV2QyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsQ0FBQyxDQUFpQixFQUFFLEVBQUU7SUFDL0MsTUFBTSxHQUFHLEdBQUcsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzNCLE1BQU0sRUFBRSxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtJQUMvQyw2RkFBNkY7SUFDN0Ysb0ZBQW9GO0lBQ3BGLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQTtJQUNqRixJQUFJLENBQUMsQ0FBQztRQUFFLE1BQU0sSUFBSSxLQUFLLENBQUMsdUJBQXVCLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQ3ZELE9B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
|
package/dist/query.js
CHANGED
|
@@ -44,7 +44,7 @@ export const makeQuery = (getRuntime) => {
|
|
|
44
44
|
},
|
|
45
45
|
queryKey,
|
|
46
46
|
queryFn: ({ meta, signal }) => runPromise(handler
|
|
47
|
-
.pipe(Effect.tapDefect(reportRuntimeError), Effect.withSpan(`query ${q.
|
|
47
|
+
.pipe(Effect.tapDefect(reportRuntimeError), Effect.withSpan(`query ${q.id}`, { captureStackTrace: false }), meta?.["span"] ? Effect.withParentSpan(meta["span"]) : (_) => _), { signal })
|
|
48
48
|
}
|
|
49
49
|
: {
|
|
50
50
|
...options,
|
|
@@ -60,7 +60,7 @@ export const makeQuery = (getRuntime) => {
|
|
|
60
60
|
},
|
|
61
61
|
queryKey: [...queryKey, req],
|
|
62
62
|
queryFn: ({ meta, signal }) => runPromise(handler(req.value)
|
|
63
|
-
.pipe(Effect.tapDefect(reportRuntimeError), Effect.withSpan(`query ${q.
|
|
63
|
+
.pipe(Effect.tapDefect(reportRuntimeError), Effect.withSpan(`query ${q.id}`, { captureStackTrace: false }), meta?.["span"] ? Effect.withParentSpan(meta["span"]) : (_) => _), { signal })
|
|
64
64
|
});
|
|
65
65
|
const latestSuccess = shallowRef();
|
|
66
66
|
const result = computed(() => swrToQuery({
|
|
@@ -145,4 +145,4 @@ export const useUpdateQuery = () => {
|
|
|
145
145
|
};
|
|
146
146
|
return f;
|
|
147
147
|
};
|
|
148
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
148
|
+
//# 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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/vue",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.67.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"@tanstack/vue-query": "5.83.1",
|
|
11
11
|
"@vueuse/core": "^13.9.0",
|
|
12
12
|
"query-string": "^9.2.2",
|
|
13
|
-
"effect-app": "3.
|
|
13
|
+
"effect-app": "3.5.0"
|
|
14
14
|
},
|
|
15
15
|
"peerDependencies": {
|
|
16
16
|
"@effect-atom/atom": "^0.1.22",
|
|
@@ -760,6 +760,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
|
|
|
760
760
|
const { confirm, confirmOrInterrupt } = yield* Confirm
|
|
761
761
|
|
|
762
762
|
const makeContext = <Id extends string>(id: Id) => {
|
|
763
|
+
if (!id) throw new Error("must specify an id")
|
|
763
764
|
const namespace = `action.${id}` as const
|
|
764
765
|
|
|
765
766
|
const action = intl.formatMessage({
|
|
@@ -1261,7 +1262,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
|
|
|
1261
1262
|
const cmd = makeCommand(rt)
|
|
1262
1263
|
return (_id: any) => {
|
|
1263
1264
|
const isObject = typeof _id === "object" || typeof _id === "function"
|
|
1264
|
-
const id = isObject ? _id.
|
|
1265
|
+
const id = isObject ? _id.id : _id
|
|
1265
1266
|
const context = makeContext(id)
|
|
1266
1267
|
const idCmd = cmd(id)
|
|
1267
1268
|
// TODO: implement proper tracing stack
|
|
@@ -1278,7 +1279,7 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
|
|
|
1278
1279
|
),
|
|
1279
1280
|
context,
|
|
1280
1281
|
isObject
|
|
1281
|
-
? { mutate: _id.mutate }
|
|
1282
|
+
? { mutate: "mutate" in _id ? _id.mutate : typeof _id === "function" ? _id : undefined }
|
|
1282
1283
|
: {}
|
|
1283
1284
|
)
|
|
1284
1285
|
))
|
|
@@ -1286,7 +1287,10 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
|
|
|
1286
1287
|
}) as unknown as <RT>(
|
|
1287
1288
|
runtime: Runtime.Runtime<RT>
|
|
1288
1289
|
) => <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(
|
|
1289
|
-
id:
|
|
1290
|
+
id:
|
|
1291
|
+
| Id
|
|
1292
|
+
| { id: Id; mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR> }
|
|
1293
|
+
| ((...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>) & { id: Id }
|
|
1290
1294
|
) => <Args extends Array<unknown>, A, E, R extends RT | CommandContext>(
|
|
1291
1295
|
handler: (
|
|
1292
1296
|
ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
|
|
@@ -1307,7 +1311,9 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
|
|
|
1307
1311
|
wrap: <RT>(runtime: Runtime.Runtime<RT>) => {
|
|
1308
1312
|
const make = makeCommand(runtime)
|
|
1309
1313
|
return <const Id extends string, Args extends Array<unknown>, A, E, R>(
|
|
1310
|
-
mutation:
|
|
1314
|
+
mutation:
|
|
1315
|
+
| { mutate: (...args: Args) => Effect.Effect<A, E, R>; id: Id }
|
|
1316
|
+
| ((...args: Args) => Effect.Effect<A, E, R>) & { id: Id }
|
|
1311
1317
|
): Commander.GenWrap<RT, Id, Args, A, E, R> & Commander.NonGenWrap<RT, Id, Args, A, E, R> =>
|
|
1312
1318
|
(
|
|
1313
1319
|
...combinators: any[]
|
|
@@ -1318,11 +1324,13 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
|
|
|
1318
1324
|
const errorDef = new Error()
|
|
1319
1325
|
Error.stackTraceLimit = limit
|
|
1320
1326
|
|
|
1321
|
-
|
|
1327
|
+
const mutate = "mutate" in mutation ? mutation.mutate : mutation
|
|
1328
|
+
|
|
1329
|
+
return make(mutation.id, errorDef)(
|
|
1322
1330
|
Effect.fnUntraced(
|
|
1323
1331
|
// fnUntraced only supports generators as first arg, so we convert to generator if needed
|
|
1324
|
-
isGeneratorFunction(
|
|
1325
|
-
return yield*
|
|
1332
|
+
isGeneratorFunction(mutate) ? mutate : function*(...args: Args) {
|
|
1333
|
+
return yield* mutate(...args)
|
|
1326
1334
|
},
|
|
1327
1335
|
...combinators as [any]
|
|
1328
1336
|
) as any
|
package/src/lib.ts
CHANGED
|
@@ -30,9 +30,9 @@ export const reportRuntimeError = (cause: Cause.Cause<unknown>, extras?: Record<
|
|
|
30
30
|
|
|
31
31
|
// $Project/$Configuration.Index
|
|
32
32
|
// -> "$Project", "$Configuration", "Index"
|
|
33
|
-
export const makeQueryKey = ({
|
|
33
|
+
export const makeQueryKey = ({ id, options }: { id: string; options?: ClientForOptions }) =>
|
|
34
34
|
pipe(
|
|
35
|
-
|
|
35
|
+
id.split("/"),
|
|
36
36
|
(split) => split.filter((_) => !options || !options?.skipQueryKey?.includes(_)).map((_) => "$" + _)
|
|
37
37
|
)
|
|
38
38
|
.join(".")
|
package/src/makeClient.ts
CHANGED
|
@@ -126,7 +126,7 @@ function handleRequest<
|
|
|
126
126
|
RDefect = never
|
|
127
127
|
>(
|
|
128
128
|
f: Effect.Effect<Exit.Exit<A, E>, never, R> | ((i: I) => Effect.Effect<Exit.Exit<A, E>, never, R>),
|
|
129
|
-
|
|
129
|
+
id: string,
|
|
130
130
|
action: string,
|
|
131
131
|
options: {
|
|
132
132
|
onSuccess: (a: A, i: I) => Effect.Effect<void, ESuccess, RSuccess>
|
|
@@ -168,7 +168,7 @@ function handleRequest<
|
|
|
168
168
|
})
|
|
169
169
|
})
|
|
170
170
|
),
|
|
171
|
-
Effect.withSpan(`mutation ${
|
|
171
|
+
Effect.withSpan(`mutation ${id}`, { captureStackTrace: false })
|
|
172
172
|
)
|
|
173
173
|
return Object.assign(
|
|
174
174
|
Effect.isEffect(f)
|
|
@@ -190,7 +190,7 @@ const _useMutation = makeMutation()
|
|
|
190
190
|
/**
|
|
191
191
|
* Pass an Effect or a function that returns an Effect, e.g from a client action
|
|
192
192
|
* Executes query cache invalidation based on default rules or provided option.
|
|
193
|
-
* adds a span with the mutation
|
|
193
|
+
* adds a span with the mutation id
|
|
194
194
|
*/
|
|
195
195
|
export const useMutation: typeof _useMutation = <
|
|
196
196
|
I,
|
|
@@ -205,7 +205,7 @@ export const useMutation: typeof _useMutation = <
|
|
|
205
205
|
) =>
|
|
206
206
|
mapHandler(
|
|
207
207
|
_useMutation(self as any, options),
|
|
208
|
-
Effect.withSpan(`mutation ${self.
|
|
208
|
+
Effect.withSpan(`mutation ${self.id}`, { captureStackTrace: false })
|
|
209
209
|
) as any
|
|
210
210
|
|
|
211
211
|
// @effect-diagnostics-next-line missingEffectServiceDependency:off
|
|
@@ -248,7 +248,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
248
248
|
a,
|
|
249
249
|
mapHandler(
|
|
250
250
|
b,
|
|
251
|
-
Effect.withSpan(`mutation ${self.
|
|
251
|
+
Effect.withSpan(`mutation ${self.id}`, { captureStackTrace: false })
|
|
252
252
|
)
|
|
253
253
|
] as const as any
|
|
254
254
|
}
|
|
@@ -276,7 +276,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
276
276
|
RDefect = never
|
|
277
277
|
>(
|
|
278
278
|
f: Effect.Effect<Exit.Exit<A2, E2>, never, R2> | ((i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>),
|
|
279
|
-
|
|
279
|
+
id: string,
|
|
280
280
|
action: string,
|
|
281
281
|
options: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect> = {}
|
|
282
282
|
) {
|
|
@@ -294,7 +294,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
294
294
|
{ action: actionMessage }
|
|
295
295
|
)
|
|
296
296
|
|
|
297
|
-
return handleRequest<E2, A2, R2, any, ESuccess, RSuccess, EError, RError, EDefect, RDefect>(f,
|
|
297
|
+
return handleRequest<E2, A2, R2, any, ESuccess, RSuccess, EError, RError, EDefect, RDefect>(f, id, action, {
|
|
298
298
|
onSuccess: Effect.fnUntraced(function*(a, i) {
|
|
299
299
|
const message = options.successMessage ? yield* options.successMessage(a, i) : defaultSuccessMessage
|
|
300
300
|
+ (S.is(OperationSuccess)(a) && a.message
|
|
@@ -460,7 +460,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
460
460
|
|
|
461
461
|
return tuple(
|
|
462
462
|
a,
|
|
463
|
-
handleRequestWithToast(b as any, self.
|
|
463
|
+
handleRequestWithToast(b as any, self.id, action, options)
|
|
464
464
|
)
|
|
465
465
|
}
|
|
466
466
|
//
|
|
@@ -697,7 +697,7 @@ export class LegacyMutation extends Effect.Service<LegacyMutation>()("LegacyMuta
|
|
|
697
697
|
|
|
698
698
|
return tuple(
|
|
699
699
|
computed(() => mutationResultToVue(a.value)),
|
|
700
|
-
handleRequest(b as any, self.
|
|
700
|
+
handleRequest(b as any, self.id, action, {
|
|
701
701
|
onSuccess: suppressToast,
|
|
702
702
|
onDefect: suppressToast,
|
|
703
703
|
onFail: suppressToast,
|
package/src/mutate.ts
CHANGED
|
@@ -7,13 +7,13 @@ import { tuple } from "effect-app/Function"
|
|
|
7
7
|
import { computed, type ComputedRef, shallowRef } from "vue"
|
|
8
8
|
import { makeQueryKey } from "./lib.js"
|
|
9
9
|
|
|
10
|
-
export const getQueryKey = (h: {
|
|
10
|
+
export const getQueryKey = (h: { id: string }) => {
|
|
11
11
|
const key = makeQueryKey(h)
|
|
12
12
|
const ns = key.filter((_) => _.startsWith("$"))
|
|
13
13
|
// we invalidate the parent namespace e.g $project/$configuration.get, we invalidate $project
|
|
14
14
|
// for $project/$configuration/$something.get, we invalidate $project/$configuration
|
|
15
15
|
const k = ns.length ? ns.length > 1 ? ns.slice(0, ns.length - 1) : ns : undefined
|
|
16
|
-
if (!k) throw new Error("empty query key for: " + h.
|
|
16
|
+
if (!k) throw new Error("empty query key for: " + h.id)
|
|
17
17
|
return k
|
|
18
18
|
}
|
|
19
19
|
|
|
@@ -180,7 +180,7 @@ export const makeMutation = () => {
|
|
|
180
180
|
const queryKey = getQueryKey(self)
|
|
181
181
|
|
|
182
182
|
if (options?.queryInvalidation) {
|
|
183
|
-
const opts = options.queryInvalidation(queryKey, self.
|
|
183
|
+
const opts = options.queryInvalidation(queryKey, self.id)
|
|
184
184
|
if (!opts.length) {
|
|
185
185
|
return Effect.void
|
|
186
186
|
}
|
package/src/query.ts
CHANGED
|
@@ -75,7 +75,7 @@ export const makeQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
|
|
|
75
75
|
handler
|
|
76
76
|
.pipe(
|
|
77
77
|
Effect.tapDefect(reportRuntimeError),
|
|
78
|
-
Effect.withSpan(`query ${q.
|
|
78
|
+
Effect.withSpan(`query ${q.id}`, { captureStackTrace: false }),
|
|
79
79
|
meta?.["span"] ? Effect.withParentSpan(meta["span"] as Span) : (_) => _
|
|
80
80
|
),
|
|
81
81
|
{ signal }
|
|
@@ -100,7 +100,7 @@ export const makeQuery = <R>(getRuntime: () => Runtime.Runtime<R>) => {
|
|
|
100
100
|
handler(req.value)
|
|
101
101
|
.pipe(
|
|
102
102
|
Effect.tapDefect(reportRuntimeError),
|
|
103
|
-
Effect.withSpan(`query ${q.
|
|
103
|
+
Effect.withSpan(`query ${q.id}`, { captureStackTrace: false }),
|
|
104
104
|
meta?.["span"] ? Effect.withParentSpan(meta["span"] as Span) : (_) => _
|
|
105
105
|
),
|
|
106
106
|
{ signal }
|
package/test/Mutation.test.ts
CHANGED
|
@@ -23,9 +23,31 @@ describe("alt2", () => {
|
|
|
23
23
|
let executed = false
|
|
24
24
|
|
|
25
25
|
const someMutation = {
|
|
26
|
-
|
|
27
|
-
mutate: (() => {}) as unknown as (a: number, b: string) => Effect.Effect<string, number,
|
|
28
|
-
}
|
|
26
|
+
id: "Test Action",
|
|
27
|
+
mutate: (() => {}) as unknown as (a: number, b: string) => Effect.Effect<string, number, CommandContext>
|
|
28
|
+
} as const
|
|
29
|
+
const someMutation2 = Object.assign(
|
|
30
|
+
(() => {}) as unknown as (a: number, b: string) => Effect.Effect<string, number, CommandContext>,
|
|
31
|
+
{
|
|
32
|
+
id: "Test Action"
|
|
33
|
+
} as const
|
|
34
|
+
)
|
|
35
|
+
const command1 = Command.alt2(someMutation2)((fn) =>
|
|
36
|
+
fn(
|
|
37
|
+
function*() {
|
|
38
|
+
expect(typeof fn.mutate).toBe("function")
|
|
39
|
+
expect(fn.id).toBe("Test Action")
|
|
40
|
+
expect(fn.namespace).toBe("action.Test Action")
|
|
41
|
+
expect(fn.namespaced("a")).toBe("action.Test Action.a")
|
|
42
|
+
}
|
|
43
|
+
)
|
|
44
|
+
)
|
|
45
|
+
yield* unwrap(command1.handle())
|
|
46
|
+
expect(command1.action).toBe("Test Action")
|
|
47
|
+
expect(command1.id).toBe("Test Action")
|
|
48
|
+
expect(command1.namespace).toBe("action.Test Action")
|
|
49
|
+
expect(command1.namespaced("a")).toBe("action.Test Action.a")
|
|
50
|
+
|
|
29
51
|
const command = Command.alt2(someMutation)((fn) =>
|
|
30
52
|
fn(
|
|
31
53
|
function*() {
|
|
@@ -55,7 +77,7 @@ describe("alt2", () => {
|
|
|
55
77
|
Effect.tap(() => executed = true)
|
|
56
78
|
)
|
|
57
79
|
)
|
|
58
|
-
|
|
80
|
+
|
|
59
81
|
expect(command.action).toBe("Test Action")
|
|
60
82
|
expect(command.id).toBe("Test Action")
|
|
61
83
|
expect(command.namespace).toBe("action.Test Action")
|
package/test/dist/stubs.d.ts
CHANGED
|
@@ -13,12 +13,16 @@ export declare const useExperimental: (options?: {
|
|
|
13
13
|
fn: <const Id extends string>(id: Id) => Commander.Gen<Toast.Toast | WithToast, Id> & Commander.NonGen<Toast.Toast | WithToast, Id>;
|
|
14
14
|
wrap: <const Id extends string, Args extends Array<unknown>, A_1, E_1, R_2>(mutation: {
|
|
15
15
|
mutate: (...args: Args) => Effect.Effect<A_1, E_1, R_2>;
|
|
16
|
-
|
|
17
|
-
}) =>
|
|
16
|
+
id: Id;
|
|
17
|
+
} | (((...args: Args) => Effect.Effect<A_1, E_1, R_2>) & {
|
|
18
|
+
id: Id;
|
|
19
|
+
})) => Commander.GenWrap<Toast.Toast | WithToast, Id, Args, A_1, E_1, R_2> & Commander.NonGenWrap<Toast.Toast | WithToast, Id, Args, A_1, E_1, R_2>;
|
|
18
20
|
alt2: <const Id extends string, MutArgs extends Array<unknown>, MutA, MutE, MutR>(id: Id | {
|
|
19
|
-
|
|
21
|
+
id: Id;
|
|
20
22
|
mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
|
|
21
|
-
}
|
|
23
|
+
} | (((...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>) & {
|
|
24
|
+
id: Id;
|
|
25
|
+
})) => <Args_1 extends Array<unknown>, A_2, E_2, R_3 extends Toast.Toast | WithToast | import("../src/experimental/commander.js").CommandContext>(handler: (ctx: Effect.fn.Gen & Effect.fn.NonGen & Commander.CommandContextLocal<Id> & {
|
|
22
26
|
mutate: (...args: MutArgs) => Effect.Effect<MutA, MutE, MutR>;
|
|
23
27
|
}) => (...args: Args_1) => Effect.Effect<A_2, E_2, R_3>) => Commander.CommandOut<Args_1, A_2, E_2, R_3, Id>;
|
|
24
28
|
takeOver: <Args_1 extends any[], A_3, E_3, R_4, const Id extends string>(command: Commander.CommandOut<Args_1, A_3, E_3, R_4, Id>) => (...args: Args_1) => Effect.Effect<A_3, E_3, import("../src/experimental/commander.js").CommandContext | Exclude<Exclude<R_4, import("../src/experimental/commander.js").CommandContext>, import("effect/Tracer").ParentSpan>>;
|
package/test/dist/stubs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAElD,OAAO,KAAK,KAAK,MAAM,8BAA8B,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AA4C5D,eAAO,MAAM,aAAa,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,oCAgBzG,CAAA;AAEH,eAAO,MAAM,eAAe,GAC1B,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE
|
|
1
|
+
{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAElD,OAAO,KAAK,KAAK,MAAM,8BAA8B,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AA4C5D,eAAO,MAAM,aAAa,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,oCAgBzG,CAAA;AAEH,eAAO,MAAM,eAAe,GAC1B,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;;;;;;;;;;;;;;;;;2IAjC9F,GAAE;gCAUD,CAAC;qBAIuF,CAAC;oFAK3D,GAAG,6EAG7B,GAChB;iJAUoB,GAAI,qEAAoE,GAAI,gEAEjD,CAAC,4BAC9B,GAAI,8FACoC,GAAI;;;;mFAEgB,CAAC,4BAEtD,GAAI,8DAA6D,GAAI;4EAEG,CAAC;qBAAyB,CAAC,2BAA0B,GAAI;iBAAsD,CAAC,6BAA4B,GAAI;iBAAiF,CAAC,qCAAoC,GAAI;2DAA0H,GAAI;;CADxe,CAAA"}
|