From 9b43f0feeb20217a78af5352faa609e5226e893e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robson=20Ten=C3=B3rio?=
 <robsontenorio@MacBook-Pro-de-Robson.local>
Date: Wed, 21 Nov 2018 00:22:52 -0200
Subject: [PATCH 1/2] @vuepress-seach / Searchable paths

---
 .../@vuepress/plugin-search/SearchBox.vue     | 25 ++++++++++++++++++-
 packages/@vuepress/plugin-search/index.js     |  3 ++-
 packages/@vuepress/theme-blog/index.js        |  3 ++-
 .../docs/plugin/official/plugin-search.md     | 24 +++++++++++++++++-
 4 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/packages/@vuepress/plugin-search/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
index 75d267c349..b655c6404b 100644
--- a/packages/@vuepress/plugin-search/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-/* global SEARCH_MAX_SUGGESTIONS */
+/* global SEARCH_MAX_SUGGESTIONS, SEARCH_PATHS */
 export default {
   data () {
     return {
@@ -76,6 +76,12 @@ export default {
         if (this.getPageLocalePath(p) !== localePath) {
           continue
         }
+
+        // filter out results that do not match searchable paths
+        if (!this.isSearchable(p)) {
+          continue
+        }
+
         if (matches(p)) {
           res.push(p)
         } else if (p.headers) {
@@ -112,6 +118,23 @@ export default {
       return '/'
     },
 
+    isSearchable (page) {
+      const searchPaths = SEARCH_PATHS
+
+      // all paths searchables
+      if (searchPaths.length === 0) { return true }
+
+      let searchable = false
+
+      searchPaths.forEach((path) => {
+        if (page.path.indexOf(path) !== -1) {
+          searchable = true
+          return
+        }
+      })
+      return searchable
+    },
+
     onUp () {
       if (this.showSuggestions) {
         if (this.focusIndex > 0) {
diff --git a/packages/@vuepress/plugin-search/index.js b/packages/@vuepress/plugin-search/index.js
index c0ffe03d7c..79d9bf3744 100644
--- a/packages/@vuepress/plugin-search/index.js
+++ b/packages/@vuepress/plugin-search/index.js
@@ -6,6 +6,7 @@ module.exports = (options) => ({
       path.resolve(__dirname, 'SearchBox.vue')
   },
   define: {
-    SEARCH_MAX_SUGGESTIONS: options.searchMaxSuggestions || 5
+    SEARCH_MAX_SUGGESTIONS: options.searchMaxSuggestions || 5,
+    SEARCH_PATHS: options.searchPaths || []
   }
 })
diff --git a/packages/@vuepress/theme-blog/index.js b/packages/@vuepress/theme-blog/index.js
index 19e95fffaf..ce4f8a181d 100644
--- a/packages/@vuepress/theme-blog/index.js
+++ b/packages/@vuepress/theme-blog/index.js
@@ -4,7 +4,8 @@ module.exports = {
     '@vuepress/pagination',
     '@vuepress/medium-zoom',
     ['@vuepress/search', {
-      searchMaxSuggestions: 10
+      searchMaxSuggestions: 10,
+      searchPaths: []
     }]
   ]
 }
diff --git a/packages/docs/docs/plugin/official/plugin-search.md b/packages/docs/docs/plugin/official/plugin-search.md
index e98a1eae97..ab99c85645 100644
--- a/packages/docs/docs/plugin/official/plugin-search.md
+++ b/packages/docs/docs/plugin/official/plugin-search.md
@@ -27,7 +27,8 @@ Note that this plugin has been included in **default theme**, the search box you
 module.exports = {
   plugins: [
     ['@vuepress/search', {
-      searchMaxSuggestions: 10
+      searchMaxSuggestions: 10,
+      searchPaths: []
     }]
   ]
 }
@@ -65,6 +66,27 @@ export default {
 
 Set the maximum number of results for search.
 
+### searchPaths
+
+- Type: `array`
+- Default: []
+
+Set the array of searchable paths. Default value (a empty array) will search on all paths. Considering you have this structure:
+
+```bash
+docs/
+├── .vuepress/            
+│    └── ...
+│
+├── 1.0/               
+│    └── ...
+│
+└── 2.0/               
+     └── ...                       
+```
+
+You can restrict the searching setting with `searchPaths` as `['/1.0/']`. Otherwise,  the default search will return duplications, once you can have similar content between folders `/1.0/` and `/2.0/`.
+
 ## Tips
 
 ### Tweak the default colors.

From 47b602e99fbfeb677bbb4bb18c9a5945529c06d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robson=20Ten=C3=B3rio?= <robsontenorio@me.com>
Date: Tue, 4 Dec 2018 15:23:17 -0200
Subject: [PATCH 2/2] Work with RegExp

---
 .../@vuepress/plugin-search/SearchBox.vue     | 16 +++++---------
 packages/@vuepress/plugin-search/index.js     |  2 +-
 packages/@vuepress/theme-blog/index.js        |  2 +-
 .../docs/plugin/official/plugin-search.md     | 22 +++++++++++++------
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/packages/@vuepress/plugin-search/SearchBox.vue b/packages/@vuepress/plugin-search/SearchBox.vue
index 0448a4d5e6..b128d2d025 100644
--- a/packages/@vuepress/plugin-search/SearchBox.vue
+++ b/packages/@vuepress/plugin-search/SearchBox.vue
@@ -119,20 +119,16 @@ export default {
     },
 
     isSearchable (page) {
-      const searchPaths = SEARCH_PATHS
+      let searchPaths = SEARCH_PATHS
 
       // all paths searchables
-      if (searchPaths.length === 0) { return true }
+      if (searchPaths === null) { return true }
 
-      let searchable = false
+      searchPaths = Array.isArray(searchPaths) ? searchPaths : new Array(searchPaths)
 
-      searchPaths.forEach((path) => {
-        if (page.path.indexOf(path) !== -1) {
-          searchable = true
-          return
-        }
-      })
-      return searchable
+      return searchPaths.filter(path => {
+        return page.path.match(path)
+      }).length > 0
     },
 
     onUp () {
diff --git a/packages/@vuepress/plugin-search/index.js b/packages/@vuepress/plugin-search/index.js
index 79d9bf3744..1cfb3565e7 100644
--- a/packages/@vuepress/plugin-search/index.js
+++ b/packages/@vuepress/plugin-search/index.js
@@ -7,6 +7,6 @@ module.exports = (options) => ({
   },
   define: {
     SEARCH_MAX_SUGGESTIONS: options.searchMaxSuggestions || 5,
-    SEARCH_PATHS: options.searchPaths || []
+    SEARCH_PATHS: options.test || null
   }
 })
diff --git a/packages/@vuepress/theme-blog/index.js b/packages/@vuepress/theme-blog/index.js
index ce4f8a181d..48d7a1647f 100644
--- a/packages/@vuepress/theme-blog/index.js
+++ b/packages/@vuepress/theme-blog/index.js
@@ -5,7 +5,7 @@ module.exports = {
     '@vuepress/medium-zoom',
     ['@vuepress/search', {
       searchMaxSuggestions: 10,
-      searchPaths: []
+      test: null
     }]
   ]
 }
diff --git a/packages/docs/docs/plugin/official/plugin-search.md b/packages/docs/docs/plugin/official/plugin-search.md
index ab99c85645..488cc29f68 100644
--- a/packages/docs/docs/plugin/official/plugin-search.md
+++ b/packages/docs/docs/plugin/official/plugin-search.md
@@ -27,8 +27,7 @@ Note that this plugin has been included in **default theme**, the search box you
 module.exports = {
   plugins: [
     ['@vuepress/search', {
-      searchMaxSuggestions: 10,
-      searchPaths: []
+      searchMaxSuggestions: 10      
     }]
   ]
 }
@@ -66,18 +65,21 @@ export default {
 
 Set the maximum number of results for search.
 
-### searchPaths
+### test
 
-- Type: `array`
-- Default: []
+- Type: `RegExp` | `Array<RegExp>`
+- Default: `null`
 
-Set the array of searchable paths. Default value (a empty array) will search on all paths. Considering you have this structure:
+Set up searchable paths with regular expressions. If no test expression is provided it will search on all paths. Considering you have this structure:
 
 ```bash
 docs/
 ├── .vuepress/            
 │    └── ...
 │
+├── master/               
+│    └── ...
+│
 ├── 1.0/               
 │    └── ...
 │
@@ -85,7 +87,13 @@ docs/
      └── ...                       
 ```
 
-You can restrict the searching setting with `searchPaths` as `['/1.0/']`. Otherwise,  the default search will return duplications, once you can have similar content between folders `/1.0/` and `/2.0/`.
+You can set up searchable paths with `test` as:
+
+- RegExp: `'/1\.0/'`
+- Array of RegExp: `['/1\.0/', '/2\.0/']`
+
+
+Otherwise,  the default search will return duplicates, once you can have similar content between folders `/master/`, `/1.0/` and `/2.0/`.
 
 ## Tips