From 3ac6b42e16dca5a44ed3fec2c0314f1dbbc2322b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 16 Jul 2023 06:02:12 +0000
Subject: [PATCH] finish path refactoring, add sourcemap + better trace support
---
quartz/components/scripts/search.inline.ts | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index 57628f5..c738fc9 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -1,12 +1,14 @@
import { Document } from "flexsearch"
import { ContentDetails } from "../../plugins/emitters/contentIndex"
-import { registerEscapeHandler, relative, removeAllChildren } from "./util"
+import { registerEscapeHandler, removeAllChildren } from "./util"
+import { CanonicalSlug, getClientSlug, resolveRelative } from "../../path"
interface Item {
- slug: string,
+ slug: CanonicalSlug,
title: string,
content: string,
}
+
let index: Document<Item> | undefined = undefined
const contextWindowWords = 30
@@ -100,7 +102,7 @@
}
}
- const formatForDisplay = (term: string, slug: string) => ({
+ const formatForDisplay = (term: string, slug: CanonicalSlug) => ({
slug,
title: highlight(term, data[slug].title ?? ""),
content: highlight(term, data[slug].content ?? "", true),
@@ -112,8 +114,8 @@
button.id = slug
button.innerHTML = `<h3>${title}</h3><p>${content}</p>`
button.addEventListener('click', () => {
- const targ = relative(currentSlug, slug)
- window.spaNavigate(new URL(targ))
+ const targ = resolveRelative(currentSlug, slug)
+ window.spaNavigate(new URL(targ, getClientSlug(window)))
})
return button
}
@@ -136,13 +138,13 @@
function onType(e: HTMLElementEventMap["input"]) {
const term = (e.target as HTMLInputElement).value
const searchResults = index?.search(term, numSearchResults) ?? []
- const getByField = (field: string): string[] => {
+ const getByField = (field: string): CanonicalSlug[] => {
const results = searchResults.filter((x) => x.field === field)
- return results.length === 0 ? [] : [...results[0].result] as string[]
+ return results.length === 0 ? [] : [...results[0].result] as CanonicalSlug[]
}
// order titles ahead of content
- const allIds: Set<string> = new Set([...getByField("title"), ...getByField("content")])
+ const allIds: Set<CanonicalSlug> = new Set([...getByField("title"), ...getByField("content")])
const finalResults = [...allIds].map(id => formatForDisplay(term, id))
displayResults(finalResults)
}
@@ -178,7 +180,7 @@
for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
await index.addAsync(slug, {
- slug,
+ slug: slug as CanonicalSlug,
title: fileData.title,
content: fileData.content
})
--
Gitblit v1.10.0