Fix duplicate comparison overwriting and error feedback

Author: WifiLatency

server/chat-plugins/datasearch.ts

@@ -25,7 +25,7 @@ interface DexOrGroup {
 	types: { [k: string]: boolean };
 	resists: { [k: string]: boolean };
 	weak: { [k: string]: boolean };
-	stats: { [k: string]: { [k in Direction]: number | string } };
+	stats: { [k: string]: { [k in Direction]: { [s: string]: number | boolean } } };
 	skip: boolean;
 }
 
@@ -1162,38 +1162,48 @@ function runDexsearch(target: string, cmd: string, canAll: boolean, message: str
 					inequalityString = target.charAt(inequality);
 				}
 				const targetParts = target.replace(/\s/g, '').split(inequalityString);
-				let compareTo;
-				let stat;
+				let compareType: string;
+				let statKey: string;
+				let value: number | boolean;
 				const directions: Direction[] = [];
 				if (!isNaN(parseFloat(targetParts[0]))) {
 					// e.g. 100 < spe
-					compareTo = parseFloat(targetParts[0]);
-					stat = targetParts[1];
+					value = parseFloat(targetParts[0]);
+					statKey = targetParts[1];
+					compareType = 'numeric';
 					if (inequalityString.startsWith('>')) directions.push('less');
 					if (inequalityString.startsWith('<')) directions.push('greater');
 				} else if (!isNaN(parseFloat(targetParts[1]))) {
 					// e.g. spe > 100
-					compareTo = parseFloat(targetParts[1]);
-					stat = targetParts[0];
+					value = parseFloat(targetParts[1]);
+					statKey = targetParts[0];
+					compareType = 'numeric';
 					if (inequalityString.startsWith('<')) directions.push('less');
 					if (inequalityString.startsWith('>')) directions.push('greater');
 				} else {
 					// e.g. atk = spatk
-					compareTo = targetParts[0];
-					stat = targetParts[1];
-					if (inequalityString.startsWith('>')) directions.push('less');
-					if (inequalityString.startsWith('<')) directions.push('greater');
-
-					if (compareTo in allStatAliases) compareTo = allStatAliases[compareTo];
-					if (!allStats.includes(compareTo)) return { error: `'${target}' did not contain a valid stat.` };
+					value = true;
+					statKey = targetParts[0];
+					compareType = targetParts[1];
+					if (inequalityString.startsWith('<')) directions.push('less');
+					if (inequalityString.startsWith('>')) directions.push('greater');
+					if (statKey in allStatAliases) statKey = allStatAliases[statKey];
+					if (compareType in allStatAliases) compareType = allStatAliases[compareType];
+					if (!allStats.slice(0, 6).includes(statKey) || !allStats.slice(0, 6).includes(compareType))
+						return { error: `'${target}' did not contain a valid stat to compare with another stat.` };
 				}
 				if (inequalityString.endsWith('=')) directions.push('equal');
-				if (stat in allStatAliases) stat = allStatAliases[stat];
-				if (!allStats.includes(stat)) return { error: `'${target}' did not contain a valid stat.` };
-				if (!orGroup.stats[stat]) orGroup.stats[stat] = Object.create(null);
+				if (statKey in allStatAliases) statKey = allStatAliases[statKey];
+				if (!allStats.includes(statKey)) return { error: `'${target}' contained an invalid stat.` };
+				if (typeof value === 'number' && value <= 0) return { error: `Specify a positive value for numeric comparison.` };
+				if (!orGroup.stats[statKey]) orGroup.stats[statKey] = Object.create(null);
+				// Prevents numeric searches from being overwritten and prevent duplicate searches of other types.
 				for (const direction of directions) {
-					if (orGroup.stats[stat][direction]) return { error: `Invalid stat range for ${stat}.` };
-					orGroup.stats[stat][direction] = compareTo;
+					if (!orGroup.stats[statKey][direction])
+						orGroup.stats[statKey][direction] = Object.create(null);
+					else if (orGroup.stats[statKey][direction][compareType])
+						return { error: `Duplicate stat inequality and type for ${statKey}.` };
+					orGroup.stats[statKey][direction][compareType] = value;
 				}
 				continue;
 			}
@@ -1402,11 +1412,9 @@ function runDexsearch(target: string, cmd: string, canAll: boolean, message: str
 			}
 			if (matched) continue;
 
-			function retrieveStat(species: Species, stat: string | number) {
+			function retrieveStat(species: Species, stat: string) {
 				let monStat = 0;
-				if (typeof stat === 'number') {
-					monStat = stat;
-				} else if (stat === 'bst') {
+				if (stat === 'bst') {
 					monStat = species.bst;
 				} else if (stat === 'weight') {
 					monStat = species.weighthg / 10;
@@ -1422,27 +1430,22 @@ function runDexsearch(target: string, cmd: string, canAll: boolean, message: str
 
 			for (const stat in alts.stats) {
 				const monStat = retrieveStat(dex[mon], stat);
-				if (alts.stats[stat].less) {
-					const compareTo = retrieveStat(dex[mon], alts.stats[stat].less);
-					if (monStat < compareTo) {
-						matched = true;
-						break;
-					}
-				}
-				if (alts.stats[stat].greater) {
-					const compareTo = retrieveStat(dex[mon], alts.stats[stat].greater);
-					if (monStat > compareTo) {
-						matched = true;
-						break;
-					}
-				}
-				if (alts.stats[stat].equal) {
-					const compareTo = retrieveStat(dex[mon], alts.stats[stat].equal);
-					if (monStat === compareTo) {
-						matched = true;
-						break;
+				for (const direction in alts.stats[stat]) {
+					for (const comparisonStat in alts.stats[stat][direction as Direction]) {
+						const checkStat = alts.stats[stat][direction as Direction][comparisonStat];
+						if (!checkStat) continue;
+						const compareTo = typeof checkStat === 'number' ?
+							checkStat : retrieveStat(dex[mon], comparisonStat);
+						if ((direction === 'less' && monStat < compareTo) ||
+							(direction === 'greater' && monStat > compareTo) ||
+							(direction === 'equal' && monStat === compareTo)) {
+							matched = true;
+							break;
+						}
 					}
+					if (matched) break;
 				}
+				if (matched) break;
 			}
 			if (matched) continue;