From 7bde99b4e2d49e30dad1e0d58ccc34c2e7482005 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 14 Aug 2023 00:47:18 +0000
Subject: [PATCH] fix: add trailing slash to local serving
---
quartz/plugins/transformers/links.ts | 148 ++++++++++++++++++++++++-------------------------
1 files changed, 72 insertions(+), 76 deletions(-)
diff --git a/quartz/plugins/transformers/links.ts b/quartz/plugins/transformers/links.ts
index da1c343..10b527c 100644
--- a/quartz/plugins/transformers/links.ts
+++ b/quartz/plugins/transformers/links.ts
@@ -1,18 +1,27 @@
import { QuartzTransformerPlugin } from "../types"
-import { CanonicalSlug, RelativeURL, canonicalizeServer, joinSegments, pathToRoot, resolveRelative, splitAnchor, transformInternalLink } from "../../path"
+import {
+ CanonicalSlug,
+ RelativeURL,
+ TransformOptions,
+ _stripSlashes,
+ canonicalizeServer,
+ joinSegments,
+ splitAnchor,
+ transformLink,
+} from "../../path"
import path from "path"
-import { visit } from 'unist-util-visit'
+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
}
const defaultOptions: Options = {
- markdownLinkResolution: 'absolute',
+ markdownLinkResolution: "absolute",
prettyLinks: true,
}
@@ -20,85 +29,72 @@
const opts = { ...defaultOptions, ...userOpts }
return {
name: "LinkProcessing",
- htmlPlugins() {
- 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!
+ htmlPlugins(ctx) {
+ return [
+ () => {
+ return (tree, file) => {
+ const curSlug = canonicalizeServer(file.data.slug!)
+ 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)
+ const transformOptions: TransformOptions = {
+ strategy: opts.markdownLinkResolution,
+ allSlugs: ctx.allSlugs,
}
- // treat as absolute
- return joinSegments(pathToRoot(curSlug), targetSlug) as RelativeURL
+ visit(tree, "element", (node, _index, _parent) => {
+ // rewrite all links
+ if (
+ node.tagName === "a" &&
+ node.properties &&
+ typeof node.properties.href === "string"
+ ) {
+ let dest = node.properties.href as RelativeURL
+ 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(curSlug, dest, transformOptions)
+ const canonicalDest = path.posix.normalize(joinSegments(curSlug, dest))
+ const [destCanonical, _destAnchor] = splitAnchor(canonicalDest)
+ outgoing.add(destCanonical as CanonicalSlug)
+ }
+
+ // rewrite link internals if prettylinks is on
+ if (
+ opts.prettyLinks &&
+ node.children.length === 1 &&
+ node.children[0].type === "text" &&
+ !node.children[0].value.startsWith("#")
+ ) {
+ node.children[0].value = path.basename(node.children[0].value)
+ }
+ }
+
+ // transform all other resources that may use links
+ if (
+ ["img", "video", "audio", "iframe"].includes(node.tagName) &&
+ node.properties &&
+ typeof node.properties.src === "string"
+ ) {
+ if (!isAbsoluteUrl(node.properties.src)) {
+ let dest = node.properties.src as RelativeURL
+ const ext = path.extname(node.properties.src)
+ dest = node.properties.src = transformLink(curSlug, dest, transformOptions)
+ node.properties.src = dest + ext
+ }
+ }
+ })
+
+ file.data.links = [...outgoing]
}
-
- const outgoing: Set<CanonicalSlug> = new Set()
- visit(tree, 'element', (node, _index, _parent) => {
- // rewrite all links
- if (
- node.tagName === 'a' &&
- node.properties &&
- typeof node.properties.href === 'string'
- ) {
- let dest = node.properties.href as RelativeURL
- node.properties.className = 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))
- const [destCanonical, _destAnchor] = splitAnchor(canonicalDest)
- outgoing.add(destCanonical as CanonicalSlug)
- }
-
- // rewrite link internals if prettylinks is on
- if (opts.prettyLinks && node.children.length === 1 && node.children[0].type === 'text') {
- node.children[0].value = path.basename(node.children[0].value)
- }
- }
-
- // transform all other resources that may use links
- if (
- ["img", "video", "audio", "iframe"].includes(node.tagName) &&
- node.properties &&
- 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
- }
- }
- })
-
- file.data.links = [...outgoing]
- }
- }]
- }
+ },
+ ]
+ },
}
}
-declare module 'vfile' {
+declare module "vfile" {
interface DataMap {
links: CanonicalSlug[]
}
--
Gitblit v1.10.0