From 2de48b267a8f2d6ed0461d2febc266559c2d8d47 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 15 Nov 2023 04:01:48 +0000
Subject: [PATCH] fix: set htmlAst after walking tree in ofm (closes #589)
---
quartz/plugins/transformers/ofm.ts | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index 8306f40..a8399d0 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -1,7 +1,7 @@
import { PluggableList } from "unified"
import { QuartzTransformerPlugin } from "../types"
import { Root, HTML, BlockContent, DefinitionContent, Code, Paragraph } from "mdast"
-import { Element, Literal } from "hast"
+import { Element, Literal, Root as HtmlRoot } from "hast"
import { Replace, findAndReplace as mdastFindReplace } from "mdast-util-find-and-replace"
import { slug as slugAnchor } from "github-slugger"
import rehypeRaw from "rehype-raw"
@@ -14,6 +14,7 @@
import { toHast } from "mdast-util-to-hast"
import { toHtml } from "hast-util-to-html"
import { PhrasingContent } from "mdast-util-find-and-replace/lib"
+import { capitalize } from "../../util/lang"
export interface Options {
comments: boolean
@@ -104,10 +105,6 @@
return calloutMapping[callout] ?? "note"
}
-const capitalize = (s: string): string => {
- return s.substring(0, 1).toUpperCase() + s.substring(1)
-}
-
// !? -> optional embedding
// \[\[ -> open brace
// ([^\[\]\|\#]+) -> one or more non-special characters ([,],|, or #) (name)
@@ -239,13 +236,13 @@
value: `<iframe src="${url}"></iframe>`,
}
} else if (ext === "") {
- const block = anchor.slice(1)
+ const block = anchor
return {
type: "html",
data: { hProperties: { transclude: true } },
value: `<blockquote class="transclude" data-url="${url}" data-block="${block}"><a href="${
url + anchor
- }" class="transclude-inner">Transclude of block ${block}</a></blockquote>`,
+ }" class="transclude-inner">Transclude of ${url}${block}</a></blockquote>`,
}
}
@@ -400,6 +397,10 @@
return (tree: Root, file) => {
const base = pathToRoot(file.data.slug!)
findAndReplace(tree, tagRegex, (_value: string, tag: string) => {
+ // Check if the tag only includes numbers
+ if (/^\d+$/.test(tag)) {
+ return false
+ }
tag = slugTag(tag)
if (file.data.frontmatter && !file.data.frontmatter.tags.includes(tag)) {
file.data.frontmatter.tags.push(tag)
@@ -476,6 +477,8 @@
}
}
})
+
+ file.data.htmlAst = tree
}
})
}
@@ -523,5 +526,6 @@
declare module "vfile" {
interface DataMap {
blocks: Record<string, Element>
+ htmlAst: HtmlRoot
}
}
--
Gitblit v1.10.0