allow variables in nested included files

README.md

@@ -133,7 +133,7 @@ Include a file literally
 
 ## Fn::Map
 
-`Fn::Map` is the equivalent of the JavaScript `map()` function allowing for the trasformation of an input array to an output array.
+`Fn::Map` is the equivalent of the JavaScript `map()` function allowing for the transformation of an input array to an output array.
 By default the string `_` is used as the variable in the map function.
 
 ```json

index.js

@@ -40,7 +40,7 @@ function recurse(base, scope, object) {
           delete object["Fn::Include"];
           _.extend(object, json);
           return object;
-        }).then(_.bind(recurse, this, base, scope));
+        }).then(_.bind(findAndReplace, this, scope)).then(_.bind(recurse, this, base, scope));
       } else {
         return object;
       }

t/includes/mapvariable.json

@@ -0,0 +1,8 @@
+{
+  "foo": "_",
+  "bar": "$",
+  "baz": [{
+    "foo": "_",
+    "bar": "$"
+  }]
+}

t/tests/map.json

@@ -202,5 +202,47 @@
     }, {
       "Value": "2"
     }]
+  }, {
+    "name": "include template with variables",
+    "template": {
+      "Fn::Map": [
+        [1, 2], "$", {
+          "Fn::Map": [
+            [3, 4], {
+              "Fn::Include": "includes/mapvariable.json"
+            }
+          ]
+        }
+      ]
+    },
+    "output": [[{
+      "foo": "3",
+      "bar": "1",
+      "baz": [{
+        "foo": "3",
+        "bar": "1"
+      }]
+    }, {
+      "foo": "4",
+      "bar": "1",
+      "baz": [{
+        "foo": "4",
+        "bar": "1"
+      }]
+    }], [{
+      "foo": "3",
+      "bar": "2",
+      "baz": [{
+        "foo": "3",
+        "bar": "2"
+      }]
+    }, {
+      "foo": "4",
+      "bar": "2",
+      "baz": [{
+        "foo": "4",
+        "bar": "2"
+      }]
+    }]]
   }]
 }