@effect-app/vue 2.60.2 → 2.60.4
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
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withToast.d.ts","sourceRoot":"","sources":["../../src/experimental/withToast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAQ,KAAK,MAAM,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAA;AAElD,MAAM,WAAW,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC;IACrE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IACtD,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IAC5D,SAAS,EACL,MAAM,GACN,CAAC,CACD,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACvB,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAC9D;;qCAMW,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,WACzC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC;;AAJvC,qBAAa,SAAU,SAAQ,
|
|
1
|
+
{"version":3,"file":"withToast.d.ts","sourceRoot":"","sources":["../../src/experimental/withToast.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAQ,KAAK,MAAM,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,EAAkB,KAAK,EAAE,MAAM,YAAY,CAAA;AAElD,MAAM,WAAW,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC;IACrE,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IACtD,SAAS,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC,GAAG,IAAI,CAAA;IAC5D,SAAS,EACL,MAAM,GACN,CAAC,CACD,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EACvB,GAAG,IAAI,EAAE,IAAI,KACV,MAAM,GAAG;QAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAC9D;;qCAMW,CAAC,EAAE,CAAC,EAAE,IAAI,SAAS,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,WACzC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC;;AAJvC,qBAAa,SAAU,SAAQ,cAgE7B;CAAG"}
|
|
@@ -16,10 +16,11 @@ export class WithToast extends Effect.Service()("WithToast", {
|
|
|
16
16
|
return yield* self.pipe(Effect.tap((a) => options.onSuccess === null ? Effect.void : toast.success(typeof options.onSuccess === "string"
|
|
17
17
|
? options.onSuccess
|
|
18
18
|
: options.onSuccess(a, ...args), toastId !== undefined ? { id: toastId, timeout: baseTimeout } : { timeout: baseTimeout })), Effect.tapErrorCause(Effect.fnUntraced(function* (cause) {
|
|
19
|
+
yield* Effect.logDebug("WithToast - caught error cause: " + Cause.squash(cause), Cause.isInterruptedOnly(cause), cause);
|
|
19
20
|
// probably doesn't catch, although sometimes seems to?
|
|
20
21
|
if (Cause.isInterruptedOnly(cause)) {
|
|
21
22
|
if (toastId)
|
|
22
|
-
yield* toast.dismiss(toastId);
|
|
23
|
+
yield* toast.dismiss(toastId).pipe(Effect.delay("1 micros"));
|
|
23
24
|
return;
|
|
24
25
|
}
|
|
25
26
|
const t = typeof options.onFailure === "string"
|
|
@@ -33,12 +34,12 @@ export class WithToast extends Effect.Service()("WithToast", {
|
|
|
33
34
|
}
|
|
34
35
|
yield* toast.error(t, toastId !== undefined ? { ...opts, id: toastId } : opts);
|
|
35
36
|
})), Effect.onExit(Effect.fnUntraced(function* (exit) {
|
|
36
|
-
if (!Exit.isFailure(exit))
|
|
37
|
+
if (!Exit.isFailure(exit))
|
|
37
38
|
return;
|
|
38
|
-
|
|
39
|
+
yield* Effect.logDebug("WithToast - caught error cause: " + Cause.squash(exit.cause), Cause.isInterruptedOnly(exit.cause), exit.cause);
|
|
39
40
|
if (Cause.isInterruptedOnly(exit.cause)) {
|
|
40
41
|
if (toastId)
|
|
41
|
-
yield* toast.dismiss(toastId);
|
|
42
|
+
yield* toast.dismiss(toastId).pipe(Effect.delay("1 micros"));
|
|
42
43
|
return;
|
|
43
44
|
}
|
|
44
45
|
})), toastId !== undefined ? Effect.provideService(CurrentToastId, CurrentToastId.of({ toastId })) : (_) => _);
|
|
@@ -46,4 +47,4 @@ export class WithToast extends Effect.Service()("WithToast", {
|
|
|
46
47
|
})
|
|
47
48
|
}) {
|
|
48
49
|
}
|
|
49
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
50
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid2l0aFRvYXN0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2V4cGVyaW1lbnRhbC93aXRoVG9hc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFlLE1BQU0sWUFBWSxDQUFBO0FBQzdELE9BQU8sRUFBRSxjQUFjLEVBQUUsS0FBSyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBY2xELG1FQUFtRTtBQUNuRSxNQUFNLE9BQU8sU0FBVSxTQUFRLE1BQU0sQ0FBQyxPQUFPLEVBQWEsQ0FBQyxXQUFXLEVBQUU7SUFDdEUsTUFBTSxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQzFCLE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLEtBQUssQ0FBQTtRQUMxQixPQUFPLENBQ0wsT0FBaUMsRUFDakMsRUFBRSxDQUNGLE1BQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUMsSUFBNEIsRUFBRSxHQUFHLElBQVU7WUFDckUsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLE9BQU8sSUFBSSxLQUFLLENBQUE7WUFDNUMsTUFBTSxPQUFPLEdBQUcsT0FBTyxDQUFDLFNBQVMsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUk7WUFDeEUsV0FBVztZQUNYLE9BQU8sT0FBTyxDQUFDLFNBQVMsS0FBSyxRQUFRO2dCQUNuQyxDQUFDLENBQUMsT0FBTyxDQUFDLFNBQVM7Z0JBQ25CLENBQUMsQ0FBQyxPQUFPLENBQUMsU0FBUyxDQUFDLEdBQUcsSUFBSSxDQUFDO1lBQzlCLHlCQUF5QjthQUMxQixDQUFBO1lBQ0QsT0FBTyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUNyQixNQUFNLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FD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
|
package/package.json
CHANGED
|
@@ -39,11 +39,17 @@ export class WithToast extends Effect.Service<WithToast>()("WithToast", {
|
|
|
39
39
|
)
|
|
40
40
|
),
|
|
41
41
|
Effect.tapErrorCause(Effect.fnUntraced(function*(cause) {
|
|
42
|
+
yield* Effect.logDebug(
|
|
43
|
+
"WithToast - caught error cause: " + Cause.squash(cause),
|
|
44
|
+
Cause.isInterruptedOnly(cause),
|
|
45
|
+
cause
|
|
46
|
+
)
|
|
42
47
|
// probably doesn't catch, although sometimes seems to?
|
|
43
48
|
if (Cause.isInterruptedOnly(cause)) {
|
|
44
|
-
if (toastId) yield* toast.dismiss(toastId)
|
|
49
|
+
if (toastId) yield* toast.dismiss(toastId).pipe(Effect.delay("1 micros"))
|
|
45
50
|
return
|
|
46
51
|
}
|
|
52
|
+
|
|
47
53
|
const t = typeof options.onFailure === "string"
|
|
48
54
|
? options.onFailure
|
|
49
55
|
: options.onFailure(Cause.failureOption(cause), ...args)
|
|
@@ -57,12 +63,16 @@ export class WithToast extends Effect.Service<WithToast>()("WithToast", {
|
|
|
57
63
|
yield* toast.error(t, toastId !== undefined ? { ...opts, id: toastId } : opts)
|
|
58
64
|
})),
|
|
59
65
|
Effect.onExit(Effect.fnUntraced(function*(exit) {
|
|
60
|
-
if (!Exit.isFailure(exit))
|
|
66
|
+
if (!Exit.isFailure(exit)) return
|
|
67
|
+
yield* Effect.logDebug(
|
|
68
|
+
"WithToast - caught error cause: " + Cause.squash(exit.cause),
|
|
69
|
+
Cause.isInterruptedOnly(exit.cause),
|
|
70
|
+
exit.cause
|
|
71
|
+
)
|
|
61
72
|
if (Cause.isInterruptedOnly(exit.cause)) {
|
|
62
|
-
if (toastId) yield* toast.dismiss(toastId)
|
|
73
|
+
if (toastId) yield* toast.dismiss(toastId).pipe(Effect.delay("1 micros"))
|
|
63
74
|
return
|
|
64
75
|
}
|
|
65
|
-
|
|
66
76
|
})),
|
|
67
77
|
toastId !== undefined ? Effect.provideService(CurrentToastId, CurrentToastId.of({ toastId })) : (_) => _
|
|
68
78
|
)
|