5etools-utils 0.1.4 → 0.1.7

package/lib/TestJson.js

@@ -9,16 +9,20 @@ import * as um from "./UtilMisc.js";
 const _IS_SORT_RESULTS = !process.env.VET_TEST_JSON_RESULTS_UNSORTED;
 const _IS_TRIM_RESULTS = !process.env.VET_TEST_JSON_RESULTS_UNTRIMMED;
 
+const LOG_TAG = "JSON";
+
 class JsonTester {
 	static _RE_DATE = /^\d\d\d\d-\d\d-\d\d$/;
 
 	constructor (
 		{
 			dirSchema,
-			tagLog = "JSON",
+			dir = ".",
+			tagLog = LOG_TAG,
 		},
 	) {
 		this._dirSchema = dirSchema;
+		this._dir = dir;
 		this._tagLog = tagLog;
 
 		// region Set up validator
@@ -55,7 +59,7 @@ class JsonTester {
 		}
 	}
 
-	_getFileErrors ({filePath}) { return `${filePath}\n${JSON.stringify(ajv.errors, null, 2)}`; }
+	_getFileErrors ({filePath}) { return `${filePath}\n${JSON.stringify(this._ajv.errors, null, 2)}`; }
 
 	_handleError ({filePath, errors, errorsFull, data}) {
 		if (!process.env.CI) errorsFull.push(this._getFileErrors({filePath}));
@@ -103,19 +107,22 @@ class JsonTester {
 		const errors = [];
 		const errorsFull = [];
 
-		uf.runOnDirs((dir) => {
-			uf.listJsonFiles(dir)
-				.forEach(filePath => {
-					const data = uf.readJSON(filePath);
-					this._addImplicits(data);
-					const valid = this._ajv.validate("homebrew.json", data);
+		uf.runOnDirs(
+			(dir) => {
+				uf.listJsonFiles(dir)
+					.forEach(filePath => {
+						const data = uf.readJSON(filePath);
+						this._addImplicits(data);
+						const valid = this._ajv.validate("homebrew.json", data);
 
-					if (!valid) this._handleError({filePath, errors, errorsFull, data});
-				});
-		});
+						if (!valid) this._handleError({filePath, errors, errorsFull, data});
+					});
+			},
+			this._dir,
+		);
 
 		return {errors, errorsFull};
 	}
 }
 
-export {JsonTester};
+export {JsonTester, LOG_TAG};

package/lib/UtilFs.js

@@ -38,10 +38,11 @@ function listJsonFiles (dir) {
 	}, []);
 }
 
-function runOnDirs (fn) {
-	fs.readdirSync(".", "utf8")
-		.filter(dir => isDirectory(dir) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules")
-		.forEach(dir => fn(dir));
+function runOnDirs (fn, root = ".") {
+	fs.readdirSync(root, "utf8")
+		.map(dir => ({dir, dirPath: `${root}/${dir}`}))
+		.filter(({dir, dirPath}) => isDirectory(dirPath) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules")
+		.forEach(({dirPath}) => fn(dirPath));
 }
 
 function mkDirs (pathToCreate) {

package/package.json

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