@effect-app/vue 4.0.0-beta.29 → 4.0.0-beta.291

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 (131) hide show
  1. package/CHANGELOG.md +2167 -0
  2. package/dist/atomQuery.d.ts +107 -0
  3. package/dist/atomQuery.d.ts.map +1 -0
  4. package/dist/atomQuery.js +345 -0
  5. package/dist/commander.d.ts +634 -0
  6. package/dist/commander.d.ts.map +1 -0
  7. package/dist/commander.js +1070 -0
  8. package/dist/{experimental/confirm.d.ts → confirm.d.ts} +6 -4
  9. package/dist/confirm.d.ts.map +1 -0
  10. package/dist/confirm.js +26 -0
  11. package/dist/dependencyMetadata.d.ts +10 -0
  12. package/dist/dependencyMetadata.d.ts.map +1 -0
  13. package/dist/dependencyMetadata.js +29 -0
  14. package/dist/errorReporter.d.ts +6 -4
  15. package/dist/errorReporter.d.ts.map +1 -1
  16. package/dist/errorReporter.js +14 -19
  17. package/dist/form.d.ts +14 -5
  18. package/dist/form.d.ts.map +1 -1
  19. package/dist/form.js +46 -13
  20. package/dist/internal/tanstackQuery.d.ts +9 -0
  21. package/dist/internal/tanstackQuery.d.ts.map +1 -0
  22. package/dist/internal/tanstackQuery.js +194 -0
  23. package/dist/intl.d.ts +15 -0
  24. package/dist/intl.d.ts.map +1 -0
  25. package/dist/intl.js +9 -0
  26. package/dist/lib.d.ts +7 -9
  27. package/dist/lib.d.ts.map +1 -1
  28. package/dist/lib.js +35 -10
  29. package/dist/makeClient.d.ts +212 -336
  30. package/dist/makeClient.d.ts.map +1 -1
  31. package/dist/makeClient.js +388 -411
  32. package/dist/makeContext.d.ts.map +1 -1
  33. package/dist/makeIntl.d.ts.map +1 -1
  34. package/dist/{experimental/makeUseCommand.d.ts → makeUseCommand.d.ts} +4 -3
  35. package/dist/makeUseCommand.d.ts.map +1 -0
  36. package/dist/makeUseCommand.js +13 -0
  37. package/dist/mutate.d.ts +108 -40
  38. package/dist/mutate.d.ts.map +1 -1
  39. package/dist/mutate.js +211 -58
  40. package/dist/query.d.ts +139 -45
  41. package/dist/query.d.ts.map +1 -1
  42. package/dist/query.js +325 -122
  43. package/dist/routeParams.d.ts +4 -4
  44. package/dist/routeParams.d.ts.map +1 -1
  45. package/dist/routeParams.js +4 -3
  46. package/dist/runtime.d.ts +1 -14
  47. package/dist/runtime.d.ts.map +1 -1
  48. package/dist/runtime.js +2 -26
  49. package/dist/suspense.d.ts +19 -0
  50. package/dist/suspense.d.ts.map +1 -0
  51. package/dist/suspense.js +38 -0
  52. package/dist/toast.d.ts +2 -0
  53. package/dist/toast.d.ts.map +1 -0
  54. package/dist/toast.js +2 -0
  55. package/dist/withToast.d.ts +2 -0
  56. package/dist/withToast.d.ts.map +1 -0
  57. package/dist/withToast.js +2 -0
  58. package/docs/atom-query-api-redesign.md +207 -0
  59. package/docs/query-key-invalidation.md +106 -0
  60. package/examples/streamMutation.ts +72 -0
  61. package/package.json +30 -94
  62. package/src/atomQuery.ts +466 -0
  63. package/src/commander.ts +3413 -0
  64. package/src/{experimental/confirm.ts → confirm.ts} +13 -15
  65. package/src/dependencyMetadata.ts +38 -0
  66. package/src/errorReporter.ts +65 -75
  67. package/src/form.ts +61 -18
  68. package/src/index.ts +7 -7
  69. package/src/internal/tanstackQuery.ts +289 -0
  70. package/src/intl.ts +12 -0
  71. package/src/lib.ts +49 -21
  72. package/src/makeClient.ts +930 -1159
  73. package/src/makeIntl.ts +2 -2
  74. package/src/{experimental/makeUseCommand.ts → makeUseCommand.ts} +9 -6
  75. package/src/mutate.ts +372 -152
  76. package/src/query.ts +683 -260
  77. package/src/routeParams.ts +7 -7
  78. package/src/runtime.ts +1 -31
  79. package/src/suspense.ts +43 -0
  80. package/src/toast.ts +1 -0
  81. package/src/withToast.ts +1 -0
  82. package/test/Mutation.test.ts +181 -24
  83. package/test/dependencyInvalidation.test.ts +352 -0
  84. package/test/dist/dependencyInvalidation.test.d.ts.map +1 -0
  85. package/test/dist/form.test.d.ts.map +1 -1
  86. package/test/dist/lib.test.d.ts.map +1 -0
  87. package/test/dist/query-span.test.d.ts.map +1 -0
  88. package/test/dist/streamFinal.test.d.ts.map +1 -0
  89. package/test/dist/streamFn.test.d.ts.map +1 -0
  90. package/test/dist/stubs.d.ts +3756 -122
  91. package/test/dist/stubs.d.ts.map +1 -1
  92. package/test/dist/stubs.js +192 -32
  93. package/test/dist/suspense-regression.test.d.ts.map +1 -0
  94. package/test/dist/suspense.test.d.ts.map +1 -0
  95. package/test/form-validation-errors.test.ts +25 -20
  96. package/test/form.test.ts +22 -3
  97. package/test/lib.test.ts +240 -0
  98. package/test/makeClient.test.ts +437 -38
  99. package/test/query-span.test.ts +92 -0
  100. package/test/streamFinal.test.ts +64 -0
  101. package/test/streamFn.test.ts +457 -0
  102. package/test/stubs.ts +228 -43
  103. package/test/suspense-regression.test.ts +168 -0
  104. package/test/suspense.test.ts +160 -0
  105. package/tsconfig.examples.json +20 -0
  106. package/tsconfig.json +3 -1
  107. package/tsconfig.src.json +34 -34
  108. package/tsconfig.test.json +2 -2
  109. package/vitest.config.ts +5 -5
  110. package/dist/experimental/commander.d.ts +0 -359
  111. package/dist/experimental/commander.d.ts.map +0 -1
  112. package/dist/experimental/commander.js +0 -557
  113. package/dist/experimental/confirm.d.ts.map +0 -1
  114. package/dist/experimental/confirm.js +0 -28
  115. package/dist/experimental/intl.d.ts +0 -16
  116. package/dist/experimental/intl.d.ts.map +0 -1
  117. package/dist/experimental/intl.js +0 -5
  118. package/dist/experimental/makeUseCommand.d.ts.map +0 -1
  119. package/dist/experimental/makeUseCommand.js +0 -13
  120. package/dist/experimental/toast.d.ts +0 -47
  121. package/dist/experimental/toast.d.ts.map +0 -1
  122. package/dist/experimental/toast.js +0 -41
  123. package/dist/experimental/withToast.d.ts +0 -25
  124. package/dist/experimental/withToast.d.ts.map +0 -1
  125. package/dist/experimental/withToast.js +0 -45
  126. package/eslint.config.mjs +0 -24
  127. package/src/experimental/commander.ts +0 -1835
  128. package/src/experimental/intl.ts +0 -9
  129. package/src/experimental/toast.ts +0 -66
  130. package/src/experimental/withToast.ts +0 -99
  131. package/tsconfig.json.bak +0 -12
package/dist/query.js CHANGED
@@ -2,123 +2,338 @@
2
2
  /* eslint-disable @typescript-eslint/no-unsafe-call */
3
3
  /* eslint-disable @typescript-eslint/no-unsafe-return */
4
4
  /* eslint-disable @typescript-eslint/no-unsafe-assignment */
5
- import { useQuery as useTanstackQuery, useQueryClient } from "@tanstack/vue-query";
6
- import { Array, Cause, Effect, Exit, flow, Option, S } from "effect-app";
7
- import { ServiceUnavailableError } from "effect-app/client/errors";
8
- import { isHttpClientError } from "effect/unstable/http/HttpClientError";
5
+ /* eslint-disable @typescript-eslint/no-unsafe-member-access */
6
+ import { injectRegistry, useAtomValue } from "@effect/atom-vue";
7
+ import * as Array from "effect-app/Array";
8
+ import { makeQueryKey } from "effect-app/client";
9
+ import * as Effect from "effect-app/Effect";
10
+ import * as Option from "effect-app/Option";
11
+ import * as Exit from "effect/Exit";
12
+ import * as Stream from "effect/Stream";
9
13
  import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
10
- import { computed, ref, shallowRef, watch } from "vue";
11
- import { makeQueryKey, reportRuntimeError } from "./lib.js";
12
- export class KnownFiberFailure extends Error {
13
- effectCause;
14
- error;
15
- constructor(effectCause) {
16
- super("Query failed with cause: " + Cause.squash(effectCause));
17
- this.effectCause = effectCause;
18
- this.error = Cause.squash(effectCause);
14
+ import * as Atom from "effect/unstable/reactivity/Atom";
15
+ import { computed, effectScope, onBeforeUnmount, onMounted, onScopeDispose, ref, toValue } from "vue";
16
+ import { awaitAtomResult, buildQueryFamily, buildStreamQueryFamily, disabledQueryAtom, isStaleResult, refreshAtomWithCurrentSpan, staleTimeMsOf, withQueryOptions } from "./atomQuery.js";
17
+ import { latestDefined } from "./suspense.js";
18
+ const useScopedSuspenseSetup = (setup) => {
19
+ const scope = effectScope();
20
+ const controller = new AbortController();
21
+ const value = scope.run(setup);
22
+ if (value === undefined) {
23
+ throw new Error("Internal Error: atom suspense setup scope did not initialize");
19
24
  }
20
- }
21
- export const makeQuery = (getRuntime) => {
22
- const useQuery_ = (q) => (arg,
23
- // todo QueryKey type would be [string, ...string[]], but with I it would be [string, ...string[], I]
24
- options
25
- // TODO
26
- ) => {
27
- // we wrap into KnownFiberFailure because we want to keep the full cause of the failure.
28
- const runPromise = flow(Effect.runPromiseExitWith(getRuntime()), (_) => _.then(Exit.match({
29
- onFailure: (cause) => Promise.reject(new KnownFiberFailure(cause)),
30
- onSuccess: (value) => Promise.resolve(value)
31
- })));
32
- const arr = arg;
33
- const req = !arg
34
- ? undefined
35
- : typeof arr === "function"
36
- ? {
37
- get value() {
38
- return arr();
39
- }
40
- }
41
- : ref(arg);
42
- const queryKey = makeQueryKey(q);
43
- const handler = q.handler;
44
- const defaultOptions = {
45
- // we do not want to throw errors, because we turn the success and error responses into a Result type
46
- // why don't we turn the error/success response into a Result type before returning to tanstack query? because we want to leverage tanstack query's retry and caching mechanism, which relies on throwing errors to trigger retries, and we don't want to interfere with that by catching the errors too early.
47
- // but if we allow tanstack query to throw, it will trigger the error boundary in Vue - via a "watcher callback" error - which we currently report and log, which is not what we want.
48
- // TODO: we might want to rethink the strategy of how to handle errors that happen after the initial load.
49
- // For suspense, the initial load is captured by the suspense boundary.
50
- // For subsequent loads (or non suspense use) we currently are required to use the QueryResult component to conditionally render error/loading/etc.
51
- throwOnError: false
52
- };
53
- const r = useTanstackQuery(Effect.isEffect(handler)
54
- ? {
55
- ...defaultOptions,
56
- ...options,
57
- retry: (retryCount, error) => {
58
- if (error instanceof KnownFiberFailure) {
59
- if (!isHttpClientError(error.error) && !S.is(ServiceUnavailableError)(error.error)) {
60
- return false;
61
- }
62
- }
63
- return retryCount < 5;
64
- },
65
- queryKey,
66
- queryFn: ({ meta, signal }) => runPromise(handler
67
- .pipe(Effect.tapCauseIf(Cause.hasDies, (cause) => reportRuntimeError(cause)), Effect.withSpan(`query ${q.id}`, {}, { captureStackTrace: false }), meta?.["span"] ? Effect.withParentSpan(meta["span"]) : (_) => _), { signal })
25
+ const isMounted = ref(true);
26
+ let stopped = false;
27
+ const stop = () => {
28
+ if (stopped)
29
+ return;
30
+ stopped = true;
31
+ isMounted.value = false;
32
+ controller.abort();
33
+ scope.stop();
34
+ };
35
+ onBeforeUnmount(stop);
36
+ onScopeDispose(stop);
37
+ return [value, isMounted, controller.signal];
38
+ };
39
+ const queryFamilyCacheKey = (q) => `${makeQueryKey(q).join("/")}:${q.queryKeyProjectionHash ?? ""}`;
40
+ // One atom family per request shape, keyed by the stable query key + projection hash (not the
41
+ // handler object — `clientFor` returns a fresh proxy per call, so the object isn't shareable).
42
+ // Module-level + key-indexed => the family is process-global, so the same request+input read
43
+ // the same atom across components/pages => cross-page caching via the global registry.
44
+ const queryFamilyByKey = new Map();
45
+ const getQueryFamily = (rt, q) => {
46
+ const key = queryFamilyCacheKey(q);
47
+ let f = queryFamilyByKey.get(key);
48
+ if (!f) {
49
+ f = buildQueryFamily(rt, q);
50
+ queryFamilyByKey.set(key, f);
51
+ }
52
+ return f;
53
+ };
54
+ const streamQueryFamilyByKey = new Map();
55
+ const getStreamQueryFamily = (rt, q) => {
56
+ const key = queryFamilyCacheKey(q);
57
+ let f = streamQueryFamilyByKey.get(key);
58
+ if (!f) {
59
+ f = buildStreamQueryFamily(rt, q);
60
+ streamQueryFamilyByKey.set(key, f);
61
+ }
62
+ return f;
63
+ };
64
+ const makeAtomQueryCacheUpdater = (warnIfMissing) => ({
65
+ update: (registry, query, input) => {
66
+ const family = queryFamilyByKey.get(queryFamilyCacheKey(query));
67
+ if (!family) {
68
+ if (warnIfMissing) {
69
+ console.warn(`Query ${query.id} has not been used yet; nothing to update`);
68
70
  }
69
- : {
70
- ...defaultOptions,
71
- ...options,
72
- retry: (retryCount, error) => {
73
- if (error instanceof KnownFiberFailure) {
74
- if (!isHttpClientError(error.error) && !S.is(ServiceUnavailableError)(error.error)) {
75
- return false;
76
- }
77
- }
78
- return retryCount < 5;
79
- },
80
- queryKey: [...queryKey, req],
81
- queryFn: ({ meta, signal }) => runPromise(handler(req.value)
82
- .pipe(Effect.tapCauseIf(Cause.hasDies, (cause) => reportRuntimeError(cause)), Effect.withSpan(`query ${q.id}`, {}, { captureStackTrace: false }), meta?.["span"] ? Effect.withParentSpan(meta["span"]) : (_) => _), { signal })
83
- });
84
- const latestSuccess = shallowRef();
85
- const result = computed(() => swrToQuery({
86
- error: r.error.value ?? undefined,
87
- data: r.data.value === undefined ? latestSuccess.value : r.data.value, // we fall back to existing data, as tanstack query might loose it when the key changes
88
- isValidating: r.isFetching.value
89
- }));
90
- // not using `computed` here as we have a circular dependency
91
- watch(result, (value) => latestSuccess.value = Option.getOrUndefined(AsyncResult.value(value)), { immediate: true });
92
- return [
93
- result,
94
- computed(() => latestSuccess.value),
95
- // one thing to keep in mind is that span will be disconnected as Context does not pass from outside.
96
- // TODO: consider how we should handle the Result here which is `QueryObserverResult<A, E>`
97
- // and always ends up in the success channel, even when error..
98
- (options) => Effect.currentSpan.pipe(Effect.orElseSucceed(() => null), Effect.flatMap((span) => Effect.promise(() => r.refetch({ ...options, updateMeta: { span } })))),
99
- r
100
- ];
71
+ return;
72
+ }
73
+ registry.refresh(family(input));
74
+ }
75
+ });
76
+ export const atomQueryCacheUpdater = makeAtomQueryCacheUpdater(true);
77
+ export const optionalAtomQueryCacheUpdater = makeAtomQueryCacheUpdater(false);
78
+ export const combineQueryCacheUpdaters = (first, second) => ({
79
+ update: (registry, query, input, updater) => {
80
+ first.update(registry, query, input, updater);
81
+ second.update(registry, query, input, updater);
82
+ }
83
+ });
84
+ let activeQueryCacheUpdater = atomQueryCacheUpdater;
85
+ export const setQueryCacheUpdater = (updater) => {
86
+ activeQueryCacheUpdater = updater;
87
+ };
88
+ const normalizeQueryOptions = (options) => {
89
+ const out = {};
90
+ if (options?.staleTime !== undefined)
91
+ out.staleTime = options.staleTime;
92
+ const gcTime = options?.idleTTL ?? options?.gcTime;
93
+ if (gcTime !== undefined)
94
+ out.gcTime = gcTime;
95
+ const revalidateOnFocus = options?.revalidateOnFocus ?? options?.refetchOnWindowFocus;
96
+ if (revalidateOnFocus !== undefined)
97
+ out.revalidateOnFocus = revalidateOnFocus;
98
+ if (options?.structuralSharing !== undefined)
99
+ out.structuralSharing = options.structuralSharing;
100
+ const refetchInterval = options?.refreshEvery ?? options?.refetchInterval;
101
+ if (refetchInterval !== undefined)
102
+ out.refetchInterval = refetchInterval;
103
+ return out;
104
+ };
105
+ export const useAtomQuery = (atom) => {
106
+ const registry = injectRegistry();
107
+ const atomRef = computed(atom);
108
+ const atomResult = useAtomValue(() => atomRef.value);
109
+ const result = computed(() => atomResult.value);
110
+ const refresh = () => registry.refresh(atomRef.value);
111
+ const awaitResult = () => awaitAtomResult(registry, atomRef.value);
112
+ const refetch = () => Effect.gen(function* () {
113
+ yield* refreshAtomWithCurrentSpan(registry, atomRef.value);
114
+ return yield* awaitResult();
115
+ });
116
+ const data = computed(() => Option.getOrUndefined(AsyncResult.value(result.value)));
117
+ return {
118
+ result,
119
+ data,
120
+ awaitResult,
121
+ refetch,
122
+ refresh,
123
+ registry,
124
+ atom: atomRef
101
125
  };
102
- function swrToQuery(r) {
103
- if (r.error !== undefined) {
104
- return AsyncResult.failureWithPrevious(r.error.effectCause, {
105
- previous: r.data === undefined ? Option.none() : Option.some(AsyncResult.success(r.data)),
106
- waiting: r.isValidating
107
- });
126
+ };
127
+ export const useAtomSuspense = (atom) => {
128
+ const [{ view, data }, isMounted, signal] = useScopedSuspenseSetup(() => {
129
+ const view = useAtomQuery(atom);
130
+ const data = latestDefined(() => view.data.value, "atom suspense");
131
+ return { view, data };
132
+ });
133
+ const eff = Effect.gen(function* () {
134
+ const exit = yield* view.awaitResult().pipe(Effect.exit);
135
+ if (!isMounted.value) {
136
+ return yield* Effect.interrupt;
108
137
  }
109
- if (r.data !== undefined) {
110
- return AsyncResult.success(r.data, { waiting: r.isValidating });
138
+ if (Exit.isFailure(exit)) {
139
+ return yield* Exit.failCause(exit.cause);
111
140
  }
112
- return AsyncResult.initial(r.isValidating);
141
+ const fetch = (_options) => view.refetch();
142
+ const handle = {
143
+ awaitResult: view.awaitResult,
144
+ refetch: view.refetch,
145
+ refresh: view.refresh,
146
+ registry: view.registry,
147
+ atom: view.atom
148
+ };
149
+ return Object.assign([
150
+ view.result,
151
+ data,
152
+ fetch,
153
+ handle
154
+ ], {
155
+ ...view,
156
+ data
157
+ });
158
+ });
159
+ return Effect.runPromise(eff, { signal });
160
+ };
161
+ export const useAtomStreamQuery = (atom) => {
162
+ const registry = injectRegistry();
163
+ const atomRef = computed(atom);
164
+ const atomResult = useAtomValue(() => atomRef.value);
165
+ const result = computed(() => atomResult.value);
166
+ const pull = () => registry.set(atomRef.value, void 0);
167
+ const refresh = () => registry.refresh(atomRef.value);
168
+ const awaitResult = () => awaitAtomResult(registry, atomRef.value);
169
+ const pullAndAwait = () => Effect.gen(function* () {
170
+ pull();
171
+ return yield* awaitResult();
172
+ });
173
+ const items = computed(() => Option.getOrElse(Option.map(AsyncResult.value(result.value), (_) => _.items), () => []));
174
+ const latest = computed(() => items.value.at(-1));
175
+ const done = computed(() => Option.getOrElse(Option.map(AsyncResult.value(result.value), (_) => _.done), () => false));
176
+ return {
177
+ result,
178
+ items,
179
+ latest,
180
+ done,
181
+ awaitResult,
182
+ pull,
183
+ pullAndAwait,
184
+ refresh,
185
+ registry,
186
+ atom: atomRef
187
+ };
188
+ };
189
+ const optionValue = (arr, options) => {
190
+ if (options?.mode === "optional") {
191
+ const getOption = typeof arr === "function"
192
+ ? arr
193
+ : () => arr.value;
194
+ return [
195
+ {
196
+ get value() {
197
+ return Option.getOrUndefined(getOption());
198
+ }
199
+ },
200
+ computed(() => Option.isSome(getOption()))
201
+ ];
113
202
  }
114
- const useQuery = (self) => {
115
- const q = useQuery_(self);
116
- return (argOrOptions, options) => Effect.isEffect(self.handler)
117
- ? q(undefined, argOrOptions)
118
- : q(argOrOptions, options);
203
+ const req = !arr
204
+ ? ({ value: undefined })
205
+ : typeof arr === "function"
206
+ ? ({
207
+ get value() {
208
+ return arr();
209
+ }
210
+ })
211
+ : ref(arr);
212
+ const enabled = options?.enabled;
213
+ return [req, computed(() => enabled === undefined ? true : !!toValue(enabled))];
214
+ };
215
+ const observedAtom = (atom, options) => withQueryOptions(atom, normalizeQueryOptions(options));
216
+ const observedStreamAtom = (atom, options) => {
217
+ let next = atom;
218
+ const refetchInterval = options?.refreshEvery ?? options?.refetchInterval;
219
+ if (refetchInterval !== undefined)
220
+ next = Atom.withRefresh(refetchInterval)(next);
221
+ const gcTime = options?.idleTTL ?? options?.gcTime;
222
+ if (gcTime === "infinity")
223
+ return Atom.keepAlive(next);
224
+ if (gcTime !== undefined)
225
+ return Atom.setIdleTTL(next, gcTime);
226
+ return next;
227
+ };
228
+ const queryAtomFor = (rt, q, arg, options) => {
229
+ const family = getQueryFamily(rt, q);
230
+ return observedAtom(family(arg), options);
231
+ };
232
+ const makeQueryView = (getAtomRt, q, arg, options) => {
233
+ const atomRt = getAtomRt();
234
+ const registry = injectRegistry();
235
+ const [req, enabledRef] = optionValue(arg, options);
236
+ const family = getQueryFamily(atomRt, q);
237
+ const atomRef = computed(() => enabledRef.value ? observedAtom(family(req.value), options) : disabledQueryAtom);
238
+ const rawResult = useAtomValue(() => atomRef.value);
239
+ const select = options?.select;
240
+ const result = (select
241
+ ? computed(() => AsyncResult.map(rawResult.value, select))
242
+ : rawResult);
243
+ const refresh = () => registry.refresh(atomRef.value);
244
+ const awaitResult = () => select
245
+ ? awaitAtomResult(registry, atomRef.value).pipe(Effect.map(select))
246
+ : awaitAtomResult(registry, atomRef.value);
247
+ const refetch = () => Effect.gen(function* () {
248
+ yield* refreshAtomWithCurrentSpan(registry, atomRef.value);
249
+ return yield* awaitResult();
250
+ });
251
+ const staleMs = staleTimeMsOf(normalizeQueryOptions(options));
252
+ onMounted(() => {
253
+ if (!enabledRef.value)
254
+ return;
255
+ if (isStaleResult(registry.get(atomRef.value), staleMs))
256
+ refresh();
257
+ });
258
+ const data = computed(() => Option.getOrUndefined(AsyncResult.value(result.value)));
259
+ return {
260
+ result,
261
+ data,
262
+ awaitResult,
263
+ refetch,
264
+ refresh,
265
+ registry,
266
+ atom: atomRef
267
+ };
268
+ };
269
+ export const makeQueryFamily = (_getRuntime, getAtomRt) => {
270
+ const useQueryFamily = (q) => getQueryFamily(getAtomRt(), q);
271
+ return useQueryFamily;
272
+ };
273
+ export const makeQueryAtom = (_getRuntime, getAtomRt) => {
274
+ const useQueryAtom = (q) => (arg, options) => queryAtomFor(getAtomRt(), q, arg, options);
275
+ return useQueryAtom;
276
+ };
277
+ export const makeQueryNew = (_getRuntime, getAtomRt) => {
278
+ const useQueryNew = (q) => (arg, options) => makeQueryView(getAtomRt, q, arg, options);
279
+ return useQueryNew;
280
+ };
281
+ export const makeQuery = (_getRuntime, getAtomRt) => {
282
+ const useQuery_ = (q) => (arg, options) => {
283
+ const view = makeQueryView(getAtomRt, q, arg, options);
284
+ // 4th element is internal-only; the public `.suspense()` Promise boundary lives in makeClient.
285
+ const handle = {
286
+ awaitResult: view.awaitResult,
287
+ refetch: view.refetch,
288
+ refresh: view.refresh,
289
+ registry: view.registry,
290
+ atom: view.atom
291
+ };
292
+ return [
293
+ view.result,
294
+ view.data,
295
+ (_options) => view.refetch(),
296
+ handle
297
+ ];
119
298
  };
299
+ const useQuery = ((self) => {
300
+ const q = useQuery_(self);
301
+ return (arg, options) => q(arg, options);
302
+ });
120
303
  return useQuery;
121
304
  };
305
+ const streamQueryAtomFor = (rt, q, arg, options) => {
306
+ const family = getStreamQueryFamily(rt, q);
307
+ return observedStreamAtom(family(arg), options);
308
+ };
309
+ export const makeStreamQueryFamily = (_getRuntime, getAtomRt) => {
310
+ const useStreamQueryFamily = (q) => getStreamQueryFamily(getAtomRt(), q);
311
+ return useStreamQueryFamily;
312
+ };
313
+ export const makeStreamQueryAtom = (_getRuntime, getAtomRt) => {
314
+ const useStreamQueryAtom = (q) => (arg, options) => streamQueryAtomFor(getAtomRt(), q, arg, options);
315
+ return useStreamQueryAtom;
316
+ };
317
+ export const makeStreamQueryNew = (_getRuntime, getAtomRt) => {
318
+ const useStreamQueryNew = (q) => (arg, options) => useAtomStreamQuery(() => streamQueryAtomFor(getAtomRt(), q, toValue(arg), options));
319
+ return useStreamQueryNew;
320
+ };
321
+ export const makeStreamQuery = (getRuntime, getAtomRt) => {
322
+ const query = makeQuery(getRuntime, getAtomRt);
323
+ // A stream query is an ordinary atom query over an effect that collects the whole stream
324
+ // into an array (`Stream.runCollect`). It reuses all the atom machinery (family cache, swr,
325
+ // invalidation, structural sharing). Note: unlike the old tanstack `streamedQuery`, the result
326
+ // appears once the stream completes, not incrementally (stream queries are not used today).
327
+ const streamQuery_ = (q) => {
328
+ const hook = query({
329
+ id: q.id,
330
+ options: q.options,
331
+ handler: (i) => Stream.runCollect(q.handler(i)).pipe(Effect.map((chunk) => [...chunk]))
332
+ });
333
+ return (arg) => hook(arg);
334
+ };
335
+ return streamQuery_;
336
+ };
122
337
  function orPrevious(result) {
123
338
  return AsyncResult.isFailure(result) && Option.isSome(result.previousSuccess)
124
339
  ? AsyncResult.success(result.previousSuccess.value, { waiting: result.waiting })
@@ -148,20 +363,8 @@ export function composeQueries(results, renderPreviousOnFailure) {
148
363
  return AsyncResult.success(r, { waiting: isRefreshing });
149
364
  }
150
365
  export const useUpdateQuery = () => {
151
- const queryClient = useQueryClient();
152
- const f = (query, updateOrInput, updaterMaybe) => {
153
- const updater = updaterMaybe !== undefined ? updaterMaybe : updateOrInput;
154
- const key = updaterMaybe !== undefined
155
- ? [...makeQueryKey(query), updateOrInput]
156
- : makeQueryKey(query);
157
- const data = queryClient.getQueryData(key);
158
- if (data) {
159
- queryClient.setQueryData(key, updater);
160
- }
161
- else {
162
- console.warn(`Query data for key ${key} not found`, key);
163
- }
164
- };
366
+ const registry = injectRegistry();
367
+ const f = (query, input, updater) => activeQueryCacheUpdater.update(registry, query, input, updater);
165
368
  return f;
166
369
  };
167
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
370
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,sDAAsD;AACtD,wDAAwD;AACxD,4DAA4D;AAC5D,+DAA+D;AAC/D,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,YAAY,EAAY,MAAM,mBAAmB,CAAA;AAI1D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,WAAW,MAAM,wCAAwC,CAAA;AACrE,OAAO,KAAK,IAAI,MAAM,iCAAiC,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAoB,WAAW,EAAyB,eAAe,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,EAAE,OAAO,EAAoB,MAAM,KAAK,CAAA;AAChK,OAAO,EAAiD,eAAe,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,aAAa,EAAE,0BAA0B,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AACxO,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAuB7C,MAAM,sBAAsB,GAAG,CAAI,KAAc,EAAE,EAAE;IACnD,MAAM,KAAK,GAAG,WAAW,EAAE,CAAA;IAC3B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;IACxC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC9B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAA;IACjF,CAAC;IAED,MAAM,SAAS,GAAG,GAAG,CAAC,IAAI,CAAC,CAAA;IAC3B,IAAI,OAAO,GAAG,KAAK,CAAA;IACnB,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,IAAI,OAAO;YAAE,OAAM;QACnB,OAAO,GAAG,IAAI,CAAA;QACd,SAAS,CAAC,KAAK,GAAG,KAAK,CAAA;QACvB,UAAU,CAAC,KAAK,EAAE,CAAA;QAClB,KAAK,CAAC,IAAI,EAAE,CAAA;IACd,CAAC,CAAA;IACD,eAAe,CAAC,IAAI,CAAC,CAAA;IACrB,cAAc,CAAC,IAAI,CAAC,CAAA;IAEpB,OAAO,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,MAAM,CAAU,CAAA;AACvD,CAAC,CAAA;AA8CD,MAAM,mBAAmB,GAAG,CAC1B,CAAyG,EACzG,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,sBAAsB,IAAI,EAAE,EAAE,CAAA;AAErE,8FAA8F;AAC9F,+FAA+F;AAC/F,6FAA6F;AAC7F,uFAAuF;AACvF,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAe,CAAA;AAC/C,MAAM,cAAc,GAAG,CACrB,EAAqB,EACrB,CAAiC,EACP,EAAE;IAC5B,MAAM,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACjC,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,CAAC,GAAG,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QAC3B,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IAC9B,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA;AAED,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAe,CAAA;AACrD,MAAM,oBAAoB,GAAG,CAC3B,EAAqB,EACrB,CAAuC,EACP,EAAE;IAClC,MAAM,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,IAAI,CAAC,GAAG,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACvC,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,CAAC,GAAG,sBAAsB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;QACjC,sBAAsB,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACpC,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA;AAED,MAAM,yBAAyB,GAAG,CAAC,aAAsB,EAAqB,EAAE,CAAC,CAAC;IAChF,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,aAAa,EAAE,CAAC;gBAClB,OAAO,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,EAAE,2CAA2C,CAAC,CAAA;YAC5E,CAAC;YACD,OAAM;QACR,CAAC;QACD,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACjC,CAAC;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,6BAA6B,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAA;AAE7E,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,KAAwB,EAAE,MAAyB,EAAqB,EAAE,CAAC,CAAC;IACpH,MAAM,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;QAC1C,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QAC7C,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAChD,CAAC;CACF,CAAC,CAAA;AAEF,IAAI,uBAAuB,GAAG,qBAAqB,CAAA;AAEnD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAA0B,EAAE,EAAE;IACjE,uBAAuB,GAAG,OAAO,CAAA;AACnC,CAAC,CAAA;AAqFD,MAAM,qBAAqB,GAAG,CAAC,OAS9B,EAAoB,EAAE;IACrB,MAAM,GAAG,GAML,EAAE,CAAA;IACN,IAAI,OAAO,EAAE,SAAS,KAAK,SAAS;QAAE,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;IACvE,MAAM,MAAM,GAAG,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,CAAA;IAClD,IAAI,MAAM,KAAK,SAAS;QAAE,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;IAC7C,MAAM,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,IAAI,OAAO,EAAE,oBAAoB,CAAA;IACrF,IAAI,iBAAiB,KAAK,SAAS;QAAE,GAAG,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;IAC9E,IAAI,OAAO,EAAE,iBAAiB,KAAK,SAAS;QAAE,GAAG,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAA;IAC/F,MAAM,eAAe,GAAG,OAAO,EAAE,YAAY,IAAI,OAAO,EAAE,eAAe,CAAA;IACzE,IAAI,eAAe,KAAK,SAAS;QAAE,GAAG,CAAC,eAAe,GAAG,eAAe,CAAA;IACxE,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,IAAoD,EACnC,EAAE;IACnB,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC9B,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAClE,MAAM,OAAO,GAAG,GAAG,EAAE,CACnB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,CAAC,CAAC,0BAA0B,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,OAAO,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;IACJ,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAEnF,OAAO;QACL,MAAM;QACN,IAAI;QACJ,WAAW;QACX,OAAO;QACP,OAAO;QACP,QAAQ;QACR,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,IAAoD,EAClB,EAAE;IACpC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,sBAAsB,CAAC,GAAG,EAAE;QACtE,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAA;QAC/B,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;QAClE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAA;IACvB,CAAC,CAAC,CAAA;IAEF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACxD,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAA;QAChC,CAAC;QACD,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QAC1C,CAAC;QAED,MAAM,KAAK,GAAG,CAAC,QAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAA;QAC3D,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;QACD,OAAO,MAAM,CAAC,MAAM,CAClB;YACE,IAAI,CAAC,MAAM;YACX,IAAI;YACJ,KAAK;YACL,MAAM;SACE,EACV;YACE,GAAG,IAAI;YACP,IAAI;SACL,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;AAC3C,CAAC,CAAA;AAoBD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,IAAsD,EAC/B,EAAE;IACzB,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;IACjC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;IAC9B,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACpD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IAC/C,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAA;IACtD,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAClE,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,EAAE,CAAA;QACN,OAAO,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;IACJ,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC1B,MAAM,CAAC,SAAS,CACd,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAC3D,GAAG,EAAE,CAAC,EAAE,CACT,CACF,CAAA;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CACzB,MAAM,CAAC,SAAS,CACd,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAC1D,GAAG,EAAE,CAAC,KAAK,CACZ,CACF,CAAA;IAED,OAAO;QACL,MAAM;QACN,KAAK;QACL,MAAM;QACN,IAAI;QACJ,WAAW;QACX,IAAI;QACJ,YAAY;QACZ,OAAO;QACP,QAAQ;QACR,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAClB,GAAmE,EACnE,OAAkG,EAC1C,EAAE;IAC1D,IAAI,OAAO,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;QACjC,MAAM,SAAS,GAA2B,OAAO,GAAG,KAAK,UAAU;YACjE,CAAC,CAAC,GAA6B;YAC/B,CAAC,CAAC,GAAG,EAAE,CAAE,GAAmC,CAAC,KAAK,CAAA;QACpD,OAAO;YACL;gBACE,IAAI,KAAK;oBACP,OAAO,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,CAAM,CAAA;gBAChD,CAAC;aACF;YACD,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;SAClC,CAAA;IACZ,CAAC;IACD,MAAM,GAAG,GAAG,CAAC,GAAG;QACd,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAc,EAAE,CAAC;QAC7B,CAAC,CAAC,OAAO,GAAG,KAAK,UAAU;YAC3B,CAAC,CAAC,CAAC;gBACD,IAAI,KAAK;oBACP,OAAQ,GAAW,EAAE,CAAA;gBACvB,CAAC;aACF,CAAC;YACF,CAAC,CAAE,GAAG,CAAC,GAAG,CAAS,CAAA;IACrB,MAAM,OAAO,GAAG,OAAO,EAAE,OAAO,CAAA;IAChC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAU,CAAA;AAC1F,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,IAA8C,EAC9C,OASC,EACyC,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAA;AAErG,MAAM,kBAAkB,GAAG,CACzB,IAAgD,EAChD,OAAgC,EACY,EAAE;IAC9C,IAAI,IAAI,GAAG,IAAI,CAAA;IACf,MAAM,eAAe,GAAG,OAAO,EAAE,YAAY,IAAI,OAAO,EAAE,eAAe,CAAA;IACzE,IAAI,eAAe,KAAK,SAAS;QAAE,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAA;IACjF,MAAM,MAAM,GAAG,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,CAAA;IAClD,IAAI,MAAM,KAAK,UAAU;QAAE,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IACtD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IAC9D,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACnB,EAAqB,EACrB,CAAiC,EACjC,GAAM,EACN,OAA4G,EAClE,EAAE;IAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IACpC,OAAO,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;AAC3C,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CACpB,SAAkC,EAClC,CAAiC,EACjC,GAAmE,EACnE,OAEC,EACoB,EAAE;IACvB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;IACjC,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,GAAG,WAAW,CAAI,GAAG,EAAE,OAAO,CAAC,CAAA;IACtD,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC,CAAA;IACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAA;IAC/G,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAA+C,CAAA;IACjG,MAAM,MAAM,GAAG,OAAO,EAAE,MAAM,CAAA;IAC9B,MAAM,MAAM,GAAG,CAAC,MAAM;QACpB,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1D,CAAC,CAAC,SAAS,CAAmD,CAAA;IAChE,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACrD,MAAM,WAAW,GAAG,GAAG,EAAE,CACvB,MAAM;QACJ,CAAC,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,GAAG,EAAE,CACnB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,KAAK,CAAC,CAAC,0BAA0B,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;QAC1D,OAAO,KAAK,CAAC,CAAC,WAAW,EAAE,CAAA;IAC7B,CAAC,CAAC,CAAA;IACJ,MAAM,OAAO,GAAG,aAAa,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAA;IAC7D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,UAAU,CAAC,KAAK;YAAE,OAAM;QAC7B,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;YAAE,OAAO,EAAE,CAAA;IACpE,CAAC,CAAC,CAAA;IACF,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAEnF,OAAO;QACL,MAAM;QACN,IAAI;QACJ,WAAW;QACX,OAAO;QACP,OAAO;QACP,QAAQ;QACR,IAAI,EAAE,OAAO;KACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAI,WAAqC,EAAE,SAAkC,EAAE,EAAE;IAC9G,MAAM,cAAc,GAIhB,CACF,CAAqD,EACrD,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAA;IAEnC,OAAO,cAAc,CAAA;AACvB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAI,WAAqC,EAAE,SAAkC,EAAE,EAAE;IAC5G,MAAM,YAAY,GASd,CACF,CAAqD,EACrD,EAAE,CACJ,CACE,GAAM,EACN,OAAuD,EACvD,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAE/C,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAAI,WAAqC,EAAE,SAAkC,EAAE,EAAE;IAC3G,MAAM,WAAW,GAcb,CACF,CAAqD,EACrD,EAAE,CACJ,CACE,GAAmE,EACnE,OAAwE,EACxE,EAAE,CAAC,aAAa,CAAiB,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAE9D,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,WAAqC,EAAE,SAAkC,EAAE,EAAE;IACxG,MAAM,SAAS,GA4CX,CACF,CAAqD,EACrD,EAAE,CACJ,CACE,GAAmE,EACnE,OAAa,EACb,EAAE;QACF,MAAM,IAAI,GAAG,aAAa,CAAiB,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;QAEtE,+FAA+F;QAC/F,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;QAED,OAAO;YACL,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,IAAI;YACT,CAAC,QAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE;YAC7C,MAAM;SACA,CAAA;IACV,CAAC,CAAA;IAED,MAAM,QAAQ,GA8CV,CAAC,CACH,IAAS,EACT,EAAE;QACF,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QACzB,OAAO,CAAC,GAAS,EAAE,OAAa,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACtD,CAAC,CAAQ,CAAA;IACT,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAKD,MAAM,kBAAkB,GAAG,CACzB,EAAqB,EACrB,CAAuC,EACvC,GAAM,EACN,OAAgC,EACY,EAAE;IAC9C,MAAM,MAAM,GAAG,oBAAoB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;IAC1C,OAAO,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAA;AACjD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAI,WAAqC,EAAE,SAAkC,EAAE,EAAE;IACpH,MAAM,oBAAoB,GAItB,CACF,CAA2D,EAC3D,EAAE,CAAC,oBAAoB,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAA;IAEzC,OAAO,oBAAoB,CAAA;AAC7B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAI,WAAqC,EAAE,SAAkC,EAAE,EAAE;IAClH,MAAM,kBAAkB,GAIpB,CACF,CAA2D,EAC3D,EAAE,CACJ,CAAC,GAAM,EAAE,OAAgC,EAAE,EAAE,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAA;IAE9F,OAAO,kBAAkB,CAAA;AAC3B,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAI,WAAqC,EAAE,SAAkC,EAAE,EAAE;IACjH,MAAM,iBAAiB,GAInB,CACF,CAA2D,EAC3D,EAAE,CACJ,CAAC,GAAwB,EAAE,OAAgC,EAAE,EAAE,CAC7D,kBAAkB,CAAC,GAAG,EAAE,CAAC,kBAAkB,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;IAErF,OAAO,iBAAiB,CAAA;AAC1B,CAAC,CAAA;AASD,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,UAAoC,EACpC,SAAkC,EAClC,EAAE;IACF,MAAM,KAAK,GAAG,SAAS,CAAC,UAAU,EAAE,SAAS,CAAC,CAAA;IAC9C,yFAAyF;IACzF,4FAA4F;IAC5F,+FAA+F;IAC/F,4FAA4F;IAC5F,MAAM,YAAY,GAId,CAAC,CAAM,EAAE,EAAE;QACb,MAAM,IAAI,GAAG,KAAK,CAAC;YACjB,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,OAAO,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;SACtF,CAAC,CAAA;QACT,OAAO,CAAC,GAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAQ,CAAA;IACxC,CAAC,CAAA;IAED,OAAO,YAAY,CAAA;AACrB,CAAC,CAAA;AAKD,SAAS,UAAU,CAAO,MAAqC;IAC7D,OAAO,WAAW,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;QAC3E,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;QAChF,CAAC,CAAC,MAAM,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,cAAc,CAG5B,OAAU,EACV,uBAAiC;IAWjC,MAAM,MAAM,GAAG,uBAAuB;QACpC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC;QACxC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;IAChD,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,KAAK,CAAA;IACd,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACrG,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC,KAAK,CAAA;IACtB,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;IACtH,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,OAAO,CAAC,KAAK,CAAA;IACtB,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAElD,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9D,IAAI,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,CAAA;QAC1C,OAAO,IAAI,CAAA;IACb,CAAC,EAAE,EAAS,CAAC,CAAA;IACb,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAA;AAC1D,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAA;IAEjC,MAAM,CAAC,GAMH,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,uBAAuB,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IAC9F,OAAO,CAAC,CAAA;AACV,CAAC,CAAA"}
@@ -1,12 +1,12 @@
1
- import { Option, S } from "effect-app";
2
- import type { Schema } from "effect-app/Schema";
1
+ import * as Option from "effect-app/Option";
2
+ import * as S from "effect-app/Schema";
3
3
  import type { ParsedQuery } from "query-string";
4
4
  export declare function getQueryParam(search: ParsedQuery, param: string): string | null | undefined;
5
5
  export declare const getQueryParamO: (search: ParsedQuery, param: string) => Option.Option<string>;
6
6
  export declare function parseRouteParamsOption<NER extends Record<string, S.Codec<any, any>>>(query: Record<string, any>, t: NER): {
7
- [K in keyof NER]: Option.Option<Schema.Type<NER[K]>>;
7
+ [K in keyof NER]: Option.Option<NER[K]["Type"]>;
8
8
  };
9
9
  export declare function parseRouteParams<NER extends Record<string, S.Codec<any, any>>>(query: Record<string, any>, t: NER): {
10
- [K in keyof NER]: Schema.Type<NER[K]>;
10
+ [K in keyof NER]: NER[K]["Type"];
11
11
  };
12
12
  //# sourceMappingURL=routeParams.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"routeParams.d.ts","sourceRoot":"","sources":["../src/routeParams.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,6BAM/D;AAED,eAAO,MAAM,cAAc,+DAA4C,CAAA;AAEvE,wBAAgB,sBAAsB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,GACrH;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CACrD,CAcA;AAED,wBAAgB,gBAAgB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAC5E,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACtC,CAcA"}
1
+ {"version":3,"file":"routeParams.d.ts","sourceRoot":"","sources":["../src/routeParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,CAAC,MAAM,mBAAmB,CAAA;AAGtC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,6BAM/D;AAED,eAAO,MAAM,cAAc,+DAA4C,CAAA;AAEvE,wBAAgB,sBAAsB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,GACrH;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;CAChD,CAcA;AAED,wBAAgB,gBAAgB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAC5E,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;CACjC,CAcA"}
@@ -1,6 +1,7 @@
1
- import { flow } from "effect";
2
- import { Option, S } from "effect-app";
1
+ import * as Option from "effect-app/Option";
2
+ import * as S from "effect-app/Schema";
3
3
  import { typedKeysOf } from "effect-app/utils";
4
+ import { flow } from "effect/Function";
4
5
  export function getQueryParam(search, param) {
5
6
  const v = search[param];
6
7
  if (Array.isArray(v)) {
@@ -25,4 +26,4 @@ export function parseRouteParams(query, t // enforce non empty
25
26
  return prev;
26
27
  }, {});
27
28
  }
28
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVQYXJhbXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcm91dGVQYXJhbXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUM3QixPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV0QyxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFHOUMsTUFBTSxVQUFVLGFBQWEsQ0FBQyxNQUFtQixFQUFFLEtBQWE7SUFDOUQsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ3ZCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2IsQ0FBQztJQUNELE9BQU8sQ0FBQyxJQUFJLElBQUksQ0FBQTtBQUNsQixDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRXZFLE1BQU0sVUFBVSxzQkFBc0IsQ0FBZ0QsS0FBMEIsRUFBRSxDQUFNLENBQUMsb0JBQW9COztJQUkzSSxPQUFPLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQzFCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osb0VBQW9FO1FBQ3BFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxjQUFjLENBQUMsS0FBSyxFQUFFLEdBQWEsQ0FBQyxDQUFDLElBQUksQ0FDbkQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBRSxDQUFDLENBQUMsQ0FDL0MsQ0FBQTtRQUVELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBRUMsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FDOUIsS0FBMEIsRUFDMUIsQ0FBTSxDQUFDLG9CQUFvQjs7SUFJM0IsT0FBTyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUMxQixDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNaLG9FQUFvRTtRQUNwRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUUsQ0FBQyxDQUNyQyxLQUFhLENBQUMsR0FBRyxDQUFDLENBQ3BCLENBQUE7UUFFRCxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUMsRUFDRCxFQUVDLENBQ0YsQ0FBQTtBQUNILENBQUMifQ==
29
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVQYXJhbXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcm91dGVQYXJhbXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEtBQUssQ0FBQyxNQUFNLG1CQUFtQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUM5QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFHdEMsTUFBTSxVQUFVLGFBQWEsQ0FBQyxNQUFtQixFQUFFLEtBQWE7SUFDOUQsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ3ZCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2IsQ0FBQztJQUNELE9BQU8sQ0FBQyxJQUFJLElBQUksQ0FBQTtBQUNsQixDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRXZFLE1BQU0sVUFBVSxzQkFBc0IsQ0FBZ0QsS0FBMEIsRUFBRSxDQUFNLENBQUMsb0JBQW9COztJQUkzSSxPQUFPLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQzFCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osb0VBQW9FO1FBQ3BFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxjQUFjLENBQUMsS0FBSyxFQUFFLEdBQWEsQ0FBQyxDQUFDLElBQUksQ0FDbkQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBRSxDQUFDLENBQUMsQ0FDL0MsQ0FBQTtRQUVELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBRUMsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FDOUIsS0FBMEIsRUFDMUIsQ0FBTSxDQUFDLG9CQUFvQjs7SUFJM0IsT0FBTyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUMxQixDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNaLG9FQUFvRTtRQUNwRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUUsQ0FBQyxDQUNyQyxLQUFhLENBQUMsR0FBRyxDQUFDLENBQ3BCLENBQUE7UUFFRCxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUMsRUFDRCxFQUVDLENBQ0YsQ0FBQTtBQUNILENBQUMifQ==
package/dist/runtime.d.ts CHANGED
@@ -1,15 +1,2 @@
1
- import { ManagedRuntime } from "effect";
2
- import { Effect, Layer } from "effect-app";
3
- export declare function makeAppRuntime<A, E>(layer: Layer.Layer<A, E>): Effect.Effect<ManagedRuntime.ManagedRuntime<A, never> & {
4
- [Symbol.dispose](): void;
5
- [Symbol.asyncDispose](): Promise<void>;
6
- }, never, never>;
7
- export declare function initializeSync<A, E>(layer: Layer.Layer<A, E, never>): ManagedRuntime.ManagedRuntime<A, never> & {
8
- [Symbol.dispose](): void;
9
- [Symbol.asyncDispose](): Promise<void>;
10
- };
11
- export declare function initializeAsync<A, E>(layer: Layer.Layer<A, E, never>): Promise<ManagedRuntime.ManagedRuntime<A, never> & {
12
- [Symbol.dispose](): void;
13
- [Symbol.asyncDispose](): Promise<void>;
14
- }>;
1
+ export * from "effect-app/runtime";
15
2
  //# sourceMappingURL=runtime.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAElD,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;;;iBAiB5D;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;;;EAGnE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;;;GAGpE"}
1
+ {"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA"}