5etools-utils 0.8.5 → 0.8.7

package/lib/Api.js

@@ -5,7 +5,7 @@ import {BrewIndexGenerator} from "./BrewIndexGenerator.js";
 import {BrewCleaner} from "./BrewCleaner.js";
 import {BrewTimestamper} from "./BrewTimestamper.js";
 import {BrewTester} from "./BrewTester.js";
-import {getCleanJson} from "./UtilClean.js";
+import {getCleanJson, getCleanString} from "./UtilClean.js";
 import {DataTester, DataTesterBase, BraceCheck, EscapeCharacterCheck} from "./TestData.js";
 import {ObjectWalker} from "./ObjectWalker.js";
 
@@ -18,6 +18,7 @@ export {
 	BrewTimestamper,
 	BrewTester,
 	getCleanJson,
+	getCleanString,
 	DataTester,
 	DataTesterBase,
 	BraceCheck,

package/lib/ObjectWalker.js

@@ -9,11 +9,12 @@ class ObjectWalker {
 			lastKey,
 		},
 	) {
-		if (!primitiveHandlers[to]) return;
+		if (!primitiveHandlers[to]) return obj;
 
-		primitiveHandlers[to] instanceof Array
-			? primitiveHandlers[to].forEach(ph => ph(obj, {filePath, lastType, lastKey}))
-			: primitiveHandlers[to](obj, {filePath, lastType, lastKey});
+		if (!(primitiveHandlers[to] instanceof Array)) return primitiveHandlers[to](obj, {filePath, lastType, lastKey});
+
+		return primitiveHandlers[to]
+			.reduce((accum, ph) => ph(accum, {filePath, lastType, lastKey}), obj);
 	}
 
 	static walk (
@@ -23,6 +24,7 @@ class ObjectWalker {
 			primitiveHandlers,
 			lastType,
 			lastKey,
+			isModify = false,
 		},
 	) {
 		const to = typeof obj;
@@ -31,48 +33,50 @@ class ObjectWalker {
 		const nxtOpts = {...opts};
 
 		if (obj === null) {
-			this._runHandlers({
+			const objMod = this._runHandlers({
 				...nxtOpts,
 				to: "null",
 			});
 
+			if (isModify) return objMod;
 			return obj;
 		}
 
 		switch (to) {
-			case undefined:
+			case "undefined":
 			case "boolean":
 			case "number":
 			case "string": {
-				this._runHandlers({
+				const objMod = this._runHandlers({
 					...nxtOpts,
 					to,
 				});
 
-				return obj;
+				return isModify ? objMod : obj;
 			}
 
 			case "object": {
 				if (obj instanceof Array) {
-					this._runHandlers({
+					const objMod = this._runHandlers({
 						...nxtOpts,
 						to: "array",
 					});
 
-					return obj.map(it => this.walk({obj: it, filePath, primitiveHandlers, lastType, lastKey}));
+					return (isModify ? objMod : obj)
+						.map(it => this.walk({obj: it, filePath, primitiveHandlers, lastType, lastKey, isModify}));
 				}
 
-				this._runHandlers({
+				const objMod = this._runHandlers({
 					...nxtOpts,
 					to: "object",
 				});
 
-				Object.keys(obj)
-					.forEach(k => {
-						obj[k] = this.walk({obj: obj[k], filePath, primitiveHandlers, lastType, lastKey: k});
+				Object.entries(isModify ? objMod : obj)
+					.forEach(([k, v]) => {
+						(isModify ? objMod : obj)[k] = this.walk({obj: v, filePath, primitiveHandlers, lastType, lastKey: k, isModify});
 					});
 
-				return obj;
+				return isModify ? objMod : obj;
 			}
 
 			default: throw new Error(`Unhandled type "${to}"`);

package/package.json

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