- Fixed cache.addAll()

- Renamed jwtDecode to decodeJWT to match conventions
- Added testCondition to search

src/search.ts

@@ -1,4 +1,4 @@
-import {dotNotation, JSONAttemptParse} from './objects';
+import {dotNotation, JSONAttemptParse} from '@ztimson/utils';
 
 export function search(rows: any[], search: string, regex?: boolean, transform: Function = (r: any) => r) {
 	if(!rows) return [];
@@ -12,27 +12,42 @@ export function search(rows: any[], search: string, regex?: boolean, transform:
 				try { return RegExp(search, 'gm').test(v.toString()); }
 				catch { return false; }
 			}).length
+		} else {
+			return testCondition(search, r);
 		}
-		// Make sure at least one OR passes
-		const or = search.split('||').map(p => p.trim()).filter(p => !!p);
-		return -1 != or.findIndex(p => {
-			// Make sure all ANDs pass
-			const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
-			return and.filter(p => {
-				// Boolean operator
-				const prop = /(\w+)\s*(==?|!=|>=|>|<=|<)\s*(\w+)/g.exec(p);
-				if(prop) {
-					const a = JSON.stringify(JSONAttemptParse(dotNotation<any>(value, prop[1])));
-					const operator = prop[2] == '=' ? '==' : prop[2];
-					const b = JSON.stringify(JSONAttemptParse(prop[3]));
-					return eval(`${a} ${operator} ${b}`);
-				}
-				// Case-sensitive
-				const v = Object.values(value).join('');
-				if(/[A-Z]/g.test(search)) return v.includes(p);
-				// Case-insensitive
-				return v.toLowerCase().includes(p);
-			}).length == and.length;
-		})
+	});
+}
+
+export function testCondition(condition: string, row: any) {
+	const evalBoolean = (a: any, op: string, b: any): boolean => {
+		switch(op) {
+			case '=':
+			case '==': return a == b;
+			case '!=': return a != b;
+			case '>': return a > b;
+			case '>=': return a >= b;
+			case '<': return a < b;
+			case '<=': return a <= b;
+			default: return false;
+		}
+	}
+
+	const or = condition.split('||').map(p => p.trim()).filter(p => !!p);
+	return -1 != or.findIndex(p => {
+		// Make sure all ANDs pass
+		const and = p.split('&&').map(p => p.trim()).filter(p => !!p);
+		return and.filter(p => {
+			// Boolean operator
+			const prop = /(\S+)\s*(==?|!=|>=|>|<=|<)\s*(\S+)/g.exec(p);
+			if(prop) {
+				const key = Object.keys(row).find(k => k.toLowerCase() == prop[1].toLowerCase());
+				return evalBoolean(dotNotation<any>(row, key || prop[1]),  prop[2], JSONAttemptParse(prop[3]));
+			}
+			// Case-sensitive
+			const v = Object.values(row).map(v => typeof v == 'object' && v != null ? JSON.stringify(v) : v).join('');
+			if(/[A-Z]/g.test(condition)) return v.includes(p);
+			// Case-insensitive
+			return v.toLowerCase().includes(p);
+		}).length == and.length;
 	});
 }