Merge pull request #118 from CloudCannon/fix/filtering-on-no-results

Fix filters causing results to return for invalid search terms

pagefind/features/filtering.feature

@@ -214,4 +214,22 @@ Feature: Filtering
             }
             """
         Then There should be no logs
-        Then The selector "[data-results]" should contain "0"
+        Then The selector "[data-results]" should contain "0"
+
+    Scenario: Filtering on a search term with no results returns nothing
+        When I evaluate:
+            """
+            async function() {
+                let pagefind = await import("/_pagefind/pagefind.js");
+
+                let search = await pagefind.search("Pontification", {
+                    filters: {
+                        color: "Orange"
+                    }
+                });
+
+                document.querySelector('[data-results]').innerText = search.results.length;
+            }
+            """
+        Then There should be no logs
+        Then The selector "[data-results]" should contain "0"

pagefind_web/src/search.rs

@@ -104,7 +104,9 @@ impl SearchIndex {
         let mut maps = Vec::new();
         let mut unique_maps = Vec::new();
         let mut words = Vec::new();
-        for term in stems_from_term(term) {
+        let split_term = stems_from_term(term);
+
+        for term in split_term.iter() {
             let mut word_maps = Vec::new();
             for (word, word_index) in self.find_word_extensions(&term) {
                 words.extend(word_index);
@@ -119,6 +121,11 @@ impl SearchIndex {
                 maps.push(result);
             }
         }
+        // In the case where a search term was passed, but not found,
+        // make sure we cause the entire search to return no results.
+        if !split_term.is_empty() && maps.is_empty() {
+            maps.push(BitSet::new());
+        }
 
         if let Some(filter) = filter_results {
             maps.push(filter);