@plitzi/sdk-shared 0.36.1 → 0.37.0

package/dist/network/spaceEvents.mjs

@@ -1,241 +1,236 @@
 import { StyleVariableCategory as e } from "../types/StyleTypes.mjs";
-import { z as t } from "zod";
+import { STYLE_STATES as t } from "../style/styleStates.mjs";
+import { z as n } from "zod";
 //#region src/network/spaceEvents.ts
-var n = (e) => typeof e == "object" && !!e && !Array.isArray(e), r = t.custom((e) => n(e) && typeof e.id == "string", { message: "expected an element with an id" }), i = t.array(r), a = t.custom((e) => n(e) && Array.isArray(e.flat), { message: "expected a schema whose `flat` is a list of elements" }), o = t.custom((e) => n(e) && typeof e.id == "string", { message: "expected a page folder with an id" }), s = t.custom((e) => n(e) && typeof e.name == "string", { message: "expected a variable with a name" }), c = t.custom(n, { message: "expected a style attributes object" }), l = t.custom((e) => n(e) && typeof e.family == "string" && typeof e.source == "string", { message: "expected a font with a family and a source" }), u = t.custom((e) => typeof e == "string" || typeof e == "number" || n(e), { message: "expected a style variable value" }), d = t.enum([
+var r = (e) => typeof e == "object" && !!e && !Array.isArray(e), i = n.custom((e) => r(e) && typeof e.id == "string", { message: "expected an element with an id" }), a = n.array(i), o = n.custom((e) => r(e) && Array.isArray(e.flat), { message: "expected a schema whose `flat` is a list of elements" }), s = n.custom((e) => r(e) && typeof e.id == "string", { message: "expected a page folder with an id" }), c = n.custom((e) => r(e) && typeof e.name == "string", { message: "expected a variable with a name" }), l = n.custom(r, { message: "expected a style attributes object" }), u = n.custom((e) => r(e) && typeof e.family == "string" && typeof e.source == "string", { message: "expected a font with a family and a source" }), d = n.custom((e) => typeof e == "string" || typeof e == "number" || r(e), { message: "expected a style variable value" }), f = n.enum([
 	"desktop",
 	"tablet",
 	"mobile"
-]), f = t.custom((e) => typeof e == "string", { message: "expected a drop position" }), p = t.custom((e) => typeof e == "string", { message: "expected a style category" }), m = t.enum([
+]), p = n.custom((e) => typeof e == "string", { message: "expected a drop position" }), m = n.custom((e) => typeof e == "string", { message: "expected a style category" }), h = n.enum([
 	"class",
 	"element",
 	"id"
-]), h = t.enum([
-	"hover",
-	"active",
-	"focus",
-	"disabled",
-	"checked",
-	"visited"
-]), g = t.enum(e), _ = t.object({
-	componentType: t.string().optional(),
-	styleSelector: t.string().optional(),
-	styleState: h.optional(),
-	styleVariant: t.string().optional()
-}), v = _.extend({ styleSelector: t.string() }), y = { contextId: t.string() }, b = t.object({ variable: s }), x = t.object({
-	displayMode: d,
-	selector: t.string(),
-	category: g,
-	name: t.string(),
-	value: u
-}), S = t.object({
-	displayMode: d,
-	selector: t.string(),
-	category: g,
-	name: t.string()
-}), C = t.object({
-	category: g,
-	name: t.string(),
-	value: u
-}), w = {
-	SPACE_UPDATED: t.object({ schema: a }),
-	STYLE_UPDATED: t.object({
-		platform: t.custom(n),
-		variables: t.custom(n),
-		cache: t.string()
-	}),
-	SPACE_ADD_PAGE: t.object({ page: r }),
-	SPACE_UPDATE_PAGE: t.object({ page: r }),
-	SPACE_SET_HOME_PAGE: t.object({ page: r }),
-	SPACE_REMOVE_PAGE: t.object({ pageId: t.string() }),
-	SPACE_ADD_PAGE_FOLDER: t.object({ pageFolder: o }),
-	SPACE_UPDATE_PAGE_FOLDER: t.object({ pageFolder: o }),
-	SPACE_REMOVE_PAGE_FOLDER: t.object({ pageFolderId: t.string() }),
-	SPACE_ADD_VARIABLE: b,
-	SPACE_UPDATE_VARIABLE: b,
-	SPACE_REMOVE_VARIABLE: t.object({ name: t.string() }),
-	SPACE_ADD_ELEMENT: t.object({
-		element: r,
-		dropPosition: f,
-		to: t.string(),
-		initialItems: i.optional(),
-		variables: t.array(s).optional()
-	}),
-	SPACE_UPDATE_ELEMENT: t.object({ element: r }),
-	SPACE_RENAME_ELEMENT: t.object({
-		elementId: t.string(),
-		id: t.string()
-	}),
-	SPACE_UPDATE_ELEMENTS: t.object({ elements: i }),
-	SPACE_REMOVE_ELEMENT: t.object({ elementId: t.string() }),
-	SPACE_MOVE_ELEMENT: t.object({
-		from: t.string(),
-		to: t.string(),
-		elementId: t.string(),
-		dropPosition: f
-	}),
-	SPACE_CLONE_ELEMENT: t.object({
-		to: t.string(),
-		element: r,
-		dropPosition: f,
-		initialItems: i
-	}),
-	SPACE_ADD_TEMPLATE: t.object({
-		element: r,
-		style: t.custom(n),
-		to: t.string(),
-		dropPosition: f,
-		initialItems: i.optional(),
-		variables: t.array(s).optional()
-	}),
-	SPACE_UPDATE_SETTINGS: t.object({
-		path: t.string(),
-		value: t.union([
-			t.string(),
-			t.number(),
-			t.boolean()
+]), g = n.enum(t), _ = n.enum(e), v = n.object({
+	componentType: n.string().optional(),
+	styleSelector: n.string().optional(),
+	styleState: g.optional(),
+	styleVariant: n.string().optional(),
+	styleAncestor: n.string().optional()
+}), y = v.extend({ styleSelector: n.string() }), b = { contextId: n.string() }, x = n.object({ variable: c }), S = n.object({
+	displayMode: f,
+	selector: n.string(),
+	category: _,
+	name: n.string(),
+	value: d
+}), C = n.object({
+	displayMode: f,
+	selector: n.string(),
+	category: _,
+	name: n.string()
+}), w = n.object({
+	category: _,
+	name: n.string(),
+	value: d
+}), T = {
+	SPACE_UPDATED: n.object({ schema: o }),
+	STYLE_UPDATED: n.object({
+		platform: n.custom(r),
+		variables: n.custom(r),
+		cache: n.string()
+	}),
+	SPACE_ADD_PAGE: n.object({ page: i }),
+	SPACE_UPDATE_PAGE: n.object({ page: i }),
+	SPACE_SET_HOME_PAGE: n.object({ page: i }),
+	SPACE_REMOVE_PAGE: n.object({ pageId: n.string() }),
+	SPACE_ADD_PAGE_FOLDER: n.object({ pageFolder: s }),
+	SPACE_UPDATE_PAGE_FOLDER: n.object({ pageFolder: s }),
+	SPACE_REMOVE_PAGE_FOLDER: n.object({ pageFolderId: n.string() }),
+	SPACE_ADD_VARIABLE: x,
+	SPACE_UPDATE_VARIABLE: x,
+	SPACE_REMOVE_VARIABLE: n.object({ name: n.string() }),
+	SPACE_ADD_ELEMENT: n.object({
+		element: i,
+		dropPosition: p,
+		to: n.string(),
+		initialItems: a.optional(),
+		variables: n.array(c).optional()
+	}),
+	SPACE_UPDATE_ELEMENT: n.object({ element: i }),
+	SPACE_RENAME_ELEMENT: n.object({
+		elementId: n.string(),
+		id: n.string()
+	}),
+	SPACE_UPDATE_ELEMENTS: n.object({ elements: a }),
+	SPACE_REMOVE_ELEMENT: n.object({ elementId: n.string() }),
+	SPACE_MOVE_ELEMENT: n.object({
+		from: n.string(),
+		to: n.string(),
+		elementId: n.string(),
+		dropPosition: p
+	}),
+	SPACE_CLONE_ELEMENT: n.object({
+		to: n.string(),
+		element: i,
+		dropPosition: p,
+		initialItems: a
+	}),
+	SPACE_ADD_TEMPLATE: n.object({
+		element: i,
+		style: n.custom(r),
+		to: n.string(),
+		dropPosition: p,
+		initialItems: a.optional(),
+		variables: n.array(c).optional()
+	}),
+	SPACE_UPDATE_SETTINGS: n.object({
+		path: n.string(),
+		value: n.union([
+			n.string(),
+			n.number(),
+			n.boolean()
 		])
 	}),
-	STYLE_ADD_SELECTOR: t.object({
-		displayMode: d,
-		selector: t.string(),
-		path: p.optional(),
-		type: m,
-		style: c.optional(),
-		params: _
-	}),
-	STYLE_UPDATE_SELECTOR: t.object({
-		displayMode: d,
-		selector: t.string(),
-		path: p.optional(),
-		style: c.optional(),
+	STYLE_ADD_SELECTOR: n.object({
+		displayMode: f,
+		selector: n.string(),
+		path: m.optional(),
+		type: h,
+		style: l.optional(),
 		params: v
 	}),
-	STYLE_REMOVE_SELECTOR: t.object({
-		displayMode: d,
-		selector: t.string()
-	}),
-	STYLE_REMOVE_SELECTORS: t.object({
-		displayMode: d,
-		selectors: t.array(t.string())
-	}),
-	STYLE_ADD_SELECTOR_VARIABLE: x,
-	STYLE_UPDATE_SELECTOR_VARIABLE: x,
-	STYLE_REMOVE_SELECTOR_VARIABLE: S,
-	STYLE_ADD_VARIABLE: C,
-	STYLE_UPDATE_VARIABLE: C,
-	STYLE_REMOVE_VARIABLE: t.object({
-		category: g,
-		name: t.string()
-	}),
-	STYLE_UPDATE_SETTINGS: t.object({
-		path: t.string(),
-		value: t.string()
-	}),
-	STYLE_ADD_FONT: t.object({ font: l }),
-	STYLE_UPDATE_FONT: t.object({
-		family: t.string(),
-		font: l
-	}),
-	STYLE_REMOVE_FONT: t.object({ family: t.string() }),
-	SEGMENT_ADD_ELEMENT: t.object({
-		...y,
-		element: r,
-		dropPosition: f,
-		to: t.string(),
-		initialItems: i.optional(),
-		variables: t.array(s).optional()
-	}),
-	SEGMENT_UPDATE_ELEMENT: t.object({
-		...y,
-		element: r
-	}),
-	SEGMENT_RENAME_ELEMENT: t.object({
-		...y,
-		elementId: t.string(),
-		id: t.string()
-	}),
-	SEGMENT_UPDATE_ELEMENTS: t.object({
-		...y,
-		elements: i
-	}),
-	SEGMENT_REMOVE_ELEMENT: t.object({
-		...y,
-		elementId: t.string()
-	}),
-	SEGMENT_MOVE_ELEMENT: t.object({
-		...y,
-		elementId: t.string(),
-		from: t.string(),
-		to: t.string(),
-		dropPosition: f
-	}),
-	SEGMENT_CLONE_ELEMENT: t.object({
-		...y,
-		element: r,
-		dropPosition: f,
-		to: t.string(),
-		initialItems: i.optional()
-	}),
-	SEGMENT_ADD_TEMPLATE: t.object({
-		...y,
-		element: r,
-		style: t.custom(n),
-		to: t.string(),
-		dropPosition: f,
-		initialItems: i.optional(),
-		variables: t.array(s).optional()
-	}),
-	SEGMENT_SPACE_ADD_VARIABLE: t.object({
-		...y,
-		variable: s
-	}),
-	SEGMENT_SPACE_UPDATE_VARIABLE: t.object({
-		...y,
-		variable: s
-	}),
-	SEGMENT_SPACE_REMOVE_VARIABLE: t.object({
-		...y,
-		variable: t.object({ name: t.string() })
-	}),
-	SEGMENT_STYLE_ADD_SELECTOR: t.object({
-		...y,
-		displayMode: d,
-		selector: t.string(),
-		type: m,
-		path: p.optional(),
-		style: c.optional(),
-		params: _
-	}),
-	SEGMENT_STYLE_UPDATE_SELECTOR: t.object({
-		...y,
-		displayMode: d,
-		selector: t.string(),
-		path: p.optional(),
-		style: c.optional(),
+	STYLE_UPDATE_SELECTOR: n.object({
+		displayMode: f,
+		selector: n.string(),
+		path: m.optional(),
+		style: l.optional(),
+		params: y
+	}),
+	STYLE_REMOVE_SELECTOR: n.object({
+		displayMode: f,
+		selector: n.string()
+	}),
+	STYLE_REMOVE_SELECTORS: n.object({
+		displayMode: f,
+		selectors: n.array(n.string())
+	}),
+	STYLE_ADD_SELECTOR_VARIABLE: S,
+	STYLE_UPDATE_SELECTOR_VARIABLE: S,
+	STYLE_REMOVE_SELECTOR_VARIABLE: C,
+	STYLE_ADD_VARIABLE: w,
+	STYLE_UPDATE_VARIABLE: w,
+	STYLE_REMOVE_VARIABLE: n.object({
+		category: _,
+		name: n.string()
+	}),
+	STYLE_UPDATE_SETTINGS: n.object({
+		path: n.string(),
+		value: n.string()
+	}),
+	STYLE_ADD_FONT: n.object({ font: u }),
+	STYLE_UPDATE_FONT: n.object({
+		family: n.string(),
+		font: u
+	}),
+	STYLE_REMOVE_FONT: n.object({ family: n.string() }),
+	SEGMENT_ADD_ELEMENT: n.object({
+		...b,
+		element: i,
+		dropPosition: p,
+		to: n.string(),
+		initialItems: a.optional(),
+		variables: n.array(c).optional()
+	}),
+	SEGMENT_UPDATE_ELEMENT: n.object({
+		...b,
+		element: i
+	}),
+	SEGMENT_RENAME_ELEMENT: n.object({
+		...b,
+		elementId: n.string(),
+		id: n.string()
+	}),
+	SEGMENT_UPDATE_ELEMENTS: n.object({
+		...b,
+		elements: a
+	}),
+	SEGMENT_REMOVE_ELEMENT: n.object({
+		...b,
+		elementId: n.string()
+	}),
+	SEGMENT_MOVE_ELEMENT: n.object({
+		...b,
+		elementId: n.string(),
+		from: n.string(),
+		to: n.string(),
+		dropPosition: p
+	}),
+	SEGMENT_CLONE_ELEMENT: n.object({
+		...b,
+		element: i,
+		dropPosition: p,
+		to: n.string(),
+		initialItems: a.optional()
+	}),
+	SEGMENT_ADD_TEMPLATE: n.object({
+		...b,
+		element: i,
+		style: n.custom(r),
+		to: n.string(),
+		dropPosition: p,
+		initialItems: a.optional(),
+		variables: n.array(c).optional()
+	}),
+	SEGMENT_SPACE_ADD_VARIABLE: n.object({
+		...b,
+		variable: c
+	}),
+	SEGMENT_SPACE_UPDATE_VARIABLE: n.object({
+		...b,
+		variable: c
+	}),
+	SEGMENT_SPACE_REMOVE_VARIABLE: n.object({
+		...b,
+		variable: n.object({ name: n.string() })
+	}),
+	SEGMENT_STYLE_ADD_SELECTOR: n.object({
+		...b,
+		displayMode: f,
+		selector: n.string(),
+		type: h,
+		path: m.optional(),
+		style: l.optional(),
 		params: v
 	}),
-	SEGMENT_STYLE_REMOVE_SELECTOR: t.object({
-		...y,
-		displayMode: d,
-		selector: t.string()
-	}),
-	SEGMENT_STYLE_REMOVE_SELECTORS: t.object({
-		...y,
-		displayMode: d,
-		selectors: t.array(t.string())
-	}),
-	SEGMENT_STYLE_ADD_SELECTOR_VARIABLE: x.extend(y),
-	SEGMENT_STYLE_UPDATE_SELECTOR_VARIABLE: x.extend(y),
-	SEGMENT_STYLE_REMOVE_SELECTOR_VARIABLE: S.extend(y),
-	SEGMENT_STYLE_ADD_VARIABLE: C.extend(y),
-	SEGMENT_STYLE_UPDATE_VARIABLE: C.extend(y),
-	SEGMENT_STYLE_REMOVE_VARIABLE: t.object({
-		...y,
-		category: g,
-		name: t.string()
+	SEGMENT_STYLE_UPDATE_SELECTOR: n.object({
+		...b,
+		displayMode: f,
+		selector: n.string(),
+		path: m.optional(),
+		style: l.optional(),
+		params: y
+	}),
+	SEGMENT_STYLE_REMOVE_SELECTOR: n.object({
+		...b,
+		displayMode: f,
+		selector: n.string()
+	}),
+	SEGMENT_STYLE_REMOVE_SELECTORS: n.object({
+		...b,
+		displayMode: f,
+		selectors: n.array(n.string())
+	}),
+	SEGMENT_STYLE_ADD_SELECTOR_VARIABLE: S.extend(b),
+	SEGMENT_STYLE_UPDATE_SELECTOR_VARIABLE: S.extend(b),
+	SEGMENT_STYLE_REMOVE_SELECTOR_VARIABLE: C.extend(b),
+	SEGMENT_STYLE_ADD_VARIABLE: w.extend(b),
+	SEGMENT_STYLE_UPDATE_VARIABLE: w.extend(b),
+	SEGMENT_STYLE_REMOVE_VARIABLE: n.object({
+		...b,
+		category: _,
+		name: n.string()
 	})
-}, T = Object.fromEntries(Object.keys(w).map((e) => [e, e])), E = (e, t) => {
-	let n = w[e];
+}, E = Object.fromEntries(Object.keys(T).map((e) => [e, e])), D = (e, t) => {
+	let n = T[e];
 	if (!n) return {
 		ok: !1,
 		issues: [{
@@ -256,4 +251,4 @@ var n = (e) => typeof e == "object" && !!e && !Array.isArray(e), r = t.custom((e
 	};
 };
 //#endregion
-export { T as SpaceEvents, T as default, w as spaceEventSchemas, E as validateSpaceEvent };
+export { E as SpaceEvents, E as default, T as spaceEventSchemas, D as validateSpaceEvent };

package/dist/queries/queryCache.d.ts

@@ -24,12 +24,22 @@ export type QueriesState = {
 };
 export type QueryObserverOptions<T> = {
     meta: QueryMeta;
-    fetcher: () => Promise<T>;
+    /** Given the signal of the request it is making, so an answer nobody can still read is not waited for. */
+    fetcher: (signal: AbortSignal) => Promise<T>;
     /** How long an answer counts as current, in milliseconds. `0` asks again on every mount. */
     staleTime: number;
     /** An answer this rejects is shown but never trusted: the next observer to mount asks again. */
     isCacheable?: (data: T) => boolean;
 };
+/**
+ * What is keeping a query, for the devtools: a query nobody renders is not a leak, it is the grace period doing its
+ * job — but that is only obvious if the panel can say so, and offer to end it.
+ */
+export type QueryUsage = {
+    observers: number;
+    holds: number;
+    collectAt?: number;
+};
 /**
  * One path segment per key.
  *
@@ -65,6 +75,17 @@ export declare class QueryCache {
     getEntry(key: string): QueryEntry | undefined;
     /** Whether `key` has been answered in this session — every answer is written with a TTL, even a distrusted one. */
     hasAnswer(key: string): boolean;
+    /** Who is keeping `key` alive, and when it would be forgotten if nobody else asked for it. */
+    usage(key: string): QueryUsage | undefined;
+    /**
+     * Forgets `key` now: the answer, the grace period and the request still out for it.
+     *
+     * The grace period is what keeps an answer around for somebody coming back, and there is no reason to wait it out
+     * when a reader knows they will not — a devtools panel clearing what a page stopped using, a flow dropping what a
+     * sign-out made meaningless. A query something still renders is left alone: dropping what is on screen leaves it
+     * with nothing and nothing to ask again, since the observer that would ask is already attached.
+     */
+    remove(key: string): boolean;
     /**
      * Keeps `key` from being collected for as long as the returned function is not called, and for `gcTime` after.
      * The latest reader's `gcTime` is the one kept.
@@ -93,8 +114,24 @@ export declare class QueryCache {
      *
      * Invalidating would not do: a stale query still SHOWS what it holds until the new answer lands, and what it holds
      * belongs to the previous visitor. The epoch makes a request still in flight from before land nowhere.
+     *
+     * `refetch` is what becomes of the queries still on screen. As somebody else, they are asked again, so the page in
+     * front of the new person is theirs. As NOBODY it is a sign-out, and there is no one to ask on behalf of: asking
+     * anyway was one refusal per provider still mounted, each reported as a failed session, for a page already on its
+     * way to the guest view.
+     */
+    reset({ refetch }?: {
+        refetch?: boolean;
+    }): Promise<void>;
+    /**
+     * Holding nothing and asking for nothing — the state a query is left in when the answers are forgotten and nobody
+     * asks again.
+     *
+     * Without it the entry is simply gone, and a reader takes that for "about to be asked": it renders as loading for
+     * as long as it stays mounted, because the observer that would ask is already attached and nothing re-runs it.
+     * Written with no life at all, so the next mount asks.
      */
-    reset(): Promise<void>;
+    private markUnasked;
     /**
      * Expiring the path is the invalidation: {@link onExpired} does the rest, for this call and for anybody else who
      * expires a query's path — the dev-tools' "Expire" included. A query that has never answered has no record to

package/dist/queries/queryCache.mjs

@@ -25,6 +25,18 @@ var t = 3e5, n = (e) => {
 	hasAnswer(e) {
 		return this.getEntry(e) !== void 0 && this.store.getFreshness(r(e)) !== void 0;
 	}
+	usage(e) {
+		let t = this.runtimes.get(n(e));
+		return t && {
+			observers: t.observers.size,
+			holds: t.holds,
+			collectAt: t.collectAt
+		};
+	}
+	remove(e) {
+		let t = this.runtimes.get(n(e));
+		return !t || t.observers.size > 0 || t.holds > 0 ? !1 : (this.cancelGc(t), this.collect(t), !0);
+	}
 	hold(e, n = t) {
 		let r = this.ensure(e);
 		return r.gcTime = n, r.holds++, this.cancelGc(r), () => {
@@ -69,12 +81,23 @@ var t = 3e5, n = (e) => {
 			}) || t.push(this.invalidateOne(n));
 		}), Promise.all(t).then(() => void 0);
 	}
-	reset() {
-		this.epochValue++, this.runtimes.forEach((e) => {
-			e.version++, e.inFlight = void 0;
-		}), this.store.setState("entries", {});
-		let e = [];
-		return this.runtimes.forEach((t) => e.push(this.fetchActive(t))), Promise.all(e).then(() => void 0);
+	reset({ refetch: e = !0 } = {}) {
+		if (this.epochValue++, this.runtimes.forEach((e) => {
+			e.version++, e.inFlight = void 0, e.controller?.abort(), e.controller = void 0;
+		}), this.store.setState("entries", {}), !e) return this.runtimes.forEach((e) => this.markUnasked(e)), Promise.resolve();
+		let t = [];
+		return this.runtimes.forEach((e) => t.push(this.fetchActive(e))), Promise.all(t).then(() => void 0);
+	}
+	markUnasked(e) {
+		let t = e.observers.values().next();
+		if (t.done) return;
+		let n = {
+			key: e.key,
+			url: t.value.meta.url,
+			tags: [...e.tags],
+			isFetching: !1
+		};
+		this.store.setState(r(e.key), n, { ttl: 0 });
 	}
 	invalidateOne(e) {
 		return this.store.expire(r(e.key)).length === 0 && e.version++, this.fetchActive(e);
@@ -100,7 +123,7 @@ var t = 3e5, n = (e) => {
 		});
 		let c = this.epochValue, l = e.version, u = (r) => {
 			if (c !== this.epochValue || this.runtimes.get(n(i)) !== e) return Promise.resolve();
-			e.inFlight = void 0;
+			e.inFlight = void 0, e.controller = void 0;
 			let u = l !== e.version;
 			if ("error" in r) {
 				let e = this.getEntry(i);
@@ -123,8 +146,8 @@ var t = 3e5, n = (e) => {
 				}, { ttl: n ? this.ttlOf(e, t) : 0 });
 			}
 			return u ? this.fetchActive(e) : Promise.resolve();
-		};
-		return e.inFlight = t.fetcher().then((e) => u({ data: e }), (e) => u({ error: e })), e.inFlight;
+		}, d = new AbortController();
+		return e.controller = d, e.inFlight = t.fetcher(d.signal).then((e) => u({ data: e }), (e) => u({ error: e })), e.inFlight;
 	}
 	ttlOf(e, t) {
 		let n = e.observers.size > 0 ? Infinity : t.staleTime;
@@ -146,7 +169,7 @@ var t = 3e5, n = (e) => {
 		}), i;
 	}
 	cancelGc(e) {
-		clearTimeout(e.gcTimer), e.gcTimer = void 0;
+		clearTimeout(e.gcTimer), e.gcTimer = void 0, e.collectAt = void 0;
 	}
 	scheduleGc(e) {
 		if (!(e.holds > 0 || e.observers.size > 0)) {
@@ -154,12 +177,12 @@ var t = 3e5, n = (e) => {
 				this.collect(e);
 				return;
 			}
-			e.gcTimer = setTimeout(() => this.collect(e), e.gcTime);
+			e.collectAt = Date.now() + e.gcTime, e.gcTimer = setTimeout(() => this.collect(e), e.gcTime);
 		}
 	}
 	collect(e) {
 		let t = n(e.key);
-		this.runtimes.get(t) === e && e.holds === 0 && e.observers.size === 0 && (this.runtimes.delete(t), this.store.setState(r(e.key), void 0, { unmount: !0 }));
+		this.runtimes.get(t) === e && e.holds === 0 && e.observers.size === 0 && (this.runtimes.delete(t), e.controller?.abort(), this.store.setState(r(e.key), void 0, { unmount: !0 }));
 	}
 }, a = new i();
 //#endregion

package/dist/queries/useQuery.d.ts

@@ -3,7 +3,7 @@ export type UseQueryOptions<T> = {
     /** What identifies the answer. Without one the hook is inert: it reads, holds and asks for nothing. */
     key: string | undefined;
     meta: QueryMeta;
-    fetcher: () => Promise<T>;
+    fetcher: (signal: AbortSignal) => Promise<T>;
     enabled?: boolean;
     /** How long an answer counts as current, in milliseconds. */
     staleTime: number;

package/dist/queries/useQuery.mjs

@@ -18,7 +18,7 @@ var { useStore: s } = o(), c = ({ key: o, meta: c, fetcher: l, enabled: u = !0,
 				tags: x ? x.split("\0") : []
 			},
 			staleTime: d,
-			fetcher: () => v.current(),
+			fetcher: (e) => v.current(e),
 			isCacheable: (e) => y.current?.(e) ?? !0
 		});
 	}, [

package/dist/schema/index.d.ts

@@ -1,5 +1,6 @@
 import { default as SchemaContext } from './SchemaContext';
 export * from './schemaConstants';
 export * from './SchemaContext';
+export * from './layoutChain';
 export * from './serverElements';
 export { SchemaContext };