Directly use picomatch

Optimize matching by caching the functions that micromatch would have generated internally.

Author: novemberborn

lib/globs.js

@@ -2,16 +2,18 @@
 const path = require('path');
 const globby = require('globby');
 const ignoreByDefault = require('ignore-by-default');
-const micromatch = require('micromatch');
+const picomatch = require('picomatch');
 const slash = require('slash');
 
 const defaultIgnorePatterns = [...ignoreByDefault.directories(), '**/node_modules'];
-const defaultMicromatchIgnorePatterns = [
+const defaultPicomatchIgnorePatterns = [
 	...defaultIgnorePatterns,
-	// Unlike globby(), micromatch needs a complete pattern when ignoring directories.
+	// Unlike globby(), picomatch needs a complete pattern when ignoring directories.
 	...defaultIgnorePatterns.map(pattern => `${pattern}/**/*`)
 ];
 
+const defaultMatchNoIgnore = picomatch(defaultPicomatchIgnorePatterns);
+
 const defaultIgnoredByWatcherPatterns = [
 	'**/*.snap.md', // No need to rerun tests when the Markdown files change.
 	'ava.config.js', // Config is not reloaded so avoid rerunning tests when it changes.
@@ -141,35 +143,37 @@ const matchingCache = new WeakMap();
 const processMatchingPatterns = input => {
 	let result = matchingCache.get(input);
 	if (!result) {
-		const ignore = [...defaultMicromatchIgnorePatterns];
+		const ignore = [...defaultPicomatchIgnorePatterns];
 		const patterns = input.filter(pattern => {
 			if (pattern.startsWith('!')) {
-				// Unlike globby(), micromatch needs a complete pattern when ignoring directories.
+				// Unlike globby(), picomatch needs a complete pattern when ignoring directories.
 				ignore.push(pattern.slice(1), `${pattern.slice(1)}/**/*`);
 				return false;
 			}
 
 			return true;
 		});
 
-		result = {patterns, ignore};
+		result = {
+			match: picomatch(patterns, {ignore}),
+			matchNoIgnore: picomatch(patterns)
+		};
 		matchingCache.set(input, result);
 	}
 
 	return result;
 };
 
 function matches(file, patterns) {
-	let ignore;
-	({patterns, ignore} = processMatchingPatterns(patterns));
-	return micromatch.some(file, patterns, {ignore});
+	const {match} = processMatchingPatterns(patterns);
+	return match(file);
 }
 
 exports.matches = matches;
 
 const matchesIgnorePatterns = (file, patterns) => {
-	({patterns} = processMatchingPatterns(patterns));
-	return micromatch.some(file, [...patterns, ...defaultMicromatchIgnorePatterns]);
+	const {matchNoIgnore} = processMatchingPatterns(patterns);
+	return matchNoIgnore(file) || defaultMatchNoIgnore(file);
 };
 
 function normalizeFileForMatching(cwd, file) {

package-lock.json

@@ -89,10 +89,10 @@
 		"lodash": "^4.17.15",
 		"matcher": "^2.1.0",
 		"md5-hex": "^3.0.1",
-		"micromatch": "^4.0.2",
 		"ms": "^2.1.2",
 		"ora": "^4.0.3",
 		"p-map": "^3.0.0",
+		"picomatch": "^2.1.1",
 		"pkg-conf": "^3.1.0",
 		"plur": "^3.1.1",
 		"pretty-ms": "^5.1.0",