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 | 83 +++++++++++++++++++++++++----------------
1 files changed, 50 insertions(+), 33 deletions(-)
diff --git a/quartz/util/path.ts b/quartz/util/path.ts
index 5cd79ba..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"
@@ -23,22 +20,22 @@
export function isFullSlug(s: string): s is FullSlug {
const validStart = !(s.startsWith(".") || s.startsWith("/"))
const validEnding = !s.endsWith("/")
- return validStart && validEnding && !_containsForbiddenCharacters(s)
+ return validStart && validEnding && !containsForbiddenCharacters(s)
}
/** Shouldn't be a relative path and shouldn't have `/index` as an ending or a file extension. It _can_ however have a trailing slash to indicate a folder path. */
export type SimpleSlug = SlugLike<"simple">
export function isSimpleSlug(s: string): s is SimpleSlug {
const validStart = !(s.startsWith(".") || (s.length > 1 && s.startsWith("/")))
- const validEnding = !(s.endsWith("/index") || s === "index")
- return validStart && !_containsForbiddenCharacters(s) && validEnding && !_hasFileExtension(s)
+ const validEnding = !endsWith(s, "index")
+ return validStart && !containsForbiddenCharacters(s) && validEnding && !_hasFileExtension(s)
}
/** Can be found on `href`s but can also be constructed for client-side navigation (e.g. search and graph) */
export type RelativeURL = SlugLike<"relative">
export function isRelativeURL(s: string): s is RelativeURL {
const validStart = /^\.{1,2}/.test(s)
- const validEnding = !(s.endsWith("/index") || s === "index")
+ const validEnding = !endsWith(s, "index")
return validStart && validEnding && ![".md", ".html"].includes(_getFileExtension(s) ?? "")
}
@@ -63,7 +60,7 @@
}
export function slugifyFilePath(fp: FilePath, excludeExt?: boolean): FullSlug {
- fp = _stripSlashes(fp) as FilePath
+ fp = stripSlashes(fp) as FilePath
let ext = _getFileExtension(fp)
const withoutFileExt = fp.replace(new RegExp(ext + "$"), "")
if (excludeExt || [".md", ".html", undefined].includes(ext)) {
@@ -73,7 +70,7 @@
let slug = sluggify(withoutFileExt)
// treat _index as index
- if (_endsWith(slug, "_index")) {
+ if (endsWith(slug, "_index")) {
slug = slug.replace(/_index$/, "index")
}
@@ -81,21 +78,21 @@
}
export function simplifySlug(fp: FullSlug): SimpleSlug {
- const res = _stripSlashes(_trimSuffix(fp, "index"), true)
+ const res = stripSlashes(trimSuffix(fp, "index"), true)
return (res.length === 0 ? "/" : res) as SimpleSlug
}
export function transformInternalLink(link: string): RelativeURL {
let [fplike, anchor] = splitAnchor(decodeURI(link))
- const folderPath = _isFolderPath(fplike)
+ const folderPath = isFolderPath(fplike)
let segments = fplike.split("/").filter((x) => x.length > 0)
- let prefix = segments.filter(_isRelativeSegment).join("/")
- let fp = segments.filter((seg) => !_isRelativeSegment(seg) && seg !== "").join("/")
+ let prefix = segments.filter(isRelativeSegment).join("/")
+ let fp = segments.filter((seg) => !isRelativeSegment(seg) && seg !== "").join("/")
// manually add ext here as we want to not strip 'index' if it has an extension
const simpleSlug = simplifySlug(slugifyFilePath(fp as FilePath))
- const joined = joinSegments(_stripSlashes(prefix), _stripSlashes(simpleSlug))
+ const joined = joinSegments(stripSlashes(prefix), stripSlashes(simpleSlug))
const trail = folderPath ? "/" : ""
const res = (_addRelativeToStart(joined) + trail + anchor) as RelativeURL
return res
@@ -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[] {
@@ -206,8 +222,8 @@
if (opts.strategy === "relative") {
return targetSlug as RelativeURL
} else {
- const folderTail = _isFolderPath(targetSlug) ? "/" : ""
- const canonicalSlug = _stripSlashes(targetSlug.slice(".".length))
+ const folderTail = isFolderPath(targetSlug) ? "/" : ""
+ const canonicalSlug = stripSlashes(targetSlug.slice(".".length))
let [targetCanonical, targetAnchor] = splitAnchor(canonicalSlug)
if (opts.strategy === "shortest") {
@@ -230,28 +246,29 @@
}
}
-function _isFolderPath(fplike: string): boolean {
+// path helpers
+function isFolderPath(fplike: string): boolean {
return (
fplike.endsWith("/") ||
- _endsWith(fplike, "index") ||
- _endsWith(fplike, "index.md") ||
- _endsWith(fplike, "index.html")
+ endsWith(fplike, "index") ||
+ endsWith(fplike, "index.md") ||
+ endsWith(fplike, "index.html")
)
}
-function _endsWith(s: string, suffix: string): boolean {
+export function endsWith(s: string, suffix: string): boolean {
return s === suffix || s.endsWith("/" + suffix)
}
-function _trimSuffix(s: string, suffix: string): string {
- if (_endsWith(s, suffix)) {
+function trimSuffix(s: string, suffix: string): string {
+ if (endsWith(s, suffix)) {
s = s.slice(0, -suffix.length)
}
return s
}
-function _containsForbiddenCharacters(s: string): boolean {
- return s.includes(" ") || s.includes("#") || s.includes("?")
+function containsForbiddenCharacters(s: string): boolean {
+ return s.includes(" ") || s.includes("#") || s.includes("?") || s.includes("&")
}
function _hasFileExtension(s: string): boolean {
@@ -262,11 +279,11 @@
return s.match(/\.[A-Za-z0-9]+$/)?.[0]
}
-function _isRelativeSegment(s: string): boolean {
+function isRelativeSegment(s: string): boolean {
return /^\.{0,2}$/.test(s)
}
-export function _stripSlashes(s: string, onlyStripPrefix?: boolean): string {
+export function stripSlashes(s: string, onlyStripPrefix?: boolean): string {
if (s.startsWith("/")) {
s = s.substring(1)
}
--
Gitblit v1.10.0