From 3a58ee390e9781d0cd0bbb316cb5fed13cbfb448 Mon Sep 17 00:00:00 2001
From: Tyler Akins <fidian@rumkin.com>
Date: Mon, 10 Apr 2023 11:39:47 -0500
Subject: [PATCH] More bugfixes and shellcheck tweaks

---
 demo/associative-arrays |  2 +-
 demo/embedded-template  |  1 +
 demo/function-args      | 10 ++++++----
 mo                      |  9 +++++----
 run-spec.js             | 43 +++++++++++++++++++++++++++++++----------
 tests/invalid-option    |  2 +-
 6 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/demo/associative-arrays b/demo/associative-arrays
index bc66117..f0d8950 100755
--- a/demo/associative-arrays
+++ b/demo/associative-arrays
@@ -3,7 +3,7 @@
 cd "$(dirname "$0")" # Go to the script's directory
 
 declare -A DATA
-DATA=([one]=111 [two]=222)
+export DATA=([one]=111 [two]=222)
 . ../mo
 
 cat <<EOF | mo
diff --git a/demo/embedded-template b/demo/embedded-template
index cd1488d..9ae95f5 100755
--- a/demo/embedded-template
+++ b/demo/embedded-template
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 #
 # This embeds a template in the script without using strange `cat` syntax.
+# shellcheck disable=SC1083 disable=SC1010 disable=SC1054 disable=SC1073 disable=SC1072 disable=SC1056 disable=SC1009
 
 cd "$(dirname "$0")" # Go to the script's directory
 
diff --git a/demo/function-args b/demo/function-args
index c461d61..594f977 100755
--- a/demo/function-args
+++ b/demo/function-args
@@ -10,20 +10,22 @@ export ARRAY=( AAA BBB CCC )
 
 # Include an external template
 INCLUDE() {
-    cat "$MO_FUNCTION_ARGS"
+    # shellcheck disable=SC2031
+    cat "${MO_FUNCTION_ARGS[0]}"
 }
 
 # Print section title
 TITLE() {
     echo "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+"
-    echo "$MO_FUNCTION_ARGS"
+    # shellcheck disable=SC2031
+    echo "${MO_FUNCTION_ARGS[0]}"
     echo "+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+"
 }
 
 cat <<EOF | mo -u
-{{TITLE Part 1}}
+{{TITLE 'Part 1'}}
 {{INCLUDE function-args-part1}}
 
-{{TITLE Part 2}}
+{{TITLE 'Part 2'}}
 {{INCLUDE function-args-part2}}
 EOF
diff --git a/mo b/mo
index cd10964..c805d96 100755
--- a/mo
+++ b/mo
@@ -154,7 +154,7 @@ mo() (
                         ;;
 
                     -*)
-                        mo::error "Unknown option: $arg    (See --help for options)"
+                        mo::error "Unknown option: $arg (See --help for options)"
                         ;;
 
                     *)
@@ -938,7 +938,7 @@ mo::parseDelimiter() {
     mo::chomp moOpen "$moContent"
     moContent=${moContent:${#moOpen}}
     mo::trim moContent "$moContent"
-    moClose="${moContent%%="$moCloseDelimiter"*}"
+    mo::chomp moClose "${moContent%%="$moCloseDelimiter"*}"
     moContent=${moContent#*="$moCloseDelimiter"}
     mo::debug "Parsing delimiters: $moOpen $moClose"
 
@@ -1237,6 +1237,7 @@ mo::getArgumentSingleQuote() {
 #
 # $1 - Destination variable name, an array with two elements
 # $2 - Content
+# $3 - Closing delimiter
 #
 # The array has the following elements.
 #     [0] = argument type, "NAME" or "VALUE"
@@ -1536,7 +1537,7 @@ mo::evaluateVariable() {
     moCurrent=$3
     moResult=""
     mo::findVariableName moNameParts "$moArg" "$moCurrent"
-    mo::debug "Evaluate variable ($moArg + $moCurrent): ${moNameParts[*]}"
+    mo::debug "Evaluate variable ($moArg, $moCurrent): ${moNameParts[*]}"
 
     if [[ -z "${moNameParts[1]}" ]]; then
         if mo::isArray "$moArg"; then
@@ -1620,7 +1621,7 @@ mo::findVariableName() {
 # $3-$* - Elements to join
 #
 # Returns nothing.
-moJoin() {
+mo::join() {
     local joiner part result target
 
     target=$1
diff --git a/run-spec.js b/run-spec.js
index 59fd738..190db36 100644
--- a/run-spec.js
+++ b/run-spec.js
@@ -26,6 +26,33 @@ const testOverrides = {
     "Lambdas -> Escaping": {
         skip: "HTML escaping is not supported"
     },
+    "Lambdas -> Inverted Section": {
+        // This one passed mostly by accident. Correcting so the test still
+        // tests what is was designed to illustrate.
+        data: {
+            static: "static",
+            lambda: {
+                __tag__: 'code',
+                bash: 'false'
+            }
+        }
+    },
+    "Lambdas -> Section - Alternate Delimiters": {
+        data: {
+            lambda: {
+                __tag__: 'code',
+                bash: 'content=$(cat); echo -n "$content{{planet}}=>|planet|$content"'
+            }
+        }
+    },
+    "Lambdas -> Section - Multiple Calls": {
+        data: {
+            lambda: {
+                __tag__: 'code',
+                bash: 'echo -n "__$(cat)__"'
+            }
+        }
+    },
     "Partials -> Recursion": {
         skip: "Complex objects are not supported and context is reset to the global level, so the recursion will loop forever"
     },
@@ -158,14 +185,8 @@ function addToEnvironmentObject(name, value) {
         return `#${name} is null`;
     }
 
-    // Sometimes the __tag__ property of the code in the lambdas may be
-    // missing. Compensate by detecting commonly defined languages.
-    if (value.__tag__ === "code" || (value.ruby && value.php && value.perl)) {
-        if (value.bash) {
-            return `${name}() { ${value.bash}; }`;
-        }
-
-        return `${name}() { perl -e 'print ((${value.perl})->("'"$1"'"))'; }`;
+    if (value.__tag__ === "code") {
+        return `${name}() { ${value.bash || 'echo "NO BASH VERSION OF CODE"'}; }`;
     }
 
     return addToEnvironmentObjectConvertedToAssociativeArray(name, value);
@@ -288,12 +309,12 @@ function runTest(testSet, test) {
     test.script = buildScript(test);
 
     if (test.skip) {
-        debug("Skipping test:", testSet.fullName, `$(${test.skip})`);
+        debug("Skipping test:", test.fullName, `(${test.skip})`);
 
         return Promise.resolve();
     }
 
-    debug("Running test:", testSet.fullName);
+    debug("Running test:", test.fullName);
 
     return setupEnvironment(test)
         .then(() => executeScript(test))
@@ -303,6 +324,8 @@ function runTest(testSet, test) {
 
             if (test.isFailure) {
                 showFailureDetails(test);
+            } else {
+                debug('Test pass:', test.fullName);
             }
         });
 }
diff --git a/tests/invalid-option b/tests/invalid-option
index bba194e..8817896 100755
--- a/tests/invalid-option
+++ b/tests/invalid-option
@@ -6,6 +6,6 @@ export person=""
 export template=""
 export returnCode=1
 export arguments=(--something)
-export expected=$'ERROR: Unknown option: --something    (See --help for options)\n'
+export expected=$'ERROR: Unknown option: --something (See --help for options)\n'
 
 runTest