rrdir 10.0.1 → 10.0.3

package/README.md

@@ -3,7 +3,7 @@
 
 > Recursive directory reader with a delightful API
 
-`rrdir` recursively reads a directory and returns entries within via an async iterator or async/sync as Array. It has minimal dependencies and can typically iterate millions of files in a matter of seconds. Memory usage is `O(1)` for the async iterator and `O(n)` for the Array variants.
+`rrdir` recursively reads a directory and returns entries within via an async iterator or async/sync as Array. It has no dependencies and can typically iterate millions of files in a matter of seconds. Memory usage is `O(1)` for the async iterator and `O(n)` for the Array variants.
 
 ## Usage
 ```console

package/index.js

@@ -30,11 +30,10 @@ function build(dirent, path, stats, opts) {
 }
 
 function makeMatcher(filters) {
+  const res = filters.map(f => new RegExp(`${f.replace(/\*+/g, ".*").replace(/\/\.\*/, ".*")}$`));
   return str => {
-    for (const filter of filters) {
-      const re = new RegExp(`${filter.replace(/\*+/g, ".*").replace(/\/\.\*/, ".*")}$`);
-      const matches = re.test(str);
-      if (matches) return true;
+    for (const re of res) {
+      if (re.test(str)) return true;
     }
     return false;
   };
@@ -56,21 +55,17 @@ export async function* rrdir(dir, opts = {}, {includeMatcher, excludeMatcher, en
   }
 
   let dirents = [];
-
   try {
     dirents = await readdir(dir, {encoding, withFileTypes: true});
   } catch (err) {
-    if (opts.strict) {
-      throw err;
-    } else {
-      yield {path: dir, err};
-    }
+    if (opts.strict) throw err;
+    yield {path: dir, err};
   }
   if (!dirents.length) return;
 
   for (const dirent of dirents) {
     const path = makePath(dirent, dir, encoding);
-    if (excludeMatcher && excludeMatcher(encoding === "buffer" ? String(path) : path)) continue;
+    if (excludeMatcher?.(encoding === "buffer" ? String(path) : path)) continue;
 
     const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
     const isIncluded = !includeMatcher || includeMatcher(encoding === "buffer" ? String(path) : path);
@@ -111,21 +106,17 @@ export async function rrdirAsync(dir, opts = {}, {includeMatcher, excludeMatcher
 
   const results = [];
   let dirents = [];
-
   try {
     dirents = await readdir(dir, {encoding, withFileTypes: true});
   } catch (err) {
-    if (opts.strict) {
-      throw err;
-    } else {
-      results.push({path: dir, err});
-    }
+    if (opts.strict) throw err;
+    results.push({path: dir, err});
   }
   if (!dirents.length) return results;
 
   await Promise.all(dirents.map(async dirent => {
     const path = makePath(dirent, dir, encoding);
-    if (excludeMatcher && excludeMatcher(encoding === "buffer" ? String(path) : path)) return;
+    if (excludeMatcher?.(encoding === "buffer" ? String(path) : path)) return;
 
     const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
     const isIncluded = !includeMatcher || includeMatcher(encoding === "buffer" ? String(path) : path);
@@ -168,21 +159,17 @@ export function rrdirSync(dir, opts = {}, {includeMatcher, excludeMatcher, encod
 
   const results = [];
   let dirents = [];
-
   try {
     dirents = readdirSync(dir, {encoding, withFileTypes: true});
   } catch (err) {
-    if (opts.strict) {
-      throw err;
-    } else {
-      results.push({path: dir, err});
-    }
+    if (opts.strict) throw err;
+    results.push({path: dir, err});
   }
   if (!dirents.length) return results;
 
   for (const dirent of dirents) {
     const path = makePath(dirent, dir, encoding);
-    if (excludeMatcher && excludeMatcher(encoding === "buffer" ? String(path) : path)) continue;
+    if (excludeMatcher?.(encoding === "buffer" ? String(path) : path)) continue;
 
     const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
     const isIncluded = !includeMatcher || includeMatcher(encoding === "buffer" ? String(path) : path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrdir",
-  "version": "10.0.1",
+  "version": "10.0.3",
   "description": "Recursive directory reader with a delightful API",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/rrdir",
@@ -20,8 +20,8 @@
     "jest": "29.0.3",
     "semver": "7.3.7",
     "tempy": "3.0.0",
-    "updates": "13.1.5",
-    "versions": "9.3.0"
+    "updates": "13.1.7",
+    "versions": "9.3.2"
   },
   "keywords": [
     "recursive readdir",