wuffle 0.53.1 → 0.54.0

package/README.md

@@ -13,9 +13,9 @@ Refer to the [project documentation](https://github.com/nikku/wuffle#readme) for
 
 ## Usage
 
-Run your own [Wuffle Board](https://github.com/nikku/wuffle) via `npx`:
+Run your own [Wuffle](https://github.com/nikku/wuffle) instance via `npx`:
 
-```
+```sh
 npx wuffle
 ```
 

package/lib/apps/automatic-dev-flow.js

@@ -49,12 +49,22 @@ module.exports = function(webhookEvents, githubIssues, columns) {
     ]);
   });
 
-  webhookEvents.on('pull_request.ready_for_review', async (context) => {
+  webhookEvents.on([
+    'pull_request.ready_for_review',
+    'pull_request.review_requested'
+  ], async (context) => {
 
     const {
-      pull_request
+      pull_request,
+      action
     } = context.payload;
 
+    // do not forcefully move draft PRs into review,
+    // these shall be marked as _ready for review_ first
+    if (action === 'review_requested' && pull_request.draft) {
+      return;
+    }
+
     const state = isExternal(pull_request) ? EXTERNAL_CONTRIBUTION : IN_REVIEW;
 
     const column = columns.getByState(state);

package/lib/apps/board-api-routes/board-api-routes.js

@@ -62,11 +62,7 @@ module.exports = async (
   }
 
   function getIssueSearchFilter(req) {
-    const s = req.query.s;
-
-    if (!s) {
-      return null;
-    }
+    const s = req.query.s || null;
 
     const user = authRoutes.getGitHubUser(req);
 
@@ -99,7 +95,7 @@ module.exports = async (
           };
         });
 
-        const searchFiltered = searchFilter ? accessFiltered.filter(searchFilter) : accessFiltered;
+        const searchFiltered = accessFiltered.filter(searchFilter);
 
         filteredItems[columnKey] = searchFiltered.map(filterIssueOrPull);
 
@@ -134,7 +130,7 @@ module.exports = async (
         };
       });
 
-      const searchFiltered = searchFilter ? accessFiltered.map(update => {
+      const searchFiltered = accessFiltered.map(update => {
 
         if (searchFilter(update.issue)) {
           return update;
@@ -146,7 +142,7 @@ module.exports = async (
           ...update,
           type: 'remove'
         };
-      }) : accessFiltered;
+      });
 
       return searchFiltered.map(update => {
 

package/lib/apps/search/Search.js

@@ -16,16 +16,20 @@ const CHILD_LINK_TYPES = {
   [ LinkTypes.CLOSES ]: true
 };
 
+/**
+ * @typedef { { defaultFilter?: string } } SearchConfig
+ */
 
 /**
  * This app allows you to create a search filter from a given term.
  *
  * @constructor
  *
+ * @param {SearchConfig} config
  * @param {import('../../types').Logger} logger
  * @param {import('../../store')} store
  */
-function Search(logger, store) {
+function Search(config, logger, store) {
 
   const log = logger.child({
     name: 'wuffle:search'
@@ -47,19 +51,25 @@ function Search(logger, store) {
     return filterReject;
   }
 
-  function includes(actual, pattern) {
-    return pattern && actual.toLowerCase().includes(pattern.toLowerCase());
-  }
+  /**
+   * @param { string } actual
+   * @param { string } pattern
+   * @param { boolean } [exact=false]
+   *
+   * @return { boolean }
+   */
+  function includes(actual, pattern, exact) {
 
-  function fuzzyMatches(actual, pattern) {
-    return pattern && actual.toLowerCase().startsWith(pattern.toLowerCase());
+    if (exact) {
+      return pattern && actual === pattern;
+    }
+
+    return pattern && actual.toLowerCase().includes(pattern.toLowerCase());
   }
 
   const filters = {
 
-    text: function textFilter(text) {
-
-      text = text.toLowerCase();
+    text: function textFilter(text, exact) {
 
       return function filterText(issue) {
         const issueText = `#${issue.number} ${issue.title}\n\n${issue.body}`;
@@ -129,26 +139,26 @@ function Search(logger, store) {
       }
     },
 
-    label: function labelFilter(name) {
+    label: function labelFilter(name, exact) {
       return function filterLabel(issue) {
 
         const { labels } = issue;
 
-        return (labels || []).some(label => includes(label.name, name));
+        return (labels || []).some(label => includes(label.name, name, exact));
       };
     },
 
-    repo: function repoFilter(name) {
+    repo: function repoFilter(name, exact) {
 
       return function filterRepoAndOwner(issue) {
 
         const { repository } = issue;
 
-        return includes(`${repository.owner.login}/${repository.name}`, name);
+        return includes(`${repository.owner.login}/${repository.name}`, name, exact);
       };
     },
 
-    milestone: function milestoneFilter(name) {
+    milestone: function milestoneFilter(name, exact) {
 
       return function filterMilestone(issue) {
 
@@ -156,11 +166,11 @@ function Search(logger, store) {
           milestone
         } = issue;
 
-        return milestone && fuzzyMatches(milestone.title, name);
+        return milestone && includes(milestone.title, name, exact);
       };
     },
 
-    author: function authorFilter(name) {
+    author: function authorFilter(name, exact) {
 
       return function filterAuthor(issue) {
 
@@ -168,11 +178,11 @@ function Search(logger, store) {
           user
         } = issue;
 
-        return user && fuzzyMatches(user.login, name);
+        return user && includes(user.login, name, exact);
       };
     },
 
-    assignee: function assigneeFilter(name) {
+    assignee: function assigneeFilter(name, exact) {
 
       return function filterAssignee(issue) {
 
@@ -180,11 +190,11 @@ function Search(logger, store) {
           assignees
         } = issue;
 
-        return (assignees || []).some(assignee => fuzzyMatches(assignee.login, name));
+        return (assignees || []).some(assignee => includes(assignee.login, name, exact));
       };
     },
 
-    reviewer: function reviewerFilter(name) {
+    reviewer: function reviewerFilter(name, exact) {
 
       return function filterReviewer(issue) {
 
@@ -199,14 +209,14 @@ function Search(logger, store) {
         }
 
         return (
-          requested_reviewers.some(reviewer => fuzzyMatches(reviewer.login, name))
+          requested_reviewers.some(reviewer => includes(reviewer.login, name, exact))
         ) || (
-          (reviews || []).some(review => fuzzyMatches(review.user.login, name))
+          (reviews || []).some(review => includes(review.user.login, name, exact))
         );
       };
     },
 
-    commented: function commentedFilter(name) {
+    commented: function commentedFilter(name, exact) {
 
       return function filterCommented(issue) {
 
@@ -220,17 +230,17 @@ function Search(logger, store) {
         }
 
         return (
-          comments.some(comment => fuzzyMatches(comment.user.login, name))
+          comments.some(comment => includes(comment.user.login, name))
         );
       };
     },
 
-    involves: function involvesFilter(name) {
+    involves: function involvesFilter(name, exact) {
 
-      const isAssigned = filters.assignee(name);
-      const isAuthor = filters.author(name);
-      const isReviewer = filters.reviewer(name);
-      const hasCommented = filters.commented(name);
+      const isAssigned = filters.assignee(name, exact);
+      const isAuthor = filters.author(name, exact);
+      const isReviewer = filters.reviewer(name, exact);
+      const hasCommented = filters.commented(name, exact);
 
       return function filterInvolves(issue) {
         return (
@@ -289,23 +299,16 @@ function Search(logger, store) {
     };
   }
 
-  /**
-   * Retrieve a filter function from the given search string.
-   *
-   * @param {string} search
-   * @param {import('../../types').GitHubUser} [user]
-   *
-   * @return {Function}
-   */
-  function getSearchFilter(search, user) {
+  function buildFilterFns(search, user) {
 
-    const terms = parseSearch(search);
+    const terms = search ? parseSearch(search) : [];
 
-    const filterFns = terms.map(term => {
+    return terms.map(term => {
       let {
         qualifier,
         value,
-        negated
+        negated,
+        exact
       } = term;
 
       if (!value) {
@@ -318,6 +321,7 @@ function Search(logger, store) {
         }
 
         value = user.login;
+        exact = true;
       }
 
       const factoryFn = filters[qualifier];
@@ -326,7 +330,7 @@ function Search(logger, store) {
         return noopFilter();
       }
 
-      const fn = factoryFn(value);
+      const fn = factoryFn(value, exact);
 
       if (negated) {
         return function(arg) {
@@ -336,10 +340,30 @@ function Search(logger, store) {
 
       return fn;
     });
+  }
+
+  /**
+   * Retrieve a filter function from the given search string.
+   *
+   * @param {string} search
+   * @param {import('../../types').GitHubUser} [user]
+   *
+   * @return {Function}
+   */
+  function getSearchFilter(search, user) {
+
+    const filterFns = buildFilterFns(search, user);
+
+    const ignoreFilterFns = buildFilterFns(config.defaultFilter, user);
 
     return function(issue) {
       try {
-        return filterFns.every(fn => fn(issue));
+        if (filterFns.length) {
+          return filterFns.every(fn => fn(issue));
+        } else {
+
+          return ignoreFilterFns.every(fn => fn(issue));
+        }
       } catch (err) {
         log.warn({ issue: issueIdent(issue), err }, 'filter failed');
 

package/lib/util/search.js

@@ -57,6 +57,16 @@ function startOfDay(time) {
   return date.getTime();
 }
 
+/**
+ * @param {string} str
+ *
+ * @return { {
+ *   qualifier: string,
+ *   value: string|undefined,
+ *   exact: boolean,
+ *   negated?: boolean
+ * }[] }
+ */
 function parseSearch(str) {
 
   const regexp = /(?:([\w#/&]+)|"([\w#/&\s-.]+)"|([-!]?)([\w]+):(?:([\w-#/&@<>=.]+)|"([\w-#/&@:.,; ]+)")?)(?:\s|$)/g;
@@ -83,7 +93,8 @@ function parseSearch(str) {
     if (textValue) {
       terms.push({
         qualifier: 'text',
-        value: textValue
+        value: textValue,
+        exact: !!textEscaped
       });
     }
 
@@ -93,7 +104,8 @@ function parseSearch(str) {
       terms.push({
         qualifier,
         value: qualifierValue,
-        negated: !!negated
+        negated: !!negated,
+        exact: !!qualifierTextEscaped
       });
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wuffle",
-  "version": "0.53.1",
+  "version": "0.54.0",
   "description": "A multi-repository task board for GitHub issues",
   "author": {
     "name": "Nico Rehwaldt",
@@ -51,7 +51,7 @@
     "smee-client": "^1.2.3"
   },
   "devDependencies": {
-    "@graphql-eslint/eslint-plugin": "^3.11.2",
+    "@graphql-eslint/eslint-plugin": "^3.20.1",
     "@octokit/graphql-schema": "^12.10.0",
     "@types/compression": "^1.7.2",
     "@types/express-session": "^1.17.4",
@@ -64,7 +64,7 @@
     "npm-run-all": "^4.1.5",
     "sinon": "^12.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "^4.7.3"
+    "typescript": "^5.1.6"
   },
   "engines": {
     "node": "14.x || 16.x"
@@ -92,5 +92,5 @@
     "index.js",
     "wuffle.config.example.js"
   ],
-  "gitHead": "b0217a878f30b5cb1fe3dc1d25f3439e3490b450"
+  "gitHead": "466ef6ec95b811c8f62a55fb7c9e5b6928d866a8"
 }