From fa6c02d3213dfd4e6da8e78bd3a2e7004555fd01 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 24 Jan 2024 01:08:56 +0000
Subject: [PATCH] fix: make search result card block
---
quartz/components/renderPage.tsx | 127 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 120 insertions(+), 7 deletions(-)
diff --git a/quartz/components/renderPage.tsx b/quartz/components/renderPage.tsx
index a1d5fee..b3fe06b 100644
--- a/quartz/components/renderPage.tsx
+++ b/quartz/components/renderPage.tsx
@@ -3,7 +3,10 @@
import HeaderConstructor from "./Header"
import BodyConstructor from "./Body"
import { JSResourceToScriptElement, StaticResources } from "../util/resources"
-import { FullSlug, joinSegments, pathToRoot } from "../util/path"
+import { FullSlug, RelativeURL, joinSegments, normalizeHastElement } from "../util/path"
+import { visit } from "unist-util-visit"
+import { Root, Element, ElementContent } from "hast"
+import { QuartzPluginData } from "../plugins/vfile"
interface RenderComponents {
head: QuartzComponent
@@ -15,17 +18,18 @@
footer: QuartzComponent
}
-export function pageResources(slug: FullSlug, staticResources: StaticResources): StaticResources {
- const baseDir = pathToRoot(slug)
-
+export function pageResources(
+ baseDir: FullSlug | RelativeURL,
+ staticResources: StaticResources,
+): StaticResources {
const contentIndexPath = joinSegments(baseDir, "static/contentIndex.json")
- const contentIndexScript = `const fetchData = fetch(\`${contentIndexPath}\`).then(data => data.json())`
+ const contentIndexScript = `const fetchData = fetch("${contentIndexPath}").then(data => data.json())`
return {
css: [joinSegments(baseDir, "index.css"), ...staticResources.css],
js: [
{
- src: joinSegments(baseDir, "/prescript.js"),
+ src: joinSegments(baseDir, "prescript.js"),
loadTime: "beforeDOMReady",
contentType: "external",
},
@@ -37,7 +41,7 @@
},
...staticResources.js,
{
- src: baseDir + "/postscript.js",
+ src: joinSegments(baseDir, "postscript.js"),
loadTime: "afterDOMReady",
moduleType: "module",
contentType: "external",
@@ -46,12 +50,121 @@
}
}
+let pageIndex: Map<FullSlug, QuartzPluginData> | undefined = undefined
+function getOrComputeFileIndex(allFiles: QuartzPluginData[]): Map<FullSlug, QuartzPluginData> {
+ if (!pageIndex) {
+ pageIndex = new Map()
+ for (const file of allFiles) {
+ pageIndex.set(file.slug!, file)
+ }
+ }
+
+ return pageIndex
+}
+
export function renderPage(
slug: FullSlug,
componentData: QuartzComponentProps,
components: RenderComponents,
pageResources: StaticResources,
): string {
+ // process transcludes in componentData
+ visit(componentData.tree as Root, "element", (node, _index, _parent) => {
+ if (node.tagName === "blockquote") {
+ const classNames = (node.properties?.className ?? []) as string[]
+ if (classNames.includes("transclude")) {
+ const inner = node.children[0] as Element
+ const transcludeTarget = inner.properties["data-slug"] as FullSlug
+ const page = getOrComputeFileIndex(componentData.allFiles).get(transcludeTarget)
+ if (!page) {
+ return
+ }
+
+ let blockRef = node.properties.dataBlock as string | undefined
+ if (blockRef?.startsWith("#^")) {
+ // block transclude
+ blockRef = blockRef.slice("#^".length)
+ let blockNode = page.blocks?.[blockRef]
+ if (blockNode) {
+ if (blockNode.tagName === "li") {
+ blockNode = {
+ type: "element",
+ tagName: "ul",
+ properties: {},
+ children: [blockNode],
+ }
+ }
+
+ node.children = [
+ normalizeHastElement(blockNode, slug, transcludeTarget),
+ {
+ type: "element",
+ tagName: "a",
+ properties: { href: inner.properties?.href, class: ["internal"] },
+ children: [{ type: "text", value: `Link to original` }],
+ },
+ ]
+ }
+ } else if (blockRef?.startsWith("#") && page.htmlAst) {
+ // header transclude
+ blockRef = blockRef.slice(1)
+ let startIdx = undefined
+ let endIdx = undefined
+ for (const [i, el] of page.htmlAst.children.entries()) {
+ if (el.type === "element" && el.tagName.match(/h[1-6]/)) {
+ if (endIdx) {
+ break
+ }
+
+ if (startIdx !== undefined) {
+ endIdx = i
+ } else if (el.properties?.id === blockRef) {
+ startIdx = i
+ }
+ }
+ }
+
+ if (startIdx === undefined) {
+ return
+ }
+
+ node.children = [
+ ...(page.htmlAst.children.slice(startIdx, endIdx) as ElementContent[]).map((child) =>
+ normalizeHastElement(child as Element, slug, transcludeTarget),
+ ),
+ {
+ type: "element",
+ tagName: "a",
+ properties: { href: inner.properties?.href, class: ["internal"] },
+ children: [{ type: "text", value: `Link to original` }],
+ },
+ ]
+ } else if (page.htmlAst) {
+ // page transclude
+ node.children = [
+ {
+ type: "element",
+ tagName: "h1",
+ properties: {},
+ children: [
+ { type: "text", value: page.frontmatter?.title ?? `Transclude of ${page.slug}` },
+ ],
+ },
+ ...(page.htmlAst.children as ElementContent[]).map((child) =>
+ normalizeHastElement(child as Element, slug, transcludeTarget),
+ ),
+ {
+ type: "element",
+ tagName: "a",
+ properties: { href: inner.properties?.href, class: ["internal"] },
+ children: [{ type: "text", value: `Link to original` }],
+ },
+ ]
+ }
+ }
+ }
+ })
+
const {
head: Head,
header,
--
Gitblit v1.10.0