From 7963910129155cd423f87813cf2da1455d812ee1 Mon Sep 17 00:00:00 2001 From: Ihor Aleksandrychiev Date: Thu, 12 Nov 2026 14:11:02 +0200 Subject: [PATCH] Upgraded flexsearch to 0.8 0.7 is no longer supported. dedupe is disabled so repeated letters aren't collapsed ("qqq" -> "q"), which matched unrelated pages and differed from 0.7. Ticket: ENT-14206 Signed-off-by: Ihor Aleksandrychiev --- scripts/search/index/createIndex.js | 3 +- scripts/search/index/package-lock.json | 31 +++++++++++++++--- scripts/search/index/package.json | 2 +- scripts/search/server/package-lock.json | 42 ++++++++++++++++++++----- scripts/search/server/package.json | 2 +- scripts/search/server/server.js | 3 +- 6 files changed, 66 insertions(+), 17 deletions(-) diff --git a/scripts/search/index/createIndex.js b/scripts/search/index/createIndex.js index d3468b7..8265309 100644 --- a/scripts/search/index/createIndex.js +++ b/scripts/search/index/createIndex.js @@ -40,9 +40,8 @@ const resolveParamsShortcodes = (text, filename) => text.replace( id: 'number', index: ['content', 'headers', 'title'] }, - charset: "latin", + encoder: new FlexSearch.Encoder(FlexSearch.Charset.Default, {dedupe: false}), tokenize: "full", - matcher: "simple", cache: true }) diff --git a/scripts/search/index/package-lock.json b/scripts/search/index/package-lock.json index 9b4fedd..84c34c6 100644 --- a/scripts/search/index/package-lock.json +++ b/scripts/search/index/package-lock.json @@ -5,14 +5,37 @@ "packages": { "": { "dependencies": { - "flexsearch": "^0.7.31", + "flexsearch": "^0.8.212", "smol-toml": "^1.9.1" } }, "node_modules/flexsearch": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.7.31.tgz", - "integrity": "sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==" + "version": "0.8.212", + "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.8.212.tgz", + "integrity": "sha512-wSyJr1GUWoOOIISRu+X2IXiOcVfg9qqBRyCPRUdLMIGJqPzMo+jMRlvE83t14v1j0dRMEaBbER/adQjp6Du2pw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/ts-thomas" + }, + { + "type": "paypal", + "url": "https://www.paypal.com/donate/?hosted_button_id=GEVR88FC9BWRW" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/flexsearch" + }, + { + "type": "patreon", + "url": "https://patreon.com/user?u=96245532" + }, + { + "type": "liberapay", + "url": "https://liberapay.com/ts-thomas" + } + ], + "license": "Apache-2.0" }, "node_modules/smol-toml": { "version": "1.9.1", diff --git a/scripts/search/index/package.json b/scripts/search/index/package.json index 544728d..fd543de 100644 --- a/scripts/search/index/package.json +++ b/scripts/search/index/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "flexsearch": "^0.7.31", + "flexsearch": "^0.8.212", "smol-toml": "^1.9.1" } } diff --git a/scripts/search/server/package-lock.json b/scripts/search/server/package-lock.json index 37563a5..15af332 100644 --- a/scripts/search/server/package-lock.json +++ b/scripts/search/server/package-lock.json @@ -1,12 +1,40 @@ { - "name": "search", + "name": "server", + "lockfileVersion": 3, "requires": true, - "lockfileVersion": 1, - "dependencies": { - "flexsearch": { - "version": "0.7.31", - "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.7.31.tgz", - "integrity": "sha512-XGozTsMPYkm+6b5QL3Z9wQcJjNYxp0CYn3U1gO7dwD6PAqU1SVWZxI9CCg3z+ml3YfqdPnrBehaBrnH2AGKbNA==" + "packages": { + "": { + "dependencies": { + "flexsearch": "^0.8.212" + } + }, + "node_modules/flexsearch": { + "version": "0.8.212", + "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.8.212.tgz", + "integrity": "sha512-wSyJr1GUWoOOIISRu+X2IXiOcVfg9qqBRyCPRUdLMIGJqPzMo+jMRlvE83t14v1j0dRMEaBbER/adQjp6Du2pw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/ts-thomas" + }, + { + "type": "paypal", + "url": "https://www.paypal.com/donate/?hosted_button_id=GEVR88FC9BWRW" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/flexsearch" + }, + { + "type": "patreon", + "url": "https://patreon.com/user?u=96245532" + }, + { + "type": "liberapay", + "url": "https://liberapay.com/ts-thomas" + } + ], + "license": "Apache-2.0" } } } diff --git a/scripts/search/server/package.json b/scripts/search/server/package.json index 66ca677..896ac22 100644 --- a/scripts/search/server/package.json +++ b/scripts/search/server/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "flexsearch": "^0.7.31" + "flexsearch": "^0.8.212" } } diff --git a/scripts/search/server/server.js b/scripts/search/server/server.js index cde5ca2..6b5a7e7 100644 --- a/scripts/search/server/server.js +++ b/scripts/search/server/server.js @@ -14,9 +14,8 @@ const fetchIndex = () => { id: 'number', index: ['title', 'headers', 'content'] }, - charset: "latin", + encoder: new FlexSearch.Encoder(FlexSearch.Charset.Default, {dedupe: false}), tokenize: "full", - matcher: "simple", cache: true });