From 52ca312f41ee6da5202cd9632d8501340ada3a67 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 27 Aug 2023 19:27:55 +0000
Subject: [PATCH] fix: slugify tag on page before adding (closes #411)
---
quartz/plugins/transformers/ofm.ts | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index b324dac..4d1586f 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -9,7 +9,7 @@
import { JSResource } from "../../util/resources"
// @ts-ignore
import calloutScript from "../../components/scripts/callout.inline.ts"
-import { FilePath, canonicalizeServer, pathToRoot, slugTag, slugifyFilePath } from "../../util/path"
+import { FilePath, pathToRoot, slugTag, slugifyFilePath } from "../../util/path"
import { toHast } from "mdast-util-to-hast"
import { toHtml } from "hast-util-to-html"
import { PhrasingContent } from "mdast-util-find-and-replace/lib"
@@ -116,7 +116,7 @@
const calloutLineRegex = new RegExp(/^> *\[\!\w+\][+-]?.*$/, "gm")
// (?:^| ) -> non-capturing group, tag should start be separated by a space or be the start of the line
// #(\w+) -> tag itself is # followed by a string of alpha-numeric characters
-const tagRegex = new RegExp(/(?:^| )#([\w-_\/]+)/, "g")
+const tagRegex = new RegExp(/(?:^| )#(\p{L}+)/, "gu")
export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options> | undefined> = (
userOpts,
@@ -381,16 +381,16 @@
if (opts.parseTags) {
plugins.push(() => {
return (tree: Root, file) => {
- const slug = canonicalizeServer(file.data.slug!)
- const base = pathToRoot(slug)
- findAndReplace(tree, tagRegex, (value: string, tag: string) => {
- if (file.data.frontmatter) {
+ const base = pathToRoot(file.data.slug!)
+ findAndReplace(tree, tagRegex, (_value: string, tag: string) => {
+ tag = slugTag(tag)
+ if (file.data.frontmatter && !file.data.frontmatter.tags.includes(tag)) {
file.data.frontmatter.tags.push(tag)
}
return {
type: "link",
- url: base + `/tags/${slugTag(tag)}`,
+ url: base + `/tags/${tag}`,
data: {
hProperties: {
className: ["tag-link"],
@@ -399,7 +399,7 @@
children: [
{
type: "text",
- value,
+ value: `#${tag}`,
},
],
}
--
Gitblit v1.10.0