5etools-utils 0.17.11 → 0.17.13

package/lib/BrewCleaner.js

@@ -98,8 +98,8 @@ class _BrewFileTester {
 	static _testFile_publicationTuples ({ALL_ERRORS, file, contents}) {
 		this._PROP_PUBLICATION_PAIRS
 			.forEach(({propContents, propData}) => {
-				const idsContents = new Set((contents[propContents] || []).map(it => it.id));
-				const idsData = new Set((contents[propData] || []).map(it => it.id));
+				const idsContents = new Set((contents[propContents] || []).map(corpusContents => corpusContents.id));
+				const idsData = new Set((contents[propData] || []).map(corpusData => corpusData.id));
 
 				const idsCombined = new Set([...idsContents, ...idsData]);
 				const duplicateCorpusIds = [...idsCombined].filter(src => this._ALL_CORPUS_IDS_LOWER.has(src.toLowerCase()));

package/package.json

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

package/schema/brew/adventure/adventure.json

@@ -1,12 +1,15 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "adventure.json",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"type": "object",
 	"properties": {
-		"data": {
-			"$ref": "../util.json#/$defs/adventureBookData"
+		"adventureData": {
+			"$ref": "../corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		}
 	},
+	"required": [
+		"adventureData"
+	],
 	"additionalProperties": false
 }

package/schema/brew/book/book.json

@@ -1,12 +1,15 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "book.json",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"type": "object",
 	"properties": {
-		"data": {
-			"$ref": "../util.json#/$defs/adventureBookData"
+		"bookData": {
+			"$ref": "../corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		}
 	},
+	"required": [
+		"bookData"
+	],
 	"additionalProperties": false
 }

package/schema/brew/corpus-shared.json

@@ -1,8 +1,33 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "corpus-shared.json",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
+		"wrappedAdventureBookDataArray": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"$ref": "util.json#/$defs/corpusId"
+					},
+					"source": {
+						"$ref": "util.json#/$defs/source"
+					},
+					"data": {
+						"$ref": "util.json#/$defs/adventureBookData"
+					}
+				},
+				"required": [
+					"id",
+					"source",
+					"data"
+				],
+				"additionalProperties": false
+			},
+			"minItems": 1,
+			"uniqueItems": true
+		},
 		"corpusCover": {
 			"description": "A link to an image. Preferred sizes are 300 x 300px or 600 x 600px.",
 			"$ref": "entry.json#/$defs/mediaHref",

package/schema/brew/homebrew.json

@@ -1,34 +1,9 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"description": "Homebrew for 5etools. Should include arrays titled similarly to the main site data, e.g. `spell` or `class`",
 	"$defs": {
-		"wrappedAdventureBookDataArray": {
-			"type": "array",
-			"items": {
-				"type": "object",
-				"properties": {
-					"id": {
-						"$ref": "util.json#/$defs/corpusId"
-					},
-					"source": {
-						"$ref": "util.json#/$defs/source"
-					},
-					"data": {
-						"$ref": "util.json#/$defs/adventureBookData"
-					}
-				},
-				"required": [
-					"id",
-					"source",
-					"data"
-				],
-				"additionalProperties": false
-			},
-			"minItems": 1,
-			"uniqueItems": true
-		},
 		"_meta": {
 			"description": "Metadata for the included data arrays",
 			"type": "object",
@@ -296,22 +271,7 @@
 					"markdownDescription": "A file hash used to automatically update the value of "dateLastModified". Should not be manually created/edited."
 				},
 				"dependencies": {
-					"description": "A map of `\"<data property>\": [\"<JsonSource1>\", ..., \"<JsonSourceN>\"]`. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of \"<classIdentifier1>\", ..., \"<classIdentifierN>\" items, where \"classIdentifierN\" matches the keys in \"5etools/data/class/index.json\" (when copying class/etc. homebrew, normal \"source\"-based linking applies).",
-					"type": "object",
-					"patternProperties": {
-						"^[a-zA-Z]+$": {
-							"type": "array",
-							"items": {
-								"type": "string"
-							},
-							"minItems": 1,
-							"uniqueItems": true
-						}
-					},
-					"propertyNames": {
-						"$ref": "util-copy.json#/$defs/copyableProps"
-					},
-					"markdownDescription": "A map of &quot;&lt;data property&gt;&quot;: [&quot;&lt;JsonSource1&gt;&quot;, ..., &quot;&lt;JsonSourceN&gt;&quot;]. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of &quot;&lt;classIdentifier1&gt;&quot;, ..., &quot;&lt;classIdentifierN&gt;&quot; items, where &quot;classIdentifierN&quot; matches the keys in &quot;5etools/data/class/index.json&quot; (when copying class/etc. homebrew, normal &quot;source&quot;-based linking applies)."
+					"$ref": "util-meta.json#/$defs/dependencies"
 				},
 				"includes": {
 					"description": "Structure as per \"dependencies\". Additional sources to be included when loading the file.",
@@ -332,14 +292,7 @@
 					"markdownDescription": "Structure as per &quot;dependencies&quot;. Additional sources to be included when loading the file."
 				},
 				"internalCopies": {
-					"description": "An array of keys that are copied from within the current document. e.g. \"item\", \"monsterFluff\", \"background\" etc.",
-					"type": "array",
-					"items": {
-						"$ref": "util-copy.json#/$defs/copyableProps"
-					},
-					"minItems": 1,
-					"uniqueItems": true,
-					"markdownDescription": "An array of keys that are copied from within the current document. e.g. &quot;item&quot;, &quot;monsterFluff&quot;, &quot;background&quot; etc."
+					"$ref": "util-meta.json#/$defs/internalCopies"
 				},
 				"fonts": {
 					"description": "A map of \"font family\" to font URL.",
@@ -554,7 +507,7 @@
 			"$ref": "adventures.json#/properties/adventure"
 		},
 		"adventureData": {
-			"$ref": "#/$defs/wrappedAdventureBookDataArray"
+			"$ref": "corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		},
 		"monster": {
 			"$ref": "bestiary/bestiary.json#/properties/monster"
@@ -590,7 +543,7 @@
 			"$ref": "books.json#/properties/book"
 		},
 		"bookData": {
-			"$ref": "#/$defs/wrappedAdventureBookDataArray"
+			"$ref": "corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		},
 		"class": {
 			"$ref": "class/class.json#/properties/class"

package/schema/brew/util-copy.json

@@ -2,7 +2,7 @@
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "util-copy.json",
 	"title": "Util: Copy",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"$defs": {
 		"_mod_renameArr_rename": {
 			"type": "object",
@@ -1157,6 +1157,7 @@
 			"enum": [
 				"monster",
 				"monsterFluff",
+				"monsterTemplate",
 				"legendaryGroup",
 				"class",
 				"classFluff",
@@ -1198,6 +1199,7 @@
 				"optionalfeatureFluff",
 				"psionic",
 				"race",
+				"raceFeature",
 				"subrace",
 				"raceFluff",
 				"reward",

package/schema/brew/util-meta.json

@@ -0,0 +1,36 @@
+{
+	"$schema": "https://json-schema.org/draft/2020-12/schema",
+	"$id": "util-meta.json",
+	"version": "1.0.0",
+	"title": "Util: Meta",
+	"$defs": {
+		"dependencies": {
+			"description": "A map of `\"<data property>\": [\"<JsonSource1>\", ..., \"<JsonSourceN>\"]`. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of \"<classIdentifier1>\", ..., \"<classIdentifierN>\" items, where \"classIdentifierN\" matches the keys in \"5etools/data/class/index.json\" (when copying class/etc. homebrew, normal \"source\"-based linking applies).",
+			"type": "object",
+			"patternProperties": {
+				"^[a-zA-Z]+$": {
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"minItems": 1,
+					"uniqueItems": true
+				}
+			},
+			"propertyNames": {
+				"$ref": "util-copy.json#/$defs/copyableProps"
+			},
+			"markdownDescription": "A map of &quot;&lt;data property&gt;&quot;: [&quot;&lt;JsonSource1&gt;&quot;, ..., &quot;&lt;JsonSourceN&gt;&quot;]. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of &quot;&lt;classIdentifier1&gt;&quot;, ..., &quot;&lt;classIdentifierN&gt;&quot; items, where &quot;classIdentifierN&quot; matches the keys in &quot;5etools/data/class/index.json&quot; (when copying class/etc. homebrew, normal &quot;source&quot;-based linking applies)."
+		},
+		"internalCopies": {
+			"description": "An array of keys that are copied from within the current document. e.g. \"item\", \"monsterFluff\", \"background\" etc.",
+			"type": "array",
+			"items": {
+				"$ref": "util-copy.json#/$defs/copyableProps"
+			},
+			"minItems": 1,
+			"uniqueItems": true,
+			"markdownDescription": "An array of keys that are copied from within the current document. e.g. &quot;item&quot;, &quot;monsterFluff&quot;, &quot;background&quot; etc."
+		}
+	}
+}

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.19.5",
+	"version": "1.19.6",
 	"$defs": {
 		"metaDependenciesArray": {
 			"type": "array",
@@ -17,12 +17,10 @@
 			"type": "object",
 			"properties": {
 				"dependencies": {
-					"type": "object",
-					"patternProperties": {
-						"^[a-zA-Z]+$": {
-							"$ref": "#/$defs/metaDependenciesArray"
-						}
-					}
+					"$ref": "util-meta.json#/$defs/dependencies"
+				},
+				"internalCopies": {
+					"$ref": "util-meta.json#/$defs/internalCopies"
 				},
 				"otherSources": {
 					"type": "object",
@@ -34,7 +32,9 @@
 						}
 					}
 				}
-			}
+			},
+			"additionalProperties": false,
+			"minProperties": 1
 		},
 		"url": {
 			"type": "string",

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

@@ -1,12 +1,15 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "adventure.json",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"type": "object",
 	"properties": {
-		"data": {
-			"$ref": "../util.json#/$defs/adventureBookData"
+		"adventureData": {
+			"$ref": "../corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		}
 	},
+	"required": [
+		"adventureData"
+	],
 	"additionalProperties": false
 }

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

@@ -1,12 +1,15 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "book.json",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"type": "object",
 	"properties": {
-		"data": {
-			"$ref": "../util.json#/$defs/adventureBookData"
+		"bookData": {
+			"$ref": "../corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		}
 	},
+	"required": [
+		"bookData"
+	],
 	"additionalProperties": false
 }

package/schema/brew-fast/corpus-shared.json

@@ -1,8 +1,31 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "corpus-shared.json",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
+		"wrappedAdventureBookDataArray": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"$ref": "util.json#/$defs/corpusId"
+					},
+					"source": {
+						"$ref": "util.json#/$defs/source"
+					},
+					"data": {}
+				},
+				"required": [
+					"id",
+					"source",
+					"data"
+				],
+				"additionalProperties": false
+			},
+			"minItems": 1,
+			"uniqueItems": true
+		},
 		"corpusCover": {
 			"description": "A link to an image. Preferred sizes are 300 x 300px or 600 x 600px.",
 			"$ref": "entry.json#/$defs/mediaHref",

package/schema/brew-fast/homebrew.json

@@ -1,32 +1,9 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.14.1",
+	"version": "1.14.2",
 	"type": "object",
 	"description": "Homebrew for 5etools. Should include arrays titled similarly to the main site data, e.g. `spell` or `class`",
 	"$defs": {
-		"wrappedAdventureBookDataArray": {
-			"type": "array",
-			"items": {
-				"type": "object",
-				"properties": {
-					"id": {
-						"$ref": "util.json#/$defs/corpusId"
-					},
-					"source": {
-						"$ref": "util.json#/$defs/source"
-					},
-					"data": {}
-				},
-				"required": [
-					"id",
-					"source",
-					"data"
-				],
-				"additionalProperties": false
-			},
-			"minItems": 1,
-			"uniqueItems": true
-		},
 		"_meta": {
 			"description": "Metadata for the included data arrays",
 			"type": "object",
@@ -294,22 +271,7 @@
 					"markdownDescription": "A file hash used to automatically update the value of "dateLastModified". Should not be manually created/edited."
 				},
 				"dependencies": {
-					"description": "A map of `\"<data property>\": [\"<JsonSource1>\", ..., \"<JsonSourceN>\"]`. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of \"<classIdentifier1>\", ..., \"<classIdentifierN>\" items, where \"classIdentifierN\" matches the keys in \"5etools/data/class/index.json\" (when copying class/etc. homebrew, normal \"source\"-based linking applies).",
-					"type": "object",
-					"patternProperties": {
-						"^[a-zA-Z]+$": {
-							"type": "array",
-							"items": {
-								"type": "string"
-							},
-							"minItems": 1,
-							"uniqueItems": true
-						}
-					},
-					"propertyNames": {
-						"$ref": "util-copy.json#/$defs/copyableProps"
-					},
-					"markdownDescription": "A map of &quot;&lt;data property&gt;&quot;: [&quot;&lt;JsonSource1&gt;&quot;, ..., &quot;&lt;JsonSourceN&gt;&quot;]. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of &quot;&lt;classIdentifier1&gt;&quot;, ..., &quot;&lt;classIdentifierN&gt;&quot; items, where &quot;classIdentifierN&quot; matches the keys in &quot;5etools/data/class/index.json&quot; (when copying class/etc. homebrew, normal &quot;source&quot;-based linking applies)."
+					"$ref": "util-meta.json#/$defs/dependencies"
 				},
 				"includes": {
 					"description": "Structure as per \"dependencies\". Additional sources to be included when loading the file.",
@@ -330,14 +292,7 @@
 					"markdownDescription": "Structure as per &quot;dependencies&quot;. Additional sources to be included when loading the file."
 				},
 				"internalCopies": {
-					"description": "An array of keys that are copied from within the current document. e.g. \"item\", \"monsterFluff\", \"background\" etc.",
-					"type": "array",
-					"items": {
-						"$ref": "util-copy.json#/$defs/copyableProps"
-					},
-					"minItems": 1,
-					"uniqueItems": true,
-					"markdownDescription": "An array of keys that are copied from within the current document. e.g. &quot;item&quot;, &quot;monsterFluff&quot;, &quot;background&quot; etc."
+					"$ref": "util-meta.json#/$defs/internalCopies"
 				},
 				"fonts": {
 					"description": "A map of \"font family\" to font URL.",
@@ -552,7 +507,7 @@
 			"$ref": "adventures.json#/properties/adventure"
 		},
 		"adventureData": {
-			"$ref": "#/$defs/wrappedAdventureBookDataArray"
+			"$ref": "corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		},
 		"monster": {
 			"$ref": "bestiary/bestiary.json#/properties/monster"
@@ -588,7 +543,7 @@
 			"$ref": "books.json#/properties/book"
 		},
 		"bookData": {
-			"$ref": "#/$defs/wrappedAdventureBookDataArray"
+			"$ref": "corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		},
 		"class": {
 			"$ref": "class/class.json#/properties/class"

package/schema/brew-fast/util-copy.json

@@ -2,7 +2,7 @@
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "util-copy.json",
 	"title": "Util: Copy",
-	"version": "1.1.2",
+	"version": "1.1.3",
 	"$defs": {
 		"_mod_renameArr_rename": {
 			"type": "object",
@@ -1157,6 +1157,7 @@
 			"enum": [
 				"monster",
 				"monsterFluff",
+				"monsterTemplate",
 				"legendaryGroup",
 				"class",
 				"classFluff",
@@ -1198,6 +1199,7 @@
 				"optionalfeatureFluff",
 				"psionic",
 				"race",
+				"raceFeature",
 				"subrace",
 				"raceFluff",
 				"reward",

package/schema/brew-fast/util-meta.json

@@ -0,0 +1,36 @@
+{
+	"$schema": "https://json-schema.org/draft/2020-12/schema",
+	"$id": "util-meta.json",
+	"version": "1.0.0",
+	"title": "Util: Meta",
+	"$defs": {
+		"dependencies": {
+			"description": "A map of `\"<data property>\": [\"<JsonSource1>\", ..., \"<JsonSourceN>\"]`. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of \"<classIdentifier1>\", ..., \"<classIdentifierN>\" items, where \"classIdentifierN\" matches the keys in \"5etools/data/class/index.json\" (when copying class/etc. homebrew, normal \"source\"-based linking applies).",
+			"type": "object",
+			"patternProperties": {
+				"^[a-zA-Z]+$": {
+					"type": "array",
+					"items": {
+						"type": "string"
+					},
+					"minItems": 1,
+					"uniqueItems": true
+				}
+			},
+			"propertyNames": {
+				"$ref": "util-copy.json#/$defs/copyableProps"
+			},
+			"markdownDescription": "A map of &quot;&lt;data property&gt;&quot;: [&quot;&lt;JsonSource1&gt;&quot;, ..., &quot;&lt;JsonSourceN&gt;&quot;]. Entities from these sources can then be extended/referenced in this file.\n\nNote: when copying classes/subclasses/class features/subclass features, the array should consist of &quot;&lt;classIdentifier1&gt;&quot;, ..., &quot;&lt;classIdentifierN&gt;&quot; items, where &quot;classIdentifierN&quot; matches the keys in &quot;5etools/data/class/index.json&quot; (when copying class/etc. homebrew, normal &quot;source&quot;-based linking applies)."
+		},
+		"internalCopies": {
+			"description": "An array of keys that are copied from within the current document. e.g. \"item\", \"monsterFluff\", \"background\" etc.",
+			"type": "array",
+			"items": {
+				"$ref": "util-copy.json#/$defs/copyableProps"
+			},
+			"minItems": 1,
+			"uniqueItems": true,
+			"markdownDescription": "An array of keys that are copied from within the current document. e.g. &quot;item&quot;, &quot;monsterFluff&quot;, &quot;background&quot; etc."
+		}
+	}
+}

package/schema/brew-fast/util.json

@@ -3,7 +3,7 @@
 	"$id": "util.json",
 	"title": "Util",
 	"description": "Utility definitions to be used in other schemas.",
-	"version": "1.19.5",
+	"version": "1.19.6",
 	"$defs": {
 		"metaDependenciesArray": {
 			"type": "array",
@@ -17,12 +17,10 @@
 			"type": "object",
 			"properties": {
 				"dependencies": {
-					"type": "object",
-					"patternProperties": {
-						"^[a-zA-Z]+$": {
-							"$ref": "#/$defs/metaDependenciesArray"
-						}
-					}
+					"$ref": "util-meta.json#/$defs/dependencies"
+				},
+				"internalCopies": {
+					"$ref": "util-meta.json#/$defs/internalCopies"
 				},
 				"otherSources": {
 					"type": "object",
@@ -34,7 +32,9 @@
 						}
 					}
 				}
-			}
+			},
+			"additionalProperties": false,
+			"minProperties": 1
 		},
 		"url": {
 			"type": "string",

package/schema/site/adventure/adventure.json

@@ -1,12 +1,15 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "adventure.json",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"type": "object",
 	"properties": {
-		"data": {
-			"$ref": "../util.json#/$defs/adventureBookData"
+		"adventureData": {
+			"$ref": "../corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		}
 	},
+	"required": [
+		"adventureData"
+	],
 	"additionalProperties": false
 }

package/schema/site/book/book.json

@@ -1,12 +1,15 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "book.json",
-	"version": "1.2.0",
+	"version": "1.3.0",
 	"type": "object",
 	"properties": {
-		"data": {
-			"$ref": "../util.json#/$defs/adventureBookData"
+		"bookData": {
+			"$ref": "../corpus-shared.json#/$defs/wrappedAdventureBookDataArray"
 		}
 	},
+	"required": [
+		"bookData"
+	],
 	"additionalProperties": false
 }

package/schema/site/corpus-shared.json

@@ -1,8 +1,33 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "corpus-shared.json",
-	"version": "1.0.4",
+	"version": "1.0.5",
 	"$defs": {
+		"wrappedAdventureBookDataArray": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"$ref": "util.json#/$defs/corpusId"
+					},
+					"source": {
+						"$ref": "util.json#/$defs/source"
+					},
+					"data": {
+						"$ref": "util.json#/$defs/adventureBookData"
+					}
+				},
+				"required": [
+					"id",
+					"source",
+					"data"
+				],
+				"additionalProperties": false
+			},
+			"minItems": 1,
+			"uniqueItems": true
+		},
 		"corpusCover": {
 			"description": "A link to an image. Preferred sizes are 300 x 300px or 600 x 600px.",
 			"$ref": "entry.json#/$defs/mediaHref",