5etools-utils 0.11.3 → 0.12.0

package/lib/BrewTester.js

@@ -77,23 +77,33 @@ class _BrewTesterFileLocations {
 	}
 }
 
-class _BrewTesterFileExtensions {
-	static _LOG_TAG = `FILE_EXTS`;
+class _BrewTesterFileNames {
+	static _LOG_TAG = `FILE_NAME`;
+
+	static _RE_NAME_FORMAT = /^[^;]+; .+\.json$/;
 
 	static run () {
-		Um.info(this._LOG_TAG, `Testing for incorrect file extensions...`);
+		Um.info(this._LOG_TAG, `Testing for incorrect file names...`);
 
 		const errors = [];
 
 		Uf.runOnDirs((dir) => {
+			const filenames = fs.readdirSync(dir);
+
 			errors.push(
-				...fs.readdirSync(dir)
+				...filenames
 					.filter(it => !it.endsWith(".json"))
 					.map(it => `File did not have ".json" extension: ${it}`),
 			);
+
+			errors.push(
+				...filenames
+					.filter(it => !this._RE_NAME_FORMAT.test(it))
+					.map(it => `Filename did not match expected pattern "${this._RE_NAME_FORMAT.toString()}" extension: ${it}`),
+			);
 		});
 
-		if (!errors.length) return Um.info(this._LOG_TAG, `Files had expected extensions.`);
+		if (!errors.length) return Um.info(this._LOG_TAG, `Files had expected names.`);
 
 		errors.forEach(it => console.error(it));
 		process.exit(1);
@@ -103,7 +113,7 @@ class _BrewTesterFileExtensions {
 class BrewTester {
 	static async pTestJson (args, opts) { return _BrewTesterJson.pRun(args, opts); }
 	static testFileLocations () { return _BrewTesterFileLocations.run(); }
-	static testFileExtensions () { return _BrewTesterFileExtensions.run(); }
+	static testFileNames () { return _BrewTesterFileNames.run(); }
 }
 
 export {BrewTester};

package/package.json

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

package/bin/test-file-extensions.js

@@ -1,5 +0,0 @@
-#!/usr/bin/env node
-
-import {BrewTester} from "../lib/BrewTester.js";
-
-BrewTester.testFileExtensions();