@shivaedev/react 0.32.0 → 0.33.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 +19 -0
- package/README.md +42 -13
- package/dist/adapters/Forbidden.d.ts.map +1 -0
- package/dist/adapters/Forbidden.js.map +1 -0
- package/dist/adapters/loadQuery.js +1 -1
- package/dist/adapters/loadQuery.js.map +1 -1
- package/dist/adapters/permissionBoundary.d.ts.map +1 -0
- package/dist/adapters/permissionBoundary.js.map +1 -0
- package/dist/{permissionGuard.d.ts → adapters/permissionGuard.d.ts} +2 -2
- package/dist/adapters/permissionGuard.d.ts.map +1 -0
- package/dist/{permissionGuard.js → adapters/permissionGuard.js} +2 -2
- package/dist/adapters/permissionGuard.js.map +1 -0
- package/dist/{internal → adapters}/queryHandoff.d.ts.map +1 -1
- package/dist/{internal → adapters}/queryHandoff.js.map +1 -1
- package/dist/{queryRoute.d.ts → adapters/queryRoute.d.ts} +13 -7
- package/dist/adapters/queryRoute.d.ts.map +1 -0
- package/dist/adapters/queryRoute.js +21 -0
- package/dist/adapters/queryRoute.js.map +1 -0
- package/dist/adapters/queryRouteFailure.d.ts +10 -0
- package/dist/adapters/queryRouteFailure.d.ts.map +1 -0
- package/dist/adapters/queryRouteFailure.js +13 -0
- package/dist/adapters/queryRouteFailure.js.map +1 -0
- package/dist/adapters/screenPending.d.ts.map +1 -0
- package/dist/adapters/screenPending.js.map +1 -0
- package/dist/{internal → adapters}/useLoaderHandoff.d.ts.map +1 -1
- package/dist/{internal → adapters}/useLoaderHandoff.js.map +1 -1
- package/dist/adapters/useQueryRetry.d.ts +3 -0
- package/dist/adapters/useQueryRetry.d.ts.map +1 -0
- package/dist/adapters/useQueryRetry.js +10 -0
- package/dist/adapters/useQueryRetry.js.map +1 -0
- package/dist/client/adapters/SessionGeneration.d.ts +1 -1
- package/dist/client/adapters/SessionGeneration.d.ts.map +1 -1
- package/dist/client/adapters/SessionGeneration.js +2 -1
- package/dist/client/adapters/SessionGeneration.js.map +1 -1
- package/dist/client/adapters/useLiveWindow.d.ts +4 -0
- package/dist/client/adapters/useLiveWindow.d.ts.map +1 -0
- package/dist/client/adapters/useLiveWindow.js +16 -0
- package/dist/client/adapters/useLiveWindow.js.map +1 -0
- package/dist/client/adapters/useSignOut.d.ts.map +1 -0
- package/dist/client/{useSignOut.js → adapters/useSignOut.js} +1 -1
- package/dist/client/adapters/useSignOut.js.map +1 -0
- package/dist/client/create.d.ts.map +1 -1
- package/dist/client/create.js +7 -4
- package/dist/client/create.js.map +1 -1
- package/dist/client/editor.js +3 -3
- package/dist/client/editor.js.map +1 -1
- package/dist/client/mountLive.d.ts +3 -3
- package/dist/client/mountLive.d.ts.map +1 -1
- package/dist/client/mountLive.js +7 -4
- package/dist/client/mountLive.js.map +1 -1
- package/dist/client/resultState.d.ts.map +1 -1
- package/dist/client/resultState.js +3 -10
- package/dist/client/resultState.js.map +1 -1
- package/dist/client/saveState.d.ts +1 -1
- package/dist/client/saveState.d.ts.map +1 -1
- package/dist/client/saveState.js +1 -1
- package/dist/client/saveState.js.map +1 -1
- package/dist/client/useLoaderQuery.js +1 -1
- package/dist/client/useLoaderQuery.js.map +1 -1
- package/dist/internal/registerLiveWindow.d.ts +5 -0
- package/dist/internal/registerLiveWindow.d.ts.map +1 -0
- package/dist/internal/registerLiveWindow.js +31 -0
- package/dist/internal/registerLiveWindow.js.map +1 -0
- package/dist/submission.d.ts +1 -0
- package/dist/submission.d.ts.map +1 -1
- package/dist/submission.js +1 -0
- package/dist/submission.js.map +1 -1
- package/package.json +14 -14
- package/src/adapters/loadQuery.ts +1 -1
- package/src/{permissionGuard.ts → adapters/permissionGuard.ts} +2 -2
- package/src/adapters/queryRoute.ts +46 -0
- package/src/adapters/queryRouteFailure.ts +21 -0
- package/src/adapters/useQueryRetry.ts +10 -0
- package/src/client/adapters/SessionGeneration.ts +4 -2
- package/src/client/adapters/useLiveWindow.ts +17 -0
- package/src/client/{useSignOut.ts → adapters/useSignOut.ts} +1 -1
- package/src/client/create.ts +10 -4
- package/src/client/editor.ts +3 -3
- package/src/client/mountLive.ts +8 -6
- package/src/client/resultState.ts +3 -10
- package/src/client/saveState.ts +2 -2
- package/src/client/useLoaderQuery.ts +1 -1
- package/src/internal/registerLiveWindow.ts +41 -0
- package/src/submission.ts +2 -0
- package/dist/client/Forbidden.d.ts.map +0 -1
- package/dist/client/Forbidden.js.map +0 -1
- package/dist/client/permissionBoundary.d.ts.map +0 -1
- package/dist/client/permissionBoundary.js.map +0 -1
- package/dist/client/screenPending.d.ts.map +0 -1
- package/dist/client/screenPending.js.map +0 -1
- package/dist/client/useSignOut.d.ts.map +0 -1
- package/dist/client/useSignOut.js.map +0 -1
- package/dist/permissionGuard.d.ts.map +0 -1
- package/dist/permissionGuard.js.map +0 -1
- package/dist/queryRoute.d.ts.map +0 -1
- package/dist/queryRoute.js +0 -21
- package/dist/queryRoute.js.map +0 -1
- package/src/queryRoute.ts +0 -35
- /package/dist/{client → adapters}/Forbidden.d.ts +0 -0
- /package/dist/{client → adapters}/Forbidden.js +0 -0
- /package/dist/{client → adapters}/permissionBoundary.d.ts +0 -0
- /package/dist/{client → adapters}/permissionBoundary.js +0 -0
- /package/dist/{internal → adapters}/queryHandoff.d.ts +0 -0
- /package/dist/{internal → adapters}/queryHandoff.js +0 -0
- /package/dist/{client → adapters}/screenPending.d.ts +0 -0
- /package/dist/{client → adapters}/screenPending.js +0 -0
- /package/dist/{internal → adapters}/useLoaderHandoff.d.ts +0 -0
- /package/dist/{internal → adapters}/useLoaderHandoff.js +0 -0
- /package/dist/client/{useSignOut.d.ts → adapters/useSignOut.d.ts} +0 -0
- /package/src/{client → adapters}/Forbidden.ts +0 -0
- /package/src/{client → adapters}/permissionBoundary.ts +0 -0
- /package/src/{internal → adapters}/queryHandoff.ts +0 -0
- /package/src/{client → adapters}/screenPending.ts +0 -0
- /package/src/{internal → adapters}/useLoaderHandoff.ts +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../../src/client/editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAe,MAAM,QAAQ,CAAC;AAG1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../../src/client/editor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Duration } from "effect";
|
|
2
|
-
import
|
|
3
|
-
export declare
|
|
1
|
+
import { type Duration, Effect } from "effect";
|
|
2
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
3
|
+
export declare const mountLive: (client: unknown, coalesceWindow?: Duration.Input | undefined) => Effect.Effect<() => void, never, AtomRegistry.AtomRegistry>;
|
|
4
4
|
//# sourceMappingURL=mountLive.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountLive.d.ts","sourceRoot":"","sources":["../../src/client/mountLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,QAAQ,EAAqB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"mountLive.d.ts","sourceRoot":"","sources":["../../src/client/mountLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,QAAQ,EAAE,MAAM,EAAqB,MAAM,QAAQ,CAAC;AAEzE,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAa/D,eAAO,MAAM,SAAS,wFA0BV,IAAI,mCAKd,CAAC"}
|
package/dist/client/mountLive.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import { Cause, Option, Predicate } from "effect";
|
|
1
|
+
import { Cause, Effect, Option, Predicate } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
3
4
|
import { LiveConnection } from "@shivaedev/contract/automaticLive.ts";
|
|
4
5
|
import { liveBindings } from "#internal/liveBindings.ts";
|
|
6
|
+
import { registerLiveWindow } from "#internal/registerLiveWindow.ts";
|
|
5
7
|
import { recheckUnauthorized } from "#internal/sessionRecheck.ts";
|
|
6
8
|
function recheckFailure(registry, failure) {
|
|
7
9
|
const error = Option.flatMap(failure, Cause.findErrorOption);
|
|
@@ -9,7 +11,8 @@ function recheckFailure(registry, failure) {
|
|
|
9
11
|
void recheckUnauthorized(registry, error.value, true);
|
|
10
12
|
}
|
|
11
13
|
}
|
|
12
|
-
export
|
|
14
|
+
export const mountLive = Effect.fn("Live.mountLive")(function* (client, coalesceWindow) {
|
|
15
|
+
const registry = yield* AtomRegistry.AtomRegistry;
|
|
13
16
|
const releases = [];
|
|
14
17
|
const found = new Set();
|
|
15
18
|
for (const value of liveBindings(client)) {
|
|
@@ -19,7 +22,7 @@ export function mountLive(registry, client, coalesceWindow) {
|
|
|
19
22
|
&& Predicate.hasProperty(live, "coalesceWindow")
|
|
20
23
|
&& Atom.isAtom(live.coalesceWindow)
|
|
21
24
|
&& Atom.isWritable(live.coalesceWindow)) {
|
|
22
|
-
|
|
25
|
+
releases.push(yield* registerLiveWindow(live.coalesceWindow, coalesceWindow));
|
|
23
26
|
}
|
|
24
27
|
found.add(live.connection);
|
|
25
28
|
releases.push(registry.subscribe(Atom.map(live.status, (status) => status.failure), (failure) => recheckFailure(registry, failure), { immediate: true }));
|
|
@@ -31,5 +34,5 @@ export function mountLive(registry, client, coalesceWindow) {
|
|
|
31
34
|
release();
|
|
32
35
|
}
|
|
33
36
|
};
|
|
34
|
-
}
|
|
37
|
+
});
|
|
35
38
|
//# sourceMappingURL=mountLive.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountLive.js","sourceRoot":"","sources":["../../src/client/mountLive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAiB,MAAM,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
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,2BAA2B,CAAC;AACzD,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,EAAE,IAAI,CAAC,CAAC;IACvD,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,8 +2,8 @@ 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 {
|
|
6
|
-
import {
|
|
5
|
+
import { acceptLoaderQuery } from "#adapters/queryHandoff.ts";
|
|
6
|
+
import { useLiveWindow } from "#client/adapters/useLiveWindow.ts";
|
|
7
7
|
import { requestsRecheck } from "#internal/sessionRecheck.ts";
|
|
8
8
|
import { usePermissionFailure } from "#internal/usePermissionFailure.ts";
|
|
9
9
|
import { useQueryNotice } from "#internal/useQueryNotice.ts";
|
|
@@ -30,14 +30,7 @@ export function useQuery(atom, options = {}) {
|
|
|
30
30
|
const result = useAtomValue(atom);
|
|
31
31
|
const registry = useContext(RegistryContext);
|
|
32
32
|
useEffect(() => acceptLoaderQuery(registry, atom), [registry, atom]);
|
|
33
|
-
|
|
34
|
-
if (options.coalesceWindow === undefined) {
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
const window = queryCoalesceWindow(atom);
|
|
38
|
-
registry.set(window, options.coalesceWindow);
|
|
39
|
-
return () => registry.set(window, undefined);
|
|
40
|
-
}, [registry, atom, options.coalesceWindow]);
|
|
33
|
+
useLiveWindow(atom, options.coalesceWindow);
|
|
41
34
|
const keepPreviousData = options.keepPreviousData === true;
|
|
42
35
|
const nativeData = AsyncResult.value(result);
|
|
43
36
|
const [held, hold] = useState(() => ({ atom, data: nativeData, dataAtom: atom, keepPreviousData, registry, 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;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resultState.js","sourceRoot":"","sources":["../../src/client/resultState.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,5 +8,5 @@ export interface SaveState<E> {
|
|
|
8
8
|
readonly save: () => void;
|
|
9
9
|
readonly saving: boolean;
|
|
10
10
|
}
|
|
11
|
-
export declare function useSaveState<TFields extends Fields, A, E, TRuntimeError>(form: Form<TFields, A, E | FieldFailure, TRuntimeError> | undefined, settled
|
|
11
|
+
export declare function useSaveState<TFields extends Fields, A, E, TRuntimeError>(form: Form<TFields, A, E | FieldFailure, TRuntimeError> | undefined, settled?: (result: A) => void): SaveState<E | TRuntimeError>;
|
|
12
12
|
//# sourceMappingURL=saveState.d.ts.map
|
|
@@ -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;AAIvC,OAAO,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAMzF,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,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,
|
|
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;AAIvC,OAAO,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAMzF,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
|
@@ -21,7 +21,7 @@ export function useSaveState(form, settled) {
|
|
|
21
21
|
useEffect(() => form
|
|
22
22
|
&& registry.subscribe(form.submit, (next) => {
|
|
23
23
|
if (AsyncResult.isSuccess(next) && !next.waiting) {
|
|
24
|
-
settled(next.value);
|
|
24
|
+
settled?.(next.value);
|
|
25
25
|
}
|
|
26
26
|
}), [form, registry, settled]);
|
|
27
27
|
const save = useCallback(() => {
|
|
@@ -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,YAAY,EAA0B,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,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,
|
|
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,YAAY,EAA0B,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACzF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,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,eAAe,CAAC,EAAE,CAAC;YAC1G,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,7 +1,7 @@
|
|
|
1
1
|
import { RegistryContext } from "@effect/atom-react";
|
|
2
2
|
import { useContext } from "react";
|
|
3
|
+
import { useLoaderHandoff } from "#adapters/useLoaderHandoff.ts";
|
|
3
4
|
import { loadedQuery } from "#internal/loadedQuery.ts";
|
|
4
|
-
import { useLoaderHandoff } from "#internal/useLoaderHandoff.ts";
|
|
5
5
|
import { useQuery } from "./resultState.js";
|
|
6
6
|
export function useLoaderQuery(atom, loaded, options = {}) {
|
|
7
7
|
useLoaderHandoff(useContext(RegistryContext), atom);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useLoaderQuery.js","sourceRoot":"","sources":["../../src/client/useLoaderQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useLoaderQuery.js","sourceRoot":"","sources":["../../src/client/useLoaderQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGrD,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAsC,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAMhF,MAAM,UAAU,cAAc,CAC7B,IAA8C,EAC9C,MAAkB,EAClB,OAAO,GAAoB,EAAE;IAE7B,gBAAgB,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC,CAAC;IACpD,OAAO,WAAW,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;AACrD,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type Duration, Effect } from "effect";
|
|
2
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
|
+
export declare const registerLiveWindow: <A extends Duration.Input | undefined>(atom: Atom.Writable<A, A>, value: A) => Effect.Effect<() => void, never, AtomRegistry.AtomRegistry>;
|
|
5
|
+
//# sourceMappingURL=registerLiveWindow.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registerLiveWindow.d.ts","sourceRoot":"","sources":["../../src/internal/registerLiveWindow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAS/D,eAAO,MAAM,kBAAkB,GAAyD,CAAC,SAAS,QAAQ,CAAC,KAAK,GAAG,SAAS,qGA6B1H,CAAC"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
3
|
+
const registries = new WeakMap();
|
|
4
|
+
export const registerLiveWindow = Effect.fn("LiveWindow.registerLiveWindow")(function* (atom, value) {
|
|
5
|
+
const registry = yield* AtomRegistry.AtomRegistry;
|
|
6
|
+
let windows = registries.get(registry);
|
|
7
|
+
if (windows === undefined) {
|
|
8
|
+
windows = new WeakMap();
|
|
9
|
+
registries.set(registry, windows);
|
|
10
|
+
}
|
|
11
|
+
let current = windows.get(atom);
|
|
12
|
+
if (current === undefined) {
|
|
13
|
+
const original = registry.get(atom);
|
|
14
|
+
current = { readers: new Map(), restore: () => registry.set(atom, original) };
|
|
15
|
+
windows.set(atom, current);
|
|
16
|
+
}
|
|
17
|
+
const reader = {};
|
|
18
|
+
function apply() {
|
|
19
|
+
registry.set(atom, value);
|
|
20
|
+
}
|
|
21
|
+
current.readers.set(reader, apply);
|
|
22
|
+
apply();
|
|
23
|
+
return () => {
|
|
24
|
+
current.readers.delete(reader);
|
|
25
|
+
([...current.readers.values()].at(-1) ?? current.restore)();
|
|
26
|
+
if (current.readers.size === 0) {
|
|
27
|
+
windows.delete(atom);
|
|
28
|
+
}
|
|
29
|
+
};
|
|
30
|
+
});
|
|
31
|
+
//# sourceMappingURL=registerLiveWindow.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registerLiveWindow.js","sourceRoot":"","sources":["../../src/internal/registerLiveWindow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAO/D,MAAM,UAAU,GAAG,IAAI,OAAO,EAAmE,CAAC;AAElG,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC,+BAA+B,CAAC,CAAC,QAAQ,CAAC,EACrF,IAAsB,EACtB,KAAQ;IAER,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;IAClD,IAAI,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;QACxB,UAAU,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,OAAO,GAAG,EAAE,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC5B,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,SAAS,KAAK;QACb,QAAQ,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IACnC,KAAK,EAAE,CAAC;IACR,OAAO,GAAG,EAAE;QACX,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5D,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACF,CAAC,CAAC;AACH,CAAC,CAAC,CAAC"}
|
package/dist/submission.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export interface SubmissionConfig<TFields extends Fields, A, E, R, TRuntimeError
|
|
|
10
10
|
readonly rejectField: RejectField<TFields, E> | undefined;
|
|
11
11
|
readonly runtime: Atom.AtomRuntime<Services<TFields, R>, TRuntimeError>;
|
|
12
12
|
readonly save: (values: Decoded<TFields>) => Effect.Effect<A, E, AtomServices<R>>;
|
|
13
|
+
readonly savedValues?: (value: A) => Encoded<TFields>;
|
|
13
14
|
}
|
|
14
15
|
export interface Submission<TFields extends Fields, A, E, TRuntimeError> {
|
|
15
16
|
readonly form: Form<TFields, A, E | FieldFailure, TRuntimeError>;
|
package/dist/submission.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submission.d.ts","sourceRoot":"","sources":["../src/submission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEvG,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAa,MAAM,qBAAqB,CAAC;AAErF,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa;IAC/E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAC3D,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAC1D,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"submission.d.ts","sourceRoot":"","sources":["../src/submission.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEvG,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAa,MAAM,qBAAqB,CAAC;AAErF,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa;IAC/E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,cAAc,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAC3D,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;IAC1D,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IACxE,QAAQ,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACtD;AAED,MAAM,WAAW,UAAU,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa;IACtE,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,aAAa,CAAC,CAAC;IACjE,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;CACvD;AAED,wBAAgB,UAAU,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,EACxE,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,GACvD,UAAU,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,CAe1C"}
|
package/dist/submission.js
CHANGED
|
@@ -12,6 +12,7 @@ export function submission(config) {
|
|
|
12
12
|
return actionTrace(save(values, submitter), "ui.submit");
|
|
13
13
|
},
|
|
14
14
|
persistedDraft: config.persistedDraft,
|
|
15
|
+
...(config.savedValues === undefined ? {} : { savedValues: config.savedValues }),
|
|
15
16
|
runtime,
|
|
16
17
|
});
|
|
17
18
|
return { form: currentForm, submitted: () => submitted };
|
package/dist/submission.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"submission.js","sourceRoot":"","sources":["../src/submission.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAuC,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"submission.js","sourceRoot":"","sources":["../src/submission.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAG/C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAuC,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAiBrF,MAAM,UAAU,UAAU,CACzB,MAAyD;IAEzD,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAClD,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAChE,IAAI,SAAuC,CAAC;IAC5C,MAAM,WAAW,GAAsD,IAAI,CAAC,MAAM,EAAE;QACnF,aAAa;QACb,QAAQ,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;YACzC,SAAS,GAAG,QAAQ,CAAC;YACrB,OAAO,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,WAAW,CAAC,CAAC;QAC1D,CAAC;QACD,cAAc,EAAE,MAAM,CAAC,cAAc;QACrC,GAAG,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;QAChF,OAAO;KACP,CAAC,CAAC;IACH,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC;AAC1D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/react",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.33.0",
|
|
4
4
|
"description": "React query, action, editor and session hooks for native Effect atoms",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -45,25 +45,25 @@
|
|
|
45
45
|
"README.md"
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@shivaedev/access": "0.3.
|
|
49
|
-
"@shivaedev/contract": "0.30.
|
|
50
|
-
"@shivaedev/errors": "0.
|
|
51
|
-
"@shivaedev/form": "0.
|
|
48
|
+
"@shivaedev/access": "0.3.6",
|
|
49
|
+
"@shivaedev/contract": "0.30.2",
|
|
50
|
+
"@shivaedev/errors": "0.5.0",
|
|
51
|
+
"@shivaedev/form": "0.11.0"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@effect/atom-react": "4.0.6",
|
|
55
55
|
"@effect/platform-node": "4.0.6",
|
|
56
56
|
"@effect/sql-pg": "4.0.6",
|
|
57
57
|
"@effect/sql-sqlite-node": "4.0.6",
|
|
58
|
-
"@shivaedev/changes": "0.
|
|
59
|
-
"@shivaedev/identity": "0.
|
|
60
|
-
"@shivaedev/jobs": "0.29.
|
|
61
|
-
"@shivaedev/quality": "0.
|
|
62
|
-
"@shivaedev/server": "0.
|
|
63
|
-
"@shivaedev/service": "0.6.
|
|
64
|
-
"@shivaedev/sql": "0.
|
|
65
|
-
"@shivaedev/test-sql": "0.16.
|
|
66
|
-
"@shivaedev/test-story": "0.
|
|
58
|
+
"@shivaedev/changes": "0.7.0",
|
|
59
|
+
"@shivaedev/identity": "0.18.0",
|
|
60
|
+
"@shivaedev/jobs": "0.29.2",
|
|
61
|
+
"@shivaedev/quality": "0.55.0",
|
|
62
|
+
"@shivaedev/server": "0.18.0",
|
|
63
|
+
"@shivaedev/service": "0.6.1",
|
|
64
|
+
"@shivaedev/sql": "0.32.0",
|
|
65
|
+
"@shivaedev/test-sql": "0.16.1",
|
|
66
|
+
"@shivaedev/test-story": "0.33.0",
|
|
67
67
|
"@tanstack/react-router": "1.170.46",
|
|
68
68
|
"@types/node": "24.19.2",
|
|
69
69
|
"@types/react": "19.3.0",
|
|
@@ -3,8 +3,8 @@ import { Effect } from "effect";
|
|
|
3
3
|
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
4
4
|
import type * as Atom from "effect/reactivity/Atom";
|
|
5
5
|
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
6
|
-
import { keepLoaderQuery } from "#internal/queryHandoff.ts";
|
|
7
6
|
import { recheckUnauthorized } from "#internal/sessionRecheck.ts";
|
|
7
|
+
import { keepLoaderQuery } from "./queryHandoff.ts";
|
|
8
8
|
|
|
9
9
|
export async function loadQuery<A, E>(
|
|
10
10
|
registry: AtomRegistry.AtomRegistry,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { notFound, redirect } from "@tanstack/react-router";
|
|
2
2
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
3
3
|
import { forbidden } from "@shivaedev/access/refusal.ts";
|
|
4
|
-
import { can, type PermissionSession } from "
|
|
5
|
-
import { type SignInLocation, signInSearch } from "
|
|
4
|
+
import { can, type PermissionSession } from "#permissions.ts";
|
|
5
|
+
import { type SignInLocation, signInSearch } from "#signInSearch.ts";
|
|
6
6
|
|
|
7
7
|
declare module "@tanstack/react-router" {
|
|
8
8
|
interface StaticDataRouteOption {
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { LoaderFnContext } from "@tanstack/react-router";
|
|
2
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
5
|
+
import { loadQuery } from "./loadQuery.ts";
|
|
6
|
+
import { type QueryRouteRedirects, queryRouteFailure } from "./queryRouteFailure.ts";
|
|
7
|
+
import { useQueryRetry } from "./useQueryRetry.ts";
|
|
8
|
+
|
|
9
|
+
interface QueryRouteInput<TParams, TSearch, TContext> {
|
|
10
|
+
readonly context: TContext;
|
|
11
|
+
readonly params: TParams;
|
|
12
|
+
readonly search: TSearch;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function queryRoute<
|
|
16
|
+
TParams extends object,
|
|
17
|
+
TSearch extends object,
|
|
18
|
+
A,
|
|
19
|
+
E,
|
|
20
|
+
TContext extends { readonly registry: AtomRegistry.AtomRegistry } = { readonly registry: AtomRegistry.AtomRegistry },
|
|
21
|
+
>(
|
|
22
|
+
query: (route: QueryRouteInput<TParams, TSearch, TContext>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>,
|
|
23
|
+
options: { readonly redirects?: QueryRouteRedirects } = {},
|
|
24
|
+
) {
|
|
25
|
+
return {
|
|
26
|
+
loader: async (
|
|
27
|
+
context: Pick<LoaderFnContext, "abortController" | "location"> & {
|
|
28
|
+
readonly context: TContext;
|
|
29
|
+
readonly deps: TSearch;
|
|
30
|
+
readonly params: TParams;
|
|
31
|
+
},
|
|
32
|
+
): Promise<A> => {
|
|
33
|
+
try {
|
|
34
|
+
return await loadQuery(context.context.registry, query({ context: context.context, params: context.params, search: context.deps }), context);
|
|
35
|
+
} catch (error) {
|
|
36
|
+
throw queryRouteFailure(error, context.location, options.redirects);
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
loaderDeps: ({ search }: { readonly search: TSearch }) => search,
|
|
40
|
+
useRetry: () =>
|
|
41
|
+
useQueryRetry((match) => {
|
|
42
|
+
const { context, params, loaderDeps }: { context: TContext; params: TParams; loaderDeps: TSearch } = match;
|
|
43
|
+
context.registry.refresh(query({ context, params, search: loaderDeps }));
|
|
44
|
+
}),
|
|
45
|
+
};
|
|
46
|
+
}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { notFound } from "@tanstack/react-router";
|
|
2
|
+
import { Predicate } from "effect";
|
|
3
|
+
import { isForbidden, isNotFound, isUnauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import type { SignInLocation } from "#signInSearch.ts";
|
|
5
|
+
|
|
6
|
+
export type QueryRouteRedirect = Response & { readonly options: object };
|
|
7
|
+
|
|
8
|
+
export interface QueryRouteRedirects {
|
|
9
|
+
readonly refused?: () => QueryRouteRedirect;
|
|
10
|
+
readonly signedOut?: (location: SignInLocation) => QueryRouteRedirect;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export function queryRouteFailure(error: unknown, location: SignInLocation, redirects: QueryRouteRedirects | undefined): unknown {
|
|
14
|
+
if (isUnauthorized(error) && redirects?.signedOut) {
|
|
15
|
+
return redirects.signedOut(location);
|
|
16
|
+
}
|
|
17
|
+
if ((isForbidden(error) || Predicate.isTagged(error, "QueryReadDenied")) && redirects?.refused) {
|
|
18
|
+
return redirects.refused();
|
|
19
|
+
}
|
|
20
|
+
return isNotFound(error) || Predicate.isTagged(error, "QueryReadDenied") ? notFound({ data: error }) : error;
|
|
21
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { type AnyRouteMatch, useMatch, useRouter } from "@tanstack/react-router";
|
|
2
|
+
|
|
3
|
+
export function useQueryRetry(refresh: (match: AnyRouteMatch) => void): () => Promise<void> {
|
|
4
|
+
const router = useRouter();
|
|
5
|
+
const match = useMatch({ strict: false });
|
|
6
|
+
return () => {
|
|
7
|
+
refresh(match);
|
|
8
|
+
return router.invalidate({ filter: (candidate) => candidate.id === match.id });
|
|
9
|
+
};
|
|
10
|
+
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RegistryContext } from "@effect/atom-react";
|
|
2
|
-
import type
|
|
2
|
+
import { type Duration, Effect } from "effect";
|
|
3
3
|
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
4
|
import { createElement, type ReactNode, useEffect, useState } from "react";
|
|
5
5
|
import { LiveConnection } from "@shivaedev/contract/automaticLive.ts";
|
|
@@ -72,7 +72,9 @@ export function SessionGeneration<TSession, TClient>({
|
|
|
72
72
|
useEffect(() => registerSessionRecheck(owned.registry, recheckLatest), [owned, recheckLatest]);
|
|
73
73
|
useEffect(() => {
|
|
74
74
|
owned.mounted += 1;
|
|
75
|
-
const stopLive =
|
|
75
|
+
const stopLive = Effect.runSync(
|
|
76
|
+
mountLive(owned.client, liveCoalesceWindow).pipe(Effect.provideService(AtomRegistry.AtomRegistry, owned.registry)),
|
|
77
|
+
);
|
|
76
78
|
return () => {
|
|
77
79
|
stopLive();
|
|
78
80
|
owned.mounted -= 1;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { RegistryContext } from "@effect/atom-react";
|
|
2
|
+
import { type Duration, Effect } from "effect";
|
|
3
|
+
import type * as Atom from "effect/reactivity/Atom";
|
|
4
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
5
|
+
import { useContext, useEffect } from "react";
|
|
6
|
+
import { queryCoalesceWindow } from "@shivaedev/contract/queryCoalesceWindow.ts";
|
|
7
|
+
import { registerLiveWindow } from "#internal/registerLiveWindow.ts";
|
|
8
|
+
|
|
9
|
+
export function useLiveWindow(atom: Atom.Atom<unknown>, window: Duration.Input | undefined): void {
|
|
10
|
+
const registry = useContext(RegistryContext);
|
|
11
|
+
useEffect(() => {
|
|
12
|
+
if (window === undefined) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
return Effect.runSync(registerLiveWindow(queryCoalesceWindow(atom), window).pipe(Effect.provideService(AtomRegistry.AtomRegistry, registry)));
|
|
16
|
+
}, [registry, atom, window]);
|
|
17
|
+
}
|
|
@@ -4,8 +4,8 @@ import { Effect } 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";
|
|
7
|
+
import { useAction } from "#client/resultState.ts";
|
|
7
8
|
import { SignOutRegistryContext } from "#internal/SignOutRegistryContext.ts";
|
|
8
|
-
import { useAction } from "./resultState.ts";
|
|
9
9
|
|
|
10
10
|
declare module "@tanstack/react-router" {
|
|
11
11
|
interface HistoryState {
|
package/src/client/create.ts
CHANGED
|
@@ -20,9 +20,15 @@ export interface Create<TFields extends Fields, TCreated, TSaveError, TRuntimeEr
|
|
|
20
20
|
readonly created: Option.Option<TCreated>;
|
|
21
21
|
readonly form: Form<TFields, TCreated, TSaveError | FieldFailure, TRuntimeError>;
|
|
22
22
|
}
|
|
23
|
-
function
|
|
24
|
-
|
|
25
|
-
return Object.fromEntries(
|
|
23
|
+
function resetValues<TV extends object>(baseline: TV, current: TV, submitted: TV | undefined): TV;
|
|
24
|
+
function resetValues(baseline: Readonly<Record<string, unknown>>, current: Readonly<Record<string, unknown>>, submitted = current): object {
|
|
25
|
+
return Object.fromEntries(
|
|
26
|
+
Object.keys({ ...baseline, ...current, ...submitted }).flatMap((name) => {
|
|
27
|
+
const changed = Object.hasOwn(current, name) !== Object.hasOwn(submitted, name) || !Equal.equals(current[name], submitted[name]);
|
|
28
|
+
const source = changed ? current : baseline;
|
|
29
|
+
return Object.hasOwn(source, name) ? [[name, source[name]]] : [];
|
|
30
|
+
}),
|
|
31
|
+
);
|
|
26
32
|
}
|
|
27
33
|
export function useCreate<TFields extends Fields, TCreated, TSaveError, R, TRuntimeError>(
|
|
28
34
|
config: CreateConfig<TFields, TCreated, TSaveError, R, TRuntimeError>,
|
|
@@ -46,7 +52,7 @@ export function useCreate<TFields extends Fields, TCreated, TSaveError, R, TRunt
|
|
|
46
52
|
const settled = useCallback(
|
|
47
53
|
(value: TCreated) => {
|
|
48
54
|
const next = fresh();
|
|
49
|
-
next.form.values.set(
|
|
55
|
+
next.form.values.set(resetValues(baseline, current.form.values.value, current.submitted()));
|
|
50
56
|
hold({ ...entry, created: Option.some(value), current: next });
|
|
51
57
|
},
|
|
52
58
|
[entry, current, fresh, baseline],
|
package/src/client/editor.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type Effect, Option, type Schema } from "effect";
|
|
2
2
|
import type * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
3
3
|
import type * as Atom from "effect/reactivity/Atom";
|
|
4
|
-
import {
|
|
4
|
+
import { useEffect, useState } from "react";
|
|
5
5
|
import { type BrowserDraftConfig, usePersistedDraft } from "@shivaedev/form/client/react.ts";
|
|
6
6
|
import type { Decoded, Encoded, FieldFailure, Fields, Form, Services } from "@shivaedev/form/shape.ts";
|
|
7
7
|
import type { AtomServices, FieldRejectionMapping } from "#fieldRejection.ts";
|
|
@@ -62,6 +62,7 @@ export function useEditor<TFields extends Fields, TRow, TQueryError, TSaveError,
|
|
|
62
62
|
initialValues: config.values(row.value),
|
|
63
63
|
persistedDraft,
|
|
64
64
|
runtime: config.runtime,
|
|
65
|
+
savedValues: config.values,
|
|
65
66
|
}).form,
|
|
66
67
|
query: config.query,
|
|
67
68
|
runtime: config.runtime,
|
|
@@ -77,8 +78,7 @@ export function useEditor<TFields extends Fields, TRow, TQueryError, TSaveError,
|
|
|
77
78
|
form.receive(values(received));
|
|
78
79
|
}
|
|
79
80
|
}, [form, values, received]);
|
|
80
|
-
const
|
|
81
|
-
const saveState = useSaveState(form, settled);
|
|
81
|
+
const saveState = useSaveState(form);
|
|
82
82
|
if ("loaded" in config && form !== undefined) {
|
|
83
83
|
return { ...saveState, form, query: loadedQuery(query, config.loaded) };
|
|
84
84
|
}
|
package/src/client/mountLive.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { Cause, type Duration, Option, Predicate } from "effect";
|
|
1
|
+
import { Cause, type Duration, Effect, Option, Predicate } from "effect";
|
|
2
2
|
import * as Atom from "effect/reactivity/Atom";
|
|
3
|
-
import
|
|
3
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
4
4
|
import { LiveConnection } from "@shivaedev/contract/automaticLive.ts";
|
|
5
5
|
import { liveBindings } from "#internal/liveBindings.ts";
|
|
6
|
+
import { registerLiveWindow } from "#internal/registerLiveWindow.ts";
|
|
6
7
|
import { recheckUnauthorized } from "#internal/sessionRecheck.ts";
|
|
7
8
|
|
|
8
9
|
function recheckFailure(registry: AtomRegistry.AtomRegistry, failure: Option.Option<Cause.Cause<unknown>>) {
|
|
@@ -12,7 +13,8 @@ function recheckFailure(registry: AtomRegistry.AtomRegistry, failure: Option.Opt
|
|
|
12
13
|
}
|
|
13
14
|
}
|
|
14
15
|
|
|
15
|
-
export
|
|
16
|
+
export const mountLive = Effect.fn("Live.mountLive")(function* (client: unknown, coalesceWindow?: Duration.Input) {
|
|
17
|
+
const registry = yield* AtomRegistry.AtomRegistry;
|
|
16
18
|
const releases: Array<() => void> = [];
|
|
17
19
|
const found = new Set<unknown>();
|
|
18
20
|
for (const value of liveBindings(client)) {
|
|
@@ -24,7 +26,7 @@ export function mountLive(registry: AtomRegistry.AtomRegistry, client: unknown,
|
|
|
24
26
|
&& Atom.isAtom(live.coalesceWindow)
|
|
25
27
|
&& Atom.isWritable(live.coalesceWindow)
|
|
26
28
|
) {
|
|
27
|
-
|
|
29
|
+
releases.push(yield* registerLiveWindow(live.coalesceWindow, coalesceWindow));
|
|
28
30
|
}
|
|
29
31
|
found.add(live.connection);
|
|
30
32
|
releases.push(
|
|
@@ -37,9 +39,9 @@ export function mountLive(registry: AtomRegistry.AtomRegistry, client: unknown,
|
|
|
37
39
|
releases.push(registry.mount(live.connection));
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
|
-
return () => {
|
|
42
|
+
return (): void => {
|
|
41
43
|
for (const release of releases) {
|
|
42
44
|
release();
|
|
43
45
|
}
|
|
44
46
|
};
|
|
45
|
-
}
|
|
47
|
+
});
|
|
@@ -4,9 +4,9 @@ import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
|
4
4
|
import type * as Atom from "effect/reactivity/Atom";
|
|
5
5
|
import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
6
6
|
import { useContext, useEffect, useState } from "react";
|
|
7
|
-
import {
|
|
7
|
+
import { acceptLoaderQuery } from "#adapters/queryHandoff.ts";
|
|
8
|
+
import { useLiveWindow } from "#client/adapters/useLiveWindow.ts";
|
|
8
9
|
import type { AtomServices } from "#fieldRejection.ts";
|
|
9
|
-
import { acceptLoaderQuery } from "#internal/queryHandoff.ts";
|
|
10
10
|
import { requestsRecheck } from "#internal/sessionRecheck.ts";
|
|
11
11
|
import { usePermissionFailure } from "#internal/usePermissionFailure.ts";
|
|
12
12
|
import { useQueryNotice } from "#internal/useQueryNotice.ts";
|
|
@@ -59,14 +59,7 @@ export function useQuery<A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>, o
|
|
|
59
59
|
const result = useAtomValue(atom);
|
|
60
60
|
const registry = useContext(RegistryContext);
|
|
61
61
|
useEffect(() => acceptLoaderQuery(registry, atom), [registry, atom]);
|
|
62
|
-
|
|
63
|
-
if (options.coalesceWindow === undefined) {
|
|
64
|
-
return;
|
|
65
|
-
}
|
|
66
|
-
const window = queryCoalesceWindow(atom);
|
|
67
|
-
registry.set(window, options.coalesceWindow);
|
|
68
|
-
return () => registry.set(window, undefined);
|
|
69
|
-
}, [registry, atom, options.coalesceWindow]);
|
|
62
|
+
useLiveWindow(atom, options.coalesceWindow);
|
|
70
63
|
const keepPreviousData = options.keepPreviousData === true;
|
|
71
64
|
const nativeData = AsyncResult.value(result);
|
|
72
65
|
const [held, hold] = useState<HeldQuery<A, E>>(() => ({ atom, data: nativeData, dataAtom: atom, keepPreviousData, registry, result }));
|