@datawheel/bespoke 0.3.7 → 0.3.8

package/dist/index.js

@@ -3888,13 +3888,14 @@ function BespokeSearch({
   };
   const inputRef = useRef();
   const containerRef = useClickOutside(doClose);
+  const searchLimit = autocompleteProps?.searchConfig?.searchLimit ?? 10;
   const doSearch = () => {
     setLoading(true);
     const params = {
       query: debouncedQuery,
       format: "profiles",
       locale,
-      limit: 10,
+      limit: searchLimit,
       visible: true,
       includes: true,
       noImage: false,
@@ -3936,10 +3937,10 @@ function BespokeSearch({
     });
   };
   useEffect(() => {
-    if (initialized && debouncedQuery.length > 0) {
+    if (initialized && debouncedQuery.length >= (autocompleteProps.searchConfig?.queryThreshold ?? 0)) {
       doSearch();
     }
-  }, [debouncedQuery]);
+  }, [initialized, debouncedQuery, autocompleteProps.searchConfig?.queryThreshold]);
   useEffect(() => {
     cancel();
     if (inputRef.current && visible) {
@@ -3952,13 +3953,6 @@ function BespokeSearch({
       setInitialized(true);
     }
   }, [visible]);
-  const acConfig = {
-    placeholder: "Search",
-    size: "md",
-    icon: /* @__PURE__ */ jsx(IconSearch, {}),
-    ...autocompleteProps,
-    data: results
-  };
   const onItemSubmit = (item) => {
     setVisible(false);
     if (callback) {
@@ -3973,6 +3967,14 @@ function BespokeSearch({
       setQuery(searchTerm);
     }
   };
+  const { searchConfig: _, ...finalAutocompleteProps } = autocompleteProps;
+  const acConfig = {
+    placeholder: "Search",
+    size: "md",
+    icon: /* @__PURE__ */ jsx(IconSearch, {}),
+    ...finalAutocompleteProps,
+    data: results
+  };
   const autocompleteElement = /* @__PURE__ */ jsx(
     Autocomplete,
     {
@@ -3982,7 +3984,7 @@ function BespokeSearch({
       onChange,
       filter: () => true,
       disabled: (loading || redirecting) && !initialized,
-      limit: 10,
+      limit: searchLimit,
       maxDropdownHeight: 250,
       rightSection: /* @__PURE__ */ jsx(Group, { spacing: 0, position: "right", children: loading ? /* @__PURE__ */ jsx(Loader, { size: 20 }) : /* @__PURE__ */ jsx(Fragment, {}) }),
       rightSectionWidth: 50,

package/dist/server.js

@@ -1707,6 +1707,12 @@ function readMemberImageFactory(db) {
     }
   }
 }
+function sanitizeQuery(str) {
+  if (!str)
+    return "";
+  return strip(str.toLowerCase(), " ").replace(/\s\s+/g, " ");
+}
+var sanitizeQuery_default = sanitizeQuery;
 lunrStemmer(lunr);
 var whitelist = [
   "ar",
@@ -1787,21 +1793,23 @@ async function newSearchIndex(db) {
             if (locale && locale !== "en")
               this.use(lunr[locale]);
             this.ref("content_id");
-            this.field("id");
-            this.field("name");
-            this.field("keywords");
+            this.field("id", { boost: 4 });
+            this.field("keywords", { boost: 3 });
+            this.field("searchTerms", { boost: 2 });
             this.field("attributes");
             this.pipeline.reset();
             this.searchPipeline.reset();
             results.forEach((result) => {
               const content = result.contentByLocale.find((d) => d.locale === locale);
               if (content) {
+                const searchTerms = sanitizeQuery_default(content.name);
                 const payload = {
                   id: result.id,
                   content_id: result.content_id,
                   name: content.name,
                   keywords: content.keywords,
-                  attributes: content.attributes
+                  attributes: content.attributes,
+                  searchTerms
                 };
                 this.add(payload, { boost: result.zvalue });
               }
@@ -1825,6 +1833,7 @@ function dbSearchMemberFactory(db) {
   async function searchMember2(params) {
     const searchIndexByLocale = await search_default2(db);
     let resultsIds = [];
+    let resultsScores = [];
     const {
       query,
       locale,
@@ -1841,11 +1850,10 @@ function dbSearchMemberFactory(db) {
       direction = "ASC"
     } = params;
     if (query && query !== "" && searchIndexByLocale[locale]) {
-      const terms = query.split(" ").filter((d) => d.trim() !== "").map((d) => {
-        return `+${d}~2*`;
-      }).join(" ");
+      const terms = sanitizeQuery_default(query).replace(/([A-z]{2,})/g, (txt) => `+${txt}`).replace(/(.)$/g, (txt) => `${txt}*`);
       const lunrResults = searchIndexByLocale[locale].index.search(terms);
       resultsIds = lunrResults.map((d) => parseInt(d.ref, 10));
+      resultsScores = lunrResults.reduce((obj, d) => (obj[d.ref] = d.score, obj), {});
     }
     const whereClause = {
       ...visible ? { visible } : {},
@@ -1910,6 +1918,29 @@ function dbSearchMemberFactory(db) {
       });
     }
     const resultFormatter = format === "nested" ? nestedFormatter : plainFormatter;
+    const formattedResults = results.map(resultFormatter);
+    if (format !== "nested") {
+      formattedResults.forEach((d) => {
+        const { name, keywords, score = 0, zvalue } = d;
+        if (name) {
+          const cleanName = sanitizeQuery_default(name);
+          let scoreMod = score;
+          const diffMod = query.length / cleanName.length;
+          const matchingStartChars = cleanName.split("").reduce((str, c, i) => {
+            if (str === query.slice(0, i), query.charAt(i) === c)
+              str += c;
+            return str;
+          }, "").length;
+          if (cleanName === query || keywords && keywords.includes(query))
+            scoreMod = 1e6;
+          else if (cleanName.startsWith(query))
+            scoreMod *= 20 * diffMod;
+          else if (matchingStartChars)
+            scoreMod *= matchingStartChars * diffMod;
+          d.zvalue = scoreMod * 2 + zvalue;
+        }
+      });
+    }
     return {
       meta: {
         origin: "lunr",
@@ -1917,7 +1948,7 @@ function dbSearchMemberFactory(db) {
           Object.entries(params).map((entry) => [entry[0], stripHTML(entry[1])])
         )
       },
-      results: results.map(resultFormatter)
+      results: formattedResults
     };
     function nestedFormatter(item) {
       return item.toJSON();
@@ -1929,7 +1960,8 @@ function dbSearchMemberFactory(db) {
         locale: localizedItem.locale,
         name: localizedItem.name,
         attributes: localizedItem.attributes,
-        keywords: localizedItem.keywords
+        keywords: localizedItem.keywords,
+        score: resultsScores[item.content_id]
       };
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/bespoke",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "Content management system for creating automated data reports",
   "exports": {
     ".": {
@@ -73,7 +73,7 @@
     "d3plus-export": "^1.3.0",
     "d3plus-format": "^1.2.4",
     "d3plus-react": "^1.3.3",
-    "d3plus-text": "^1.2.3",
+    "d3plus-text": "^1.2.4",
     "d3plus-viz": "^1.3.3",
     "dom-parser": "^0.1.6",
     "fast-glob": "^3.2.12",