@shivaedev/work-board 0.15.0 → 0.16.0

package/src/client/react/useBoardNavigation.ts

@@ -1,23 +1,27 @@
 import { useRouter } from "@tanstack/react-router";
-import { useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
 import type { RouterShell } from "#client/react/loadBoardPage.ts";
 import { useMainLocation } from "#client/react/MainLocationContext.ts";
-import { currentEntry, navigationFailure, readingKey, sameReadingLocation } from "#client/react/navigationLocation.ts";
+import { currentEntry, navigationFailure, readingKey, recordEntry, sameReadingLocation } from "#client/react/navigationLocation.ts";
+import { ReadingReadyContext, readingReady } from "#client/react/ReadingReadyContext.ts";
 import { readerLink } from "#client/react/readerLink.ts";
 import { captureReading } from "#client/react/readingState.ts";
 import { retryPage } from "#client/react/retryPage.ts";
 import { scheduleReading } from "#client/react/scheduleReading.ts";
 import { readingEntry, storedReadings } from "#client/react/storedReadings.ts";
 
-export function useBoardNavigation(shell: RouterShell) {
+export function useBoardNavigation(shell: RouterShell, onCurrentDestination?: () => void) {
 	const router = useRouter();
 	const main = useMainLocation();
+	const { element } = useContext(ReadingReadyContext);
+	const readyRef = useRef(element);
 	const mainRef = useRef(main);
 	const pageRef = useRef<(() => void) | undefined>(undefined);
 	useEffect(() => {
 		mainRef.current = main;
+		readyRef.current = element;
 		pageRef.current?.();
-	}, [main]);
+	}, [main, element]);
 	const [status, setStatus] = useState("");
 	useEffect(() => {
 		const readings = storedReadings();
@@ -42,7 +46,7 @@ export function useBoardNavigation(shell: RouterShell) {
 			const location = router.state.resolvedLocation ?? router.state.location;
 			const nextRoute = location.pathname + location.searchStr;
 			const doc = document.getElementById("doc");
-			if (!doc || mainRef.current.route !== nextRoute) {
+			if (!doc || mainRef.current.route !== nextRoute || !readingReady(doc, readyRef.current)) {
 				return;
 			}
 			const previousFailure = failure;
@@ -69,8 +73,10 @@ export function useBoardNavigation(shell: RouterShell) {
 		}
 		async function open(target: URL) {
 			save();
-			document.dispatchEvent(new Event("board-navigate"));
 			const url = target.pathname + target.search + target.hash;
+			if (url === router.state.location.href) {
+				onCurrentDestination?.();
+			}
 			if (
 				url === router.state.location.href
 				&& mainRef.current.route === target.pathname + target.search
@@ -130,17 +136,6 @@ export function useBoardNavigation(shell: RouterShell) {
 			pageRef.current = undefined;
 			window.removeEventListener("pagehide", save);
 		};
-	}, [router, shell.api, shell.registry, shell.reading, shell.client]);
+	}, [router, shell.api, shell.registry, shell.reading, shell.client, onCurrentDestination]);
 	return status;
 }
-
-function recordEntry(router: ReturnType<typeof useRouter>, route: string, id: string, native: boolean) {
-	if (!native) {
-		return;
-	}
-	router.history.flush?.();
-	if (window.location.pathname + window.location.search !== route || window.history.state?.workBoard?.id === id) {
-		return;
-	}
-	window.history.replaceState({ ...window.history.state, workBoard: { id } }, "");
-}

package/src/client/react/useDiagnosticsPolling.ts

@@ -1,14 +1,17 @@
 import { RegistryContext } from "@effect/atom-react";
 import type * as Atom from "effect/reactivity/Atom";
 import { useContext, useEffect } from "react";
-import { session } from "#client/entry.ts";
+import type { BrowserClient } from "#client/client.ts";
 
-export function useDiagnosticsPolling<A, TFleet>(atom: Atom.Atom<A>, fleet?: Atom.Atom<TFleet>) {
+export function useDiagnosticsPolling<A, TFleet>(
+	client: (Pick<BrowserClient, "registry"> & { readonly updates: Pick<BrowserClient["updates"], "paused"> }) | undefined,
+	atom: Atom.Atom<A>,
+	fleet?: Atom.Atom<TFleet>,
+) {
 	const registry = useContext(RegistryContext);
 	useEffect(() => {
 		function refresh() {
-			const native = session(window);
-			if (!(document.hidden || native.registry.get(native.updates.paused))) {
+			if (!(document.hidden || client?.registry.get(client.updates.paused))) {
 				registry.refresh(atom);
 				if (fleet) {
 					registry.refresh(fleet);
@@ -16,12 +19,16 @@ export function useDiagnosticsPolling<A, TFleet>(atom: Atom.Atom<A>, fleet?: Ato
 			}
 		}
 		const timer = setInterval(refresh, 15_000);
-		document.addEventListener("board-updates-resumed", refresh);
+		const resumed = client?.registry.subscribe(client.updates.paused, (paused) => {
+			if (!paused) {
+				refresh();
+			}
+		});
 		document.addEventListener("visibilitychange", refresh);
 		return () => {
 			clearInterval(timer);
-			document.removeEventListener("board-updates-resumed", refresh);
+			resumed?.();
 			document.removeEventListener("visibilitychange", refresh);
 		};
-	}, [atom, fleet, registry]);
+	}, [atom, fleet, registry, client]);
 }

package/src/client/react/useSidebar.ts

@@ -1,8 +1,10 @@
+import { useRouter } from "@tanstack/react-router";
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
 import type { AppearanceControls } from "./useAppearance.ts";
 import { useMedia } from "./useMedia.ts";
 
 export function useSidebar(appearance: AppearanceControls) {
+	const router = useRouter();
 	const narrow = useMedia("(max-width: 767px)");
 	const [drawer, setDrawer] = useState(false);
 	const open = narrow ? drawer : !appearance.closed;
@@ -55,12 +57,12 @@ export function useSidebar(appearance: AppearanceControls) {
 			trapTab(event);
 		}
 		document.addEventListener("keydown", key);
-		document.addEventListener("board-navigate", close);
+		const unsubscribe = router.subscribe("onBeforeNavigate", close);
 		return () => {
 			document.removeEventListener("keydown", key);
-			document.removeEventListener("board-navigate", close);
+			unsubscribe();
 		};
-	}, [narrow, open, close]);
+	}, [narrow, open, close, router]);
 	return { close, narrow, open, toggle };
 }
 export type SidebarControls = ReturnType<typeof useSidebar>;

package/src/render/code.ts

@@ -50,10 +50,8 @@ async function renderedCode(highlighter: Shiki, pre: Element, diagrams: boolean)
 	return language === undefined ? undefined : await highlighted(highlighter, source, language);
 }
 
-export const codeBlocks =
-	(highlighter: Shiki, { diagrams = true }: { readonly diagrams?: boolean } = {}) =>
-	() =>
-	async (tree: Root) => {
+export function codeBlocks(highlighter: Shiki, { diagrams = true }: { readonly diagrams?: boolean } = {}) {
+	return () => async (tree: Root) => {
 		const work: Promise<void>[] = [];
 		visitElements(tree, "element", (pre, index, parent) => {
 			if (pre.tagName !== "pre" || index === undefined || parent === undefined) {
@@ -69,3 +67,4 @@ export const codeBlocks =
 		});
 		await Promise.all(work);
 	};
+}

package/src/render/{footnotes.ts → footnoteIds.ts}

@@ -17,13 +17,15 @@ function scoped(prefix: string, value: Value): Value {
 	return Array.isArray(value) ? value.map((each) => (typeof each === "string" ? String(scoped(prefix, each)) : each)) : value;
 }
 
-export const footnoteIds = (prefix: string) => () => (tree: Root) => {
-	visitElements(tree, "element", (element) => {
-		if (!["a", "h2", "li"].includes(element.tagName)) {
-			return;
-		}
-		element.properties = Object.fromEntries(
-			Object.entries(element.properties).map(([name, value]) => [name, SCOPED.has(name) ? scoped(prefix, value) : value]),
-		);
-	});
-};
+export function footnoteIds(prefix: string) {
+	return () => (tree: Root) => {
+		visitElements(tree, "element", (element) => {
+			if (!["a", "h2", "li"].includes(element.tagName)) {
+				return;
+			}
+			element.properties = Object.fromEntries(
+				Object.entries(element.properties).map(([name, value]) => [name, SCOPED.has(name) ? scoped(prefix, value) : value]),
+			);
+		});
+	};
+}

package/src/server/board.ts

@@ -3,7 +3,7 @@ import { HttpRouter } from "effect/http";
 import { RpcSerialization, RpcServer } from "effect/rpc";
 import type { InternalServerError } from "@shivaedev/platform/errors/taxonomy.ts";
 import { localRpcGuard } from "@shivaedev/platform/rpc-server/local.ts";
-import type { RenderFailed } from "#render/failed.ts";
+import type { RenderFailed } from "#render/Failed.ts";
 import { workRpcs } from "#rpc/contract.ts";
 import { boardRuntime } from "#server/boardRuntime.ts";
 import type { HomeMissing } from "#server/files/home.ts";

package/src/server/packageInfo.ts

@@ -1,2 +1,2 @@
 export const NAME = "work-board";
-export const VERSION = "0.15.0";
+export const VERSION = "0.16.0";

package/src/server/render/Highlighter.ts

@@ -2,7 +2,7 @@ import { Effect } from "effect";
 import { createHighlighter } from "shiki";
 import { defineService } from "@shivaedev/effect-service/define-service.ts";
 import { codeBlocks, THEMES } from "#render/code.ts";
-import { RenderFailed } from "#render/failed.ts";
+import { RenderFailed } from "#render/Failed.ts";
 
 export const Highlighter = defineService({
 	id: "WorkBoard/Highlighter",

package/src/server/render/markdown.ts

@@ -7,8 +7,8 @@ import type { PluggableList } from "unified";
 import type { documentHeadings } from "#render/documentHeadings.ts";
 import { documentLinks } from "#render/documentLinks.ts";
 import { documentPlugins } from "#render/documentPlugins.ts";
-import { RenderFailed } from "#render/failed.ts";
-import { footnoteIds } from "#render/footnotes.ts";
+import { RenderFailed } from "#render/Failed.ts";
+import { footnoteIds } from "#render/footnoteIds.ts";
 import { Highlighter } from "./Highlighter.ts";
 
 export interface RenderOptions {

package/dist/render/failed.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"failed.d.ts","sourceRoot":"","sources":["../../src/render/failed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;AAEhC,qBAAa,YAAa,SAAQ,iBAA6E;IAC9G,IAAa,OAAO,WAEnB;CACD"}

package/dist/render/failed.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"failed.js","sourceRoot":"","sources":["../../src/render/failed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,OAAO,YAAa,SAAQ,MAAM,CAAC,WAAW,EAAgB,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC;IAC9G,IAAa,OAAO;QACnB,OAAO,uHAAuH,CAAC;IAChI,CAAC;CACD"}

package/dist/render/footnotes.d.ts

@@ -1,3 +0,0 @@
-import type { Root } from "hast";
-export declare const footnoteIds: (prefix: string) => () => (tree: Root) => void;
-//# sourceMappingURL=footnotes.d.ts.map

package/dist/render/footnotes.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"footnotes.d.ts","sourceRoot":"","sources":["../../src/render/footnotes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAmB1C,eAAO,MAAM,WAAW,WAAY,MAAM,kBAAkB,IAAI,SAS/D,CAAC"}

package/dist/render/footnotes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"footnotes.js","sourceRoot":"","sources":["../../src/render/footnotes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,IAAI,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAE1D,MAAM,YAAY,GAAG,sCAAsC,CAAC;AAI5D,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAE1D,SAAS,MAAM,CAAC,MAAc,EAAE,KAAY;IAC3C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3D,OAAO,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC;IAC5B,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7F,OAAO,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAC7H,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,MAAc,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,IAAU,EAAE,EAAE;IACnE,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;QAC1C,IAAI,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAClD,OAAO;QACR,CAAC;QACD,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,CACtC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CACnH,CAAC;IACH,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC"}