5etools-utils 0.1.16 → 0.1.19

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

@@ -1,4 +1,5 @@
 import * as fs from "fs";
+import * as path from "path";
 
 function isDirectory (path) {
 	return fs.lstatSync(path).isDirectory();
@@ -35,12 +36,13 @@ function readJSON (path, {isIncludeRaw = false} = {}) {
  */
 function listJsonFiles (dir, opts) {
 	const {dirBlacklist = null} = opts || {};
+	const dirBlacklist_ = dirBlacklist ? new Set(dirBlacklist.map(it => path.normalize(it))) : new Set();
 
 	const dirContent = fs.readdirSync(dir, "utf8")
 		.map(file => dir === "." ? file : `${dir}/${file}`);
 	return dirContent.reduce((acc, file) => {
 		if (isDirectory(file)) {
-			if (dirBlacklist == null || !dirBlacklist.has(file)) acc.push(...listJsonFiles(file, opts));
+			if (!dirBlacklist_.has(path.normalize(file))) acc.push(...listJsonFiles(file, opts));
 		} else {
 			if (file.toLowerCase().endsWith(".json")) acc.push(file);
 		}

package/package.json

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