5etools-utils 0.9.66 → 0.10.1

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.66",
+	"version": "0.10.1",
 	"description": "Shared utilities for the 5etools ecosystem.",
 	"type": "module",
 	"main": "lib/Api.js",

package/schema/brew/bestiary/bestiary.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.24",
+	"version": "1.21.25",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -313,6 +313,9 @@
 									"type": "string"
 								}
 							},
+							"required": [
+								"special"
+							],
 							"additionalProperties": false
 						}
 					]
@@ -364,7 +367,8 @@
 							"$ref": "../entry.json"
 						}
 					},
-					"additionalProperties": false
+					"additionalProperties": false,
+					"minProperties": 1
 				},
 				"skill": {
 					"type": "object",
@@ -495,7 +499,8 @@
 							"$ref": "../entry.json"
 						}
 					},
-					"additionalProperties": false
+					"additionalProperties": false,
+					"minProperties": 1
 				},
 				"senses": {
 					"oneOf": [
@@ -503,7 +508,8 @@
 							"type": "array",
 							"items": {
 								"type": "string"
-							}
+							},
+							"minItems": 1
 						},
 						{
 							"type": "null"
@@ -1249,7 +1255,8 @@
 									}
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						}
 					]
 				},
@@ -1473,6 +1480,9 @@
 											"type": "string"
 										}
 									},
+									"required": [
+										"special"
+									],
 									"additionalProperties": false
 								}
 							]
@@ -1524,7 +1534,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"skill": {
 							"type": "object",
@@ -1655,7 +1666,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"senses": {
 							"oneOf": [
@@ -1663,7 +1675,8 @@
 									"type": "array",
 									"items": {
 										"type": "string"
-									}
+									},
+									"minItems": 1
 								},
 								{
 									"type": "null"
@@ -2409,7 +2422,8 @@
 											}
 										}
 									},
-									"additionalProperties": false
+									"additionalProperties": false,
+									"minProperties": 1
 								}
 							]
 						},
@@ -2638,6 +2652,9 @@
 											"type": "string"
 										}
 									},
+									"required": [
+										"special"
+									],
 									"additionalProperties": false
 								}
 							]
@@ -2689,7 +2706,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"skill": {
 							"type": "object",
@@ -2820,7 +2838,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"senses": {
 							"oneOf": [
@@ -2828,7 +2847,8 @@
 									"type": "array",
 									"items": {
 										"type": "string"
-									}
+									},
+									"minItems": 1
 								},
 								{
 									"type": "null"
@@ -3574,7 +3594,8 @@
 											}
 										}
 									},
-									"additionalProperties": false
+									"additionalProperties": false,
+									"minProperties": 1
 								}
 							]
 						},

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.18",
+	"version": "1.5.19",
 	"type": "object",
 	"$defs": {
 		"itemLookupBase": {
@@ -255,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"
@@ -589,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"
@@ -927,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"

package/schema/brew/magicvariants.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.14",
+	"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"
 							},
@@ -451,6 +457,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},
@@ -601,6 +613,12 @@
 							"bolt": {
 								"type": "boolean"
 							},
+							"bulletSling": {
+								"type": "boolean"
+							},
+							"needleBlowgun": {
+								"type": "boolean"
+							},
 							"weaponCategory": {
 								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 							},
@@ -967,6 +985,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},
@@ -1121,6 +1145,12 @@
 							"bolt": {
 								"type": "boolean"
 							},
+							"bulletSling": {
+								"type": "boolean"
+							},
+							"needleBlowgun": {
+								"type": "boolean"
+							},
 							"weaponCategory": {
 								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 							},
@@ -1486,6 +1516,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},

package/schema/brew-fast/bestiary/bestiary.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.24",
+	"version": "1.21.25",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -313,6 +313,9 @@
 									"type": "string"
 								}
 							},
+							"required": [
+								"special"
+							],
 							"additionalProperties": false
 						}
 					]
@@ -364,7 +367,8 @@
 							"$ref": "../entry.json"
 						}
 					},
-					"additionalProperties": false
+					"additionalProperties": false,
+					"minProperties": 1
 				},
 				"skill": {
 					"type": "object",
@@ -495,7 +499,8 @@
 							"$ref": "../entry.json"
 						}
 					},
-					"additionalProperties": false
+					"additionalProperties": false,
+					"minProperties": 1
 				},
 				"senses": {
 					"oneOf": [
@@ -503,7 +508,8 @@
 							"type": "array",
 							"items": {
 								"type": "string"
-							}
+							},
+							"minItems": 1
 						},
 						{
 							"type": "null"
@@ -1249,7 +1255,8 @@
 									}
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						}
 					]
 				},
@@ -1473,6 +1480,9 @@
 											"type": "string"
 										}
 									},
+									"required": [
+										"special"
+									],
 									"additionalProperties": false
 								}
 							]
@@ -1524,7 +1534,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"skill": {
 							"type": "object",
@@ -1655,7 +1666,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"senses": {
 							"oneOf": [
@@ -1663,7 +1675,8 @@
 									"type": "array",
 									"items": {
 										"type": "string"
-									}
+									},
+									"minItems": 1
 								},
 								{
 									"type": "null"
@@ -2409,7 +2422,8 @@
 											}
 										}
 									},
-									"additionalProperties": false
+									"additionalProperties": false,
+									"minProperties": 1
 								}
 							]
 						},
@@ -2638,6 +2652,9 @@
 											"type": "string"
 										}
 									},
+									"required": [
+										"special"
+									],
 									"additionalProperties": false
 								}
 							]
@@ -2689,7 +2706,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"skill": {
 							"type": "object",
@@ -2820,7 +2838,8 @@
 									"$ref": "../entry.json"
 								}
 							},
-							"additionalProperties": false
+							"additionalProperties": false,
+							"minProperties": 1
 						},
 						"senses": {
 							"oneOf": [
@@ -2828,7 +2847,8 @@
 									"type": "array",
 									"items": {
 										"type": "string"
-									}
+									},
+									"minItems": 1
 								},
 								{
 									"type": "null"
@@ -3574,7 +3594,8 @@
 											}
 										}
 									},
-									"additionalProperties": false
+									"additionalProperties": false,
+									"minProperties": 1
 								}
 							]
 						},

package/schema/brew-fast/items-base.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items-base.json",
-	"version": "1.5.18",
+	"version": "1.5.19",
 	"type": "object",
 	"$defs": {
 		"itemLookupBase": {
@@ -255,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"
@@ -589,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"
@@ -927,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"

package/schema/brew-fast/magicvariants.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.14",
+	"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"
 							},
@@ -451,6 +457,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},
@@ -601,6 +613,12 @@
 							"bolt": {
 								"type": "boolean"
 							},
+							"bulletSling": {
+								"type": "boolean"
+							},
+							"needleBlowgun": {
+								"type": "boolean"
+							},
 							"weaponCategory": {
 								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 							},
@@ -967,6 +985,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},
@@ -1121,6 +1145,12 @@
 							"bolt": {
 								"type": "boolean"
 							},
+							"bulletSling": {
+								"type": "boolean"
+							},
+							"needleBlowgun": {
+								"type": "boolean"
+							},
 							"weaponCategory": {
 								"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 							},
@@ -1486,6 +1516,12 @@
 						"bolt": {
 							"type": "boolean"
 						},
+						"bulletSling": {
+							"type": "boolean"
+						},
+						"needleBlowgun": {
+							"type": "boolean"
+						},
 						"weaponCategory": {
 							"$ref": "items-shared.json#/$defs/itemWeaponCategory"
 						},