From e1dd6aee863878a02f51200b3878d619220c22f3 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Fri, 11 Aug 2023 23:55:17 -0700 Subject: [PATCH] fix wikilinks to anchors in the same document --- content/features/upcoming features.md | 1 - quartz/plugins/transformers/ofm.ts | 11 ++++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/features/upcoming features.md b/content/features/upcoming features.md index 718ae170b..728d16a32 100644 --- a/content/features/upcoming features.md +++ b/content/features/upcoming features.md @@ -4,7 +4,6 @@ draft: true ## todo -- wikilink to anchors in the same document - blockquote with link in first child broken - 404 using base url - back button with anchors / popovers + spa is broken diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts index a371efb69..794b554c1 100644 --- a/quartz/plugins/transformers/ofm.ts +++ b/quartz/plugins/transformers/ofm.ts @@ -108,7 +108,7 @@ const capitalize = (s: string): string => { // ([^\[\]\|\#]+) -> one or more non-special characters ([,],|, or #) (name) // (#[^\[\]\|\#]+)? -> # then one or more non-special characters (heading link) // (|[^\[\]\|\#]+)? -> | then one or more non-special characters (alias) -const wikilinkRegex = new RegExp(/!?\[\[([^\[\]\|\#]+)(#[^\[\]\|\#]+)?(\|[^\[\]\|\#]+)?\]\]/, "g") +const wikilinkRegex = new RegExp(/!?\[\[([^\[\]\|\#]+)?(#[^\[\]\|\#]+)?(\|[^\[\]\|\#]+)?\]\]/, "g") const highlightRegex = new RegExp(/==(.+)==/, "g") const commentRegex = new RegExp(/%%(.+)%%/, "g") // from https://github.com/escwxyz/remark-obsidian-callout/blob/main/src/index.ts @@ -161,10 +161,11 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin if (opts.wikilinks) { src = src.toString() return src.replaceAll(wikilinkRegex, (value, ...capture) => { - const [fp, rawHeader, rawAlias] = capture + const [rawFp, rawHeader, rawAlias] = capture + const fp = rawFp ?? "" const anchor = rawHeader?.trim().slice(1) const displayAnchor = anchor ? `#${slugAnchor(anchor)}` : "" - const displayAlias = rawAlias ?? "" + const displayAlias = rawAlias ?? rawHeader?.replace("#", "|") ?? "" const embedDisplay = value.startsWith("!") ? "!" : "" return `${embedDisplay}[[${fp}${displayAnchor}${displayAlias}]]` }) @@ -177,8 +178,8 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin plugins.push(() => { return (tree: Root, _file) => { findAndReplace(tree, wikilinkRegex, (value: string, ...capture: string[]) => { - let [fp, rawHeader, rawAlias] = capture - fp = fp.trim() + let [rawFp, rawHeader, rawAlias] = capture + const fp = rawFp?.trim() ?? "" const anchor = rawHeader?.trim() ?? "" const alias = rawAlias?.slice(1).trim()