rrdir 14.0.1 → 14.1.0

package/README.md

@@ -1,5 +1,5 @@
 # rrdir
-[![](https://img.shields.io/npm/v/rrdir.svg?style=flat)](https://www.npmjs.org/package/rrdir) [![](https://img.shields.io/npm/dm/rrdir.svg)](https://www.npmjs.org/package/rrdir) [![](https://packagephobia.com/badge?p=rrdir)](https://packagephobia.com/result?p=rrdir)
+[![](https://img.shields.io/npm/v/rrdir.svg?style=flat)](https://www.npmjs.org/package/rrdir) [![](https://img.shields.io/npm/dm/rrdir.svg)](https://www.npmjs.org/package/rrdir) [![](https://packagephobia.com/badge?p=rrdir)](https://packagephobia.com/result?p=rrdir) [![](https://depx.co/api/badge/rrdir)](https://depx.co/pkg/rrdir)
 
 > Recursive directory reader with a delightful API
 

package/dist/index.d.ts

@@ -1,10 +1,8 @@
 import { Stats } from "node:fs";
-import { Matcher } from "picomatch";
 
 //#region index.d.ts
 type Encoding = "utf8" | "buffer";
-type Dir = string | Uint8Array;
-type DirNodeCompatible = string | Buffer;
+type Dir = string | Buffer;
 type RRDirOpts = {
   strict?: boolean;
   stats?: boolean;
@@ -13,37 +11,33 @@ type RRDirOpts = {
   exclude?: string[];
   insensitive?: boolean;
 };
+type Matcher = ((path: string) => boolean) | null;
 type InternalOpts = {
   includeMatcher?: Matcher;
   excludeMatcher?: Matcher;
   encoding?: Encoding;
 };
-type Entry = {
-  /** The path to the entry, will be relative if `dir` is given relative. If `dir` is a `Uint8Array`, this will be too. Always present. */
-  path: Dir;
-  /** Boolean indicating whether the entry is a directory. `undefined` on error. */
-  directory?: boolean;
-  /** Boolean indicating whether the entry is a symbolic link. `undefined` on error. */
-  symlink?: boolean;
-  /** A [`fs.stats`](https://nodejs.org/api/fs.html#fs_class_fs_stats) object, present when `options.stats` is set. `undefined` on error. */
-  stats?: Stats;
-  /** Any error encountered while reading this entry. `undefined` on success. */
+type Entry<T = Dir> = {
+  /** The path to the entry, will be relative if `dir` is given relative. If `dir` is a `Uint8Array`, this will be too. Always present. */path: T; /** Boolean indicating whether the entry is a directory. `undefined` on error. */
+  directory?: boolean; /** Boolean indicating whether the entry is a symbolic link. `undefined` on error. */
+  symlink?: boolean; /** A [`fs.stats`](https://nodejs.org/api/fs.html#fs_class_fs_stats) object, present when `options.stats` is set. `undefined` on error. */
+  stats?: Stats; /** Any error encountered while reading this entry. `undefined` on success. */
   err?: Error;
 };
-declare function rrdir(dir: Dir, opts?: RRDirOpts, {
+declare function rrdir<T extends Dir>(dir: T, opts?: RRDirOpts, {
   includeMatcher,
   excludeMatcher,
   encoding
-}?: InternalOpts): AsyncGenerator<Entry>;
-declare function rrdirAsync(dir: Dir, opts?: RRDirOpts, {
+}?: InternalOpts): AsyncGenerator<Entry<T>>;
+declare function rrdirAsync<T extends Dir>(dir: T, opts?: RRDirOpts, {
   includeMatcher,
   excludeMatcher,
   encoding
-}?: InternalOpts): Promise<Entry[]>;
-declare function rrdirSync(dir: Dir, opts?: RRDirOpts, {
+}?: InternalOpts): Promise<Array<Entry<T>>>;
+declare function rrdirSync<T extends Dir>(dir: T, opts?: RRDirOpts, {
   includeMatcher,
   excludeMatcher,
   encoding
-}?: InternalOpts): Entry[];
+}?: InternalOpts): Array<Entry<T>>;
 //#endregion
-export { Dir, DirNodeCompatible, Encoding, Entry, RRDirOpts, rrdir, rrdirAsync, rrdirSync };
+export { Dir, Encoding, Entry, RRDirOpts, rrdir, rrdirAsync, rrdirSync };

package/dist/index.js

@@ -1,7 +1,6 @@
 import { lstat, readdir, stat } from "node:fs/promises";
 import { lstatSync, readdirSync, statSync } from "node:fs";
 import { resolve, sep } from "node:path";
-import picomatch from "picomatch";
 
 //#region index.ts
 const encoder = new TextEncoder();
@@ -34,14 +33,28 @@ function build(dirent, path, stats, opts) {
 		...opts.stats ? { stats } : {}
 	};
 }
-function makeMatchers({ include, exclude, insensitive }) {
-	const opts = {
-		dot: true,
-		flags: insensitive ? "i" : void 0
+function globToRegex(pattern, insensitive) {
+	pattern = pattern.replace(/\\/g, "/");
+	const endsWithDoubleStar = pattern.endsWith("/**");
+	let regex = pattern.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*\*/g, "__DOUBLESTAR__").replace(/\*/g, "[^/]*").replace(/__DOUBLESTAR__/g, ".*");
+	if (endsWithDoubleStar) {
+		regex = regex.slice(0, -3);
+		regex = `^${regex}(?:/.*)?$`;
+	} else regex = `^${regex}$`;
+	return new RegExp(regex, insensitive ? "i" : "");
+}
+function createMatcher(patterns, insensitive) {
+	if (!patterns?.length) return null;
+	const regexes = patterns.map((pattern) => globToRegex(pattern, insensitive));
+	return (path) => {
+		const normalizedPath = resolve(path).replace(/\\/g, "/");
+		return regexes.some((regex) => regex.test(normalizedPath));
 	};
+}
+function makeMatchers({ include, exclude, insensitive }) {
 	return {
-		includeMatcher: include?.length ? (path) => picomatch(include, opts)(resolve(path)) : null,
-		excludeMatcher: exclude?.length ? (path) => picomatch(exclude, opts)(resolve(path)) : null
+		includeMatcher: createMatcher(include || [], insensitive || false),
+		excludeMatcher: createMatcher(exclude || [], insensitive || false)
 	};
 }
 async function* rrdir(dir, opts = {}, { includeMatcher, excludeMatcher, encoding } = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrdir",
-  "version": "14.0.1",
+  "version": "14.1.0",
   "description": "Recursive directory reader with a delightful API",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/rrdir",
@@ -16,20 +16,16 @@
   "engines": {
     "node": ">=22"
   },
-  "dependencies": {
-    "picomatch": "4.0.3"
-  },
   "devDependencies": {
-    "@types/node": "24.10.1",
-    "@types/picomatch": "4.0.2",
-    "eslint": "9.39.1",
-    "eslint-config-silverwind": "111.0.5",
-    "tsdown": "0.16.3",
-    "tsdown-config-silverwind": "1.5.2",
-    "typescript-config-silverwind": "12.0.0",
-    "updates": "16.9.1",
-    "versions": "14.0.2",
-    "vitest": "4.0.8",
-    "vitest-config-silverwind": "10.4.2"
+    "@types/node": "25.1.0",
+    "eslint": "9.39.2",
+    "eslint-config-silverwind": "118.0.1",
+    "tsdown": "0.20.1",
+    "tsdown-config-silverwind": "1.7.3",
+    "typescript-config-silverwind": "14.0.0",
+    "updates": "17.0.8",
+    "versions": "14.0.3",
+    "vitest": "4.0.18",
+    "vitest-config-silverwind": "10.6.1"
   }
 }