fix: Properly check for array existence

Author: hyperupcall

pkg/lib/traverse-set.sh

@@ -44,13 +44,14 @@ bash_object.traverse-set() {
 		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'"
-					return
+				bash_object.util.die 'ERROR_VALUE_NOT_FOUND' "Key or index '$key' is not in '$filter_stack_string'"
+				return
 			# If we are at the last element in the query
 			elif ((i+1 == ${#REPLIES[@]})); then
 				if [ "$final_value_type" = object ]; then
 					# TODO: test this
-					if bash_object.ensure.variable_does_exist "$final_value"; then :; else
+					# shellcheck disable=SC1087
+					if bash_object.ensure.variable_does_exist "$final_value[@]"; then :; else
 						return
 					fi
 
@@ -83,7 +84,8 @@ bash_object.traverse-set() {
 					done
 				elif [ "$final_value_type" = array ]; then
 					# TODO: test this
-					if bash_object.ensure.variable_does_exist "$final_value"; then :; else
+					# shellcheck disable=SC1087
+					if bash_object.ensure.variable_does_exist "$final_value[@]"; then :; else
 						return
 					fi
 

pkg/lib/util/ensure.sh

@@ -5,12 +5,22 @@ bash_object.ensure.variable_is_valid() {
 	return 0
 }
 
-# TODO: swap with does_not
+# @description Ensure the variable already exists. Note that the variable _must_ be sanitized before using this function
 bash_object.ensure.variable_does_exist() {
-	if bash_object.ensure.variable_does_not_exist "$1"; then
-		bash_object.util.die 'ERROR_INTERNAL_MISCELLANEOUS' "Variable '$1' does not exist, but it should"
+	local variable_name="$1"
+
+	if [ -z "$variable_name" ]; then
+		bash_object.util.die "ERROR_INTERNAL_MISCELLANEOUS" "Parameter to function 'bash_object.ensure.variable_does_exist' was empty"
 		return
+	fi
+
+	if ((BASH_VERSINFO[0] >= 5)) || ((BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] >= 2)); then
+		if [[ ! -v "$variable_name" ]]; then
+			bash_object.util.die 'ERROR_INTERNAL_MISCELLANEOUS' "Variable '$variable_name' does not exist, but it should"
+			return
+		fi
 	else
+		# TODO
 		:
 	fi
 }

pkg/lib/util/util.sh

@@ -19,17 +19,19 @@ bash_object.util.die() {
 	local error_output=
 	case "$error_key" in
 	ERROR_INVALID_FILTER)
-		printf -v error_output 'Failed to perform operation:
+		printf -v error_output 'Failed to parse filter:
   -> code: %s
   -> message: %s
   -> context: %s
-  -> PARSER_COLUMN_NUMBER: %s' "$error_key" "$error_message" "$error_context" "$PARSER_COLUMN_NUMBER"
+  -> PARSER_COLUMN_NUMBER: %s
+' "$error_key" "$error_message" "$error_context" "$PARSER_COLUMN_NUMBER"
 		;;
 	*)
-		printf -v error_output 'Failed to parse filter:
+		printf -v error_output 'Failed to perform operation:
   -> code: %s
   -> message: %s
-  -> context: %s' "$error_key" "$error_message" "$error_context"
+  -> context: %s
+' "$error_key" "$error_message" "$error_context"
 		;;
 	esac