5etools-utils 0.14.0 → 0.14.2

package/lib/TestData.js

@@ -4,12 +4,12 @@ import {ObjectWalker} from "./ObjectWalker.js";
 
 /** Runs multiple handlers on each file, to avoid re-reading each file for each handler */
 class _ParsedJsonChecker {
-	static _CLAZZES_FILE_HANDLER = [];
+	static _FILE_HANDLERS = [];
 
 	static _PRIMITIVE_HANDLERS = {};
 
-	static registerFileHandler (Clazz) {
-		_ParsedJsonChecker._CLAZZES_FILE_HANDLER.push(Clazz);
+	static registerFileHandler (fileHandler) {
+		this._FILE_HANDLERS.push(fileHandler);
 	}
 
 	static addPrimitiveHandler (primitiveType, handler) {
@@ -19,20 +19,22 @@ class _ParsedJsonChecker {
 
 	/* -------------------------------------------- */
 
-	static run (filePath, {fnIsIgnoredFile, fnIsIgnoredDirectory} = {}) {
-		this._fileRecurse({
+	static async pRun (filePath, {fnIsIgnoredFile, fnIsIgnoredDirectory} = {}) {
+		await this._pFileRecurse({
 			filePath,
 			fnIsIgnoredFile,
 			fnIsIgnoredDirectory,
 		});
 	}
 
-	static _fileRecurse ({filePath, fnIsIgnoredFile, fnIsIgnoredDirectory}) {
+	static async _pFileRecurse ({filePath, fnIsIgnoredFile, fnIsIgnoredDirectory}) {
 		if (fs.lstatSync(filePath).isDirectory()) {
 			if (fnIsIgnoredDirectory && fnIsIgnoredDirectory(filePath)) return;
 
-			return fs.readdirSync(filePath)
-				.forEach(nxt => this._fileRecurse({filePath: `${filePath}/${nxt}`, fnIsIgnoredFile, fnIsIgnoredDirectory}));
+			for (const nxt of fs.readdirSync(filePath)) {
+				await this._pFileRecurse({filePath: `${filePath}/${nxt}`, fnIsIgnoredFile, fnIsIgnoredDirectory});
+			}
+			return;
 		}
 
 		if (!filePath.endsWith(".json") || (fnIsIgnoredFile && fnIsIgnoredFile(filePath))) return;
@@ -45,8 +47,11 @@ class _ParsedJsonChecker {
 			primitiveHandlers: this._PRIMITIVE_HANDLERS,
 		});
 
-		this._CLAZZES_FILE_HANDLER.forEach(dataTester => dataTester.handleFile(filePath, contents));
-		this._CLAZZES_FILE_HANDLER.forEach(dataTester => dataTester.addMessageBoundary());
+		for (const dataTester of this._FILE_HANDLERS) {
+			dataTester.handleFile(filePath, contents);
+			await dataTester.pHandleFile(filePath, contents);
+			dataTester.addMessageBoundary();
+		}
 	}
 }
 
@@ -81,6 +86,8 @@ class DataTesterBase {
 	/* -------------------------------------------- */
 
 	handleFile (filePath, contents) { /* Implement as required */ }
+
+	async pHandleFile (filePath, contents) { /* Implement as required */ }
 }
 
 class BraceCheck extends DataTesterBase {
@@ -162,7 +169,7 @@ class DataTester {
 			fnIsIgnoredDirectory,
 		} = {},
 	) {
-		_ParsedJsonChecker.run(filePath, {fnIsIgnoredFile, fnIsIgnoredDirectory});
+		await _ParsedJsonChecker.pRun(filePath, {fnIsIgnoredFile, fnIsIgnoredDirectory});
 
 		for (const dataTester of dataTesters) {
 			await dataTester.pRun();

package/package.json

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

package/schema/brew/actions.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "actions.json",
-	"version": "1.2.7",
+	"version": "1.2.8",
 	"type": "object",
 	"$defs": {
 		"action": {
@@ -84,6 +84,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}

package/schema/brew/backgrounds.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "backgrounds.json",
-	"version": "1.3.12",
+	"version": "1.3.13",
 	"type": "object",
 	"$defs": {
 		"backgroundData": {
@@ -119,6 +119,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"foundryAdvancement": {
 					"$ref": "util-foundry.json#/$defs/foundryAdvancementsArray"
 				},
@@ -245,6 +248,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"foundryAdvancement": {
 							"$ref": "util-foundry.json#/$defs/foundryAdvancementsArray"
 						},
@@ -374,6 +380,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"foundryAdvancement": {
 							"$ref": "util-foundry.json#/$defs/foundryAdvancementsArray"
 						},

package/schema/brew/bestiary/bestiary.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.52",
+	"version": "1.21.53",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -1426,6 +1426,9 @@
 				"foundryImg": {
 					"$ref": "../util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "../entry.json"
+				},
 				"foundryPrototypeToken": {
 					"$ref": "../util-foundry.json#/$defs/foundryPrototypeTokenObject"
 				},
@@ -2758,6 +2761,9 @@
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
+						},
 						"foundryPrototypeToken": {
 							"$ref": "../util-foundry.json#/$defs/foundryPrototypeTokenObject"
 						},
@@ -4095,6 +4101,9 @@
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
+						},
 						"foundryPrototypeToken": {
 							"$ref": "../util-foundry.json#/$defs/foundryPrototypeTokenObject"
 						},

package/schema/brew/charcreationoptions.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "charcreationoptions.json",
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"title": "Character Creation Options",
 	"type": "object",
 	"$defs": {
@@ -74,6 +74,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}

package/schema/brew/class/class.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "2.12.10",
+	"version": "2.12.11",
 	"$id": "class.json",
 	"type": "object",
 	"$defs": {
@@ -253,6 +253,9 @@
 				"foundryImg": {
 					"$ref": "../util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "../entry.json"
+				},
 				"languageProficiencies": {
 					"$ref": "../util.json#/$defs/languageProficiencies"
 				},
@@ -366,6 +369,9 @@
 				"foundryImg": {
 					"$ref": "../util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "../entry.json"
+				},
 				"languageProficiencies": {
 					"$ref": "../util.json#/$defs/languageProficiencies"
 				},
@@ -473,6 +479,9 @@
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
+						},
 						"languageProficiencies": {
 							"$ref": "../util.json#/$defs/languageProficiencies"
 						},
@@ -588,6 +597,9 @@
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
+						},
 						"languageProficiencies": {
 							"$ref": "../util.json#/$defs/languageProficiencies"
 						},
@@ -924,6 +936,9 @@
 						},
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
+						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
 						}
 					},
 					"additionalProperties": false,
@@ -1133,6 +1148,9 @@
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
+						},
 						"_copy": {
 							"$ref": "../util-copy.json#/$defs/copyBlock_copy_generic"
 						}
@@ -1340,6 +1358,9 @@
 				},
 				"foundryImg": {
 					"$ref": "../util-foundry.json#/$defs/foundryImg"
+				},
+				"foundryAdvice": {
+					"$ref": "../entry.json"
 				}
 			},
 			"additionalProperties": false
@@ -1722,6 +1743,9 @@
 						},
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
+						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
 						}
 					},
 					"additionalProperties": false,
@@ -2025,6 +2049,9 @@
 						"foundryImg": {
 							"$ref": "../util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "../entry.json"
+						},
 						"_copy": {
 							"$ref": "../util-copy.json#/$defs/copyBlock_copy_generic"
 						}
@@ -2329,6 +2356,9 @@
 				},
 				"foundryImg": {
 					"$ref": "../util-foundry.json#/$defs/foundryImg"
+				},
+				"foundryAdvice": {
+					"$ref": "../entry.json"
 				}
 			},
 			"additionalProperties": false,

package/schema/brew/conditionsdiseases.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "conditionsdiseases.json",
-	"version": "1.2.10",
+	"version": "1.2.11",
 	"type": "object",
 	"$defs": {
 		"_conditionDiseaseBase": {
@@ -63,6 +63,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
@@ -139,6 +142,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},

package/schema/brew/cultsboons.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "cultsboons.json",
-	"version": "1.2.1",
+	"version": "1.2.2",
 	"type": "object",
 	"$defs": {
 		"cult": {
@@ -91,6 +91,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
@@ -172,6 +175,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}

package/schema/brew/deities.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "deities.json",
-	"version": "1.2.13",
+	"version": "1.2.14",
 	"type": "object",
 	"$defs": {
 		"deityData": {
@@ -171,6 +171,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
 				}
 			},
 			"additionalProperties": false
@@ -344,6 +347,9 @@
 						},
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
+						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
 						}
 					},
 					"additionalProperties": false,
@@ -521,6 +527,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_copy": {
 							"$ref": "util-copy.json#/$defs/copyBlock_copy_generic"
 						}

package/schema/brew/feats.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "feats.json",
-	"version": "1.7.12",
+	"version": "1.7.13",
 	"type": "object",
 	"$defs": {
 		"featData": {
@@ -147,6 +147,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
@@ -298,6 +301,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_foundryMerge": {
 							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						}
@@ -452,6 +458,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_foundryMerge": {
 							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},

package/schema/brew/items-base.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.6.15",
+	"version": "1.6.16",
 	"type": "object",
 	"$defs": {
 		"itemLookupBase": {
@@ -467,6 +467,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
@@ -848,6 +851,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_foundryMerge": {
 							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},
@@ -1233,6 +1239,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_foundryMerge": {
 							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},

package/schema/brew/items.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.26",
+	"version": "1.14.27",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -521,6 +521,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
@@ -1055,6 +1058,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
@@ -1591,6 +1597,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_foundryMerge": {
 							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},
@@ -2125,6 +2134,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
@@ -2666,6 +2678,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_foundryMerge": {
 							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},
@@ -3204,6 +3219,9 @@
 						"foundryImg": {
 							"$ref": "util-foundry.json#/$defs/foundryImg"
 						},
+						"foundryAdvice": {
+							"$ref": "entry.json"
+						},
 						"_foundryMerge": {
 							"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 						},

package/schema/brew/languages.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "languages.json",
-	"version": "1.1.15",
+	"version": "1.1.16",
 	"type": "object",
 	"$defs": {
 		"language": {
@@ -79,6 +79,9 @@
 				},
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
+				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
 				}
 			},
 			"required": [

package/schema/brew/magicvariants.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.9.16",
+	"version": "1.9.17",
 	"type": "object",
 	"$defs": {
 		"_magicvariantDataBase": {
@@ -613,6 +613,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
@@ -1231,6 +1234,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
@@ -1853,6 +1859,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				}
@@ -2476,6 +2485,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
@@ -3100,6 +3112,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},
@@ -3725,6 +3740,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"_foundryMerge": {
 					"$ref": "util-foundry.json#/$defs/foundryMergeObject"
 				},

package/schema/brew/objects.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "objects.json",
-	"version": "1.3.10",
+	"version": "1.3.11",
 	"type": "object",
 	"$defs": {
 		"object": {
@@ -162,6 +162,9 @@
 				"foundryImg": {
 					"$ref": "util-foundry.json#/$defs/foundryImg"
 				},
+				"foundryAdvice": {
+					"$ref": "entry.json"
+				},
 				"tokenUrl": {
 					"$ref": "util-token.json#/$defs/tokenUrl"
 				},