astro-accelerator 4.1.7 → 4.1.9

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "4.1.7",
+    "version": "4.1.9",
     "author": "Steve Fenton",
     "name": "astro-accelerator",
     "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",

package/public/js/search.js

@@ -26,6 +26,17 @@ function enabled(settings, option) {
     return settings && settings.includes(option);
 }
 
+/**
+ *
+ * @param {any} value
+ * @param {number} index
+ * @param {any[]} array
+ * @returns
+ */
+function unique(value, index, array) {
+    return array.indexOf(value) === index;
+}
+
 /**
 @typedef {
     {
@@ -38,6 +49,7 @@ function enabled(settings, option) {
 @typedef {
     {
         foundWords: number;
+        foundTerms: string[];
         score: number;
         depth: number;
         title: string;
@@ -272,7 +284,6 @@ function initializeSearch() {
             }
         }
 
-        console.log('Post-synonym', queryTerms);
         return queryTerms.filter((qt) => qt != null);
     }
 
@@ -295,7 +306,7 @@ function initializeSearch() {
         }
 
         /** @type {SearchEntry[]} */
-        const needles = [];
+        let needles = [];
 
         // Clean the input
         const cleanQuery = sanitise(s);
@@ -321,6 +332,7 @@ function initializeSearch() {
         cleanQuery.length > 0 &&
             haystack.forEach((item) => {
                 item.foundWords = 0;
+                item.foundTerms = [];
                 item.score = 0;
                 item.matchedHeadings = [];
 
@@ -356,6 +368,8 @@ function initializeSearch() {
                 // Part 2 - Term Matches, i.e. "Kitchen" or "Sink"
 
                 let foundWords = 0;
+                /** @type{string[]} */
+                let foundTerms = [];
 
                 allTerms.forEach((term) => {
                     let isTermFound = false;
@@ -363,6 +377,7 @@ function initializeSearch() {
                     // Title
                     if (contains(item.safeTitle, term)) {
                         item.score = item.score + scoring.termTitle;
+                        item.foundWords += scores.titleContains / 2;
                         isTermFound = true;
                     }
 
@@ -370,6 +385,7 @@ function initializeSearch() {
                     item.headings.forEach((c) => {
                         if (contains(c.safeText, term)) {
                             item.score = item.score + scoring.termHeading;
+                            item.foundWords += scores.headingContains / 2;
                             isTermFound = true;
 
                             if (
@@ -404,10 +420,14 @@ function initializeSearch() {
 
                     if (isTermFound) {
                         foundWords++;
+                        foundTerms.push(term);
                     }
                 });
 
                 item.foundWords += foundWords;
+                item.foundTerms = item.foundTerms
+                    .concat(foundTerms)
+                    .filter(unique);
 
                 if (item.score > 0) {
                     needles.push(item);
@@ -428,12 +448,16 @@ function initializeSearch() {
             }
         });
 
-        needles.sort(function (a, b) {
-            if (b.foundWords === a.foundWords) {
-                return b.score - a.score;
+        needles = needles.sort(function (a, b) {
+            if (b.foundTerms.length === a.foundTerms.length) {
+                if (b.foundWords === a.foundWords) {
+                    return b.score - a.score;
+                }
+
+                return b.foundWords - a.foundWords;
             }
 
-            return b.foundWords - a.foundWords;
+            return b.foundTerms.length - a.foundTerms.length;
         });
 
         const total = needles.reduce(function (accumulator, needle) {