From e0ebee5aa9b3646de722f139f1d8d15591df538e Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 02 Jul 2023 20:08:29 +0000
Subject: [PATCH] various polish
---
quartz/path.ts | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/quartz/path.ts b/quartz/path.ts
index 4127fc0..81cdb3a 100644
--- a/quartz/path.ts
+++ b/quartz/path.ts
@@ -1,12 +1,30 @@
import path from 'path'
+import { slug as slugAnchor } from 'github-slugger'
function slugSegment(s: string): string {
return s.replace(/\s/g, '-')
}
+// on the client, 'index' isn't ever rendered so we should clean it up
+export function clientSideSlug(fp: string): string {
+ if (fp.endsWith("index")) {
+ fp = fp.slice(0, -"index".length)
+ }
+
+ return fp
+}
+
+export function trimPathSuffix(fp: string): string {
+ fp = clientSideSlug(fp)
+ let [cleanPath, anchor] = fp.split("#", 2)
+ anchor = anchor === undefined ? "" : "#" + anchor
+
+ return cleanPath + anchor
+}
+
export function slugify(s: string): string {
const [fp, anchor] = s.split("#", 2)
- const sluggedAnchor = anchor === undefined ? "" : "#" + slugSegment(anchor)
+ const sluggedAnchor = anchor === undefined ? "" : "#" + slugAnchor(anchor)
const withoutFileExt = fp.replace(new RegExp(path.extname(fp) + '$'), '')
const rawSlugSegments = withoutFileExt.split(path.sep)
const slugParts: string = rawSlugSegments
@@ -18,12 +36,13 @@
// resolve /a/b/c to ../../
export function resolveToRoot(slug: string): string {
- let fp = slug
- if (fp.endsWith("/index")) {
- fp = fp.slice(0, -"/index".length)
+ let fp = trimPathSuffix(slug)
+
+ if (fp === "") {
+ return "."
}
- return fp
+ return "./" + fp
.split('/')
.filter(x => x !== '')
.map(_ => '..')
@@ -35,7 +54,8 @@
}
export function relative(src: string, dest: string): string {
- return path.relative(src, dest)
+ return "./" + path.relative(src, dest)
+
}
export const QUARTZ = "quartz"
--
Gitblit v1.10.0