rrdir 10.1.3 → 11.0.1

package/index.js

@@ -30,22 +30,20 @@ function build(dirent, path, stats, opts) {
   };
 }
 
-export function pathGlobToRegex(glob, {flags = undefined, sep = "/"} = {flags: undefined, sep: "/"}) {
-  if (sep === "\\") sep = "\\\\";
+export function pathGlobToRegex(glob, {flags = undefined} = {flags: undefined}) {
   return new RegExp(`${glob
     .replace(/[|\\{}()[\]^$+.-]/g, "\\$&")
-    .replace(new RegExp(`\\*\\*${sep}\\*`, "g"), ".*")
-    .replace(/^\*\*/g, ".*")
-    .replace(new RegExp(`${sep}?\\*\\*$`, "g"), ".*")
-    .replace(new RegExp(`(${sep})\\*\\*(${sep})`, "g"), (_, p1, p2) => `${p1}.*${p2}`)
-    .replace(/([^.])\*/g, (_, p1) => `${p1}[^${sep}]*`)
+    .replace(/\*\*\/\*/, ".*")
+    .replace(/\*\*/g, ".*")
+    .replace(/\//g, "[/\\\\]")
+    .replace(/([^.])\*/g, (_, p1) => `${p1}[^/\\\\]*`)
     .replaceAll("**", "*")
     .replaceAll("?", ".")
   }$`, flags);
 }
 
 function makeMatcher(filters, flags) {
-  const regexes = filters.map(filter => pathGlobToRegex(filter, {flags, sep}));
+  const regexes = filters.map(filter => pathGlobToRegex(filter, {flags}));
   return str => {
     for (const regex of regexes) {
       if (regex.test(str)) return true;
@@ -84,7 +82,8 @@ export async function* rrdir(dir, opts = {}, {includeMatcher, excludeMatcher, en
     if (excludeMatcher?.(encoding === "buffer" ? String(path) : path)) continue;
 
     const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
-    const isIncluded = !includeMatcher || includeMatcher(encoding === "buffer" ? String(path) : path);
+    const encodedPath = encoding === "buffer" ? String(path) : path;
+    const isIncluded = !includeMatcher || includeMatcher(encodedPath);
     let stats;
 
     if (isIncluded) {
@@ -135,7 +134,8 @@ export async function rrdirAsync(dir, opts = {}, {includeMatcher, excludeMatcher
     if (excludeMatcher?.(encoding === "buffer" ? String(path) : path)) return;
 
     const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
-    const isIncluded = !includeMatcher || includeMatcher(encoding === "buffer" ? String(path) : path);
+    const encodedPath = encoding === "buffer" ? String(path) : path;
+    const isIncluded = !includeMatcher || includeMatcher(encodedPath);
     let stats;
 
     if (isIncluded) {
@@ -188,7 +188,8 @@ export function rrdirSync(dir, opts = {}, {includeMatcher, excludeMatcher, encod
     if (excludeMatcher?.(encoding === "buffer" ? String(path) : path)) continue;
 
     const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
-    const isIncluded = !includeMatcher || includeMatcher(encoding === "buffer" ? String(path) : path);
+    const encodedPath = encoding === "buffer" ? String(path) : path;
+    const isIncluded = !includeMatcher || includeMatcher(encodedPath);
     let stats;
 
     if (isIncluded) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrdir",
-  "version": "10.1.3",
+  "version": "11.0.1",
   "description": "Recursive directory reader with a delightful API",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/rrdir",
@@ -9,17 +9,17 @@
   "type": "module",
   "sideEffects": false,
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "files": [
     "index.js"
   ],
   "devDependencies": {
-    "eslint": "8.36.0",
-    "eslint-config-silverwind": "65.1.3",
-    "updates": "13.2.9",
-    "versions": "10.4.2",
-    "vitest": "0.29.7"
+    "eslint": "8.39.0",
+    "eslint-config-silverwind": "67.0.1",
+    "updates": "14.1.0",
+    "versions": "11.0.0",
+    "vitest": "0.30.1"
   },
   "keywords": [
     "recursive readdir",

package/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) silverwind
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.