refactor: Move generating stack string to function

Author: hyperupcall

pkg/lib/traverse-get.sh

@@ -48,12 +48,6 @@ bash_object.traverse-get() {
 		local key="${REPLIES[$i]}"
 		filter_stack+=("$key")
 
-		# TODO: redo filter_stack string, and use stdlib.arrayprint TODO
-		local oldIFS="$IFS"
-		IFS='_'
-		local filter_stack_string="${filter_stack[*]}"
-		IFS="$oldIFS"
-
 		bash_object.trace_loop
 
 		local is_index_of_array='no'
@@ -64,7 +58,7 @@ bash_object.traverse-get() {
 
 		# If 'key' is not a member of object or index of array, error
 		if [ -z "${current_object["$key"]+x}" ]; then
-			bash_object.util.die 'ERROR_VALUE_NOT_FOUND' "Key or index '$key' is not in '$filter_stack_string'"
+			bash_object.util.die 'ERROR_VALUE_NOT_FOUND' "Key or index '$key' (filter index '$i') does not exist"
 			return
 		# If 'key' is a member of an object or index of array
 		else

pkg/lib/traverse-set.sh

@@ -122,19 +122,16 @@ bash_object.traverse-set() {
 	for ((i=0; i<${#REPLIES[@]}; i++)); do
 		local key="${REPLIES[$i]}"
 		filter_stack+=("$key")
-
-		local oldIFS="$IFS"
-		IFS='_'
-		local filter_stack_string="${filter_stack[*]}"
-		IFS="$oldIFS"
+		bash_object.util.generate_filter_stack_string
+		local filter_stack_string="$REPLY"
 
 		bash_object.trace_loop
 
 		# If 'key' is not a member of object or index of array, error
 		if [ -z "${current_object["$key"]+x}" ]; then
 			# If we are before the last element in the query, then error
 			if ((i+1 < ${#REPLIES[@]})); then
-				bash_object.util.die 'ERROR_VALUE_NOT_FOUND' "Key or index '$key' is not in '$filter_stack_string'"
+				bash_object.util.die 'ERROR_VALUE_NOT_FOUND' "Key or index '$key' (filter index '$i') does not exist"
 				return
 			# If we are at the last element in the query
 			elif ((i+1 == ${#REPLIES[@]})); then

pkg/lib/util/util.sh

@@ -57,6 +57,18 @@ bash_object.util.generate_vobject_name() {
 	REPLY="__bash_object_${root_object_name}_${root_object_query}_${random_string}"
 }
 
+# @description A stringified version of the filter
+# stack. This is used when generating objects to prevent
+# conflicts
+bash_object.util.generate_filter_stack_string() {
+	unset REPLY
+
+	local oldIFS="$IFS"
+	IFS='_'
+	REPLY="${filter_stack[*]}"
+	IFS="$oldIFS"
+}
+
 # TODO
 stdtrace.log() {
 	local level="$1"