astro-accelerator 0.0.102 → 0.0.104

package/package.json

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

package/public/css/main.css

@@ -14,11 +14,11 @@ html {
     outline: 0;
     padding: 0;
     vertical-align: baseline;
- }
+}
 
- html {
+html {
     scroll-padding-top: 5em;
- }
+}
 
 body {
     background-color: var(--aft);
@@ -642,6 +642,28 @@ form.site-search button {
     font-family: var(--code-font);
 }
 
+.result-headings li {
+    display: none;
+}
+
+.result-headings li:nth-child(-n+3) {
+    display: block;
+}
+
+.result-headings:has(li:nth-child(n+4))::after {
+    content: 'See more >';
+    color: var(--fore-link);
+    text-decoration: underline;
+  }
+
+.result-headings:focus-within li {
+    display: block;
+}
+
+.result-headings:focus-within::after {
+    display: none;
+}
+
 .show-more {
     padding: 0.5em 1em;
     background-color: var(--fore-link);

package/public/js/modules/string.js

@@ -43,7 +43,7 @@ function highlight(string, terms) {
  * Simplifies a string to plain lower case, removing diacritic characters and hyphens
  * This means a search for "co-op" will be found in "COOP" and "Café" will be found in "cafe"
  * @param {string} string 
- * @returns 
+ * @returns {string}
  */
  function sanitise(string) {
     // @ts-ignore

package/public/js/search.js

@@ -31,6 +31,194 @@ import { contains, containsWord, sanitise, explode, highlight } from './modules/
 }  SearchEntry
  */
 
+/**
+ * Removes "morphological and inflexional endings" from words
+ * See: http://www.tartarus.org/~martin/PorterStemmer
+ */
+const stemmer = (function () {
+    const step2list = {
+        "ational": "ate",
+        "tional": "tion",
+        "enci": "ence",
+        "anci": "ance",
+        "izer": "ize",
+        "bli": "ble",
+        "alli": "al",
+        "entli": "ent",
+        "eli": "e",
+        "ousli": "ous",
+        "ization": "ize",
+        "ation": "ate",
+        "ator": "ate",
+        "alism": "al",
+        "iveness": "ive",
+        "fulness": "ful",
+        "ousness": "ous",
+        "aliti": "al",
+        "iviti": "ive",
+        "biliti": "ble",
+        "logi": "log"
+    };
+
+    const step3list = {
+        "icate": "ic",
+        "ative": "",
+        "alize": "al",
+        "iciti": "ic",
+        "ical": "ic",
+        "ful": "",
+        "ness": ""
+    };
+
+    const c = "[^aeiou]", // consonant
+    v = "[aeiouy]",       // vowel
+    C = c + "[^aeiouy]*", // consonant sequence
+    V = v + "[aeiou]*",   // vowel sequence
+
+    mgr0 = "^(" + C + ")?" + V + C,                   // [C]VC... is m>0
+    meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$", // [C]VC[V] is m=1
+    mgr1 = "^(" + C + ")?" + V + C + V + C,           // [C]VCVC... is m>1
+    s_v = "^(" + C + ")?" + v;                        // vowel in stem
+
+    /**
+     * @param {string} w
+     * @returns {string}
+     */
+    return function (w) {
+        var stem,
+            suffix,
+            firstch,
+            re,
+            re2,
+            re3,
+            re4,
+            origword = w;
+
+        if (w.length < 3) { return w; }
+
+        firstch = w.substring(0, 1);
+
+        if (firstch == "y") {
+            w = firstch.toUpperCase() + w.substring(1, w.length);
+        }
+
+        // Step 1a
+        re = /^(.+?)(ss|i)es$/;
+        re2 = /^(.+?)([^s])s$/;
+
+        if (re.test(w)) { 
+            w = w.replace(re, "$1$2"); 
+        } else if (re2.test(w)) {
+            w = w.replace(re2, "$1$2"); 
+        }
+
+        // Step 1b
+        re = /^(.+?)eed$/;
+        re2 = /^(.+?)(ed|ing)$/;
+        if (re.test(w)) {
+            var fp = re.exec(w);
+            re = new RegExp(mgr0);
+            if (re.test(fp[1])) {
+                re = /.$/;
+                w = w.replace(re, "");
+            }
+        } else if (re2.test(w)) {
+            var fp = re2.exec(w);
+            stem = fp[1];
+            re2 = new RegExp(s_v);
+            if (re2.test(stem)) {
+                w = stem;
+                re2 = /(at|bl|iz)$/;
+                re3 = new RegExp("([^aeiouylsz])\\1$");
+                re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+                if (re2.test(w)) { w = w + "e"; }
+                else if (re3.test(w)) { re = /.$/; w = w.replace(re, ""); }
+                else if (re4.test(w)) { w = w + "e"; }
+            }
+        }
+
+        // Step 1c
+        re = /^(.+?)y$/;
+        if (re.test(w)) {
+            var fp = re.exec(w);
+            stem = fp[1];
+            re = new RegExp(s_v);
+            if (re.test(stem)) { w = stem + "i"; }
+        }
+
+        // Step 2
+        re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
+        if (re.test(w)) {
+            var fp = re.exec(w);
+            stem = fp[1];
+            suffix = fp[2];
+            re = new RegExp(mgr0);
+            if (re.test(stem)) {
+                w = stem + step2list[suffix];
+            }
+        }
+
+        // Step 3
+        re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
+        if (re.test(w)) {
+            var fp = re.exec(w);
+            stem = fp[1];
+            suffix = fp[2];
+            re = new RegExp(mgr0);
+            if (re.test(stem)) {
+                w = stem + step3list[suffix];
+            }
+        }
+
+        // Step 4
+        re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
+        re2 = /^(.+?)(s|t)(ion)$/;
+        if (re.test(w)) {
+            var fp = re.exec(w);
+            stem = fp[1];
+            re = new RegExp(mgr1);
+            if (re.test(stem)) {
+                w = stem;
+            }
+        } else if (re2.test(w)) {
+            var fp = re2.exec(w);
+            stem = fp[1] + fp[2];
+            re2 = new RegExp(mgr1);
+            if (re2.test(stem)) {
+                w = stem;
+            }
+        }
+
+        // Step 5
+        re = /^(.+?)e$/;
+        if (re.test(w)) {
+            var fp = re.exec(w);
+            stem = fp[1];
+            re = new RegExp(mgr1);
+            re2 = new RegExp(meq1);
+            re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
+            if (re.test(stem) || (re2.test(stem) && !(re3.test(stem)))) {
+                w = stem;
+            }
+        }
+
+        re = /ll$/;
+        re2 = new RegExp(mgr1);
+        if (re.test(w) && re2.test(w)) {
+            re = /.$/;
+            w = w.replace(re, "");
+        }
+
+        // and turn initial Y back to y
+
+        if (firstch == "y") {
+            w = firstch.toLowerCase() + w.substr(1);
+        }
+
+        return w;
+    }
+})();
+
 /** @type {SearchEntry[]} */
 var haystack = [];
 var currentQuery = '';
@@ -62,8 +250,21 @@ function search(s, r) {
     raiseEvent('searched', { search: s });
 
     currentQuery = cleanQuery;
+    /** @type {string[]} */
+    const stemmedTerms = [];
     const queryTerms = explode(currentQuery);
 
+    for (const term of queryTerms) {
+        const stemmed = stemmer(term);
+        if (stemmed !== term) {
+            stemmedTerms.push(stemmed);
+        }
+    }
+
+    const allTerms = queryTerms.concat(stemmedTerms);
+
+    console.log(allTerms);
+
     cleanQuery.length > 0 && haystack.forEach( (item) => {
 
         let foundWords = 0;
@@ -94,8 +295,9 @@ function search(s, r) {
 
         // Part 2 - Term Matches, i.e. "Kitchen" or "Sink"
         
-        queryTerms.forEach(term => {
+        allTerms.forEach(term => {
             let isTermFound = false;
+            const isUserTerm = queryTerms.includes(term);
 
             // Title
             if (contains(item.safeTitle, term)) {
@@ -140,7 +342,7 @@ function search(s, r) {
             }
         });
 
-        item.foundWords = foundWords / queryTerms.length;
+        item.foundWords = foundWords / allTerms.length;
 
         if (item.score > 0) {
             needles.push(item);
@@ -177,6 +379,7 @@ function search(s, r) {
         const url =  isSameHost ? address.pathname : needle.url;
 
         const a = document.createElement('a');
+        // Only highlight user query terms, not stemmed terms
         a.innerHTML = highlight(needle.title, queryTerms);
         a.href = url;
 
@@ -186,27 +389,34 @@ function search(s, r) {
 
         const markers = document.createElement('div');
         markers.className = 'result-text';
+        // Only highlight user query terms, not stemmed terms
         markers.innerHTML = highlight(needle.description, queryTerms);
 
-        const headings = document.createElement('ul');
-        markers.className = 'result-headings';
-
-        needle.matchedHeadings
-            .forEach(h => {
-                const item = document.createElement('li');
-                const link = document.createElement('a');
-                link.href = url + '#' + h.slug;
-                link.innerHTML = highlight(h.text, queryTerms);
-                item.appendChild(link);
-                headings.append(item);
-            });
-
         const li = document.createElement('li');
+        li.dataset.score = (Math.round((needle.score/ total) * 100)).toString();
         li.appendChild(a);
         li.appendChild(path);
         li.appendChild(markers);
-        li.append(headings);
-        li.dataset.score = (Math.round((needle.score/ total) * 100)).toString();
+
+        if (needle.matchedHeadings.length > 0) {
+            const headings = document.createElement('ul');
+            headings.className = 'result-headings';
+
+            headings.tabIndex = 0;
+
+            needle.matchedHeadings
+                .forEach(h => {
+                    const item = document.createElement('li');
+                    const link = document.createElement('a');
+                    link.href = url + '#' + h.slug;
+                    // Only highlight user query terms, not stemmed terms
+                    link.innerHTML = highlight(h.text, queryTerms);
+                    item.appendChild(link);
+                    headings.append(item);
+                });
+
+            li.appendChild(headings);
+        }
 
         ol.appendChild(li);
     }

package/src/themes/accelerator/utilities/img.mjs

@@ -128,12 +128,12 @@ for (const file of filesToProcess) {
             // Only resize if the image is larger than the target size
             sharp(source)
                 .resize(size[key], null)
-                .webp({ quality: 80 })
+                .webp({ quality: 90 })
                 .toFile(resizeDestination + '.webp');
         } else {
             // Don't resize as it's smaller than target size
             sharp(source)
-                .webp({ quality: 80 })
+                .webp({ quality: 90 })
                 .toFile(resizeDestination + '.webp');
         }
     }