From 0c199975f2d469ecdfd7efcf2ddd16ffa1dc492b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 07:55:28 +0000
Subject: [PATCH] various path fixes for links to extensions, fix relative paths in links
---
quartz/plugins/transformers/links.ts | 49 ++++++++++++++-----------------------------------
1 files changed, 14 insertions(+), 35 deletions(-)
diff --git a/quartz/plugins/transformers/links.ts b/quartz/plugins/transformers/links.ts
index 9a9195b..d867039 100644
--- a/quartz/plugins/transformers/links.ts
+++ b/quartz/plugins/transformers/links.ts
@@ -2,21 +2,20 @@
import {
CanonicalSlug,
RelativeURL,
+ TransformOptions,
_stripSlashes,
canonicalizeServer,
joinSegments,
- pathToRoot,
- resolveRelative,
splitAnchor,
- transformInternalLink,
-} from "../../path"
+ transformLink,
+} from "../../util/path"
import path from "path"
import { visit } from "unist-util-visit"
import isAbsoluteUrl from "is-absolute-url"
interface Options {
/** How to resolve Markdown paths */
- markdownLinkResolution: "absolute" | "relative" | "shortest"
+ markdownLinkResolution: TransformOptions["strategy"]
/** Strips folders from a link so that it looks nice */
prettyLinks: boolean
}
@@ -35,34 +34,13 @@
() => {
return (tree, file) => {
const curSlug = canonicalizeServer(file.data.slug!)
- const transformLink = (target: string): RelativeURL => {
- const targetSlug = _stripSlashes(transformInternalLink(target).slice(".".length))
- let [targetCanonical, targetAnchor] = splitAnchor(targetSlug)
- if (opts.markdownLinkResolution === "relative") {
- return targetSlug as RelativeURL
- } else if (opts.markdownLinkResolution === "shortest") {
- // if the file name is unique, then it's just the filename
- const matchingFileNames = ctx.allSlugs.filter((slug) => {
- const parts = slug.split(path.posix.sep)
- const fileName = parts.at(-1)
- return targetCanonical === fileName
- })
+ const outgoing: Set<CanonicalSlug> = new Set()
- // only match, just use it
- if (matchingFileNames.length === 1) {
- const targetSlug = canonicalizeServer(matchingFileNames[0])
- return (resolveRelative(curSlug, targetSlug) + targetAnchor) as RelativeURL
- }
-
- // if it's not unique, then it's the absolute path from the vault root
- // (fall-through case)
- }
-
- // treat as absolute
- return joinSegments(pathToRoot(curSlug), targetSlug) as RelativeURL
+ const transformOptions: TransformOptions = {
+ strategy: opts.markdownLinkResolution,
+ allSlugs: ctx.allSlugs,
}
- const outgoing: Set<CanonicalSlug> = new Set()
visit(tree, "element", (node, _index, _parent) => {
// rewrite all links
if (
@@ -76,7 +54,7 @@
// don't process external links or intra-document anchors
if (!(isAbsoluteUrl(dest) || dest.startsWith("#"))) {
- dest = node.properties.href = transformLink(dest)
+ dest = node.properties.href = transformLink(curSlug, dest, transformOptions)
const canonicalDest = path.posix.normalize(joinSegments(curSlug, dest))
const [destCanonical, _destAnchor] = splitAnchor(canonicalDest)
outgoing.add(destCanonical as CanonicalSlug)
@@ -86,7 +64,8 @@
if (
opts.prettyLinks &&
node.children.length === 1 &&
- node.children[0].type === "text"
+ node.children[0].type === "text" &&
+ !node.children[0].value.startsWith("#")
) {
node.children[0].value = path.basename(node.children[0].value)
}
@@ -99,9 +78,9 @@
typeof node.properties.src === "string"
) {
if (!isAbsoluteUrl(node.properties.src)) {
- const ext = path.extname(node.properties.src)
- node.properties.src =
- transformLink(joinSegments("assets", node.properties.src)) + ext
+ let dest = node.properties.src as RelativeURL
+ dest = node.properties.src = transformLink(curSlug, dest, transformOptions)
+ node.properties.src = dest
}
}
})
--
Gitblit v1.10.0