fix(common-utils): 🐛 update argument prefix for params in dispatch utility

Author: tomgrv

src/common-utils/_zz_args.sh

@@ -21,6 +21,12 @@ if test $# -lt 1; then
         <argname> <datatype> <varname> <help>
         ...
         help" >&2
+
+    echo "With <argname>:
+    x   for flags x with value (e.g., -f value, -h being reserved for help)
+    -   for sequential arguments in the order defined, without flags
+    +   to capture all remaining arguments as a single variable with spaces as separators
+    &   to capture all remaining arguments as a single variable with newlines as separators" >&2
     return 1
 fi
 
@@ -48,7 +54,7 @@ while read argname datatype varname help; do
         line="<$datatype...>"
         helpinfo="$helpinfo\n\t$(printf '%-12s : %s' "$name" "$help")"
     elif [ "$argname" = "&" ]; then
-        line="<$datatype...>"
+        line="<$datatype...>>"
         helpinfo="$helpinfo\n\t$(printf '%-12s : %s' "$name" "$help")"
     else
         if [ "$datatype" = "-" ]; then
@@ -113,15 +119,23 @@ else
 
     # Process remaining '&' parameters
     for arg in $(echo $varnames | grep -E "^&" | cut -f2); do
-        if [ "$#" -gt "0" ]; then
-            echo "$arg='$(echo $@ | sed "s/ /\n/g")'" && shift $#
-        fi
+        lines=""
+        while [ "$#" -gt "0" ]; do
+            # spaces that are not escaped should be preserved as part of the argument
+            if [ -z "$lines" ]; then
+                lines="$1"
+            else
+                lines="$lines\\\\n$1"
+            fi
+            shift 1
+        done
+        echo "$arg='$lines'"  
     done
 
     # Process remaining '+' parameters
     for arg in $(echo $varnames | grep -E "^\+" | cut -f2); do
         if [ "$#" -gt "0" ]; then
-            echo "$arg='$(echo $@ | sed "s/ /\\\\ /g")'" && shift $#
+            echo "$arg='$@'" && shift $#
         fi
     done
 

src/common-utils/_zz_dispatch.sh

@@ -8,10 +8,11 @@ set -e
 
 # Parse arguments and display help if needed
 eval $(
-    zz_args "Dispatch Utility" $0 "$@" <<- help
+    ./src/common-utils/_zz_args.sh "Dispatch Utility" $0 "$@" <<- help
 		-   caller caller     Caller script path
         -   subcmd subcmd     Target script to execute
-        +   params params     Remaining arguments passed to the target script
+        d   debug  debug      Enable debug mode
+        &   params params     Remaining arguments passed to the target script
 	help
 )
 
@@ -24,6 +25,12 @@ usage() {
     fi
 }
 
+preserve() {
+    echo $@ | while read -r line; do
+        echo \"$line\" 
+    done
+}
+
 # Determine caller directory and base name
 caller_basename=$(basename "${caller}")
 caller_dir=$(dirname "${caller}")
@@ -38,8 +45,6 @@ if [ -z "${subcmd}" ]; then
     exit 1
 fi
 
-
-
 # If caller_dir is just the basename (no slash) and file exists in PATH, try to locate
 if [ "${caller_dir}" = "${caller_basename}" ] || [ -z "${caller_dir}" ]; then
     caller_dir="."
@@ -52,12 +57,14 @@ else
     target="${caller_dir}/${name}"
 fi
 
+echo $(preserve $params)
+
 if [ -x "${target}" ]; then
     zz_log i "Dispatching to executable target: ${target}" >&2
-    exec "${target}" $params
+    exec "${target}" $(preserve $params)
 elif [ -f "${target}" ]; then
     zz_log i "Dispatching to subshell target: ${target}" >&2
-    exec sh "${target}" $params
+    exec sh "${target}" $(preserve $params)
 else
     # Nothing found: show help and available utilities in the same directory
     zz_log w "No dispatch target found" && usage