5etools-utils 0.1.15 → 0.1.18

package/lib/TestJson.js

@@ -109,17 +109,19 @@ class JsonTester {
 		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});
-			});
+	_doRunOnDir ({isFailFast, dir, errors, errorsFull, ...opts} = {}) {
+		for (const filePath of uf.listJsonFiles(dir, opts)) {
+			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});
+				if (isFailFast) break;
+			}
+		}
 	}
 
 	/**
@@ -140,7 +142,7 @@ class JsonTester {
 		return {errors, errorsFull};
 	}
 
-	getErrorsOnDirs () {
+	getErrorsOnDirs ({isFailFast = false} = {}) {
 		um.info(this._tagLog, `Validating JSON against schema`);
 
 		this._doLoadSchema();
@@ -148,7 +150,10 @@ class JsonTester {
 		const errors = [];
 		const errorsFull = [];
 
-		uf.runOnDirs((dir) => this._doRunOnDir({errors, errorsFull, dir}));
+		uf.runOnDirs((dir) => {
+			if (isFailFast && errors.length) return;
+			return this._doRunOnDir({isFailFast, errors, errorsFull, dir});
+		});
 
 		return {errors, errorsFull};
 	}

package/lib/UtilFs.js

@@ -48,18 +48,25 @@ function listJsonFiles (dir, opts) {
 	}, []);
 }
 
+function _runOnDirs_getDirs () {
+	return fs.readdirSync(".", "utf8")
+		.filter(dir => isDirectory(dir) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules");
+}
+
 function runOnDirs (fn) {
-	fs.readdirSync(".", "utf8")
-		.filter(dir => isDirectory(dir) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules")
+	_runOnDirs_getDirs()
 		.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)),
-	);
+async function pRunOnDirs (pFn, {isSerial = false} = {}) {
+	const dirs = _runOnDirs_getDirs();
+
+	if (isSerial) {
+		for (const dir of dirs) await pFn(dir);
+		return;
+	}
+
+	await Promise.allSettled(dirs.map(dir => pFn(dir)));
 }
 
 function mkDirs (pathToCreate) {

package/package.json

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