5etools-utils 0.8.37 → 0.9.1

package/README.md

@@ -4,4 +4,5 @@ Available commands:
 
 ```
 npx test-json-brew [file] [--dir <dir>]
+npx test-json-ua [file] [--dir <dir>]
 ```

package/bin/test-json-ua.js

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import {BrewTester} from "../lib/BrewTester.js";
+
+BrewTester.pTestJson(process.argv, {mode: "ua"});

package/lib/BrewTester.js

@@ -10,7 +10,7 @@ class _BrewTesterJson {
 	static _LOG_TAG = "JSON";
 	static _IS_FAIL_SLOW = !!process.env.FAIL_SLOW;
 
-	static async pRun (args) {
+	static async pRun (args, {mode = "brew"} = {}) {
 		const program = new Command()
 			.argument("[file]", "File to test")
 			.option("--dir <dir>", "Directory to test")
@@ -19,7 +19,7 @@ class _BrewTesterJson {
 		program.parse(args);
 		const opts = program.opts();
 
-		const jsonTester = new JsonTester({isBrew: true, tagLog: this._LOG_TAG, fnGetSchemaId: () => "homebrew.json"});
+		const jsonTester = new JsonTester({mode, tagLog: this._LOG_TAG, fnGetSchemaId: () => "homebrew.json"});
 
 		let results;
 		if (program.args[0]) {
@@ -95,7 +95,7 @@ class _BrewTesterFileExtensions {
 }
 
 class BrewTester {
-	static async pTestJson (args) { return _BrewTesterJson.pRun(args); }
+	static async pTestJson (args, opts) { return _BrewTesterJson.pRun(args, opts); }
 	static testFileLocations () { return _BrewTesterFileLocations.run(); }
 	static testFileExtensions () { return _BrewTesterFileExtensions.run(); }
 }

package/lib/TestJson.js

@@ -18,6 +18,12 @@ const _IS_TRIM_RESULTS = !process.env.VET_TEST_JSON_RESULTS_UNTRIMMED;
 
 const LOG_TAG = "JSON";
 
+const MODES = {
+	SITE: "site",
+	BREW: "brew",
+	UA: "ua",
+};
+
 class JsonTester {
 	static _RE_DATE = /^\d\d\d\d-\d\d-\d\d$/;
 
@@ -25,19 +31,23 @@ class JsonTester {
 		{
 			fnGetSchemaId,
 
-			isBrew = false,
+			mode = null,
 			dirSchema = null,
 			tagLog = LOG_TAG,
 		},
 	) {
-		if (isBrew && dirSchema) throw new Error(`"isBrew" and "dirSchema" are mutually exclusive!`);
+		this._tagLog = tagLog;
+
+		if (mode && dirSchema) throw new Error(`"mode" and "dirSchema" are mutually exclusive!`);
+		if (mode != null && !Object.values(MODES).includes(mode)) throw new Error(`"mode" must be one of ${Object.values(MODES).join("/")}!`);
 		if (!fnGetSchemaId) throw new Error(`"fnGetSchemaId" is required!`);
 
 		this._dirSchemaSite = path.join(__dirname, "..", "schema", "site");
 		this._dirSchemaBrew = path.join(__dirname, "..", "schema", "brew");
+		this._dirSchemaUa = path.join(__dirname, "..", "schema", "ua");
+
+		this._dirSchema = dirSchema ?? (mode === "site" ? this._dirSchemaSite : mode === "brew" ? this._dirSchemaBrew : this._dirSchemaUa);
 
-		this._dirSchema = dirSchema ?? (isBrew ? this._dirSchemaBrew : this._dirSchemaSite);
-		this._tagLog = tagLog;
 		this._fnGetSchemaId = fnGetSchemaId;
 
 		// region Set up validator
@@ -113,9 +123,14 @@ class JsonTester {
 	}
 
 	doLoadSchema (type, relativeFilePath) {
-		if (!["site", "brew"].includes(type)) throw new Error(`Unknown schema type "${type}"`);
+		if (!Object.values(MODES).includes(type)) throw new Error(`Unknown schema type "${type}"`);
 
-		const dir = type === "site" ? this._dirSchemaSite : this._dirSchemaBrew;
+		const dir = {
+			[MODES.SITE]: this._dirSchemaSite,
+			[MODES.BREW]: this._dirSchemaBrew,
+			[MODES.UA]: this._dirSchemaUa,
+		}[type];
+		if (!dir) throw new Error(`Unhandled type "${type}"!`);
 
 		this._ajv.addSchema(
 			Uf.readJsonSync(path.join(dir, relativeFilePath)),
@@ -198,7 +213,7 @@ class JsonTester {
 	}
 
 	async pGetErrorsOnDirsWorkers ({isFailFast = false, fileList = null} = {}) {
-		Um.info(this._tagLog, `Validating JSON against schema`);
+		Um.info(this._tagLog, `Validating JSON against schemas in dir: ${this._dirSchema}`);
 
 		const cntWorkers = Math.max(1, os.cpus().length - 1);
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "5etools-utils",
-	"version": "0.8.37",
+	"version": "0.9.1",
 	"description": "Shared utilities for the 5etools ecosystem.",
 	"type": "module",
 	"main": "lib/Api.js",
@@ -13,6 +13,7 @@
 	},
 	"bin": {
 		"test-json-brew": "bin/test-json-brew.js",
+		"test-json-ua": "bin/test-json-ua.js",
 		"test-file-extensions": "bin/test-file-extensions.js",
 		"test-file-locations": "bin/test-file-locations.js"
 	},

package/schema/brew/backgrounds.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "backgrounds.json",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"type": "object",
 	"$defs": {
 		"backgroundData": {
@@ -74,6 +74,10 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"fluff": {
+					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+					"$ref": "util.json#/$defs/fluffObject"
+				},
 				"expertise": {
 					"$ref": "util.json#/$defs/expertise"
 				},
@@ -95,10 +99,6 @@
 				"conditionImmune": {
 					"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 				},
-				"fluff": {
-					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-					"$ref": "util.json#/$defs/fluffObject"
-				},
 				"foundrySystem": {
 					"$ref": "util.json#/$defs/foundrySystemObject"
 				},
@@ -189,6 +189,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"fluff": {
+							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+							"$ref": "util.json#/$defs/fluffObject"
+						},
 						"expertise": {
 							"$ref": "util.json#/$defs/expertise"
 						},
@@ -210,10 +214,6 @@
 						"conditionImmune": {
 							"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 						},
-						"fluff": {
-							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-							"$ref": "util.json#/$defs/fluffObject"
-						},
 						"foundrySystem": {
 							"$ref": "util.json#/$defs/foundrySystemObject"
 						},
@@ -307,6 +307,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"fluff": {
+							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+							"$ref": "util.json#/$defs/fluffObject"
+						},
 						"expertise": {
 							"$ref": "util.json#/$defs/expertise"
 						},
@@ -328,10 +332,6 @@
 						"conditionImmune": {
 							"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 						},
-						"fluff": {
-							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-							"$ref": "util.json#/$defs/fluffObject"
-						},
 						"foundrySystem": {
 							"$ref": "util.json#/$defs/foundrySystemObject"
 						},

package/schema/brew/class/class.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "2.11.4",
+	"version": "2.11.5",
 	"$id": "class.json",
 	"type": "object",
 	"$defs": {

package/schema/brew/items-shared.json

@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",

package/schema/brew/races.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "races.json",
-	"version": "1.12.3",
+	"version": "1.12.4",
 	"type": "object",
 	"$defs": {
 		"sharedData": {

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.6",
+	"version": "1.9.7",
 	"title": "Spells",
 	"type": "object",
 	"$defs": {
@@ -341,6 +341,26 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"groups": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"name": {
+								"type": "string"
+							},
+							"source": {
+								"$ref": "../util.json#/$defs/source"
+							}
+						},
+						"required": [
+							"name",
+							"source"
+						]
+					},
+					"minItems": 1,
+					"uniqueItems": true
+				},
 				"classes": {
 					"type": "object",
 					"properties": {
@@ -497,26 +517,6 @@
 					"minItems": 1,
 					"uniqueItems": true
 				},
-				"groups": {
-					"type": "array",
-					"items": {
-						"type": "object",
-						"properties": {
-							"name": {
-								"type": "string"
-							},
-							"source": {
-								"$ref": "../util.json#/$defs/source"
-							}
-						},
-						"required": [
-							"name",
-							"source"
-						]
-					},
-					"minItems": 1,
-					"uniqueItems": true
-				},
 				"subschools": {
 					"description": "For homebrew use only.",
 					"type": "array",
@@ -886,6 +886,26 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"groups": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"source": {
+										"$ref": "../util.json#/$defs/source"
+									}
+								},
+								"required": [
+									"name",
+									"source"
+								]
+							},
+							"minItems": 1,
+							"uniqueItems": true
+						},
 						"classes": {
 							"type": "object",
 							"properties": {
@@ -1042,26 +1062,6 @@
 							"minItems": 1,
 							"uniqueItems": true
 						},
-						"groups": {
-							"type": "array",
-							"items": {
-								"type": "object",
-								"properties": {
-									"name": {
-										"type": "string"
-									},
-									"source": {
-										"$ref": "../util.json#/$defs/source"
-									}
-								},
-								"required": [
-									"name",
-									"source"
-								]
-							},
-							"minItems": 1,
-							"uniqueItems": true
-						},
 						"subschools": {
 							"description": "For homebrew use only.",
 							"type": "array",
@@ -1439,6 +1439,26 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"groups": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"source": {
+										"$ref": "../util.json#/$defs/source"
+									}
+								},
+								"required": [
+									"name",
+									"source"
+								]
+							},
+							"minItems": 1,
+							"uniqueItems": true
+						},
 						"classes": {
 							"type": "object",
 							"properties": {
@@ -1595,26 +1615,6 @@
 							"minItems": 1,
 							"uniqueItems": true
 						},
-						"groups": {
-							"type": "array",
-							"items": {
-								"type": "object",
-								"properties": {
-									"name": {
-										"type": "string"
-									},
-									"source": {
-										"$ref": "../util.json#/$defs/source"
-									}
-								},
-								"required": [
-									"name",
-									"source"
-								]
-							},
-							"minItems": 1,
-							"uniqueItems": true
-						},
 						"subschools": {
 							"description": "For homebrew use only.",
 							"type": "array",

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.29",
+	"version": "1.13.30",
 	"$defs": {
 		"metaDependenciesArray": {
 			"type": "array",
@@ -193,6 +193,7 @@
 				"auran",
 				"celestial",
 				"common",
+				"common sign language",
 				"deep speech",
 				"draconic",
 				"druidic",
@@ -237,6 +238,9 @@
 					"common": {
 						"const": true
 					},
+					"common sign language": {
+						"const": true
+					},
 					"deep speech": {
 						"const": true
 					},
@@ -683,6 +687,12 @@
 					"celestial": {
 						"const": true
 					},
+					"common": {
+						"const": true
+					},
+					"common sign language": {
+						"const": true
+					},
 					"deep speech": {
 						"const": true
 					},
@@ -692,9 +702,36 @@
 					"infernal": {
 						"const": true
 					},
+					"gith": {
+						"const": true
+					},
+					"gnomish": {
+						"const": true
+					},
+					"goblin": {
+						"const": true
+					},
+					"halfling": {
+						"const": true
+					},
+					"orc": {
+						"const": true
+					},
 					"primordial": {
 						"const": true
 					},
+					"aquan": {
+						"const": true
+					},
+					"auran": {
+						"const": true
+					},
+					"ignan": {
+						"const": true
+					},
+					"terran": {
+						"const": true
+					},
 					"sylvan": {
 						"const": true
 					},
@@ -710,6 +747,15 @@
 					"giant": {
 						"const": true
 					},
+					"other": {
+						"const": true
+					},
+					"druidic": {
+						"const": true
+					},
+					"thieves' cant": {
+						"const": true
+					},
 					"otherLanguage": {
 						"const": true
 					},

package/schema/brew-fast/backgrounds.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "backgrounds.json",
-	"version": "1.3.2",
+	"version": "1.3.3",
 	"type": "object",
 	"$defs": {
 		"backgroundData": {
@@ -74,6 +74,10 @@
 				"hasFluffImages": {
 					"type": "boolean"
 				},
+				"fluff": {
+					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+					"$ref": "util.json#/$defs/fluffObject"
+				},
 				"expertise": {
 					"$ref": "util.json#/$defs/expertise"
 				},
@@ -95,10 +99,6 @@
 				"conditionImmune": {
 					"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 				},
-				"fluff": {
-					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-					"$ref": "util.json#/$defs/fluffObject"
-				},
 				"foundrySystem": {
 					"$ref": "util.json#/$defs/foundrySystemObject"
 				},
@@ -189,6 +189,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"fluff": {
+							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+							"$ref": "util.json#/$defs/fluffObject"
+						},
 						"expertise": {
 							"$ref": "util.json#/$defs/expertise"
 						},
@@ -210,10 +214,6 @@
 						"conditionImmune": {
 							"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 						},
-						"fluff": {
-							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-							"$ref": "util.json#/$defs/fluffObject"
-						},
 						"foundrySystem": {
 							"$ref": "util.json#/$defs/foundrySystemObject"
 						},
@@ -307,6 +307,10 @@
 						"hasFluffImages": {
 							"type": "boolean"
 						},
+						"fluff": {
+							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
+							"$ref": "util.json#/$defs/fluffObject"
+						},
 						"expertise": {
 							"$ref": "util.json#/$defs/expertise"
 						},
@@ -328,10 +332,6 @@
 						"conditionImmune": {
 							"$ref": "util.json#/$defs/conditionImmunityArrayPlayer"
 						},
-						"fluff": {
-							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
-							"$ref": "util.json#/$defs/fluffObject"
-						},
 						"foundrySystem": {
 							"$ref": "util.json#/$defs/foundrySystemObject"
 						},

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

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "2.11.4",
+	"version": "2.11.5",
 	"$id": "class.json",
 	"type": "object",
 	"$defs": {

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

@@ -3,7 +3,7 @@
 	"$id": "items-shared.json",
 	"title": "Shared Item Schema",
 	"description": "Shared item definitions to be used in item schemas.",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"$defs": {
 		"_itemModifySpeedEqual": {
 			"type": "string",

package/schema/brew-fast/races.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "races.json",
-	"version": "1.12.3",
+	"version": "1.12.4",
 	"type": "object",
 	"$defs": {
 		"sharedData": {