From 03ccac2872822442b4e11457e1c3452167a3f639 Mon Sep 17 00:00:00 2001
From: Amir Pourmand <pourmand1376@gmail.com>
Date: Wed, 17 Sep 2025 22:39:30 +0000
Subject: [PATCH] feat: Update FlexSearch and Add Support for All Languages (#2108)
---
package-lock.json | 35 +++++++++++++++++++++++++++++++----
package.json | 2 +-
quartz/components/scripts/search.inline.ts | 16 +++++++++++-----
3 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 741ed77..63611ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,7 @@
"cli-spinner": "^0.2.10",
"d3": "^7.9.0",
"esbuild-sass-plugin": "^3.3.1",
- "flexsearch": "0.7.43",
+ "flexsearch": "^0.8.205",
"github-slugger": "^2.0.0",
"globby": "^14.1.0",
"gray-matter": "^4.0.3",
@@ -3189,9 +3189,36 @@
}
},
"node_modules/flexsearch": {
- "version": "0.7.43",
- "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.7.43.tgz",
- "integrity": "sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg=="
+ "version": "0.8.205",
+ "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.8.205.tgz",
+ "integrity": "sha512-REFjMqy86DKkCTJ4gIE42c9MVm9t1vUWfEub/8taixYuhvyu4jd4XmFALk5VuKW4GH4VLav8A4BJboTsslHF1w==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/ts-thomas"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/flexsearch"
+ },
+ {
+ "type": "patreon",
+ "url": "https://patreon.com/user?u=96245532"
+ },
+ {
+ "type": "liberapay",
+ "url": "https://liberapay.com/ts-thomas"
+ },
+ {
+ "type": "paypal",
+ "url": "https://www.paypal.com/donate/?hosted_button_id=GEVR88FC9BWRW"
+ },
+ {
+ "type": "bountysource",
+ "url": "https://salt.bountysource.com/teams/ts-thomas"
+ }
+ ],
+ "license": "Apache-2.0"
},
"node_modules/format": {
"version": "0.2.2",
diff --git a/package.json b/package.json
index 457027a..55bd1b2 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
"cli-spinner": "^0.2.10",
"d3": "^7.9.0",
"esbuild-sass-plugin": "^3.3.1",
- "flexsearch": "0.7.43",
+ "flexsearch": "^0.8.205",
"github-slugger": "^2.0.0",
"globby": "^14.1.0",
"gray-matter": "^4.0.3",
diff --git a/quartz/components/scripts/search.inline.ts b/quartz/components/scripts/search.inline.ts
index 28d47e9..6a84a50 100644
--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -1,4 +1,4 @@
-import FlexSearch from "flexsearch"
+import FlexSearch, { DefaultDocumentSearchResults } from "flexsearch"
import { ContentDetails } from "../../plugins/emitters/contentIndex"
import { registerEscapeHandler, removeAllChildren } from "./util"
import { FullSlug, normalizeRelativeURLs, resolveRelative } from "../../util/path"
@@ -9,15 +9,21 @@
title: string
content: string
tags: string[]
+ [key: string]: any
}
// Can be expanded with things like "term" in the future
type SearchType = "basic" | "tags"
let searchType: SearchType = "basic"
let currentSearchTerm: string = ""
-const encoder = (str: string) => str.toLowerCase().split(/([^a-z]|[^\x00-\x7F])/)
+const encoder = (str: string) => {
+ return str
+ .toLowerCase()
+ .split(/\s+/)
+ .filter((token) => token.length > 0)
+}
+
let index = new FlexSearch.Document<Item>({
- charset: "latin:extra",
encode: encoder,
document: {
id: "id",
@@ -397,7 +403,7 @@
searchLayout.classList.toggle("display-results", currentSearchTerm !== "")
searchType = currentSearchTerm.startsWith("#") ? "tags" : "basic"
- let searchResults: FlexSearch.SimpleDocumentSearchResultSetUnit[]
+ let searchResults: DefaultDocumentSearchResults<Item>
if (searchType === "tags") {
currentSearchTerm = currentSearchTerm.substring(1).trim()
const separatorIndex = currentSearchTerm.indexOf(" ")
@@ -410,7 +416,7 @@
// return at least 10000 documents, so it is enough to filter them by tag (implemented in flexsearch)
limit: Math.max(numSearchResults, 10000),
index: ["title", "content"],
- tag: tag,
+ tag: { tags: tag },
})
for (let searchResult of searchResults) {
searchResult.result = searchResult.result.slice(0, numSearchResults)
--
Gitblit v1.10.0