From ef72f1bf707dca363cdab84da91e2acfaef8f276 Mon Sep 17 00:00:00 2001
From: Ammar Alakkad <am.alakkad@gmail.com>
Date: Mon, 30 Dec 2024 16:03:57 +0000
Subject: [PATCH] Fix ObsidianFlavoredMarkdown source link (#1694)
---
quartz/plugins/transformers/toc.ts | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/quartz/plugins/transformers/toc.ts b/quartz/plugins/transformers/toc.ts
index d0781ec..791547b 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,10 +24,8 @@
slug: string // this is just the anchor (#some-slug), not the canonical slug
}
-const regexMdLinks = new RegExp(/\[([^\[]+)\](\(.*\))/, "g")
-export const TableOfContents: QuartzTransformerPlugin<Partial<Options> | undefined> = (
- userOpts,
-) => {
+const slugAnchor = new Slugger()
+export const TableOfContents: QuartzTransformerPlugin<Partial<Options>> = (userOpts) => {
const opts = { ...defaultOptions, ...userOpts }
return {
name: "TableOfContents",
@@ -38,21 +35,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 +50,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