@shivaedev/work-board 0.6.0 → 0.7.0

package/src/search/collector.ts

@@ -1,6 +1,7 @@
-import type { Element } from "hast";
-import { defineHastPlugin } from "satteri";
+import type { Element, Root } from "hast";
+import { visit as visitElements } from "unist-util-visit";
 import { fileUrl } from "#files/url.ts";
+import { textContent } from "#render/textContent.ts";
 import type { Entry } from "./entries.ts";
 
 function sourceLine(element: Element, first: number | undefined, length: number): { readonly line?: number } {
@@ -14,31 +15,33 @@ export function searchCollector(file: string, startLine: () => number | undefine
 	const entries: Entry[] = [];
 	let passage = "";
 	let label = file;
-	const plugin = defineHastPlugin({
-		element: {
-			filter: ["h1", "h2", "h3", "h4", "h5", "h6", "p", "pre", "li", "td", "th"],
-			visit: (element, context) => {
-				const text = context.textContent(element).replace(/\s+/gu, " ").trim();
-				if (!text || element.properties.id === "footnote-label") {
-					return;
-				}
-				const heading = element.tagName.startsWith("h") && element.tagName !== "th";
-				if (heading && typeof element.properties.id === "string") {
-					passage = element.properties.id;
-					label = text;
+	function collect(element: Element) {
+		const text = element.children.map(textContent).join("").replace(/\s+/gu, " ").trim();
+		if (!text || element.properties.id === "footnote-label") {
+			return;
+		}
+		const heading = element.tagName.startsWith("h") && element.tagName !== "th";
+		if (heading && typeof element.properties.id === "string") {
+			passage = element.properties.id;
+			label = text;
+		}
+		entries.push({
+			file,
+			href: fileUrl(file) + (passage ? `#${encodeURIComponent(passage)}` : ""),
+			kind: heading ? "heading" : "passage",
+			...sourceLine(element, startLine(), length()),
+			text,
+			title: label,
+		});
+	}
+	function plugin() {
+		return function transform(tree: Root) {
+			visitElements(tree, "element", (element) => {
+				if (["h1", "h2", "h3", "h4", "h5", "h6", "p", "pre", "li", "td", "th"].includes(element.tagName)) {
+					collect(element);
 				}
-				entries.push({
-					file,
-					href: fileUrl(file) + (passage ? `#${encodeURIComponent(passage)}` : ""),
-					kind: heading ? "heading" : "passage",
-					...sourceLine(element, startLine(), length()),
-					text,
-					title: label,
-				});
-			},
-		},
-		name: "work-board-search-text",
-	});
-
+			});
+		};
+	}
 	return { entries, plugin };
 }

package/src/search/entries.ts

@@ -1,7 +1,12 @@
-import { markdownToHtml } from "satteri";
+import { MarkdownAsync } from "react-markdown";
+import rehypeRaw from "rehype-raw";
+import remarkDirective from "remark-directive";
+import remarkGfm from "remark-gfm";
 import { fileUrl } from "#files/url.ts";
 import { boardOf } from "#render/board.ts";
+import { callouts } from "#render/callouts.ts";
 import { documentHeadings } from "#render/documentHeadings.ts";
+import { visualDocuments } from "#render/visualDocuments.ts";
 import { searchCollector } from "./collector.ts";
 import { linkCollector } from "./linkCollector.ts";
 
@@ -41,8 +46,10 @@ export async function entriesOf(source: string, file: string, home: boolean, bod
 		if (fragment) {
 			fragmentLength = fragment.split("\n").length;
 			fragmentLine = board ? fragmentLocation(source, fragment, bodyLine, seenFragments) : bodyLine;
-			await markdownToHtml(board?.definitions ? `${fragment}\n\n${board.definitions}` : fragment, {
-				hastPlugins: [headings.plugin, plugin, linkCollector(links)],
+			await MarkdownAsync({
+				children: board?.definitions ? `${fragment}\n\n${board.definitions}` : fragment,
+				rehypePlugins: [rehypeRaw, headings.plugin, plugin, linkCollector(links)],
+				remarkPlugins: [remarkGfm, remarkDirective, visualDocuments, callouts],
 			});
 		}
 	}

package/src/search/linkCollector.ts

@@ -1,16 +1,16 @@
-import { defineHastPlugin } from "satteri";
+import type { Root } from "hast";
+import { visit as visitElements } from "unist-util-visit";
 
 export function linkCollector(links: Set<string>) {
-	return defineHastPlugin({
-		element: {
-			filter: ["a"],
-			visit: (element) => {
-				const href = element.properties.href;
-				if (typeof href === "string" && !href.startsWith("#")) {
-					links.add(href);
-				}
-			},
-		},
-		name: "work-board-link-collector",
-	});
+	return () => (tree: Root) => {
+		visitElements(tree, "element", (element) => {
+			if (element.tagName !== "a") {
+				return;
+			}
+			const href = element.properties.href;
+			if (typeof href === "string" && !href.startsWith("#")) {
+				links.add(href);
+			}
+		});
+	};
 }