From 2f6747b1666316e579c6e7238092ac6a65d00925 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 05:04:15 +0000
Subject: [PATCH] fix relative path resolution in router and link crawling
---
quartz/components/scripts/search.inline.ts | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 deletions(-)
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index c738fc9..5c7dae0 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -1,12 +1,13 @@
import { Document } from "flexsearch"
import { ContentDetails } from "../../plugins/emitters/contentIndex"
import { registerEscapeHandler, removeAllChildren } from "./util"
-import { CanonicalSlug, getClientSlug, resolveRelative } from "../../path"
+import { CanonicalSlug, getClientSlug, resolveRelative } from "../../util/path"
interface Item {
- slug: CanonicalSlug,
- title: string,
- content: string,
+ id: number
+ slug: CanonicalSlug
+ title: string
+ content: string
}
let index: Document<Item> | undefined = undefined
@@ -15,15 +16,17 @@
const numSearchResults = 5
function highlight(searchTerm: string, text: string, trim?: boolean) {
// try to highlight longest tokens first
- const tokenizedTerms = searchTerm.split(/\s+/).filter(t => t !== "").sort((a, b) => b.length - a.length)
- let tokenizedText = text
+ const tokenizedTerms = searchTerm
.split(/\s+/)
- .filter(t => t !== "")
+ .filter((t) => t !== "")
+ .sort((a, b) => b.length - a.length)
+ let tokenizedText = text.split(/\s+/).filter((t) => t !== "")
let startIndex = 0
let endIndex = tokenizedText.length - 1
if (trim) {
- const includesCheck = (tok: string) => tokenizedTerms.some((term) => tok.toLowerCase().startsWith(term.toLowerCase()))
+ const includesCheck = (tok: string) =>
+ tokenizedTerms.some((term) => tok.toLowerCase().startsWith(term.toLowerCase()))
const occurencesIndices = tokenizedText.map(includesCheck)
let bestSum = 0
@@ -42,19 +45,22 @@
tokenizedText = tokenizedText.slice(startIndex, endIndex)
}
- const slice = tokenizedText.map(tok => {
- // see if this tok is prefixed by any search terms
- for (const searchTok of tokenizedTerms) {
- if (tok.toLowerCase().includes(searchTok.toLowerCase())) {
- const regex = new RegExp(searchTok.toLowerCase(), "gi")
- return tok.replace(regex, `<span class="highlight">$&</span>`)
+ const slice = tokenizedText
+ .map((tok) => {
+ // see if this tok is prefixed by any search terms
+ for (const searchTok of tokenizedTerms) {
+ if (tok.toLowerCase().includes(searchTok.toLowerCase())) {
+ const regex = new RegExp(searchTok.toLowerCase(), "gi")
+ return tok.replace(regex, `<span class="highlight">$&</span>`)
+ }
}
- }
- return tok
- })
+ return tok
+ })
.join(" ")
- return `${startIndex === 0 ? "" : "..."}${slice}${endIndex === tokenizedText.length - 1 ? "" : "..."}`
+ return `${startIndex === 0 ? "" : "..."}${slice}${
+ endIndex === tokenizedText.length - 1 ? "" : "..."
+ }`
}
const encoder = (str: string) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])/)
@@ -67,6 +73,7 @@
const searchIcon = document.getElementById("search-icon")
const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
const results = document.getElementById("results-container")
+ const idDataMap = Object.keys(data) as CanonicalSlug[]
function hideSearch() {
container?.classList.remove("active")
@@ -102,18 +109,22 @@
}
}
- const formatForDisplay = (term: string, slug: CanonicalSlug) => ({
- slug,
- title: highlight(term, data[slug].title ?? ""),
- content: highlight(term, data[slug].content ?? "", true),
- })
+ const formatForDisplay = (term: string, id: number) => {
+ const slug = idDataMap[id]
+ return {
+ id,
+ slug,
+ title: highlight(term, data[slug].title ?? ""),
+ content: highlight(term, data[slug].content ?? "", true),
+ }
+ }
const resultToHTML = ({ slug, title, content }: Item) => {
const button = document.createElement("button")
button.classList.add("result-card")
button.id = slug
button.innerHTML = `<h3>${title}</h3><p>${content}</p>`
- button.addEventListener('click', () => {
+ button.addEventListener("click", () => {
const targ = resolveRelative(currentSlug, slug)
window.spaNavigate(new URL(targ, getClientSlug(window)))
})
@@ -132,20 +143,20 @@
} else {
results.append(...finalResults.map(resultToHTML))
}
-
}
- function onType(e: HTMLElementEventMap["input"]) {
+ async function onType(e: HTMLElementEventMap["input"]) {
const term = (e.target as HTMLInputElement).value
- const searchResults = index?.search(term, numSearchResults) ?? []
- const getByField = (field: string): CanonicalSlug[] => {
+ const searchResults = (await index?.searchAsync(term, numSearchResults)) ?? []
+ console.log(searchResults)
+ const getByField = (field: string): number[] => {
const results = searchResults.filter((x) => x.field === field)
- return results.length === 0 ? [] : [...results[0].result] as CanonicalSlug[]
+ return results.length === 0 ? [] : ([...results[0].result] as number[])
}
// order titles ahead of content
- const allIds: Set<CanonicalSlug> = new Set([...getByField("title"), ...getByField("content")])
- const finalResults = [...allIds].map(id => formatForDisplay(term, id))
+ const allIds: Set<number> = new Set([...getByField("title"), ...getByField("content")])
+ const finalResults = [...allIds].map((id) => formatForDisplay(term, id))
displayResults(finalResults)
}
@@ -160,30 +171,33 @@
if (!index) {
index = new Document({
cache: true,
- charset: 'latin:extra',
+ charset: "latin:extra",
optimize: true,
encode: encoder,
document: {
- id: "slug",
+ id: "id",
index: [
{
field: "title",
- tokenize: "forward",
+ tokenize: "reverse",
},
{
field: "content",
tokenize: "reverse",
},
- ]
+ ],
},
})
+ let id = 0
for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
- await index.addAsync(slug, {
+ await index.addAsync(id, {
+ id,
slug: slug as CanonicalSlug,
title: fileData.title,
- content: fileData.content
+ content: fileData.content,
})
+ id++
}
}
--
Gitblit v1.10.0