feat: add more expression functions #2515 #2528

docs/4_secondary_admin_controls/expressions/functions.md

@@ -63,6 +63,10 @@ eg `00:10:15` gives 615
 
 You can do the reverse of this with `secondsToTimestamp(str)`
 
+**randomInt(min, max)**
+
+Generate a random integer in the specified range (inclusive).
+
 ##### String operations
 
 **trim(val)**
@@ -86,12 +90,29 @@ substr() extracts characters from indexStart up to but not including indexEnd.
 
 Tip: If you don't want the behaviour of negative numbers, you can use `max(0, index)` to limit the value to never be below 0.
 
+**concat(str1, str2)**
+
+Combine one or more values into a single string
+
 **includes(val, find)**
 
 Check if a string contains a specific value
 
 eg `includes("Companion is great!", "great")` gives `true`
 
+**indexOf(val, find, offset)**
+
+Find the index of the first occurence of a value within the provided string.
+
+Optionally provide an offset to start the search from.
+
+
+**lastIndexOf(val, find, offset)**
+
+Find the index of the last occurence of a value within the provided string.
+
+Optionally provide an offset to start the search from.
+
 **toUpperCase(val)**
 
 Coverts all characters in a string to uppercase

lib/Shared/Expression/ExpressionFunctions.js

@@ -31,16 +31,28 @@ export const ExpressionFunctions = {
 			return 0
 		}
 	},
+	randomInt: (min = 0, max = 10) => {
+		min = Number(min)
+		max = Number(max)
+		return min + Math.round(Math.random() * (max - min))
+	},
 
 	// String operations
 	trim: (v) => (v + '').trim(),
 	strlen: (v) => (v + '').length,
 	substr: (str, start, end) => {
 		return (str + '').slice(start, end)
 	},
+	concat: (...strs) => ''.concat(...strs),
 	includes: (str, arg) => {
 		return (str + '').includes(arg)
 	},
+	indexOf: (str, arg, offset) => {
+		return (str + '').indexOf(arg, offset)
+	},
+	lastIndexOf: (str, arg, offset) => {
+		return (str + '').lastIndexOf(arg, offset)
+	},
 	toUpperCase: (str) => {
 		return (str + '').toUpperCase()
 	},