rrdir 13.1.1 → 13.2.0

package/dist/index.d.ts

@@ -1,9 +1,9 @@
 import { Stats } from 'node:fs';
 import { Matcher } from 'picomatch';
-
-type Encoding = "utf8" | "buffer";
-type Dir = string | Uint8Array;
-type RRDirOpts = {
+export type Encoding = "utf8" | "buffer";
+export type Dir = string | Uint8Array;
+export type DirNodeCompatible = string | Buffer;
+export type RRDirOpts = {
     strict?: boolean;
     stats?: boolean;
     followSymlinks?: boolean;
@@ -16,7 +16,7 @@ type InternalOpts = {
     excludeMatcher?: Matcher;
     encoding?: Encoding;
 };
-type Entry = {
+export 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. */
@@ -32,3 +32,4 @@ export declare function rrdir(dir: Dir, opts?: RRDirOpts, { includeMatcher, excl
 export declare function rrdirAsync(dir: Dir, opts?: RRDirOpts, { includeMatcher, excludeMatcher, encoding }?: InternalOpts): Promise<Entry[]>;
 export declare function rrdirSync(dir: Dir, opts?: RRDirOpts, { includeMatcher, excludeMatcher, encoding }?: InternalOpts): Entry[];
 export {};
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,KAAK,EAAS,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAQvC,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;AACzC,MAAM,MAAM,GAAG,GAAG,MAAM,GAAG,UAAU,CAAC;AACtC,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEhD,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAA;AAED,KAAK,YAAY,GAAG;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB,CAAA;AAED,MAAM,MAAM,KAAK,GAAG;IAClB,wIAAwI;IACxI,IAAI,EAAE,GAAG,CAAC;IACV,iFAAiF;IACjF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qFAAqF;IACrF,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0IAA0I;IAC1I,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,8EAA8E;IAC9E,GAAG,CAAC,EAAE,KAAK,CAAC;CACb,CAAA;AA6CD,wBAAuB,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAE,SAAc,EAAE,EAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAC,GAAE,YAAiB,GAAG,cAAc,CAAC,KAAK,CAAC,CAkDjJ;AAED,wBAAsB,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAE,SAAc,EAAE,EAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAC,GAAE,YAAiB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAqDhJ;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAE,SAAc,EAAE,EAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAC,GAAE,YAAiB,GAAG,KAAK,EAAE,CAoDhI"}

package/dist/index.js

@@ -1,164 +1,190 @@
-import { readdir as U, stat as b, lstat as g } from "node:fs/promises";
-import { readdirSync as I, statSync as $, lstatSync as E } from "node:fs";
-import { sep as F, resolve as A } from "node:path";
-import P from "picomatch";
-const T = new TextEncoder(), O = T.encode.bind(T), p = new TextDecoder(), h = p.decode.bind(p), j = O(F), S = (t) => t instanceof Uint8Array ? "buffer" : "utf8", k = {
-  strict: !1,
-  stats: !1,
-  followSymlinks: !1,
+import { readdir, stat, lstat } from "node:fs/promises";
+import { readdirSync, statSync, lstatSync } from "node:fs";
+import { sep, resolve } from "node:path";
+import picomatch from "picomatch";
+const encoder = new TextEncoder();
+const toUint8Array = encoder.encode.bind(encoder);
+const decoder = new TextDecoder();
+const toString = decoder.decode.bind(decoder);
+const sepUint8Array = toUint8Array(sep);
+const getEncoding = (dir) => dir instanceof Uint8Array ? "buffer" : "utf8";
+const defaultOpts = {
+  strict: false,
+  stats: false,
+  followSymlinks: false,
   exclude: void 0,
   include: void 0,
-  insensitive: !1
+  insensitive: false
 };
-function v({ name: t }, i, s) {
-  return s === "buffer" ? i === "." ? t : Uint8Array.from([...i, ...j, ...t]) : i === "." ? t : `${i}${F}${t}`;
+function makePath({ name }, dir, encoding) {
+  if (encoding === "buffer") {
+    return dir === "." ? name : Uint8Array.from([...dir, ...sepUint8Array, ...name]);
+  } else {
+    return dir === "." ? name : `${dir}${sep}${name}`;
+  }
 }
-function D(t, i, s, l) {
+function build(dirent, path, stats, opts) {
   return {
-    path: i,
-    directory: (s || t).isDirectory(),
-    symlink: (s || t).isSymbolicLink(),
-    ...l.stats ? { stats: s } : {}
+    path,
+    directory: (stats || dirent).isDirectory(),
+    symlink: (stats || dirent).isSymbolicLink(),
+    ...opts.stats ? { stats } : {}
   };
 }
-function L({ include: t, exclude: i, insensitive: s }) {
-  const l = {
-    dot: !0,
-    flags: s ? "i" : void 0
+function makeMatchers({ include, exclude, insensitive }) {
+  const opts = {
+    dot: true,
+    flags: insensitive ? "i" : void 0
   };
   return {
-    includeMatcher: t?.length ? (f) => P(t, l)(A(f)) : null,
-    excludeMatcher: i?.length ? (f) => P(i, l)(A(f)) : null
+    includeMatcher: include?.length ? (path) => picomatch(include, opts)(resolve(path)) : null,
+    excludeMatcher: exclude?.length ? (path) => picomatch(exclude, opts)(resolve(path)) : null
   };
 }
-async function* q(t, i = {}, { includeMatcher: s, excludeMatcher: l, encoding: f } = {}) {
-  s === void 0 && (i = { ...k, ...i }, { includeMatcher: s, excludeMatcher: l } = L(i), typeof t == "string" && /[/\\]$/.test(t) && (t = t.substring(0, t.length - 1)), f = S(t));
-  let n = [];
+async function* rrdir(dir, opts = {}, { includeMatcher, excludeMatcher, encoding } = {}) {
+  if (includeMatcher === void 0) {
+    opts = { ...defaultOpts, ...opts };
+    ({ includeMatcher, excludeMatcher } = makeMatchers(opts));
+    if (typeof dir === "string" && /[/\\]$/.test(dir)) dir = dir.substring(0, dir.length - 1);
+    encoding = getEncoding(dir);
+  }
+  let dirents = [];
   try {
-    n = await U(t, { encoding: f, withFileTypes: !0 });
-  } catch (y) {
-    if (i.strict)
-      throw y;
-    yield { path: t, err: y };
+    dirents = await readdir(dir, { encoding, withFileTypes: true });
+  } catch (err) {
+    if (opts.strict) throw err;
+    yield { path: dir, err };
   }
-  if (n.length)
-    for (const y of n) {
-      const r = v(y, t, f);
-      if (l?.(f === "buffer" ? h(r) : r))
-        continue;
-      const e = i.followSymlinks && y.isSymbolicLink(), u = f === "buffer" ? h(r) : r, m = !s || s(u);
-      let c;
-      if (m) {
-        if (i.stats || e)
-          try {
-            c = await (i.followSymlinks ? b : g)(r);
-          } catch (a) {
-            if (i.strict)
-              throw a;
-            yield { path: r, err: a };
-          }
-        yield D(y, r, c, i);
+  if (!dirents.length) return;
+  for (const dirent of dirents) {
+    const path = makePath(dirent, dir, encoding);
+    if (excludeMatcher?.(encoding === "buffer" ? toString(path) : path)) continue;
+    const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
+    const encodedPath = encoding === "buffer" ? toString(path) : path;
+    const isIncluded = !includeMatcher || includeMatcher(encodedPath);
+    let stats;
+    if (isIncluded) {
+      if (opts.stats || isSymbolicLink) {
+        try {
+          stats = await (opts.followSymlinks ? stat : lstat)(path);
+        } catch (err) {
+          if (opts.strict) throw err;
+          yield { path, err };
+        }
+      }
+      yield build(dirent, path, stats, opts);
+    }
+    let recurse = false;
+    if (isSymbolicLink) {
+      if (!stats) try {
+        stats = await stat(path);
+      } catch {
       }
-      let o = !1;
-      if (e) {
-        if (!c)
-          try {
-            c = await b(r);
-          } catch {
-          }
-        c && c.isDirectory() && (o = !0);
-      } else
-        y.isDirectory() && (o = !0);
-      o && (yield* q(r, i, { includeMatcher: s, excludeMatcher: l, encoding: f }));
+      if (stats && stats.isDirectory()) recurse = true;
+    } else if (dirent.isDirectory()) {
+      recurse = true;
     }
+    if (recurse) yield* rrdir(path, opts, { includeMatcher, excludeMatcher, encoding });
+  }
 }
-async function z(t, i = {}, { includeMatcher: s, excludeMatcher: l, encoding: f } = {}) {
-  s === void 0 && (i = { ...k, ...i }, { includeMatcher: s, excludeMatcher: l } = L(i), typeof t == "string" && /[/\\]$/.test(t) && (t = t.substring(0, t.length - 1)), f = S(t));
-  const n = [];
-  let y = [];
+async function rrdirAsync(dir, opts = {}, { includeMatcher, excludeMatcher, encoding } = {}) {
+  if (includeMatcher === void 0) {
+    opts = { ...defaultOpts, ...opts };
+    ({ includeMatcher, excludeMatcher } = makeMatchers(opts));
+    if (typeof dir === "string" && /[/\\]$/.test(dir)) dir = dir.substring(0, dir.length - 1);
+    encoding = getEncoding(dir);
+  }
+  const results = [];
+  let dirents = [];
   try {
-    y = await U(t, { encoding: f, withFileTypes: !0 });
-  } catch (r) {
-    if (i.strict)
-      throw r;
-    n.push({ path: t, err: r });
+    dirents = await readdir(dir, { encoding, withFileTypes: true });
+  } catch (err) {
+    if (opts.strict) throw err;
+    results.push({ path: dir, err });
   }
-  return y.length && await Promise.all(y.map(async (r) => {
-    const e = v(r, t, f);
-    if (l?.(f === "buffer" ? h(e) : e))
-      return;
-    const u = i.followSymlinks && r.isSymbolicLink(), m = f === "buffer" ? h(e) : e, c = !s || s(m);
-    let o;
-    if (c) {
-      if (i.stats || u)
+  if (!dirents.length) return results;
+  await Promise.all(dirents.map(async (dirent) => {
+    const path = makePath(dirent, dir, encoding);
+    if (excludeMatcher?.(encoding === "buffer" ? toString(path) : path)) return;
+    const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
+    const encodedPath = encoding === "buffer" ? toString(path) : path;
+    const isIncluded = !includeMatcher || includeMatcher(encodedPath);
+    let stats;
+    if (isIncluded) {
+      if (opts.stats || isSymbolicLink) {
         try {
-          o = await (i.followSymlinks ? b : g)(e);
-        } catch (w) {
-          if (i.strict)
-            throw w;
-          n.push({ path: e, err: w });
+          stats = await (opts.followSymlinks ? stat : lstat)(path);
+        } catch (err) {
+          if (opts.strict) throw err;
+          results.push({ path, err });
         }
-      n.push(D(r, e, o, i));
+      }
+      results.push(build(dirent, path, stats, opts));
     }
-    let a = !1;
-    if (u) {
-      if (!o)
-        try {
-          o = await b(e);
-        } catch {
-        }
-      o && o.isDirectory() && (a = !0);
-    } else
-      r.isDirectory() && (a = !0);
-    a && n.push(...await z(e, i, { includeMatcher: s, excludeMatcher: l, encoding: f }));
-  })), n;
+    let recurse = false;
+    if (isSymbolicLink) {
+      if (!stats) try {
+        stats = await stat(path);
+      } catch {
+      }
+      if (stats && stats.isDirectory()) recurse = true;
+    } else if (dirent.isDirectory()) {
+      recurse = true;
+    }
+    if (recurse) results.push(...await rrdirAsync(path, opts, { includeMatcher, excludeMatcher, encoding }));
+  }));
+  return results;
 }
-function B(t, i = {}, { includeMatcher: s, excludeMatcher: l, encoding: f } = {}) {
-  s === void 0 && (i = { ...k, ...i }, { includeMatcher: s, excludeMatcher: l } = L(i), typeof t == "string" && /[/\\]$/.test(t) && (t = t.substring(0, t.length - 1)), f = S(t));
-  const n = [];
-  let y = [];
+function rrdirSync(dir, opts = {}, { includeMatcher, excludeMatcher, encoding } = {}) {
+  if (includeMatcher === void 0) {
+    opts = { ...defaultOpts, ...opts };
+    ({ includeMatcher, excludeMatcher } = makeMatchers(opts));
+    if (typeof dir === "string" && /[/\\]$/.test(dir)) dir = dir.substring(0, dir.length - 1);
+    encoding = getEncoding(dir);
+  }
+  const results = [];
+  let dirents = [];
   try {
-    y = I(t, { encoding: f, withFileTypes: !0 });
-  } catch (r) {
-    if (i.strict)
-      throw r;
-    n.push({ path: t, err: r });
+    dirents = readdirSync(dir, { encoding, withFileTypes: true });
+  } catch (err) {
+    if (opts.strict) throw err;
+    results.push({ path: dir, err });
   }
-  if (!y.length)
-    return n;
-  for (const r of y) {
-    const e = v(r, t, f);
-    if (l?.(f === "buffer" ? h(e) : e))
-      continue;
-    const u = i.followSymlinks && r.isSymbolicLink(), m = f === "buffer" ? h(e) : e, c = !s || s(m);
-    let o;
-    if (c) {
-      if (i.stats || u)
+  if (!dirents.length) return results;
+  for (const dirent of dirents) {
+    const path = makePath(dirent, dir, encoding);
+    if (excludeMatcher?.(encoding === "buffer" ? toString(path) : path)) continue;
+    const isSymbolicLink = opts.followSymlinks && dirent.isSymbolicLink();
+    const encodedPath = encoding === "buffer" ? toString(path) : path;
+    const isIncluded = !includeMatcher || includeMatcher(encodedPath);
+    let stats;
+    if (isIncluded) {
+      if (opts.stats || isSymbolicLink) {
         try {
-          o = (i.followSymlinks ? $ : E)(e);
-        } catch (w) {
-          if (i.strict)
-            throw w;
-          n.push({ path: e, err: w });
+          stats = (opts.followSymlinks ? statSync : lstatSync)(path);
+        } catch (err) {
+          if (opts.strict) throw err;
+          results.push({ path, err });
         }
-      n.push(D(r, e, o, i));
+      }
+      results.push(build(dirent, path, stats, opts));
     }
-    let a = !1;
-    if (u) {
-      if (!o)
-        try {
-          o = $(e);
-        } catch {
-        }
-      o && o.isDirectory() && (a = !0);
-    } else
-      r.isDirectory() && (a = !0);
-    a && n.push(...B(e, i, { includeMatcher: s, excludeMatcher: l, encoding: f }));
+    let recurse = false;
+    if (isSymbolicLink) {
+      if (!stats) try {
+        stats = statSync(path);
+      } catch {
+      }
+      if (stats && stats.isDirectory()) recurse = true;
+    } else if (dirent.isDirectory()) {
+      recurse = true;
+    }
+    if (recurse) results.push(...rrdirSync(path, opts, { includeMatcher, excludeMatcher, encoding }));
   }
-  return n;
+  return results;
 }
 export {
-  q as rrdir,
-  z as rrdirAsync,
-  B as rrdirSync
+  rrdir,
+  rrdirAsync,
+  rrdirSync
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rrdir",
-  "version": "13.1.1",
+  "version": "13.2.0",
   "description": "Recursive directory reader with a delightful API",
   "author": "silverwind <me@silverwind.io>",
   "repository": "silverwind/rrdir",
@@ -20,17 +20,17 @@
     "picomatch": "^4.0.2"
   },
   "devDependencies": {
-    "@types/node": "20.12.12",
-    "@types/picomatch": "2.3.3",
+    "@types/node": "22.10.1",
+    "@types/picomatch": "3.0.1",
     "eslint": "8.57.0",
-    "eslint-config-silverwind": "83.0.1",
-    "eslint-config-silverwind-typescript": "3.2.5",
-    "typescript-config-silverwind": "4.2.0",
-    "updates": "16.0.1",
-    "versions": "12.0.1",
-    "vite": "5.2.11",
-    "vite-config-silverwind": "2.0.3",
-    "vitest": "1.5.0",
-    "vitest-config-silverwind": "8.0.4"
+    "eslint-config-silverwind": "94.2.1",
+    "eslint-config-silverwind-typescript": "9.2.0",
+    "typescript-config-silverwind": "6.1.1",
+    "updates": "16.4.0",
+    "versions": "12.1.2",
+    "vite": "6.0.1",
+    "vite-config-silverwind": "3.1.0",
+    "vitest": "2.1.6",
+    "vitest-config-silverwind": "9.2.0"
   }
 }