5etools-utils 0.9.0 → 0.9.2

package/lib/BrewTester.js

@@ -95,7 +95,7 @@ class _BrewTesterFileExtensions {
 }
 
 class BrewTester {
-	static async pTestJson (args) { return _BrewTesterJson.pRun(args); }
+	static async pTestJson (args, opts) { return _BrewTesterJson.pRun(args, opts); }
 	static testFileLocations () { return _BrewTesterFileLocations.run(); }
 	static testFileExtensions () { return _BrewTesterFileExtensions.run(); }
 }

package/lib/TestJson.js

@@ -36,6 +36,8 @@ class JsonTester {
 			tagLog = LOG_TAG,
 		},
 	) {
+		this._tagLog = tagLog;
+
 		if (mode && dirSchema) throw new Error(`"mode" and "dirSchema" are mutually exclusive!`);
 		if (mode != null && !Object.values(MODES).includes(mode)) throw new Error(`"mode" must be one of ${Object.values(MODES).join("/")}!`);
 		if (!fnGetSchemaId) throw new Error(`"fnGetSchemaId" is required!`);
@@ -44,8 +46,8 @@ class JsonTester {
 		this._dirSchemaBrew = path.join(__dirname, "..", "schema", "brew");
 		this._dirSchemaUa = path.join(__dirname, "..", "schema", "ua");
 
-		this._dirSchema = dirSchema ?? (mode === "site" ? this._dirSchemaSite : mode === "brew" ? this._dirSchemaBrew : this._dirSchemaSite);
-		this._tagLog = tagLog;
+		this._dirSchema = dirSchema ?? (mode === "site" ? this._dirSchemaSite : mode === "brew" ? this._dirSchemaBrew : this._dirSchemaUa);
+
 		this._fnGetSchemaId = fnGetSchemaId;
 
 		// region Set up validator
@@ -211,7 +213,7 @@ class JsonTester {
 	}
 
 	async pGetErrorsOnDirsWorkers ({isFailFast = false, fileList = null} = {}) {
-		Um.info(this._tagLog, `Validating JSON against schema`);
+		Um.info(this._tagLog, `Validating JSON against schemas in dir: ${this._dirSchema}`);
 
 		const cntWorkers = Math.max(1, os.cpus().length - 1);
 

package/package.json

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

package/schema/brew/backgrounds.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "backgrounds.json",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"type": "object",
 	"$defs": {
 		"backgroundData": {
@@ -74,6 +74,10 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"fluff": {
+					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+					"$ref": "util.json#/$defs/fluffObject"
+				},
 				"expertise": {
 					"$ref": "util.json#/$defs/expertise"
 				},
@@ -95,10 +99,6 @@
 				"conditionImmune": {
 					"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 				},
-				"fluff": {
-					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-					"$ref": "util.json#/$defs/fluffObject"
-				},
 				"foundrySystem": {
 					"$ref": "util.json#/$defs/foundrySystemObject"
 				},
@@ -189,6 +189,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"fluff": {
+							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+							"$ref": "util.json#/$defs/fluffObject"
+						},
 						"expertise": {
 							"$ref": "util.json#/$defs/expertise"
 						},
@@ -210,10 +214,6 @@
 						"conditionImmune": {
 							"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 						},
-						"fluff": {
-							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-							"$ref": "util.json#/$defs/fluffObject"
-						},
 						"foundrySystem": {
 							"$ref": "util.json#/$defs/foundrySystemObject"
 						},
@@ -307,6 +307,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"fluff": {
+							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+							"$ref": "util.json#/$defs/fluffObject"
+						},
 						"expertise": {
 							"$ref": "util.json#/$defs/expertise"
 						},
@@ -328,10 +332,6 @@
 						"conditionImmune": {
 							"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 						},
-						"fluff": {
-							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-							"$ref": "util.json#/$defs/fluffObject"
-						},
 						"foundrySystem": {
 							"$ref": "util.json#/$defs/foundrySystemObject"
 						},