@effect-app/vue 4.0.0-beta.17 → 4.0.0-beta.171

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 (96) hide show
  1. package/CHANGELOG.md +1098 -0
  2. package/dist/commander.d.ts +370 -0
  3. package/dist/commander.d.ts.map +1 -0
  4. package/dist/commander.js +591 -0
  5. package/dist/confirm.d.ts +19 -0
  6. package/dist/confirm.d.ts.map +1 -0
  7. package/dist/confirm.js +24 -0
  8. package/dist/errorReporter.d.ts +4 -4
  9. package/dist/errorReporter.d.ts.map +1 -1
  10. package/dist/errorReporter.js +12 -18
  11. package/dist/form.d.ts +13 -4
  12. package/dist/form.d.ts.map +1 -1
  13. package/dist/form.js +41 -12
  14. package/dist/index.d.ts +1 -1
  15. package/dist/intl.d.ts +15 -0
  16. package/dist/intl.d.ts.map +1 -0
  17. package/dist/intl.js +9 -0
  18. package/dist/lib.d.ts +8 -9
  19. package/dist/lib.d.ts.map +1 -1
  20. package/dist/lib.js +34 -7
  21. package/dist/makeClient.d.ts +120 -277
  22. package/dist/makeClient.d.ts.map +1 -1
  23. package/dist/makeClient.js +155 -359
  24. package/dist/makeContext.d.ts +1 -1
  25. package/dist/makeContext.d.ts.map +1 -1
  26. package/dist/makeIntl.d.ts +1 -1
  27. package/dist/makeIntl.d.ts.map +1 -1
  28. package/dist/makeUseCommand.d.ts +8 -0
  29. package/dist/makeUseCommand.d.ts.map +1 -0
  30. package/dist/makeUseCommand.js +13 -0
  31. package/dist/mutate.d.ts +4 -4
  32. package/dist/mutate.d.ts.map +1 -1
  33. package/dist/mutate.js +7 -7
  34. package/dist/query.d.ts +11 -15
  35. package/dist/query.d.ts.map +1 -1
  36. package/dist/query.js +19 -27
  37. package/dist/routeParams.d.ts +1 -1
  38. package/dist/runtime.d.ts +5 -2
  39. package/dist/runtime.d.ts.map +1 -1
  40. package/dist/runtime.js +27 -17
  41. package/dist/toast.d.ts +46 -0
  42. package/dist/toast.d.ts.map +1 -0
  43. package/dist/toast.js +32 -0
  44. package/dist/withToast.d.ts +26 -0
  45. package/dist/withToast.d.ts.map +1 -0
  46. package/dist/withToast.js +49 -0
  47. package/eslint.config.mjs +2 -2
  48. package/package.json +48 -48
  49. package/src/{experimental/commander.ts → commander.ts} +930 -255
  50. package/src/{experimental/confirm.ts → confirm.ts} +10 -14
  51. package/src/errorReporter.ts +60 -72
  52. package/src/form.ts +55 -16
  53. package/src/intl.ts +12 -0
  54. package/src/lib.ts +50 -13
  55. package/src/makeClient.ts +454 -1023
  56. package/src/{experimental/makeUseCommand.ts → makeUseCommand.ts} +3 -3
  57. package/src/mutate.ts +40 -32
  58. package/src/query.ts +39 -50
  59. package/src/runtime.ts +39 -18
  60. package/src/{experimental/toast.ts → toast.ts} +11 -25
  61. package/src/{experimental/withToast.ts → withToast.ts} +15 -6
  62. package/test/Mutation.test.ts +130 -10
  63. package/test/dist/form.test.d.ts.map +1 -1
  64. package/test/dist/lib.test.d.ts.map +1 -0
  65. package/test/dist/stubs.d.ts +2162 -118
  66. package/test/dist/stubs.d.ts.map +1 -1
  67. package/test/dist/stubs.js +80 -23
  68. package/test/form-validation-errors.test.ts +23 -19
  69. package/test/form.test.ts +20 -2
  70. package/test/lib.test.ts +240 -0
  71. package/test/makeClient.test.ts +217 -38
  72. package/test/stubs.ts +117 -40
  73. package/tsconfig.json +0 -1
  74. package/tsconfig.json.bak +2 -2
  75. package/tsconfig.src.json +34 -34
  76. package/tsconfig.test.json +2 -2
  77. package/vitest.config.ts +5 -5
  78. package/dist/experimental/commander.d.ts +0 -359
  79. package/dist/experimental/commander.d.ts.map +0 -1
  80. package/dist/experimental/commander.js +0 -557
  81. package/dist/experimental/confirm.d.ts +0 -19
  82. package/dist/experimental/confirm.d.ts.map +0 -1
  83. package/dist/experimental/confirm.js +0 -28
  84. package/dist/experimental/intl.d.ts +0 -16
  85. package/dist/experimental/intl.d.ts.map +0 -1
  86. package/dist/experimental/intl.js +0 -5
  87. package/dist/experimental/makeUseCommand.d.ts +0 -8
  88. package/dist/experimental/makeUseCommand.d.ts.map +0 -1
  89. package/dist/experimental/makeUseCommand.js +0 -13
  90. package/dist/experimental/toast.d.ts +0 -47
  91. package/dist/experimental/toast.d.ts.map +0 -1
  92. package/dist/experimental/toast.js +0 -41
  93. package/dist/experimental/withToast.d.ts +0 -25
  94. package/dist/experimental/withToast.d.ts.map +0 -1
  95. package/dist/experimental/withToast.js +0 -45
  96. package/src/experimental/intl.ts +0 -9
package/dist/lib.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { useIntervalFn } from "@vueuse/core";
2
- import { Cause, pipe } from "effect-app";
2
+ import { Cause } from "effect-app";
3
3
  import { isHttpClientError } from "effect/unstable/http/HttpClientError";
4
4
  import { reportError } from "./errorReporter.js";
5
5
  export * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
@@ -21,11 +21,7 @@ const determineLevel = (cause) => {
21
21
  }
22
22
  };
23
23
  export const reportRuntimeError = (cause, extras) => reportRuntimeError_(cause, extras, determineLevel(cause));
24
- // $Project/$Configuration.Index
25
- // -> "$Project", "$Configuration", "Index"
26
- export const makeQueryKey = ({ id, options }) => pipe(id.split("/"), (split) => split.filter((_) => !options || !options?.skipQueryKey?.includes(_)).map((_) => "$" + _))
27
- .join(".")
28
- .split(".");
24
+ export { makeQueryKey } from "effect-app/client";
29
25
  export function pauseWhileProcessing(iv, pmf) {
30
26
  return Promise
31
27
  .resolve(iv.pause())
@@ -48,4 +44,35 @@ export const mapHandler = (self, map) => ({
48
44
  ? (i) => map(self.handler)(i)
49
45
  : map(self.handler)
50
46
  });
51
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xpYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQWlCLGFBQWEsRUFBNkIsTUFBTSxjQUFjLENBQUE7QUFDdEYsT0FBTyxFQUFFLEtBQUssRUFBZSxJQUFJLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFHckQsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0NBQXNDLENBQUE7QUFFeEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRWhELE9BQU8sS0FBSyxXQUFXLE1BQU0sd0NBQXdDLENBQUE7QUFFckUsTUFBTSxtQkFBbUIsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFbEQsTUFBTSxPQUFPLEdBQUcsQ0FBQyw0QkFBNEIsRUFBRSxZQUFZLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFBO0FBRXhGLE1BQU0sY0FBYyxHQUFHLENBQUMsS0FBMkIsRUFBRSxFQUFFO0lBQ3JELE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDOUIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDM0IsT0FBTyxTQUFTLENBQUE7SUFDbEIsQ0FBQztJQUNELE1BQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxDQUFBO0lBQ2pELFFBQVEsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN2QixLQUFLLGdCQUFnQjtZQUNuQixPQUFPLE1BQWUsQ0FBQTtRQUN4QixLQUFLLGFBQWE7WUFDaEIsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQWUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFBO1FBQ2pGO1lBQ0UsT0FBTyxTQUFTLENBQUE7SUFDcEIsQ0FBQztBQUNILENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLGtCQUFrQixHQUFHLENBQUMsS0FBMkIsRUFBRSxNQUFnQyxFQUFFLEVBQUUsQ0FDbEcsbUJBQW1CLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtBQUUzRCxnQ0FBZ0M7QUFDaEMsMkNBQTJDO0FBQzNDLE1BQU0sQ0FBQyxNQUFNLFlBQVksR0FBRyxDQUFDLEVBQUUsRUFBRSxFQUFFLE9BQU8sRUFBOEMsRUFBRSxFQUFFLENBQzFGLElBQUksQ0FDRixFQUFFLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUNiLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sSUFBSSxDQUFDLE9BQU8sRUFBRSxZQUFZLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLENBQ3BHO0tBQ0UsSUFBSSxDQUFDLEdBQUcsQ0FBQztLQUNULEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtBQUVmLE1BQU0sVUFBVSxvQkFBb0IsQ0FDbEMsRUFBWSxFQUNaLEdBQTJCO0lBRTNCLE9BQU8sT0FBTztTQUNYLE9BQU8sQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUM7U0FDbkIsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLEdBQUcsRUFBRSxDQUFDO1NBQ2pCLE9BQU8sQ0FBQyxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtBQUMvQixDQUFDO0FBRUQsTUFBTSxVQUFVLCtCQUErQixDQUM3QyxHQUEyQixFQUMzQixRQUFtQyxFQUNuQyxPQUF5RDtJQUV6RCxNQUFNLEVBQUUsR0FBRyxhQUFhLENBQ3RCLEdBQUcsRUFBRSxDQUFDLG9CQUFvQixDQUFDLEVBQUUsRUFBRSxHQUFHLENBQUMsRUFDbkMsUUFBUSxFQUNSLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUM3RCxDQUFBO0lBQ0QsT0FBTztRQUNMLFFBQVEsRUFBRSxFQUFFLENBQUMsUUFBUTtLQUN0QixDQUFBO0FBQ0gsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FTbkIsQ0FBQyxJQUFTLEVBQUUsR0FBUSxFQUFPLEVBQUUsQ0FBQyxDQUFDO0lBQ2pDLEdBQUcsSUFBSTtJQUNQLE9BQU8sRUFBRSxPQUFPLElBQUksQ0FBQyxPQUFPLEtBQUssVUFBVTtRQUN6QyxDQUFDLENBQUMsQ0FBQyxDQUFNLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsT0FBbUQsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUM5RSxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7Q0FDdEIsQ0FBQyxDQUFBIn0=
47
+ import { isProxy, isReactive, isRef, toRaw } from "vue";
48
+ export function deepToRaw(sourceObj) {
49
+ const objectIterator = (input) => {
50
+ if (isRef(input)) {
51
+ return objectIterator(input.value);
52
+ }
53
+ const rawInput = isReactive(input) || isProxy(input)
54
+ ? toRaw(input)
55
+ : input;
56
+ if (Array.isArray(rawInput)) {
57
+ return rawInput.map((item) => objectIterator(item));
58
+ }
59
+ if (rawInput instanceof Map) {
60
+ return new Map(Array.from(rawInput.entries(), ([key, value]) => [objectIterator(key), objectIterator(value)]));
61
+ }
62
+ if (rawInput instanceof Set) {
63
+ return new Set(Array.from(rawInput.values(), (value) => objectIterator(value)));
64
+ }
65
+ if (rawInput instanceof Date) {
66
+ return new Date(rawInput);
67
+ }
68
+ if (rawInput && typeof rawInput === "object") {
69
+ return Object.keys(rawInput).reduce((acc, key) => {
70
+ acc[key] = objectIterator(rawInput[key]);
71
+ return acc;
72
+ }, {});
73
+ }
74
+ return rawInput;
75
+ };
76
+ return objectIterator(sourceObj);
77
+ }
78
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xpYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRTVDLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFJbEMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sc0NBQXNDLENBQUE7QUFFeEUsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBRWhELE9BQU8sS0FBSyxXQUFXLE1BQU0sd0NBQXdDLENBQUE7QUFFckUsTUFBTSxtQkFBbUIsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFbEQsTUFBTSxPQUFPLEdBQUcsQ0FBQyw0QkFBNEIsRUFBRSxZQUFZLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFBO0FBRXhGLE1BQU0sY0FBYyxHQUFHLENBQUMsS0FBMkIsRUFBRSxFQUFFO0lBQ3JELE1BQU0sRUFBRSxHQUFHLEtBQUssQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUE7SUFDOUIsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUM7UUFDM0IsT0FBTyxTQUFTLENBQUE7SUFDbEIsQ0FBQztJQUNELE1BQU0sUUFBUSxHQUFHLEVBQUUsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLFdBQVcsRUFBRSxDQUFBO0lBQ2pELFFBQVEsRUFBRSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUN2QixLQUFLLGdCQUFnQjtZQUNuQixPQUFPLE1BQWUsQ0FBQTtRQUN4QixLQUFLLGFBQWE7WUFDaEIsT0FBTyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxRQUFRLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxD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
@@ -1,19 +1,19 @@
1
1
  import { type InvalidateOptions, type InvalidateQueryFilters, type QueryObserverResult, type RefetchOptions, type UseQueryReturnType } from "@tanstack/vue-query";
2
- import { Cause, Effect, Exit, Layer, type ManagedRuntime, S, ServiceMap } from "effect-app";
2
+ import { type Context, Effect, type Layer, type ManagedRuntime, S } from "effect-app";
3
3
  import { type ApiClientFactory, type Req } from "effect-app/client";
4
- import type { RequestHandler, RequestHandlers, RequestHandlerWithInput, Requests } from "effect-app/client/clientFor";
5
- import { ErrorSilenced, type SupportedErrors } from "effect-app/client/errors";
6
- import { type OperationFailure } from "effect-app/Operations";
4
+ import type { ExtractModuleName, RequestHandler, RequestHandlers, RequestHandlerWithInput, RequestInputFromMake, RequestsAny } from "effect-app/client/clientFor";
5
+ import type { InvalidationCallback } from "effect-app/client/makeClient";
6
+ import type * as ExitResult from "effect/Exit";
7
7
  import { type Fiber } from "effect/Fiber";
8
8
  import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
9
- import { type ComputedRef, type Ref, type WatchSource } from "vue";
10
- import { type Commander } from "./experimental/commander.js";
11
- import { I18n } from "./experimental/intl.js";
12
- import { type CommanderResolved } from "./experimental/makeUseCommand.js";
13
- import { Toast } from "./experimental/toast.js";
14
- import { type MutationOptions, type MutationOptionsBase, type Res } from "./mutate.js";
9
+ import { type ComputedRef, type WatchSource } from "vue";
10
+ import { type Commander } from "./commander.js";
11
+ import { type I18n } from "./intl.js";
12
+ import { type CommanderResolved } from "./makeUseCommand.js";
13
+ import { type MutationOptionsBase } from "./mutate.js";
15
14
  import { type CustomUndefinedInitialQueryOptions, makeQuery } from "./query.js";
16
- export interface RequestExtensions<RT, Id extends string, I, A, E, R> {
15
+ import { type Toast } from "./toast.js";
16
+ export interface CommandRequestExtensions<RT, Id extends string, I, A, E, R> {
17
17
  /** Defines a Command based on this call, taking the `id` of the call as the `id` of the Command.
18
18
  * The Request function will be taken as the first member of the Command, the Command required input will be the Request input.
19
19
  * see Command.wrap for details */
@@ -23,67 +23,102 @@ export interface RequestExtensions<RT, Id extends string, I, A, E, R> {
23
23
  fn: Commander.CommanderFn<RT, Id, Id, undefined>;
24
24
  }
25
25
  /** my other doc */
26
- export interface RequestExtWithInput<RT, Id extends string, I, A, E, R> extends Commander.CommandContextLocal<Id, Id>, RequestExtensions<RT, Id, I, A, E, R> {
26
+ export interface RequestExtWithInput<RT, Id extends string, I, A, E, R> extends Commander.CommandContextLocal<Id, Id>, CommandRequestExtensions<RT, Id, I, A, E, R> {
27
27
  /**
28
- * Request the endpoint with input
28
+ * Send the request to the endpoint and return the raw Effect response.
29
+ * This does not perform query cache invalidation.
29
30
  */
30
- (i: I): Effect.Effect<A, E, R>;
31
+ request: (i: I) => Effect.Effect<A, E, R>;
31
32
  }
32
- /**
33
- * Request the endpoint
34
- */
35
- export interface RequestExt<RT, Id extends string, A, E, R> extends Commander.CommandContextLocal<Id, Id>, Commander.CommanderWrap<RT, Id, Id, undefined, void, A, E, R>, RequestExtensions<RT, Id, void, A, E, R>, Effect.Effect<A, E, R> {
33
+ export interface RequestExt<RT, Id extends string, A, E, R> extends Commander.CommandContextLocal<Id, Id>, Commander.CommanderWrap<RT, Id, Id, undefined, void, A, E, R>, CommandRequestExtensions<RT, Id, void, A, E, R> {
34
+ /**
35
+ * Send the request to the endpoint and return the raw Effect response.
36
+ * This does not perform query cache invalidation.
37
+ */
38
+ request: Effect.Effect<A, E, R>;
39
+ }
40
+ export type CommandRequestWithExtensions<RT, Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer _Request, infer Id> ? RequestExtWithInput<RT, Id, I, A, E, R> : Req extends RequestHandler<infer A, infer E, infer R, infer _Request, infer Id> ? RequestExt<RT, Id, A, E, R> : never;
41
+ export interface QueryExtensionsWithInput<I, A, E, R> {
42
+ /**
43
+ * Send the request to the endpoint and return the raw Effect response.
44
+ * This does not set up query state tracking.
45
+ */
46
+ request: (i: I) => Effect.Effect<A, E, R>;
47
+ }
48
+ export interface QueryExtensions<A, E, R> {
49
+ /**
50
+ * Send the request to the endpoint and return the raw Effect response.
51
+ * This does not set up query state tracking.
52
+ */
53
+ request: Effect.Effect<A, E, R>;
36
54
  }
37
- export type RequestWithExtensions<RT, Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer _Request, infer Id> ? RequestExtWithInput<RT, Id, I, A, E, R> : Req extends RequestHandler<infer A, infer E, infer R, infer _Request, infer Id> ? RequestExt<RT, Id, A, E, R> : never;
55
+ export type QueryRequestWithExtensions<Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer _Request, infer _Id> ? QueryExtensionsWithInput<I, A, E, R> : Req extends RequestHandler<infer A, infer E, infer R, infer _Request, infer _Id> ? QueryExtensions<A, E, R> : never;
56
+ type QueryHandler<Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "query" ? RequestHandlerWithInput<I, A, E, R, Request, Id> : never : Req extends RequestHandler<infer A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "query" ? RequestHandler<A, E, R, Request, Id> : never : never;
57
+ type CommandHandler<Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "command" ? RequestHandlerWithInput<I, A, E, R, Request, Id> : never : Req extends RequestHandler<infer A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "command" ? RequestHandler<A, E, R, Request, Id> : never : never;
38
58
  export interface MutationExtensions<RT, Id extends string, I, A, E, R> {
39
59
  /** Defines a Command based on this mutation, taking the `id` of the mutation as the `id` of the Command.
40
60
  * The Mutation function will be taken as the first member of the Command, the Command required input will be the Mutation input.
41
61
  * see Command.wrap for details */
42
62
  wrap: Commander.CommanderWrap<RT, Id, Id, undefined, I, A, E, R>;
43
- /** Defines a Command based on this mutation, taking the `id` of the mutation as the `id` of the Command.
44
- * see Command.fn for details */
45
- fn: Commander.CommanderFn<RT, Id, Id, undefined>;
46
63
  }
47
64
  /** my other doc */
48
- export interface MutationExtWithInput<RT, Id extends string, I, A, E, R> extends Commander.CommandContextLocal<Id, Id>, MutationExtensions<RT, Id, I, A, E, R> {
65
+ export interface MutationExtWithInput<RT, Id extends string, I, A, E, R, EA = unknown> extends MutationExtensions<RT, Id, I, A, E, R> {
49
66
  /**
50
- * Call the endpoint with input
51
- * Invalidate queries based on namespace of this mutation.
52
- * Do not use for queries.
67
+ * Send the request to the endpoint and return the raw Effect response.
68
+ * Also invalidates query caches using the request namespace by default.
69
+ * Namespace invalidation targets parent namespace keys
70
+ * (for example `$project/$configuration.get` invalidates `$project`).
71
+ * Override invalidation in client options via `queryInvalidation`.
53
72
  */
54
73
  (i: I): Effect.Effect<A, E, R>;
74
+ project: <ProjSchema extends S.Top>(schema: EA extends ProjSchema["Encoded"] ? ProjSchema : never) => MutationExtWithInput<RT, Id, I, S.Schema.Type<ProjSchema>, E | S.SchemaError, R | S.Codec.DecodingServices<ProjSchema>, S.Codec.Encoded<ProjSchema>>;
55
75
  }
56
76
  /**
57
- * Call the endpoint
58
- * Invalidate queries based on namespace of this mutation.
59
- * Do not use for queries.
77
+ * Send the request to the endpoint and return the raw Effect response.
78
+ * Also invalidates query caches using the request namespace by default.
79
+ * Namespace invalidation targets parent namespace keys
80
+ * (for example `$project/$configuration.get` invalidates `$project`).
81
+ * Override invalidation in client options via `queryInvalidation`.
60
82
  */
61
- export interface MutationExt<RT, Id extends string, A, E, R> extends Commander.CommandContextLocal<Id, Id>, Commander.CommanderWrap<RT, Id, Id, undefined, void, A, E, R>, MutationExtensions<RT, Id, void, A, E, R>, Effect.Effect<A, E, R> {
83
+ export interface MutationExt<RT, Id extends string, A, E, R, EA = unknown> extends MutationExtensions<RT, Id, void, A, E, R>, Effect.Effect<A, E, R> {
84
+ project: <ProjSchema extends S.Top>(schema: EA extends ProjSchema["Encoded"] ? ProjSchema : never) => MutationExt<RT, Id, S.Schema.Type<ProjSchema>, E | S.SchemaError, R | S.Codec.DecodingServices<ProjSchema>, S.Codec.Encoded<ProjSchema>>;
62
85
  }
63
- export type MutationWithExtensions<RT, Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer _Request, infer Id> ? MutationExtWithInput<RT, Id, I, A, E, R> : Req extends RequestHandler<infer A, infer E, infer R, infer _Request, infer Id> ? MutationExt<RT, Id, A, E, R> : never;
86
+ export type MutationWithExtensions<RT, Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id> ? MutationExtWithInput<RT, Id, I, A, E, R, S.Codec.Encoded<Request["success"]>> : Req extends RequestHandler<infer A, infer E, infer R, infer Request, infer Id> ? MutationExt<RT, Id, A, E, R, S.Codec.Encoded<Request["success"]>> : never;
64
87
  declare const useQuery_: QueryImpl<any>["useQuery"];
65
88
  declare const useSuspenseQuery_: QueryImpl<any>["useSuspenseQuery"];
89
+ export interface ProjectResult<RT, I, B, E, R, Request extends Req, Id extends string> {
90
+ request: (i: I) => Effect.Effect<B, E, R>;
91
+ query: Exclude<R, RT> extends never ? ReturnType<typeof useQuery_<I, E, B, Request, Id>> : MissingDependencies<RT, R> & {};
92
+ suspense: Exclude<R, RT> extends never ? ReturnType<typeof useSuspenseQuery_<I, E, B, Request, Id>> : MissingDependencies<RT, R> & {};
93
+ }
94
+ export type QueryProjection<RT, HandlerReq> = HandlerReq extends RequestHandlerWithInput<infer I, infer _A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "query" ? {
95
+ project: <ProjSchema extends S.Top>(schema: S.Codec.Encoded<Request["success"]> extends ProjSchema["Encoded"] ? ProjSchema : never) => ProjectResult<RT, I, S.Schema.Type<ProjSchema>, E | S.SchemaError, R | S.Codec.DecodingServices<ProjSchema>, Request, Id>;
96
+ } : {} : HandlerReq extends RequestHandler<infer _A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "query" ? {
97
+ project: <ProjSchema extends S.Top>(schema: S.Codec.Encoded<Request["success"]> extends ProjSchema["Encoded"] ? ProjSchema : never) => ProjectResult<RT, void, S.Schema.Type<ProjSchema>, E | S.SchemaError, R | S.Codec.DecodingServices<ProjSchema>, Request, Id>;
98
+ } : {} : {};
66
99
  export interface QueriesWithInput<Request extends Req, Id extends string, I, A, E> {
67
100
  /**
68
- * Effect results are passed to the caller, including errors.
101
+ * Read helper for query requests.
102
+ * Runs as a tracked Vue Query and returns reactive state.
103
+ * Queries read state and should not be used to mutate it.
69
104
  */
70
105
  query: ReturnType<typeof useQuery_<I, E, A, Request, Id>>;
71
106
  /**
72
- * The difference with useQuery is that this function will return a Promise you can await in the Setup,
73
- * which ensures that either there always is a latest value, or an error occurs on load.
74
- * So that Suspense and error boundaries can be used.
107
+ * Like `.query`, but returns a Promise for setup-time awaiting.
108
+ * Use this when integrating with Vue Suspense / error boundaries.
75
109
  */
76
110
  suspense: ReturnType<typeof useSuspenseQuery_<I, E, A, Request, Id>>;
77
111
  }
78
112
  export interface QueriesWithoutInput<Request extends Req, Id extends string, A, E> {
79
113
  /**
80
- * Effect results are passed to the caller, including errors.
114
+ * Read helper for query requests.
115
+ * Runs as a tracked Vue Query and returns reactive state.
116
+ * Queries read state and should not be used to mutate it.
81
117
  */
82
118
  query: ReturnType<typeof useQuery_<E, A, Request, Id>>;
83
119
  /**
84
- * The difference with useQuery is that this function will return a Promise you can await in the Setup,
85
- * which ensures that either there always is a latest value, or an error occurs on load.
86
- * So that Suspense and error boundaries can be used.
120
+ * Like `.query`, but returns a Promise for setup-time awaiting.
121
+ * Use this when integrating with Vue Suspense / error boundaries.
87
122
  */
88
123
  suspense: ReturnType<typeof useSuspenseQuery_<E, A, Request, Id>>;
89
124
  }
@@ -91,53 +126,13 @@ export type MissingDependencies<RT, R> = {
91
126
  message: "Dependencies required that are not provided by the runtime";
92
127
  dependencies: Exclude<R, RT>;
93
128
  };
94
- export type Queries<RT, Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id> ? Exclude<R, RT> extends never ? QueriesWithInput<Request, Id, I, A, E> : {
129
+ export type Queries<RT, Req> = Req extends RequestHandlerWithInput<infer I, infer A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "query" ? Exclude<R, RT> extends never ? QueriesWithInput<Request, Id, I, A, E> : {
95
130
  query: MissingDependencies<RT, R> & {};
96
131
  suspense: MissingDependencies<RT, R> & {};
97
- } : Req extends RequestHandler<infer A, infer E, infer R, infer Request, infer Id> ? Exclude<R, RT> extends never ? QueriesWithoutInput<Request, Id, A, E> : {
132
+ } : never : Req extends RequestHandler<infer A, infer E, infer R, infer Request, infer Id> ? Request["type"] extends "query" ? Exclude<R, RT> extends never ? QueriesWithoutInput<Request, Id, A, E> : {
98
133
  query: MissingDependencies<RT, R> & {};
99
134
  suspense: MissingDependencies<RT, R> & {};
100
- } : never;
101
- declare const SuppressErrors_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => Cause.YieldableError & {
102
- readonly _tag: "SuppressErrors";
103
- } & Readonly<A>;
104
- /**
105
- * Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
106
- */
107
- export declare class SuppressErrors extends SuppressErrors_base<{}> {
108
- readonly [ErrorSilenced]: true;
109
- }
110
- export type ResponseErrors = S.SchemaError | SupportedErrors | SuppressErrors | OperationFailure;
111
- export interface Opts<A, E, R, I = void, A2 = A, E2 = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never> extends MutationOptions<A, E, R, A2, E2, R2, I> {
112
- /** set to `undefined` to use default message */
113
- successMessage?: ((a: A2, i: I) => Effect.Effect<string | undefined, ESuccess, RSuccess>) | undefined;
114
- /** set to `undefined` to use default message */
115
- failMessage?: ((e: E2, i: I) => Effect.Effect<string | undefined, EError, RError>) | undefined;
116
- /** set to `undefined` to use default message */
117
- defectMessage?: ((e: Cause.Cause<E2>, i: I) => Effect.Effect<string | undefined, EDefect, RDefect>) | undefined;
118
- }
119
- export interface LowOpts<A, E, I = void, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never> {
120
- onSuccess: (a: A, i: I) => Effect.Effect<void, ESuccess, RSuccess>;
121
- onFail: (e: E, i: I) => Effect.Effect<void, EError, RError>;
122
- onDefect: (e: Cause.Cause<E>, i: I) => Effect.Effect<void, EDefect, RDefect>;
123
- }
124
- export interface LowOptsOptional<A, E, R, I = void, A2 = A, E2 = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never> extends MutationOptions<A, E, R, A2, E2, R2, I> {
125
- onSuccess?: (a: A, i: I) => Effect.Effect<void, ESuccess, RSuccess>;
126
- onFail?: (e: E, i: I) => Effect.Effect<void, EError, RError>;
127
- onDefect?: (e: Cause.Cause<E>, i: I) => Effect.Effect<void, EDefect, RDefect>;
128
- }
129
- type WithAction<A> = A & {
130
- action: string;
131
- };
132
- type Resp<I, A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
133
- V,
134
- WithAction<(I: I) => Effect.Effect<Exit.Exit<A, E>, never, R>>
135
- ];
136
- type ActResp<A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
137
- V,
138
- WithAction<Effect.Effect<Exit.Exit<A, E>, never, R>>
139
- ];
140
- export declare const suppressToast: import("effect/Function").LazyArg<Effect.Effect<undefined, never, never>>;
135
+ } : never : never;
141
136
  declare const _useMutation: {
142
137
  <I, E, A, R, Request extends Req, Id extends string>(self: RequestHandlerWithInput<I, A, E, R, Request, Id>, options?: MutationOptionsBase): ((i: I) => Effect.Effect<A, E, R>) & {
143
138
  readonly id: Id;
@@ -165,189 +160,10 @@ export declare const useMutationInt: () => {
165
160
  readonly id: Id;
166
161
  };
167
162
  };
168
- export declare class LegacyMutationImpl<RT> {
169
- private readonly getRuntime;
170
- private readonly toast;
171
- private readonly intl;
172
- constructor(getRuntime: () => ServiceMap.ServiceMap<RT>, toast: Toast, intl: I18n);
173
- /**
174
- * Effect results are converted to Exit, so errors are ignored by default.
175
- * you should use the result ref to render errors!
176
- * @deprecated use `Command.fn` and friends instead
177
- */
178
- readonly useSafeMutation: {
179
- /**
180
- * Effect results are converted to Exit, so errors are ignored by default.
181
- * you should use the result ref to render errors!
182
- * @deprecated use `Command.fn` and friends instead
183
- */
184
- <I, E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2, I>): readonly [
185
- ComputedRef<AsyncResult.AsyncResult<A2, E2>>,
186
- (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>
187
- ];
188
- /**
189
- * Effect results are converted to Exit, so errors are ignored by default.
190
- * you should use the result ref to render errors!
191
- * @deprecated use `Command.fn` and friends instead
192
- */
193
- <E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandler<A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2>): readonly [
194
- ComputedRef<AsyncResult.AsyncResult<A2, E2>>,
195
- Effect.Effect<Exit.Exit<A2, E2>, never, R2>
196
- ];
197
- };
198
- /** handles errors as toasts and reports defects
199
- * @deprecated use `Command.fn` and friends instead
200
- */
201
- readonly useHandleRequestWithToast: () => <A, E extends ResponseErrors, R, I = void, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(f: Effect.Effect<Exit.Exit<A2, E2>, never, R2> | ((i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>), id: string, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>) => (Effect.Effect<Exit.Exit<A2, E2>, ESuccess | EError | EDefect, Exclude<R2, import("effect/Tracer").ParentSpan> | Exclude<RSuccess, import("effect/Tracer").ParentSpan> | Exclude<RError, import("effect/Tracer").ParentSpan> | Exclude<RDefect, import("effect/Tracer").ParentSpan>> | ((i: any) => Effect.Effect<Exit.Exit<A2, E2>, ESuccess | EError | EDefect, Exclude<R2, import("effect/Tracer").ParentSpan> | Exclude<RSuccess, import("effect/Tracer").ParentSpan> | Exclude<RError, import("effect/Tracer").ParentSpan> | Exclude<RDefect, import("effect/Tracer").ParentSpan>>)) & {
202
- action: string;
203
- };
204
- /**
205
- * Pass a function that returns an Effect, e.g from a client action, give it a name.
206
- * Returns a tuple with raw Result and execution function which reports success and errors as Toast.
207
- * @deprecated use `Command.fn` and friends instead
208
- */
209
- readonly useAndHandleMutationResult: {
210
- /**
211
- * Pass a function that returns an Effect, e.g from a client action, give it a name.
212
- * Returns a tuple with raw Result and execution function which reports success and errors as Toast.
213
- * @deprecated use `Command.fn` and friends instead
214
- */
215
- <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2, ComputedRef<AsyncResult.AsyncResult<A2, E2>>>;
216
- /**
217
- * Pass a function that returns an Effect, e.g from a client action, give it a name.
218
- * Returns a tuple with raw Result and execution function which reports success and errors as Toast.
219
- * @deprecated use `Command.fn` and friends instead
220
- */
221
- <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2, ComputedRef<AsyncResult.AsyncResult<A2, E2>>>;
222
- };
223
- /**
224
- * Pass a function that returns an Effect, e.g from a client action, give it a name.
225
- * Returns a tuple with state ref and execution function which reports success and errors as Toast.
226
- *
227
- * @deprecated use `Command.fn` and friends instead
228
- */
229
- readonly useAndHandleMutation: {
230
- /**
231
- * Pass a function that returns an Effect, e.g from a client action, give it a name.
232
- * Returns a tuple with state ref and execution function which reports success and errors as Toast.
233
- *
234
- * @deprecated use `Command.fn` and friends instead
235
- */
236
- <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2>;
237
- /**
238
- * Pass a function that returns an Effect, e.g from a client action, give it a name.
239
- * Returns a tuple with state ref and execution function which reports success and errors as Toast.
240
- *
241
- * @deprecated use `Command.fn` and friends instead
242
- */
243
- <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2>;
244
- };
245
- /** @deprecated use `Command.fn` and friends instead */
246
- readonly makeUseAndHandleMutation: (defaultOptions?: Opts<any, any, any, any, any, any, any, any, any>) => {
247
- <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2>;
248
- <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2>;
249
- };
250
- /**
251
- * The same as @see useAndHandleMutation, but does not display any toasts by default.
252
- * Messages for success, error and defect toasts can be provided in the Options.
253
- * @deprecated use `Command.fn` and friends instead
254
- */
255
- readonly useAndHandleMutationSilently: {
256
- /**
257
- * The same as @see useAndHandleMutation, but does not display any toasts by default.
258
- * Messages for success, error and defect toasts can be provided in the Options.
259
- * @deprecated use `Command.fn` and friends instead
260
- */
261
- <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R>;
262
- /**
263
- * The same as @see useAndHandleMutation, but does not display any toasts by default.
264
- * Messages for success, error and defect toasts can be provided in the Options.
265
- * @deprecated use `Command.fn` and friends instead
266
- */
267
- <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<void, never, R>;
268
- };
269
- /**
270
- * The same as @see useAndHandleMutation, but does not act on success, error or defect by default.
271
- * Actions for success, error and defect can be provided in the Options.
272
- * @deprecated use `Command.fn` and friends instead
273
- */
274
- readonly useAndHandleMutationCustom: {
275
- /**
276
- * The same as @see useAndHandleMutation, but does not act on success, error or defect by default.
277
- * Actions for success, error and defect can be provided in the Options.
278
- * @deprecated use `Command.fn` and friends instead
279
- */
280
- <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: LowOptsOptional<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2>;
281
- /**
282
- * The same as @see useAndHandleMutation, but does not act on success, error or defect by default.
283
- * Actions for success, error and defect can be provided in the Options.
284
- * @deprecated use `Command.fn` and friends instead
285
- */
286
- <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: LowOptsOptional<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2>;
287
- };
288
- /**
289
- * Effect results are converted to Exit, so errors are ignored by default.
290
- * you should use the result ref to render errors!
291
- * @deprecated use `Command.fn` and friends instead
292
- */
293
- readonly useSafeMutationWithState: {
294
- /**
295
- * Effect results are converted to Exit, so errors are ignored by default.
296
- * you should use the result ref to render errors!
297
- * @deprecated use `Command.fn` and friends instead
298
- */
299
- <I, E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2, I>): readonly [
300
- ComputedRef<Res<A, E>>,
301
- (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>
302
- ];
303
- /**
304
- * Effect results are converted to Exit, so errors are ignored by default.
305
- * you should use the result ref to render errors!
306
- * @deprecated use `Command.fn` and friends instead
307
- */
308
- <E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandler<A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2>): readonly [
309
- ComputedRef<Res<A, E>>,
310
- Effect.Effect<Exit.Exit<A2, E2>, never, R2>
311
- ];
312
- };
313
- /** @deprecated use OmegaForm */
314
- readonly buildFormFromSchema: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, C extends Record<PropertyKey, any>, OnSubmitA>(s: S.Codec<To> & {
315
- new (c: C): any;
316
- extend: any;
317
- fields: S.Struct.Fields;
318
- }, state: Ref<Omit<From, "_tag">>, onSubmit: (a: To) => Effect.Effect<OnSubmitA, never, RT>) => {
319
- fields: { [K in keyof To]-?: {
320
- true: {
321
- true: To[K] extends {
322
- _tag: string;
323
- } ? import("./form.js").DiscriminatedUnionFieldInfo<{ [P in import("./form.js").DistributiveNestedFieldInfoKey<To[K]> as P["_infoTag" & keyof P] & string]: P; }> : import("./form.js").UnionFieldInfo<import("./form.js").DistributiveNestedFieldInfoKey<To[K]>[]>;
324
- false: import("./form.js").NestedFieldInfoKey<To[K]>;
325
- }[`${To[K] extends object ? true : false}`];
326
- false: import("./form.js").NestedFieldInfoKey<To[K]>;
327
- }[`${import("effect-app/utils").IsUnion<To[K]>}`]; };
328
- /** optimized for Vuetify v-form submit callback */
329
- submit: <T extends Promise<{
330
- valid: boolean;
331
- }>>(e: T) => Promise<unknown>;
332
- /** optimized for Native form submit callback or general use */
333
- submitFromState: Effect.Effect<any, unknown, unknown>;
334
- submitFromStatePromise: () => Promise<unknown>;
335
- isDirty: Ref<boolean, boolean>;
336
- isValid: Ref<boolean, boolean>;
337
- isLoading: Ref<boolean, boolean>;
338
- };
339
- }
340
- declare const LegacyMutation_base: ServiceMap.ServiceClass<LegacyMutation, "LegacyMutation", <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => LegacyMutationImpl<R>> & {
341
- readonly make: Effect.Effect<(<R>(getRuntime: () => ServiceMap.ServiceMap<R>) => LegacyMutationImpl<R>), never, I18n | Toast>;
342
- };
343
- export declare class LegacyMutation extends LegacyMutation_base {
344
- static readonly DefaultWithoutDependencies: Layer.Layer<LegacyMutation, never, I18n | Toast>;
345
- static readonly Default: Layer.Layer<LegacyMutation, never, I18n | Toast>;
346
- }
347
- export type ClientFrom<M extends Requests> = RequestHandlers<never, never, M, M["meta"]["moduleName"]>;
163
+ export type ClientFrom<M extends RequestsAny> = RequestHandlers<never, never, M, ExtractModuleName<M>>;
348
164
  export declare class QueryImpl<R> {
349
- readonly getRuntime: () => ServiceMap.ServiceMap<R>;
350
- constructor(getRuntime: () => ServiceMap.ServiceMap<R>);
165
+ readonly getRuntime: () => Context.Context<R>;
166
+ constructor(getRuntime: () => Context.Context<R>);
351
167
  /**
352
168
  * Effect results are passed to the caller, including errors.
353
169
  * @deprecated use client helpers instead (.query())
@@ -400,21 +216,46 @@ export declare class QueryImpl<R> {
400
216
  };
401
217
  }
402
218
  type Base = I18n | Toast;
403
- type Mix = ApiClientFactory | Commander | LegacyMutation | Base;
219
+ type Mix = ApiClientFactory | Commander | Base;
220
+ type InvalidationResources = Record<string, Record<string, unknown>>;
221
+ type UnionToIntersection<U> = (U extends unknown ? (arg: U) => void : never) extends ((arg: infer I) => void) ? I : never;
222
+ type CommandInvalidationResources<Req> = Req extends {
223
+ readonly type: "command";
224
+ readonly "~invalidationResources"?: infer Resources;
225
+ } ? NonNullable<Resources> extends InvalidationResources ? NonNullable<Resources> : never : Req extends {
226
+ readonly type: "command";
227
+ readonly config?: infer Config;
228
+ } ? Config extends {
229
+ readonly invalidationResources?: infer LegacyResources;
230
+ } ? NonNullable<LegacyResources> extends InvalidationResources ? NonNullable<LegacyResources> : never : Config extends {
231
+ readonly invalidatesQueries?: InvalidationCallback<infer LegacyResources, any, any, any>;
232
+ } ? NonNullable<LegacyResources> extends InvalidationResources ? NonNullable<LegacyResources> : never : never : never;
233
+ type InvalidationResourcesForUnion<M extends RequestsAny> = {
234
+ [K in keyof M]: CommandInvalidationResources<M[K]>;
235
+ }[keyof M];
236
+ type InvalidationResourcesFor<M extends RequestsAny> = [InvalidationResourcesForUnion<M>] extends [never] ? never : UnionToIntersection<InvalidationResourcesForUnion<M>> extends infer R ? R extends InvalidationResources ? R : never : never;
237
+ type QueryInvalidationFactory<M extends RequestsAny> = (client: ClientFrom<M>) => QueryInvalidation<M>;
238
+ type StrictResourcesArg<Shape, Actual extends Shape = Shape> = Actual & Record<Exclude<keyof Actual, keyof Shape>, never>;
239
+ type ClientForArgs<M extends RequestsAny, Resources extends InvalidationResourcesFor<M> = InvalidationResourcesFor<M>> = [InvalidationResourcesFor<M>] extends [never] ? [
240
+ queryInvalidation?: QueryInvalidationFactory<M>,
241
+ invalidationResources?: StrictResourcesArg<InvalidationResourcesFor<M>, Resources>
242
+ ] : [
243
+ queryInvalidation: QueryInvalidationFactory<M> | undefined,
244
+ invalidationResources: StrictResourcesArg<InvalidationResourcesFor<M>, Resources>
245
+ ];
404
246
  export declare const makeClient: <RT_, RTHooks>(getBaseMrt: () => ManagedRuntime.ManagedRuntime<RT_ | Mix, never>, clientFor_: ReturnType<(typeof ApiClientFactory)["makeFor"]>, rtHooks: Layer.Layer<RTHooks, never, Mix>) => {
405
- Command: CommanderResolved<Mix | RT_, RTHooks>;
406
- useCommand: () => CommanderResolved<Mix | RT_, RTHooks>;
407
- clientFor: <M extends Requests>(m: M, queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>) => { [Key in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]>]: RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key] & RequestWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]> & {
408
- mutate: MutationWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>;
409
- } & Queries<Mix | RT_, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>; } & {
410
- helpers: { [Key_1 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_1>}Request`]: RequestWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_1]>; } & { [Key_2 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_2>}Mutation`]: MutationWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_2]>; } & { [Key_3 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_3>}Query`]: Queries<Mix | RT_, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_3]>["query"]; } & { [Key_4 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_4>}SuspenseQuery`]: Queries<Mix | RT_, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_4]>["suspense"]; };
247
+ Command: CommanderResolved<RT_ | Mix, RTHooks>;
248
+ useCommand: () => CommanderResolved<RT_ | Mix, RTHooks>;
249
+ clientFor: <M extends RequestsAny, Resources extends InvalidationResourcesFor<M> = InvalidationResourcesFor<M>>(m: M, ...args: ClientForArgs<M, Resources>) => { [Key in keyof RequestHandlers<never, never, M, ExtractModuleName<M>>]: RequestHandlers<never, never, M, ExtractModuleName<M>>[Key] & (QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> extends never ? {} : QueryRequestWithExtensions<QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>> & Queries<RT_ | Mix, QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>> & QueryProjection<RT_ | Mix, QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>>) & (CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> extends never ? {} : CommandRequestWithExtensions<RTHooks | (RT_ | Mix), CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>>) & (CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> extends never ? {} : {
250
+ mutate: MutationWithExtensions<RTHooks | (RT_ | Mix), CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>>;
251
+ }) & {
252
+ Input: RequestHandlers<never, never, M, ExtractModuleName<M>>[Key] extends RequestHandlerWithInput<infer I, any, any, any, any, any> ? I : never;
253
+ }; } & {
254
+ helpers: { [Key in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> extends never ? never : `${ToCamel<string & Key>}Request`]: CommandRequestWithExtensions<RTHooks | (RT_ | Mix), CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>>; } & { [Key in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> extends never ? never : `${ToCamel<string & Key>}Mutation`]: MutationWithExtensions<RTHooks | (RT_ | Mix), CommandHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>>; } & { [Key in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> extends never ? never : `${ToCamel<string & Key>}Query`]: Queries<RT_ | Mix, QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>>["query"]; } & { [Key in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> extends never ? never : `${ToCamel<string & Key>}SuspenseQuery`]: Queries<RT_ | Mix, QueryHandler<RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>>["suspense"]; };
411
255
  };
412
- legacy: Legacy<Mix | RT_>;
413
256
  };
414
- export interface Legacy<R> extends Pick<QueryImpl<R>, "useQuery" | "useSuspenseQuery">, Omit<LegacyMutationImpl<R>, "getRuntime" | "toast" | "intl"> {
415
- }
416
257
  export type QueryInvalidation<M> = {
417
- [K in keyof M]?: (defaultKey: string[], name: string) => {
258
+ [K in keyof M]?: (defaultKey: string[], name: string, input?: unknown, output?: ExitResult.Exit<unknown, unknown>) => {
418
259
  filters?: InvalidateQueryFilters | undefined;
419
260
  options?: InvalidateOptions | undefined;
420
261
  }[];
@@ -430,7 +271,9 @@ export interface CommandBase<I = void, A = void> {
430
271
  }
431
272
  export interface EffectCommand<I = void, A = unknown, E = unknown> extends CommandBase<I, Fiber<A, E>> {
432
273
  }
433
- export interface CommandFromRequest<I extends abstract new (...args: any) => any, A = unknown, E = unknown> extends EffectCommand<ConstructorParameters<I>[0], A, E> {
274
+ export interface CommandFromRequest<I extends {
275
+ readonly make: (...args: any[]) => any;
276
+ }, A = unknown, E = unknown> extends EffectCommand<RequestInputFromMake<I>, A, E> {
434
277
  }
435
278
  export {};
436
- //# sourceMappingURL=makeClient.d.ts.map
279
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeClient.d.ts","sourceRoot":"","sources":["../src/makeClient.ts"],"names":[],"mappings":"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"}