@shivaedev/react 0.39.0 → 0.41.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 +23 -0
- package/README.md +76 -3
- package/dist/client/actionCompletion.d.ts.map +1 -1
- package/dist/client/actionCompletion.js +2 -2
- package/dist/client/actionCompletion.js.map +1 -1
- package/dist/client/adapters/SessionSignOut.d.ts +9 -0
- package/dist/client/adapters/SessionSignOut.d.ts.map +1 -0
- package/dist/client/adapters/SessionSignOut.js +18 -0
- package/dist/client/adapters/SessionSignOut.js.map +1 -0
- package/dist/client/adapters/crypto.d.ts +3 -0
- package/dist/client/adapters/crypto.d.ts.map +1 -0
- package/dist/client/adapters/crypto.js +9 -0
- package/dist/client/adapters/crypto.js.map +1 -0
- package/dist/client/adapters/handlerRuntime.d.ts +3 -0
- package/dist/client/adapters/handlerRuntime.d.ts.map +1 -0
- package/dist/client/adapters/handlerRuntime.js +4 -0
- package/dist/client/adapters/handlerRuntime.js.map +1 -0
- package/dist/client/adapters/useClock.d.ts +5 -0
- package/dist/client/adapters/useClock.d.ts.map +1 -0
- package/dist/client/adapters/useClock.js +9 -0
- package/dist/client/adapters/useClock.js.map +1 -0
- package/dist/client/adapters/useNewId.d.ts +5 -0
- package/dist/client/adapters/useNewId.d.ts.map +1 -0
- package/dist/client/adapters/useNewId.js +9 -0
- package/dist/client/adapters/useNewId.js.map +1 -0
- package/dist/client/adapters/usePromiseAction.d.ts +7 -0
- package/dist/client/adapters/usePromiseAction.d.ts.map +1 -0
- package/dist/client/adapters/usePromiseAction.js +16 -0
- package/dist/client/adapters/usePromiseAction.js.map +1 -0
- package/dist/client/adapters/useSessionRetry.d.ts +3 -0
- package/dist/client/adapters/useSessionRetry.d.ts.map +1 -0
- package/dist/client/adapters/useSessionRetry.js +48 -0
- package/dist/client/adapters/useSessionRetry.js.map +1 -0
- package/dist/client/adapters/useSignOut.d.ts +3 -2
- package/dist/client/adapters/useSignOut.d.ts.map +1 -1
- package/dist/client/adapters/useSignOut.js +6 -1
- package/dist/client/adapters/useSignOut.js.map +1 -1
- package/dist/client/adapters/useUndoableChange.d.ts +31 -0
- package/dist/client/adapters/useUndoableChange.d.ts.map +1 -0
- package/dist/client/adapters/useUndoableChange.js +48 -0
- package/dist/client/adapters/useUndoableChange.js.map +1 -0
- package/dist/client/mountLive.js +1 -1
- package/dist/client/mountLive.js.map +1 -1
- package/dist/client/resultState.d.ts.map +1 -1
- package/dist/client/resultState.js +2 -2
- package/dist/client/resultState.js.map +1 -1
- package/dist/client/saveState.d.ts.map +1 -1
- package/dist/client/saveState.js +2 -2
- package/dist/client/saveState.js.map +1 -1
- package/dist/client/sessionBoundary.d.ts +6 -3
- package/dist/client/sessionBoundary.d.ts.map +1 -1
- package/dist/client/sessionBoundary.js +16 -4
- package/dist/client/sessionBoundary.js.map +1 -1
- package/dist/internal/adapters/useLatestCallback.d.ts +1 -1
- package/dist/internal/adapters/useLatestCallback.d.ts.map +1 -1
- package/dist/internal/adapters/useLatestCallback.js.map +1 -1
- package/dist/internal/sessionRecheck.d.ts +1 -2
- package/dist/internal/sessionRecheck.d.ts.map +1 -1
- package/dist/internal/sessionRecheck.js +2 -6
- package/dist/internal/sessionRecheck.js.map +1 -1
- package/package.json +17 -17
- package/src/client/actionCompletion.ts +2 -2
- package/src/client/adapters/SessionSignOut.ts +27 -0
- package/src/client/adapters/crypto.ts +14 -0
- package/src/client/adapters/handlerRuntime.ts +4 -0
- package/src/client/adapters/useClock.ts +11 -0
- package/src/client/adapters/useNewId.ts +11 -0
- package/src/client/adapters/usePromiseAction.ts +25 -0
- package/src/client/adapters/useSessionRetry.ts +54 -0
- package/src/client/adapters/useSignOut.ts +6 -1
- package/src/client/adapters/useUndoableChange.ts +82 -0
- package/src/client/mountLive.ts +1 -1
- package/src/client/resultState.ts +2 -2
- package/src/client/saveState.ts +2 -2
- package/src/client/sessionBoundary.ts +33 -17
- package/src/internal/adapters/useLatestCallback.ts +1 -1
- package/src/internal/sessionRecheck.ts +2 -7
package/dist/client/mountLive.js
CHANGED
|
@@ -8,7 +8,7 @@ import { recheckUnauthorized } from "#internal/sessionRecheck.ts";
|
|
|
8
8
|
function recheckFailure(registry, failure) {
|
|
9
9
|
const error = Option.flatMap(failure, Cause.findErrorOption);
|
|
10
10
|
if (Option.isSome(error)) {
|
|
11
|
-
void recheckUnauthorized(registry, error.value
|
|
11
|
+
void recheckUnauthorized(registry, error.value);
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
export const mountLive = Effect.fn("Live.mountLive")(function* (client, coalesceWindow) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountLive.js","sourceRoot":"","sources":["../../src/client/mountLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,SAAS,cAAc,CAAC,QAAmC,EAAE,OAA4C;IACxG,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,KAAK,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"mountLive.js","sourceRoot":"","sources":["../../src/client/mountLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,SAAS,cAAc,CAAC,QAAmC,EAAE,OAA4C;IACxG,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;IAC7D,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,KAAK,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;AACF,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAe,EAAE,cAA+B;IAC/G,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;IAClD,MAAM,QAAQ,GAAsB,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAW,CAAC;IACjC,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,MAAM,IAAI,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;QACnC,IAAI,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9G,IACC,cAAc,KAAK,SAAS;mBACzB,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC;mBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC;mBAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EACtC,CAAC;gBACF,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC;YAC/E,CAAC;YACD,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3B,QAAQ,CAAC,IAAI,CACZ,QAAQ,CAAC,SAAS,CACjB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EACjD,CAAC,OAAO,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,EAC9C,EAAE,SAAS,EAAE,IAAI,EAAE,CACnB,CACD,CAAC;YACF,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAChD,CAAC;IACF,CAAC;IACD,OAAO,GAAS,EAAE;QACjB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAChC,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultState.d.ts","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,KAAK,QAAQ,EAAE,KAAK,MAAM,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"resultState.d.ts","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,12 @@ import { RegistryContext, useAtomRefresh, useAtomSet, useAtomValue } from "@effe
|
|
|
2
2
|
import { Cause, Option, Predicate } from "effect";
|
|
3
3
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
4
4
|
import { useContext, useEffect, useState } from "react";
|
|
5
|
+
import { isUnauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
5
6
|
import { acceptLoaderQuery } from "#adapters/queryHandoff.ts";
|
|
6
7
|
import { useActionResult } from "#client/adapters/useActionResult.ts";
|
|
7
8
|
import { useLiveWindow } from "#client/adapters/useLiveWindow.ts";
|
|
8
9
|
import { usePermissionFailure } from "#internal/adapters/usePermissionFailure.ts";
|
|
9
10
|
import { useQueryNotice } from "#internal/adapters/useQueryNotice.ts";
|
|
10
|
-
import { requestsRecheck } from "#internal/sessionRecheck.ts";
|
|
11
11
|
import { useActionSource } from "./actionCompletion.js";
|
|
12
12
|
import { useSessionRecheck } from "./sessionBoundary.js";
|
|
13
13
|
function state(result, data = AsyncResult.value(result)) {
|
|
@@ -22,7 +22,7 @@ function state(result, data = AsyncResult.value(result)) {
|
|
|
22
22
|
function useRecheckOnUnauthorized(result, enabled = true) {
|
|
23
23
|
const recheck = useSessionRecheck();
|
|
24
24
|
useEffect(() => {
|
|
25
|
-
if (enabled && AsyncResult.isFailure(result) && Option.exists(Cause.findErrorOption(result.cause),
|
|
25
|
+
if (enabled && AsyncResult.isFailure(result) && Option.exists(Cause.findErrorOption(result.cause), isUnauthorized)) {
|
|
26
26
|
recheck();
|
|
27
27
|
}
|
|
28
28
|
}, [enabled, recheck, result]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultState.js","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC/F,OAAO,EAAE,KAAK,EAA8B,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAC9E,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"resultState.js","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveState.d.ts","sourceRoot":"","sources":["../../src/client/saveState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"saveState.d.ts","sourceRoot":"","sources":["../../src/client/saveState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKvC,OAAO,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAKzF,MAAM,WAAW,SAAS,CAAC,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC;IACvE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;CACzB;AACD,wBAAgB,YAAY,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EACvE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,aAAa,CAAC,GAAG,SAAS,EACnE,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,GAC3B,SAAS,CAAC,CAAC,GAAG,aAAa,CAAC,CAgC9B"}
|
package/dist/client/saveState.js
CHANGED
|
@@ -3,8 +3,8 @@ import { Cause, Option } from "effect";
|
|
|
3
3
|
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
4
4
|
import * as Atom from "effect/reactivity/Atom";
|
|
5
5
|
import { useCallback, useContext, useEffect } from "react";
|
|
6
|
+
import { isUnauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
6
7
|
import { FieldFailure, Invalid } from "@shivaedev/form/shape.ts";
|
|
7
|
-
import { requestsRecheck } from "#internal/sessionRecheck.ts";
|
|
8
8
|
import { useSessionRecheck } from "./sessionBoundary.js";
|
|
9
9
|
const idle = Atom.make(AsyncResult.initial());
|
|
10
10
|
const clean = Atom.make(false);
|
|
@@ -14,7 +14,7 @@ export function useSaveState(form, settled) {
|
|
|
14
14
|
const result = useAtomValue(form?.submit ?? idle);
|
|
15
15
|
const dirty = useAtomValue(form?.dirty ?? clean);
|
|
16
16
|
useEffect(() => {
|
|
17
|
-
if (AsyncResult.isFailure(result) && Option.exists(Cause.findErrorOption(result.cause),
|
|
17
|
+
if (AsyncResult.isFailure(result) && Option.exists(Cause.findErrorOption(result.cause), isUnauthorized)) {
|
|
18
18
|
recheck();
|
|
19
19
|
}
|
|
20
20
|
}, [recheck, result]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveState.js","sourceRoot":"","sources":["../../src/client/saveState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"saveState.js","sourceRoot":"","sources":["../../src/client/saveState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAA0B,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC;AAC9C,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAS/B,MAAM,UAAU,YAAY,CAC3B,IAAmE,EACnE,OAA6B;IAE7B,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,iBAAiB,EAAE,CAAC;IACpC,MAAM,MAAM,GAA2E,YAAY,CAAC,IAAI,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC;IAC1H,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC;IACjD,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC,EAAE,CAAC;YACzG,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IACtB,SAAS,CACR,GAAG,EAAE,CACJ,IAAI;WACD,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3C,IAAI,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClD,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACF,CAAC,CAAC,EACH,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CACzB,CAAC;IACF,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7B,IAAI,IAAI,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;YAC7D,OAAO;QACR,CAAC;QACD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtC,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;IACrB,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAC5B,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EACzB,CAAC,KAAK,EAA8B,EAAE,CAAC,CAAC,CAAC,KAAK,YAAY,YAAY,IAAI,KAAK,YAAY,OAAO,CAAC,CACnG,CAAC;IACF,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;AACnG,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import type { Duration } from "effect";
|
|
1
|
+
import type { Duration, Effect } from "effect";
|
|
2
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
2
4
|
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
3
5
|
import { type ReactNode } from "react";
|
|
4
6
|
export interface SessionBoundaryProps<TSession, TClient> {
|
|
@@ -7,11 +9,12 @@ export interface SessionBoundaryProps<TSession, TClient> {
|
|
|
7
9
|
readonly identify: (session: TSession) => string;
|
|
8
10
|
readonly liveCoalesceWindow?: Duration.Input | undefined;
|
|
9
11
|
readonly navigate?: ((href: string) => void) | undefined;
|
|
10
|
-
readonly recheck: () => void
|
|
12
|
+
readonly recheck: (() => void) | Effect.Effect<unknown, unknown, AtomRegistry.AtomRegistry>;
|
|
11
13
|
readonly redirectTo?: string | undefined;
|
|
12
14
|
readonly session: TSession | undefined;
|
|
13
15
|
readonly signedOut?: ReactNode;
|
|
16
|
+
readonly signOut?: Atom.Atom<AsyncResult.AsyncResult<unknown, unknown>> | undefined;
|
|
14
17
|
}
|
|
15
18
|
export declare function useSessionRecheck(): () => void;
|
|
16
|
-
export declare function SessionBoundary<TSession, TClient>({ session, liveCoalesceWindow, identify, connect, recheck, signedOut, redirectTo, navigate, children, }: SessionBoundaryProps<TSession, TClient>): ReactNode;
|
|
19
|
+
export declare function SessionBoundary<TSession, TClient>({ session, liveCoalesceWindow, identify, connect, recheck, signedOut, signOut, redirectTo, navigate, children, }: SessionBoundaryProps<TSession, TClient>): ReactNode;
|
|
17
20
|
//# sourceMappingURL=sessionBoundary.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionBoundary.d.ts","sourceRoot":"","sources":["../../src/client/sessionBoundary.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionBoundary.d.ts","sourceRoot":"","sources":["../../src/client/sessionBoundary.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAA2B,KAAK,SAAS,EAAc,MAAM,OAAO,CAAC;AAS5E,MAAM,WAAW,oBAAoB,CAAC,QAAQ,EAAE,OAAO;IACtD,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,SAAS,CAAC;IAClD,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAC,YAAY,KAAK,OAAO,CAAC;IACtF,QAAQ,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC;IACjD,QAAQ,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC,GAAG,SAAS,CAAC;IACzD,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IAC5F,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC;IAC/B,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CACpF;AACD,wBAAgB,iBAAiB,IAAI,MAAM,IAAI,CAE9C;AACD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,EAClD,OAAO,EACP,kBAAkB,EAClB,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,GACR,EAAE,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,SAAS,CA6BrD"}
|
|
@@ -3,18 +3,30 @@ import { createElement, Fragment, useContext } from "react";
|
|
|
3
3
|
import { DraftSessionContext } from "@shivaedev/form/adapters/react.ts";
|
|
4
4
|
import { SessionGeneration } from "#client/adapters/SessionGeneration.ts";
|
|
5
5
|
import { SessionHandoff } from "#client/adapters/SessionHandoff.ts";
|
|
6
|
+
import { SessionSignOut } from "#client/adapters/SessionSignOut.ts";
|
|
7
|
+
import { useSessionRetry } from "#client/adapters/useSessionRetry.ts";
|
|
6
8
|
import { RecheckContext } from "#internal/RecheckContext.ts";
|
|
7
9
|
import { SignOutRegistryContext } from "#internal/SignOutRegistryContext.ts";
|
|
8
10
|
import { useDraftOwner } from "./useDraftOwner.js";
|
|
9
11
|
export function useSessionRecheck() {
|
|
10
12
|
return useContext(RecheckContext);
|
|
11
13
|
}
|
|
12
|
-
export function SessionBoundary({ session, liveCoalesceWindow, identify, connect, recheck, signedOut, redirectTo, navigate, children, }) {
|
|
14
|
+
export function SessionBoundary({ session, liveCoalesceWindow, identify, connect, recheck, signedOut, signOut, redirectTo, navigate, children, }) {
|
|
13
15
|
const registry = useContext(RegistryContext);
|
|
14
16
|
const id = session === undefined ? undefined : identify(session);
|
|
15
17
|
const current = useDraftOwner(id);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
const retry = useSessionRetry(recheck, id);
|
|
19
|
+
if (session === undefined) {
|
|
20
|
+
return createElement(Fragment, null, signedOut);
|
|
21
|
+
}
|
|
22
|
+
const generation = createElement(SessionGeneration, {
|
|
23
|
+
children,
|
|
24
|
+
connect,
|
|
25
|
+
identity: id,
|
|
26
|
+
liveCoalesceWindow,
|
|
27
|
+
recheck: retry,
|
|
28
|
+
session,
|
|
29
|
+
});
|
|
30
|
+
return createElement(SignOutRegistryContext.Provider, { value: registry }, createElement(DraftSessionContext.Provider, { value: current }, createElement(SessionHandoff, { key: id, navigate, redirectTo }, signOut === undefined ? generation : createElement(SessionSignOut, { action: signOut, recheck: retry }, generation))));
|
|
19
31
|
}
|
|
20
32
|
//# sourceMappingURL=sessionBoundary.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionBoundary.js","sourceRoot":"","sources":["../../src/client/sessionBoundary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionBoundary.js","sourceRoot":"","sources":["../../src/client/sessionBoundary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAKrD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAkB,UAAU,EAAE,MAAM,OAAO,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAanD,MAAM,UAAU,iBAAiB;IAChC,OAAO,UAAU,CAAC,cAAc,CAAC,CAAC;AACnC,CAAC;AACD,MAAM,UAAU,eAAe,CAAoB,EAClD,OAAO,EACP,kBAAkB,EAClB,QAAQ,EACR,OAAO,EACP,OAAO,EACP,SAAS,EACT,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,GACiC;IACzC,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAC7C,MAAM,EAAE,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjE,MAAM,OAAO,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC3C,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;IACjD,CAAC;IACD,MAAM,UAAU,GAAG,aAAa,CAAC,iBAAoC,EAAE;QACtE,QAAQ;QACR,OAAO;QACP,QAAQ,EAAE,EAAE;QACZ,kBAAkB;QAClB,OAAO,EAAE,KAAK;QACd,OAAO;KACP,CAAC,CAAC;IACH,OAAO,aAAa,CACnB,sBAAsB,CAAC,QAAQ,EAC/B,EAAE,KAAK,EAAE,QAAQ,EAAE,EACnB,aAAa,CACZ,mBAAmB,CAAC,QAAQ,EAC5B,EAAE,KAAK,EAAE,OAAO,EAAE,EAClB,aAAa,CACZ,cAAc,EACd,EAAE,GAAG,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EACjC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,CAAC,CACnH,CACD,CACD,CAAC;AACH,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function useLatestCallback(callback: () =>
|
|
1
|
+
export declare function useLatestCallback<A>(callback: () => A): () => A;
|
|
2
2
|
//# sourceMappingURL=useLatestCallback.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLatestCallback.d.ts","sourceRoot":"","sources":["../../../src/internal/adapters/useLatestCallback.ts"],"names":[],"mappings":"AAEA,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"useLatestCallback.d.ts","sourceRoot":"","sources":["../../../src/internal/adapters/useLatestCallback.ts"],"names":[],"mappings":"AAEA,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,CAM/D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLatestCallback.js","sourceRoot":"","sources":["../../../src/internal/adapters/useLatestCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE7D,MAAM,UAAU,iBAAiB,
|
|
1
|
+
{"version":3,"file":"useLatestCallback.js","sourceRoot":"","sources":["../../../src/internal/adapters/useLatestCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE7D,MAAM,UAAU,iBAAiB,CAAI,QAAiB;IACrD,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;IACnC,eAAe,CAAC,GAAG,EAAE;QACpB,SAAS,CAAC,OAAO,GAAG,QAAQ,CAAC;IAC9B,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IACf,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
2
2
|
export declare function registerSessionRecheck(registry: AtomRegistry.AtomRegistry, recheck: () => void): () => void;
|
|
3
|
-
export declare function
|
|
4
|
-
export declare function recheckUnauthorized(registry: AtomRegistry.AtomRegistry, error: unknown, connection?: boolean): Promise<void>;
|
|
3
|
+
export declare function recheckUnauthorized(registry: AtomRegistry.AtomRegistry, error: unknown): Promise<void>;
|
|
5
4
|
//# sourceMappingURL=sessionRecheck.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionRecheck.d.ts","sourceRoot":"","sources":["../../src/internal/sessionRecheck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionRecheck.d.ts","sourceRoot":"","sources":["../../src/internal/sessionRecheck.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAKpE,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,CAAC,YAAY,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAK3G;AAED,wBAAsB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAI5G"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { RpcClientError } from "effect/rpc/RpcClientError";
|
|
2
1
|
import { isUnauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
2
|
const rechecks = new WeakMap();
|
|
4
3
|
export function registerSessionRecheck(registry, recheck) {
|
|
@@ -7,11 +6,8 @@ export function registerSessionRecheck(registry, recheck) {
|
|
|
7
6
|
rechecks.delete(registry);
|
|
8
7
|
};
|
|
9
8
|
}
|
|
10
|
-
export function
|
|
11
|
-
|
|
12
|
-
}
|
|
13
|
-
export async function recheckUnauthorized(registry, error, connection = false) {
|
|
14
|
-
if (requestsRecheck(error, connection)) {
|
|
9
|
+
export async function recheckUnauthorized(registry, error) {
|
|
10
|
+
if (isUnauthorized(error)) {
|
|
15
11
|
await rechecks.get(registry)?.();
|
|
16
12
|
}
|
|
17
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionRecheck.js","sourceRoot":"","sources":["../../src/internal/sessionRecheck.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"sessionRecheck.js","sourceRoot":"","sources":["../../src/internal/sessionRecheck.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE/D,MAAM,QAAQ,GAAG,IAAI,OAAO,EAAyC,CAAC;AAEtE,MAAM,UAAU,sBAAsB,CAAC,QAAmC,EAAE,OAAmB;IAC9F,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,GAAG,EAAE;QACX,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,QAAmC,EAAE,KAAc;IAC5F,IAAI,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,MAAM,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;IAClC,CAAC;AACF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.41.0",
|
|
4
4
|
"description": "React query, action, editor and session hooks for native Effect atoms",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
"imports": {
|
|
21
21
|
"#test/*": "./src/test-support/*",
|
|
22
22
|
"#*.ts": {
|
|
23
|
-
"source": "./src/*.ts",
|
|
23
|
+
"@shivaedev/source": "./src/*.ts",
|
|
24
24
|
"types": "./dist/*.d.ts",
|
|
25
25
|
"default": "./dist/*.js"
|
|
26
26
|
}
|
|
27
27
|
},
|
|
28
28
|
"exports": {
|
|
29
29
|
"./*.ts": {
|
|
30
|
-
"source": "./src/*.ts",
|
|
30
|
+
"@shivaedev/source": "./src/*.ts",
|
|
31
31
|
"types": "./dist/*.d.ts",
|
|
32
32
|
"default": "./dist/*.js"
|
|
33
33
|
},
|
|
@@ -45,26 +45,26 @@
|
|
|
45
45
|
"README.md"
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@shivaedev/access": "0.
|
|
49
|
-
"@shivaedev/contract": "0.
|
|
50
|
-
"@shivaedev/errors": "0.
|
|
51
|
-
"@shivaedev/form": "0.
|
|
52
|
-
"@shivaedev/identity": "0.
|
|
48
|
+
"@shivaedev/access": "0.5.0",
|
|
49
|
+
"@shivaedev/contract": "0.36.0",
|
|
50
|
+
"@shivaedev/errors": "0.9.0",
|
|
51
|
+
"@shivaedev/form": "0.17.0",
|
|
52
|
+
"@shivaedev/identity": "0.25.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
55
|
"@effect/atom-react": "4.0.6",
|
|
56
56
|
"@effect/platform-node": "4.0.6",
|
|
57
57
|
"@effect/sql-pg": "4.0.6",
|
|
58
58
|
"@effect/sql-sqlite-node": "4.0.6",
|
|
59
|
-
"@shivaedev/changes": "0.
|
|
60
|
-
"@shivaedev/jobs": "0.
|
|
61
|
-
"@shivaedev/quality": "0.
|
|
62
|
-
"@shivaedev/server": "0.
|
|
63
|
-
"@shivaedev/service": "0.
|
|
64
|
-
"@shivaedev/sql": "0.
|
|
65
|
-
"@shivaedev/test-kits": "0.
|
|
66
|
-
"@shivaedev/test-sql": "0.
|
|
67
|
-
"@shivaedev/test-story": "0.
|
|
59
|
+
"@shivaedev/changes": "0.10.0",
|
|
60
|
+
"@shivaedev/jobs": "0.35.1",
|
|
61
|
+
"@shivaedev/quality": "0.61.0",
|
|
62
|
+
"@shivaedev/server": "0.24.1",
|
|
63
|
+
"@shivaedev/service": "0.7.0",
|
|
64
|
+
"@shivaedev/sql": "0.38.0",
|
|
65
|
+
"@shivaedev/test-kits": "0.3.1",
|
|
66
|
+
"@shivaedev/test-sql": "0.21.0",
|
|
67
|
+
"@shivaedev/test-story": "0.39.0",
|
|
68
68
|
"@tanstack/react-router": "1.170.46",
|
|
69
69
|
"@types/node": "24.19.2",
|
|
70
70
|
"@types/react": "19.3.0",
|
|
@@ -2,10 +2,10 @@ import { RegistryContext } from "@effect/atom-react";
|
|
|
2
2
|
import { Effect } from "effect";
|
|
3
3
|
import type * as Atom from "effect/reactivity/Atom";
|
|
4
4
|
import { useContext, useInsertionEffect, useMemo, useRef } from "react";
|
|
5
|
+
import { isUnauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
5
6
|
import type { AtomServices } from "#AtomServices.ts";
|
|
6
7
|
import { NoticeContext } from "#internal/NoticeContext.ts";
|
|
7
8
|
import { publishNotice } from "#internal/noticeStore.ts";
|
|
8
|
-
import { requestsRecheck } from "#internal/sessionRecheck.ts";
|
|
9
9
|
import type { NoticeFeedback } from "#notices.ts";
|
|
10
10
|
import { useSessionRecheck } from "./sessionBoundary.ts";
|
|
11
11
|
|
|
@@ -33,7 +33,7 @@ export function useActionSource<TInput, A, E, R, TRuntimeError>(
|
|
|
33
33
|
const lifetime = { active: false, registry };
|
|
34
34
|
function rejected(error: E, input: TInput) {
|
|
35
35
|
return Effect.gen(function* () {
|
|
36
|
-
if (lifetime.active &&
|
|
36
|
+
if (lifetime.active && isUnauthorized(error)) {
|
|
37
37
|
yield* Effect.sync(() => latestRef.current.recheck());
|
|
38
38
|
}
|
|
39
39
|
yield* Effect.sync(() => {
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { useAtomValue } from "@effect/atom-react";
|
|
2
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import { type ReactNode, useEffect, useState } from "react";
|
|
5
|
+
|
|
6
|
+
export function SessionSignOut({
|
|
7
|
+
action,
|
|
8
|
+
children,
|
|
9
|
+
recheck,
|
|
10
|
+
}: {
|
|
11
|
+
readonly action: Atom.Atom<AsyncResult.AsyncResult<unknown, unknown>>;
|
|
12
|
+
readonly children?: ReactNode;
|
|
13
|
+
readonly recheck: () => void;
|
|
14
|
+
}): ReactNode {
|
|
15
|
+
const result = useAtomValue(action);
|
|
16
|
+
const [held, hold] = useState(false);
|
|
17
|
+
const blocked = result.waiting || (held && !AsyncResult.isFailure(result));
|
|
18
|
+
if (held !== blocked) {
|
|
19
|
+
hold(blocked);
|
|
20
|
+
}
|
|
21
|
+
useEffect(() => {
|
|
22
|
+
if (held && AsyncResult.isSuccess(result) && !result.waiting) {
|
|
23
|
+
recheck();
|
|
24
|
+
}
|
|
25
|
+
}, [held, result, recheck]);
|
|
26
|
+
return blocked ? null : children;
|
|
27
|
+
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Crypto, Effect, Layer, PlatformError } from "effect";
|
|
2
|
+
|
|
3
|
+
export const clientCrypto = Layer.succeed(
|
|
4
|
+
Crypto.Crypto,
|
|
5
|
+
Crypto.make({
|
|
6
|
+
digest: (algorithm, data) =>
|
|
7
|
+
Effect.tryPromise({
|
|
8
|
+
catch: (cause) =>
|
|
9
|
+
PlatformError.systemError({ _tag: "Unknown", cause, description: "Could not compute digest", method: "digest", module: "Crypto" }),
|
|
10
|
+
try: () => globalThis.crypto.subtle.digest(algorithm, new Uint8Array(data)).then((buffer) => new Uint8Array(buffer)),
|
|
11
|
+
}),
|
|
12
|
+
randomBytes: (size) => globalThis.crypto.getRandomValues(new Uint8Array(size)),
|
|
13
|
+
}),
|
|
14
|
+
);
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { useAtomSuspense } from "@effect/atom-react";
|
|
2
|
+
import { Clock, Context } from "effect";
|
|
3
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
4
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
5
|
+
import { useCallback } from "react";
|
|
6
|
+
import { handlerRuntime } from "#client/adapters/handlerRuntime.ts";
|
|
7
|
+
|
|
8
|
+
export function useClock(runtime: Atom.Atom<AsyncResult.AsyncResult<Context.Context<never>, unknown>> = handlerRuntime): () => number {
|
|
9
|
+
const clock = Context.get(useAtomSuspense(runtime).value, Clock.Clock);
|
|
10
|
+
return useCallback(() => clock.currentTimeMillisUnsafe(), [clock]);
|
|
11
|
+
}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { useAtomSuspense } from "@effect/atom-react";
|
|
2
|
+
import { Context, Crypto, Effect } from "effect";
|
|
3
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
4
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
5
|
+
import { useCallback } from "react";
|
|
6
|
+
import { handlerRuntime } from "#client/adapters/handlerRuntime.ts";
|
|
7
|
+
|
|
8
|
+
export function useNewId(runtime: Atom.Atom<AsyncResult.AsyncResult<Context.Context<Crypto.Crypto>, unknown>> = handlerRuntime): () => string {
|
|
9
|
+
const crypto = Context.get(useAtomSuspense(runtime).value, Crypto.Crypto);
|
|
10
|
+
return useCallback(() => Effect.runSync(crypto.randomUUIDv4()), [crypto]);
|
|
11
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Cause, Effect } from "effect";
|
|
2
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
import { useInsertionEffect, useRef, useState } from "react";
|
|
4
|
+
import { type ActionState, useAction } from "#client/resultState.ts";
|
|
5
|
+
|
|
6
|
+
export function usePromiseAction<A>(run: () => PromiseLike<A>): ActionState<void, A, Cause.UnknownError>;
|
|
7
|
+
export function usePromiseAction<A, E>(run: () => PromiseLike<A>, options: { readonly catch: (cause: unknown) => E }): ActionState<void, A, E>;
|
|
8
|
+
export function usePromiseAction<A, E>(
|
|
9
|
+
run: () => PromiseLike<A>,
|
|
10
|
+
options?: { readonly catch: (cause: unknown) => E },
|
|
11
|
+
): ActionState<void, A, E | Cause.UnknownError> {
|
|
12
|
+
const latestRef = useRef({ reject: options?.catch, run });
|
|
13
|
+
useInsertionEffect(() => {
|
|
14
|
+
latestRef.current = { reject: options?.catch, run };
|
|
15
|
+
}, [run, options?.catch]);
|
|
16
|
+
const [atom] = useState(() =>
|
|
17
|
+
Atom.fn<void>()(() =>
|
|
18
|
+
Effect.tryPromise({
|
|
19
|
+
catch: (cause) => (latestRef.current.reject ? latestRef.current.reject(cause) : new Cause.UnknownError(cause)),
|
|
20
|
+
try: () => latestRef.current.run(),
|
|
21
|
+
}),
|
|
22
|
+
),
|
|
23
|
+
);
|
|
24
|
+
return useAction(atom);
|
|
25
|
+
}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import { RegistryContext } from "@effect/atom-react";
|
|
2
|
+
import { Effect, Fiber, Schedule } from "effect";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
import { useContext, useEffect, useMemo } from "react";
|
|
5
|
+
import type { SessionBoundaryProps } from "#client/sessionBoundary.ts";
|
|
6
|
+
import { useLatestCallback } from "#internal/adapters/useLatestCallback.ts";
|
|
7
|
+
|
|
8
|
+
export function useSessionRetry(recheck: SessionBoundaryProps<unknown, unknown>["recheck"], identity: string | undefined): () => void {
|
|
9
|
+
const registry = useContext(RegistryContext);
|
|
10
|
+
const latest = useLatestCallback(() => (Effect.isEffect(recheck) ? recheck : Effect.sync(recheck)));
|
|
11
|
+
const retry = useMemo(() => {
|
|
12
|
+
let running: Fiber.Fiber<unknown, unknown> | undefined;
|
|
13
|
+
function stop() {
|
|
14
|
+
if (running) {
|
|
15
|
+
Effect.runFork(Fiber.interrupt(running));
|
|
16
|
+
running = undefined;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
function start() {
|
|
20
|
+
if (running || identity === undefined) {
|
|
21
|
+
return;
|
|
22
|
+
}
|
|
23
|
+
const fiber = Effect.runFork(
|
|
24
|
+
Effect.suspend(latest).pipe(
|
|
25
|
+
Effect.retry(Schedule.min([Schedule.exponential("1 second"), Schedule.spaced("30 seconds")])),
|
|
26
|
+
Effect.provideService(AtomRegistry.AtomRegistry, registry),
|
|
27
|
+
),
|
|
28
|
+
);
|
|
29
|
+
running = fiber;
|
|
30
|
+
fiber.addObserver(() => {
|
|
31
|
+
if (running === fiber) {
|
|
32
|
+
running = undefined;
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
function resume() {
|
|
37
|
+
if (running && window.document.visibilityState === "visible") {
|
|
38
|
+
stop();
|
|
39
|
+
start();
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return { resume, start, stop };
|
|
43
|
+
}, [latest, registry, identity]);
|
|
44
|
+
useEffect(() => {
|
|
45
|
+
window.addEventListener("online", retry.resume);
|
|
46
|
+
window.addEventListener("visibilitychange", retry.resume);
|
|
47
|
+
return () => {
|
|
48
|
+
window.removeEventListener("online", retry.resume);
|
|
49
|
+
window.removeEventListener("visibilitychange", retry.resume);
|
|
50
|
+
retry.stop();
|
|
51
|
+
};
|
|
52
|
+
}, [retry]);
|
|
53
|
+
return retry.start;
|
|
54
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RegistryContext, useAtomMount } from "@effect/atom-react";
|
|
2
2
|
import { useRouter } from "@tanstack/react-router";
|
|
3
|
-
import { Effect } from "effect";
|
|
3
|
+
import { Effect, Option } from "effect";
|
|
4
4
|
import * as Atom from "effect/reactivity/Atom";
|
|
5
5
|
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
6
6
|
import { useContext, useEffect, useMemo } from "react";
|
|
@@ -46,6 +46,11 @@ export function useSignOut<A, E>(action: Atom.AtomResultFn<void, A, E>, options:
|
|
|
46
46
|
useAtomMount(followUp);
|
|
47
47
|
useEffect(() => () => local.set(followUp, Atom.Interrupt), [local, followUp]);
|
|
48
48
|
const state = useAction(source);
|
|
49
|
+
useEffect(() => {
|
|
50
|
+
if (router && Option.isSome(state.cause) && !state.pending && router.history.location.state.__platformSignOut) {
|
|
51
|
+
router.history.replace(router.history.location.href, { ...router.history.location.state, __platformSignOut: false });
|
|
52
|
+
}
|
|
53
|
+
}, [router, state.cause, state.pending]);
|
|
49
54
|
return {
|
|
50
55
|
...state,
|
|
51
56
|
dispatch: () => {
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
import { RegistryContext, useAtomValue } from "@effect/atom-react";
|
|
2
|
+
import { Effect, Option } from "effect";
|
|
3
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import { useContext, useMemo } from "react";
|
|
5
|
+
import type { AtomServices } from "#AtomServices.ts";
|
|
6
|
+
import type { deployUpdate } from "#client/deployUpdate.ts";
|
|
7
|
+
import { useAction } from "#client/resultState.ts";
|
|
8
|
+
|
|
9
|
+
export interface VersionedChangeCommand<TInput, A, E, R, TRuntimeError> {
|
|
10
|
+
readonly run: (input: TInput) => Effect.Effect<A, E, AtomServices<R>>;
|
|
11
|
+
readonly runtime: Atom.AtomRuntime<R, TRuntimeError>;
|
|
12
|
+
readonly update: Pick<ReturnType<typeof deployUpdate>, "block">;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export interface UndoableNotice<TInput, A> {
|
|
16
|
+
readonly input: TInput;
|
|
17
|
+
readonly message: string;
|
|
18
|
+
readonly value: A;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function useUndoableChange<TInput extends { readonly expectedVersion: number }, A extends { readonly version: number }, E, R, TRuntimeError>(
|
|
22
|
+
command: VersionedChangeCommand<TInput, A, E, R, TRuntimeError>,
|
|
23
|
+
options: { readonly describe: (value: NoInfer<A>, input: NoInfer<TInput>) => string },
|
|
24
|
+
) {
|
|
25
|
+
const { run, runtime, update } = command;
|
|
26
|
+
const registry = useContext(RegistryContext);
|
|
27
|
+
type Entry = UndoableNotice<TInput, A> & { readonly inverse: Omit<TInput, "expectedVersion"> };
|
|
28
|
+
interface Removal {
|
|
29
|
+
readonly input: TInput;
|
|
30
|
+
readonly inverse: Omit<TInput, "expectedVersion">;
|
|
31
|
+
readonly sequence: number;
|
|
32
|
+
}
|
|
33
|
+
const owner = useMemo(
|
|
34
|
+
() => ({ notice: Atom.make(Option.none<Entry>()), registry, run, runtime, sequence: 0, update }),
|
|
35
|
+
[run, runtime, update, registry],
|
|
36
|
+
);
|
|
37
|
+
const execute = useMemo(
|
|
38
|
+
() => (input: TInput) =>
|
|
39
|
+
Effect.acquireUseRelease(
|
|
40
|
+
owner.update.block,
|
|
41
|
+
() => owner.run(input),
|
|
42
|
+
(release) => Effect.sync(release),
|
|
43
|
+
),
|
|
44
|
+
[owner],
|
|
45
|
+
);
|
|
46
|
+
const removeRun = useMemo(() => (request: Removal) => execute(request.input), [execute]);
|
|
47
|
+
const undoRun = useMemo(() => (entry: Entry) => execute({ ...entry.input, ...entry.inverse, expectedVersion: entry.value.version }), [execute]);
|
|
48
|
+
const removal = useAction(owner.runtime, removeRun, {
|
|
49
|
+
concurrent: true,
|
|
50
|
+
onSuccess: (value, { input, inverse, sequence }) => {
|
|
51
|
+
if (sequence === owner.sequence) {
|
|
52
|
+
owner.registry.set(owner.notice, Option.some({ input, inverse, message: options.describe(value, input), value }));
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
const restoration = useAction(owner.runtime, undoRun, {
|
|
57
|
+
onSuccess: (_value, entry) => {
|
|
58
|
+
if (Option.getOrUndefined(owner.registry.get(owner.notice)) === entry) {
|
|
59
|
+
owner.registry.set(owner.notice, Option.none());
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
});
|
|
63
|
+
const notice: Option.Option<UndoableNotice<TInput, A>> = useAtomValue(owner.notice);
|
|
64
|
+
return {
|
|
65
|
+
notice,
|
|
66
|
+
pending: removal.pending || restoration.pending,
|
|
67
|
+
remove: (input: TInput, inverse: Omit<TInput, "expectedVersion">) => {
|
|
68
|
+
owner.sequence += 1;
|
|
69
|
+
removal.dispatch({ input, inverse, sequence: owner.sequence });
|
|
70
|
+
},
|
|
71
|
+
removeResult: removal.result,
|
|
72
|
+
removing: removal.pending,
|
|
73
|
+
undo: () => {
|
|
74
|
+
const current = owner.registry.get(owner.notice);
|
|
75
|
+
if (Option.isSome(current)) {
|
|
76
|
+
restoration.dispatch(current.value);
|
|
77
|
+
}
|
|
78
|
+
},
|
|
79
|
+
undoing: restoration.pending,
|
|
80
|
+
undoResult: restoration.result,
|
|
81
|
+
};
|
|
82
|
+
}
|
package/src/client/mountLive.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { recheckUnauthorized } from "#internal/sessionRecheck.ts";
|
|
|
9
9
|
function recheckFailure(registry: AtomRegistry.AtomRegistry, failure: Option.Option<Cause.Cause<unknown>>) {
|
|
10
10
|
const error = Option.flatMap(failure, Cause.findErrorOption);
|
|
11
11
|
if (Option.isSome(error)) {
|
|
12
|
-
void recheckUnauthorized(registry, error.value
|
|
12
|
+
void recheckUnauthorized(registry, error.value);
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
|