5etools-utils 0.12.9 → 0.12.10

package/lib/Api.js

@@ -7,7 +7,8 @@ import {BrewTimestamper} from "./BrewTimestamper.js";
 import {BrewTester} from "./BrewTester.js";
 import {getCleanJson, getCleanString} from "./UtilClean.js";
 import {DataTester, DataTesterBase, BraceCheck, EscapeCharacterCheck} from "./TestData.js";
-import {ObjectWalker} from "./ObjectWalker.js";
+import {ObjectWalker, SymObjectWalkerBreak} from "./ObjectWalker.js";
+import {UtilSource} from "./UtilSource.js";
 
 export {
 	JsonTester,
@@ -24,4 +25,6 @@ export {
 	BraceCheck,
 	EscapeCharacterCheck,
 	ObjectWalker,
+	SymObjectWalkerBreak,
+	UtilSource,
 };

package/lib/ObjectWalker.js

@@ -1,6 +1,8 @@
 import MiscUtil from "./UtilMisc.js";
 
-class ObjectWalker {
+export const SymObjectWalkerBreak = Symbol("walkerBreak");
+
+export class ObjectWalker {
 	static _runHandlers (
 		{
 			primitiveHandlers,
@@ -22,6 +24,7 @@ class ObjectWalker {
 		return primitiveHandlers[to]
 			.reduce((accum, ph) => {
 				const accumMod = ph(accum, {filePath, lastType, lastKey});
+				if (accumMod === SymObjectWalkerBreak) return SymObjectWalkerBreak;
 				return isModify ? accumMod : accum;
 			}, obj);
 	}
@@ -47,6 +50,8 @@ class ObjectWalker {
 				to: "null",
 			});
 
+			if (objMod === SymObjectWalkerBreak) return SymObjectWalkerBreak;
+
 			return isModify ? objMod : obj;
 		}
 
@@ -60,36 +65,63 @@ class ObjectWalker {
 					to,
 				});
 
+				if (objMod === SymObjectWalkerBreak) return SymObjectWalkerBreak;
+
 				return isModify ? objMod : obj;
 			}
 
 			case "object": {
 				if (obj instanceof Array) {
-					const objMod = this._runHandlers({
-						...nxtOpts,
-						to: "array",
-					});
+					this._runHandlers({...nxtOpts, to: "preArray"});
+					const objMod = this._runHandlers({...nxtOpts, to: "array"});
+
+					if (objMod === SymObjectWalkerBreak) {
+						this._runHandlers({...nxtOpts, to: "postArray"});
+						return SymObjectWalkerBreak;
+					}
+
+					const out = [];
+					for (const it of isModify ? objMod : obj) {
+						const outSub = this.walk({obj: it, filePath, primitiveHandlers, lastType, lastKey, isModify});
 
-					return (isModify ? objMod : obj)
-						.map(it => this.walk({obj: it, filePath, primitiveHandlers, lastType, lastKey, isModify}));
+						if (outSub === SymObjectWalkerBreak) {
+							this._runHandlers({...nxtOpts, to: "postArray"});
+							return SymObjectWalkerBreak;
+						}
+
+						out.push(outSub);
+					}
+
+					this._runHandlers({...nxtOpts, to: "postArray"});
+
+					return out;
 				}
 
-				const objMod = this._runHandlers({
-					...nxtOpts,
-					to: "object",
-				});
+				this._runHandlers({...nxtOpts, to: "preObject"});
+				const objMod = this._runHandlers({...nxtOpts, to: "object"});
 
-				Object.entries(isModify ? objMod : obj)
-					.forEach(([k, v]) => {
-						(isModify ? objMod : obj)[k] = this.walk({obj: v, filePath, primitiveHandlers, lastType, lastKey: k, isModify});
-					});
+				if (objMod === SymObjectWalkerBreak) {
+					this._runHandlers({...nxtOpts, to: "postObject"});
+					return SymObjectWalkerBreak;
+				}
 
-				return isModify ? objMod : obj;
+				for (const [k, v] of Object.entries(isModify ? objMod : obj)) {
+					const outSub = this.walk({obj: v, filePath, primitiveHandlers, lastType, lastKey: k, isModify});
+
+					if (outSub === SymObjectWalkerBreak) {
+						this._runHandlers({...nxtOpts, to: "postObject"});
+						return SymObjectWalkerBreak;
+					}
+
+					(isModify ? objMod : obj)[k] = outSub;
+				}
+
+				const out = isModify ? objMod : obj;
+				this._runHandlers({...nxtOpts, to: "postObject"});
+				return out;
 			}
 
 			default: throw new Error(`Unhandled type "${to}"`);
 		}
 	}
 }
-
-export {ObjectWalker};

package/lib/UtilSource.js

@@ -0,0 +1,19 @@
+import url from "url";
+import path from "path";
+import {readJsonSync} from "./UtilFs.js";
+
+const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
+
+export class UtilSource {
+	static _SOURCES = null;
+
+	static isSiteSource (source) {
+		this._SOURCES ||= new Set(
+			readJsonSync(
+				path.join(__dirname, "..", "schema", "site", "sources-5etools.json"),
+			).$defs.sources.enum.map(it => it.toLowerCase()),
+		);
+
+		return this._SOURCES.has(source?.toLowerCase());
+	}
+}

package/package.json

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