Apply FND's suggestions to improve FileFinder

Author: moonglum

lib.js

@@ -4,20 +4,21 @@ let path = require("node:path");
 
 exports.FileFinder = class FileFinder {
 	/**
-	 * @param {string} directory
+	 * @param {string} root
 	 * @param {FileFinderOptions} options?
 	 */
-	constructor(directory, { skipDotfiles, filter = () => true } = {}) {
-		this.directory = directory;
+	constructor(root, { skipDotfiles, filter }) {
+		this._root = root;
+
 		/**
 		 * @param {string} filename
 		 * @return {boolean}
 		 */
-		this.filter = filename => {
+		this._filter = filename => {
 			if(skipDotfiles && isDotfile(filename)) {
 				return false;
 			}
-			return filter(filename);
+			return filter ? filter(filename) : true;
 		};
 	}
 
@@ -26,9 +27,9 @@ exports.FileFinder = class FileFinder {
 	 *
 	 * @returns {Promise<string[]>}
 	 */
-	all() {
-		return tree(this.directory).
-			then(filenames => filenames.filter(this.filter));
+	async all() {
+		let filenames = await tree(this._root);
+		return filenames.filter(this._filter);
 	}
 
 	/**
@@ -37,64 +38,39 @@ exports.FileFinder = class FileFinder {
 	 * @param {string[]} filepaths
 	 * @returns {Promise<string[]>}
 	 */
-	match(filepaths) {
-		return filesWithinDirectory(this.directory, filepaths).
-			then(filepaths => filepaths.filter(this.filter));
+	async match(filepaths) {
+		return filepaths.map(filepath => path.relative(this._root, filepath)).
+			filter(filename => !filename.startsWith("..")).
+			filter(this._filter);
 	}
 };
 
 /**
+ * flat list of all files of a directory tree
+ *
  * @param {string} filepath
  * @param {string} referenceDir
  * @returns {Promise<string[]>}
  */
-function tree(filepath, referenceDir = filepath) {
-	return stat(filepath).
-		then(res => {
-			if(!res.isDirectory()) {
-				return [path.relative(referenceDir, filepath)];
-			}
+async function tree(filepath, referenceDir = filepath) {
+	let stats = await stat(filepath);
 
-			return readdir(filepath).
-				then(entries => {
-					let res = Promise.all(entries.map(entry => {
-						return tree(path.join(filepath, entry), referenceDir);
-					}));
-					return res.then(flatten);
-				});
-		});
-}
+	if(!stats.isDirectory()) {
+		return [path.relative(referenceDir, filepath)];
+	}
 
-/**
- * @param {string} directory
- * @param {string[]} files
- * @returns {Promise<string[]>}
- */
-function filesWithinDirectory(directory, files) {
-	return new Promise(resolve => {
-		resolve(files.
-			map(filepath => path.relative(directory, filepath)).
-			filter(filename => !filename.startsWith("..")));
-	});
+	let entries = await Promise.all((await readdir(filepath)).map(entry => {
+		return tree(path.join(filepath, entry), referenceDir);
+	}));
+	return entries.flat();
 }
 
 /**
+ * Does the filename start with a dot?
+ *
  * @param {string} filename
  * @returns {boolean}
  */
 function isDotfile(filename) {
 	return path.basename(filename).startsWith(".");
 }
-
-/**
- * @param {string[][]} arr
- * @returns {string[]}
- */
-function flatten(arr) {
-	/**
-	 * I'm deeply sorry for this
-	 * @type string[]
-	 */
-	const akwardlyTypedStringArray = [];
-	return akwardlyTypedStringArray.concat.apply([], arr);
-}

types.ts

@@ -56,6 +56,6 @@ export interface ProcessFile {
 }
 
 export interface FileFinderOptions {
-		skipDotfiles?: boolean,
+		skipDotfiles: boolean,
 		filter?: (filename: string) => boolean
 }