Merge pull request #496 from sunng87/fix/partial-context

Fix block param scope leaked into partials

Author: sunng87

src/context.rs

@@ -173,9 +173,6 @@ impl Context {
         // always use absolute at the moment until we get base_value lifetime issue fixed
         let resolved_visitor = parse_json_visitor(relative_path, block_contexts, true);
 
-        // debug logging
-        debug!("Accessing context value: {:?}", resolved_visitor);
-
         match resolved_visitor {
             ResolvedPath::AbsolutePath(paths) => {
                 let mut ptr = Some(self.data());

src/partial.rs

@@ -79,6 +79,10 @@ pub fn expand_partial<'reg: 'rc, 'rc>(
             let mut block = BlockContext::new();
             *block.base_path_mut() = base_path.to_vec();
             block_created = true;
+
+            // clear blocks to prevent block params from parent
+            // template to be leaked into partials
+            local_rc.clear_blocks();
             local_rc.push_block(block);
         } else if !d.hash().is_empty() {
             let mut block = BlockContext::new();
@@ -93,8 +97,14 @@ pub fn expand_partial<'reg: 'rc, 'rc>(
                 local_rc.evaluate2(ctx, &Path::current())?.as_json(),
                 &hash_ctx,
             );
+
             block.set_base_value(merged_context);
             block_created = true;
+
+            // clear blocks to prevent block params from parent
+            // template to be leaked into partials
+            // see `test_partial_context_issue_495` for the case.
+            local_rc.clear_blocks();
             local_rc.push_block(block);
         }
 
@@ -491,4 +501,45 @@ name: there
             .unwrap();
         assert_eq!(":(\n", r2);
     }
+
+    #[test]
+    fn test_partial_context_issue_495() {
+        let mut hb = Registry::new();
+        hb.register_template_string(
+            "t1",
+            r#"{{~#*inline "displayName"~}}
+Template:{{name}}
+{{/inline}}
+{{#each data as |name|}}
+Name:{{name}}
+{{>displayName name="aaaa"}}
+{{/each}}"#,
+        )
+        .unwrap();
+
+        hb.register_template_string(
+            "t1",
+            r#"{{~#*inline "displayName"~}}
+Template:{{this}}
+{{/inline}}
+{{#each data as |name|}}
+Name:{{name}}
+{{>displayName}}
+{{/each}}"#,
+        )
+        .unwrap();
+
+        let data = json!({
+            "data": ["hudel", "test"]
+        });
+
+        assert_eq!(
+            r#"Name:hudel
+Template:hudel
+Name:test
+Template:test
+"#,
+            hb.render("t1", &data).unwrap()
+        );
+    }
 }

src/render.rs

@@ -101,6 +101,10 @@ impl<'reg: 'rc, 'rc> RenderContext<'reg, 'rc> {
         self.blocks.pop_front();
     }
 
+    pub(crate) fn clear_blocks(&mut self) {
+        self.blocks.clear();
+    }
+
     /// Borrow a reference to current block context
     pub fn block(&self) -> Option<&BlockContext<'reg>> {
         self.blocks.front()