5etools-utils 0.5.14 → 0.5.15

package/lib/TestJson.js

@@ -33,10 +33,10 @@ class JsonTester {
 		if (isBrew && dirSchema) throw new Error(`"isBrew" and "dirSchema" are mutually exclusive!`);
 		if (!fnGetSchemaId) throw new Error(`"fnGetSchemaId" is required!`);
 
-		this._dirSchema = dirSchema ??
-			(isBrew
-				? path.join(__dirname, "..", "schema", "brew")
-				: path.join(__dirname, "..", "schema", "site"));
+		this._dirSchemaSite = path.join(__dirname, "..", "schema", "site");
+		this._dirSchemaBrew = path.join(__dirname, "..", "schema", "brew");
+
+		this._dirSchema = dirSchema ?? (isBrew ? this._dirSchemaBrew : this._dirSchemaSite);
 		this._tagLog = tagLog;
 		this._fnGetSchemaId = fnGetSchemaId;
 
@@ -112,30 +112,40 @@ class JsonTester {
 		return out;
 	}
 
-	_doLoadSchema () {
+	doLoadSchema (type, relativeFilePath) {
+		if (!["site", "brew"].includes(type)) throw new Error(`Unknown schema type "${type}"`);
+
+		const dir = type === "site" ? this._dirSchemaSite : this._dirSchemaBrew;
+
+		this._ajv.addSchema(
+			Uf.readJSON(path.join(dir, relativeFilePath)),
+			relativeFilePath,
+		);
+	}
+
+	_doLoadSchemas () {
 		if (this._isSchemaLoaded) return;
 
 		Uf.listJsonFiles(this._dirSchema)
 			.forEach(filePath => {
 				filePath = path.normalize(filePath);
-				const contents = Uf.readJSON(filePath);
 
 				const relativeFilePath = path.relative(this._dirSchema, filePath)
 					.replace(/\\/g, "/");
 
-				this._ajv.addSchema(contents, relativeFilePath);
+				this._ajv.addSchema(Uf.readJSON(filePath), relativeFilePath);
 			});
 
 		this._isSchemaLoaded = true;
 	}
 
 	_hasSchema (schemaId) {
-		this._doLoadSchema();
+		this._doLoadSchemas();
 		return !!this._ajv.schemas[schemaId];
 	}
 
 	getFileErrors ({filePath} = {}) {
-		this._doLoadSchema();
+		this._doLoadSchemas();
 
 		Um.info(this._tagLog, `\tValidating "${filePath}"...`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "5etools-utils",
-	"version": "0.5.14",
+	"version": "0.5.15",
 	"description": "Shared utilities for the 5etools ecosystem.",
 	"type": "module",
 	"main": "lib/Api.js",
@@ -15,7 +15,8 @@
 		"build": "node node/compile-schemas.js",
 		"test": "npm run lint:js && npm run test:js",
 		"test:js": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-		"lint:js": "eslint lib node test --fix"
+		"lint:js": "eslint lib node test --fix",
+		"preversion": "npm t"
 	},
 	"repository": {
 		"type": "git",