Merge pull request #624 from code16/fix-autocomplete-local-search

Fix autocomplete local search

Author: aguingand

package-lock.json

@@ -70,7 +70,7 @@
     "cropperjs": "^1.5.12",
     "dompurify": "^3.2.6",
     "filesize": "^10.1.0",
-    "flexsearch": "^0.7.43",
+    "flexsearch": "^0.8.205",
     "leaflet": "^1.9.4",
     "lodash": "^4.17.21",
     "lucide-vue-next": "^0.511.0",

package.json

@@ -1,25 +1,27 @@
-import Flexsearch from "flexsearch";
+import { Document, DocumentData, FieldName, Charset } from "flexsearch";
 import { MaybeRefOrGetter, toValue, watch } from "vue";
 
-export function useFullTextSearch<T>(list: MaybeRefOrGetter<T[] | null>, { id, searchKeys }: { id: string, searchKeys: string[] }) {
-    let index: Flexsearch.Document<T, true>;
+export function useFullTextSearch<T extends DocumentData>(
+    list: MaybeRefOrGetter<T[] | null>,
+    { id, searchKeys }: { id: string, searchKeys: FieldName<T>[] }
+) {
+    let index: Document<T>;
 
     function fullTextSearch(query: string) {
-        return index.search(query, undefined, { enrich: true })
-            .map(result => result.result.map(r => r.doc))
-            .flat()
+        return index.search(query, { enrich: true, merge: true })
+            .map(result => result.doc)
     }
 
     watch(() => toValue(list), (list) => {
         if(list) {
-            index = new Flexsearch.Document<T, true>({
+            index = new Document<T>({
                 document: {
                     id,
                     index: searchKeys,
                     store: true,
                 },
                 tokenize: 'forward',
-                charset: 'latin:simple',
+                encoder: Charset.Normalize,
             });
             list.forEach(item => index.add(item));
         }