grace/htmlua
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

bug: multiple includes now works

Browse source
This commit is contained in:
gyoder 2025-07-08 12:25:04 -06:00
parent 88c262fe64
commit c8ffbb2af0
4 changed files with 39 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

37
htmlua-parser/src/render.rs
View file

@ -119,6 +119,7 @@ pub fn expand_template(document: NodeRef, component_path: &PathBuf, include_from
for i in document for i in document
.select("include") .select("include")
.map_err(|()| anyhow!("Error finding include"))? .map_err(|()| anyhow!("Error finding include"))?
.collect::<Vec<_>>()
{ {
let attrs = match i.as_node().as_element() { let attrs = match i.as_node().as_element() {
Some(e) => e.attributes.borrow(), Some(e) => e.attributes.borrow(),
@ -129,10 +130,13 @@ pub fn expand_template(document: NodeRef, component_path: &PathBuf, include_from
item_path.push(include_path); item_path.push(include_path);
let new_node = read_doc_from_file(item_path)?; let new_node = read_doc_from_file(item_path)?;
let replaced_node = expand_template(new_node, component_path, Some(i.as_node()))?; let replaced_node = expand_template(new_node, component_path, Some(i.as_node()))?;
i.as_node().insert_before(replaced_node); replaced_node.select_first("html").map_err(|()| anyhow!("Error finding html"))?.as_node().children().rev().for_each(|c| i.as_node().insert_after(c));
i.as_node().detach();
} }
} }
while let Ok(i) = document.select_first("include") {
i.as_node().detach();
}
Ok(document) Ok(document)
} }
@ -265,6 +269,35 @@ mod tests {
assert!(d.select_first("include").is_err()); assert!(d.select_first("include").is_err());
} }
#[test]
fn multiple_include() {
let page = r#"
<!DOCTYPE html>
<html>
<head>
<title>Basic HTML Page</title>
</head>
<body>
<h1>Hello World</h1>
<p>This is a paragraph.</p>
<include path="multi1_1.html"></include>
<include path="multi1_2.html"></include>
<include path="multi1_3.html"></include>
</body>
</html>"#;
let mut p = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
p.push("tests/components");
let document = kuchikiki::parse_html().one(page);
let d = expand_template(document, &p, None).unwrap();
let text = d.select_first("#inc1").unwrap().as_node().text_contents();
assert_eq!(text, "included1");
let text = d.select_first("#inc2").unwrap().as_node().text_contents();
assert_eq!(text, "included2");
let text = d.select_first("#inc3").unwrap().as_node().text_contents();
assert_eq!(text, "included3");
assert!(d.select_first("include").is_err());
}
#[test] #[test]
fn basic_lua_include() { fn basic_lua_include() {
let page = r#" let page = r#"

1
htmlua-parser/tests/components/multi1_1.html Normal file
View file

@ -0,0 +1 @@
<span id="inc1">included1</span>

2
htmlua-parser/tests/components/multi1_2.html Normal file
View file

@ -0,0 +1,2 @@
<span id="inc2">included2</span>

1
htmlua-parser/tests/components/multi1_3.html Normal file
View file

@ -0,0 +1 @@
<span id="inc3">included3</span>