5etools-utils 0.1.7 → 0.1.10

package/lib/TestJson.js

@@ -19,11 +19,13 @@ class JsonTester {
 			dirSchema,
 			dir = ".",
 			tagLog = LOG_TAG,
+			fnGetSchemaId = () => "homebrew.json",
 		},
 	) {
 		this._dirSchema = dirSchema;
 		this._dir = dir;
 		this._tagLog = tagLog;
+		this._fnGetSchemaId = fnGetSchemaId;
 
 		// region Set up validator
 		this._ajv = new Ajv({
@@ -113,7 +115,7 @@ class JsonTester {
 					.forEach(filePath => {
 						const data = uf.readJSON(filePath);
 						this._addImplicits(data);
-						const valid = this._ajv.validate("homebrew.json", data);
+						const valid = this._ajv.validate(this._fnGetSchemaId(filePath), data);
 
 						if (!valid) this._handleError({filePath, errors, errorsFull, data});
 					});

package/lib/UtilFs.js

@@ -4,21 +4,23 @@ function isDirectory (path) {
 	return fs.lstatSync(path).isDirectory();
 }
 
-function readJSON (path) {
+function readJSON (path, {isIncludeRaw = false} = {}) {
 	try {
 		if (fs.existsSync(path)) {
 			let str = fs.readFileSync(path, "utf8");
 			// Strip BOM(s)
 			while (str.charCodeAt(0) === 0xFEFF) str = str.slice(1);
-			return JSON.parse(str);
+			const out = JSON.parse(str);
+			if (isIncludeRaw) return {raw: str, json: out};
+			return out;
 		} else {
 			const parts = path.split(/[\\/]+/g);
 			const dir = parts.slice(0, -1).join("/");
 			const originalName = parts[parts.length - 1];
 			const filenames = fs.readdirSync(dir, "utf8");
 			const filename = filenames.find(it => it.toLowerCase() === originalName.toLowerCase());
-			if (filename) return JSON.parse(fs.readFileSync(`${dir}/${filename}`, "utf8"));
-			else throw new Error(`Could not find file "${path}"`);
+			if (!filename) throw new Error(`Could not find file "${path}"`);
+			return readJSON(`${dir}/${filename}`, {isIncludeRaw});
 		}
 	} catch (e) {
 		e.message += ` (Path: ${path})`;
@@ -28,7 +30,7 @@ function readJSON (path) {
 
 function listJsonFiles (dir) {
 	const dirContent = fs.readdirSync(dir, "utf8")
-		.map(file => `${dir}/${file}`);
+		.map(file => dir === "." ? file : `${dir}/${file}`);
 	return dirContent.reduce((acc, file) => {
 		if (isDirectory(file)) acc.push(...listJsonFiles(file));
 		else {
@@ -40,7 +42,7 @@ function listJsonFiles (dir) {
 
 function runOnDirs (fn, root = ".") {
 	fs.readdirSync(root, "utf8")
-		.map(dir => ({dir, dirPath: `${root}/${dir}`}))
+		.map(dir => ({dir, dirPath: root === "." ? dir : `${root}/${dir}`}))
 		.filter(({dir, dirPath}) => isDirectory(dirPath) && !dir.startsWith(".") && !dir.startsWith("_") && dir !== "node_modules")
 		.forEach(({dirPath}) => fn(dirPath));
 }

package/package.json

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