5etools-utils 0.5.14 → 0.5.16

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.16",
 	"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",

package/schema/brew/bestiary/bestiary.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.9",
+	"version": "1.21.10",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -1099,6 +1099,9 @@
 				"basicRules": {
 					"$ref": "../util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "../util.json#/$defs/legacy"
+				},
 				"summonedBySpell": {
 					"description": "The spell used to summon this creature; specifically for TCE-esque summon spells.",
 					"type": "string"
@@ -2198,6 +2201,9 @@
 						"basicRules": {
 							"$ref": "../util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "../util.json#/$defs/legacy"
+						},
 						"summonedBySpell": {
 							"description": "The spell used to summon this creature; specifically for TCE-esque summon spells.",
 							"type": "string"
@@ -3312,6 +3318,9 @@
 						"basicRules": {
 							"$ref": "../util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "../util.json#/$defs/legacy"
+						},
 						"summonedBySpell": {
 							"description": "The spell used to summon this creature; specifically for TCE-esque summon spells.",
 							"type": "string"

package/schema/brew/books.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "books.json",
-	"version": "1.2.8",
+	"version": "1.2.9",
 	"type": "object",
 	"properties": {
 		"book": {
@@ -24,6 +24,9 @@
 					"source": {
 						"type": "string"
 					},
+					"legacy": {
+						"$ref": "util.json#/$defs/legacy"
+					},
 					"group": {
 						"description": "The group under which this book should be listed in the navbar.",
 						"type": "string",

package/schema/brew/cultsboons.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "cultsboons.json",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"type": "object",
 	"$defs": {
 		"cult": {
@@ -22,6 +22,9 @@
 				"reprintedAs": {
 					"$ref": "util.json#/$defs/reprintedAs"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"type": {
 					"type": "string",
 					"examples": [

package/schema/brew/deities.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "deities.json",
-	"version": "1.2.5",
+	"version": "1.2.6",
 	"type": "object",
 	"$defs": {
 		"deityData": {
@@ -118,6 +118,9 @@
 				"basicRules": {
 					"$ref": "util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"customExtensionOf": {
 					"type": "string",
 					"description": "A UID of an existing deity that this deity extends. e.g. \"Bahgtru|Orc|SCAG\""
@@ -251,6 +254,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"customExtensionOf": {
 							"type": "string",
 							"description": "A UID of an existing deity that this deity extends. e.g. \"Bahgtru|Orc|SCAG\""
@@ -387,6 +393,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"customExtensionOf": {
 							"type": "string",
 							"description": "A UID of an existing deity that this deity extends. e.g. \"Bahgtru|Orc|SCAG\""

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.4",
+	"version": "1.5.5",
 	"$defs": {
 		"itemPropertyLookupArray": {
 			"type": "array",
@@ -312,6 +312,9 @@
 					"basicRules": {
 						"$ref": "util.json#/$defs/basicRules"
 					},
+					"legacy": {
+						"$ref": "util.json#/$defs/legacy"
+					},
 					"otherSources": {
 						"$ref": "util.json#/$defs/otherSources"
 					},

package/schema/brew/items.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "items.json",
-	"version": "1.13.1",
+	"version": "1.13.2",
 	"type": "object",
 	"$defs": {
 		"itemData": {
@@ -423,6 +423,9 @@
 				"basicRules": {
 					"$ref": "util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"packContents": {
 					"type": "array",
 					"items": {
@@ -1016,6 +1019,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"packContents": {
 							"type": "array",
 							"items": {
@@ -1612,6 +1618,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"packContents": {
 							"type": "array",
 							"items": {

package/schema/brew/languages.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "languages.json",
-	"version": "1.1.9",
+	"version": "1.1.10",
 	"type": "object",
 	"$defs": {
 		"language": {
@@ -28,6 +28,9 @@
 				"basicRules": {
 					"$ref": "util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"otherSources": {
 					"$ref": "util.json#/$defs/otherSources"
 				},

package/schema/brew/magicvariants.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "magicvariants.json",
-	"version": "1.8.0",
+	"version": "1.8.1",
 	"type": "object",
 	"properties": {
 		"magicvariant": {
@@ -224,6 +224,9 @@
 							"basicRules": {
 								"$ref": "util.json#/$defs/basicRules"
 							},
+							"legacy": {
+								"$ref": "util.json#/$defs/legacy"
+							},
 							"otherSources": {
 								"$ref": "util.json#/$defs/otherSources"
 							},

package/schema/brew/names.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "names.json",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"title": "NameArray",
 	"type": "object",
 	"$defs": {
@@ -59,6 +59,9 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"tables": {
 					"type": "array",
 					"items": {

package/schema/brew/optionalfeatures.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "optionalfeatures.json",
-	"version": "1.12.0",
+	"version": "1.12.1",
 	"title": "Optional Features",
 	"type": "object",
 	"$defs": {
@@ -55,6 +55,9 @@
 				"srd": {
 					"$ref": "util.json#/$defs/srd"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"isClassFeatureVariant": {
 					"type": "boolean"
 				},

package/schema/brew/races.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "races.json",
-	"version": "1.12.2",
+	"version": "1.12.3",
 	"type": "object",
 	"$defs": {
 		"sharedData": {
@@ -105,6 +105,9 @@
 				"basicRules": {
 					"$ref": "util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"lineage": {
 					"oneOf": [
 						{
@@ -339,6 +342,9 @@
 				"basicRules": {
 					"$ref": "util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"lineage": {
 					"oneOf": [
 						{
@@ -664,6 +670,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"lineage": {
 							"oneOf": [
 								{
@@ -902,6 +911,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"lineage": {
 							"oneOf": [
 								{
@@ -1201,6 +1213,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"lineage": {
 							"oneOf": [
 								{
@@ -1451,6 +1466,9 @@
 						"basicRules": {
 							"$ref": "util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"lineage": {
 							"oneOf": [
 								{

package/schema/brew/rewards.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "rewards.json",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"type": "object",
 	"$defs": {
 		"reward": {
@@ -16,6 +16,9 @@
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"type": {
 					"type": "string",
 					"examples": [

package/schema/brew/spells/spells.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "spells.json",
-	"version": "1.9.3",
+	"version": "1.9.4",
 	"title": "Spells",
 	"type": "object",
 	"$defs": {
@@ -339,6 +339,9 @@
 				"basicRules": {
 					"$ref": "../util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "../util.json#/$defs/legacy"
+				},
 				"scalingLevelDice": {
 					"oneOf": [
 						{
@@ -901,6 +904,9 @@
 						"basicRules": {
 							"$ref": "../util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "../util.json#/$defs/legacy"
+						},
 						"scalingLevelDice": {
 							"oneOf": [
 								{
@@ -1471,6 +1477,9 @@
 						"basicRules": {
 							"$ref": "../util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "../util.json#/$defs/legacy"
+						},
 						"scalingLevelDice": {
 							"oneOf": [
 								{

package/schema/brew/tables.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "tables.json",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"type": "object",
 	"$defs": {
 		"tableData": {
@@ -27,6 +27,9 @@
 				"basicRules": {
 					"$ref": "util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"page": {
 					"$ref": "util.json#/$defs/page"
 				},

package/schema/brew/trapshazards.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "trapshazards.json",
-	"version": "1.3.0",
+	"version": "1.3.1",
 	"type": "object",
 	"$defs": {
 		"trap": {
@@ -36,6 +36,9 @@
 						"srd": {
 							"$ref": "util.json#/$defs/srd"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"foundryImg": {
 							"$ref": "util.json#/$defs/foundryImg"
 						}
@@ -154,6 +157,9 @@
 						"srd": {
 							"$ref": "util.json#/$defs/srd"
 						},
+						"legacy": {
+							"$ref": "util.json#/$defs/legacy"
+						},
 						"foundryImg": {
 							"$ref": "util.json#/$defs/foundryImg"
 						}
@@ -206,6 +212,9 @@
 				"srd": {
 					"$ref": "util.json#/$defs/srd"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"foundrySystem": {
 					"$ref": "util.json#/$defs/foundrySystemObject"
 				},

package/schema/brew/util.json

@@ -3,7 +3,7 @@
 	"$id": "util.json",
 	"title": "Util",
 	"description": "Utility definitions to be used in other schemas.",
-	"version": "1.13.7",
+	"version": "1.13.8",
 	"$defs": {
 		"metaBlock": {
 			"type": "object",
@@ -3237,6 +3237,9 @@
 		"basicRules": {
 			"const": true
 		},
+		"legacy": {
+			"const": true
+		},
 		"fluffObject": {
 			"type": "object",
 			"properties": {

package/schema/brew/variantrules.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "variantrules.json",
-	"version": "1.1.4",
+	"version": "1.1.5",
 	"title": "RulesArray",
 	"type": "object",
 	"properties": {
@@ -53,6 +53,9 @@
 				"srd": {
 					"$ref": "util.json#/$defs/srd"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"additionalSources": {
 					"$ref": "util.json#/$defs/additionalSources"
 				},

package/schema/brew/vehicles.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "vehicles.json",
-	"version": "1.7.0",
+	"version": "1.7.1",
 	"type": "object",
 	"$defs": {
 		"vehicleTerrain": {
@@ -88,6 +88,9 @@
 				"otherSources": {
 					"$ref": "util.json#/$defs/otherSources"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"upgradeType": {
 					"type": "array",
 					"items": {
@@ -125,6 +128,9 @@
 				"otherSources": {
 					"$ref": "util.json#/$defs/otherSources"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"vehicleType": {
 					"const": "SHIP"
 				},
@@ -478,6 +484,9 @@
 				"otherSources": {
 					"$ref": "util.json#/$defs/otherSources"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"vehicleType": {
 					"const": "SPELLJAMMER"
 				},
@@ -651,6 +660,9 @@
 				"otherSources": {
 					"$ref": "util.json#/$defs/otherSources"
 				},
+				"legacy": {
+					"$ref": "util.json#/$defs/legacy"
+				},
 				"vehicleType": {
 					"const": "INFWAR"
 				},

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

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.9",
+	"version": "1.21.10",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -1099,6 +1099,9 @@
 				"basicRules": {
 					"$ref": "../util.json#/$defs/basicRules"
 				},
+				"legacy": {
+					"$ref": "../util.json#/$defs/legacy"
+				},
 				"summonedBySpell": {
 					"description": "The spell used to summon this creature; specifically for TCE-esque summon spells.",
 					"type": "string"
@@ -2198,6 +2201,9 @@
 						"basicRules": {
 							"$ref": "../util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "../util.json#/$defs/legacy"
+						},
 						"summonedBySpell": {
 							"description": "The spell used to summon this creature; specifically for TCE-esque summon spells.",
 							"type": "string"
@@ -3312,6 +3318,9 @@
 						"basicRules": {
 							"$ref": "../util.json#/$defs/basicRules"
 						},
+						"legacy": {
+							"$ref": "../util.json#/$defs/legacy"
+						},
 						"summonedBySpell": {
 							"description": "The spell used to summon this creature; specifically for TCE-esque summon spells.",
 							"type": "string"

package/schema/brew-fast/books.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "books.json",
-	"version": "1.2.8",
+	"version": "1.2.9",
 	"type": "object",
 	"properties": {
 		"book": {
@@ -24,6 +24,9 @@
 					"source": {
 						"type": "string"
 					},
+					"legacy": {
+						"$ref": "util.json#/$defs/legacy"
+					},
 					"group": {
 						"description": "The group under which this book should be listed in the navbar.",
 						"type": "string",