@shivaedev/react 0.33.0 → 0.35.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 (99) hide show
  1. package/CHANGELOG.md +34 -0
  2. package/README.md +121 -77
  3. package/dist/AtomServices.d.ts +5 -0
  4. package/dist/AtomServices.d.ts.map +1 -0
  5. package/dist/AtomServices.js +2 -0
  6. package/dist/AtomServices.js.map +1 -0
  7. package/dist/adapters/loadQuery.d.ts.map +1 -1
  8. package/dist/adapters/loadQuery.js +0 -1
  9. package/dist/adapters/loadQuery.js.map +1 -1
  10. package/dist/adapters/permissionBoundary.d.ts +1 -1
  11. package/dist/adapters/permissionBoundary.d.ts.map +1 -1
  12. package/dist/adapters/permissionBoundary.js +1 -1
  13. package/dist/adapters/permissionBoundary.js.map +1 -1
  14. package/dist/adapters/permissionGuard.d.ts +1 -1
  15. package/dist/adapters/permissionGuard.d.ts.map +1 -1
  16. package/dist/adapters/permissionGuard.js +1 -1
  17. package/dist/adapters/permissionGuard.js.map +1 -1
  18. package/dist/can.d.ts +4 -0
  19. package/dist/can.d.ts.map +1 -0
  20. package/dist/can.js +5 -0
  21. package/dist/can.js.map +1 -0
  22. package/dist/client/actionCompletion.d.ts +1 -1
  23. package/dist/client/actionCompletion.d.ts.map +1 -1
  24. package/dist/client/adapters/SessionGeneration.js +1 -1
  25. package/dist/client/adapters/SessionGeneration.js.map +1 -1
  26. package/dist/client/authAction.d.ts +2 -16
  27. package/dist/client/authAction.d.ts.map +1 -1
  28. package/dist/client/authAction.js +1 -77
  29. package/dist/client/authAction.js.map +1 -1
  30. package/dist/client/authQuery.d.ts +2 -3
  31. package/dist/client/authQuery.d.ts.map +1 -1
  32. package/dist/client/authQuery.js +2 -7
  33. package/dist/client/authQuery.js.map +1 -1
  34. package/dist/client/authSession.d.ts +3 -9
  35. package/dist/client/authSession.d.ts.map +1 -1
  36. package/dist/client/authSession.js +2 -19
  37. package/dist/client/authSession.js.map +1 -1
  38. package/dist/client/create.d.ts +6 -4
  39. package/dist/client/create.d.ts.map +1 -1
  40. package/dist/client/create.js +2 -2
  41. package/dist/client/create.js.map +1 -1
  42. package/dist/client/editor.d.ts +6 -4
  43. package/dist/client/editor.d.ts.map +1 -1
  44. package/dist/client/editor.js +2 -1
  45. package/dist/client/editor.js.map +1 -1
  46. package/dist/client/mountLive.js +1 -1
  47. package/dist/client/mountLive.js.map +1 -1
  48. package/dist/client/resultState.d.ts +1 -1
  49. package/dist/client/resultState.d.ts.map +1 -1
  50. package/dist/client/resultState.js.map +1 -1
  51. package/dist/client/sessionBoundary.js +1 -1
  52. package/dist/client/sessionBoundary.js.map +1 -1
  53. package/dist/internal/PermissionContext.d.ts +1 -1
  54. package/dist/internal/PermissionContext.d.ts.map +1 -1
  55. package/dist/internal/useSubmissionCallbacks.d.ts +3 -2
  56. package/dist/internal/useSubmissionCallbacks.d.ts.map +1 -1
  57. package/dist/internal/useSubmissionCallbacks.js +1 -1
  58. package/dist/internal/useSubmissionCallbacks.js.map +1 -1
  59. package/dist/notices.d.ts +1 -1
  60. package/dist/notices.d.ts.map +1 -1
  61. package/dist/submission.d.ts +4 -3
  62. package/dist/submission.d.ts.map +1 -1
  63. package/dist/submission.js +5 -1
  64. package/dist/submission.js.map +1 -1
  65. package/package.json +13 -13
  66. package/src/AtomServices.ts +5 -0
  67. package/src/adapters/loadQuery.ts +0 -1
  68. package/src/adapters/permissionBoundary.ts +2 -1
  69. package/src/adapters/permissionGuard.ts +2 -1
  70. package/src/can.ts +6 -0
  71. package/src/client/actionCompletion.ts +1 -1
  72. package/src/client/adapters/SessionGeneration.ts +1 -1
  73. package/src/client/authAction.ts +3 -94
  74. package/src/client/authQuery.ts +3 -14
  75. package/src/client/authSession.ts +5 -34
  76. package/src/client/create.ts +9 -6
  77. package/src/client/editor.ts +9 -5
  78. package/src/client/mountLive.ts +1 -1
  79. package/src/client/resultState.ts +1 -1
  80. package/src/client/sessionBoundary.ts +1 -1
  81. package/src/internal/PermissionContext.ts +1 -1
  82. package/src/internal/useSubmissionCallbacks.ts +2 -1
  83. package/src/notices.ts +1 -1
  84. package/src/submission.ts +9 -3
  85. package/dist/fieldRejection.d.ts +0 -25
  86. package/dist/fieldRejection.d.ts.map +0 -1
  87. package/dist/fieldRejection.js +0 -21
  88. package/dist/fieldRejection.js.map +0 -1
  89. package/dist/internal/liveBindings.d.ts +0 -3
  90. package/dist/internal/liveBindings.d.ts.map +0 -1
  91. package/dist/internal/liveBindings.js +0 -10
  92. package/dist/internal/liveBindings.js.map +0 -1
  93. package/dist/permissions.d.ts +0 -13
  94. package/dist/permissions.d.ts.map +0 -1
  95. package/dist/permissions.js +0 -9
  96. package/dist/permissions.js.map +0 -1
  97. package/src/fieldRejection.ts +0 -51
  98. package/src/internal/liveBindings.ts +0 -11
  99. package/src/permissions.ts +0 -11
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/react",
3
- "version": "0.33.0",
3
+ "version": "0.35.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.6",
49
- "@shivaedev/contract": "0.30.2",
50
- "@shivaedev/errors": "0.5.0",
51
- "@shivaedev/form": "0.11.0"
48
+ "@shivaedev/access": "0.4.0",
49
+ "@shivaedev/contract": "0.32.0",
50
+ "@shivaedev/errors": "0.6.0",
51
+ "@shivaedev/form": "0.13.0",
52
+ "@shivaedev/identity": "0.20.0"
52
53
  },
53
54
  "devDependencies": {
54
55
  "@effect/atom-react": "4.0.6",
55
56
  "@effect/platform-node": "4.0.6",
56
57
  "@effect/sql-pg": "4.0.6",
57
58
  "@effect/sql-sqlite-node": "4.0.6",
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",
59
+ "@shivaedev/changes": "0.9.0",
60
+ "@shivaedev/jobs": "0.31.0",
61
+ "@shivaedev/quality": "0.57.0",
62
+ "@shivaedev/server": "0.20.0",
63
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",
64
+ "@shivaedev/sql": "0.34.0",
65
+ "@shivaedev/test-sql": "0.17.0",
66
+ "@shivaedev/test-story": "0.35.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,5 @@
1
+ import type { Scope } from "effect";
2
+ import type { AtomRegistry } from "effect/reactivity/AtomRegistry";
3
+ import type { Reactivity } from "effect/reactivity/Reactivity";
4
+
5
+ export type AtomServices<TRequirements> = TRequirements | Scope.Scope | AtomRegistry | Reactivity;
@@ -21,7 +21,6 @@ export async function loadQuery<A, E>(
21
21
  }
22
22
  return result.success;
23
23
  } catch (error) {
24
- handoff.release();
25
24
  if (signal.aborted) {
26
25
  const canceled = new Error("Query loading canceled", { cause: error });
27
26
  canceled.name = "AbortError";
@@ -2,8 +2,9 @@ import { CatchBoundary } from "@tanstack/react-router";
2
2
  import { createElement, type ReactNode, useContext } from "react";
3
3
  import type { Permission } from "@shivaedev/access/permission.ts";
4
4
  import { isForbidden } from "@shivaedev/errors/taxonomy.ts";
5
+ import type { PermissionSession } from "@shivaedev/identity/PermissionSession.ts";
6
+ import { can } from "#can.ts";
5
7
  import { PermissionContext } from "#internal/PermissionContext.ts";
6
- import { can, type PermissionSession } from "#permissions.ts";
7
8
 
8
9
  export interface PermissionBoundaryProps {
9
10
  readonly children: ReactNode;
@@ -1,7 +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 "#permissions.ts";
4
+ import type { PermissionSession } from "@shivaedev/identity/PermissionSession.ts";
5
+ import { can } from "#can.ts";
5
6
  import { type SignInLocation, signInSearch } from "#signInSearch.ts";
6
7
 
7
8
  declare module "@tanstack/react-router" {
package/src/can.ts ADDED
@@ -0,0 +1,6 @@
1
+ import { hasPermission, type Permission } from "@shivaedev/access/permission.ts";
2
+ import type { PermissionSession } from "@shivaedev/identity/PermissionSession.ts";
3
+
4
+ export function can(session: PermissionSession | null | undefined, permission: Permission): boolean {
5
+ return hasPermission(session?.user.permissions, permission);
6
+ }
@@ -2,7 +2,7 @@ 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 type { AtomServices } from "#fieldRejection.ts";
5
+ import type { AtomServices } from "#AtomServices.ts";
6
6
  import { NoticeContext } from "#internal/NoticeContext.ts";
7
7
  import { publishNotice } from "#internal/noticeStore.ts";
8
8
  import { requestsRecheck } from "#internal/sessionRecheck.ts";
@@ -3,8 +3,8 @@ 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";
6
+ import { liveBindings } from "@shivaedev/contract/composeBindings.ts";
6
7
  import { mountLive } from "#client/mountLive.ts";
7
- import { liveBindings } from "#internal/liveBindings.ts";
8
8
  import { RecheckContext } from "#internal/RecheckContext.ts";
9
9
  import { registerSessionRecheck } from "#internal/sessionRecheck.ts";
10
10
  import { useLatestCallback } from "#internal/useLatestCallback.ts";
@@ -1,97 +1,6 @@
1
- import { Effect, Schema } from "effect";
2
- import * as HttpStatus from "effect/http/HttpStatus";
1
+ import type { Effect } from "effect";
3
2
  import * as Atom from "effect/reactivity/Atom";
4
3
 
5
- export interface AuthActionResult<A, E> {
6
- readonly data: A;
7
- readonly error: E | null;
8
- }
9
-
10
- export const AuthFailureCode = Schema.Literals([
11
- "USER_NOT_FOUND",
12
- "FAILED_TO_CREATE_USER",
13
- "FAILED_TO_CREATE_SESSION",
14
- "FAILED_TO_UPDATE_USER",
15
- "FAILED_TO_GET_SESSION",
16
- "INVALID_PASSWORD",
17
- "INVALID_EMAIL",
18
- "INVALID_EMAIL_OR_PASSWORD",
19
- "INVALID_USER",
20
- "SOCIAL_ACCOUNT_ALREADY_LINKED",
21
- "PROVIDER_NOT_FOUND",
22
- "INVALID_TOKEN",
23
- "TOKEN_EXPIRED",
24
- "ID_TOKEN_NOT_SUPPORTED",
25
- "FAILED_TO_GET_USER_INFO",
26
- "USER_EMAIL_NOT_FOUND",
27
- "EMAIL_NOT_VERIFIED",
28
- "PASSWORD_TOO_SHORT",
29
- "PASSWORD_TOO_LONG",
30
- "USER_ALREADY_EXISTS",
31
- "USER_ALREADY_EXISTS_USE_ANOTHER_EMAIL",
32
- "EMAIL_CAN_NOT_BE_UPDATED",
33
- "CHANGE_EMAIL_DISABLED",
34
- "CREDENTIAL_ACCOUNT_NOT_FOUND",
35
- "SESSION_EXPIRED",
36
- "FAILED_TO_UNLINK_LAST_ACCOUNT",
37
- "ACCOUNT_NOT_FOUND",
38
- "USER_ALREADY_HAS_PASSWORD",
39
- "CROSS_SITE_NAVIGATION_LOGIN_BLOCKED",
40
- "VERIFICATION_EMAIL_NOT_ENABLED",
41
- "EMAIL_ALREADY_VERIFIED",
42
- "EMAIL_MISMATCH",
43
- "SESSION_NOT_FRESH",
44
- "LINKED_ACCOUNT_ALREADY_EXISTS",
45
- "INVALID_ORIGIN",
46
- "INVALID_CALLBACK_URL",
47
- "INVALID_REDIRECT_URL",
48
- "INVALID_ERROR_CALLBACK_URL",
49
- "INVALID_NEW_USER_CALLBACK_URL",
50
- "MISSING_OR_NULL_ORIGIN",
51
- "CALLBACK_URL_REQUIRED",
52
- "FAILED_TO_CREATE_VERIFICATION",
53
- "FIELD_NOT_ALLOWED",
54
- "ASYNC_VALIDATION_NOT_SUPPORTED",
55
- "VALIDATION_ERROR",
56
- "MISSING_FIELD",
57
- "METHOD_NOT_ALLOWED_DEFER_SESSION_REQUIRED",
58
- "BODY_MUST_BE_AN_OBJECT",
59
- "PASSWORD_ALREADY_SET",
60
- "RATE_LIMITED",
61
- "UNKNOWN",
62
- ]);
63
- export type AuthFailureCode = typeof AuthFailureCode.Type;
64
-
65
- export class AuthFailure extends Schema.TaggedError<AuthFailure>()("AuthFailure", {
66
- cause: Schema.Unknown,
67
- code: AuthFailureCode,
68
- }) {}
69
-
70
- const supportedCode = Schema.is(AuthFailureCode);
71
-
72
- export function authCall<TInput, A, E extends object = never>(
73
- run: (input: TInput, signal: AbortSignal) => Promise<AuthActionResult<A, E>>,
74
- ): (input: TInput) => Effect.Effect<A, AuthFailure> {
75
- return (input) =>
76
- Effect.tryPromise({
77
- catch: (cause) => new AuthFailure({ cause, code: "UNKNOWN" }),
78
- try: (signal) => run(input, signal),
79
- }).pipe(
80
- Effect.flatMap(({ data, error }) => {
81
- if (error === null) {
82
- return Effect.succeed(data);
83
- }
84
- if ("code" in error && supportedCode(error.code)) {
85
- return Effect.fail(new AuthFailure({ cause: error, code: error.code }));
86
- }
87
- const code = "status" in error && error.status === HttpStatus.fromLiteral("TooManyRequests") ? "RATE_LIMITED" : "UNKNOWN";
88
- return Effect.fail(new AuthFailure({ cause: error, code }));
89
- }),
90
- );
91
- }
92
-
93
- export function authAction<TInput, A, E extends object = never>(
94
- run: (input: TInput, signal: AbortSignal) => Promise<AuthActionResult<A, E>>,
95
- ): Atom.AtomResultFn<TInput, A, AuthFailure> {
96
- return Atom.fn<TInput>()(authCall(run));
4
+ export function authAction<TInput, A, E>(run: (input: TInput) => Effect.Effect<A, E>): Atom.AtomResultFn<TInput, A, E> {
5
+ return Atom.fn<TInput>()(run);
97
6
  }
@@ -1,18 +1,7 @@
1
- import { Effect } from "effect";
1
+ import type { Effect } from "effect";
2
2
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
3
3
  import * as Atom from "effect/reactivity/Atom";
4
- import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
5
- import type { AuthActionResult } from "./authAction.ts";
6
4
 
7
- export function authQuery<TInput, A, E extends object = never>(
8
- run: (input: TInput, signal: AbortSignal) => Promise<AuthActionResult<A, E>>,
9
- ): (input: TInput) => Atom.Atom<AsyncResult.AsyncResult<A, E | AuthUnavailable>> {
10
- return Atom.family((input: TInput) =>
11
- Atom.make(
12
- Effect.tryPromise({
13
- catch: (cause) => new AuthUnavailable({ message: String(cause) }),
14
- try: (signal) => run(input, signal),
15
- }).pipe(Effect.flatMap((result) => (result.error === null ? Effect.succeed(result.data) : Effect.fail(result.error)))),
16
- ),
17
- );
5
+ export function authQuery<TInput, A, E>(read: (input: TInput) => Effect.Effect<A, E>): (input: TInput) => Atom.Atom<AsyncResult.AsyncResult<A, E>> {
6
+ return Atom.family((input: TInput) => Atom.make(read(input)));
18
7
  }
@@ -1,44 +1,15 @@
1
- import { Effect, Schema } from "effect";
1
+ import { Effect } from "effect";
2
2
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
3
3
  import * as Atom from "effect/reactivity/Atom";
4
4
  import * as AtomRegistry from "effect/reactivity/AtomRegistry";
5
- import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
6
- import { PermissionSession } from "#permissions.ts";
7
- import type { AuthActionResult } from "./authAction.ts";
8
5
 
9
6
  export interface AuthSession<A, E> {
10
- readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E | AuthUnavailable>>;
11
- readonly refresh: Effect.Effect<A, E | AuthUnavailable, AtomRegistry.AtomRegistry>;
7
+ readonly atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>;
8
+ readonly refresh: Effect.Effect<A, E, AtomRegistry.AtomRegistry>;
12
9
  }
13
10
 
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
- );
11
+ export function authSession<A, E>(read: Effect.Effect<A, E>): AuthSession<A, E> {
12
+ const atom = Atom.make(read);
42
13
  const refresh = Effect.gen(function* () {
43
14
  const registry = yield* AtomRegistry.AtomRegistry;
44
15
  registry.refresh(atom);
@@ -1,21 +1,24 @@
1
1
  import { type Effect, Equal, Option, type Schema } from "effect";
2
2
  import type * as Atom from "effect/reactivity/Atom";
3
3
  import { useCallback, useState } from "react";
4
- import { type BrowserDraftConfig, usePersistedDraft } from "@shivaedev/form/client/react.ts";
4
+ import { usePersistedDraft } from "@shivaedev/form/adapters/react.ts";
5
+ import type { FieldRejectionMapping } from "@shivaedev/form/fieldRejection.ts";
6
+ import type { PersistedDraftConfig } from "@shivaedev/form/persistence.ts";
5
7
  import type { Decoded, Encoded, FieldFailure, Fields, Form, Services } from "@shivaedev/form/shape.ts";
6
- import type { AtomServices, FieldRejectionMapping } from "#fieldRejection.ts";
8
+ import type { AtomServices } from "#AtomServices.ts";
7
9
  import { useSubmissionCallbacks } from "#internal/useSubmissionCallbacks.ts";
8
10
  import type { NoticeFeedback } from "#notices.ts";
9
- import { submission } from "#submission.ts";
11
+ import { type SubmissionConfig, submission } from "#submission.ts";
10
12
  import { type SaveState, useSaveState } from "./saveState.ts";
11
13
  export type CreateConfig<TFields extends Fields, TCreated, TSaveError, R, TRuntimeError> = {
12
- readonly persistedDraft?: BrowserDraftConfig | undefined;
14
+ readonly persistedDraft?: PersistedDraftConfig | undefined;
13
15
  readonly fields: Schema.Struct<TFields>;
14
16
  readonly initialValues: Encoded<TFields>;
15
17
  readonly create: (values: Decoded<TFields>) => Effect.Effect<TCreated, TSaveError, AtomServices<R>>;
16
18
  readonly runtime: Atom.AtomRuntime<Services<TFields, R>, TRuntimeError>;
17
19
  readonly notices?: NoticeFeedback<Decoded<TFields>, TCreated, TSaveError, Services<TFields, R>>;
18
- } & FieldRejectionMapping<TFields, TSaveError>;
20
+ } & FieldRejectionMapping<TFields, TSaveError> &
21
+ Pick<SubmissionConfig<TFields, TCreated, TSaveError, R, TRuntimeError>, "requiredMessages" | "checks" | "debounce" | "arrayKeys">;
19
22
  export interface Create<TFields extends Fields, TCreated, TSaveError, TRuntimeError> extends SaveState<TSaveError | TRuntimeError> {
20
23
  readonly created: Option.Option<TCreated>;
21
24
  readonly form: Form<TFields, TCreated, TSaveError | FieldFailure, TRuntimeError>;
@@ -38,7 +41,7 @@ export function useCreate<TFields extends Fields, TCreated, TSaveError, R, TRunt
38
41
  function initialize() {
39
42
  const { fields, initialValues, runtime } = config;
40
43
  function makeSubmission() {
41
- return submission({ ...callbacks, fields, initialValues, persistedDraft, runtime });
44
+ return submission({ ...config, ...callbacks, fields, initialValues, persistedDraft, runtime });
42
45
  }
43
46
  return { baseline: initialValues, created: Option.none<TCreated>(), current: makeSubmission(), fields, fresh: makeSubmission, runtime };
44
47
  }
@@ -2,18 +2,20 @@ 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
4
  import { useEffect, useState } from "react";
5
- import { type BrowserDraftConfig, usePersistedDraft } from "@shivaedev/form/client/react.ts";
5
+ import { usePersistedDraft } from "@shivaedev/form/adapters/react.ts";
6
+ import type { FieldRejectionMapping } from "@shivaedev/form/fieldRejection.ts";
7
+ import type { PersistedDraftConfig } from "@shivaedev/form/persistence.ts";
6
8
  import type { Decoded, Encoded, FieldFailure, Fields, Form, Services } from "@shivaedev/form/shape.ts";
7
- import type { AtomServices, FieldRejectionMapping } from "#fieldRejection.ts";
9
+ import type { AtomServices } from "#AtomServices.ts";
8
10
  import { loadedQuery } from "#internal/loadedQuery.ts";
9
11
  import { useSubmissionCallbacks } from "#internal/useSubmissionCallbacks.ts";
10
12
  import type { NoticeFeedback } from "#notices.ts";
11
- import { submission } from "#submission.ts";
13
+ import { type SubmissionConfig, submission } from "#submission.ts";
12
14
  import { type QueryOptions, type QueryState, useQuery } from "./resultState.ts";
13
15
  import { type SaveState, useSaveState } from "./saveState.ts";
14
16
  import type { LoadedQueryState } from "./useLoaderQuery.ts";
15
17
  export type EditorConfig<TFields extends Fields, TRow, TQueryError, TSaveError, R, TRuntimeError> = {
16
- readonly persistedDraft?: BrowserDraftConfig | undefined;
18
+ readonly persistedDraft?: PersistedDraftConfig | undefined;
17
19
  readonly query: Atom.Atom<AsyncResult.AsyncResult<TRow, TQueryError>>;
18
20
  readonly fields: Schema.Struct<TFields>;
19
21
  readonly values: (row: TRow) => Encoded<TFields>;
@@ -21,7 +23,8 @@ export type EditorConfig<TFields extends Fields, TRow, TQueryError, TSaveError,
21
23
  readonly runtime: Atom.AtomRuntime<Services<TFields, R>, TRuntimeError>;
22
24
  readonly notices?: NoticeFeedback<Decoded<TFields>, TRow, TSaveError, Services<TFields, R>>;
23
25
  readonly queryNotice?: QueryOptions<TQueryError>["notice"];
24
- } & FieldRejectionMapping<TFields, TSaveError>;
26
+ } & FieldRejectionMapping<TFields, TSaveError> &
27
+ Pick<SubmissionConfig<TFields, TRow, TSaveError, R, TRuntimeError>, "requiredMessages" | "checks" | "debounce" | "arrayKeys">;
25
28
  export interface Editor<TFields extends Fields, TRow, TQueryError, TSaveError, TRuntimeError> extends SaveState<TSaveError | TRuntimeError> {
26
29
  readonly form: Form<TFields, TRow, TSaveError | FieldFailure, TRuntimeError> | undefined;
27
30
  readonly query: QueryState<TRow, TQueryError>;
@@ -57,6 +60,7 @@ export function useEditor<TFields extends Fields, TRow, TQueryError, TSaveError,
57
60
  current = {
58
61
  fields: config.fields,
59
62
  form: submission({
63
+ ...config,
60
64
  ...callbacks,
61
65
  fields: config.fields,
62
66
  initialValues: config.values(row.value),
@@ -2,7 +2,7 @@ import { Cause, type Duration, Effect, Option, Predicate } from "effect";
2
2
  import * as Atom from "effect/reactivity/Atom";
3
3
  import * as AtomRegistry from "effect/reactivity/AtomRegistry";
4
4
  import { LiveConnection } from "@shivaedev/contract/automaticLive.ts";
5
- import { liveBindings } from "#internal/liveBindings.ts";
5
+ import { liveBindings } from "@shivaedev/contract/composeBindings.ts";
6
6
  import { registerLiveWindow } from "#internal/registerLiveWindow.ts";
7
7
  import { recheckUnauthorized } from "#internal/sessionRecheck.ts";
8
8
 
@@ -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 type { AtomServices } from "#AtomServices.ts";
7
8
  import { acceptLoaderQuery } from "#adapters/queryHandoff.ts";
8
9
  import { useLiveWindow } from "#client/adapters/useLiveWindow.ts";
9
- import type { AtomServices } from "#fieldRejection.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";
@@ -2,7 +2,7 @@ import { RegistryContext } from "@effect/atom-react";
2
2
  import type { Duration } from "effect";
3
3
  import type * as AtomRegistry from "effect/reactivity/AtomRegistry";
4
4
  import { createElement, Fragment, type ReactNode, useContext } from "react";
5
- import { DraftSessionContext } from "@shivaedev/form/client/react.ts";
5
+ import { DraftSessionContext } from "@shivaedev/form/adapters/react.ts";
6
6
  import { SessionGeneration } from "#client/adapters/SessionGeneration.ts";
7
7
  import { SessionHandoff } from "#client/adapters/SessionHandoff.ts";
8
8
  import { RecheckContext } from "#internal/RecheckContext.ts";
@@ -1,5 +1,5 @@
1
1
  import { createContext, type ReactNode } from "react";
2
- import type { PermissionSession } from "#permissions.ts";
2
+ import type { PermissionSession } from "@shivaedev/identity/PermissionSession.ts";
3
3
 
4
4
  export const PermissionContext = createContext<{ readonly fallback: ReactNode; readonly session: PermissionSession | null | undefined } | undefined>(
5
5
  undefined,
@@ -1,8 +1,9 @@
1
1
  import { Effect, type Schema } from "effect";
2
2
  import type * as Atom from "effect/reactivity/Atom";
3
3
  import { useInsertionEffect, useMemo, useRef } from "react";
4
+ import { fieldRejectionOf, type RejectField } from "@shivaedev/form/fieldRejection.ts";
4
5
  import type { Decoded, Fields } from "@shivaedev/form/shape.ts";
5
- import { type AtomServices, fieldRejectionOf, type RejectField } from "#fieldRejection.ts";
6
+ import type { AtomServices } from "#AtomServices.ts";
6
7
  import type { NoticeFeedback } from "#notices.ts";
7
8
  import { useNoticePublisher } from "./useNoticePublisher.ts";
8
9
 
package/src/notices.ts CHANGED
@@ -3,7 +3,7 @@ import { type Duration, type Effect, Layer } from "effect";
3
3
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
4
4
  import * as Atom from "effect/reactivity/Atom";
5
5
  import { createElement, Fragment, type ReactNode, useContext, useLayoutEffect, useMemo } from "react";
6
- import type { AtomServices } from "#fieldRejection.ts";
6
+ import type { AtomServices } from "#AtomServices.ts";
7
7
  import { NoticeContext } from "#internal/NoticeContext.ts";
8
8
  import type { NoticeClock, NoticeEntry } from "#internal/noticeEntry.ts";
9
9
  import { noticeStore } from "#internal/noticeStore.ts";
package/src/submission.ts CHANGED
@@ -1,12 +1,14 @@
1
1
  import type { Effect, Schema } from "effect";
2
2
  import type * as Atom from "effect/reactivity/Atom";
3
+ import { type RejectField, rejecting } from "@shivaedev/form/fieldRejection.ts";
3
4
  import { form } from "@shivaedev/form/form.ts";
4
5
  import type { PersistedDraftConfig } from "@shivaedev/form/persistence.ts";
5
- import type { Decoded, Encoded, FieldFailure, Fields, Form, Services } from "@shivaedev/form/shape.ts";
6
+ import type { Config, Decoded, Encoded, FieldFailure, Fields, Form, Services } from "@shivaedev/form/shape.ts";
7
+ import type { AtomServices } from "#AtomServices.ts";
6
8
  import { actionTrace } from "#actionTrace.ts";
7
- import { type AtomServices, type RejectField, rejecting } from "./fieldRejection.ts";
8
9
 
9
- export interface SubmissionConfig<TFields extends Fields, A, E, R, TRuntimeError> {
10
+ export interface SubmissionConfig<TFields extends Fields, A, E, R, TRuntimeError>
11
+ extends Pick<Config<TFields, A, E, R, TRuntimeError>, "requiredMessages" | "checks" | "debounce" | "arrayKeys"> {
10
12
  readonly fields: Schema.Struct<TFields>;
11
13
  readonly initialValues: Encoded<TFields>;
12
14
  readonly persistedDraft?: PersistedDraftConfig | undefined;
@@ -28,6 +30,10 @@ export function submission<TFields extends Fields, A, E, R, TRuntimeError>(
28
30
  const save = rejecting(fields, config.save, config.rejectField);
29
31
  let submitted: Encoded<TFields> | undefined;
30
32
  const currentForm: Form<TFields, A, E | FieldFailure, TRuntimeError> = form(fields, {
33
+ ...(config.arrayKeys === undefined ? {} : { arrayKeys: config.arrayKeys }),
34
+ ...(config.checks === undefined ? {} : { checks: config.checks }),
35
+ ...(config.debounce === undefined ? {} : { debounce: config.debounce }),
36
+ ...(config.requiredMessages === undefined ? {} : { requiredMessages: config.requiredMessages }),
31
37
  initialValues,
32
38
  onSubmit: (values, submitter, snapshot) => {
33
39
  submitted = snapshot;
@@ -1,25 +0,0 @@
1
- import { Effect, type Schema, type Scope } from "effect";
2
- import type { AtomRegistry } from "effect/reactivity/AtomRegistry";
3
- import type { Reactivity } from "effect/reactivity/Reactivity";
4
- import type { FieldFailure, Fields, Name, Submitter } from "@shivaedev/form/shape.ts";
5
- export interface FieldRejection<TName extends string> {
6
- readonly field: TName;
7
- readonly message: string;
8
- }
9
- export type AtomServices<TRequirements> = TRequirements | Scope.Scope | AtomRegistry | Reactivity;
10
- export type RejectField<TFields extends Fields, TError> = (error: TError) => FieldRejection<Name<TFields>> | undefined;
11
- type Unmatched<TFields extends Fields, TError> = TError extends {
12
- readonly _tag: string;
13
- readonly message: string;
14
- } ? "field" extends keyof TError ? Exclude<TError["field"], Name<TFields> | undefined> : never : never;
15
- export type FieldRejectionMapping<TFields extends Fields, TError> = {
16
- readonly rejectField?: RejectField<TFields, TError>;
17
- } & ([
18
- Unmatched<TFields, TError>
19
- ] extends [never] ? unknown : {
20
- readonly rejectField: RejectField<TFields, TError>;
21
- });
22
- export declare function fieldRejectionOf<TFields extends Fields>(schema: Schema.Struct<TFields>): (error: unknown) => FieldRejection<Name<TFields>> | undefined;
23
- export declare function rejecting<TFields extends Fields, TValues, TResult, TError, TRequirements>(schema: Schema.Struct<TFields>, save: (values: TValues) => Effect.Effect<TResult, TError, TRequirements>, reject: RejectField<TFields, TError> | undefined): (values: TValues, submitter: Submitter<Name<TFields>>) => Effect.Effect<TResult, TError | FieldFailure, TRequirements>;
24
- export {};
25
- //# sourceMappingURL=fieldRejection.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"fieldRejection.d.ts","sourceRoot":"","sources":["../src/fieldRejection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAEtF,MAAM,WAAW,cAAc,CAAC,KAAK,SAAS,MAAM;IACnD,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,YAAY,CAAC,aAAa,IAAI,aAAa,GAAG,KAAK,CAAC,KAAK,GAAG,YAAY,GAAG,UAAU,CAAC;AAElG,MAAM,MAAM,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,MAAM,IAAI,CAAC,KAAK,EAAE,MAAM,KAAK,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;AAEvH,KAAK,SAAS,CAAC,OAAO,SAAS,MAAM,EAAE,MAAM,IAAI,MAAM,SAAS;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAChH,OAAO,SAAS,MAAM,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC,GACnD,KAAK,GACN,KAAK,CAAC;AAET,MAAM,MAAM,qBAAqB,CAAC,OAAO,SAAS,MAAM,EAAE,MAAM,IAAI;IAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CAAC;IAC9H,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,SAAS,CAAC,KAAK,CAAC,GACd,OAAO,GACP;IAAE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAAC;AAE3D,wBAAgB,gBAAgB,CAAC,OAAO,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WACvE,OAAO,KAAG,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAUlE;AAED,wBAAgB,SAAS,CAAC,OAAO,SAAS,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EACxF,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,EACxE,MAAM,EAAE,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,SAAS,YAGhC,OAAO,aAAa,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,EAAE,aAAa,CAAC,CAK3H"}
@@ -1,21 +0,0 @@
1
- import { Effect, Predicate } from "effect";
2
- export function fieldRejectionOf(schema) {
3
- return (error) => {
4
- function isName(name) {
5
- return typeof name === "string" && Object.hasOwn(schema.fields, name);
6
- }
7
- if (!(Predicate.hasProperty(error, "_tag") && Predicate.hasProperty(error, "field") && Predicate.hasProperty(error, "message"))) {
8
- return undefined;
9
- }
10
- const { _tag, field, message } = error;
11
- return typeof _tag === "string" && isName(field) && typeof message === "string" ? { field, message } : undefined;
12
- };
13
- }
14
- export function rejecting(schema, save, reject) {
15
- const rejection = reject ?? fieldRejectionOf(schema);
16
- return (values, submitter) => Effect.catch(save(values), (error) => {
17
- const found = rejection(error);
18
- return found === undefined ? Effect.fail(error) : submitter.fail(found.field, found.message);
19
- });
20
- }
21
- //# sourceMappingURL=fieldRejection.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"fieldRejection.js","sourceRoot":"","sources":["../src/fieldRejection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAA2B,MAAM,QAAQ,CAAC;AA0BpE,MAAM,UAAU,gBAAgB,CAAyB,MAA8B;IACtF,OAAO,CAAC,KAAc,EAA6C,EAAE;QACpE,SAAS,MAAM,CAAC,IAAa;YAC5B,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACvE,CAAC;QACD,IAAI,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;YACjI,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;QACvC,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAClH,CAAC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CACxB,MAA8B,EAC9B,IAAwE,EACxE,MAAgD;IAEhD,MAAM,SAAS,GAAG,MAAM,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACrD,OAAO,CAAC,MAAe,EAAE,SAAmC,EAAgE,EAAE,CAC7H,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,EAA+C,EAAE;QACjF,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IAC9F,CAAC,CAAC,CAAC;AACL,CAAC"}
@@ -1,3 +0,0 @@
1
- import { type LiveBound } from "@shivaedev/contract/automaticLive.ts";
2
- export declare function liveBindings(client: unknown): readonly LiveBound[];
3
- //# sourceMappingURL=liveBindings.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"liveBindings.d.ts","sourceRoot":"","sources":["../../src/internal/liveBindings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAkB,MAAM,sCAAsC,CAAC;AAMtF,wBAAgB,YAAY,CAAC,MAAM,EAAE,OAAO,GAAG,SAAS,SAAS,EAAE,CAGlE"}
@@ -1,10 +0,0 @@
1
- import { Predicate } from "effect";
2
- import { LiveConnection } from "@shivaedev/contract/automaticLive.ts";
3
- function isLiveBound(value) {
4
- return Predicate.hasProperty(value, LiveConnection);
5
- }
6
- export function liveBindings(client) {
7
- const values = typeof client === "object" && client !== null ? [client, ...Object.values(client)] : [client];
8
- return values.filter(isLiveBound);
9
- }
10
- //# sourceMappingURL=liveBindings.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"liveBindings.js","sourceRoot":"","sources":["../../src/internal/liveBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAkB,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAEtF,SAAS,WAAW,CAAC,KAAc;IAClC,OAAO,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAe;IAC3C,MAAM,MAAM,GAAG,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IAC7G,OAAO,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AACnC,CAAC"}
@@ -1,13 +0,0 @@
1
- import { Schema } from "effect";
2
- import { Permission } from "@shivaedev/access/permission.ts";
3
- export declare const PermissionSession: Schema.Struct<{
4
- readonly user: Schema.Struct<{
5
- readonly permissions: Schema.optionalKey<Schema.$Array<Schema.Struct<{
6
- readonly name: Schema.String;
7
- readonly strength: Schema.Literals<readonly ["own", "any"]>;
8
- }>>>;
9
- }>;
10
- }>;
11
- export type PermissionSession = typeof PermissionSession.Type;
12
- export declare function can(session: PermissionSession | null | undefined, permission: Permission): boolean;
13
- //# sourceMappingURL=permissions.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAiB,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE5E,eAAO,MAAM,iBAAiB;;;;;;;EAE5B,CAAC;AACH,MAAM,MAAM,iBAAiB,GAAG,OAAO,iBAAiB,CAAC,IAAI,CAAC;AAE9D,wBAAgB,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAElG"}
@@ -1,9 +0,0 @@
1
- import { Schema } from "effect";
2
- import { hasPermission, Permission } from "@shivaedev/access/permission.ts";
3
- export const PermissionSession = Schema.Struct({
4
- user: Schema.Struct({ permissions: Schema.optionalKey(Schema.Array(Permission)) }),
5
- });
6
- export function can(session, permission) {
7
- return hasPermission(session?.user.permissions, permission);
8
- }
9
- //# sourceMappingURL=permissions.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE5E,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;CAClF,CAAC,CAAC;AAGH,MAAM,UAAU,GAAG,CAAC,OAA6C,EAAE,UAAsB;IACxF,OAAO,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;AAC7D,CAAC"}