add datapack change methods

Author: everloste

src/config.ts

@@ -1,6 +1,6 @@
 import JSZip from "jszip";
 import type { Datapack } from "./datapack";
-import { DatapackModifierInstance } from "./datapack_changes";
+import { DatapackModifierInstance, type DatapackChangeMethod } from "./datapack_changes";
 
 type TextWidget = {
 	type: "title" | "heading" | "text";
@@ -388,7 +388,7 @@ async function dostuff(datapack: Datapack, method: Method) {
 			JSON.parse(content);
 
 			DatapackModifierInstance.queueChange(
-				datapack, file_name, accessor.value_path, final_value
+				datapack, file_name, accessor.value_path, final_value, accessor.method as DatapackChangeMethod
 			);
 		});
 

src/datapack_changes.ts

@@ -4,9 +4,25 @@ interface DatapackChange {
 	datapack: Datapack;
 	file_path: string;
 	value_path: string;
-	new_value: string | number | boolean;
+	value: DatapackChangeValue;
+	application_method: DatapackChangeMethod;
 }
 
+export type DatapackChangeValue = string | number | boolean;
+
+export type DatapackChangeMethod =
+	  "multiply" 
+	| "divide"
+	| "add"
+	| "subtract"
+	| "set"
+	| "multiply_int"
+	| "divide_int"
+	| "add_int"
+	| "subtract_int"
+	| "remove"
+	| "pop";
+
 export class DatapackModifier {
 	private static instance: DatapackModifier;
 	private changeQueue: Array<DatapackChange>;
@@ -19,14 +35,20 @@ export class DatapackModifier {
 		this.changeQueue = [];
 	}
 
-	public queueChange(datapack: Datapack, file_path: string, value_path: string, value: number | string | boolean) {
-		const change: DatapackChange = {
-			datapack: datapack,
-			file_path: file_path,
-			value_path: value_path,
-			new_value: value
-		};
-		this.changeQueue.push(change);
+	public queueChange(datapack: Datapack, file_path: string, value_path: string, value: DatapackChangeValue, method: DatapackChangeMethod) {
+		if (valueMatchesMethod(value, method)) {
+			const change: DatapackChange = {
+				datapack: datapack,
+				file_path: file_path,
+				value_path: value_path,
+				value: value,
+				application_method: method
+			};
+			this.changeQueue.push(change);
+		}
+		else {
+			console.warn(`Datapack change wasn't queued - value ${value} (type <${typeof value}>) doesn't match application method "${method}!"`);
+		}
 	}
 
 	public async applyChanges() {
@@ -42,3 +64,42 @@ export class DatapackModifier {
 }
 
 export const DatapackModifierInstance = DatapackModifier.Instance;
+
+
+const string_methods: ReadonlyArray<DatapackChangeMethod> = [
+	"add",
+	"pop",
+	"remove",
+	"set"
+];
+
+const number_methods: ReadonlyArray<DatapackChangeMethod> = [
+	"multiply",
+	"divide",
+	"add",
+	"subtract",
+	"set",
+	"multiply_int",
+	"divide_int",
+	"add_int",
+	"subtract_int",
+	"remove",
+	"pop"
+];
+
+const boolean_methods: ReadonlyArray<DatapackChangeMethod> = [
+	"set"
+];
+
+function valueMatchesMethod(value: DatapackChangeValue, method: DatapackChangeMethod) {
+	if (typeof value === "string" && !string_methods.includes(method)) {
+		return false;
+	}
+	else if (typeof value === "number" && !number_methods.includes(method)) {
+		return false;
+	}
+	else if (typeof value === "boolean" && !boolean_methods.includes(method)) {
+		return false;
+	}
+	return true;
+}