@shivaedev/react 0.49.2 → 0.51.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 (151) hide show
  1. package/CHANGELOG.md +37 -0
  2. package/README.md +188 -186
  3. package/dist/adapters/permissionGuard.d.ts +4 -3
  4. package/dist/adapters/permissionGuard.d.ts.map +1 -1
  5. package/dist/adapters/permissionGuard.js +3 -4
  6. package/dist/adapters/permissionGuard.js.map +1 -1
  7. package/dist/adapters/signInRedirect.d.ts +4 -0
  8. package/dist/adapters/signInRedirect.d.ts.map +1 -0
  9. package/dist/adapters/signInRedirect.js +6 -0
  10. package/dist/adapters/signInRedirect.js.map +1 -0
  11. package/dist/client/FailureHostContext.d.ts +3 -0
  12. package/dist/client/FailureHostContext.d.ts.map +1 -0
  13. package/dist/client/FailureHostContext.js +3 -0
  14. package/dist/client/FailureHostContext.js.map +1 -0
  15. package/dist/client/NoticeContext.d.ts +1 -1
  16. package/dist/client/QueryView.d.ts +20 -5
  17. package/dist/client/QueryView.d.ts.map +1 -1
  18. package/dist/client/QueryView.js +23 -3
  19. package/dist/client/QueryView.js.map +1 -1
  20. package/dist/client/actionCompletion.d.ts +6 -5
  21. package/dist/client/actionCompletion.d.ts.map +1 -1
  22. package/dist/client/actionCompletion.js +19 -18
  23. package/dist/client/actionCompletion.js.map +1 -1
  24. package/dist/client/adapters/formFields.d.ts +4 -0
  25. package/dist/client/adapters/formFields.d.ts.map +1 -0
  26. package/dist/client/adapters/formFields.js +30 -0
  27. package/dist/client/adapters/formFields.js.map +1 -0
  28. package/dist/client/adapters/operationHooks.d.ts +5 -0
  29. package/dist/client/adapters/operationHooks.d.ts.map +1 -0
  30. package/dist/client/adapters/operationHooks.js +7 -0
  31. package/dist/client/adapters/operationHooks.js.map +1 -0
  32. package/dist/{adapters → client/adapters}/queryRoute.d.ts +12 -5
  33. package/dist/client/adapters/queryRoute.d.ts.map +1 -0
  34. package/dist/{adapters → client/adapters}/queryRoute.js +14 -1
  35. package/dist/client/adapters/queryRoute.js.map +1 -0
  36. package/dist/client/adapters/rowValues.d.ts +7 -0
  37. package/dist/client/adapters/rowValues.d.ts.map +1 -0
  38. package/dist/client/adapters/rowValues.js +17 -0
  39. package/dist/client/adapters/rowValues.js.map +1 -0
  40. package/dist/client/adapters/useFeedback.d.ts +11 -0
  41. package/dist/client/adapters/useFeedback.d.ts.map +1 -0
  42. package/dist/client/adapters/useFeedback.js +38 -0
  43. package/dist/client/adapters/useFeedback.js.map +1 -0
  44. package/dist/client/adapters/useQueryNotice.js +1 -1
  45. package/dist/client/adapters/useQueryNotice.js.map +1 -1
  46. package/dist/client/adapters/useStableRun.js +1 -1
  47. package/dist/client/adapters/useStableRun.js.map +1 -1
  48. package/dist/client/adapters/useSubmissionCallbacks.d.ts +4 -5
  49. package/dist/client/adapters/useSubmissionCallbacks.d.ts.map +1 -1
  50. package/dist/client/adapters/useSubmissionCallbacks.js +37 -17
  51. package/dist/client/adapters/useSubmissionCallbacks.js.map +1 -1
  52. package/dist/client/adapters/useUndoableChange.d.ts +13 -12
  53. package/dist/client/adapters/useUndoableChange.d.ts.map +1 -1
  54. package/dist/client/adapters/useUndoableChange.js +16 -4
  55. package/dist/client/adapters/useUndoableChange.js.map +1 -1
  56. package/dist/client/boundOperation.d.ts +12 -0
  57. package/dist/client/boundOperation.d.ts.map +1 -0
  58. package/dist/client/boundOperation.js +2 -0
  59. package/dist/client/boundOperation.js.map +1 -0
  60. package/dist/client/create.d.ts +15 -11
  61. package/dist/client/create.d.ts.map +1 -1
  62. package/dist/client/create.js +12 -5
  63. package/dist/client/create.js.map +1 -1
  64. package/dist/client/editor.d.ts +25 -18
  65. package/dist/client/editor.d.ts.map +1 -1
  66. package/dist/client/editor.js +14 -8
  67. package/dist/client/editor.js.map +1 -1
  68. package/dist/client/failureDecision.d.ts +16 -0
  69. package/dist/client/failureDecision.d.ts.map +1 -0
  70. package/dist/client/failureDecision.js +49 -0
  71. package/dist/client/failureDecision.js.map +1 -0
  72. package/dist/client/failures.d.ts +45 -0
  73. package/dist/client/failures.d.ts.map +1 -0
  74. package/dist/client/failures.js +2 -0
  75. package/dist/client/failures.js.map +1 -0
  76. package/dist/client/notices.d.ts +9 -4
  77. package/dist/client/notices.d.ts.map +1 -1
  78. package/dist/client/notices.js +22 -3
  79. package/dist/client/notices.js.map +1 -1
  80. package/dist/client/operationForm.d.ts +40 -0
  81. package/dist/client/operationForm.d.ts.map +1 -0
  82. package/dist/client/operationForm.js +2 -0
  83. package/dist/client/operationForm.js.map +1 -0
  84. package/dist/client/pendingCommand.d.ts +6 -9
  85. package/dist/client/pendingCommand.d.ts.map +1 -1
  86. package/dist/client/pendingCommand.js +3 -3
  87. package/dist/client/pendingCommand.js.map +1 -1
  88. package/dist/client/resultState.d.ts +7 -4
  89. package/dist/client/resultState.d.ts.map +1 -1
  90. package/dist/client/resultState.js +6 -3
  91. package/dist/client/resultState.js.map +1 -1
  92. package/dist/client/unexpectedFailure.d.ts +8 -0
  93. package/dist/client/unexpectedFailure.d.ts.map +1 -0
  94. package/dist/client/unexpectedFailure.js +17 -0
  95. package/dist/client/unexpectedFailure.js.map +1 -0
  96. package/dist/client/useDebouncedValue.js +1 -1
  97. package/dist/client/useDebouncedValue.js.map +1 -1
  98. package/dist/client/useDelay.js +1 -1
  99. package/dist/client/useDelay.js.map +1 -1
  100. package/dist/noticeEntry.d.ts +3 -1
  101. package/dist/noticeEntry.d.ts.map +1 -1
  102. package/dist/noticeEntry.js +2 -1
  103. package/dist/noticeEntry.js.map +1 -1
  104. package/dist/noticeStore.d.ts +3 -3
  105. package/dist/noticeStore.d.ts.map +1 -1
  106. package/dist/noticeStore.js +4 -4
  107. package/dist/noticeStore.js.map +1 -1
  108. package/dist/noticeTypes.d.ts +1 -2
  109. package/dist/noticeTypes.d.ts.map +1 -1
  110. package/dist/submission.d.ts +2 -4
  111. package/dist/submission.d.ts.map +1 -1
  112. package/dist/submission.js +1 -3
  113. package/dist/submission.js.map +1 -1
  114. package/package.json +13 -13
  115. package/src/adapters/permissionGuard.ts +6 -5
  116. package/src/adapters/signInRedirect.ts +7 -0
  117. package/src/client/FailureHostContext.ts +4 -0
  118. package/src/client/QueryView.ts +50 -7
  119. package/src/client/actionCompletion.ts +33 -23
  120. package/src/client/adapters/formFields.ts +33 -0
  121. package/src/client/adapters/operationHooks.ts +14 -0
  122. package/src/{adapters → client/adapters}/queryRoute.ts +24 -9
  123. package/src/client/adapters/rowValues.ts +25 -0
  124. package/src/client/adapters/useFeedback.ts +50 -0
  125. package/src/client/adapters/useQueryNotice.ts +1 -1
  126. package/src/client/adapters/useStableRun.ts +1 -1
  127. package/src/client/adapters/useSubmissionCallbacks.ts +44 -21
  128. package/src/client/adapters/useUndoableChange.ts +66 -30
  129. package/src/client/boundOperation.ts +13 -0
  130. package/src/client/create.ts +50 -20
  131. package/src/client/editor.ts +98 -38
  132. package/src/client/failureDecision.ts +70 -0
  133. package/src/client/failures.ts +56 -0
  134. package/src/client/notices.ts +44 -6
  135. package/src/client/operationForm.ts +52 -0
  136. package/src/client/pendingCommand.ts +12 -14
  137. package/src/client/resultState.ts +20 -11
  138. package/src/client/unexpectedFailure.ts +24 -0
  139. package/src/client/useDebouncedValue.ts +1 -1
  140. package/src/client/useDelay.ts +1 -1
  141. package/src/noticeEntry.ts +5 -0
  142. package/src/noticeStore.ts +9 -4
  143. package/src/noticeTypes.ts +1 -2
  144. package/src/submission.ts +4 -6
  145. package/dist/adapters/queryRoute.d.ts.map +0 -1
  146. package/dist/adapters/queryRoute.js.map +0 -1
  147. package/dist/client/adapters/useNoticePublisher.d.ts +0 -4
  148. package/dist/client/adapters/useNoticePublisher.d.ts.map +0 -1
  149. package/dist/client/adapters/useNoticePublisher.js +0 -8
  150. package/dist/client/adapters/useNoticePublisher.js.map +0 -1
  151. package/src/client/adapters/useNoticePublisher.ts +0 -10
@@ -1 +1 @@
1
- {"version":3,"file":"useQueryNotice.js","sourceRoot":"","sources":["../../../src/client/adapters/useQueryNotice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAE1C,MAAM,UAAU,cAAc,CAC7B,MAAqC,EACrC,UAAmB,EACnB,MAAiI;IAEjI,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,kBAAkB,CAAC,GAAG,EAAE;QACvB,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC;IAC5B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,MAAM,OAAO,GAAG,MAAM,CAA4C,SAAS,CAAC,CAAC;IAC7E,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;YAClD,OAAO;QACR,CAAC;QACD,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC;QACzB,IAAI,KAAK,EAAE,MAAM,IAAI,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACpD,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;YAC5E,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;QAC3C,CAAC;IACF,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;AACjC,CAAC"}
1
+ {"version":3,"file":"useQueryNotice.js","sourceRoot":"","sources":["../../../src/client/adapters/useQueryNotice.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,KAAK,WAAW,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAE1C,MAAM,UAAU,cAAc,CAC7B,MAAqC,EACrC,UAAmB,EACnB,MAAiI;IAEjI,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IACjC,kBAAkB,CAAC,GAAG,EAAE;QACvB,SAAS,CAAC,OAAO,GAAG,MAAM,CAAC;IAC5B,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,MAAM,OAAO,GAAG,MAAM,CAA4C,SAAS,CAAC,CAAC;IAC7E,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;YAClD,OAAO;QACR,CAAC;QACD,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC;QACzB,IAAI,KAAK,EAAE,MAAM,IAAI,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;YACpD,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;YAC5E,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACxD,CAAC;IACF,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC;AACjC,CAAC"}
@@ -13,7 +13,7 @@ export function useStableRun(run) {
13
13
  }
14
14
  const changes = seen === committedRef.current ? 1 : seen.changes + 1;
15
15
  if (changes === UNCOMMITTED_CHANGES) {
16
- throw new Error(`useAction received a new \`run\` function on ${UNCOMMITTED_CHANGES} renders in a row. \`run\` is the action's identity and must stay the same function between renders: pass a bound command such as \`api.rename.run\` directly, or wrap your function in \`useCallback\` or \`useMemo\`.`);
16
+ throw new Error(`useAction received a new \`run\` function on ${UNCOMMITTED_CHANGES} renders in a row. \`run\` is the action's identity and must stay the same function between renders: pass a bound command such as \`api.rename\` directly, or wrap your \`run\` in \`useCallback\` or \`useMemo\`.`);
17
17
  }
18
18
  see({ changes, run });
19
19
  }
@@ -1 +1 @@
1
- {"version":3,"file":"useStableRun.js","sourceRoot":"","sources":["../../../src/client/adapters/useStableRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE7D,yIAAyI;AACzI,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,MAAM,UAAU,YAAY,CAAC,GAAY;IACxC,2HAA2H;IAC3H,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,kBAAkB,CAAC,GAAG,EAAE;QACvB,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;IAC7B,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACX,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QACtB,OAAO;IACR,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,KAAK,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACrE,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACd,gDAAgD,mBAAmB,yNAAyN,CAC5R,CAAC;IACH,CAAC;IACD,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AACvB,CAAC"}
1
+ {"version":3,"file":"useStableRun.js","sourceRoot":"","sources":["../../../src/client/adapters/useStableRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE7D,yIAAyI;AACzI,MAAM,mBAAmB,GAAG,EAAE,CAAC;AAE/B,MAAM,UAAU,YAAY,CAAC,GAAY;IACxC,2HAA2H;IAC3H,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAClD,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAClC,kBAAkB,CAAC,GAAG,EAAE;QACvB,YAAY,CAAC,OAAO,GAAG,IAAI,CAAC;IAC7B,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACX,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QACtB,OAAO;IACR,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,KAAK,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACrE,IAAI,OAAO,KAAK,mBAAmB,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACd,gDAAgD,mBAAmB,oNAAoN,CACvR,CAAC;IACH,CAAC;IACD,GAAG,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AACvB,CAAC"}
@@ -1,12 +1,11 @@
1
1
  import { Effect, type Schema } from "effect";
2
2
  import type * as Atom from "effect/reactivity/Atom";
3
- import { type RejectField } from "@shivaedev/form/fieldRejection.ts";
4
- import type { Decoded, Fields } from "@shivaedev/form/shape.ts";
3
+ import { type Decoded, FieldFailure, type Fields, type Name, type Submitter } from "@shivaedev/form/shape.ts";
5
4
  import type { AtomServices } from "#AtomServices.ts";
5
+ import type { FailureChoices } from "#client/failures.ts";
6
6
  import type { NoticeFeedback } from "#client/notices.ts";
7
- export declare function useSubmissionCallbacks<TFields extends Fields, A, E, R, TRuntime, TRuntimeError>(fields: Schema.Struct<TFields>, save: (values: Decoded<TFields>) => Effect.Effect<A, E, AtomServices<R>>, rejectField: RejectField<TFields, E> | undefined, runtime: Atom.AtomRuntime<TRuntime, TRuntimeError>, notices: NoticeFeedback<Decoded<TFields>, A, E, TRuntime> | undefined): {
7
+ export declare function useSubmissionCallbacks<TFields extends Fields, A, E, R, TRuntime, TRuntimeError>(fields: Schema.Struct<TFields>, save: (values: Decoded<TFields>) => Effect.Effect<A, E, AtomServices<R>>, choices: FailureChoices, runtime: Atom.AtomRuntime<TRuntime, TRuntimeError>, notices: NoticeFeedback<Decoded<TFields>, A, TRuntime> | undefined): {
8
8
  active: boolean;
9
- rejectField: (error: E) => import("@shivaedev/form/fieldRejection.ts").FieldRejection<import("@shivaedev/form/shape.ts").Name<TFields>> | undefined;
10
- save: (values: Decoded<TFields>) => Effect.Effect<A, E, AtomServices<R>>;
9
+ save: (values: Decoded<TFields>, submitter: Submitter<Name<TFields>>) => Effect.Effect<A, E | FieldFailure, AtomServices<R>>;
11
10
  };
12
11
  //# sourceMappingURL=useSubmissionCallbacks.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useSubmissionCallbacks.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/useSubmissionCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAoB,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,aAAa,EAC9F,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EACxE,WAAW,EAAE,WAAW,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,SAAS,EAChD,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,EAClD,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,GAAG,SAAS;;yBA0B9C,CAAC;mBACP,OAAO,CAAC,OAAO,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;EAgBxE"}
1
+ {"version":3,"file":"useSubmissionCallbacks.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/useSubmissionCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAU,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5D,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAGpD,OAAO,EAAE,KAAK,OAAO,EAAE,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC9G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAkBzD,wBAAgB,sBAAsB,CAAC,OAAO,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,aAAa,EAC9F,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAC9B,IAAI,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,EACxE,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,EAClD,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,GAAG,SAAS;;mBAgCjD,OAAO,CAAC,OAAO,CAAC,aAAa,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;EAgB5H"}
@@ -1,39 +1,59 @@
1
- import { Effect } from "effect";
1
+ import { Cause, Effect, Option } from "effect";
2
2
  import { useInsertionEffect, useMemo, useRef } from "react";
3
3
  import { fieldRejectionOf } from "@shivaedev/form/fieldRejection.ts";
4
- import { useNoticePublisher } from "#client/adapters/useNoticePublisher.ts";
5
- export function useSubmissionCallbacks(fields, save, rejectField, runtime, notices) {
6
- const publish = useNoticePublisher(runtime);
7
- const latestRef = useRef({ notices, rejectField, save });
4
+ import { FieldFailure } from "@shivaedev/form/shape.ts";
5
+ import { useFeedback } from "#client/adapters/useFeedback.ts";
6
+ function isFieldFailure(cause) {
7
+ return Option.exists(Cause.findErrorOption(cause), (error) => error instanceof FieldFailure);
8
+ }
9
+ function placeOnField(decision, isName, submitter) {
10
+ if (decision._tag !== "field") {
11
+ return undefined;
12
+ }
13
+ const { field, message } = decision.rejection;
14
+ const name = typeof field === "string" ? field : field[0];
15
+ if (!isName(name)) {
16
+ return undefined;
17
+ }
18
+ return submitter.fail(typeof field === "string" ? name : [name, ...field.slice(1)], message);
19
+ }
20
+ export function useSubmissionCallbacks(fields, save, choices, runtime, notices) {
21
+ const feedback = useFeedback(runtime);
22
+ const latestRef = useRef({ choices, notices, save });
8
23
  useInsertionEffect(() => {
9
- latestRef.current = { notices, rejectField, save };
10
- }, [notices, rejectField, save]);
24
+ latestRef.current = { choices, notices, save };
25
+ }, [choices, notices, save]);
11
26
  const callbacks = useMemo(() => {
12
27
  const automatic = fieldRejectionOf(fields);
13
- function rejected(error, values) {
14
- return Effect.sync(() => {
15
- if (callbacks.active) {
16
- publish(latestRef.current.notices?.onFailure?.(error, values));
28
+ function isName(field) {
29
+ return Object.hasOwn(fields.fields, field);
30
+ }
31
+ function rejected(cause, values, submitter) {
32
+ return Effect.suspend(() => {
33
+ // A save that already answered with a field failure has placed its own feedback.
34
+ if (!callbacks.active || isFieldFailure(cause)) {
35
+ return Effect.failCause(cause);
17
36
  }
18
- }).pipe(Effect.andThen(Effect.fail(error)));
37
+ const decision = feedback.failed(cause, values, latestRef.current.choices, automatic);
38
+ return placeOnField(decision, isName, submitter) ?? Effect.failCause(cause);
39
+ });
19
40
  }
20
41
  function completed(value, values) {
21
42
  return Effect.sync(() => {
22
43
  if (callbacks.active) {
23
- publish(latestRef.current.notices?.onSuccess?.(value, values));
44
+ feedback.succeeded(latestRef.current.notices?.onSuccess?.(value, values));
24
45
  }
25
46
  return value;
26
47
  });
27
48
  }
28
49
  return {
29
50
  active: false,
30
- rejectField: (error) => (latestRef.current.rejectField ?? automatic)(error),
31
- save: (values) => Effect.suspend(() => latestRef.current.save(values)).pipe(Effect.matchEffect({
32
- onFailure: (error) => rejected(error, values),
51
+ save: (values, submitter) => Effect.suspend(() => latestRef.current.save(values)).pipe(Effect.matchCauseEffect({
52
+ onFailure: (cause) => rejected(cause, values, submitter),
33
53
  onSuccess: (value) => completed(value, values),
34
54
  })),
35
55
  };
36
- }, [fields, publish]);
56
+ }, [feedback, fields]);
37
57
  useInsertionEffect(() => {
38
58
  callbacks.active = true;
39
59
  return () => {
@@ -1 +1 @@
1
- {"version":3,"file":"useSubmissionCallbacks.js","sourceRoot":"","sources":["../../../src/client/adapters/useSubmissionCallbacks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAE7C,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAoB,MAAM,mCAAmC,CAAC;AAGvF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAG5E,MAAM,UAAU,sBAAsB,CACrC,MAA8B,EAC9B,IAAwE,EACxE,WAAgD,EAChD,OAAkD,EAClD,OAAqE;IAErE,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,kBAAkB,CAAC,GAAG,EAAE;QACvB,SAAS,CAAC,OAAO,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IACpD,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;IACjC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAC3C,SAAS,QAAQ,CAAC,KAAQ,EAAE,MAAwB;YACnD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvB,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;oBACtB,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;gBAChE,CAAC;YACF,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;QACD,SAAS,SAAS,CAAC,KAAQ,EAAE,MAAwB;YACpD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvB,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;oBACtB,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;gBAChE,CAAC;gBACD,OAAO,KAAK,CAAC;YACd,CAAC,CAAC,CAAC;QACJ,CAAC;QACD,OAAO;YACN,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,CAAC,KAAQ,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,WAAW,IAAI,SAAS,CAAC,CAAC,KAAK,CAAC;YAC9E,IAAI,EAAE,CAAC,MAAwB,EAAwC,EAAE,CACxE,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CACxD,MAAM,CAAC,WAAW,CAAC;gBAClB,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAC7C,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;aAC9C,CAAC,CACF;SACF,CAAC;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACtB,kBAAkB,CAAC,GAAG,EAAE;QACvB,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC;QACxB,OAAO,GAAG,EAAE;YACX,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC;QAC1B,CAAC,CAAC;IACH,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAChB,OAAO,SAAS,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"useSubmissionCallbacks.js","sourceRoot":"","sources":["../../../src/client/adapters/useSubmissionCallbacks.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,10 @@
1
- import { Effect, Option } from "effect";
1
+ import { Option } from "effect";
2
2
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
3
- import * as Atom from "effect/reactivity/Atom";
4
- import type { AtomServices } from "#AtomServices.ts";
3
+ import type { BoundOperation } from "#client/boundOperation.ts";
5
4
  import type { deployUpdate } from "#client/deployUpdate.ts";
6
- export interface VersionedChangeCommand<TInput, A, E, R, TRuntimeError> {
7
- readonly run: (input: TInput) => Effect.Effect<A, E, AtomServices<R>>;
8
- readonly runtime: Atom.AtomRuntime<R, TRuntimeError>;
9
- readonly update: Pick<ReturnType<typeof deployUpdate>, "block">;
10
- }
5
+ import type { FailuresOption } from "#client/failures.ts";
6
+ import type { NoticeDescriptor } from "#client/notices.ts";
7
+ type DeployUpdate = Pick<ReturnType<typeof deployUpdate>, "block">;
11
8
  export interface UndoableNotice<TInput, A> {
12
9
  readonly input: TInput;
13
10
  readonly message: string;
@@ -23,15 +20,19 @@ export interface UndoableChange<TInput, A, E, TInverse extends readonly unknown[
23
20
  readonly undoing: boolean;
24
21
  readonly undoResult: AsyncResult.AsyncResult<A, E>;
25
22
  }
26
- export declare function useUndoableChange<TInput, A, E, R, TRuntimeError>(command: VersionedChangeCommand<TInput, A, E, R, TRuntimeError>, options: {
23
+ type UndoableFailures<TInput, E, R, TSilent extends boolean> = FailuresOption<E, TInput, NoticeDescriptor<R>, TSilent>;
24
+ export declare function useUndoableChange<TInput, A, E, R, TRuntimeError, TSilent extends boolean = false>(command: BoundOperation<TInput, A, E, R, TRuntimeError>, options: {
27
25
  readonly describe: (value: NoInfer<A>, input: NoInfer<TInput>) => string;
28
26
  readonly undoInput: (value: NoInfer<A>, input: NoInfer<TInput>) => NoInfer<TInput>;
29
- }): UndoableChange<TInput, A, E | TRuntimeError, []>;
27
+ readonly update: DeployUpdate;
28
+ } & UndoableFailures<NoInfer<TInput>, E, R, TSilent>): UndoableChange<TInput, A, E | TRuntimeError, []>;
30
29
  export declare function useUndoableChange<TInput extends {
31
30
  readonly expectedVersion: number;
32
31
  }, A extends {
33
32
  readonly version: number;
34
- }, E, R, TRuntimeError>(command: VersionedChangeCommand<TInput, A, E, R, TRuntimeError>, options: {
33
+ }, E, R, TRuntimeError, TSilent extends boolean = false>(command: BoundOperation<TInput, A, E, R, TRuntimeError>, options: {
35
34
  readonly describe: (value: NoInfer<A>, input: NoInfer<TInput>) => string;
36
- }): UndoableChange<TInput, A, E | TRuntimeError, [inverse: Omit<TInput, "expectedVersion">]>;
35
+ readonly update: DeployUpdate;
36
+ } & UndoableFailures<NoInfer<TInput>, E, R, TSilent>): UndoableChange<TInput, A, E | TRuntimeError, [inverse: Omit<TInput, "expectedVersion">]>;
37
+ export {};
37
38
  //# sourceMappingURL=useUndoableChange.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"useUndoableChange.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/useUndoableChange.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useUndoableChange.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/useUndoableChange.ts"],"names":[],"mappings":"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"}
@@ -2,15 +2,26 @@ import { RegistryContext, useAtomValue } from "@effect/atom-react";
2
2
  import { Effect, Option } from "effect";
3
3
  import * as Atom from "effect/reactivity/Atom";
4
4
  import { useContext, useMemo } from "react";
5
- import { useAction } from "#client/resultState.ts";
5
+ import { useActionState } from "#client/resultState.ts";
6
+ function failuresFor(choices, input) {
7
+ const { failures, silent } = choices;
8
+ const handlers = failures
9
+ && Object.fromEntries(Object.entries(failures).map(([tag, choice]) => [
10
+ tag,
11
+ typeof choice === "function" ? (error, action) => choice(error, input(action)) : choice,
12
+ ]));
13
+ return { failures: handlers, silent };
14
+ }
6
15
  export function useUndoableChange(command, options) {
7
- const { run, runtime, update } = command;
16
+ const { run, runtime } = command;
17
+ const { update } = options;
8
18
  const registry = useContext(RegistryContext);
9
19
  const owner = useMemo(() => ({ notice: Atom.make(Option.none()), registry, run, runtime, sequence: 0, update }), [run, runtime, update, registry]);
10
20
  const execute = useMemo(() => (input) => Effect.acquireUseRelease(owner.update.block, () => owner.run(input), (release) => Effect.sync(release)), [owner]);
11
21
  const removeRun = useMemo(() => (request) => execute(request.input), [execute]);
12
22
  const undoRun = useMemo(() => (entry) => execute(entry.inverse), [execute]);
13
- const removal = useAction(owner.runtime, removeRun, {
23
+ const removal = useActionState({ run: removeRun, runtime: owner.runtime }, {
24
+ ...failuresFor(options, (request) => request.input),
14
25
  concurrent: true,
15
26
  onSuccess: (value, { input, inverse, sequence }) => {
16
27
  if (sequence === owner.sequence) {
@@ -19,7 +30,8 @@ export function useUndoableChange(command, options) {
19
30
  }
20
31
  },
21
32
  });
22
- const restoration = useAction(owner.runtime, undoRun, {
33
+ const restoration = useActionState({ run: undoRun, runtime: owner.runtime }, {
34
+ ...failuresFor(options, (entry) => entry.inverse),
23
35
  onSuccess: (_value, entry) => {
24
36
  if (Option.getOrUndefined(owner.registry.get(owner.notice)) === entry) {
25
37
  owner.registry.set(owner.notice, Option.none());
@@ -1 +1 @@
1
- {"version":3,"file":"useUndoableChange.js","sourceRoot":"","sources":["../../../src/client/adapters/useUndoableChange.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"useUndoableChange.js","sourceRoot":"","sources":["../../../src/client/adapters/useUndoableChange.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ import type { Effect } from "effect";
2
+ import type * as Atom from "effect/reactivity/Atom";
3
+ import type { AtomServices } from "#AtomServices.ts";
4
+ export interface BoundOperation<TInput, A, E, R, TRuntimeError> {
5
+ readonly query?: "a bound query only reads: read it with useQuery, and pass a command here";
6
+ readonly run: (input: TInput) => Effect.Effect<A, E, AtomServices<R>>;
7
+ readonly runtime: Atom.AtomRuntime<R, TRuntimeError>;
8
+ }
9
+ export type LooseOperation = BoundOperation<object, unknown, unknown, unknown, unknown> & {
10
+ readonly payload?: unknown;
11
+ };
12
+ //# sourceMappingURL=boundOperation.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"boundOperation.d.ts","sourceRoot":"","sources":["../../src/client/boundOperation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,MAAM,WAAW,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa;IAE7D,QAAQ,CAAC,KAAK,CAAC,EAAE,0EAA0E,CAAC;IAC5F,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;CACrD;AAED,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG;IAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=boundOperation.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"boundOperation.js","sourceRoot":"","sources":["../../src/client/boundOperation.ts"],"names":[],"mappings":""}
@@ -1,23 +1,27 @@
1
- import { type Effect, Option, type Schema } from "effect";
2
- import type * as Atom from "effect/reactivity/Atom";
3
- import type { FieldRejectionMapping } from "@shivaedev/form/fieldRejection.ts";
1
+ import { Option, type Schema } from "effect";
4
2
  import type { PersistedDraftConfig } from "@shivaedev/form/persistence.ts";
5
3
  import type { Decoded, Encoded, FieldFailure, Fields, Form, Services } from "@shivaedev/form/shape.ts";
6
- import type { AtomServices } from "#AtomServices.ts";
4
+ import type { BoundOperation, LooseOperation } from "#client/boundOperation.ts";
5
+ import type { FailureChoices, FormFailuresOption } from "#client/failures.ts";
7
6
  import type { NoticeFeedback } from "#client/notices.ts";
7
+ import type { DecodingServicesOption, FieldsOption, FixedOption, FormFields, NoFixed, Unfixed } from "#client/operationForm.ts";
8
8
  import { type SaveState } from "#client/saveState.ts";
9
9
  import { type SubmissionConfig } from "#submission.ts";
10
- export type CreateConfig<TFields extends Fields, TCreated, TSaveError, R, TRuntimeError> = {
10
+ export type CreateOptions<TFields extends Fields, TCreated, TSaveError, R, TRuntimeError> = {
11
11
  readonly persistedDraft?: PersistedDraftConfig | undefined;
12
- readonly fields: Schema.Struct<TFields>;
13
12
  readonly initialValues: Encoded<TFields>;
14
- readonly create: (values: Decoded<TFields>) => Effect.Effect<TCreated, TSaveError, AtomServices<R>>;
15
- readonly runtime: Atom.AtomRuntime<Services<TFields, R>, TRuntimeError>;
16
- readonly notices?: NoticeFeedback<Decoded<TFields>, TCreated, TSaveError, Services<TFields, R>>;
17
- } & FieldRejectionMapping<TFields, TSaveError> & Pick<SubmissionConfig<TFields, TCreated, TSaveError, R, TRuntimeError>, "requiredMessages" | "checks" | "debounce" | "arrayKeys">;
13
+ readonly notices?: NoticeFeedback<Decoded<TFields>, TCreated, Services<TFields, R>>;
14
+ } & Pick<SubmissionConfig<TFields, TCreated, TSaveError, R, TRuntimeError>, "requiredMessages" | "checks" | "debounce" | "arrayKeys">;
18
15
  export interface Create<TFields extends Fields, TCreated, TSaveError, TRuntimeError> extends SaveState<TSaveError | TRuntimeError> {
19
16
  readonly created: Option.Option<TCreated>;
20
17
  readonly form: Form<TFields, TCreated, TSaveError | FieldFailure, TRuntimeError>;
21
18
  }
22
- export declare function useCreate<TFields extends Fields, TCreated, TSaveError, R, TRuntimeError>(config: CreateConfig<TFields, TCreated, TSaveError, R, TRuntimeError>): Create<TFields, TCreated, TSaveError, TRuntimeError>;
19
+ export type UseCreate = <TInput, TCreated, TSaveError, R, TRuntimeError, TPayload = never, TFixed extends Partial<TInput> = NoFixed, TFields extends Fields = never, TSilent extends boolean = false>(operation: BoundOperation<TInput, TCreated, TSaveError, R, TRuntimeError> & {
20
+ readonly payload?: TPayload;
21
+ }, options: NoInfer<CreateOptions<FormFields<TPayload, TFixed, TFields>, TCreated, TSaveError, R, TRuntimeError>> & FieldsOption<TPayload, TFields> & FixedOption<TInput, TFixed, Unfixed<TInput, FormFields<TPayload, TFixed, TFields>, TFixed>> & NoInfer<DecodingServicesOption<FormFields<TPayload, TFixed, TFields>, R>> & FormFailuresOption<FormFields<TPayload, TFixed, TFields>, TSaveError, Services<FormFields<TPayload, TFixed, TFields>, R>, TSilent>) => Create<FormFields<TPayload, TFixed, TFields>, TCreated, TSaveError, TRuntimeError>;
22
+ export type LooseCreate = (operation: LooseOperation, options: CreateOptions<Fields, unknown, unknown, unknown, unknown> & FailureChoices & {
23
+ readonly fields?: Schema.Struct<Fields>;
24
+ readonly fixed?: object;
25
+ }) => Create<Fields, unknown, unknown, unknown>;
26
+ export declare const useCreate: UseCreate;
23
27
  //# sourceMappingURL=create.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/client/create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,KAAK,KAAK,IAAI,MAAM,wBAAwB,CAAC;AAGpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,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;AACvG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,KAAK,SAAS,EAAgB,MAAM,sBAAsB,CAAC;AACpE,OAAO,EAAE,KAAK,gBAAgB,EAAc,MAAM,gBAAgB,CAAC;AACnE,MAAM,MAAM,YAAY,CAAC,OAAO,SAAS,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,aAAa,IAAI;IAC1F,QAAQ,CAAC,cAAc,CAAC,EAAE,oBAAoB,GAAG,SAAS,CAAC;IAC3D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACpG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IACxE,QAAQ,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;CAChG,GAAG,qBAAqB,CAAC,OAAO,EAAE,UAAU,CAAC,GAC7C,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,aAAa,CAAC,EAAE,kBAAkB,GAAG,QAAQ,GAAG,UAAU,GAAG,WAAW,CAAC,CAAC;AACnI,MAAM,WAAW,MAAM,CAAC,OAAO,SAAS,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAE,SAAQ,SAAS,CAAC,UAAU,GAAG,aAAa,CAAC;IACjI,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1C,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,GAAG,YAAY,EAAE,aAAa,CAAC,CAAC;CACjF;AAWD,wBAAgB,SAAS,CAAC,OAAO,SAAS,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,aAAa,EACvF,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,aAAa,CAAC,GACnE,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,CAAC,CA0BtD"}
1
+ {"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../src/client/create.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,8 @@
1
1
  import { Equal, Option } from "effect";
2
2
  import { useCallback, useState } from "react";
3
3
  import { usePersistedDraft } from "@shivaedev/form/adapters/react.ts";
4
+ import { formFields } from "#client/adapters/formFields.ts";
5
+ import { typedCreate } from "#client/adapters/operationHooks.ts";
4
6
  import { useSubmissionCallbacks } from "#client/adapters/useSubmissionCallbacks.ts";
5
7
  import { useSaveState } from "#client/saveState.ts";
6
8
  import { submission } from "#submission.ts";
@@ -11,11 +13,15 @@ function resetValues(baseline, current, submitted = current) {
11
13
  return Object.hasOwn(source, name) ? [[name, source[name]]] : [];
12
14
  }));
13
15
  }
14
- export function useCreate(config) {
16
+ const useLooseCreate = (operation, options) => {
17
+ const { fixed } = options;
18
+ const { runtime } = operation;
19
+ const fields = formFields(operation.payload, options.fields, fixed);
20
+ const config = { ...options, fields, runtime };
15
21
  const persistedDraft = usePersistedDraft(config.persistedDraft);
16
- const callbacks = useSubmissionCallbacks(config.fields, config.create, config.rejectField, config.runtime, config.notices);
22
+ const callbacks = useSubmissionCallbacks(fields, (values) => operation.run({ ...fixed, ...values }), config, runtime, config.notices);
17
23
  function initialize() {
18
- const { fields, initialValues, runtime } = config;
24
+ const { initialValues } = config;
19
25
  function makeSubmission() {
20
26
  return submission({ ...config, ...callbacks, fields, initialValues, persistedDraft, runtime });
21
27
  }
@@ -23,7 +29,7 @@ export function useCreate(config) {
23
29
  }
24
30
  const [held, hold] = useState(initialize);
25
31
  let entry = held;
26
- if (entry.fields !== config.fields || entry.runtime !== config.runtime) {
32
+ if (entry.fields !== fields || entry.runtime !== runtime) {
27
33
  entry = initialize();
28
34
  hold(entry);
29
35
  }
@@ -34,5 +40,6 @@ export function useCreate(config) {
34
40
  hold({ ...entry, created: Option.some(value), current: next });
35
41
  }, [entry, current, fresh, baseline]);
36
42
  return { ...useSaveState(current.form, settled), created, form: current.form };
37
- }
43
+ };
44
+ export const useCreate = typedCreate(useLooseCreate);
38
45
  //# sourceMappingURL=create.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/client/create.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/client/create.ts"],"names":[],"mappings":"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"}
@@ -1,35 +1,42 @@
1
- import { type Effect, type Schema } from "effect";
1
+ import { 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 type { FieldRejectionMapping } from "@shivaedev/form/fieldRejection.ts";
5
4
  import type { PersistedDraftConfig } from "@shivaedev/form/persistence.ts";
6
5
  import type { Decoded, Encoded, FieldFailure, Fields, Form, Services } from "@shivaedev/form/shape.ts";
7
- import type { AtomServices } from "#AtomServices.ts";
6
+ import type { BoundOperation, LooseOperation } from "#client/boundOperation.ts";
7
+ import type { FailureChoices, FormFailuresOption } from "#client/failures.ts";
8
8
  import type { NoticeFeedback } from "#client/notices.ts";
9
+ import type { DecodingServicesOption, FieldsOption, FixedOption, FormFields, MissingFromRow, NoFixed, Unfixed, ValuesOption } from "#client/operationForm.ts";
9
10
  import { type QueryOptions, type QueryState } from "#client/resultState.ts";
10
11
  import { type SaveState } from "#client/saveState.ts";
11
12
  import type { LoadedQueryState } from "#client/useLoaderQuery.ts";
12
13
  import { type SubmissionConfig } from "#submission.ts";
13
- export type EditorConfig<TFields extends Fields, TRow, TQueryError, TSaveError, R, TRuntimeError> = {
14
+ export type EditorOptions<TFields extends Fields, TRow, TQueryError, TSaved, TSaveError, R, TRuntimeError> = {
14
15
  readonly persistedDraft?: PersistedDraftConfig | undefined;
15
16
  readonly query: Atom.Atom<AsyncResult.AsyncResult<TRow, TQueryError>>;
16
- readonly fields: Schema.Struct<TFields>;
17
- readonly values: (row: TRow) => Encoded<TFields>;
18
- readonly save: (values: Decoded<TFields>) => Effect.Effect<TRow, TSaveError, AtomServices<R>>;
19
- readonly runtime: Atom.AtomRuntime<Services<TFields, R>, TRuntimeError>;
20
- readonly notices?: NoticeFeedback<Decoded<TFields>, TRow, TSaveError, Services<TFields, R>>;
17
+ readonly notices?: NoticeFeedback<Decoded<TFields>, TSaved, Services<TFields, R>>;
21
18
  readonly queryNotice?: QueryOptions<TQueryError>["notice"];
22
- } & FieldRejectionMapping<TFields, TSaveError> & Pick<SubmissionConfig<TFields, TRow, TSaveError, R, TRuntimeError>, "requiredMessages" | "checks" | "debounce" | "arrayKeys">;
23
- export interface Editor<TFields extends Fields, TRow, TQueryError, TSaveError, TRuntimeError> extends SaveState<TSaveError | TRuntimeError> {
24
- readonly form: Form<TFields, TRow, TSaveError | FieldFailure, TRuntimeError> | undefined;
19
+ } & Pick<SubmissionConfig<TFields, TSaved, TSaveError, R, TRuntimeError>, "requiredMessages" | "checks" | "debounce" | "arrayKeys">;
20
+ export interface Editor<TFields extends Fields, TRow, TQueryError, TSaveError, TRuntimeError, TSaved = TRow> extends SaveState<TSaveError | TRuntimeError> {
21
+ readonly form: Form<TFields, TSaved, TSaveError | FieldFailure, TRuntimeError> | undefined;
25
22
  readonly query: QueryState<TRow, TQueryError>;
26
23
  }
27
- export interface LoadedEditor<TFields extends Fields, TRow, TQueryError, TSaveError, TRuntimeError> extends Omit<Editor<TFields, TRow, TQueryError, TSaveError, TRuntimeError>, "form" | "query"> {
28
- readonly form: Form<TFields, TRow, TSaveError | FieldFailure, TRuntimeError>;
24
+ export interface LoadedEditor<TFields extends Fields, TRow, TQueryError, TSaveError, TRuntimeError, TSaved = TRow> extends Omit<Editor<TFields, TRow, TQueryError, TSaveError, TRuntimeError, TSaved>, "form" | "query"> {
25
+ readonly form: Form<TFields, TSaved, TSaveError | FieldFailure, TRuntimeError>;
29
26
  readonly query: LoadedQueryState<TRow, TQueryError>;
30
27
  }
31
- export declare function useEditor<TFields extends Fields, TRow, TQueryError, TSaveError, R, TRuntimeError>(config: EditorConfig<TFields, TRow, TQueryError, TSaveError, R, TRuntimeError> & {
32
- readonly loaded: TRow;
33
- }): LoadedEditor<TFields, TRow, TQueryError, TSaveError, TRuntimeError>;
34
- export declare function useEditor<TFields extends Fields, TRow, TQueryError, TSaveError, R, TRuntimeError>(config: EditorConfig<TFields, TRow, TQueryError, TSaveError, R, TRuntimeError>): Editor<TFields, TRow, TQueryError, TSaveError, TRuntimeError>;
28
+ type Derived<TFields> = [TFields] extends [never] ? true : false;
29
+ export type UseEditor = <TInput, TSaved, TSaveError, R, TRuntimeError, TRow, TQueryError, TPayload = never, TFixed extends Partial<TInput> = NoFixed, TFields extends Fields = never, TLoaded extends NoInfer<TRow> | undefined = undefined, TSilent extends boolean = false>(operation: BoundOperation<TInput, TSaved, TSaveError, R, TRuntimeError> & {
30
+ readonly payload?: TPayload;
31
+ }, options: EditorOptions<NoInfer<FormFields<TPayload, TFixed, TFields>>, TRow, TQueryError, NoInfer<TSaved>, NoInfer<TSaveError>, NoInfer<R>, NoInfer<TRuntimeError>> & {
32
+ readonly loaded?: TLoaded;
33
+ } & FieldsOption<TPayload, TFields> & FixedOption<TInput, TFixed, Unfixed<TInput, FormFields<TPayload, TFixed, TFields>, TFixed> | (Derived<TFields> extends true ? MissingFromRow<TRow | TSaved, FormFields<TPayload, TFixed, TFields>> : never)> & NoInfer<ValuesOption<TRow | TSaved, FormFields<TPayload, TFixed, TFields>, Derived<TFields>>> & NoInfer<DecodingServicesOption<FormFields<TPayload, TFixed, TFields>, R>> & FormFailuresOption<FormFields<TPayload, TFixed, TFields>, TSaveError, Services<FormFields<TPayload, TFixed, TFields>, R>, TSilent>) => [TLoaded] extends [undefined] ? Editor<FormFields<TPayload, TFixed, TFields>, TRow, TQueryError, TSaveError, TRuntimeError, TSaved> : LoadedEditor<FormFields<TPayload, TFixed, TFields>, TRow, TQueryError, TSaveError, TRuntimeError, TSaved>;
34
+ export type LooseEditor = (operation: LooseOperation, options: EditorOptions<Fields, unknown, unknown, unknown, unknown, unknown, unknown> & FailureChoices & {
35
+ readonly fields?: Schema.Struct<Fields>;
36
+ readonly fixed?: object;
37
+ readonly loaded?: unknown;
38
+ readonly values?: (row: unknown) => Encoded<Fields>;
39
+ }) => Editor<Fields, unknown, unknown, unknown, unknown, unknown> | LoadedEditor<Fields, unknown, unknown, unknown, unknown, unknown>;
40
+ export declare const useEditor: UseEditor;
41
+ export {};
35
42
  //# sourceMappingURL=editor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../src/client/editor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../../src/client/editor.ts"],"names":[],"mappings":"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"}
@@ -1,32 +1,37 @@
1
1
  import { Option } from "effect";
2
2
  import { useEffect, useState } from "react";
3
3
  import { usePersistedDraft } from "@shivaedev/form/adapters/react.ts";
4
+ import { formFields } from "#client/adapters/formFields.ts";
5
+ import { typedEditor } from "#client/adapters/operationHooks.ts";
6
+ import { rowValues } from "#client/adapters/rowValues.ts";
4
7
  import { useSubmissionCallbacks } from "#client/adapters/useSubmissionCallbacks.ts";
5
8
  import { useQuery } from "#client/resultState.ts";
6
9
  import { useSaveState } from "#client/saveState.ts";
7
10
  import { loadedQuery } from "#loadedQuery.ts";
8
11
  import { submission } from "#submission.ts";
9
- export function useEditor(config) {
12
+ const useLooseEditor = (operation, options) => {
13
+ const { fixed } = options;
14
+ const { runtime } = operation;
15
+ const fields = formFields(operation.payload, options.fields, fixed);
16
+ const config = { ...options, fields, runtime, values: options.values ?? rowValues(fields) };
10
17
  const persistedDraft = usePersistedDraft(config.persistedDraft);
11
- const callbacks = useSubmissionCallbacks(config.fields, config.save, config.rejectField, config.runtime, config.notices);
18
+ const callbacks = useSubmissionCallbacks(fields, (edited) => operation.run({ ...fixed, ...edited }), config, runtime, config.notices);
12
19
  const query = useQuery(config.query, config.queryNotice === undefined ? {} : { notice: config.queryNotice });
13
20
  const row = Option.orElse(query.data, () => ("loaded" in config ? Option.some(config.loaded) : Option.none()));
14
21
  const [held, hold] = useState(undefined);
15
- let current = held?.query === config.query && held.fields === config.fields && held.runtime === config.runtime ? held : undefined;
22
+ let current = held?.query === config.query && held.fields === fields && held.runtime === runtime ? held : undefined;
16
23
  if (current === undefined && Option.isSome(row)) {
17
24
  current = {
18
- fields: config.fields,
25
+ fields,
19
26
  form: submission({
20
27
  ...config,
21
28
  ...callbacks,
22
- fields: config.fields,
23
29
  initialValues: config.values(row.value),
24
30
  persistedDraft,
25
- runtime: config.runtime,
26
31
  savedValues: config.values,
27
32
  }).form,
28
33
  query: config.query,
29
- runtime: config.runtime,
34
+ runtime,
30
35
  values: config.values,
31
36
  };
32
37
  hold(current);
@@ -44,5 +49,6 @@ export function useEditor(config) {
44
49
  return { ...saveState, form, query: loadedQuery(query, config.loaded) };
45
50
  }
46
51
  return { ...saveState, form, query };
47
- }
52
+ };
53
+ export const useEditor = typedEditor(useLooseEditor);
48
54
  //# sourceMappingURL=editor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"editor.js","sourceRoot":"","sources":["../../src/client/editor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editor.js","sourceRoot":"","sources":["../../src/client/editor.ts"],"names":[],"mappings":"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"}