fix: core.trap_add now works properly

Author: hyperupcall

README.md

@@ -12,7 +12,6 @@ Added functions: `core.trap_add` (not working), `core.trap_remove` `core.shopt_p
 
 Use [Basalt](https://github.com/hyperupcall/basalt), a Bash package manager, to add this project as a dependency
 
-
 ```sh
 basalt add hyperupcall/bash-core
 ```

basalt.toml

@@ -7,7 +7,7 @@ description = 'Core lightweight functions that any Bash programmer will love'
 
 [run]
 dependencies = ['https://github.com/hyperupcall/bats-all.git@v4.1.0']
-sourceDirs = ['./pkg/lib/public']
+sourceDirs = ['pkg/lib/public', 'pkg/lib/util']
 builtinDirs = []
 binDirs = []
 completionDirs = []

examples/example.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+shopt -s dotglob globstar nullglob
+
+for f in ../pkg/**/*.sh; do
+	source "$f"
+done; unset f
+
+fn1() {
+	printf '%s\n' 'Function 1 called'
+}
+
+fn2() {
+	printf '%s\n' 'Function 2 called'
+}
+
+core.trap_add 'fn1' SIGINT
+core.trap_add 'fn2' SIGINT
+core.trap_remove 'fn2' SIGINT
+
+read -r

pkg/lib/public/bash-core.sh

@@ -1,6 +1,8 @@
 # shellcheck shell=bash
 
 core.init() {
+	# TODO: way below should error if any variables are not set
+
 	if [ ${___global_bash_core_has_init__+x} ]; then
 		return
 	fi
@@ -10,10 +12,9 @@ core.init() {
 	declare -ag ___global_shopt_stack___=()
 }
 
-# @description Get version of the package, from the point of the
-# callsite. In other words, it returns the version of the package
-# that has the file containing the direct caller of this function
-# @set REPLY The full path to the directory
+# @description Get version of the package, from the point of the callsite. In other words, it
+# returns the version of the package that has the file containing the direct caller of this
+# function @set REPLY The full path to the directory
 core.get_package_dir() {
 	# local start_dir="${1:-"${BASH_SOURCE[1]}"}"
 
@@ -30,13 +31,20 @@ core.trap_add() {
 	local signal_spec="$2"
 
 	# validation
+	if [ -z "$function" ]; then
+		printf '%s\n' "Error: core.trap_add: First argument cannot be empty"
+		return 1
+	fi
+	if [ -z "$signal_spec" ]; then
+		printf '%s\n' "Error: core.trap_add: Second argument cannot be empty"
+		return 1
+	fi
 	local regex='^[0-9]+$'
 	if [[ "$signal_spec" =~ $regex ]]; then
 		printf '%s\n' "Error: core.trap_add: Passing numbers for the signal specs is prohibited"
 		return 1
 	fi; unset regex
 	signal_spec="${signal_spec#SIG}"
-
 	if ! declare -f "$function" &>/dev/null; then
 		printf '%s\n' "Error: core.trap_add: Function '$function' not defined" >&2
 		return 1
@@ -46,21 +54,14 @@ core.trap_add() {
 	___global_trap_table___["$signal_spec"]="${___global_trap_table___[$signal_spec]}"$'\x1C'"$function"
 
 	local global_trap_handler_name=
-	printf -v global_trap_handler_name '%q' "__global_trap_${signal_spec}_handler___"
-
-	eval 'if ! '"$global_trap_handler_name"'() {
-		local trap_handlers= trap_handler=
-		IFS=$'"'\x1C'"' read -ra trap_handlers <<< "${___global_trap_table___[$signal_spec]}"
-		for trap_func in "${trap_handlers[@]}"; do
-			if declare -f "$trap_handler"; then
-				:
-			else
-				printf "%s\n" "Warn: core.trap_add: Function '"'\$function'"' registered for signal '"'\$signal_spec'"' no longer exists" >&2
-			fi
-		done
-	}; then
-		false
-	fi'
+	printf -v global_trap_handler_name '%q' "___global_trap_${signal_spec}_handler___"
+
+	if ! eval "$global_trap_handler_name() {
+	core.trap_common_global_handler "$signal_spec"
+}"; then
+		printf '%s\n' "Error: core.trap_add: Could not eval function"
+		return 1
+	fi
 	trap "$global_trap_handler_name" "$signal_spec"
 }
 
@@ -69,13 +70,20 @@ core.trap_remove() {
 	local signal_spec="$2"
 
 	# validation
+	if [ -z "$function" ]; then
+		printf '%s\n' "Error: core.trap_add: First argument cannot be empty"
+		return 1
+	fi
+	if [ -z "$signal_spec" ]; then
+		printf '%s\n' "Error: core.trap_add: Second argument cannot be empty"
+		return 1
+	fi
 	local regex='^[0-9]+$'
 	if [[ "$signal_spec" =~ $regex ]]; then
 		printf '%s\n' "Error: core.trap_add: Passing numbers for the signal specs is prohibited"
 		return 1
 	fi; unset regex
 	signal_spec="${signal_spec#SIG}"
-
 	if ! declare -f "$function" &>/dev/null; then
 		printf '%s\n' "Error: core.trap_add: Function '$function' not defined" >&2
 		return 1

pkg/lib/util/util.sh

@@ -0,0 +1,21 @@
+# shellcheck shell=bash
+
+core.trap_common_global_handler() {
+	local signal_spec="$1"
+
+	local trap_handlers=
+	IFS=$'\x1C' read -ra trap_handlers <<< "${___global_trap_table___[$signal_spec]}"
+
+	local trap_handler=
+	for trap_handler in "${trap_handlers[@]}"; do
+		if [ -z "$trap_handler" ]; then
+			continue
+		fi
+
+		if declare -f "$trap_handler" &>/dev/null; then
+			"$trap_handler"
+		else
+			printf "%s\n" "Warn: core.trap_add: Function '$trap_handler' registered for signal '$signal_spec' no longer exists. Skipping" >&2
+		fi
+	done; unset trap_func
+}