added include elements

2 files changed, 81 insertions, 6 deletions

diff --git a/htmlua-parser/src/lib.rs b/htmlua-parser/src/lib.rs
index bf62208..d5b291f 100644
--- a/htmlua-parser/src/lib.rs
+++ b/htmlua-parser/src/lib.rs
@@ -11,7 +11,6 @@ use kuchikiki::{
     traits::TendrilSink,
 };
 use mlua::{Lua, Table};
-use tendril::Atomicity;
 
 fn create_luahtml_stdlib(l: &Lua, stdout: &Rc<RefCell<String>>) -> mlua::Result<Table> {
     let t = l.create_table()?;
@@ -73,7 +72,21 @@ pub fn execute_lua(document: NodeRef) -> Result<NodeRef> {
     Ok(document)
 }
 
-pub fn expand_template(document: NodeRef, component_path: &PathBuf) -> Result<NodeRef> {
+pub fn expand_template(document: NodeRef, component_path: &PathBuf, include_from: Option<&NodeRef>) -> Result<NodeRef> {
+    if let Some(from_node) = include_from {
+
+
+        for i in document.select("includeelement").map_err(|()| anyhow!("Error finding includeelement"))? {
+            if let Some(name) = i.attributes.borrow().get("name") {
+                let exported = from_node.select_first(format!("exportelement.{name}").as_str()).map_err(|()| anyhow!("Error finding exportelement"))?;
+                exported.as_node().children().for_each(|c| i.as_node().insert_after(c));
+            }
+        }
+        while let Ok(i) = document.select_first("includeelement") {
+            i.as_node().detach();
+        }
+
+    }
     for i in document.select("include").map_err(|()| anyhow!("Error finding include"))? {
         let attrs = match i.as_node().as_element() {
             Some(e) => e.attributes.borrow(),
@@ -82,10 +95,9 @@ pub fn expand_template(document: NodeRef, component_path: &PathBuf) -> Result<No
         if let Some(include_path) = attrs.get("path") {
             let mut item_path = component_path.clone();
             item_path.push(include_path);
-            println!("{item_path:?}");
             let component_text = read_to_string(item_path)?;
             let new_node = kuchikiki::parse_html().one(component_text);
-            let replaced_node = expand_template(new_node, component_path)?;
+            let replaced_node = expand_template(new_node, component_path, Some(i.as_node()))?;
             i.as_node().insert_before(replaced_node);
             i.as_node().detach();
         }
@@ -121,6 +133,34 @@ mod tests {
     }
 
     #[test]
+    fn multiple_lua() {
+        let page = r#"
+            <!DOCTYPE html>
+            <html>
+            <head>
+                <title>Basic HTML Page</title>
+            </head>
+            <body>
+                <h1>Hello World</h1>
+                <p>This is a paragraph.</p>
+                <span id="ta"><lua>
+                    htmlua.println("Test from Lua!")
+                </lua></span>
+                <div>
+                    <span id="tb"><lua>htmlua.println("test 2")</lua></span>
+                </div>
+            </body>
+            </html>"#;
+        let document =  kuchikiki::parse_html().one(page);
+        let d = execute_lua(document).unwrap();
+        let text = d.select_first("#ta").unwrap().as_node().text_contents();
+        assert_eq!(text, "Test from Lua!\n");
+        let text = d.select_first("#tb").unwrap().as_node().text_contents();
+        assert_eq!(text, "test 2\n");
+        assert!(d.select_first("lua").is_err());
+    }
+
+    #[test]
     fn basic_include() {
         let page = r#"
             <!DOCTYPE html>
@@ -140,7 +180,7 @@ mod tests {
         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).unwrap();
+        let d = expand_template(document, &p, None).unwrap();
         let text = d.select_first("span").unwrap().as_node().text_contents();
         assert_eq!(text, "included1");
         assert!(d.select_first("include").is_err());
@@ -162,10 +202,38 @@ mod tests {
         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).unwrap();
+        let d = expand_template(document, &p, None).unwrap();
         let text = d.select_first("span").unwrap().as_node().text_contents();
         assert_eq!(text, "included_twice");
         assert!(d.select_first("include").is_err());
     }
 
+    #[test]
+    fn export_element_include() {
+        let page = r#"
+            <!DOCTYPE html>
+            <html>
+                <head>
+                    <title>Basic HTML Page</title>
+                </head>
+            <body>
+                <h1>Hello World</h1>
+                <include path="with_include1.html">
+                    <exportelement class="el1"><span id="ta">element 1</span></exportelement>
+                    <exportelement class="el2"><span id="tb">element 2</span></exportelement>
+                </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("#ta").unwrap().as_node().text_contents();
+        assert_eq!(text, "element 1");
+        let text = d.select_first("#tb").unwrap().as_node().text_contents();
+        assert_eq!(text, "element 2");
+        assert!(d.select_first("exportelement").is_err());
+        assert!(d.select_first("includeelement").is_err());
+    }
+
 }
diff --git a/htmlua-parser/tests/components/with_include1.html b/htmlua-parser/tests/components/with_include1.html
new file mode 100644
index 0000000..4902bf1
--- /dev/null
+++ b/htmlua-parser/tests/components/with_include1.html
@@ -0,0 +1,7 @@
+<div>
+  <includeelement name="el1"></includeelement>
+  <br>
+  <div>
+    <includeelement name="el2"></includeelement>
+  </div>
+</div>