@effect-app/vue 4.0.0-beta.99 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +2701 -0
- package/dist/atomQuery.d.ts +120 -0
- package/dist/atomQuery.d.ts.map +1 -0
- package/dist/atomQuery.js +434 -0
- package/dist/commander.d.ts +318 -43
- package/dist/commander.d.ts.map +1 -1
- package/dist/commander.js +593 -81
- package/dist/confirm.d.ts +5 -3
- package/dist/confirm.d.ts.map +1 -1
- package/dist/confirm.js +12 -14
- package/dist/dependencyMetadata.d.ts +18 -0
- package/dist/dependencyMetadata.d.ts.map +1 -0
- package/dist/dependencyMetadata.js +67 -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 +5 -5
- package/dist/form.d.ts.map +1 -1
- package/dist/form.js +16 -10
- package/dist/internal/tanstackQuery.d.ts +9 -0
- package/dist/internal/tanstackQuery.d.ts.map +1 -0
- package/dist/internal/tanstackQuery.js +204 -0
- package/dist/intl.d.ts +4 -4
- package/dist/intl.d.ts.map +1 -1
- package/dist/intl.js +2 -2
- package/dist/lib.d.ts +8 -10
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +37 -12
- package/dist/liveQueryInvalidation.d.ts +16 -0
- package/dist/liveQueryInvalidation.d.ts.map +1 -0
- package/dist/liveQueryInvalidation.js +115 -0
- package/dist/makeClient.d.ts +232 -109
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +416 -84
- package/dist/makeContext.d.ts.map +1 -1
- package/dist/makeIntl.d.ts.map +1 -1
- package/dist/makeUseCommand.d.ts +3 -2
- package/dist/makeUseCommand.d.ts.map +1 -1
- package/dist/makeUseCommand.js +2 -2
- package/dist/mutate.d.ts +110 -41
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +236 -59
- package/dist/query.d.ts +161 -44
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +382 -113
- package/dist/queryLifetime.d.ts +25 -0
- package/dist/queryLifetime.d.ts.map +1 -0
- package/dist/queryLifetime.js +54 -0
- 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 -17
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +2 -38
- 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 +1 -45
- package/dist/toast.d.ts.map +1 -1
- package/dist/toast.js +2 -32
- package/dist/withToast.d.ts +1 -24
- package/dist/withToast.d.ts.map +1 -1
- package/dist/withToast.js +2 -45
- package/docs/atom-query-api-redesign.md +207 -0
- package/docs/mutation-command-atoms.md +40 -0
- package/docs/query-key-invalidation.md +107 -0
- package/examples/streamMutation.ts +72 -0
- package/package.json +35 -94
- package/src/atomQuery.ts +600 -0
- package/src/commander.ts +1064 -116
- package/src/confirm.ts +12 -14
- package/src/dependencyMetadata.ts +84 -0
- package/src/errorReporter.ts +65 -75
- package/src/form.ts +22 -15
- package/src/index.ts +7 -7
- package/src/internal/tanstackQuery.ts +308 -0
- package/src/intl.ts +2 -2
- package/src/lib.ts +51 -23
- package/src/liveQueryInvalidation.ts +138 -0
- package/src/makeClient.ts +972 -263
- package/src/makeIntl.ts +2 -2
- package/src/makeUseCommand.ts +8 -5
- package/src/mutate.ts +407 -154
- package/src/query.ts +758 -242
- package/src/queryLifetime.ts +74 -0
- package/src/routeParams.ts +7 -7
- package/src/runtime.ts +1 -54
- package/src/suspense.ts +43 -0
- package/src/toast.ts +1 -52
- package/src/withToast.ts +1 -99
- package/test/Mutation.test.ts +104 -17
- package/test/dependencyInvalidation.test.ts +444 -0
- package/test/dist/dependencyInvalidation.test.d.ts.map +1 -0
- package/test/dist/form.test.d.ts.map +1 -1
- package/test/dist/inactiveInvalidation.test.d.ts.map +1 -0
- 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/liveQueryInvalidation.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 +3681 -256
- package/test/dist/stubs.d.ts.map +1 -1
- package/test/dist/stubs.js +166 -25
- 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 +2 -1
- package/test/form.test.ts +2 -1
- package/test/inactiveInvalidation.test.ts +172 -0
- package/test/interrupt-refetch-repro.test.ts +625 -0
- package/test/lib.test.ts +240 -0
- package/test/liveQueryInvalidation.test.ts +108 -0
- package/test/makeClient.test.ts +414 -32
- 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 +194 -36
- package/test/suspense-regression.test.ts +168 -0
- package/test/suspense.test.ts +160 -0
- package/tsconfig.examples.json +20 -0
- package/tsconfig.json +9 -1
- package/tsconfig.src.json +34 -34
- package/tsconfig.test.json +2 -2
- package/vitest.config.ts +5 -5
- package/eslint.config.mjs +0 -24
- package/tsconfig.json.bak +0 -12
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
import type { ClientForOptions } from "effect-app/client/clientFor";
|
|
2
|
+
import * as Effect from "effect-app/Effect";
|
|
3
|
+
import * as Cause from "effect/Cause";
|
|
4
|
+
import * as Duration from "effect/Duration";
|
|
5
|
+
import type * as Layer from "effect/Layer";
|
|
6
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
7
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
8
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
9
|
+
import * as Stream from "effect/Stream";
|
|
10
|
+
import { type QueryInvalidationMode } from "./dependencyMetadata.js";
|
|
11
|
+
import { type LiveQueryOptions } from "./liveQueryInvalidation.js";
|
|
12
|
+
/** Refresh observed query atoms without making the triggering mutation await them. */
|
|
13
|
+
export declare const invalidateSoft: (keys: ReadonlyArray<unknown>) => Effect.Effect<void>;
|
|
14
|
+
/**
|
|
15
|
+
* Invalidate the given keys and AWAIT the result. `keyAtoms` resolves all matching hierarchical
|
|
16
|
+
* keys to a deduplicated set of query atoms. Refresh that set directly: sending the whole key set
|
|
17
|
+
* through `Reactivity.invalidate` invokes one atom's registered callback once per matching key,
|
|
18
|
+
* repeatedly superseding the same fetch when a mutation carries many row/prefix keys.
|
|
19
|
+
*
|
|
20
|
+
* Resolves once every **observed** matching query has settled, so a mutation can
|
|
21
|
+
* `yield*` this and know the on-screen data is fresh. Idle (observers === 0)
|
|
22
|
+
* matches are only marked stale — they do not block the mutation. Soft
|
|
23
|
+
* invalidation (`invalidateSoft`) still fires without awaiting.
|
|
24
|
+
*/
|
|
25
|
+
export declare const invalidateAndAwait: (keys: ReadonlyArray<unknown>) => Effect.Effect<void>;
|
|
26
|
+
/**
|
|
27
|
+
* Structural sharing (tanstack `replaceEqualDeep`): walk `next` against `prev` and reuse `prev`'s
|
|
28
|
+
* reference for any unchanged array/object sub-tree, so unchanged data keeps referential identity
|
|
29
|
+
* (Vue skips re-rendering it). Leaves — including decoded Schema CLASS INSTANCES — are compared with
|
|
30
|
+
* Effect `Equal.equals` (structural), which reuses equal instances that tanstack's `===` could not.
|
|
31
|
+
*/
|
|
32
|
+
export declare const replaceEqualDeep: (prev: any, next: any) => any;
|
|
33
|
+
export interface AtomClientRuntime {
|
|
34
|
+
readonly runtime: Atom.AtomRuntime<any, never>;
|
|
35
|
+
readonly factory: Atom.RuntimeFactory;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Build one AtomRuntime (and its factory) from an already-built app context.
|
|
39
|
+
* Shares the ManagedRuntime's `memoMap` so layers are not built twice, and so
|
|
40
|
+
* query-registration and mutation-invalidation resolve the SAME `Reactivity`.
|
|
41
|
+
*/
|
|
42
|
+
export declare const makeAtomClientRuntime: <R>(getContext: () => Layer.Layer<R, never, never>, memoMap: Layer.MemoMap) => AtomClientRuntime;
|
|
43
|
+
export interface AtomQueryOptions {
|
|
44
|
+
/** background-refresh threshold (TanStack staleTime; default 5s) */
|
|
45
|
+
readonly staleTime?: Duration.Input;
|
|
46
|
+
/** dispose-when-idle (TanStack gcTime; default 5min). "infinity" => keepAlive */
|
|
47
|
+
readonly gcTime?: Duration.Input | "infinity";
|
|
48
|
+
readonly invalidation?: QueryInvalidationMode;
|
|
49
|
+
/**
|
|
50
|
+
* Revalidate a stale query on window focus AND on network reconnect (default on, matching
|
|
51
|
+
* tanstack refetchOnWindowFocus + refetchOnReconnect).
|
|
52
|
+
*/
|
|
53
|
+
readonly revalidateOnFocus?: boolean;
|
|
54
|
+
/**
|
|
55
|
+
* Reuse references of unchanged sub-trees across refetches (default on, matching tanstack
|
|
56
|
+
* structuralSharing). Uses Effect `Equal` so decoded Schema instances share too — more effective
|
|
57
|
+
* than tanstack's `===`, but a deep compare per refetch (O(rows·fields)). Set `false` for very
|
|
58
|
+
* large or mostly-changing result sets where the compare costs more than the saved re-renders.
|
|
59
|
+
*/
|
|
60
|
+
readonly structuralSharing?: boolean;
|
|
61
|
+
/** poll: re-fetch every N ms (tanstack refetchInterval). */
|
|
62
|
+
readonly refetchInterval?: number;
|
|
63
|
+
/** Refresh when writes intersect the dependencies recorded by this query. */
|
|
64
|
+
readonly live?: boolean | LiveQueryOptions;
|
|
65
|
+
}
|
|
66
|
+
export interface AtomQueryMetadata {
|
|
67
|
+
readonly staleTimeMs: number;
|
|
68
|
+
}
|
|
69
|
+
export declare const queryKeyForAtom: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => ReadonlyArray<unknown> | undefined;
|
|
70
|
+
export declare const captureAtomQueryParentSpan: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Effect.Effect<void>;
|
|
71
|
+
export declare const refreshAtomWithCurrentSpan: <A, E>(registry: AtomRegistry.AtomRegistry, atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Effect.Effect<void>;
|
|
72
|
+
export declare const getAtomQueryMetadata: <A, E>(atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => AtomQueryMetadata | undefined;
|
|
73
|
+
/** Exported so the vue hook can do refetch-on-mount-per-observer with the same rule as swr. */
|
|
74
|
+
export declare const isStaleResult: (r: AsyncResult.AsyncResult<any, any>, staleTimeMs: number) => boolean;
|
|
75
|
+
export declare const staleTimeMsOf: (opts: AtomQueryOptions) => number;
|
|
76
|
+
export interface QueryFetchState {
|
|
77
|
+
inFlight: number;
|
|
78
|
+
recovering: boolean;
|
|
79
|
+
}
|
|
80
|
+
export declare const queryFetchStates: WeakMap<Atom.Atom<any>, QueryFetchState>;
|
|
81
|
+
export declare const withQueryOptions: <A, E>(self: Atom.Atom<AsyncResult.AsyncResult<A, E>>, opts?: AtomQueryOptions, liveKey?: ReadonlyArray<unknown>) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
82
|
+
/** Constant atom for disabled / `mode:"optional"`-None queries: stays Initial, never fetches. */
|
|
83
|
+
export declare const disabledQueryAtom: Atom.Atom<AsyncResult.AsyncResult<any, any>>;
|
|
84
|
+
/**
|
|
85
|
+
* Build the per-input atom family for a request handler — the query CACHE IDENTITY.
|
|
86
|
+
*
|
|
87
|
+
* This is the TanStack `queryKey = [handler, input]` equivalent and the piece that makes
|
|
88
|
+
* caching cross-component: `Atom.family` memoizes one atom per structurally-distinct input
|
|
89
|
+
* (v4 hashes the input via Hash/Equal), so every component querying the same handler+input
|
|
90
|
+
* reads the SAME atom instance => one fetch, one shared result in the global registry,
|
|
91
|
+
* ref-counted and GC'd on idle ttl. (The registry + ttl give lifetime; reactivity keys give
|
|
92
|
+
* invalidation; the family gives identity/sharing — all three are needed.)
|
|
93
|
+
*
|
|
94
|
+
* The family is created once per handler (see query.ts's per-handler cache), so it is shared
|
|
95
|
+
* process-wide via the registry.
|
|
96
|
+
*
|
|
97
|
+
* Invalidation is hierarchical: each atom registers under EVERY prefix of its full key
|
|
98
|
+
* `[...makeQueryKey(self), input]`. Since reactivity matches keys by exact hash, registering
|
|
99
|
+
* all prefixes means `invalidate(P)` refreshes every atom whose key starts with `P` — e.g.
|
|
100
|
+
* `["$X"]` refreshes all inputs, `["$X","$List",input]` only that input. (`makeQueryKey`'s
|
|
101
|
+
* collapsed form `getQueryKey` — what mutations invalidate by default — is one of the prefixes.)
|
|
102
|
+
*/
|
|
103
|
+
export declare const buildQueryFamily: <I, A, E>(rt: AtomClientRuntime, self: {
|
|
104
|
+
readonly id: string;
|
|
105
|
+
readonly handler: (i: I) => Effect.Effect<A, E, any>;
|
|
106
|
+
readonly options?: ClientForOptions;
|
|
107
|
+
readonly queryKeyProjectionHash?: string;
|
|
108
|
+
}) => (arg: I) => Atom.Atom<AsyncResult.AsyncResult<A, E>>;
|
|
109
|
+
export declare const buildStreamQueryFamily: <I, A, E>(rt: AtomClientRuntime, self: {
|
|
110
|
+
readonly id: string;
|
|
111
|
+
readonly handler: (i: I) => Stream.Stream<A, E, any>;
|
|
112
|
+
readonly options?: ClientForOptions;
|
|
113
|
+
readonly queryKeyProjectionHash?: string;
|
|
114
|
+
}) => (arg: I) => Atom.Atom<AsyncResult.AsyncResult<{
|
|
115
|
+
readonly done: boolean;
|
|
116
|
+
readonly items: [A, ...A[]];
|
|
117
|
+
}, E | Cause.NoSuchElementError>>;
|
|
118
|
+
/** Await the first resolved (non-Waiting) result of an atom. Failing query results fail the Effect. */
|
|
119
|
+
export declare const awaitAtomResult: <A, E>(registry: AtomRegistry.AtomRegistry, atom: Atom.Atom<AsyncResult.AsyncResult<A, E>>) => Effect.Effect<A, E, never>;
|
|
120
|
+
//# sourceMappingURL=atomQuery.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"atomQuery.d.ts","sourceRoot":"","sources":["../src/atomQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,434 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
+
/**
|
|
3
|
+
* Shared atom core for the query/mutation engine (used by query.ts + mutate.ts).
|
|
4
|
+
*
|
|
5
|
+
* Replaces the @tanstack/vue-query engine with Effect `Atom`, keeping the public
|
|
6
|
+
* `.query()/.suspense()/.mutate()` contract unchanged:
|
|
7
|
+
* - cache identity = the atom reference (one per [handler, input], via Atom.family)
|
|
8
|
+
* - invalidation key = reactivity keys (= the app's existing namespace query keys)
|
|
9
|
+
* - SWR + focus = Atom.swr (+ windowFocusSignal)
|
|
10
|
+
* - gcTime = Atom.setIdleTTL / Atom.keepAlive
|
|
11
|
+
* - retry = Effect.retry inside the atom effect
|
|
12
|
+
*
|
|
13
|
+
* Built over the app's RPC client through the existing `RequestHandlerWithInput`
|
|
14
|
+
* abstraction (mirrors AtomRpc's recipe; see docs/atom-query-plan.md).
|
|
15
|
+
*/
|
|
16
|
+
import { defaultRegistry } from "@effect/atom-vue";
|
|
17
|
+
import { DataDependencies, makeQueryKey } from "effect-app/client";
|
|
18
|
+
import { ServiceUnavailableError } from "effect-app/client/errors";
|
|
19
|
+
import * as Effect from "effect-app/Effect";
|
|
20
|
+
import * as Option from "effect-app/Option";
|
|
21
|
+
import * as S from "effect-app/Schema";
|
|
22
|
+
import * as Cause from "effect/Cause";
|
|
23
|
+
import * as Duration from "effect/Duration";
|
|
24
|
+
import * as Equal from "effect/Equal";
|
|
25
|
+
import * as Hash from "effect/Hash";
|
|
26
|
+
import { isHttpClientError } from "effect/http/HttpClientError";
|
|
27
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult";
|
|
28
|
+
import * as Atom from "effect/reactivity/Atom";
|
|
29
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry";
|
|
30
|
+
import * as Ref from "effect/Ref";
|
|
31
|
+
import * as Stream from "effect/Stream";
|
|
32
|
+
import { clearQueryReadDependencies, getQueryReadDependencies, registerQueryInvalidationMode, setQueryReadDependencies } from "./dependencyMetadata.js";
|
|
33
|
+
import { reportRuntimeError } from "./lib.js";
|
|
34
|
+
import { beginLiveQueryFetch, endLiveQueryFetch, registerLiveQuery } from "./liveQueryInvalidation.js";
|
|
35
|
+
import { atomsToRefetch, observeQueryAtom } from "./queryLifetime.js";
|
|
36
|
+
/** All non-empty prefixes of a key, longest last. `[a,b,c]` -> `[[a],[a,b],[a,b,c]]`. */
|
|
37
|
+
const prefixesOf = (key) => key.map((_, i) => key.slice(0, i + 1));
|
|
38
|
+
const uniqueKeys = (keys) => {
|
|
39
|
+
const out = [];
|
|
40
|
+
const seen = new Set();
|
|
41
|
+
for (const key of keys) {
|
|
42
|
+
const hash = Hash.hash(key);
|
|
43
|
+
if (seen.has(hash))
|
|
44
|
+
continue;
|
|
45
|
+
seen.add(hash);
|
|
46
|
+
out.push(key);
|
|
47
|
+
}
|
|
48
|
+
return out;
|
|
49
|
+
};
|
|
50
|
+
// --- awaitable invalidation -------------------------------------------------------------------
|
|
51
|
+
// keyHash -> query atoms registered under that key. A query atom stays in the map while it is
|
|
52
|
+
// alive in the registry (mounted OR cached within idle-ttl). Invalidation *marks* every matching
|
|
53
|
+
// atom stale; it only *refetches* atoms that currently have observers (TanStack refetchType:
|
|
54
|
+
// "active"). Idle cache entries refetch on the next mount.
|
|
55
|
+
const keyAtoms = new Map();
|
|
56
|
+
const trackByKeys = (keys) => (atom) => Atom.transform(atom, (get) => {
|
|
57
|
+
for (const key of keys) {
|
|
58
|
+
const h = Hash.hash(key);
|
|
59
|
+
let set = keyAtoms.get(h);
|
|
60
|
+
if (!set)
|
|
61
|
+
keyAtoms.set(h, set = new Set());
|
|
62
|
+
set.add(atom);
|
|
63
|
+
get.addFinalizer(() => {
|
|
64
|
+
set.delete(atom);
|
|
65
|
+
if (set.size === 0)
|
|
66
|
+
keyAtoms.delete(h);
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
return get(atom);
|
|
70
|
+
}, { initialValueTarget: atom });
|
|
71
|
+
const trackWritableByKeys = (keys) => (atom) => {
|
|
72
|
+
const tracked = trackByKeys(keys)(atom);
|
|
73
|
+
return Atom.writable((get) => get(tracked), (ctx, value) => ctx.set(atom, value), (refresh) => refresh(tracked));
|
|
74
|
+
};
|
|
75
|
+
/**
|
|
76
|
+
* Keep a query's recorded read-dependencies registered for as long as it is alive, and drop them when
|
|
77
|
+
* its atom is GC'd (mirrors `trackByKeys`).
|
|
78
|
+
*
|
|
79
|
+
* `recordReads` only stores the deps on an actual fetch. A query that unmounts and later remounts from
|
|
80
|
+
* cache (within idle-ttl) does NOT re-run the handler, so its registry entry — cleared by the previous
|
|
81
|
+
* teardown's finalizer — would never be restored, and a subsequent mutation could not derive it as an
|
|
82
|
+
* invalidation target. Re-asserting the last-known reads on every (re)subscribe closes that gap, so the
|
|
83
|
+
* registry mirrors the live query even across cache-hit remounts.
|
|
84
|
+
*/
|
|
85
|
+
const trackReadDependencies = (key, getReads) => (atom) => Atom.transform(atom, (get) => {
|
|
86
|
+
const reads = getReads();
|
|
87
|
+
if (DataDependencies.isNonEmpty(reads))
|
|
88
|
+
setQueryReadDependencies(key, reads);
|
|
89
|
+
get.addFinalizer(() => clearQueryReadDependencies(key));
|
|
90
|
+
return get(atom);
|
|
91
|
+
}, { initialValueTarget: atom });
|
|
92
|
+
const atomsForKeys = (keys) => {
|
|
93
|
+
const atoms = new Set();
|
|
94
|
+
for (const key of keys) {
|
|
95
|
+
const set = keyAtoms.get(Hash.hash(key));
|
|
96
|
+
if (set) {
|
|
97
|
+
for (const a of set)
|
|
98
|
+
atoms.add(a);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
return [...atoms];
|
|
102
|
+
};
|
|
103
|
+
/** Refresh observed query atoms without making the triggering mutation await them. */
|
|
104
|
+
export const invalidateSoft = (keys) => Effect
|
|
105
|
+
.gen(function* () {
|
|
106
|
+
const atoms = atomsToRefetch(atomsForKeys(keys));
|
|
107
|
+
yield* Effect.forEach(atoms, captureAtomQueryParentSpan, { discard: true, concurrency: "unbounded" });
|
|
108
|
+
if (atoms.length === 0)
|
|
109
|
+
return;
|
|
110
|
+
yield* Effect.forEach(atoms, (atom) => Effect.sync(() => defaultRegistry.refresh(atom)), {
|
|
111
|
+
discard: true
|
|
112
|
+
});
|
|
113
|
+
})
|
|
114
|
+
.pipe(Effect.orDie);
|
|
115
|
+
/**
|
|
116
|
+
* Invalidate the given keys and AWAIT the result. `keyAtoms` resolves all matching hierarchical
|
|
117
|
+
* keys to a deduplicated set of query atoms. Refresh that set directly: sending the whole key set
|
|
118
|
+
* through `Reactivity.invalidate` invokes one atom's registered callback once per matching key,
|
|
119
|
+
* repeatedly superseding the same fetch when a mutation carries many row/prefix keys.
|
|
120
|
+
*
|
|
121
|
+
* Resolves once every **observed** matching query has settled, so a mutation can
|
|
122
|
+
* `yield*` this and know the on-screen data is fresh. Idle (observers === 0)
|
|
123
|
+
* matches are only marked stale — they do not block the mutation. Soft
|
|
124
|
+
* invalidation (`invalidateSoft`) still fires without awaiting.
|
|
125
|
+
*/
|
|
126
|
+
export const invalidateAndAwait = (keys) => Effect
|
|
127
|
+
.gen(function* () {
|
|
128
|
+
const atoms = atomsToRefetch(atomsForKeys(keys));
|
|
129
|
+
yield* Effect.forEach(atoms, captureAtomQueryParentSpan, { discard: true, concurrency: "unbounded" });
|
|
130
|
+
if (atoms.length === 0)
|
|
131
|
+
return;
|
|
132
|
+
yield* Effect.forEach(atoms, (atom) => Effect.sync(() => defaultRegistry.refresh(atom)), {
|
|
133
|
+
discard: true
|
|
134
|
+
});
|
|
135
|
+
// Contract: observers > 0 ⇒ wait for this refresh to finish.
|
|
136
|
+
yield* Effect.forEach(atoms, (a) => awaitAtomResult(defaultRegistry, a).pipe(Effect.exit));
|
|
137
|
+
})
|
|
138
|
+
.pipe(Effect.orDie);
|
|
139
|
+
const isPlainObject = (o) => {
|
|
140
|
+
if (typeof o !== "object" || o === null)
|
|
141
|
+
return false;
|
|
142
|
+
const proto = Object.getPrototypeOf(o);
|
|
143
|
+
return proto === Object.prototype || proto === null;
|
|
144
|
+
};
|
|
145
|
+
/**
|
|
146
|
+
* Structural sharing (tanstack `replaceEqualDeep`): walk `next` against `prev` and reuse `prev`'s
|
|
147
|
+
* reference for any unchanged array/object sub-tree, so unchanged data keeps referential identity
|
|
148
|
+
* (Vue skips re-rendering it). Leaves — including decoded Schema CLASS INSTANCES — are compared with
|
|
149
|
+
* Effect `Equal.equals` (structural), which reuses equal instances that tanstack's `===` could not.
|
|
150
|
+
*/
|
|
151
|
+
export const replaceEqualDeep = (prev, next) => {
|
|
152
|
+
if (prev === next)
|
|
153
|
+
return prev;
|
|
154
|
+
const bothArrays = Array.isArray(prev) && Array.isArray(next);
|
|
155
|
+
if (bothArrays || (isPlainObject(prev) && isPlainObject(next))) {
|
|
156
|
+
const a = prev;
|
|
157
|
+
const b = next;
|
|
158
|
+
const copy = bothArrays ? [] : {};
|
|
159
|
+
const nextKeys = bothArrays ? b.map((_, i) => i) : Object.keys(b);
|
|
160
|
+
const nextSize = nextKeys.length;
|
|
161
|
+
const prevSize = bothArrays ? a.length : Object.keys(a).length;
|
|
162
|
+
let equalItems = 0;
|
|
163
|
+
for (let i = 0; i < nextSize; i++) {
|
|
164
|
+
const key = nextKeys[i];
|
|
165
|
+
copy[key] = replaceEqualDeep(a[key], b[key]);
|
|
166
|
+
if (copy[key] === a[key] && a[key] !== undefined)
|
|
167
|
+
equalItems++;
|
|
168
|
+
}
|
|
169
|
+
return prevSize === nextSize && equalItems === prevSize ? prev : copy;
|
|
170
|
+
}
|
|
171
|
+
return Equal.equals(prev, next) ? prev : next;
|
|
172
|
+
};
|
|
173
|
+
/** Atom combinator: share each new `Success` value structurally against the previous one. */
|
|
174
|
+
const structuralShare = (self) => Atom.transform(self, (get) => {
|
|
175
|
+
const next = get(self);
|
|
176
|
+
if (next._tag !== "Success")
|
|
177
|
+
return next;
|
|
178
|
+
const prev = Option.flatMap(get.self(), AsyncResult.value);
|
|
179
|
+
if (Option.isNone(prev))
|
|
180
|
+
return next;
|
|
181
|
+
const shared = replaceEqualDeep(prev.value, next.value);
|
|
182
|
+
return shared === next.value
|
|
183
|
+
? next
|
|
184
|
+
: AsyncResult.success(shared, { waiting: next.waiting, timestamp: next.timestamp });
|
|
185
|
+
}, { initialValueTarget: self });
|
|
186
|
+
/**
|
|
187
|
+
* Build one AtomRuntime (and its factory) from an already-built app context.
|
|
188
|
+
* Shares the ManagedRuntime's `memoMap` so layers are not built twice, and so
|
|
189
|
+
* query-registration and mutation-invalidation resolve the SAME `Reactivity`.
|
|
190
|
+
*/
|
|
191
|
+
export const makeAtomClientRuntime = (getContext, memoMap) => {
|
|
192
|
+
const factory = Atom.context({ memoMap });
|
|
193
|
+
const runtime = factory((_get) => getContext());
|
|
194
|
+
return { runtime, factory };
|
|
195
|
+
};
|
|
196
|
+
const isRetryable = (e) => isHttpClientError(e)
|
|
197
|
+
|| S.is(ServiceUnavailableError)(e)
|
|
198
|
+
|| (typeof e === "object" && e !== null && e._tag === "RpcClientError");
|
|
199
|
+
const defaults = { staleTime: Duration.seconds(5), gcTime: Duration.minutes(5) };
|
|
200
|
+
const atomQueryMetadata = new WeakMap();
|
|
201
|
+
const atomQueryParentSpans = new WeakMap();
|
|
202
|
+
const atomQueryKeys = new WeakMap();
|
|
203
|
+
export const queryKeyForAtom = (atom) => atomQueryKeys.get(atom);
|
|
204
|
+
const atomSpanTarget = (atom) => {
|
|
205
|
+
let target = atom;
|
|
206
|
+
while (target.initialValueTarget !== undefined) {
|
|
207
|
+
target = target.initialValueTarget;
|
|
208
|
+
}
|
|
209
|
+
return target;
|
|
210
|
+
};
|
|
211
|
+
const takeAtomQueryParentSpan = (atom) => {
|
|
212
|
+
const target = atomSpanTarget(atom);
|
|
213
|
+
const span = atomQueryParentSpans.get(target);
|
|
214
|
+
if (span !== undefined)
|
|
215
|
+
atomQueryParentSpans.delete(target);
|
|
216
|
+
return span;
|
|
217
|
+
};
|
|
218
|
+
const setAtomQueryParentSpan = (atom, span) => {
|
|
219
|
+
atomQueryParentSpans.set(atomSpanTarget(atom), span);
|
|
220
|
+
};
|
|
221
|
+
export const captureAtomQueryParentSpan = (atom) => Effect.currentParentSpan.pipe(Effect.tap((span) => Effect.sync(() => setAtomQueryParentSpan(atom, span))), Effect.ignore);
|
|
222
|
+
export const refreshAtomWithCurrentSpan = (registry, atom) => captureAtomQueryParentSpan(atom).pipe(Effect.andThen(Effect.sync(() => registry.refresh(atom))));
|
|
223
|
+
const setAtomQueryMetadata = (atom, opts = {}) => {
|
|
224
|
+
const staleTimeMs = staleTimeMsOf(opts);
|
|
225
|
+
const previous = atomQueryMetadata.get(atom);
|
|
226
|
+
atomQueryMetadata.set(atom, {
|
|
227
|
+
staleTimeMs: previous === undefined ? staleTimeMs : Math.min(previous.staleTimeMs, staleTimeMs)
|
|
228
|
+
});
|
|
229
|
+
return atom;
|
|
230
|
+
};
|
|
231
|
+
export const getAtomQueryMetadata = (atom) => atomQueryMetadata.get(atom);
|
|
232
|
+
/** Exported so the vue hook can do refetch-on-mount-per-observer with the same rule as swr. */
|
|
233
|
+
export const isStaleResult = (r, staleTimeMs) => {
|
|
234
|
+
if (r.waiting)
|
|
235
|
+
return false;
|
|
236
|
+
const ts = r._tag === "Success"
|
|
237
|
+
? r.timestamp
|
|
238
|
+
: r._tag === "Failure"
|
|
239
|
+
? Option.getOrUndefined(Option.map(r.previousSuccess, (s) => s.timestamp))
|
|
240
|
+
: undefined;
|
|
241
|
+
if (ts === undefined)
|
|
242
|
+
return r._tag !== "Initial";
|
|
243
|
+
return Date.now() - ts >= staleTimeMs;
|
|
244
|
+
};
|
|
245
|
+
export const staleTimeMsOf = (opts) => Duration.toMillis(Duration.fromInputUnsafe(opts.staleTime ?? defaults.staleTime));
|
|
246
|
+
export const queryFetchStates = new WeakMap();
|
|
247
|
+
const recoverStuckWaitingOnMount = (familyAtom) => (wrapped) => Atom.transform(wrapped, (get) => {
|
|
248
|
+
const current = get.once(wrapped);
|
|
249
|
+
get.subscribe(wrapped, (value) => get.setSelf(value));
|
|
250
|
+
const state = queryFetchStates.get(familyAtom);
|
|
251
|
+
const waiting = current?.waiting === true;
|
|
252
|
+
// Stuck: the result says `waiting` yet nothing is in-flight — an interrupt was hidden and left
|
|
253
|
+
// `waiting` dangling. Treat it as not-yet-fetched and refetch; a live fetch (`inFlight > 0`) is
|
|
254
|
+
// joined, not superseded. `recovering` prevents concurrent mounts from issuing more than one
|
|
255
|
+
// recovery fetch (cleared once a fetch is actually running again).
|
|
256
|
+
if (state && waiting && state.inFlight === 0 && !state.recovering) {
|
|
257
|
+
state.recovering = true;
|
|
258
|
+
get.refresh(familyAtom);
|
|
259
|
+
}
|
|
260
|
+
return current;
|
|
261
|
+
}, { initialValueTarget: wrapped });
|
|
262
|
+
export const withQueryOptions = (self, opts = {}, liveKey) => {
|
|
263
|
+
setAtomQueryMetadata(self, opts);
|
|
264
|
+
const staleTime = opts.staleTime ?? defaults.staleTime;
|
|
265
|
+
let atom = self;
|
|
266
|
+
if (liveKey !== undefined) {
|
|
267
|
+
atom = Atom.transform(atom, (get) => {
|
|
268
|
+
const unregister = registerQueryInvalidationMode(liveKey, opts.invalidation ?? "await");
|
|
269
|
+
get.addFinalizer(unregister);
|
|
270
|
+
return get(self);
|
|
271
|
+
}, { initialValueTarget: self });
|
|
272
|
+
}
|
|
273
|
+
if (opts.live && liveKey !== undefined) {
|
|
274
|
+
const liveOptions = opts.live === true ? {} : opts.live;
|
|
275
|
+
atom = Atom.transform(atom, (get) => {
|
|
276
|
+
const unregister = registerLiveQuery(liveKey, () => getQueryReadDependencies(liveKey), liveOptions);
|
|
277
|
+
get.addFinalizer(unregister);
|
|
278
|
+
return get(self);
|
|
279
|
+
}, { initialValueTarget: self });
|
|
280
|
+
}
|
|
281
|
+
const revalidateOnFocus = opts.revalidateOnFocus ?? true;
|
|
282
|
+
atom = Atom.swr({
|
|
283
|
+
staleTime,
|
|
284
|
+
revalidateOnFocus,
|
|
285
|
+
focusSignal: revalidateOnFocus ? focusOrReconnectSignal : undefined
|
|
286
|
+
})(atom);
|
|
287
|
+
atom = recoverStuckWaitingOnMount(self)(atom);
|
|
288
|
+
if (opts.refetchInterval)
|
|
289
|
+
atom = Atom.withRefresh(Duration.millis(opts.refetchInterval))(atom);
|
|
290
|
+
if (opts.structuralSharing ?? true)
|
|
291
|
+
atom = structuralShare(atom);
|
|
292
|
+
return atom;
|
|
293
|
+
};
|
|
294
|
+
/** Constant atom for disabled / `mode:"optional"`-None queries: stays Initial, never fetches. */
|
|
295
|
+
export const disabledQueryAtom = Atom.readable(() => AsyncResult.initial(false));
|
|
296
|
+
/**
|
|
297
|
+
* Bumps when the browser regains connectivity (the `online` event) — the tanstack
|
|
298
|
+
* `refetchOnReconnect` trigger. One shared listener (module-level). SSR-guarded.
|
|
299
|
+
*/
|
|
300
|
+
const onlineSignal = Atom.readable((get) => {
|
|
301
|
+
let count = 0;
|
|
302
|
+
if (typeof window === "undefined")
|
|
303
|
+
return count;
|
|
304
|
+
const update = () => {
|
|
305
|
+
if (navigator.onLine)
|
|
306
|
+
get.setSelf(++count);
|
|
307
|
+
};
|
|
308
|
+
window.addEventListener("online", update);
|
|
309
|
+
get.addFinalizer(() => window.removeEventListener("online", update));
|
|
310
|
+
return count;
|
|
311
|
+
});
|
|
312
|
+
/**
|
|
313
|
+
* Focus OR reconnect, as a single signal for `swr` — both should stale-revalidate a query.
|
|
314
|
+
* swr takes one `focusSignal`, so we fold window-focus + reconnect into one derived atom;
|
|
315
|
+
* a bump from either triggers swr's stale check.
|
|
316
|
+
*/
|
|
317
|
+
const focusOrReconnectSignal = Atom.make((get) => get(Atom.windowFocusSignal) + get(onlineSignal));
|
|
318
|
+
/**
|
|
319
|
+
* Build the per-input atom family for a request handler — the query CACHE IDENTITY.
|
|
320
|
+
*
|
|
321
|
+
* This is the TanStack `queryKey = [handler, input]` equivalent and the piece that makes
|
|
322
|
+
* caching cross-component: `Atom.family` memoizes one atom per structurally-distinct input
|
|
323
|
+
* (v4 hashes the input via Hash/Equal), so every component querying the same handler+input
|
|
324
|
+
* reads the SAME atom instance => one fetch, one shared result in the global registry,
|
|
325
|
+
* ref-counted and GC'd on idle ttl. (The registry + ttl give lifetime; reactivity keys give
|
|
326
|
+
* invalidation; the family gives identity/sharing — all three are needed.)
|
|
327
|
+
*
|
|
328
|
+
* The family is created once per handler (see query.ts's per-handler cache), so it is shared
|
|
329
|
+
* process-wide via the registry.
|
|
330
|
+
*
|
|
331
|
+
* Invalidation is hierarchical: each atom registers under EVERY prefix of its full key
|
|
332
|
+
* `[...makeQueryKey(self), input]`. Since reactivity matches keys by exact hash, registering
|
|
333
|
+
* all prefixes means `invalidate(P)` refreshes every atom whose key starts with `P` — e.g.
|
|
334
|
+
* `["$X"]` refreshes all inputs, `["$X","$List",input]` only that input. (`makeQueryKey`'s
|
|
335
|
+
* collapsed form `getQueryKey` — what mutations invalidate by default — is one of the prefixes.)
|
|
336
|
+
*/
|
|
337
|
+
export const buildQueryFamily = (rt, self) => {
|
|
338
|
+
const baseKey = makeQueryKey(self); // hierarchical, input-independent
|
|
339
|
+
return Atom.family((input) => {
|
|
340
|
+
const fullKey = [...baseKey, input];
|
|
341
|
+
// Record the repository/server read-dependencies seen while fetching, keyed by `fullKey`, so a
|
|
342
|
+
// later mutation whose writes intersect them can derive this query as an invalidation target.
|
|
343
|
+
// The last recorded reads are retained on the (memoized) family atom so `trackReadDependencies`
|
|
344
|
+
// can re-assert them on a cache-hit remount that never re-runs the handler.
|
|
345
|
+
let lastReads = DataDependencies.empty();
|
|
346
|
+
// Fetch bookkeeping read by `recoverStuckWaitingOnMount`. `inFlight` counts live computes, so a
|
|
347
|
+
// `waiting` result with `inFlight === 0` is a stuck/hidden interrupt. `recovering` guards the
|
|
348
|
+
// recovery refresh against concurrent mounts; a running fetch clears it.
|
|
349
|
+
const fetchState = { inFlight: 0, recovering: false };
|
|
350
|
+
let atom;
|
|
351
|
+
atom = rt.runtime.atom(Effect.suspend(() => {
|
|
352
|
+
// A fetch is now running: the atom is not stuck, and any pending recovery is fulfilled.
|
|
353
|
+
fetchState.recovering = false;
|
|
354
|
+
fetchState.inFlight++;
|
|
355
|
+
const recordReads = Effect
|
|
356
|
+
.gen(function* () {
|
|
357
|
+
const readsRef = yield* Ref.make(DataDependencies.empty());
|
|
358
|
+
const writesRef = yield* Ref.make(DataDependencies.empty());
|
|
359
|
+
const recorder = DataDependencies.makeDataDependencyRecorder(readsRef, writesRef);
|
|
360
|
+
const result = yield* self
|
|
361
|
+
.handler(input)
|
|
362
|
+
.pipe(Effect.provideService(DataDependencies.DataDependencyRecorder, recorder));
|
|
363
|
+
lastReads = yield* Ref.get(readsRef);
|
|
364
|
+
setQueryReadDependencies(fullKey, lastReads);
|
|
365
|
+
return result;
|
|
366
|
+
});
|
|
367
|
+
let liveFetch = false;
|
|
368
|
+
const effect = Effect
|
|
369
|
+
.gen(function* () {
|
|
370
|
+
liveFetch = yield* Effect.promise(() => beginLiveQueryFetch(fullKey));
|
|
371
|
+
return yield* recordReads.pipe(Effect.retry({ times: 5, while: isRetryable }));
|
|
372
|
+
})
|
|
373
|
+
.pipe(Effect.ensuring(Effect.sync(() => endLiveQueryFetch(liveFetch))), Effect.tapCauseIf(Cause.hasDies, (cause) => reportRuntimeError(cause)),
|
|
374
|
+
// On exit, the compute is no longer in-flight. An interrupt (subscriber lost interest / a
|
|
375
|
+
// superseding refresh) may leave the result at `waiting`; with `inFlight` back at 0 that
|
|
376
|
+
// reads as "stuck", so the next mount recovers it (`recoverStuckWaitingOnMount`). We do not
|
|
377
|
+
// re-fire here — the interrupt was intentional; recovery is driven by a genuine (re)mount.
|
|
378
|
+
Effect.onExit(() => Effect.sync(() => {
|
|
379
|
+
fetchState.inFlight = Math.max(0, fetchState.inFlight - 1);
|
|
380
|
+
})), Effect.withSpan(`query ${self.id}`, {}, { captureStackTrace: false }));
|
|
381
|
+
const parentSpan = takeAtomQueryParentSpan(atom);
|
|
382
|
+
return parentSpan === undefined
|
|
383
|
+
? effect
|
|
384
|
+
: effect.pipe(Effect.withParentSpan(parentSpan, { captureStackTrace: false }));
|
|
385
|
+
}));
|
|
386
|
+
// Register under every prefix of the full key => hierarchical (prefix) invalidation. Two roles:
|
|
387
|
+
// - withReactivity: `Reactivity.invalidate(key)` refreshes this atom (the actual refetch).
|
|
388
|
+
// - trackByKeys: records the atom in `keyAtoms` so the mutation can AWAIT its settle.
|
|
389
|
+
const projectedFullKey = self.queryKeyProjectionHash === undefined
|
|
390
|
+
? fullKey
|
|
391
|
+
: [...baseKey, self.queryKeyProjectionHash, input];
|
|
392
|
+
const reactivityKeys = uniqueKeys([...prefixesOf(fullKey), ...prefixesOf(projectedFullKey)]);
|
|
393
|
+
atom = rt.factory.withReactivity(reactivityKeys)(atom);
|
|
394
|
+
atom = trackByKeys(reactivityKeys)(atom);
|
|
395
|
+
atom = trackReadDependencies(fullKey, () => lastReads)(atom);
|
|
396
|
+
// gcTime LAST so the whole chain (incl. the registration + tracking) stays alive through the
|
|
397
|
+
// idle window. Invalidation still finds the cached atom and marks it stale; it does not
|
|
398
|
+
// refetch until an observer remounts (TanStack refetchType: "active").
|
|
399
|
+
atom = Atom.setIdleTTL(atom, defaults.gcTime);
|
|
400
|
+
const registered = setAtomQueryMetadata(Atom.withLabel(`query:${self.id}`)(atom));
|
|
401
|
+
const writable = Atom.writable((get) => {
|
|
402
|
+
const current = get.once(registered);
|
|
403
|
+
get.subscribe(registered, (value) => get.setSelf(value));
|
|
404
|
+
return current;
|
|
405
|
+
}, (ctx, value) => ctx.setSelf(value), (refresh) => refresh(registered));
|
|
406
|
+
const writableWithTarget = Object.assign(writable, { initialValueTarget: registered });
|
|
407
|
+
const result = setAtomQueryMetadata(Atom.withLabel(`query-cache:${self.id}`)(writableWithTarget));
|
|
408
|
+
// Key the fetch state by the atom `withQueryOptions` receives, so its mount hook can find it.
|
|
409
|
+
const observed = observeQueryAtom(result);
|
|
410
|
+
queryFetchStates.set(result, fetchState);
|
|
411
|
+
queryFetchStates.set(observed, fetchState);
|
|
412
|
+
atomQueryKeys.set(result, fullKey);
|
|
413
|
+
atomQueryKeys.set(observed, fullKey);
|
|
414
|
+
return observed;
|
|
415
|
+
});
|
|
416
|
+
};
|
|
417
|
+
export const buildStreamQueryFamily = (rt, self) => {
|
|
418
|
+
const baseKey = makeQueryKey(self);
|
|
419
|
+
return Atom.family((input) => {
|
|
420
|
+
let atom = rt.runtime.pull(self.handler(input).pipe(Stream.tapCause((cause) => Cause.hasDies(cause) ? reportRuntimeError(cause) : Effect.void)));
|
|
421
|
+
const fullKey = [...baseKey, input];
|
|
422
|
+
const projectedFullKey = self.queryKeyProjectionHash === undefined
|
|
423
|
+
? fullKey
|
|
424
|
+
: [...baseKey, self.queryKeyProjectionHash, input];
|
|
425
|
+
const reactivityKeys = uniqueKeys([...prefixesOf(fullKey), ...prefixesOf(projectedFullKey)]);
|
|
426
|
+
atom = rt.factory.withReactivity(reactivityKeys)(atom);
|
|
427
|
+
atom = trackWritableByKeys(reactivityKeys)(atom);
|
|
428
|
+
atom = Atom.setIdleTTL(atom, defaults.gcTime);
|
|
429
|
+
return observeQueryAtom(setAtomQueryMetadata(Atom.withLabel(`stream-query:${self.id}`)(atom)));
|
|
430
|
+
});
|
|
431
|
+
};
|
|
432
|
+
/** Await the first resolved (non-Waiting) result of an atom. Failing query results fail the Effect. */
|
|
433
|
+
export const awaitAtomResult = (registry, atom) => AtomRegistry.getResult(registry, atom, { suspendOnWaiting: true });
|
|
434
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"atomQuery.js","sourceRoot":"","sources":["../src/atomQuery.ts"],"names":[],"mappings":"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"}
|