fix: Clenup some TODO's

Author: hyperupcall

pkg/lib/parse.sh

@@ -36,10 +36,9 @@ bash_object.parse_filter() {
 		done
 		IFS="$old_ifs"
 	elif [ "$flag_parser_type" = 'advanced' ]; then
-		# TODO: scope
-		declare char=
-		declare mode='MODE_DEFAULT'
-		declare -i PARSER_COLUMN_NUMBER=0
+		local char=
+		local mode='MODE_DEFAULT'
+		local -i PARSER_COLUMN_NUMBER=0
 
 		# Append dot so parsing does not fail at end
 		# This makes parsing a lot easier, since it always expects a dot after a ']'

pkg/lib/util/ensure.sh

@@ -16,12 +16,11 @@ bash_object.ensure.variable_does_exist() {
 
 	if ! declare -p "$variable_name" &>/dev/null; then
 		bash_object.util.die 'ERROR_INTERNAL' "Variable '$variable_name' does not exist, but it should"
-			return
+		return
 	fi
 }
 
-# TODO
-# @description Test if the variable already exists. Note that the variable _must_ be sanitized before using this function
+# @description Ensure the variable does not exist
 bash_object.ensure.variable_does_not_exist() {
 	local variable_name="$1"
 
@@ -30,20 +29,8 @@ bash_object.ensure.variable_does_not_exist() {
 		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' "Variable '$variable_name' exists, but it shouldn't"
-			return
-		fi
-	else
-		if ! eval "
-			if ! [ -z \${$variable_name+x} ]; then
-				bash_object.util.die 'ERROR_INTERNAL' \"Variable '$variable_name' exists, but it shouldn't\"
-				return
-			fi
-		"; then
-			bash_object.util.die 'ERROR_INTERNAL' 'Eval unset test'
-			return
-		fi
+	if bash_object.ensure.variable_does_exist "$1"; then
+		bash_object.util.die 'ERROR_INTERNAL' "Variable '$variable_name' exists, but it shouldn't"
+		return
 	fi
 }

pkg/lib/util/util.sh

@@ -21,11 +21,6 @@ bash_object.util.die() {
 	local error_key="$1"
 	local error_context="${2:-<empty>}"
 
-	# TODO: test
-	# if [[ ! -v 'ERRORS_BASH_OBJECT["$error_key"]' ]]; then
-	# 	return 77
-	# fi
-
 	local error_output=
 	case "$error_key" in
 	ERROR_FILTER_INVALID)
@@ -60,7 +55,7 @@ bash_object.util.generate_vobject_name() {
 		random_string="${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}_${RANDOM}"
 	fi
 
-	REPLY="__bash_object_${root_object_name}_${root_object_query}_${random_string}"
+	printf -v REPLY '%q' "__bash_object_${root_object_name}_${root_object_query}_${random_string}"
 }
 
 # @description A stringified version of the filter

tests/get-errors-param.bats

@@ -7,6 +7,14 @@
 load './util/init.sh'
 
 # get
+@test "Error on invalid \$1" {
+	run bobject get-blah
+
+	assert_failure
+	assert_line -p "ERROR_ARGUMENTS_INVALID"
+	assert_line -p "Subcommand 'get-blah' not recognized"
+}
+
 @test "Error with \$# of 2" {
 	run bobject get-string --as-value 'OBJECT'
 

tests/set-errors-param.bats

@@ -77,14 +77,13 @@ load './util/init.sh'
 	assert_line -p ", but received '5'"
 }
 
-# TODO?
-# @test "Error on empty \$1" {
-# 	run bobject
-
-# 	assert_failure
-# 	assert_line -p "ERROR_ARGUMENTS_INVALID"
-# 	assert_line -p "'1' is empty"
-# }
+@test "Error on invalid \$1" {
+	run bobject set-blah
+
+	assert_failure
+	assert_line -p "ERROR_ARGUMENTS_INVALID"
+	assert_line -p "Subcommand 'set-blah' not recognized"
+}
 
 @test "Error on empty \$2" {
 	run bobject set-string --by-ref "" '.obj' obj