From ab5efac75fb0f20afe74bef33a2cf7e9ba0ba40f Mon Sep 17 00:00:00 2001
From: bfahrenfort <59982409+bfahrenfort@users.noreply.github.com>
Date: Sun, 01 Oct 2023 16:47:22 +0000
Subject: [PATCH] Fix: RSS title escaping (#521)
---
quartz/plugins/transformers/links.ts | 168 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 102 insertions(+), 66 deletions(-)
diff --git a/quartz/plugins/transformers/links.ts b/quartz/plugins/transformers/links.ts
index 04b26c6..e050e00 100644
--- a/quartz/plugins/transformers/links.ts
+++ b/quartz/plugins/transformers/links.ts
@@ -1,84 +1,120 @@
-import { PluggableList } from "unified"
import { QuartzTransformerPlugin } from "../types"
-import { remarkWikiLink } from "@flowershow/remark-wiki-link"
-import { relative, relativeToRoot, slugify } from "../../path"
+import {
+ FullSlug,
+ RelativeURL,
+ SimpleSlug,
+ TransformOptions,
+ _stripSlashes,
+ simplifySlug,
+ splitAnchor,
+ transformLink,
+} from "../../util/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'
+ markdownLinkResolution: TransformOptions["strategy"]
/** Strips folders from a link so that it looks nice */
prettyLinks: boolean
}
const defaultOptions: Options = {
- markdownLinkResolution: 'absolute',
- prettyLinks: true
+ markdownLinkResolution: "absolute",
+ prettyLinks: true,
}
-export class LinkProcessing extends QuartzTransformerPlugin {
- name = "LinkProcessing"
- opts: Options
+export const CrawlLinks: QuartzTransformerPlugin<Partial<Options> | undefined> = (userOpts) => {
+ const opts = { ...defaultOptions, ...userOpts }
+ return {
+ name: "LinkProcessing",
+ htmlPlugins(ctx) {
+ return [
+ () => {
+ return (tree, file) => {
+ const curSlug = simplifySlug(file.data.slug!)
+ const outgoing: Set<SimpleSlug> = new Set()
- constructor(opts?: Options) {
- super()
- this.opts = { ...defaultOptions, ...opts }
+ const transformOptions: TransformOptions = {
+ strategy: opts.markdownLinkResolution,
+ allSlugs: ctx.allSlugs,
+ }
+
+ 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
+ const isInternal = !(isAbsoluteUrl(dest) || dest.startsWith("#"))
+ if (isInternal) {
+ dest = node.properties.href = transformLink(
+ file.data.slug!,
+ dest,
+ transformOptions,
+ )
+
+ // url.resolve is considered legacy
+ // WHATWG equivalent https://nodejs.dev/en/api/v18/url/#urlresolvefrom-to
+ const url = new URL(dest, `https://base.com/${curSlug}`)
+ const canonicalDest = url.pathname
+ const [destCanonical, _destAnchor] = splitAnchor(canonicalDest)
+
+ // need to decodeURIComponent here as WHATWG URL percent-encodes everything
+ const simple = decodeURIComponent(
+ simplifySlug(destCanonical as FullSlug),
+ ) as SimpleSlug
+ outgoing.add(simple)
+ node.properties["data-slug"] = simple
+ }
+
+ // rewrite link internals if prettylinks is on
+ if (
+ opts.prettyLinks &&
+ isInternal &&
+ 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
+ dest = node.properties.src = transformLink(
+ file.data.slug!,
+ dest,
+ transformOptions,
+ )
+ node.properties.src = dest
+ }
+ }
+ })
+
+ file.data.links = [...outgoing]
+ }
+ },
+ ]
+ },
}
+}
- markdownPlugins(): PluggableList {
- return [[remarkWikiLink, {
- pathFormat: this.opts.markdownLinkResolution === "absolute" ? 'obsidian-absolute' : 'raw',
- }]]
- }
-
- htmlPlugins(): PluggableList {
- return [() => {
- return (tree, file) => {
- const curSlug = file.data.slug!
- const transformLink = (target: string) => {
- const targetSlug = slugify(decodeURI(target).trim())
- if (this.opts.markdownLinkResolution === 'relative' && !path.isAbsolute(targetSlug)) {
- return './' + relative(curSlug, targetSlug)
- } else {
- return './' + relativeToRoot(curSlug, targetSlug)
- }
- }
-
- visit(tree, 'element', (node, _index, _parent) => {
- // rewrite all links
- if (
- node.tagName === 'a' &&
- node.properties &&
- typeof node.properties.href === 'string'
- ) {
- node.properties.className = isAbsoluteUrl(node.properties.href) ? "external" : "internal"
-
- // don't process external links or intra-document anchors
- if (!(isAbsoluteUrl(node.properties.href) || node.properties.href.startsWith("#"))) {
- node.properties.href = transformLink(node.properties.href)
- }
-
- // rewrite link internals if prettylinks is on
- if (this.opts.prettyLinks && node.children.length === 1 && node.children[0].type === 'text') {
- node.children[0].value = path.basename(node.children[0].value)
- }
- }
-
- // transform all images
- if (
- node.tagName === 'img' &&
- 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
- }
- }
- })
- }
- }]
+declare module "vfile" {
+ interface DataMap {
+ links: SimpleSlug[]
}
}
--
Gitblit v1.10.0