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 | 59 +++++++++++++++++++----------------------------------------
1 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/quartz/plugins/transformers/links.ts b/quartz/plugins/transformers/links.ts
index 96c5f58..d867039 100644
--- a/quartz/plugins/transformers/links.ts
+++ b/quartz/plugins/transformers/links.ts
@@ -2,20 +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
}
@@ -29,41 +29,18 @@
const opts = { ...defaultOptions, ...userOpts }
return {
name: "LinkProcessing",
- htmlPlugins() {
+ htmlPlugins(ctx) {
return [
() => {
return (tree, file) => {
const curSlug = canonicalizeServer(file.data.slug!)
- const transformLink = (target: string): RelativeURL => {
- const targetSlug = transformInternalLink(target).slice("./".length)
- let [targetCanonical, targetAnchor] = splitAnchor(targetSlug)
- if (opts.markdownLinkResolution === "relative") {
- return targetSlug as RelativeURL
- } else if (opts.markdownLinkResolution === "shortest") {
- // https://forum.obsidian.md/t/settings-new-link-format-what-is-shortest-path-when-possible/6748/5
- const allSlugs = file.data.allSlugs!
+ const outgoing: Set<CanonicalSlug> = new Set()
- // if the file name is unique, then it's just the filename
- const matchingFileNames = allSlugs.filter((slug) => {
- const parts = slug.split(path.posix.sep)
- const fileName = parts.at(-1)
- return targetCanonical === fileName
- })
-
- 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 (
@@ -72,12 +49,13 @@
typeof node.properties.href === "string"
) {
let dest = node.properties.href as RelativeURL
- node.properties.className = isAbsoluteUrl(dest) ? "external" : "internal"
+ node.properties.className ??= []
+ node.properties.className.push(isAbsoluteUrl(dest) ? "external" : "internal")
// don't process external links or intra-document anchors
if (!(isAbsoluteUrl(dest) || dest.startsWith("#"))) {
- dest = node.properties.href = transformLink(dest)
- const canonicalDest = path.normalize(joinSegments(curSlug, 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(path.join("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