From 81e22a01e3369de1a09221f34f044cc894aad5ae Mon Sep 17 00:00:00 2001
From: Daniel Bauer <daniel.bauer@senckenberg.de>
Date: Mon, 16 Dec 2024 12:25:15 +0100
Subject: [PATCH] filter fields at index time

---
 src/DataviewSuggester.ts | 35 ++++++++++++++++++++---------------
 src/SettingsTab.ts       |  1 +
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/DataviewSuggester.ts b/src/DataviewSuggester.ts
index e34991e..0ccf903 100644
--- a/src/DataviewSuggester.ts
+++ b/src/DataviewSuggester.ts
@@ -53,26 +53,15 @@ export class DataviewSuggester extends EditorSuggest<String> {
     }
 
     getSuggestions(context: EditorSuggestContext): string[] | Promise<string[]> {
-        // TODO: add filter at index-time?
-        let filtered = this.suggestionsList;
-        for (const filterPattern of this.plugin.settings.ignoredFields) {
-            const regex = new RegExp(`^(${filterPattern})::.*`);
-            const ignoredSuggestions = filtered.filter((suggestion) => regex.test(suggestion));
-            // minimatch.match(filtered, filterPattern + ":: *", { partial: true })
-            for (const ignoredSuggestion of ignoredSuggestions) {
-                filtered = filtered.slice(filtered.indexOf(ignoredSuggestion) + 1);
-            }
-        }
-
-        const idxs = this.searcher.filter(filtered, context.query);
+        const idxs = this.searcher.filter(this.suggestionsList, context.query);
         if (idxs != null && idxs.length > 0) {
-            let info = this.searcher.info(idxs, filtered, context.query);
-            let order = this.searcher.sort(info, filtered, context.query);
+            let info = this.searcher.info(idxs, this.suggestionsList, context.query);
+            let order = this.searcher.sort(info, this.suggestionsList, context.query);
 
             // return top N suggestions with marks
             return order
                 .slice(0, this.maxSuggestions)
-                .map((idx) => [idx, filtered[info.idx[idx]]])
+                .map((idx) => [idx, this.suggestionsList[info.idx[idx]]])
                 .map((suggestion: [number, string]) => uFuzzy.highlight(suggestion[1], info.ranges[suggestion[0]]));
         }
         return [];
@@ -134,6 +123,16 @@ export class DataviewSuggester extends EditorSuggest<String> {
         return `${key}:: ${stringValue}`;
     }
 
+    filterCompositeValue(compositeValue: string): boolean {
+        for (const filterPattern of this.plugin.settings.ignoredFields) {
+            const regex = new RegExp(`^(${filterPattern})::.*`);
+            if (regex.test(compositeValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     buildNewIndex() {
         console.log("Begin Rebuilding dataview suggestion index");
         const startTime = performance.now();
@@ -166,6 +165,9 @@ export class DataviewSuggester extends EditorSuggest<String> {
                     if (value === null || value === undefined) continue; // skip empty fields
 
                     let compositeValue = this.formatCompositeValue(key, value);
+                    if (!this.filterCompositeValue(compositeValue)) {
+                        continue;
+                    }
 
                     if (newSuggestions.indexOf(compositeValue) === -1) {
                         // suggestion not seen on any page yet
@@ -216,6 +218,9 @@ export class DataviewSuggester extends EditorSuggest<String> {
                     if (value === null || value === undefined) continue; // skip empty fields
 
                     let compositeValue = this.formatCompositeValue(key, value);
+                    if (!this.filterCompositeValue(compositeValue)) {
+                        continue;
+                    }
                     if (updateCompositeValues.indexOf(compositeValue) === -1) {
                         updateCompositeValues.push(compositeValue);
                     }
diff --git a/src/SettingsTab.ts b/src/SettingsTab.ts
index 4440ea6..054d6e8 100644
--- a/src/SettingsTab.ts
+++ b/src/SettingsTab.ts
@@ -33,6 +33,7 @@ export class SettingsTab extends PluginSettingTab {
                             .map((val) => val.trim())
                             .filter((val) => val.length > 0);
                         await this.plugin.saveSettings();
+                        this.plugin.suggester?.buildNewIndex();
                     });
             });
     }