From 9c8fec06d2b58e4e3bbe280ddc665a99fcc4878c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 09 Mar 2025 22:33:15 +0000
Subject: [PATCH] feat: support non-singleton search
---
quartz/util/path.ts | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/quartz/util/path.ts b/quartz/util/path.ts
index dceb89b..8f85029 100644
--- a/quartz/util/path.ts
+++ b/quartz/util/path.ts
@@ -1,9 +1,6 @@
import { slug as slugAnchor } from "github-slugger"
import type { Element as HastElement } from "hast"
-import rfdc from "rfdc"
-
-export const clone = rfdc()
-
+import { clone } from "./clone"
// this file must be isomorphic so it can't use node libs (e.g. path)
export const QUARTZ = "quartz"
@@ -108,10 +105,10 @@
el.setAttribute(attr, rebased.pathname + rebased.hash)
}
export function normalizeRelativeURLs(el: Element | Document, destination: string | URL) {
- el.querySelectorAll('[href^="./"], [href^="../"]').forEach((item) =>
+ el.querySelectorAll('[href=""], [href^="./"], [href^="../"]').forEach((item) =>
_rebaseHtmlElement(item, "href", destination),
)
- el.querySelectorAll('[src^="./"], [src^="../"]').forEach((item) =>
+ el.querySelectorAll('[src=""], [src^="./"], [src^="../"]').forEach((item) =>
_rebaseHtmlElement(item, "src", destination),
)
}
@@ -168,6 +165,9 @@
export function splitAnchor(link: string): [string, string] {
let [fp, anchor] = link.split("#", 2)
+ if (fp.endsWith(".pdf")) {
+ return [fp, anchor === undefined ? "" : `#${anchor}`]
+ }
anchor = anchor === undefined ? "" : "#" + slugAnchor(anchor)
return [fp, anchor]
}
@@ -180,10 +180,26 @@
}
export function joinSegments(...args: string[]): string {
- return args
- .filter((segment) => segment !== "")
+ if (args.length === 0) {
+ return ""
+ }
+
+ let joined = args
+ .filter((segment) => segment !== "" && segment !== "/")
+ .map((segment) => stripSlashes(segment))
.join("/")
- .replace(/\/\/+/g, "/")
+
+ // if the first segment starts with a slash, add it back
+ if (args[0].startsWith("/")) {
+ joined = "/" + joined
+ }
+
+ // if the last segment is a folder, add a trailing slash
+ if (args[args.length - 1].endsWith("/")) {
+ joined = joined + "/"
+ }
+
+ return joined
}
export function getAllSegmentPrefixes(tags: string): string[] {
--
Gitblit v1.10.0