5etools-utils 0.12.18 → 0.12.20

package/lib/BrewIndexGenerator.js

@@ -96,6 +96,23 @@ class _BrewIndexMeta extends _BrewIndex {
 	}
 }
 
+class _BrewIndexAdventureBookIds extends _BrewIndex {
+	static _FILE_PATH = "_generated/index-adventure-book-ids.json";
+	static _DISPLAY_NAME = "ids";
+
+	addToIndex (fileInfo) {
+		["adventure", "book"]
+			.forEach(prop => {
+				(fileInfo.contents[prop] || [])
+					.forEach(({name, source, id}) => {
+						if (!name || !source || !id) return;
+						// Lowercase the key, as we expect this to come from a hash
+						this._index[id.toLowerCase()] = {name, source, id};
+					});
+			});
+	}
+}
+
 class BrewIndexGenerator {
 	static _DIR_TO_PRIMARY_PROP = {
 		"creature": [
@@ -147,6 +164,7 @@ class BrewIndexGenerator {
 			new _BrewIndexProps(),
 			new _BrewIndexSources(),
 			new _BrewIndexMeta(),
+			new _BrewIndexAdventureBookIds(),
 		];
 
 		Um.info(`INDEX`, `Indexing...`);

package/lib/TestJson.js

@@ -3,16 +3,14 @@ import * as path from "path";
 import * as url from "url";
 import {Worker} from "worker_threads";
 
-import Ajv2020 from "ajv/dist/2020.js";
-import addFormats from "ajv-formats";
 import * as jsonSourceMap from "json-source-map";
-import NP from "number-precision";
 
 import * as Uf from "./UtilFs.js";
 import Um from "./UtilMisc.js";
 import {WorkerList, Deferred} from "./WorkerList.js";
 import {ObjectWalker} from "./ObjectWalker.js";
 import {UrlUtil} from "./UrlUtil.js";
+import {UtilAjv} from "./UtilAjv.js";
 
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
@@ -28,8 +26,6 @@ const MODES = {
 };
 
 class JsonTester {
-	static _RE_DATE = /^\d\d\d\d-\d\d-\d\d$/;
-
 	constructor (
 		{
 			fnGetSchemaId,
@@ -53,41 +49,7 @@ class JsonTester {
 
 		this._fnGetSchemaId = fnGetSchemaId;
 
-		// region Set up validator
-		this._ajv = new Ajv2020({
-			allowUnionTypes: true,
-		});
-		addFormats(this._ajv);
-
-		this._ajv.addKeyword({
-			keyword: "version",
-			validate: false,
-		});
-
-		this._ajv.addFormat(
-			"date",
-			{
-				validate: str => JsonTester._RE_DATE.test(str),
-			},
-		);
-		// endregion
-
-		// region Patch AJV `"multipleOf"`
-		// See: https://github.com/ajv-validator/ajv/issues/652#issuecomment-944202626
-		this._ajv.removeKeyword("multipleOf");
-
-		this._ajv.addKeyword({
-			keyword: "multipleOf",
-			type: "number",
-			compile (schema) {
-				return (data) => Number.isInteger(NP.divide(data, schema));
-			},
-			errors: false,
-			metaSchema: {
-				type: "number",
-			},
-		});
-		// endregion
+		this._ajv = UtilAjv.getValidator();
 
 		this._pLoadSchema = null;
 	}

package/lib/UtilAjv.js

@@ -0,0 +1,47 @@
+import Ajv2020 from "ajv/dist/2020.js";
+import addFormats from "ajv-formats";
+import NP from "number-precision";
+
+export class UtilAjv {
+	static _RE_DATE = /^\d\d\d\d-\d\d-\d\d$/;
+
+	static getValidator () {
+		// region Set up validator
+		const ajv = new Ajv2020({
+			allowUnionTypes: true,
+		});
+		addFormats(ajv);
+
+		ajv.addKeyword({
+			keyword: "version",
+			validate: false,
+		});
+
+		ajv.addFormat(
+			"date",
+			{
+				validate: str => this._RE_DATE.test(str),
+			},
+		);
+		// endregion
+
+		// region Patch AJV `"multipleOf"`
+		// See: https://github.com/ajv-validator/ajv/issues/652#issuecomment-944202626
+		ajv.removeKeyword("multipleOf");
+
+		ajv.addKeyword({
+			keyword: "multipleOf",
+			type: "number",
+			compile (schema) {
+				return (data) => Number.isInteger(NP.divide(data, schema));
+			},
+			errors: false,
+			metaSchema: {
+				type: "number",
+			},
+		});
+		// endregion
+
+		return ajv;
+	}
+}

package/lib/UtilSource.js

@@ -1,6 +1,9 @@
 import url from "url";
 import path from "path";
+
 import {readJsonSync} from "./UtilFs.js";
+import {UtilAjv} from "./UtilAjv.js";
+import * as Uf from "./UtilFs.js";
 
 const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 
@@ -16,4 +19,35 @@ export class UtilSource {
 
 		return this._SOURCES.has(source?.toLowerCase());
 	}
+
+	/* -------------------------------------------- */
+
+	static _HOMEBREW_SOURCE_VALIDATOR = null;
+
+	static isValidHomebrewSorce (source) {
+		if (!this._HOMEBREW_SOURCE_VALIDATOR) {
+			this._HOMEBREW_SOURCE_VALIDATOR = UtilAjv.getValidator();
+
+			[
+				"util.json",
+				"sources-homebrew-legacy.json",
+				"sources-5etools.json",
+			]
+				.forEach(fname => {
+					this._HOMEBREW_SOURCE_VALIDATOR.addSchema(
+						Uf.readJsonSync(path.join(path.join(__dirname, "..", "schema", "brew", fname))),
+						fname,
+					);
+				});
+
+			this._HOMEBREW_SOURCE_VALIDATOR.addSchema(
+				{
+					"$ref": "util.json#/$defs/sourceJson",
+				},
+				"homebrewSource",
+			);
+		}
+
+		return this._HOMEBREW_SOURCE_VALIDATOR.validate("homebrewSource", source);
+	}
 }

package/package.json

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