@effect-app/vue 4.0.0-beta.30 → 4.0.0-beta.301
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.
- package/CHANGELOG.md +2234 -0
- package/dist/atomQuery.d.ts +111 -0
- package/dist/atomQuery.d.ts.map +1 -0
- package/dist/atomQuery.js +386 -0
- package/dist/commander.d.ts +634 -0
- package/dist/commander.d.ts.map +1 -0
- package/dist/commander.js +1070 -0
- package/dist/{experimental/confirm.d.ts → confirm.d.ts} +6 -4
- package/dist/confirm.d.ts.map +1 -0
- package/dist/confirm.js +26 -0
- package/dist/dependencyMetadata.d.ts +10 -0
- package/dist/dependencyMetadata.d.ts.map +1 -0
- package/dist/dependencyMetadata.js +29 -0
- package/dist/errorReporter.d.ts +6 -4
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +14 -19
- package/dist/form.d.ts +14 -5
- package/dist/form.d.ts.map +1 -1
- package/dist/form.js +46 -13
- package/dist/internal/tanstackQuery.d.ts +9 -0
- package/dist/internal/tanstackQuery.d.ts.map +1 -0
- package/dist/internal/tanstackQuery.js +194 -0
- package/dist/intl.d.ts +15 -0
- package/dist/intl.d.ts.map +1 -0
- package/dist/intl.js +9 -0
- package/dist/lib.d.ts +7 -9
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +35 -10
- package/dist/makeClient.d.ts +236 -336
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +416 -408
- package/dist/makeContext.d.ts.map +1 -1
- package/dist/makeIntl.d.ts.map +1 -1
- package/dist/{experimental/makeUseCommand.d.ts → makeUseCommand.d.ts} +4 -3
- package/dist/makeUseCommand.d.ts.map +1 -0
- package/dist/makeUseCommand.js +13 -0
- package/dist/mutate.d.ts +108 -40
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +211 -58
- package/dist/query.d.ts +150 -46
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +370 -122
- package/dist/routeParams.d.ts +4 -4
- package/dist/routeParams.d.ts.map +1 -1
- package/dist/routeParams.js +4 -3
- package/dist/runtime.d.ts +1 -14
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +2 -26
- package/dist/suspense.d.ts +19 -0
- package/dist/suspense.d.ts.map +1 -0
- package/dist/suspense.js +38 -0
- package/dist/toast.d.ts +2 -0
- package/dist/toast.d.ts.map +1 -0
- package/dist/toast.js +2 -0
- package/dist/withToast.d.ts +2 -0
- package/dist/withToast.d.ts.map +1 -0
- package/dist/withToast.js +2 -0
- package/docs/atom-query-api-redesign.md +207 -0
- package/docs/query-key-invalidation.md +106 -0
- package/examples/streamMutation.ts +72 -0
- package/package.json +36 -95
- package/src/atomQuery.ts +540 -0
- package/src/commander.ts +3413 -0
- package/src/{experimental/confirm.ts → confirm.ts} +13 -15
- package/src/dependencyMetadata.ts +38 -0
- package/src/errorReporter.ts +65 -75
- package/src/form.ts +61 -18
- package/src/index.ts +7 -7
- package/src/internal/tanstackQuery.ts +289 -0
- package/src/intl.ts +12 -0
- package/src/lib.ts +49 -21
- package/src/makeClient.ts +967 -1159
- package/src/makeIntl.ts +2 -2
- package/src/{experimental/makeUseCommand.ts → makeUseCommand.ts} +9 -6
- package/src/mutate.ts +370 -152
- package/src/query.ts +742 -260
- package/src/routeParams.ts +7 -7
- package/src/runtime.ts +1 -31
- package/src/suspense.ts +43 -0
- package/src/toast.ts +1 -0
- package/src/withToast.ts +1 -0
- package/test/Mutation.test.ts +181 -24
- package/test/dependencyInvalidation.test.ts +373 -0
- package/test/dist/dependencyInvalidation.test.d.ts.map +1 -0
- package/test/dist/form.test.d.ts.map +1 -1
- package/test/dist/interrupt-refetch-repro.test.d.ts.map +1 -0
- package/test/dist/lib.test.d.ts.map +1 -0
- package/test/dist/query-span.test.d.ts.map +1 -0
- package/test/dist/queryOptions.test.d.ts.map +1 -0
- package/test/dist/streamFinal.test.d.ts.map +1 -0
- package/test/dist/streamFn.test.d.ts.map +1 -0
- package/test/dist/stubs.d.ts +3756 -122
- package/test/dist/stubs.d.ts.map +1 -1
- package/test/dist/stubs.js +192 -32
- package/test/dist/suspense-regression.test.d.ts.map +1 -0
- package/test/dist/suspense.test.d.ts.map +1 -0
- package/test/form-validation-errors.test.ts +25 -20
- package/test/form.test.ts +22 -3
- package/test/interrupt-refetch-repro.test.ts +623 -0
- package/test/lib.test.ts +240 -0
- package/test/makeClient.test.ts +437 -38
- package/test/query-span.test.ts +92 -0
- package/test/queryOptions.test.ts +88 -0
- package/test/streamFinal.test.ts +64 -0
- package/test/streamFn.test.ts +457 -0
- package/test/stubs.ts +228 -43
- package/test/suspense-regression.test.ts +168 -0
- package/test/suspense.test.ts +160 -0
- package/tsconfig.examples.json +20 -0
- package/tsconfig.json +3 -1
- package/tsconfig.src.json +34 -34
- package/tsconfig.test.json +2 -2
- package/vitest.config.ts +5 -5
- package/dist/experimental/commander.d.ts +0 -359
- package/dist/experimental/commander.d.ts.map +0 -1
- package/dist/experimental/commander.js +0 -557
- package/dist/experimental/confirm.d.ts.map +0 -1
- package/dist/experimental/confirm.js +0 -28
- package/dist/experimental/intl.d.ts +0 -16
- package/dist/experimental/intl.d.ts.map +0 -1
- package/dist/experimental/intl.js +0 -5
- package/dist/experimental/makeUseCommand.d.ts.map +0 -1
- package/dist/experimental/makeUseCommand.js +0 -13
- package/dist/experimental/toast.d.ts +0 -47
- package/dist/experimental/toast.d.ts.map +0 -1
- package/dist/experimental/toast.js +0 -41
- package/dist/experimental/withToast.d.ts +0 -25
- package/dist/experimental/withToast.d.ts.map +0 -1
- package/dist/experimental/withToast.js +0 -45
- package/eslint.config.mjs +0 -24
- package/src/experimental/commander.ts +0 -1835
- package/src/experimental/intl.ts +0 -9
- package/src/experimental/toast.ts +0 -66
- package/src/experimental/withToast.ts +0 -99
- package/tsconfig.json.bak +0 -12
package/dist/query.js
CHANGED
|
@@ -2,123 +2,383 @@
|
|
|
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
|
-
|
|
6
|
-
import {
|
|
7
|
-
import
|
|
8
|
-
import {
|
|
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
|
|
11
|
-
import {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
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
|
-
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
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, updater) => {
|
|
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
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
const atom = family(input);
|
|
74
|
+
const current = registry.get(atom);
|
|
75
|
+
const next = AsyncResult.map(current, updater);
|
|
76
|
+
registry.set(atom, next);
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
export const atomQueryCacheUpdater = makeAtomQueryCacheUpdater(true);
|
|
80
|
+
export const optionalAtomQueryCacheUpdater = makeAtomQueryCacheUpdater(false);
|
|
81
|
+
export const combineQueryCacheUpdaters = (first, second) => ({
|
|
82
|
+
update: (registry, query, input, updater) => {
|
|
83
|
+
first.update(registry, query, input, updater);
|
|
84
|
+
second.update(registry, query, input, updater);
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
let activeQueryCacheUpdater = atomQueryCacheUpdater;
|
|
88
|
+
export const setQueryCacheUpdater = (updater) => {
|
|
89
|
+
activeQueryCacheUpdater = updater;
|
|
90
|
+
};
|
|
91
|
+
/**
|
|
92
|
+
* Layer TanStack `initialData` / `placeholderData` over a raw query result as a DISPLAY fallback.
|
|
93
|
+
* Only while the result is still `Initial` (pending, never settled): show `initialData` as resolved
|
|
94
|
+
* data, or `placeholderData` as provisional (`waiting: true`). Once real data exists the seed is
|
|
95
|
+
* dropped. Failures are never masked — including failures without `previousSuccess` (where
|
|
96
|
+
* `AsyncResult.value` is empty). `placeholderData` in function form receives the last seen concrete
|
|
97
|
+
* value for basic keep-previous across input changes. Returns the raw ref untouched when neither
|
|
98
|
+
* option is set. Neither value is written to the atom cache.
|
|
99
|
+
*/
|
|
100
|
+
export const withDataFallback = (rawResult, options) => {
|
|
101
|
+
const opts = options;
|
|
102
|
+
const initialData = opts?.initialData;
|
|
103
|
+
const placeholderData = opts?.placeholderData;
|
|
104
|
+
if (initialData === undefined && placeholderData === undefined) {
|
|
105
|
+
return rawResult;
|
|
106
|
+
}
|
|
107
|
+
let lastData;
|
|
108
|
+
return computed(() => {
|
|
109
|
+
const r = rawResult.value;
|
|
110
|
+
const concrete = AsyncResult.value(r);
|
|
111
|
+
if (Option.isSome(concrete)) {
|
|
112
|
+
lastData = concrete.value;
|
|
113
|
+
}
|
|
114
|
+
// Fallback is pending-only. Failure (even without previousSuccess) and Success pass through.
|
|
115
|
+
if (!AsyncResult.isInitial(r)) {
|
|
116
|
+
return r;
|
|
117
|
+
}
|
|
118
|
+
if (initialData !== undefined) {
|
|
119
|
+
const v = typeof initialData === "function" ? initialData() : initialData;
|
|
120
|
+
return AsyncResult.success(v, { waiting: r.waiting });
|
|
121
|
+
}
|
|
122
|
+
const v = typeof placeholderData === "function"
|
|
123
|
+
? placeholderData(lastData)
|
|
124
|
+
: placeholderData;
|
|
125
|
+
return v === undefined ? r : AsyncResult.success(v, { waiting: true });
|
|
126
|
+
});
|
|
127
|
+
};
|
|
128
|
+
const normalizeQueryOptions = (options) => {
|
|
129
|
+
const out = {};
|
|
130
|
+
if (options?.staleTime !== undefined)
|
|
131
|
+
out.staleTime = options.staleTime;
|
|
132
|
+
const gcTime = options?.idleTTL ?? options?.gcTime;
|
|
133
|
+
if (gcTime !== undefined)
|
|
134
|
+
out.gcTime = gcTime;
|
|
135
|
+
const revalidateOnFocus = options?.revalidateOnFocus ?? options?.refetchOnWindowFocus;
|
|
136
|
+
if (revalidateOnFocus !== undefined)
|
|
137
|
+
out.revalidateOnFocus = revalidateOnFocus;
|
|
138
|
+
if (options?.structuralSharing !== undefined)
|
|
139
|
+
out.structuralSharing = options.structuralSharing;
|
|
140
|
+
const refetchInterval = options?.refreshEvery ?? options?.refetchInterval;
|
|
141
|
+
if (refetchInterval !== undefined)
|
|
142
|
+
out.refetchInterval = refetchInterval;
|
|
143
|
+
return out;
|
|
144
|
+
};
|
|
145
|
+
export const useAtomQuery = (atom) => {
|
|
146
|
+
const registry = injectRegistry();
|
|
147
|
+
const atomRef = computed(atom);
|
|
148
|
+
const atomResult = useAtomValue(() => atomRef.value);
|
|
149
|
+
const result = computed(() => atomResult.value);
|
|
150
|
+
const refresh = () => registry.refresh(atomRef.value);
|
|
151
|
+
const awaitResult = () => awaitAtomResult(registry, atomRef.value);
|
|
152
|
+
const refetch = () => Effect.gen(function* () {
|
|
153
|
+
yield* refreshAtomWithCurrentSpan(registry, atomRef.value);
|
|
154
|
+
return yield* awaitResult();
|
|
155
|
+
});
|
|
156
|
+
const data = computed(() => Option.getOrUndefined(AsyncResult.value(result.value)));
|
|
157
|
+
return {
|
|
158
|
+
result,
|
|
159
|
+
data,
|
|
160
|
+
awaitResult,
|
|
161
|
+
refetch,
|
|
162
|
+
refresh,
|
|
163
|
+
registry,
|
|
164
|
+
atom: atomRef
|
|
101
165
|
};
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
166
|
+
};
|
|
167
|
+
export const useAtomSuspense = (atom) => {
|
|
168
|
+
const [{ view, data }, isMounted, signal] = useScopedSuspenseSetup(() => {
|
|
169
|
+
const view = useAtomQuery(atom);
|
|
170
|
+
const data = latestDefined(() => view.data.value, "atom suspense");
|
|
171
|
+
return { view, data };
|
|
172
|
+
});
|
|
173
|
+
const eff = Effect.gen(function* () {
|
|
174
|
+
const exit = yield* view.awaitResult().pipe(Effect.exit);
|
|
175
|
+
if (!isMounted.value) {
|
|
176
|
+
return yield* Effect.interrupt;
|
|
108
177
|
}
|
|
109
|
-
if (
|
|
110
|
-
return
|
|
178
|
+
if (Exit.isFailure(exit)) {
|
|
179
|
+
return yield* Exit.failCause(exit.cause);
|
|
111
180
|
}
|
|
112
|
-
|
|
181
|
+
const fetch = (_options) => view.refetch();
|
|
182
|
+
const handle = {
|
|
183
|
+
awaitResult: view.awaitResult,
|
|
184
|
+
refetch: view.refetch,
|
|
185
|
+
refresh: view.refresh,
|
|
186
|
+
registry: view.registry,
|
|
187
|
+
atom: view.atom
|
|
188
|
+
};
|
|
189
|
+
return Object.assign([
|
|
190
|
+
view.result,
|
|
191
|
+
data,
|
|
192
|
+
fetch,
|
|
193
|
+
handle
|
|
194
|
+
], {
|
|
195
|
+
...view,
|
|
196
|
+
data
|
|
197
|
+
});
|
|
198
|
+
});
|
|
199
|
+
return Effect.runPromise(eff, { signal });
|
|
200
|
+
};
|
|
201
|
+
export const useAtomStreamQuery = (atom) => {
|
|
202
|
+
const registry = injectRegistry();
|
|
203
|
+
const atomRef = computed(atom);
|
|
204
|
+
const atomResult = useAtomValue(() => atomRef.value);
|
|
205
|
+
const result = computed(() => atomResult.value);
|
|
206
|
+
const pull = () => registry.set(atomRef.value, void 0);
|
|
207
|
+
const refresh = () => registry.refresh(atomRef.value);
|
|
208
|
+
const awaitResult = () => awaitAtomResult(registry, atomRef.value);
|
|
209
|
+
const pullAndAwait = () => Effect.gen(function* () {
|
|
210
|
+
pull();
|
|
211
|
+
return yield* awaitResult();
|
|
212
|
+
});
|
|
213
|
+
const items = computed(() => Option.getOrElse(Option.map(AsyncResult.value(result.value), (_) => _.items), () => []));
|
|
214
|
+
const latest = computed(() => items.value.at(-1));
|
|
215
|
+
const done = computed(() => Option.getOrElse(Option.map(AsyncResult.value(result.value), (_) => _.done), () => false));
|
|
216
|
+
return {
|
|
217
|
+
result,
|
|
218
|
+
items,
|
|
219
|
+
latest,
|
|
220
|
+
done,
|
|
221
|
+
awaitResult,
|
|
222
|
+
pull,
|
|
223
|
+
pullAndAwait,
|
|
224
|
+
refresh,
|
|
225
|
+
registry,
|
|
226
|
+
atom: atomRef
|
|
227
|
+
};
|
|
228
|
+
};
|
|
229
|
+
const optionValue = (arr, options) => {
|
|
230
|
+
if (options?.mode === "optional") {
|
|
231
|
+
const getOption = typeof arr === "function"
|
|
232
|
+
? arr
|
|
233
|
+
: () => arr.value;
|
|
234
|
+
return [
|
|
235
|
+
{
|
|
236
|
+
get value() {
|
|
237
|
+
return Option.getOrUndefined(getOption());
|
|
238
|
+
}
|
|
239
|
+
},
|
|
240
|
+
computed(() => Option.isSome(getOption()))
|
|
241
|
+
];
|
|
113
242
|
}
|
|
114
|
-
const
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
?
|
|
118
|
-
|
|
243
|
+
const req = !arr
|
|
244
|
+
? ({ value: undefined })
|
|
245
|
+
: typeof arr === "function"
|
|
246
|
+
? ({
|
|
247
|
+
get value() {
|
|
248
|
+
return arr();
|
|
249
|
+
}
|
|
250
|
+
})
|
|
251
|
+
: ref(arr);
|
|
252
|
+
const enabled = options?.enabled;
|
|
253
|
+
return [req, computed(() => enabled === undefined ? true : !!toValue(enabled))];
|
|
254
|
+
};
|
|
255
|
+
const observedAtom = (atom, options) => withQueryOptions(atom, normalizeQueryOptions(options));
|
|
256
|
+
const observedStreamAtom = (atom, options) => {
|
|
257
|
+
let next = atom;
|
|
258
|
+
const refetchInterval = options?.refreshEvery ?? options?.refetchInterval;
|
|
259
|
+
if (refetchInterval !== undefined)
|
|
260
|
+
next = Atom.withRefresh(refetchInterval)(next);
|
|
261
|
+
const gcTime = options?.idleTTL ?? options?.gcTime;
|
|
262
|
+
if (gcTime === "infinity")
|
|
263
|
+
return Atom.keepAlive(next);
|
|
264
|
+
if (gcTime !== undefined)
|
|
265
|
+
return Atom.setIdleTTL(next, gcTime);
|
|
266
|
+
return next;
|
|
267
|
+
};
|
|
268
|
+
const queryAtomFor = (rt, q, arg, options) => {
|
|
269
|
+
const family = getQueryFamily(rt, q);
|
|
270
|
+
return observedAtom(family(arg), options);
|
|
271
|
+
};
|
|
272
|
+
const makeQueryView = (getAtomRt, q, arg, options) => {
|
|
273
|
+
const atomRt = getAtomRt();
|
|
274
|
+
const registry = injectRegistry();
|
|
275
|
+
const [req, enabledRef] = optionValue(arg, options);
|
|
276
|
+
const family = getQueryFamily(atomRt, q);
|
|
277
|
+
const atomRef = computed(() => enabledRef.value ? observedAtom(family(req.value), options) : disabledQueryAtom);
|
|
278
|
+
const rawResult = useAtomValue(() => atomRef.value);
|
|
279
|
+
// `initialData` / `placeholderData` display fallback (old `.query()` API). Applied only while the
|
|
280
|
+
// result is still Initial; Failures/Success pass through unmasked. Neither is written to cache
|
|
281
|
+
// (the base atom stays Initial, so the mount-staleness check still triggers the real fetch). The
|
|
282
|
+
// fallback runs PRE-select, matching TanStack (`initialData`/`placeholderData` are TQueryData).
|
|
283
|
+
const fallbackResult = withDataFallback(rawResult, options);
|
|
284
|
+
const select = options?.select;
|
|
285
|
+
const result = (select
|
|
286
|
+
? computed(() => AsyncResult.map(fallbackResult.value, select))
|
|
287
|
+
: fallbackResult);
|
|
288
|
+
const refresh = () => registry.refresh(atomRef.value);
|
|
289
|
+
const awaitResult = () => select
|
|
290
|
+
? awaitAtomResult(registry, atomRef.value).pipe(Effect.map(select))
|
|
291
|
+
: awaitAtomResult(registry, atomRef.value);
|
|
292
|
+
const refetch = () => Effect.gen(function* () {
|
|
293
|
+
yield* refreshAtomWithCurrentSpan(registry, atomRef.value);
|
|
294
|
+
return yield* awaitResult();
|
|
295
|
+
});
|
|
296
|
+
const staleMs = staleTimeMsOf(normalizeQueryOptions(options));
|
|
297
|
+
onMounted(() => {
|
|
298
|
+
if (!enabledRef.value)
|
|
299
|
+
return;
|
|
300
|
+
if (isStaleResult(registry.get(atomRef.value), staleMs))
|
|
301
|
+
refresh();
|
|
302
|
+
});
|
|
303
|
+
const data = computed(() => Option.getOrUndefined(AsyncResult.value(result.value)));
|
|
304
|
+
return {
|
|
305
|
+
result,
|
|
306
|
+
data,
|
|
307
|
+
awaitResult,
|
|
308
|
+
refetch,
|
|
309
|
+
refresh,
|
|
310
|
+
registry,
|
|
311
|
+
atom: atomRef
|
|
119
312
|
};
|
|
313
|
+
};
|
|
314
|
+
export const makeQueryFamily = (_getRuntime, getAtomRt) => {
|
|
315
|
+
const useQueryFamily = (q) => getQueryFamily(getAtomRt(), q);
|
|
316
|
+
return useQueryFamily;
|
|
317
|
+
};
|
|
318
|
+
export const makeQueryAtom = (_getRuntime, getAtomRt) => {
|
|
319
|
+
const useQueryAtom = (q) => (arg, options) => queryAtomFor(getAtomRt(), q, arg, options);
|
|
320
|
+
return useQueryAtom;
|
|
321
|
+
};
|
|
322
|
+
export const makeQueryNew = (_getRuntime, getAtomRt) => {
|
|
323
|
+
const useQueryNew = (q) => (arg, options) => makeQueryView(getAtomRt, q, arg, options);
|
|
324
|
+
return useQueryNew;
|
|
325
|
+
};
|
|
326
|
+
export const makeQuery = (_getRuntime, getAtomRt) => {
|
|
327
|
+
const useQuery_ = (q) => (arg, options) => {
|
|
328
|
+
const view = makeQueryView(getAtomRt, q, arg, options);
|
|
329
|
+
// 4th element is internal-only; the public `.suspense()` Promise boundary lives in makeClient.
|
|
330
|
+
const handle = {
|
|
331
|
+
awaitResult: view.awaitResult,
|
|
332
|
+
refetch: view.refetch,
|
|
333
|
+
refresh: view.refresh,
|
|
334
|
+
registry: view.registry,
|
|
335
|
+
atom: view.atom
|
|
336
|
+
};
|
|
337
|
+
return [
|
|
338
|
+
view.result,
|
|
339
|
+
view.data,
|
|
340
|
+
(_options) => view.refetch(),
|
|
341
|
+
handle
|
|
342
|
+
];
|
|
343
|
+
};
|
|
344
|
+
const useQuery = ((self) => {
|
|
345
|
+
const q = useQuery_(self);
|
|
346
|
+
return (arg, options) => q(arg, options);
|
|
347
|
+
});
|
|
120
348
|
return useQuery;
|
|
121
349
|
};
|
|
350
|
+
const streamQueryAtomFor = (rt, q, arg, options) => {
|
|
351
|
+
const family = getStreamQueryFamily(rt, q);
|
|
352
|
+
return observedStreamAtom(family(arg), options);
|
|
353
|
+
};
|
|
354
|
+
export const makeStreamQueryFamily = (_getRuntime, getAtomRt) => {
|
|
355
|
+
const useStreamQueryFamily = (q) => getStreamQueryFamily(getAtomRt(), q);
|
|
356
|
+
return useStreamQueryFamily;
|
|
357
|
+
};
|
|
358
|
+
export const makeStreamQueryAtom = (_getRuntime, getAtomRt) => {
|
|
359
|
+
const useStreamQueryAtom = (q) => (arg, options) => streamQueryAtomFor(getAtomRt(), q, arg, options);
|
|
360
|
+
return useStreamQueryAtom;
|
|
361
|
+
};
|
|
362
|
+
export const makeStreamQueryNew = (_getRuntime, getAtomRt) => {
|
|
363
|
+
const useStreamQueryNew = (q) => (arg, options) => useAtomStreamQuery(() => streamQueryAtomFor(getAtomRt(), q, toValue(arg), options));
|
|
364
|
+
return useStreamQueryNew;
|
|
365
|
+
};
|
|
366
|
+
export const makeStreamQuery = (getRuntime, getAtomRt) => {
|
|
367
|
+
const query = makeQuery(getRuntime, getAtomRt);
|
|
368
|
+
// A stream query is an ordinary atom query over an effect that collects the whole stream
|
|
369
|
+
// into an array (`Stream.runCollect`). It reuses all the atom machinery (family cache, swr,
|
|
370
|
+
// invalidation, structural sharing). Note: unlike the old tanstack `streamedQuery`, the result
|
|
371
|
+
// appears once the stream completes, not incrementally (stream queries are not used today).
|
|
372
|
+
const streamQuery_ = (q) => {
|
|
373
|
+
const hook = query({
|
|
374
|
+
id: q.id,
|
|
375
|
+
options: q.options,
|
|
376
|
+
handler: (i) => Stream.runCollect(q.handler(i)).pipe(Effect.map((chunk) => [...chunk]))
|
|
377
|
+
});
|
|
378
|
+
return (arg) => hook(arg);
|
|
379
|
+
};
|
|
380
|
+
return streamQuery_;
|
|
381
|
+
};
|
|
122
382
|
function orPrevious(result) {
|
|
123
383
|
return AsyncResult.isFailure(result) && Option.isSome(result.previousSuccess)
|
|
124
384
|
? AsyncResult.success(result.previousSuccess.value, { waiting: result.waiting })
|
|
@@ -148,20 +408,8 @@ export function composeQueries(results, renderPreviousOnFailure) {
|
|
|
148
408
|
return AsyncResult.success(r, { waiting: isRefreshing });
|
|
149
409
|
}
|
|
150
410
|
export const useUpdateQuery = () => {
|
|
151
|
-
const
|
|
152
|
-
const f = (query,
|
|
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
|
-
};
|
|
411
|
+
const registry = injectRegistry();
|
|
412
|
+
const f = (query, input, updater) => activeQueryCacheUpdater.update(registry, query, input, updater);
|
|
165
413
|
return f;
|
|
166
414
|
};
|
|
167
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
|
415
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
|
package/dist/routeParams.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
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<
|
|
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]:
|
|
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":"
|
|
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"}
|
package/dist/routeParams.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
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,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGVQYXJhbXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcm91dGVQYXJhbXMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLE1BQU0sTUFBTSxtQkFBbUIsQ0FBQTtBQUMzQyxPQUFPLEtBQUssQ0FBQyxNQUFNLG1CQUFtQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUM5QyxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0saUJBQWlCLENBQUE7QUFHdEMsTUFBTSxVQUFVLGFBQWEsQ0FBQyxNQUFtQixFQUFFLEtBQWE7SUFDOUQsTUFBTSxDQUFDLEdBQUcsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQ3ZCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBQ3JCLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQ2IsQ0FBQztJQUNELE9BQU8sQ0FBQyxJQUFJLElBQUksQ0FBQTtBQUNsQixDQUFDO0FBRUQsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLGFBQWEsQ0FBQyxDQUFBO0FBRXZFLE1BQU0sVUFBVSxzQkFBc0IsQ0FBZ0QsS0FBMEIsRUFBRSxDQUFNLENBQUMsb0JBQW9COztJQUkzSSxPQUFPLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQzFCLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ1osb0VBQW9FO1FBQ3BFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxjQUFjLENBQUMsS0FBSyxFQUFFLEdBQWEsQ0FBQyxDQUFDLElBQUksQ0FDbkQsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBRSxDQUFDLENBQUMsQ0FDL0MsQ0FBQTtRQUVELE9BQU8sSUFBSSxDQUFBO0lBQ2IsQ0FBQyxFQUNELEVBRUMsQ0FDRixDQUFBO0FBQ0gsQ0FBQztBQUVELE1BQU0sVUFBVSxnQkFBZ0IsQ0FDOUIsS0FBMEIsRUFDMUIsQ0FBTSxDQUFDLG9CQUFvQjs7SUFJM0IsT0FBTyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUMxQixDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNaLG9FQUFvRTtRQUNwRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLGlCQUFpQixDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUUsQ0FBQyxDQUNyQyxLQUFhLENBQUMsR0FBRyxDQUFDLENBQ3BCLENBQUE7UUFFRCxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUMsRUFDRCxFQUVDLENBQ0YsQ0FBQTtBQUNILENBQUMifQ==
|