5etools-utils 0.1.12 → 0.1.15

package/lib/TestJson.js

@@ -17,15 +17,11 @@ class JsonTester {
 	constructor (
 		{
 			dirSchema,
-			dir = ".",
-			dirWhitelist = null,
 			tagLog = LOG_TAG,
 			fnGetSchemaId = () => "homebrew.json",
 		},
 	) {
 		this._dirSchema = dirSchema;
-		this._dir = dir;
-		this._dirWhitelist = dirWhitelist;
 		this._tagLog = tagLog;
 		this._fnGetSchemaId = fnGetSchemaId;
 
@@ -46,6 +42,8 @@ class JsonTester {
 			},
 		);
 		// endregion
+
+		this._isSchemaLoaded = false;
 	}
 
 	/**
@@ -94,8 +92,8 @@ class JsonTester {
 		errors.push(error);
 	}
 
-	getErrors () {
-		um.info(this._tagLog, `Validating JSON against schema`);
+	_doLoadSchema () {
+		if (this._isSchemaLoaded) return;
 
 		uf.listJsonFiles(this._dirSchema)
 			.forEach(filePath => {
@@ -108,27 +106,49 @@ class JsonTester {
 				this._ajv.addSchema(contents, relativeFilePath);
 			});
 
+		this._isSchemaLoaded = true;
+	}
+
+	_doRunOnDir ({dir, errors, errorsFull, ...opts} = {}) {
+		uf.listJsonFiles(dir, opts)
+			.forEach(filePath => {
+				um.info(this._tagLog, `\tValidating "${filePath}"...`);
+
+				const data = uf.readJSON(filePath);
+				this._addImplicits(data);
+				const valid = this._ajv.validate(this._fnGetSchemaId(filePath), data);
+
+				if (!valid) this._handleError({filePath, errors, errorsFull, data});
+			});
+	}
+
+	/**
+	 * @param dir
+	 * @param [opts]
+	 * @param [opts.dirBlacklist]
+	 */
+	getErrors (dir, opts = {}) {
+		um.info(this._tagLog, `Validating JSON against schema`);
+
+		this._doLoadSchema();
+
 		const errors = [];
 		const errorsFull = [];
 
-		uf.runOnDirs(
-			(dir) => {
-				uf.listJsonFiles(dir)
-					.forEach(filePath => {
-						um.info(this._tagLog, `\tValidating "${filePath}"...`);
+		this._doRunOnDir({...opts, errors, errorsFull, dir});
 
-						const data = uf.readJSON(filePath);
-						this._addImplicits(data);
-						const valid = this._ajv.validate(this._fnGetSchemaId(filePath), data);
+		return {errors, errorsFull};
+	}
 
-						if (!valid) this._handleError({filePath, errors, errorsFull, data});
-					});
-			},
-			{
-				root: this._dir,
-				dirWhitelist: this._dirWhitelist,
-			},
-		);
+	getErrorsOnDirs () {
+		um.info(this._tagLog, `Validating JSON against schema`);
+
+		this._doLoadSchema();
+
+		const errors = [];
+		const errorsFull = [];
+
+		uf.runOnDirs((dir) => this._doRunOnDir({errors, errorsFull, dir}));
 
 		return {errors, errorsFull};
 	}

package/lib/UtilFs.js

@@ -28,23 +28,38 @@ function readJSON (path, {isIncludeRaw = false} = {}) {
 	}
 }
 
-function listJsonFiles (dir) {
+/**
+ * @param dir
+ * @param [opts]
+ * @param [opts.dirBlacklist]
+ */
+function listJsonFiles (dir, opts) {
+	const {dirBlacklist = null} = opts || {};
+
 	const dirContent = fs.readdirSync(dir, "utf8")
 		.map(file => dir === "." ? file : `${dir}/${file}`);
 	return dirContent.reduce((acc, file) => {
-		if (isDirectory(file)) acc.push(...listJsonFiles(file));
-		else {
+		if (isDirectory(file)) {
+			if (dirBlacklist == null || !dirBlacklist.has(file)) acc.push(...listJsonFiles(file, opts));
+		} else {
 			if (file.toLowerCase().endsWith(".json")) acc.push(file);
 		}
 		return acc;
 	}, []);
 }
 
-function runOnDirs (fn, {root = ".", dirWhitelist = null} = {}) {
-	fs.readdirSync(root, "utf8")
-		.map(dir => ({dir, dirPath: root === "." ? dir : `${root}/${dir}`}))
-		.filter(({dir, dirPath}) => isDirectory(dirPath) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules" && (!dirWhitelist || dirWhitelist.has(dir)))
-		.forEach(({dirPath}) => fn(dirPath));
+function runOnDirs (fn) {
+	fs.readdirSync(".", "utf8")
+		.filter(dir => isDirectory(dir) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules")
+		.forEach(dir => fn(dir));
+}
+
+async function pRunOnDirs (pFn) {
+	await Promise.allSettled(
+		fs.readdirSync(".", "utf8")
+		.filter(dir => isDirectory(dir) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules")
+		.map(dir => pFn(dir)),
+	);
 }
 
 function mkDirs (pathToCreate) {
@@ -63,5 +78,6 @@ export {
 	readJSON,
 	listJsonFiles,
 	runOnDirs,
+	pRunOnDirs,
 	mkDirs,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "5etools-utils",
-	"version": "0.1.12",
+	"version": "0.1.15",
 	"description": "Shared utilities for the 5etools ecosystem.",
 	"type": "module",
 	"main": "lib/Api.js",