5etools-utils 0.9.65 → 0.10.0

package/lib/TestJson.js

@@ -90,21 +90,6 @@ class JsonTester {
 		this._isSchemaLoaded = false;
 	}
 
-	/**
-	 * Add any implicit data to the JSON
-	 */
-	_addImplicits (obj, lastKey) {
-		if (typeof obj !== "object") return;
-		if (obj == null) return;
-		if (obj instanceof Array) obj.forEach(it => this._addImplicits(it, lastKey));
-		else {
-			// "obj.mode" will be set if this is in a "_copy" etc. block
-			if (lastKey === "spellcasting" && !obj.mode) obj.type = obj.type || "spellcasting";
-
-			Object.entries(obj).forEach(([k, v]) => this._addImplicits(v, k));
-		}
-	}
-
 	_getFileErrors ({filePath}) { return `${filePath}\n${JSON.stringify(this._ajv.errors, null, 2)}`; }
 
 	_getErrors ({filePath, data}) {
@@ -183,7 +168,6 @@ class JsonTester {
 		Um.info(this._tagLog, `\tValidating "${filePath}"...`);
 
 		const data = Uf.readJsonSync(filePath);
-		this._addImplicits(data);
 
 		const isValid = this._ajv.validate(this._fnGetSchemaId(filePath), data);
 		if (isValid) return {errors: [], errorsFull: []};

package/package.json

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

package/schema/brew/decks.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "decks.json",
-	"version": "1.0.4",
+	"version": "1.0.3",
 	"type": "object",
 	"$defs": {
 		"deckData": {
@@ -65,9 +65,6 @@
 				"back": {
 					"$ref": "entry.json#/$defs/entryImage"
 				},
-				"creditBack": {
-					"type": "string"
-				},
 				"hasCardArt": {
 					"description": "A hint used by filters, determining whether or not this deck should be filtered out by default.",
 					"type": "boolean"
@@ -138,9 +135,6 @@
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"hasCardArt": {
 							"description": "A hint used by filters, determining whether or not this deck should be filtered out by default.",
 							"type": "boolean"
@@ -214,9 +208,6 @@
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"hasCardArt": {
 							"description": "A hint used by filters, determining whether or not this deck should be filtered out by default.",
 							"type": "boolean"
@@ -265,15 +256,9 @@
 				"face": {
 					"$ref": "entry.json#/$defs/entryImage"
 				},
-				"creditFace": {
-					"type": "string"
-				},
 				"back": {
 					"$ref": "entry.json#/$defs/entryImage"
 				},
-				"creditBack": {
-					"type": "string"
-				},
 				"suit": {
 					"type": "string"
 				},
@@ -321,15 +306,9 @@
 						"face": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditFace": {
-							"type": "string"
-						},
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"suit": {
 							"type": "string"
 						},
@@ -380,15 +359,9 @@
 						"face": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditFace": {
-							"type": "string"
-						},
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"suit": {
 							"type": "string"
 						},

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.5.17",
+	"version": "1.5.19",
 	"type": "object",
 	"$defs": {
 		"itemLookupBase": {
@@ -196,6 +196,9 @@
 				"strength": {
 					"type": "string"
 				},
+				"dexterityMax": {
+					"$ref": "items-shared.json#/$defs/itemDexterityMax"
+				},
 				"armor": {
 					"description": "Flag used when merging generic variants",
 					"type": "boolean"
@@ -252,6 +255,14 @@
 					"description": "Flag used when merging generic variants",
 					"type": "boolean"
 				},
+				"bulletSling": {
+					"description": "Flag used when merging generic variants",
+					"type": "boolean"
+				},
+				"needleBlowgun": {
+					"description": "Flag used when merging generic variants",
+					"type": "boolean"
+				},
 				"weapon": {
 					"description": "Flag used when merging generic variants",
 					"type": "boolean"
@@ -377,6 +388,9 @@
 				"customProperties": {
 					"$ref": "items-shared.json#/$defs/customProperties"
 				},
+				"acSpecial": {
+					"$ref": "items-shared.json#/$defs/itemAcSpecial"
+				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
 					"type": "string"
@@ -524,6 +538,9 @@
 						"strength": {
 							"type": "string"
 						},
+						"dexterityMax": {
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
+						},
 						"armor": {
 							"description": "Flag used when merging generic variants",
 							"type": "boolean"
@@ -580,6 +597,14 @@
 							"description": "Flag used when merging generic variants",
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"description": "Flag used when merging generic variants",
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"description": "Flag used when merging generic variants",
+							"type": "boolean"
+						},
 						"weapon": {
 							"description": "Flag used when merging generic variants",
 							"type": "boolean"
@@ -705,6 +730,9 @@
 						"customProperties": {
 							"$ref": "items-shared.json#/$defs/customProperties"
 						},
+						"acSpecial": {
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -856,6 +884,9 @@
 						"strength": {
 							"type": "string"
 						},
+						"dexterityMax": {
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
+						},
 						"armor": {
 							"description": "Flag used when merging generic variants",
 							"type": "boolean"
@@ -912,6 +943,14 @@
 							"description": "Flag used when merging generic variants",
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"description": "Flag used when merging generic variants",
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"description": "Flag used when merging generic variants",
+							"type": "boolean"
+						},
 						"weapon": {
 							"description": "Flag used when merging generic variants",
 							"type": "boolean"
@@ -1037,6 +1076,9 @@
 						"customProperties": {
 							"$ref": "items-shared.json#/$defs/customProperties"
 						},
+						"acSpecial": {
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"

package/schema/brew/items-shared.json

@@ -281,6 +281,13 @@
 		"itemReach": {
 			"type": "integer"
 		},
+		"itemDexterityMax": {
+			"description": "Maximum dexterity modifier for medium armor.",
+			"type": [
+				"integer",
+				"null"
+			]
+		},
 		"customProperties": {
 			"description": "An unrestricted area for custom properties to be stored.",
 			"type": "object",
@@ -293,6 +300,10 @@
 				]
 			}
 		},
+		"itemAcSpecial": {
+			"description": "Free text field for homebrew use.",
+			"type": "string"
+		},
 		"fluff": {
 			"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source.",
 			"anyOf": [

package/schema/brew/items.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.14.7",
+	"version": "1.14.8",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -125,11 +125,7 @@
 					]
 				},
 				"dexterityMax": {
-					"description": "Maximum dexterity modifier for medium armor.",
-					"type": [
-						"integer",
-						"null"
-					]
+					"$ref": "items-shared.json#/$defs/itemDexterityMax"
 				},
 				"firearm": {
 					"type": "boolean"
@@ -547,8 +543,7 @@
 					"$ref": "items-shared.json#/$defs/customProperties"
 				},
 				"acSpecial": {
-					"description": "Free text field for homebrew use.",
-					"type": "string"
+					"$ref": "items-shared.json#/$defs/itemAcSpecial"
 				},
 				"currencyConversion": {
 					"description": "ID of a value conversion table. Homebrew only.",
@@ -722,11 +717,7 @@
 							]
 						},
 						"dexterityMax": {
-							"description": "Maximum dexterity modifier for medium armor.",
-							"type": [
-								"integer",
-								"null"
-							]
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
 						},
 						"firearm": {
 							"type": "boolean"
@@ -1144,8 +1135,7 @@
 							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
-							"description": "Free text field for homebrew use.",
-							"type": "string"
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
@@ -1314,11 +1304,7 @@
 							]
 						},
 						"dexterityMax": {
-							"description": "Maximum dexterity modifier for medium armor.",
-							"type": [
-								"integer",
-								"null"
-							]
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
 						},
 						"firearm": {
 							"type": "boolean"
@@ -1736,8 +1722,7 @@
 							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
-							"description": "Free text field for homebrew use.",
-							"type": "string"
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
@@ -1911,11 +1896,7 @@
 							]
 						},
 						"dexterityMax": {
-							"description": "Maximum dexterity modifier for medium armor.",
-							"type": [
-								"integer",
-								"null"
-							]
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
 						},
 						"firearm": {
 							"type": "boolean"
@@ -2333,8 +2314,7 @@
 							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
-							"description": "Free text field for homebrew use.",
-							"type": "string"
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
@@ -2507,11 +2487,7 @@
 							]
 						},
 						"dexterityMax": {
-							"description": "Maximum dexterity modifier for medium armor.",
-							"type": [
-								"integer",
-								"null"
-							]
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
 						},
 						"firearm": {
 							"type": "boolean"
@@ -2929,8 +2905,7 @@
 							"$ref": "items-shared.json#/$defs/customProperties"
 						},
 						"acSpecial": {
-							"description": "Free text field for homebrew use.",
-							"type": "string"
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
 						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",

package/schema/brew/magicvariants.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.13",
+	"version": "1.8.15",
 	"type": "object",
 	"$defs": {
 		"_magicvariantItemBase": {
@@ -90,6 +90,12 @@
 							"bolt": {
 								"type": "boolean"
 							},
+							"bulletSling": {
+								"type": "boolean"
+							},
+							"needleBlowgun": {
+								"type": "boolean"
+							},
 							"weaponCategory": {
 								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 							},
@@ -243,6 +249,9 @@
 								"null"
 							]
 						},
+						"dexterityMax": {
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
+						},
 						"wondrous": {
 							"type": "boolean"
 						},
@@ -343,6 +352,9 @@
 							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
+						"acSpecial": {
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -445,6 +457,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},
@@ -595,6 +613,12 @@
 							"bolt": {
 								"type": "boolean"
 							},
+							"bulletSling": {
+								"type": "boolean"
+							},
+							"needleBlowgun": {
+								"type": "boolean"
+							},
 							"weaponCategory": {
 								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 							},
@@ -748,6 +772,9 @@
 								"null"
 							]
 						},
+						"dexterityMax": {
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
+						},
 						"wondrous": {
 							"type": "boolean"
 						},
@@ -848,6 +875,9 @@
 							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
+						"acSpecial": {
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -955,6 +985,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},
@@ -1109,6 +1145,12 @@
 							"bolt": {
 								"type": "boolean"
 							},
+							"bulletSling": {
+								"type": "boolean"
+							},
+							"needleBlowgun": {
+								"type": "boolean"
+							},
 							"weaponCategory": {
 								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 							},
@@ -1262,6 +1304,9 @@
 								"null"
 							]
 						},
+						"dexterityMax": {
+							"$ref": "items-shared.json#/$defs/itemDexterityMax"
+						},
 						"wondrous": {
 							"type": "boolean"
 						},
@@ -1362,6 +1407,9 @@
 							"description": "An unrestricted area for custom properties to be stored.",
 							"type": "object"
 						},
+						"acSpecial": {
+							"$ref": "items-shared.json#/$defs/itemAcSpecial"
+						},
 						"currencyConversion": {
 							"description": "ID of a value conversion table. Homebrew only.",
 							"type": "string"
@@ -1468,6 +1516,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},

package/schema/brew-fast/decks.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "decks.json",
-	"version": "1.0.4",
+	"version": "1.0.3",
 	"type": "object",
 	"$defs": {
 		"deckData": {
@@ -65,9 +65,6 @@
 				"back": {
 					"$ref": "entry.json#/$defs/entryImage"
 				},
-				"creditBack": {
-					"type": "string"
-				},
 				"hasCardArt": {
 					"description": "A hint used by filters, determining whether or not this deck should be filtered out by default.",
 					"type": "boolean"
@@ -138,9 +135,6 @@
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"hasCardArt": {
 							"description": "A hint used by filters, determining whether or not this deck should be filtered out by default.",
 							"type": "boolean"
@@ -214,9 +208,6 @@
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"hasCardArt": {
 							"description": "A hint used by filters, determining whether or not this deck should be filtered out by default.",
 							"type": "boolean"
@@ -265,15 +256,9 @@
 				"face": {
 					"$ref": "entry.json#/$defs/entryImage"
 				},
-				"creditFace": {
-					"type": "string"
-				},
 				"back": {
 					"$ref": "entry.json#/$defs/entryImage"
 				},
-				"creditBack": {
-					"type": "string"
-				},
 				"suit": {
 					"type": "string"
 				},
@@ -321,15 +306,9 @@
 						"face": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditFace": {
-							"type": "string"
-						},
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"suit": {
 							"type": "string"
 						},
@@ -380,15 +359,9 @@
 						"face": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditFace": {
-							"type": "string"
-						},
 						"back": {
 							"$ref": "entry.json#/$defs/entryImage"
 						},
-						"creditBack": {
-							"type": "string"
-						},
 						"suit": {
 							"type": "string"
 						},