From 4877a9c934201e8f0e4e83821efe2dc3f9299d9a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 03 Aug 2023 07:08:13 +0000
Subject: [PATCH] fix callout aliases not being used properly

---
 quartz/components/scripts/search.inline.ts |   68 ++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index 57628f5..40d0bc2 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -1,27 +1,31 @@
 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,
-  title: string,
-  content: string,
+  slug: CanonicalSlug
+  title: string
+  content: string
 }
+
 let index: Document<Item> | undefined = undefined
 
 const contextWindowWords = 30
 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
@@ -40,19 +44,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])/)
@@ -100,7 +107,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),
@@ -111,9 +118,9 @@
     button.classList.add("result-card")
     button.id = slug
     button.innerHTML = `<h3>${title}</h3><p>${content}</p>`
-    button.addEventListener('click', () => {
-      const targ = relative(currentSlug, slug)
-      window.spaNavigate(new URL(targ))
+    button.addEventListener("click", () => {
+      const targ = resolveRelative(currentSlug, slug)
+      window.spaNavigate(new URL(targ, getClientSlug(window)))
     })
     return button
   }
@@ -130,20 +137,19 @@
     } else {
       results.append(...finalResults.map(resultToHTML))
     }
-
   }
 
   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 finalResults = [...allIds].map(id => formatForDisplay(term, id))
+    const allIds: Set<CanonicalSlug> = new Set([...getByField("title"), ...getByField("content")])
+    const finalResults = [...allIds].map((id) => formatForDisplay(term, id))
     displayResults(finalResults)
   }
 
@@ -158,7 +164,7 @@
   if (!index) {
     index = new Document({
       cache: true,
-      charset: 'latin:extra',
+      charset: "latin:extra",
       optimize: true,
       encode: encoder,
       document: {
@@ -172,15 +178,15 @@
             field: "content",
             tokenize: "reverse",
           },
-        ]
+        ],
       },
     })
 
     for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
       await index.addAsync(slug, {
-        slug,
+        slug: slug as CanonicalSlug,
         title: fileData.title,
-        content: fileData.content
+        content: fileData.content,
       })
     }
   }

--
Gitblit v1.10.0