@openrails/contentkit-ui 0.98.6 → 0.99.0

package/dist/react/public.js

@@ -1,91 +1,95 @@
 import { defaultImage as e, isPattern as t, ruleDir as n, stableImage as r } from "../client/media/rules.js";
 import { useOptionalContentKitClient as i, useReadScope as a } from "./context.js";
-import { useContentScope as o } from "./use-resource.js";
-import { useKinds as s } from "./groups.js";
-import { useMediaRead as c } from "./read.js";
-import { useEffect as l, useMemo as u, useState as d } from "react";
+import { resourcesFor as o } from "./resources.js";
+import { keyOf as s, useContentScope as c, useResource as l } from "./use-resource.js";
+import { useKinds as u } from "./groups.js";
+import { useMediaRead as d } from "./read.js";
+import { useCallback as f, useEffect as p, useMemo as m, useState as h } from "react";
 //#region src/react/public.ts
-var f = /* @__PURE__ */ new WeakMap(), p = /* @__PURE__ */ new WeakMap();
-function m(e = {}) {
-	let t = i(e.client), [, n] = d(0), r = t ? f.get(t) : void 0;
-	return l(() => {
-		if (!t || f.has(t)) return;
-		let e = !0, r = p.get(t);
-		return r || (r = t.media.presets().then((e) => void f.set(t, { presets: e }), (e) => void f.set(t, {
-			presets: [],
-			error: e
-		})).finally(() => p.delete(t)), p.set(t, r)), r.then(() => e && n((e) => e + 1)), () => {
-			e = !1;
-		};
-	}, [t]), {
-		presets: r?.presets ?? [],
-		loaded: !!r || !t,
-		error: r?.error
+var g = /* @__PURE__ */ new WeakMap();
+function _(e = {}) {
+	let t = i(e.client), n = t ? o(t) : null, r = t ? s("presets") : null, a = t ? g.get(t) : void 0, c = l(n, r, { type: "presets" }, async () => {
+		let e = await t.media.presets();
+		return g.set(t, e), e;
+	}, { initial: a });
+	return p(() => {
+		r && n?.snapshot(r).error && n.load(r, !0);
+	}, [r, n]), {
+		presets: c.data ?? [],
+		loaded: c.loaded || !!a || !t,
+		error: c.error,
+		reload: c.reload
 	};
 }
-function h(r, a, o = {}) {
-	let { kind: s, id: l, version: d } = r, f = i(o.client), { presets: p, loaded: h } = m({ client: f }), g = p.find((e) => e.kind === s && e.name === a), _ = o.image !== void 0, v = g ? t(g.from) ? n(g.from) : g.from : void 0, y = c(r, {
-		prefix: v,
-		read: _ || !h ? null : o.read,
-		client: f
-	});
+function v(r, a, o = {}) {
+	let { kind: s, id: c, version: l } = r, u = i(o.client), { presets: p, loaded: h, error: g, reload: v } = _({ client: u }), y = p.find((e) => e.kind === s && e.name === a), b = o.image !== void 0, x = y ? t(y.from) ? n(y.from) : y.from : void 0, S = d(r, {
+		prefix: x,
+		read: b || !h ? null : o.read,
+		client: u
+	}), C = m(() => {
+		let t = b ? o.image : S.read?.public?.find((e) => e.preset === a);
+		if (t && t.renditions.length) return {
+			image: {
+				preset: a,
+				renditions: t.renditions,
+				aspect: "aspect" in t && t.aspect || y?.aspect
+			},
+			isDefault: !1
+		};
+		if (!b && !S.read) return {
+			image: null,
+			isDefault: !1
+		};
+		let n = y && e(y, c, l);
+		return n ? {
+			image: n,
+			isDefault: !0
+		} : {
+			image: null,
+			isDefault: !1
+		};
+	}, [
+		b,
+		o.image,
+		S.read,
+		a,
+		y,
+		c,
+		l
+	]), w = S.reload, T = f(() => {
+		g && v(), w();
+	}, [
+		g,
+		v,
+		w
+	]);
 	return {
-		...u(() => {
-			let t = _ ? o.image : y.read?.public?.find((e) => e.preset === a);
-			if (t && t.renditions.length) return {
-				image: {
-					preset: a,
-					renditions: t.renditions,
-					aspect: "aspect" in t && t.aspect || g?.aspect
-				},
-				isDefault: !1
-			};
-			if (!_ && !y.read) return {
-				image: null,
-				isDefault: !1
-			};
-			let n = g && e(g, l, d);
-			return n ? {
-				image: n,
-				isDefault: !0
-			} : {
-				image: null,
-				isDefault: !1
-			};
-		}, [
-			_,
-			o.image,
-			y.read,
-			a,
-			g,
-			l,
-			d
-		]),
-		rule: g,
-		loading: !h || y.loading,
-		error: y.error,
-		reload: y.reload
+		...C,
+		rule: y,
+		loading: !h || S.loading,
+		error: S.error ?? g,
+		reload: T
 	};
 }
-function g(e, i = {}) {
-	let { client: f, viewer: p } = o(i.client), m = a(), { kinds: h } = s({ client: f }), g = h?.avatars, _ = !!g && !!e && e === p, v = g ? t(g.from) ? n(g.from) : g.from : void 0, y = c({
+function y(e, i = {}) {
+	let { client: o, viewer: s } = c(i.client), l = a(), { kinds: f } = u({ client: o }), g = f?.avatars, _ = !!g && !!e && e === s, v = g ? t(g.from) ? n(g.from) : g.from : void 0, y = d({
 		kind: g?.kind ?? "",
 		id: e ?? ""
 	}, {
-		client: f,
+		client: o,
 		prefix: v,
 		read: _ ? void 0 : null
-	}), [b, x] = d(null);
-	!_ && b && x(null), _ && y.read && (b?.read !== y.read || b.client !== f || b.scope !== m || b.id !== e) && x({
-		client: f,
-		scope: m,
+	}), [b, x] = h(null);
+	!_ && b && x(null), _ && y.read && (b?.read !== y.read || b.client !== o || b.scope !== l || b.id !== e) && x({
+		client: o,
+		scope: l,
 		id: e,
 		read: y.read
 	});
 	let S = y.error && (y.error.transient || y.error.status >= 500);
 	_ && y.error && !S && b && x(null);
-	let { refresh: C } = y, w = y.read ?? (_ && (y.loading || S) && b?.client === f && b.scope === m && b.id === e ? b.read : null);
-	return l(() => {
+	let { refresh: C } = y, w = y.read ?? (_ && (y.loading || S) && b?.client === o && b.scope === l && b.id === e ? b.read : null);
+	return p(() => {
 		if (!_) return;
 		let e = () => {
 			document.visibilityState === "visible" && C();
@@ -93,7 +97,7 @@ function g(e, i = {}) {
 		return window.addEventListener("focus", C), document.addEventListener("visibilitychange", e), () => {
 			window.removeEventListener("focus", C), document.removeEventListener("visibilitychange", e);
 		};
-	}, [_, C]), u(() => {
+	}, [_, C]), m(() => {
 		if (!g || !e) return null;
 		if (!_) return r(g, e);
 		let t = w?.public?.find((e) => e.preset === g.name);
@@ -110,6 +114,6 @@ function g(e, i = {}) {
 	]);
 }
 //#endregion
-export { g as useAvatar, m as usePresets, h as usePublicImage };
+export { y as useAvatar, _ as usePresets, v as usePublicImage };
 
 //# sourceMappingURL=public.js.map

package/dist/react/public.js.map

@@ -1 +1 @@
-{"version":3,"file":"public.js","names":[],"sources":["../../src/react/public.ts"],"sourcesContent":["import { useEffect, useMemo, useState } from \"react\";\nimport type { ContentKitClient } from \"../client/client.js\";\nimport type { ContentKitError } from \"../client/errors.js\";\nimport type { ReadResult, RefBody } from \"../client/generated/wire.js\";\nimport type { PresetRule } from \"../client/generated/wire.js\";\nimport { defaultImage, isPattern, ruleDir, stableImage } from \"../client/media/rules.js\";\nimport type { PublicPreset } from \"../client/public.js\";\nimport { useOptionalContentKitClient, useReadScope } from \"./context.js\";\nimport { useKinds } from \"./groups.js\";\nimport { useMediaRead } from \"./read.js\";\nimport { useContentScope } from \"./use-resource.js\";\n\nexport interface UsePresets {\n  /** Every kind's public presets; empty until they load (or when the server has none). */\n  presets: PresetRule[];\n  loaded: boolean;\n  error?: ContentKitError;\n}\n\nconst settled = new WeakMap<ContentKitClient, { presets: PresetRule[]; error?: ContentKitError }>();\nconst inflight = new WeakMap<ContentKitClient, Promise<void>>();\n\n/** The public presets (`GET /media/presets`), fetched once per client. */\nexport function usePresets(o: { client?: ContentKitClient | null } = {}): UsePresets {\n  const client = useOptionalContentKitClient(o.client);\n  const [, rerender] = useState(0);\n  const done = client ? settled.get(client) : undefined;\n  useEffect(() => {\n    if (!client || settled.has(client)) return;\n    let live = true;\n    let load = inflight.get(client);\n    if (!load) {\n      load = client.media.presets().then(\n        (presets) => void settled.set(client, { presets }),\n        (error: ContentKitError) => void settled.set(client, { presets: [], error }),\n      ).finally(() => inflight.delete(client));\n      inflight.set(client, load);\n    }\n    void load.then(() => live && rerender((n) => n + 1));\n    return () => {\n      live = false;\n    };\n  }, [client]);\n  return { presets: done?.presets ?? [], loaded: !!done || !client, error: done?.error };\n}\n\nexport interface PublicImageOptions {\n  /** The host's listing of the item's image (its API's): shown without a read. */\n  image?: PublicPreset | null;\n  /** A read of the item the host already has. */\n  read?: ReadResult | null;\n  /** Overrides the provider's client. */\n  client?: ContentKitClient | null;\n}\n\nexport interface UsePublicImage {\n  /** The item's current renditions; else the kind's default image (when the preset has one); null while unknown or when there is neither. */\n  image: PublicPreset | null;\n  /** The preset's rules (aspect, widths, min_width) once the presets load. */\n  rule?: PresetRule;\n  /** image is the kind's default, not the item's own. */\n  isDefault: boolean;\n  loading: boolean;\n  error?: ContentKitError;\n  reload: () => void;\n}\n\n/**\n * An item's public image for a preset (\"avatar\", \"cover\", a version's\n * \"poster\"): the exact renditions from a read's `public` (or the host's\n * listing), else the kind's default image, else none. Reads refresh after\n * commits through the same client.\n */\nexport function usePublicImage(item: RefBody, preset: string, o: PublicImageOptions = {}): UsePublicImage {\n  const { kind, id, version } = item;\n  const client = useOptionalContentKitClient(o.client);\n  const { presets, loaded } = usePresets({ client });\n  const rule = presets.find((p) => p.kind === kind && p.name === preset);\n  const listed = o.image !== undefined;\n  // The read waits for the presets, so it lists only the preset's upload.\n  const prefix = rule ? (isPattern(rule.from) ? ruleDir(rule.from) : rule.from) : undefined;\n  const r = useMediaRead(item, { prefix, read: listed || !loaded ? null : o.read, client });\n  const image = useMemo((): { image: PublicPreset | null; isDefault: boolean } => {\n    const own = listed ? o.image : r.read?.public?.find((p) => p.preset === preset);\n    if (own && own.renditions.length) return { image: { preset, renditions: own.renditions, aspect: (\"aspect\" in own && own.aspect) || rule?.aspect }, isDefault: false };\n    if (!listed && !r.read) return { image: null, isDefault: false };\n    const def = rule && defaultImage(rule, id, version);\n    return def ? { image: def, isDefault: true } : { image: null, isDefault: false };\n  }, [listed, o.image, r.read, preset, rule, id, version]);\n  return { ...image, rule, loading: !loaded || r.loading, error: r.error, reload: r.reload };\n}\n\n/**\n * A person's avatar. The signed-in viewer reads their current immutable\n * publication and follows upload/crop/removal events. Other accounts keep the\n * stable public URL without one API request per author in a listing.\n */\nexport function useAvatar(userId: string | null | undefined, o: { client?: ContentKitClient } = {}): PublicPreset | null {\n  const { client, viewer } = useContentScope(o.client);\n  const scope = useReadScope();\n  const { kinds } = useKinds({ client });\n  const rule = kinds?.avatars;\n  const own = !!rule && !!userId && userId === viewer;\n  const prefix = rule ? (isPattern(rule.from) ? ruleDir(rule.from) : rule.from) : undefined;\n  const current = useMediaRead({ kind: rule?.kind ?? \"\", id: userId ?? \"\" }, { client, prefix, read: own ? undefined : null });\n  const [last, setLast] = useState<{ client: ContentKitClient; scope: string; id: string; read: ReadResult } | null>(null);\n  if (!own && last) setLast(null);\n  if (own && current.read && (last?.read !== current.read || last.client !== client || last.scope !== scope || last.id !== userId)) {\n    setLast({ client, scope, id: userId!, read: current.read });\n  }\n  const transient = current.error && (current.error.transient || current.error.status >= 500);\n  if (own && current.error && !transient && last) setLast(null);\n  const { refresh } = current;\n  const read = current.read ?? (own && (current.loading || transient) && last?.client === client && last.scope === scope && last.id === userId ? last.read : null);\n\n\n  // Another app can change the shared avatar while this tab is inactive.\n  // The read store deduplicates refreshes from multiple consumers.\n  useEffect(() => {\n    if (!own) return;\n    const visible = () => { if (document.visibilityState === \"visible\") refresh(); };\n    window.addEventListener(\"focus\", refresh);\n    document.addEventListener(\"visibilitychange\", visible);\n    return () => {\n      window.removeEventListener(\"focus\", refresh);\n      document.removeEventListener(\"visibilitychange\", visible);\n    };\n  }, [own, refresh]);\n\n  return useMemo(() => {\n    if (!rule || !userId) return null;\n    if (!own) return stableImage(rule, userId);\n    const publication = read?.public?.find((p) => p.preset === rule.name);\n    return publication?.renditions.length ? { preset: rule.name, aspect: rule.aspect, renditions: publication.renditions } : null;\n  }, [rule, userId, own, read]);\n}\n"],"mappings":"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"}
+{"version":3,"file":"public.js","names":[],"sources":["../../src/react/public.ts"],"sourcesContent":["import { useCallback, useEffect, useMemo, useState } from \"react\";\nimport type { ContentKitClient } from \"../client/client.js\";\nimport type { ContentKitError } from \"../client/errors.js\";\nimport type { ReadResult, RefBody } from \"../client/generated/wire.js\";\nimport type { PresetRule } from \"../client/generated/wire.js\";\nimport { defaultImage, isPattern, ruleDir, stableImage } from \"../client/media/rules.js\";\nimport type { PublicPreset } from \"../client/public.js\";\nimport { useOptionalContentKitClient, useReadScope } from \"./context.js\";\nimport { useKinds } from \"./groups.js\";\nimport { useMediaRead } from \"./read.js\";\nimport { keyOf, useContentScope, useResource } from \"./use-resource.js\";\nimport { resourcesFor } from \"./resources.js\";\n\nexport interface UsePresets {\n  /** Every kind's public presets; empty until they load (or when the server has none). */\n  presets: PresetRule[];\n  loaded: boolean;\n  error?: ContentKitError;\n  /** Retry a failed read; successful public presets remain cached. */\n  reload: () => void;\n}\n\n// Seed remounts synchronously with successful, immutable public metadata.\n// Failures stay in the mounted resource and are never cached here.\nconst settled = new WeakMap<ContentKitClient, PresetRule[]>();\n\n/** Public presets, shared across consumers; failed reads can be retried. */\nexport function usePresets(o: { client?: ContentKitClient | null } = {}): UsePresets {\n  const client = useOptionalContentKitClient(o.client);\n  const store = client ? resourcesFor(client) : null;\n  const key = client ? keyOf(\"presets\") : null;\n  const initial = client ? settled.get(client) : undefined;\n  const r = useResource<PresetRule[]>(store, key, { type: \"presets\" }, async () => {\n    const presets = await client!.media.presets();\n    settled.set(client!, presets);\n    return presets;\n  }, { initial });\n  useEffect(() => {\n    // A remount may join a failed slot before its deferred cleanup. Retry\n    // once on mounting, rather than retrying continuously after each error.\n    if (key && store?.snapshot(key).error) store.load(key, true);\n  }, [key, store]);\n  return { presets: r.data ?? [], loaded: r.loaded || !!initial || !client, error: r.error, reload: r.reload };\n}\n\nexport interface PublicImageOptions {\n  /** The host's listing of the item's image (its API's): shown without a read. */\n  image?: PublicPreset | null;\n  /** A read of the item the host already has. */\n  read?: ReadResult | null;\n  /** Overrides the provider's client. */\n  client?: ContentKitClient | null;\n}\n\nexport interface UsePublicImage {\n  /** The item's current renditions; else the kind's default image (when the preset has one); null while unknown or when there is neither. */\n  image: PublicPreset | null;\n  /** The preset's rules (aspect, widths, min_width) once the presets load. */\n  rule?: PresetRule;\n  /** image is the kind's default, not the item's own. */\n  isDefault: boolean;\n  loading: boolean;\n  error?: ContentKitError;\n  reload: () => void;\n}\n\n/**\n * An item's public image for a preset (\"avatar\", \"cover\", a version's\n * \"poster\"): the exact renditions from a read's `public` (or the host's\n * listing), else the kind's default image, else none. Reads refresh after\n * commits through the same client.\n */\nexport function usePublicImage(item: RefBody, preset: string, o: PublicImageOptions = {}): UsePublicImage {\n  const { kind, id, version } = item;\n  const client = useOptionalContentKitClient(o.client);\n  const { presets, loaded, error: presetError, reload: reloadPresets } = usePresets({ client });\n  const rule = presets.find((p) => p.kind === kind && p.name === preset);\n  const listed = o.image !== undefined;\n  // The read waits for the presets, so it lists only the preset's upload.\n  const prefix = rule ? (isPattern(rule.from) ? ruleDir(rule.from) : rule.from) : undefined;\n  const r = useMediaRead(item, { prefix, read: listed || !loaded ? null : o.read, client });\n  const image = useMemo((): { image: PublicPreset | null; isDefault: boolean } => {\n    const own = listed ? o.image : r.read?.public?.find((p) => p.preset === preset);\n    if (own && own.renditions.length) return { image: { preset, renditions: own.renditions, aspect: (\"aspect\" in own && own.aspect) || rule?.aspect }, isDefault: false };\n    if (!listed && !r.read) return { image: null, isDefault: false };\n    const def = rule && defaultImage(rule, id, version);\n    return def ? { image: def, isDefault: true } : { image: null, isDefault: false };\n  }, [listed, o.image, r.read, preset, rule, id, version]);\n  const reloadRead = r.reload;\n  const reload = useCallback(() => { if (presetError) reloadPresets(); reloadRead(); }, [presetError, reloadPresets, reloadRead]);\n  return { ...image, rule, loading: !loaded || r.loading, error: r.error ?? presetError, reload };\n}\n\n/**\n * A person's avatar. The signed-in viewer reads their current immutable\n * publication and follows upload/crop/removal events. Other accounts keep the\n * stable public URL without one API request per author in a listing.\n */\nexport function useAvatar(userId: string | null | undefined, o: { client?: ContentKitClient } = {}): PublicPreset | null {\n  const { client, viewer } = useContentScope(o.client);\n  const scope = useReadScope();\n  const { kinds } = useKinds({ client });\n  const rule = kinds?.avatars;\n  const own = !!rule && !!userId && userId === viewer;\n  const prefix = rule ? (isPattern(rule.from) ? ruleDir(rule.from) : rule.from) : undefined;\n  const current = useMediaRead({ kind: rule?.kind ?? \"\", id: userId ?? \"\" }, { client, prefix, read: own ? undefined : null });\n  const [last, setLast] = useState<{ client: ContentKitClient; scope: string; id: string; read: ReadResult } | null>(null);\n  if (!own && last) setLast(null);\n  if (own && current.read && (last?.read !== current.read || last.client !== client || last.scope !== scope || last.id !== userId)) {\n    setLast({ client, scope, id: userId!, read: current.read });\n  }\n  const transient = current.error && (current.error.transient || current.error.status >= 500);\n  if (own && current.error && !transient && last) setLast(null);\n  const { refresh } = current;\n  const read = current.read ?? (own && (current.loading || transient) && last?.client === client && last.scope === scope && last.id === userId ? last.read : null);\n\n\n  // Another app can change the shared avatar while this tab is inactive.\n  // The read store deduplicates refreshes from multiple consumers.\n  useEffect(() => {\n    if (!own) return;\n    const visible = () => { if (document.visibilityState === \"visible\") refresh(); };\n    window.addEventListener(\"focus\", refresh);\n    document.addEventListener(\"visibilitychange\", visible);\n    return () => {\n      window.removeEventListener(\"focus\", refresh);\n      document.removeEventListener(\"visibilitychange\", visible);\n    };\n  }, [own, refresh]);\n\n  return useMemo(() => {\n    if (!rule || !userId) return null;\n    if (!own) return stableImage(rule, userId);\n    const publication = read?.public?.find((p) => p.preset === rule.name);\n    return publication?.renditions.length ? { preset: rule.name, aspect: rule.aspect, renditions: publication.renditions } : null;\n  }, [rule, userId, own, read]);\n}\n"],"mappings":"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"}

package/dist/react/resources.d.ts

@@ -22,21 +22,13 @@ export interface Tag {
     type: string;
     readScope?: string;
     target?: Target;
+    language?: string;
     id?: string;
     scope?: string;
 }
-interface Slot {
-    tag: Tag;
-    listeners: Set<() => void>;
-    entry: Resource<unknown>;
-    fetcher?: Fetcher<unknown>;
+interface Binding {
+    fetcher: Fetcher<unknown>;
     more?: (cursor: string | number, signal: AbortSignal) => Promise<Page<unknown>>;
-    ctl?: AbortController;
-    moreCtl?: AbortController;
-    /** Bumped by mark(): an optimistic write rolls back only if no newer one started. */
-    version: number;
-    /** Identifies the full read; item patches and appended pages retain it. */
-    readVersion: number;
 }
 /**
  * The content reads hooks share, per client: one request per key while any
@@ -49,8 +41,8 @@ export declare class ResourceStore {
     constructor(client: ContentKitClient);
     subscribe(key: string, tag: Tag, listener: () => void): () => void;
     snapshot<T>(key: string): Resource<T>;
-    /** The latest fetchers of a key: its first read, and a list's next page. */
-    bind(key: string, fetcher: Fetcher<unknown>, more?: Slot["more"]): void;
+    /** Registers one subscriber's key-bound fetchers; cleanup releases only it. */
+    bind(key: string, fetcher: Fetcher<unknown>, more?: Binding["more"]): () => void;
     /** Fetches unless loaded or in flight; force refetches (a list from its first page). */
     load(key: string, force?: boolean): void;
     /** Appends a list's next page; resolves once it landed. */

package/dist/react/resources.js

@@ -1,63 +1,68 @@
 import { toContentKitError as e } from "../client/errors.js";
 import { sameTarget as t } from "../client/content/types.js";
 //#region src/react/resources.ts
-var n = {
+var n = (e) => [...e.bindings.values()].at(-1), r = {
 	data: void 0,
 	loading: !1,
 	loaded: !1
-}, r = class {
+}, i = class {
 	slots = /* @__PURE__ */ new Map();
 	version = 0;
 	constructor(e) {
 		e.subscribe((e, t) => this.apply(e, t));
 	}
-	subscribe(e, t, r) {
+	subscribe(e, t, n) {
 		let i = this.slots.get(e);
 		i || this.slots.set(e, i = {
 			tag: t,
 			listeners: /* @__PURE__ */ new Set(),
-			entry: n,
+			bindings: /* @__PURE__ */ new Map(),
+			entry: r,
 			version: 0,
 			readVersion: ++this.version
 		});
 		let a = i;
-		return a.listeners.add(r), () => {
-			a.listeners.delete(r), queueMicrotask(() => {
+		return a.listeners.add(n), () => {
+			a.listeners.delete(n), queueMicrotask(() => {
 				a.listeners.size || this.slots.get(e) !== a || (a.ctl?.abort(), a.moreCtl?.abort(), this.slots.delete(e));
 			});
 		};
 	}
 	snapshot(e) {
-		return this.slots.get(e)?.entry ?? n;
+		return this.slots.get(e)?.entry ?? r;
 	}
 	bind(e, t, n) {
 		let r = this.slots.get(e);
-		r && Object.assign(r, {
+		if (!r) return () => {};
+		let i = Symbol();
+		return r.bindings.set(i, {
 			fetcher: t,
 			more: n
-		});
+		}), () => {
+			r.bindings.delete(i);
+		};
 	}
-	load(t, n = !1) {
-		let r = this.slots.get(t);
-		if (!r?.fetcher || !n && (r.entry.loaded || r.ctl)) return;
-		r.ctl?.abort(), r.moreCtl?.abort(), r.moreCtl = void 0;
-		let i = r.ctl = new AbortController();
-		this.update(r, {
+	load(t, r = !1) {
+		let i = this.slots.get(t), a = i && n(i);
+		if (!i || !a || !r && (i.entry.loaded || i.ctl)) return;
+		i.ctl?.abort(), i.moreCtl?.abort(), i.moreCtl = void 0;
+		let o = i.ctl = new AbortController();
+		this.update(i, {
 			loading: !0,
 			loadingMore: !1,
 			error: void 0
-		}), r.fetcher(i.signal).then((e) => {
-			r.ctl === i && (r.ctl = void 0, r.readVersion = ++this.version, this.update(r, {
+		}), a.fetcher(o.signal).then((e) => {
+			i.ctl === o && (i.ctl = void 0, i.readVersion = ++this.version, this.update(i, {
 				data: e,
 				loading: !1,
 				loaded: !0,
 				error: void 0
 			}));
 		}, (t) => {
-			if (r.ctl !== i) return;
-			r.ctl = void 0;
+			if (i.ctl !== o) return;
+			i.ctl = void 0;
 			let n = e(t);
-			n.code !== "aborted" && this.update(r, {
+			n.code !== "aborted" && this.update(i, {
 				loading: !1,
 				loaded: !0,
 				error: n
@@ -65,26 +70,26 @@ var n = {
 		});
 	}
 	async loadMore(t) {
-		let n = this.slots.get(t), r = n?.entry.data;
-		if (!n?.more || !r || r.next === null || n.moreCtl || n.ctl) return;
-		let i = n.moreCtl = new AbortController();
-		this.update(n, { loadingMore: !0 });
+		let r = this.slots.get(t), i = r && n(r), a = r?.entry.data;
+		if (!r || !i?.more || !a || a.next === null || r.moreCtl || r.ctl) return;
+		let o = r.moreCtl = new AbortController();
+		this.update(r, { loadingMore: !0 });
 		try {
-			let e = await n.more(r.next, i.signal);
-			if (n.moreCtl !== i) return;
-			let t = n.entry.data, a = new Set(t.items.map((e) => e.id));
-			this.update(n, {
+			let e = await i.more(a.next, o.signal);
+			if (r.moreCtl !== o) return;
+			let t = r.entry.data, n = new Set(t.items.map((e) => e.id));
+			this.update(r, {
 				data: {
-					items: [...t.items, ...e.items.filter((e) => !a.has(e.id))],
+					items: [...t.items, ...e.items.filter((e) => !n.has(e.id))],
 					next: e.next
 				},
 				error: void 0
 			});
 		} catch (t) {
-			let r = e(t);
-			n.moreCtl === i && r.code !== "aborted" && this.update(n, { error: r });
+			let n = e(t);
+			r.moreCtl === o && n.code !== "aborted" && this.update(r, { error: n });
 		} finally {
-			n.moreCtl === i && (n.moreCtl = void 0, this.update(n, { loadingMore: !1 }));
+			r.moreCtl === o && (r.moreCtl = void 0, this.update(r, { loadingMore: !1 }));
 		}
 	}
 	set(e, t) {
@@ -142,6 +147,10 @@ var n = {
 			};
 		});
 		switch (e.type) {
+			case "media.committed":
+			case "media.processed":
+				this.invalidate((t) => t.type === "page-review" && t.id === e.ref.version);
+				break;
 			case "notifications.updated":
 				this.updateNotification(e.item, n);
 				break;
@@ -149,14 +158,14 @@ var n = {
 				this.invalidate((e) => e.type === "notifications");
 				break;
 			case "comment.created": {
-				let n = e.comment.reply_to_id, a = !e.comment.moderation;
-				r((r) => n ? r.type === "replies" && r.id === n : r.type === "comments" && t(r.target, e.target), (t) => t.items.some((t) => t.id === e.comment.id) ? t : {
+				let n = e.comment.reply_to_id, a = !e.comment.moderation, o = (n) => t(n.target, e.target) && (!n.language || n.language === e.comment.language);
+				r((e) => n ? e.type === "replies" && e.id === n : e.type === "comments" && o(e), (t) => t.items.some((t) => t.id === e.comment.id) ? t : {
 					...t,
 					items: n ? [...t.items, e.comment] : [e.comment, ...t.items]
 				}), n && a && i(["comments"], (e) => e.id === n ? {
 					...e,
 					reply_count: e.reply_count + 1
-				} : e), this.invalidate((e) => e.type === "latest" || e.type === "admin-comments");
+				} : e), this.invalidate((e) => e.type === "latest" || e.type === "admin-comments"), n || this.invalidate((e) => e.type === "standing" && o(e));
 				break;
 			}
 			case "comment.updated":
@@ -164,7 +173,7 @@ var n = {
 					...t,
 					...e.comment,
 					author: e.comment.author ?? t.author
-				} : t);
+				} : t), this.invalidate((e) => e.type === "standing");
 				break;
 			case "comment.reacted":
 				i(a, (t) => t.id === e.id ? {
@@ -188,11 +197,11 @@ var n = {
 					...t,
 					deleted: !0,
 					deleted_at: (/* @__PURE__ */ new Date()).toISOString()
-				} : t);
+				} : t), this.invalidate((e) => e.type === "standing");
 				break;
 			}
 			case "comment.restored":
-				this.invalidate((e) => a.includes(e.type));
+				this.invalidate((e) => a.includes(e.type) || e.type === "standing");
 				break;
 			case "reaction.changed":
 				r((n) => n.type === "reaction" && t(n.target, e.target), () => e.counts), e.target.type === "contents" && (o(e.target.id, (t) => ({
@@ -221,17 +230,17 @@ var n = {
 				})), this.invalidate((e) => e.type === "daily-releases")), this.invalidate((e) => e.type === "favorites");
 				break;
 			case "content.saved":
-				r((t) => t.type === "content" && t.id === e.content.id, () => e.content), this.invalidate((t) => t.type === "contents" || t.type === "cards" || t.type === "daily-releases" || t.type === "content-detail" && t.id === e.content.id);
+				r((t) => t.type === "content" && t.id === e.content.id, () => e.content), this.invalidate((t) => t.type === "contents" || t.type === "cards" || t.type === "daily-releases" || t.type === "content-detail" && t.id === e.content.id), this.invalidate((t) => t.type === "standing" && t.target?.type === "contents" && t.target.id === e.content.id);
 				break;
 			case "content.changed":
-				this.invalidate((t) => (t.type === "content" || t.type === "content-detail") && t.id === e.id || t.type === "contents" || t.type === "cards" || t.type === "daily-releases");
+				this.invalidate((t) => (t.type === "content" || t.type === "content-detail") && t.id === e.id || t.type === "contents" || t.type === "cards" || t.type === "daily-releases"), this.invalidate((t) => t.type === "standing" && t.target?.type === "contents" && t.target.id === e.id);
 				break;
 			case "content.deleted":
 				i([
 					"contents",
 					"cards",
 					"history"
-				], (t) => t.id === e.id ? null : t), this.invalidate((t) => (t.type === "content" || t.type === "content-detail") && t.id === e.id || t.type === "contents" && t.scope === "deleted" || t.type === "daily-releases");
+				], (t) => t.id === e.id ? null : t), this.invalidate((t) => (t.type === "content" || t.type === "content-detail") && t.id === e.id || t.type === "contents" && t.scope === "deleted" || t.type === "daily-releases"), this.invalidate((t) => t.type === "standing" && t.target?.type === "contents" && t.target.id === e.id);
 				break;
 			case "poll.created":
 				this.invalidate((e) => e.type === "polls" || e.type === "poll" && !e.id);
@@ -256,7 +265,7 @@ var n = {
 				this.invalidate((e) => e.type === "cards" || e.type === "history" || e.type === "release-dates" || e.type === "daily-releases");
 				break;
 			case "access.changed":
-				this.invalidate((e) => e.type === "cards" || e.type === "history" || e.type === "content-detail" || e.type === "reader-plan" || e.type.startsWith("group") || e.type === "daily-releases");
+				this.invalidate((e) => e.type === "cards" || e.type === "history" || e.type === "content-detail" || e.type === "reader-plan" || e.type.startsWith("group") || e.type === "daily-releases" || e.type === "standing");
 				break;
 			case "history.changed":
 				this.invalidate((e) => e.type === "history" || e.type === "cards" || e.type === "daily-releases");
@@ -268,9 +277,9 @@ var n = {
 				this.invalidate((t) => t.type === "moderation-rules" && t.scope === e.rules);
 				break;
 			case "reader.changed":
-				this.invalidate((t) => t.type === "reader-plan" && t.id === e.version);
+				this.invalidate((t) => (t.type === "reader-plan" || t.type === "page-review") && t.id === e.version);
 				break;
-			case "moderation.resolved": i(["held"], (t) => t.id === e.id ? null : t), e.kind === "comment" ? this.invalidate((e) => a.includes(e.type)) : this.invalidate((t) => t.type === "content" && t.id === e.id || t.type === "contents");
+			case "moderation.resolved": i(["held"], (t) => t.id === e.id ? null : t), e.kind === "comment" ? this.invalidate((e) => a.includes(e.type) || e.type === "standing") : this.invalidate((t) => t.type === "content" && t.id === e.id || t.type === "contents");
 		}
 	}
 	updateNotification(e, t) {
@@ -300,12 +309,12 @@ var n = {
 		};
 		for (let t of e.listeners) t();
 	}
-}, i = /* @__PURE__ */ new WeakMap();
-function a(e) {
-	let t = i.get(e);
-	return t || i.set(e, t = new r(e)), t;
+}, a = /* @__PURE__ */ new WeakMap();
+function o(e) {
+	let t = a.get(e);
+	return t || a.set(e, t = new i(e)), t;
 }
 //#endregion
-export { r as ResourceStore, a as resourcesFor };
+export { i as ResourceStore, o as resourcesFor };
 
 //# sourceMappingURL=resources.js.map