From 2707adaa056fb804a386dd6c30c84c1c3935c5a2 Mon Sep 17 00:00:00 2001
From: Joseph Dalrymple <swivelgames@gmail.com>
Date: Fri, 31 Mar 2023 05:52:13 -0500
Subject: [PATCH] Updated function calls to pass in current element when
 looping

---
 demo/function-args-loops          | 48 +++++++++++++++++++++++++++++++
 mo                                | 15 ++++++++--
 tests/function-args-loop.env      |  9 ++++++
 tests/function-args-loop.expected |  8 ++++++
 tests/function-args-loop.template |  6 ++++
 5 files changed, 83 insertions(+), 3 deletions(-)
 create mode 100755 demo/function-args-loops
 create mode 100644 tests/function-args-loop.env
 create mode 100644 tests/function-args-loop.expected
 create mode 100644 tests/function-args-loop.template

diff --git a/demo/function-args-loops b/demo/function-args-loops
new file mode 100755
index 0000000..4308966
--- /dev/null
+++ b/demo/function-args-loops
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Example for how #54 can get implemented.
+
+cd "$(dirname "$0")" # Go to the script's directory
+
+# The links are associative arrays
+declare -a links
+declare -A names urls
+
+links+=(resque)
+names[resque]=Resque
+urls[resque]=http://example.com/resque
+
+links+=(hub)
+names[hub]=Hub
+urls[hub]=http://example.com/hub
+
+links+=(rip)
+names[rip]=Rip
+urls[rip]=http://example.com/rip
+
+# helper functions
+link_name() {
+    # Trying to use unique names
+    local key
+    key=$(cat)
+    echo ${names[$key]}
+}
+
+link_url() {
+    # Trying to use unique names
+    local key
+    key=$(cat)
+    echo ${urls[$key]}
+}
+
+
+# Source mo in order to work with arrays
+. ../mo
+
+# Process the template
+cat <<EOF | mo --allow-function-arguments
+Here are your links:
+{{#links}}
+ * [{{link_name}}]({{link_url}})
+{{/links}}
+
+EOF
diff --git a/mo b/mo
index c928d7c..a634b4c 100755
--- a/mo
+++ b/mo
@@ -769,9 +769,13 @@ moParse() {
                 moFullTagName moTag "$moCurrent" "$moTag"
                 moContent=${moContent[1]}
 
+                if [[ ! -z "$moCurrent" ]]; then
+                    moBlock=$(moShow "$moCurrent" "$moCurrent")
+                fi
+
                 # Now show the value
                 # Quote moArgs here, do not quote it later.
-                moShow "$moTag" "$moCurrent" "$moArgs"
+                moShow "$moTag" "$moCurrent" "$moArgs" "$moBlock"
                 ;;
 
             '&'*)
@@ -791,8 +795,12 @@ moParse() {
                 moArgs=${moArgs:${#moTag}}
                 moFullTagName moTag "$moCurrent" "$moTag"
 
+                if [[ ! -z "$moCurrent" ]]; then
+                    moBlock=$(moShow "$moCurrent" "$moCurrent")
+                fi
+
                 # Quote moArgs here, do not quote it later.
-                moShow "$moTag" "$moCurrent" "$moArgs"
+                moShow "$moTag" "$moCurrent" "$moArgs" "$moBlock"
                 ;;
         esac
 
@@ -880,6 +888,7 @@ moPartial() {
 # $1 - Name of environment variable or function
 # $2 - Current context
 # $3 - Arguments string if $1 is a function
+# $4 - Content string if $1 is a function
 #
 # Returns nothing.
 moShow() {
@@ -887,7 +896,7 @@ moShow() {
     local moJoined moNameParts moContent
 
     if moIsFunction "$1"; then
-        moCallFunction moContent "$1" "" "$3"
+        moCallFunction moContent "$1" "$4" "$3"
         moParse "$moContent" "$2" false
         return 0
     fi
diff --git a/tests/function-args-loop.env b/tests/function-args-loop.env
new file mode 100644
index 0000000..298505d
--- /dev/null
+++ b/tests/function-args-loop.env
@@ -0,0 +1,9 @@
+arr=(
+    "test1"
+    "test2"
+)
+
+testArgs() {
+    value=$(cat)
+    echo "$value - $MO_FUNCTION_ARGS"
+}
diff --git a/tests/function-args-loop.expected b/tests/function-args-loop.expected
new file mode 100644
index 0000000..ca2af94
--- /dev/null
+++ b/tests/function-args-loop.expected
@@ -0,0 +1,8 @@
+No args: [test1 - ] - done
+One arg: [test1 - one] - done
+Multiple arguments: [test1 - aa bb cc 'x' " ! {[_.|] - done
+Evil: [test1 - bla; cat /etc/issue] - done
+No args: [test2 - ] - done
+One arg: [test2 - one] - done
+Multiple arguments: [test2 - aa bb cc 'x' " ! {[_.|] - done
+Evil: [test2 - bla; cat /etc/issue] - done
diff --git a/tests/function-args-loop.template b/tests/function-args-loop.template
new file mode 100644
index 0000000..4d73fea
--- /dev/null
+++ b/tests/function-args-loop.template
@@ -0,0 +1,6 @@
+{{#arr}}
+No args: [{{testArgs}}] - done
+One arg: [{{testArgs one}}] - done
+Multiple arguments: [{{testArgs aa bb cc 'x' " ! {[_.| }}] - done
+Evil: [{{testArgs bla; cat /etc/issue}}] - done
+{{/arr}}