5etools-utils 0.5.17 → 0.6.0

package/lib/BrewCleaner.js

@@ -23,7 +23,7 @@ class BrewCleaner {
 
 		const files = Uf.listJsonFiles(folder);
 		for (const file of files) {
-			let contents = Uf.readJSON(file);
+			let contents = Uf.readJsonSync(file);
 
 			if (this._RE_INVALID_WINDOWS_CHARS.test(file.split("/").slice(1).join("/"))) {
 				ALL_ERRORS.push(`${file} contained invalid characters!`);

package/lib/BrewIndexGenerator.js

@@ -144,7 +144,7 @@ class BrewIndexGenerator {
 					folder,
 					name: file,
 					cleanName: file.replace(/#/g, "%23"),
-					contents: Uf.readJSON(file),
+					contents: Uf.readJsonSync(file),
 				}))
 				.forEach(fileInfo => {
 					if (!fileInfo.contents._meta) {

package/lib/BrewTimestamper.js

@@ -17,7 +17,7 @@ class BrewTimestamper {
 	static async _pUpdateDir (dir) {
 		const promises = Uf.listJsonFiles(dir)
 			.map(async file => {
-				const fileData = Uf.readJSON(file, {isIncludeRaw: true});
+				const fileData = Uf.readJsonSync(file, {isIncludeRaw: true});
 
 				if (!fileData.json._meta) {
 					throw new Error(`File "${file}" did not have metadata!`);

package/lib/TestData.js

@@ -1,5 +1,5 @@
 import fs from "fs";
-import {readJSON} from "./UtilFs.js";
+import {readJsonSync} from "./UtilFs.js";
 import {ObjectWalker} from "./ObjectWalker.js";
 
 /** Runs multiple handlers on each file, to avoid re-reading each file for each handler */
@@ -37,7 +37,7 @@ class _ParsedJsonChecker {
 
 		if (!filePath.endsWith(".json") || (fnIsIgnoredFile && fnIsIgnoredFile(filePath))) return;
 
-		const contents = readJSON(filePath);
+		const contents = readJsonSync(filePath);
 
 		ObjectWalker.walk({
 			obj: contents,

package/lib/TestJson.js

@@ -118,7 +118,7 @@ class JsonTester {
 		const dir = type === "site" ? this._dirSchemaSite : this._dirSchemaBrew;
 
 		this._ajv.addSchema(
-			Uf.readJSON(path.join(dir, relativeFilePath)),
+			Uf.readJsonSync(path.join(dir, relativeFilePath)),
 			relativeFilePath,
 		);
 	}
@@ -133,7 +133,7 @@ class JsonTester {
 				const relativeFilePath = path.relative(this._dirSchema, filePath)
 					.replace(/\\/g, "/");
 
-				this._ajv.addSchema(Uf.readJSON(filePath), relativeFilePath);
+				this._ajv.addSchema(Uf.readJsonSync(filePath), relativeFilePath);
 			});
 
 		this._isSchemaLoaded = true;
@@ -149,7 +149,7 @@ class JsonTester {
 
 		Um.info(this._tagLog, `\tValidating "${filePath}"...`);
 
-		const data = Uf.readJSON(filePath);
+		const data = Uf.readJsonSync(filePath);
 		this._addImplicits(data);
 
 		const isValid = this._ajv.validate(this._fnGetSchemaId(filePath), data);

package/lib/UtilFs.js

@@ -5,7 +5,7 @@ function isDirectory (path) {
 	return fs.lstatSync(path).isDirectory();
 }
 
-function readJSON (path, {isIncludeRaw = false} = {}) {
+function readJsonSync (path, {isIncludeRaw = false} = {}) {
 	try {
 		if (fs.existsSync(path)) {
 			let str = fs.readFileSync(path, "utf8");
@@ -21,7 +21,7 @@ function readJSON (path, {isIncludeRaw = false} = {}) {
 			const filenames = fs.readdirSync(dir, "utf8");
 			const filename = filenames.find(it => it.toLowerCase() === originalName.toLowerCase());
 			if (!filename) throw new Error(`Could not find file "${path}"`);
-			return readJSON(`${dir}/${filename}`, {isIncludeRaw});
+			return readJsonSync(`${dir}/${filename}`, {isIncludeRaw});
 		}
 	} catch (e) {
 		e.message += ` (Path: ${path})`;
@@ -29,6 +29,10 @@ function readJSON (path, {isIncludeRaw = false} = {}) {
 	}
 }
 
+function writeJsonSync (filePath, data) {
+	return fs.writeFileSync(filePath, `${JSON.stringify(data, null, "\t")}\n`, "utf-8");
+}
+
 /**
  * @param dir
  * @param [opts]
@@ -86,10 +90,66 @@ function mkDirs (pathToCreate) {
 		}, "");
 }
 
+function removeSync (path) {
+	if (fs.existsSync(path)) {
+		fs.readdirSync(path).forEach(file => {
+			const curPath = `${path}/${file}`;
+			if (fs.lstatSync(curPath).isDirectory()) removeSync(curPath);
+			else fs.unlinkSync(curPath);
+		});
+		fs.rmdirSync(path);
+	}
+}
+
+/**
+ * @param src
+ * @param dest
+ * @param [opts]
+ * @param [opts.isForce]
+ * @param [opts.isDryRun]
+ */
+function copySync (src, dest, opts) {
+	opts = opts || {};
+	if (fs.existsSync(src) && fs.statSync(src).isDirectory()) {
+		if (opts.isDryRun) console.log(`Creating directory ${dest}`);
+		else fs.mkdirSync(dest, {recursive: true});
+
+		fs.readdirSync(src).forEach(child => copySync(`${src}/${child}`, `${dest}/${child}`, opts));
+	} else {
+		if (opts.isForce) {
+			if (opts.isDryRun) {
+				console.log(`\tRemoving ${dest}`);
+			} else {
+				if (fs.existsSync(dest)) fs.unlinkSync(dest);
+			}
+		}
+
+		if (opts.isDryRun) console.log(`\tCopying ${src} to ${dest}`);
+		else {
+			const dirName = path.dirname(dest);
+			if (dirName && !fs.existsSync(dirName)) fs.mkdirSync(dirName, {recursive: true});
+			fs.copyFileSync(src, dest);
+		}
+	}
+}
+
+function lsRecursiveSync (dir, fileList = []) {
+	fs.readdirSync(dir).forEach(file => {
+		fileList = fs.statSync(path.join(dir, file)).isDirectory()
+			? lsRecursiveSync(path.join(dir, file), fileList)
+			: fileList.concat(path.join(dir, file));
+	});
+	return fileList;
+}
+
 export {
-	readJSON,
+	readJsonSync,
+	writeJsonSync,
 	listJsonFiles,
 	runOnDirs,
 	pRunOnDirs,
 	mkDirs,
+	removeSync,
+	copySync,
+	lsRecursiveSync,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "5etools-utils",
-	"version": "0.5.17",
+	"version": "0.6.0",
 	"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.10",
+	"version": "1.21.11",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -1146,6 +1146,26 @@
 						"additionalProperties": false
 					}
 				},
+				"resource": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"value": {
+								"type": "integer"
+							},
+							"formula": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"value"
+						],
+						"additionalProperties": false
+					},
+					"uniqueItems": true,
+					"minItems": 1
+				},
 				"fluff": {
 					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
 					"anyOf": [
@@ -2248,6 +2268,26 @@
 								"additionalProperties": false
 							}
 						},
+						"resource": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"value": {
+										"type": "integer"
+									},
+									"formula": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"value"
+								],
+								"additionalProperties": false
+							},
+							"uniqueItems": true,
+							"minItems": 1
+						},
 						"fluff": {
 							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
 							"anyOf": [
@@ -3365,6 +3405,26 @@
 								"additionalProperties": false
 							}
 						},
+						"resource": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"value": {
+										"type": "integer"
+									},
+									"formula": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"value"
+								],
+								"additionalProperties": false
+							},
+							"uniqueItems": true,
+							"minItems": 1
+						},
 						"fluff": {
 							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
 							"anyOf": [

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.4",
+	"version": "1.9.5",
 	"title": "Spells",
 	"type": "object",
 	"$defs": {

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

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.10",
+	"version": "1.21.11",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",
@@ -1146,6 +1146,26 @@
 						"additionalProperties": false
 					}
 				},
+				"resource": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"value": {
+								"type": "integer"
+							},
+							"formula": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"value"
+						],
+						"additionalProperties": false
+					},
+					"uniqueItems": true,
+					"minItems": 1
+				},
 				"fluff": {
 					"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
 					"anyOf": [
@@ -2248,6 +2268,26 @@
 								"additionalProperties": false
 							}
 						},
+						"resource": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"value": {
+										"type": "integer"
+									},
+									"formula": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"value"
+								],
+								"additionalProperties": false
+							},
+							"uniqueItems": true,
+							"minItems": 1
+						},
 						"fluff": {
 							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
 							"anyOf": [
@@ -3365,6 +3405,26 @@
 								"additionalProperties": false
 							}
 						},
+						"resource": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"value": {
+										"type": "integer"
+									},
+									"formula": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"value"
+								],
+								"additionalProperties": false
+							},
+							"uniqueItems": true,
+							"minItems": 1
+						},
 						"fluff": {
 							"description": "This is intended to be used for Homebrew only - site data should include a fluff file per source",
 							"anyOf": [

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

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "spells.json",
-	"version": "1.9.4",
+	"version": "1.9.5",
 	"title": "Spells",
 	"type": "object",
 	"$defs": {

package/schema/site/bestiary/bestiary.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.10",
+	"version": "1.21.11",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",

package/schema/site/spells/spells.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "spells.json",
-	"version": "1.9.4",
+	"version": "1.9.5",
 	"title": "Spells",
 	"type": "object",
 	"$defs": {

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

@@ -1,6 +1,6 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
-	"version": "1.21.10",
+	"version": "1.21.11",
 	"title": "Bestiary Schema",
 	"$id": "bestiary.json",
 	"type": "object",

package/schema/site-fast/spells/spells.json

@@ -1,7 +1,7 @@
 {
 	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"$id": "spells.json",
-	"version": "1.9.4",
+	"version": "1.9.5",
 	"title": "Spells",
 	"type": "object",
 	"$defs": {