rrdir 10.0.3 → 10.1.0

package/README.md

@@ -42,6 +42,7 @@ The directory to read, either absolute or relative. Pass a `Buffer` to switch th
 - `exclude` *Array*: Path globs to exclude, e.g. `["**/*.js"]`. Default: `undefined`.
 - `include` *Array*: Path globs to include, e.g. `["**/*.map"]`. Default: `undefined`.
 - `strict` *boolean*: Whether to throw immediately when reading an entry fails. Default: `false`.
+- `insensitive` *boolean: Whether `include` and `exclude` match case-insensitively. Default: `false`.
 
 #### `entry` *Object*
 

package/index.js

@@ -10,8 +10,11 @@ const defaults = {
   followSymlinks: false,
   exclude: undefined,
   include: undefined,
+  insensitive: false,
 };
 
+const escRe = str => str.replace(/[|\\{}()[\]^$+*?.-]/g, "\\$&");
+
 function makePath(entry, dir, encoding) {
   if (encoding === "buffer") {
     return dir === "." ? entry.name : Buffer.from([...dir, ...sepBuffer, ...entry.name]);
@@ -29,8 +32,10 @@ function build(dirent, path, stats, opts) {
   };
 }
 
-function makeMatcher(filters) {
-  const res = filters.map(f => new RegExp(`${f.replace(/\*+/g, ".*").replace(/\/\.\*/, ".*")}$`));
+function makeMatcher(filters, flags) {
+  const res = filters.map(f => {
+    return new RegExp(`${escRe(f).replace(/\\\*+/g, ".*").replace(/\/\.\*/, ".*")}$`, flags);
+  });
   return str => {
     for (const re of res) {
       if (re.test(str)) return true;
@@ -39,16 +44,17 @@ function makeMatcher(filters) {
   };
 }
 
-function makeMatchers({include, exclude}) {
+function makeMatchers({include, exclude, insensitive}) {
+  const flags = insensitive ? "i" : "";
   return {
-    includeMatcher: include ? makeMatcher(include) : null,
-    excludeMatcher: exclude ? makeMatcher(exclude) : null,
+    includeMatcher: include ? makeMatcher(include, flags) : null,
+    excludeMatcher: exclude ? makeMatcher(exclude, flags) : null,
   };
 }
 
 export async function* rrdir(dir, opts = {}, {includeMatcher, excludeMatcher, encoding} = {}) {
   if (includeMatcher === undefined) {
-    opts = Object.assign({}, defaults, opts);
+    opts = {...defaults, ...opts};
     ({includeMatcher, excludeMatcher} = makeMatchers(opts));
     if (/[/\\]$/.test(dir)) dir = dir.substring(0, dir.length - 1);
     encoding = Buffer.isBuffer(dir) ? "buffer" : undefined;
@@ -98,7 +104,7 @@ export async function* rrdir(dir, opts = {}, {includeMatcher, excludeMatcher, en
 
 export async function rrdirAsync(dir, opts = {}, {includeMatcher, excludeMatcher, encoding} = {}) {
   if (includeMatcher === undefined) {
-    opts = Object.assign({}, defaults, opts);
+    opts = {...defaults, ...opts};
     ({includeMatcher, excludeMatcher} = makeMatchers(opts));
     if (/[/\\]$/.test(dir)) dir = dir.substring(0, dir.length - 1);
     encoding = Buffer.isBuffer(dir) ? "buffer" : undefined;
@@ -151,7 +157,7 @@ export async function rrdirAsync(dir, opts = {}, {includeMatcher, excludeMatcher
 
 export function rrdirSync(dir, opts = {}, {includeMatcher, excludeMatcher, encoding} = {}) {
   if (includeMatcher === undefined) {
-    opts = Object.assign({}, defaults, opts);
+    opts = {...defaults, ...opts};
     ({includeMatcher, excludeMatcher} = makeMatchers(opts));
     if (/[/\\]$/.test(dir)) dir = dir.substring(0, dir.length - 1);
     encoding = Buffer.isBuffer(dir) ? "buffer" : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrdir",
-  "version": "10.0.3",
+  "version": "10.1.0",
   "description": "Recursive directory reader with a delightful API",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/rrdir",
@@ -15,13 +15,12 @@
     "index.js"
   ],
   "devDependencies": {
-    "eslint": "8.23.1",
-    "eslint-config-silverwind": "54.0.2",
-    "jest": "29.0.3",
-    "semver": "7.3.7",
+    "eslint": "8.24.0",
+    "eslint-config-silverwind": "57.0.1",
+    "jest": "29.1.2",
     "tempy": "3.0.0",
-    "updates": "13.1.7",
-    "versions": "9.3.2"
+    "updates": "13.1.8",
+    "versions": "9.3.3"
   },
   "keywords": [
     "recursive readdir",