fix: update flexsearch to support accent insensitive search

Author: JeromeBu

helm-charts/catalogi/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: catalogi
 description: A Helm chart for deploying the Catalogi open source software catalog.
 type: application
-version: 2.0.20
-appVersion: 1.53.3
+version: 2.0.21
+appVersion: 1.53.4
 dependencies:
   - name: postgresql
     version: '16'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sill",
-  "version": "1.53.3",
+  "version": "1.53.4",
   "license": "MIT",
   "private": true,
   "scripts": {

web/package.json

@@ -30,7 +30,7 @@
         "@uiw/react-md-editor": "^3.23.5",
         "api": "*",
         "evt": "^2.5.7",
-        "flexsearch": "0.7.43",
+        "flexsearch": "^0.8.212",
         "i18next": "^23.6.0",
         "i18next-browser-languagedetector": "^8.0.2",
         "i18next-http-backend": "^3.0.2",

web/src/core/usecases/softwareCatalog/thunks.ts

@@ -312,32 +312,31 @@ function apiSoftwareToInternalSoftware(params: {
 const { filterBySearchMemoized } = (() => {
     const getFlexSearch = memoize(
         (softwares: State.Software.Internal[]) => {
-            const index = new FlexSearch.Document<State.Software.Internal>({
+            const index = new FlexSearch.Document({
                 document: {
                     id: "softwareName",
                     field: ["search"]
                 },
                 cache: 100,
                 tokenize: "full",
-                charset: {
-                    split: /\s+/,
-                    rtl: false,
-                    encode: (str: string): string[] => {
-                        const normalized = str
-                            .normalize("NFD")
-                            .replace(/[\u0300-\u036f]/g, "")
-                            .toLowerCase();
-                        return [normalized];
-                    }
-                },
+                encoder: "Default",
                 context: {
                     resolution: 9,
                     depth: 2,
                     bidirectional: true
                 }
             });
 
-            softwares.forEach(software => index.add(software));
+            softwares.forEach(
+                ({
+                    logoUrl,
+                    latestVersion,
+                    userDeclaration,
+                    referencePublications,
+                    customAttributes,
+                    ...software
+                }) => index.add(software)
+            );
 
             return index;
         },
@@ -376,7 +375,6 @@ const { filterBySearchMemoized } = (() => {
             const index = getFlexSearch(softwares);
 
             const searchResult = await index.searchAsync(search, {
-                bool: "or",
                 suggest: true,
                 enrich: true
             });

yarn.lock

@@ -4189,10 +4189,10 @@ flatted@^3.2.9:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
   integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
 
-flexsearch@0.7.43:
-  version "0.7.43"
-  resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.7.43.tgz#34f89b36278a466ce379c5bf6fb341965ed3f16c"
-  integrity sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg==
+flexsearch@^0.8.212:
+  version "0.8.212"
+  resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.8.212.tgz#b9509af778a991b938292e36fe0809a4ece4b940"
+  integrity sha512-wSyJr1GUWoOOIISRu+X2IXiOcVfg9qqBRyCPRUdLMIGJqPzMo+jMRlvE83t14v1j0dRMEaBbER/adQjp6Du2pw==
 
 for-each@^0.3.3:
   version "0.3.5"