@shivaedev/react 0.31.1 → 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.
Files changed (122) hide show
  1. package/CHANGELOG.md +34 -0
  2. package/README.md +80 -25
  3. package/dist/adapters/Forbidden.d.ts +10 -0
  4. package/dist/adapters/Forbidden.d.ts.map +1 -0
  5. package/dist/adapters/Forbidden.js +6 -0
  6. package/dist/adapters/Forbidden.js.map +1 -0
  7. package/dist/adapters/loadQuery.js +1 -1
  8. package/dist/adapters/loadQuery.js.map +1 -1
  9. package/dist/{client → adapters}/permissionBoundary.d.ts +3 -0
  10. package/dist/adapters/permissionBoundary.d.ts.map +1 -0
  11. package/dist/{client → adapters}/permissionBoundary.js +2 -2
  12. package/dist/adapters/permissionBoundary.js.map +1 -0
  13. package/dist/{permissionGuard.d.ts → adapters/permissionGuard.d.ts} +4 -3
  14. package/dist/adapters/permissionGuard.d.ts.map +1 -0
  15. package/dist/{permissionGuard.js → adapters/permissionGuard.js} +5 -5
  16. package/dist/adapters/permissionGuard.js.map +1 -0
  17. package/dist/{internal → adapters}/queryHandoff.d.ts.map +1 -1
  18. package/dist/{internal → adapters}/queryHandoff.js.map +1 -1
  19. package/dist/{queryRoute.d.ts → adapters/queryRoute.d.ts} +13 -7
  20. package/dist/adapters/queryRoute.d.ts.map +1 -0
  21. package/dist/adapters/queryRoute.js +21 -0
  22. package/dist/adapters/queryRoute.js.map +1 -0
  23. package/dist/adapters/queryRouteFailure.d.ts +10 -0
  24. package/dist/adapters/queryRouteFailure.d.ts.map +1 -0
  25. package/dist/adapters/queryRouteFailure.js +13 -0
  26. package/dist/adapters/queryRouteFailure.js.map +1 -0
  27. package/dist/adapters/screenPending.d.ts.map +1 -0
  28. package/dist/adapters/screenPending.js.map +1 -0
  29. package/dist/{internal → adapters}/useLoaderHandoff.d.ts.map +1 -1
  30. package/dist/{internal → adapters}/useLoaderHandoff.js.map +1 -1
  31. package/dist/adapters/useQueryRetry.d.ts +3 -0
  32. package/dist/adapters/useQueryRetry.d.ts.map +1 -0
  33. package/dist/adapters/useQueryRetry.js +10 -0
  34. package/dist/adapters/useQueryRetry.js.map +1 -0
  35. package/dist/client/adapters/SessionGeneration.d.ts +1 -1
  36. package/dist/client/adapters/SessionGeneration.d.ts.map +1 -1
  37. package/dist/client/adapters/SessionGeneration.js +2 -1
  38. package/dist/client/adapters/SessionGeneration.js.map +1 -1
  39. package/dist/client/adapters/useLiveWindow.d.ts +4 -0
  40. package/dist/client/adapters/useLiveWindow.d.ts.map +1 -0
  41. package/dist/client/adapters/useLiveWindow.js +16 -0
  42. package/dist/client/adapters/useLiveWindow.js.map +1 -0
  43. package/dist/client/adapters/useSignOut.d.ts.map +1 -0
  44. package/dist/client/{useSignOut.js → adapters/useSignOut.js} +1 -1
  45. package/dist/client/adapters/useSignOut.js.map +1 -0
  46. package/dist/client/authSession.d.ts +7 -3
  47. package/dist/client/authSession.d.ts.map +1 -1
  48. package/dist/client/authSession.js +20 -3
  49. package/dist/client/authSession.js.map +1 -1
  50. package/dist/client/create.d.ts.map +1 -1
  51. package/dist/client/create.js +7 -4
  52. package/dist/client/create.js.map +1 -1
  53. package/dist/client/editor.js +3 -3
  54. package/dist/client/editor.js.map +1 -1
  55. package/dist/client/mountLive.d.ts +3 -3
  56. package/dist/client/mountLive.d.ts.map +1 -1
  57. package/dist/client/mountLive.js +7 -4
  58. package/dist/client/mountLive.js.map +1 -1
  59. package/dist/client/resultState.d.ts.map +1 -1
  60. package/dist/client/resultState.js +3 -10
  61. package/dist/client/resultState.js.map +1 -1
  62. package/dist/client/saveState.d.ts +1 -1
  63. package/dist/client/saveState.d.ts.map +1 -1
  64. package/dist/client/saveState.js +1 -1
  65. package/dist/client/saveState.js.map +1 -1
  66. package/dist/client/useLoaderQuery.js +1 -1
  67. package/dist/client/useLoaderQuery.js.map +1 -1
  68. package/dist/internal/registerLiveWindow.d.ts +5 -0
  69. package/dist/internal/registerLiveWindow.d.ts.map +1 -0
  70. package/dist/internal/registerLiveWindow.js +31 -0
  71. package/dist/internal/registerLiveWindow.js.map +1 -0
  72. package/dist/permissions.d.ts +11 -6
  73. package/dist/permissions.d.ts.map +1 -1
  74. package/dist/permissions.js +5 -1
  75. package/dist/permissions.js.map +1 -1
  76. package/dist/submission.d.ts +1 -0
  77. package/dist/submission.d.ts.map +1 -1
  78. package/dist/submission.js +1 -0
  79. package/dist/submission.js.map +1 -1
  80. package/package.json +14 -14
  81. package/src/adapters/Forbidden.ts +26 -0
  82. package/src/adapters/loadQuery.ts +1 -1
  83. package/src/{client → adapters}/permissionBoundary.ts +2 -2
  84. package/src/{permissionGuard.ts → adapters/permissionGuard.ts} +6 -5
  85. package/src/adapters/queryRoute.ts +46 -0
  86. package/src/adapters/queryRouteFailure.ts +21 -0
  87. package/src/adapters/useQueryRetry.ts +10 -0
  88. package/src/client/adapters/SessionGeneration.ts +4 -2
  89. package/src/client/adapters/useLiveWindow.ts +17 -0
  90. package/src/client/{useSignOut.ts → adapters/useSignOut.ts} +1 -1
  91. package/src/client/authSession.ts +32 -6
  92. package/src/client/create.ts +10 -4
  93. package/src/client/editor.ts +3 -3
  94. package/src/client/mountLive.ts +8 -6
  95. package/src/client/resultState.ts +3 -10
  96. package/src/client/saveState.ts +2 -2
  97. package/src/client/useLoaderQuery.ts +1 -1
  98. package/src/internal/registerLiveWindow.ts +41 -0
  99. package/src/permissions.ts +6 -6
  100. package/src/submission.ts +2 -0
  101. package/dist/client/permissionBoundary.d.ts.map +0 -1
  102. package/dist/client/permissionBoundary.js.map +0 -1
  103. package/dist/client/screenPending.d.ts.map +0 -1
  104. package/dist/client/screenPending.js.map +0 -1
  105. package/dist/client/useSignOut.d.ts.map +0 -1
  106. package/dist/client/useSignOut.js.map +0 -1
  107. package/dist/permissionGuard.d.ts.map +0 -1
  108. package/dist/permissionGuard.js.map +0 -1
  109. package/dist/queryRoute.d.ts.map +0 -1
  110. package/dist/queryRoute.js +0 -21
  111. package/dist/queryRoute.js.map +0 -1
  112. package/src/queryRoute.ts +0 -35
  113. /package/dist/{internal → adapters}/queryHandoff.d.ts +0 -0
  114. /package/dist/{internal → adapters}/queryHandoff.js +0 -0
  115. /package/dist/{client → adapters}/screenPending.d.ts +0 -0
  116. /package/dist/{client → adapters}/screenPending.js +0 -0
  117. /package/dist/{internal → adapters}/useLoaderHandoff.d.ts +0 -0
  118. /package/dist/{internal → adapters}/useLoaderHandoff.js +0 -0
  119. /package/dist/client/{useSignOut.d.ts → adapters/useSignOut.d.ts} +0 -0
  120. /package/src/{internal → adapters}/queryHandoff.ts +0 -0
  121. /package/src/{client → adapters}/screenPending.ts +0 -0
  122. /package/src/{internal → adapters}/useLoaderHandoff.ts +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/react",
3
- "version": "0.31.1",
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.5",
49
- "@shivaedev/contract": "0.30.1",
50
- "@shivaedev/errors": "0.4.1",
51
- "@shivaedev/form": "0.10.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.6.0",
59
- "@shivaedev/identity": "0.16.0",
60
- "@shivaedev/jobs": "0.29.0",
61
- "@shivaedev/quality": "0.53.1",
62
- "@shivaedev/server": "0.16.1",
63
- "@shivaedev/service": "0.6.0",
64
- "@shivaedev/sql": "0.30.0",
65
- "@shivaedev/test-sql": "0.15.3",
66
- "@shivaedev/test-story": "0.31.4",
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",
@@ -0,0 +1,26 @@
1
+ import { Link } from "@tanstack/react-router";
2
+ import { createElement, type ReactNode } from "react";
3
+
4
+ export interface ForbiddenProps {
5
+ readonly backLabel?: string;
6
+ readonly children?: ReactNode;
7
+ readonly className?: string;
8
+ readonly title?: string;
9
+ readonly to: string;
10
+ }
11
+
12
+ export function Forbidden({
13
+ to,
14
+ title = "Permission denied",
15
+ children = "You do not have access to this page.",
16
+ backLabel = "Go back",
17
+ className,
18
+ }: ForbiddenProps): ReactNode {
19
+ return createElement(
20
+ "main",
21
+ { className },
22
+ createElement("h1", null, title),
23
+ createElement("p", null, children),
24
+ createElement(Link, { to }, backLabel),
25
+ );
26
+ }
@@ -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,
@@ -16,7 +16,7 @@ export function useCan(): (permission: Permission) => boolean {
16
16
  return (permission) => can(context?.session, permission);
17
17
  }
18
18
 
19
- function PermissionFailure({ error }: { readonly error: unknown }): ReactNode {
19
+ export function PermissionBoundaryError({ error }: { readonly error: unknown }): ReactNode {
20
20
  const context = useContext(PermissionContext);
21
21
  if (!isForbidden(error)) {
22
22
  throw error;
@@ -28,6 +28,6 @@ export function PermissionBoundary({ children, fallback, session }: PermissionBo
28
28
  return createElement(
29
29
  PermissionContext.Provider,
30
30
  { value: { fallback, session } },
31
- createElement(CatchBoundary, { children, errorComponent: PermissionFailure, getResetKey: () => "permission" }),
31
+ createElement(CatchBoundary, { children, errorComponent: PermissionBoundaryError, getResetKey: () => "permission" }),
32
32
  );
33
33
  }
@@ -1,8 +1,8 @@
1
- import { redirect } from "@tanstack/react-router";
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 "./permissions.ts";
5
- import { type SignInLocation, signInSearch } from "./signInSearch.ts";
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 {
@@ -12,6 +12,7 @@ declare module "@tanstack/react-router" {
12
12
  }
13
13
 
14
14
  export interface PermissionGuardOptions {
15
+ readonly hidden?: boolean;
15
16
  readonly session: () => PermissionSession | null | undefined;
16
17
  readonly signIn: string;
17
18
  }
@@ -21,7 +22,7 @@ export interface PermissionGuardContext {
21
22
  readonly matches: readonly { readonly staticData: { readonly permission?: Permission; readonly signedIn?: boolean } }[];
22
23
  }
23
24
 
24
- export function permissionGuard({ session, signIn }: PermissionGuardOptions): (context: PermissionGuardContext) => void {
25
+ export function permissionGuard({ session, signIn, hidden = false }: PermissionGuardOptions): (context: PermissionGuardContext) => void {
25
26
  return ({ matches, location }) => {
26
27
  const required = matches.flatMap((match) => (match.staticData.permission === undefined ? [] : [match.staticData.permission]));
27
28
  if (required.length === 0 && !matches.some((match) => match.staticData.signedIn === true)) {
@@ -33,7 +34,7 @@ export function permissionGuard({ session, signIn }: PermissionGuardOptions): (c
33
34
  }
34
35
  for (const permission of required) {
35
36
  if (!can(current, permission)) {
36
- throw forbidden(permission);
37
+ throw hidden ? notFound() : forbidden(permission);
37
38
  }
38
39
  }
39
40
  };
@@ -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 { Duration } from "effect";
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 = mountLive(owned.registry, owned.client, liveCoalesceWindow);
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 {
@@ -1,18 +1,44 @@
1
- import { Effect } from "effect";
1
+ import { Effect, Schema } from "effect";
2
2
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
3
- import type * as Atom from "effect/reactivity/Atom";
3
+ import * as Atom from "effect/reactivity/Atom";
4
4
  import * as AtomRegistry from "effect/reactivity/AtomRegistry";
5
- import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
5
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
6
+ import { PermissionSession } from "#permissions.ts";
6
7
  import type { AuthActionResult } from "./authAction.ts";
7
- import { authQuery } from "./authQuery.ts";
8
8
 
9
9
  export interface AuthSession<A, E> {
10
10
  readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E | AuthUnavailable>>;
11
11
  readonly refresh: Effect.Effect<A, E | AuthUnavailable, AtomRegistry.AtomRegistry>;
12
12
  }
13
13
 
14
- export function authSession<A, E extends object = never>(read: (signal: AbortSignal) => Promise<AuthActionResult<A, E>>): AuthSession<A, E> {
15
- const atom = authQuery((_: undefined, signal) => read(signal))(undefined);
14
+ export type SessionWithPermissions<A> = A extends null ? null : A & PermissionSession;
15
+
16
+ function decodeSession<A extends { readonly user: object } | null>(data: A): Effect.Effect<SessionWithPermissions<A>, AuthUnavailable>;
17
+ function decodeSession(data: { readonly user: object } | null) {
18
+ if (data === null) {
19
+ return Effect.succeed(null);
20
+ }
21
+ return Schema.decodeUnknownEffect(PermissionSession)(data).pipe(
22
+ Effect.map((access) => ({ ...data, user: { ...data.user, ...access.user } })),
23
+ Effect.mapError(() => new AuthUnavailable({ message: "Could not read session permissions" })),
24
+ );
25
+ }
26
+
27
+ export function authSession<A extends { readonly user: object } | null, E extends object = never>(
28
+ read: (signal: AbortSignal) => Promise<AuthActionResult<A, E>>,
29
+ ): AuthSession<SessionWithPermissions<A>, E> {
30
+ const atom = Atom.make(
31
+ Effect.gen(function* () {
32
+ const result = yield* Effect.tryPromise({
33
+ catch: (cause) => new AuthUnavailable({ message: String(cause) }),
34
+ try: read,
35
+ });
36
+ if (result.error !== null) {
37
+ return yield* Effect.fail(result.error);
38
+ }
39
+ return yield* decodeSession(result.data);
40
+ }),
41
+ );
16
42
  const refresh = Effect.gen(function* () {
17
43
  const registry = yield* AtomRegistry.AtomRegistry;
18
44
  registry.refresh(atom);
@@ -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 editedSince<TV extends object>(current: TV, submitted: TV | undefined): Readonly<Record<string, unknown>> {
24
- const before = new Map(Object.entries(submitted ?? current));
25
- return Object.fromEntries(Object.entries(current).filter(([name, value]) => !Equal.equals(value, before.get(name))));
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({ ...baseline, ...editedSince(current.form.values.value, current.submitted()) });
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],
@@ -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 { useCallback, useEffect, useState } from "react";
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 settled = useCallback((saved: TRow) => (form && values ? form.receive(values(saved)) : undefined), [form, values]);
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
  }
@@ -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 type * as AtomRegistry from "effect/reactivity/AtomRegistry";
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 function mountLive(registry: AtomRegistry.AtomRegistry, client: unknown, coalesceWindow?: Duration.Input) {
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
- registry.set(live.coalesceWindow, coalesceWindow);
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 { queryCoalesceWindow } from "@shivaedev/contract/queryCoalesceWindow.ts";
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
- useEffect(() => {
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 }));
@@ -19,7 +19,7 @@ export interface SaveState<E> {
19
19
  }
20
20
  export function useSaveState<TFields extends Fields, A, E, TRuntimeError>(
21
21
  form: Form<TFields, A, E | FieldFailure, TRuntimeError> | undefined,
22
- settled: (result: A) => void,
22
+ settled?: (result: A) => void,
23
23
  ): SaveState<E | TRuntimeError> {
24
24
  const registry = useContext(RegistryContext);
25
25
  const recheck = useSessionRecheck();
@@ -35,7 +35,7 @@ export function useSaveState<TFields extends Fields, A, E, TRuntimeError>(
35
35
  form
36
36
  && registry.subscribe(form.submit, (next) => {
37
37
  if (AsyncResult.isSuccess(next) && !next.waiting) {
38
- settled(next.value);
38
+ settled?.(next.value);
39
39
  }
40
40
  }),
41
41
  [form, registry, settled],
@@ -2,8 +2,8 @@ import { RegistryContext } from "@effect/atom-react";
2
2
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
3
3
  import type * as Atom from "effect/reactivity/Atom";
4
4
  import { useContext } from "react";
5
+ import { useLoaderHandoff } from "#adapters/useLoaderHandoff.ts";
5
6
  import { loadedQuery } from "#internal/loadedQuery.ts";
6
- import { useLoaderHandoff } from "#internal/useLoaderHandoff.ts";
7
7
  import { type QueryOptions, type QueryState, useQuery } from "./resultState.ts";
8
8
 
9
9
  export interface LoadedQueryState<A, E> extends Omit<QueryState<A, E>, "data" | "result"> {
@@ -0,0 +1,41 @@
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
+
5
+ interface Windows {
6
+ readonly readers: Map<object, () => void>;
7
+ readonly restore: () => void;
8
+ }
9
+
10
+ const registries = new WeakMap<AtomRegistry.AtomRegistry, WeakMap<Atom.Atom<unknown>, Windows>>();
11
+
12
+ export const registerLiveWindow = Effect.fn("LiveWindow.registerLiveWindow")(function* <A extends Duration.Input | undefined>(
13
+ atom: Atom.Writable<A>,
14
+ value: A,
15
+ ) {
16
+ const registry = yield* AtomRegistry.AtomRegistry;
17
+ let windows = registries.get(registry);
18
+ if (windows === undefined) {
19
+ windows = new WeakMap();
20
+ registries.set(registry, windows);
21
+ }
22
+ let current = windows.get(atom);
23
+ if (current === undefined) {
24
+ const original = registry.get(atom);
25
+ current = { readers: new Map(), restore: () => registry.set(atom, original) };
26
+ windows.set(atom, current);
27
+ }
28
+ const reader = {};
29
+ function apply() {
30
+ registry.set(atom, value);
31
+ }
32
+ current.readers.set(reader, apply);
33
+ apply();
34
+ return () => {
35
+ current.readers.delete(reader);
36
+ ([...current.readers.values()].at(-1) ?? current.restore)();
37
+ if (current.readers.size === 0) {
38
+ windows.delete(atom);
39
+ }
40
+ };
41
+ });
@@ -1,10 +1,10 @@
1
- import { hasPermission, type Permission } from "@shivaedev/access/permission.ts";
1
+ import { Schema } from "effect";
2
+ import { hasPermission, Permission } from "@shivaedev/access/permission.ts";
2
3
 
3
- export interface PermissionSession {
4
- readonly user: {
5
- readonly permissions?: readonly Permission[];
6
- };
7
- }
4
+ export const PermissionSession = Schema.Struct({
5
+ user: Schema.Struct({ permissions: Schema.optionalKey(Schema.Array(Permission)) }),
6
+ });
7
+ export type PermissionSession = typeof PermissionSession.Type;
8
8
 
9
9
  export function can(session: PermissionSession | null | undefined, permission: Permission): boolean {
10
10
  return hasPermission(session?.user.permissions, permission);
package/src/submission.ts CHANGED
@@ -13,6 +13,7 @@ export interface SubmissionConfig<TFields extends Fields, A, E, R, TRuntimeError
13
13
  readonly rejectField: RejectField<TFields, E> | undefined;
14
14
  readonly runtime: Atom.AtomRuntime<Services<TFields, R>, TRuntimeError>;
15
15
  readonly save: (values: Decoded<TFields>) => Effect.Effect<A, E, AtomServices<R>>;
16
+ readonly savedValues?: (value: A) => Encoded<TFields>;
16
17
  }
17
18
 
18
19
  export interface Submission<TFields extends Fields, A, E, TRuntimeError> {
@@ -33,6 +34,7 @@ export function submission<TFields extends Fields, A, E, R, TRuntimeError>(
33
34
  return actionTrace(save(values, submitter), "ui.submit");
34
35
  },
35
36
  persistedDraft: config.persistedDraft,
37
+ ...(config.savedValues === undefined ? {} : { savedValues: config.savedValues }),
36
38
  runtime,
37
39
  });
38
40
  return { form: currentForm, submitted: () => submitted };
@@ -1 +0,0 @@
1
- {"version":3,"file":"permissionBoundary.d.ts","sourceRoot":"","sources":["../../src/client/permissionBoundary.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,KAAK,SAAS,EAAc,MAAM,OAAO,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAGlE,OAAO,EAAO,KAAK,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAE9D,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;CACvD;AAED,wBAAgB,MAAM,IAAI,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAG5D;AAUD,wBAAgB,kBAAkB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,uBAAuB,GAAG,SAAS,CAMtG"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"permissionBoundary.js","sourceRoot":"","sources":["../../src/client/permissionBoundary.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAkB,UAAU,EAAE,MAAM,OAAO,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,GAAG,EAA0B,MAAM,iBAAiB,CAAC;AAQ9D,MAAM,UAAU,MAAM;IACrB,MAAM,OAAO,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAC9C,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,iBAAiB,CAAC,EAAE,KAAK,EAA+B;IAChE,MAAM,OAAO,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAC9C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,KAAK,CAAC;IACb,CAAC;IACD,OAAO,OAAO,EAAE,QAAQ,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAA2B;IAC1F,OAAO,aAAa,CACnB,iBAAiB,CAAC,QAAQ,EAC1B,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,EAChC,aAAa,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE,CAAC,CAC9G,CAAC;AACH,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"screenPending.d.ts","sourceRoot":"","sources":["../../src/client/screenPending.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAExC,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAE/D,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,SAAS,CAAC;CACxC;AAED,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,GAAE,oBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,OAAO,EAAE,KAAK,EAAE,YAAY,CAAC,YAAY,CAAC,CAKnI"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"screenPending.js","sourceRoot":"","sources":["../../src/client/screenPending.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAM/D,MAAM,UAAU,aAAa,CAAC,EAAE,MAAM,EAAE,GAAyB,EAAE;IAClE,OAAO,MAAM,CAAC,GAAG,CAChB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,CAAC,EACzC,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC,CACnI,CAAC;AACH,CAAC;AAED,SAAS,OAAO,CAAC,MAA6B;IAC7C,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC;AAC7H,CAAC;AAED,SAAS,OAAO,CAAC,IAAgC;IAChD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;AACxI,CAAC;AAED,qHAAqH;AACrH,SAAS,QAAQ,CAAC,IAAgC,EAAE,OAAwC;IAC3F,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC;IACb,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AAC5F,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"useSignOut.d.ts","sourceRoot":"","sources":["../../src/client/useSignOut.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAM/C,OAAO,QAAQ,wBAAwB,CAAC;IACvC,UAAU,YAAY;QACrB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;KACrC;CACD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE;;;;;;;EA8C3G"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"useSignOut.js","sourceRoot":"","sources":["../../src/client/useSignOut.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAQ7C,MAAM,UAAU,UAAU,CAAO,MAAqC,EAAE,OAAoC;IAC3G,MAAM,MAAM,GAAG,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,UAAU,CAAC,sBAAsB,CAAC,IAAI,KAAK,CAAC;IAC7D,MAAM,MAAM,GAAG,OAAO,CACrB,GAAG,EAAE,CACJ,IAAI,CAAC,QAAQ,CACZ,CAAC,GAAG,EAAE,EAAE;QACP,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9E,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC,EACD,CAAC,CAAC,EAAE,KAA8C,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAClF,EACF,CAAC,QAAQ,EAAE,MAAM,CAAC,CAClB,CAAC;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;QAC7B,SAAS,MAAM;YACd,IAAI,MAAM,EAAE,CAAC;gBACZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC;YACtH,CAAC;QACF,CAAC;QACD,SAAS,SAAS;YACjB,IAAI,MAAM,EAAE,CAAC;gBACZ,KAAK,MAAM,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YACjG,CAAC;QACF,CAAC;QACD,OAAO,IAAI,CAAC,EAAE,EAAQ,CAAC,GAAG,EAAE,CAC3B,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,CACpI,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/C,YAAY,CAAC,QAAQ,CAAC,CAAC;IACvB,SAAS,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAChC,OAAO;QACN,GAAG,KAAK;QACR,QAAQ,EAAE,GAAG,EAAE;YACd,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;gBACjE,OAAO;YACR,CAAC;YACD,IAAI,MAAM,EAAE,CAAC;gBACZ,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;YACrH,CAAC;YACD,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YAC1B,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAChC,CAAC;KACD,CAAC;AACH,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"permissionGuard.d.ts","sourceRoot":"","sources":["../src/permissionGuard.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAO,KAAK,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,KAAK,cAAc,EAAgB,MAAM,mBAAmB,CAAC;AAEtE,OAAO,QAAQ,wBAAwB,CAAC;IACvC,UAAU,qBAAqB;QAC9B,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;QACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;KAC5B;CACD;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;IAC7D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,SAAS;QAAE,QAAQ,CAAC,UAAU,EAAE;YAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;YAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;SAAE,CAAA;KAAE,EAAE,CAAC;CACxH;AAED,wBAAgB,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,sBAAsB,GAAG,CAAC,OAAO,EAAE,sBAAsB,KAAK,IAAI,CAgBtH"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"permissionGuard.js","sourceRoot":"","sources":["../src/permissionGuard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,GAAG,EAA0B,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAuB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAmBtE,MAAM,UAAU,eAAe,CAAC,EAAE,OAAO,EAAE,MAAM,EAA0B;IAC1E,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE;QAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC9H,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,KAAK,IAAI,CAAC,EAAE,CAAC;YAC3F,OAAO;QACR,CAAC;QACD,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC;QAC1B,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC/C,MAAM,QAAQ,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,KAAK,MAAM,UAAU,IAAI,QAAQ,EAAE,CAAC;YACnC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC;gBAC/B,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;YAC7B,CAAC;QACF,CAAC;IACF,CAAC,CAAC;AACH,CAAC"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"queryRoute.d.ts","sourceRoot":"","sources":["../src/queryRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAY,MAAM,wBAAwB,CAAC;AAExE,OAAO,KAAK,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAClE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,KAAK,YAAY,MAAM,gCAAgC,CAAC;AAIpE,wBAAgB,UAAU,CACzB,OAAO,SAAS,MAAM,EACtB,OAAO,SAAS,MAAM,EACtB,CAAC,EACD,CAAC,EACD,QAAQ,SAAS;IAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,YAAY,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,YAAY,CAAA;CAAE,EACnH,KAAK,EAAE,CAAC,KAAK,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,KAAK,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAE9I,MAAM,YACI,IAAI,CAAC,eAAe,EAAE,iBAAiB,CAAC,GAAG;QACnD,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;QACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;KACzB,KACC,OAAO,CAAC,CAAC,CAAC;IAUb,UAAU,eAAe;QAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;KAAE;EAEtD"}
@@ -1,21 +0,0 @@
1
- import { notFound } from "@tanstack/react-router";
2
- import { Predicate } from "effect";
3
- import { isNotFound } from "@shivaedev/errors/taxonomy.ts";
4
- import { loadQuery } from "#adapters/loadQuery.ts";
5
- export function queryRoute(query) {
6
- return {
7
- loader: async (context) => {
8
- try {
9
- return await loadQuery(context.context.registry, query({ context: context.context, params: context.params, search: context.deps }), context);
10
- }
11
- catch (error) {
12
- if (isNotFound(error) || Predicate.isTagged(error, "QueryReadDenied")) {
13
- throw notFound({ data: error });
14
- }
15
- throw error;
16
- }
17
- },
18
- loaderDeps: ({ search }) => search,
19
- };
20
- }
21
- //# sourceMappingURL=queryRoute.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"queryRoute.js","sourceRoot":"","sources":["../src/queryRoute.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAInC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,UAAU,UAAU,CAMxB,KAA8I;IAC/I,OAAO;QACN,MAAM,EAAE,KAAK,EACZ,OAIC,EACY,EAAE;YACf,IAAI,CAAC;gBACJ,OAAO,MAAM,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;YAC9I,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC,EAAE,CAAC;oBACvE,MAAM,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;gBACjC,CAAC;gBACD,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC;QACD,UAAU,EAAE,CAAC,EAAE,MAAM,EAAgC,EAAE,EAAE,CAAC,MAAM;KAChE,CAAC;AACH,CAAC"}