Merge pull request #4 from neilboyd/add-query-to-middleware

add query to middleware
neilboyd · Jul 24, 2024 · 9746038 · 9746038
2 parents f9bc704 + 380b101
commit 9746038
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -167,7 +167,7 @@ If the `search.json` contains this data
 
 A function that will be called whenever a match in the template is found.
 
-It gets passed the current property name, property value, and the template.
+It gets passed the current property name, property value, the template, and the search query.
 
 If the function returns a non-undefined value, it gets replaced in the template.
 
@@ -178,7 +178,7 @@ Example:
 ```js
 SimpleJekyllSearch({
   ...
-  templateMiddleware: function(prop, value, template) {
+  templateMiddleware: function(prop, value, template, query) {
     if (prop === 'bar') {
       return value.replace(/^\//, '')
     }

diff --git a/WIKI.md b/WIKI.md
@@ -57,7 +57,7 @@ If the `search.json` contains this data
 
 A function that will be called whenever a match in the template is found.
 
-It gets passed the current property name, property value, and the template.
+It gets passed the current property name, property value, the template, and the search query.
 
 If the function returns a non-undefined value, it gets replaced in the template.
 
@@ -68,7 +68,7 @@ Example:
 ```js
 SimpleJekyllSearch({
   ...
-  templateMiddleware: function(prop, value, template) {
+  templateMiddleware: function(prop, value, template, query) {
     if (prop === 'bar') {
       return value.replace(/^\//, '')
     }

diff --git a/dest/simple-jekyll-search.js b/dest/simple-jekyll-search.js
@@ -27,7 +27,7 @@ function setOptions (_options) {
 
 function compile (data) {
   return options.template.replace(options.pattern, function (match, prop) {
-    const value = options.middleware(prop, data[prop], options.template)
+    const value = options.middleware(prop, data[prop], options.template, data.query)
     if (typeof value !== 'undefined') {
       return value
     }
@@ -90,7 +90,7 @@ function LiteralSearchStrategy () {
     }
     if (crit.startsWith('"') && crit.endsWith('"')) {
       exact = true
-      crit = crit.substring(1, crit.length - 2)
+      crit = crit.substring(1, crit.length - 1)
     }
     crit = crit.toLowerCase()
     crit = exact ? [crit] : crit.split(' ')
@@ -192,7 +192,7 @@ function findMatches (data, crit, strategy, opt) {
 
 function findMatchesInObject (obj, crit, strategy, opt) {
   for (const key in obj) {
-    if (!isExcluded(obj[key], opt.exclude) && strategy.matches(obj[key], crit)) {
+    if (key !== 'query' && !isExcluded(obj[key], opt.exclude) && strategy.matches(obj[key], crit)) {
       return obj
     }
   }

diff --git a/dest/simple-jekyll-search.min.js b/dest/simple-jekyll-search.min.js
diff --git a/example/js/simple-jekyll-search.js b/example/js/simple-jekyll-search.js
@@ -27,7 +27,7 @@ function setOptions (_options) {
 
 function compile (data) {
   return options.template.replace(options.pattern, function (match, prop) {
-    const value = options.middleware(prop, data[prop], options.template)
+    const value = options.middleware(prop, data[prop], options.template, data.query)
     if (typeof value !== 'undefined') {
       return value
     }
@@ -90,7 +90,7 @@ function LiteralSearchStrategy () {
     }
     if (crit.startsWith('"') && crit.endsWith('"')) {
       exact = true
-      crit = crit.substring(1, crit.length - 2)
+      crit = crit.substring(1, crit.length - 1)
     }
     crit = crit.toLowerCase()
     crit = exact ? [crit] : crit.split(' ')
@@ -192,7 +192,7 @@ function findMatches (data, crit, strategy, opt) {
 
 function findMatchesInObject (obj, crit, strategy, opt) {
   for (const key in obj) {
-    if (!isExcluded(obj[key], opt.exclude) && strategy.matches(obj[key], crit)) {
+    if (key !== 'query' && !isExcluded(obj[key], opt.exclude) && strategy.matches(obj[key], crit)) {
       return obj
     }
   }