From 5ec61468d5e787b3c8ae32a2b4ef1595cf0bc3ee Mon Sep 17 00:00:00 2001
From: Emile Bangma <ewjbangma@hotmail.com>
Date: Sun, 31 Mar 2024 16:44:50 +0000
Subject: [PATCH] fix(wikilinks): proper escaping of pipe character in wikilinks inside tables (#1040)
---
quartz/plugins/transformers/toc.ts | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/quartz/plugins/transformers/toc.ts b/quartz/plugins/transformers/toc.ts
index d0781ec..bfc2f98 100644
--- a/quartz/plugins/transformers/toc.ts
+++ b/quartz/plugins/transformers/toc.ts
@@ -3,11 +3,10 @@
import { visit } from "unist-util-visit"
import { toString } from "mdast-util-to-string"
import Slugger from "github-slugger"
-import { wikilinkRegex } from "./ofm"
export interface Options {
maxDepth: 1 | 2 | 3 | 4 | 5 | 6
- minEntries: 1
+ minEntries: number
showByDefault: boolean
collapseByDefault: boolean
}
@@ -25,7 +24,7 @@
slug: string // this is just the anchor (#some-slug), not the canonical slug
}
-const regexMdLinks = new RegExp(/\[([^\[]+)\](\(.*\))/, "g")
+const slugAnchor = new Slugger()
export const TableOfContents: QuartzTransformerPlugin<Partial<Options> | undefined> = (
userOpts,
) => {
@@ -38,21 +37,12 @@
return async (tree: Root, file) => {
const display = file.data.frontmatter?.enableToc ?? opts.showByDefault
if (display) {
- const slugAnchor = new Slugger()
+ slugAnchor.reset()
const toc: TocEntry[] = []
let highestDepth: number = opts.maxDepth
visit(tree, "heading", (node) => {
if (node.depth <= opts.maxDepth) {
- let text = toString(node)
-
- // strip link formatting from toc entries
- text = text.replace(wikilinkRegex, (_, rawFp, __, rawAlias) => {
- const fp = rawFp?.trim() ?? ""
- const alias = rawAlias?.slice(1).trim()
- return alias ?? fp
- })
- text = text.replace(regexMdLinks, "$1")
-
+ const text = toString(node)
highestDepth = Math.min(highestDepth, node.depth)
toc.push({
depth: node.depth,
@@ -62,7 +52,7 @@
}
})
- if (toc.length > opts.minEntries) {
+ if (toc.length > 0 && toc.length > opts.minEntries) {
file.data.toc = toc.map((entry) => ({
...entry,
depth: entry.depth - highestDepth,
--
Gitblit v1.10.0