@ape-egg/vibe-compiler 4.3.14 → 4.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ape-egg/vibe-compiler",
-  "version": "4.3.14",
+  "version": "4.3.16",
   "type": "module",
   "description": "Optional Rust compiler for Vibe \u2014 pre-renders, inlines components, and optimizes iterations. The runtime never needs it.",
   "homepage": "https://vibe.korte.kim",

package/src/Cargo.lock

@@ -1599,7 +1599,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vibe-compiler"
-version = "4.3.14"
+version = "4.3.16"
 dependencies = [
  "clap",
  "colored",

package/src/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "vibe-compiler"
-version = "4.3.14"
+version = "4.3.16"
 edition = "2021"
 description = "Vibe framework compiler - compiles Vibe source files into optimized output"
 authors = ["Kim Korte"]

package/src/compiler/compile.rs

@@ -1601,6 +1601,7 @@ impl Compiler {
 
         // Raw pre-pass: read every page and detect the shared-layout shape
         // BEFORE component inlining consumes the <component src> root.
+        let component_names: Vec<&str> = parser.elements().keys().map(String::as_str).collect();
         let mut raw_pages = Vec::new();
         for path in &page_files {
             let rel = path
@@ -1612,7 +1613,7 @@ impl Compiler {
                 path: path.display().to_string(),
                 source: e,
             })?;
-            let candidate = spa::detect_layout_root(&content);
+            let candidate = spa::detect_layout_root(&content, &component_names);
             raw_pages.push((rel, content, candidate));
         }
         let candidates: Vec<_> = raw_pages.iter().map(|(_, _, c)| c.clone()).collect();

package/src/compiler/spa.rs

@@ -260,10 +260,11 @@ pub fn dissect_page(rel_path: &str, html: &str) -> Result<SpaPage, String> {
 
 /// Scan a page body for the hoistable-layout shape: ignoring whitespace,
 /// comments and top-level <script> blocks, the body must be EXACTLY ONE
-/// `<component src="…">` element. Returns (open_tag, src, inner_html).
+/// `<component src="…">` element or one tag named after a component
+/// (`<Layout>`). Returns (open_tag, src or tag name, inner_html).
 /// In-body scripts stay page code (they ride the fragment prelude), so they
 /// don't break the shape.
-pub fn detect_layout_root(raw_source: &str) -> Option<(String, String, String)> {
+pub fn detect_layout_root(raw_source: &str, component_names: &[&str]) -> Option<(String, String, String)> {
     let body_re = Regex::new(r"(?is)<body[^>]*>(.*)</body>").unwrap();
     let body_caps = body_re.captures(raw_source)?;
     let body_match = body_caps.get(1)?;
@@ -280,12 +281,21 @@ pub fn detect_layout_root(raw_source: &str) -> Option<(String, String, String)>
     let cleaned = page_style_re.replace_all(&cleaned, "");
     let trimmed = cleaned.trim();
 
-    let open_re = Regex::new(r#"(?is)^<component\b((?:"[^"]*"|'[^']*'|[^>"'])*)>"#).unwrap();
+    let open_re = Regex::new(r#"(?s)^<([A-Za-z][\w-]*)\b((?:"[^"]*"|'[^']*'|[^>"'])*)>"#).unwrap();
     let caps = open_re.captures(trimmed)?;
     let open_tag = caps.get(0).unwrap().as_str().to_string();
-    let attrs = caps.get(1).unwrap().as_str();
+    let name = caps.get(1).unwrap().as_str();
+    let attrs = caps.get(2).unwrap().as_str();
     let src_re = Regex::new(r#"(?i)src\s*=\s*"([^"]+)""#).unwrap();
-    let src = src_re.captures(attrs)?.get(1).unwrap().as_str().to_string();
+    let (src, tag_re) = if name.eq_ignore_ascii_case("component") {
+        let src = src_re.captures(attrs)?.get(1).unwrap().as_str().to_string();
+        (src, Regex::new(r"(?i)<component\b|</component\s*>").unwrap())
+    } else if component_names.contains(&name) {
+        let name = regex::escape(name);
+        (name.clone(), Regex::new(&format!(r"<{name}\b|</{name}\s*>")).unwrap())
+    } else {
+        return None;
+    };
 
     // Find the matching </component> by depth over a MASKED copy of the body:
     // comments, scripts and styles are space-filled at identical byte offsets,
@@ -306,7 +316,6 @@ pub fn detect_layout_root(raw_source: &str) -> Option<(String, String, String)>
     );
     let start = masked_body.find(open_tag.as_str())?;
     let after_open = start + open_tag.len();
-    let tag_re = Regex::new(r"(?i)<component\b|</component\s*>").unwrap();
     let mut depth = 1usize;
     let mut inner_end = None;
     for m in tag_re.find_iter(&masked_body[after_open..]) {
@@ -532,11 +541,12 @@ pub fn compose_shell(
     // state and timers persist, matching what a hand-written SPA shell does.
     match hoisted_layout {
         Some((open_tag, _src)) => {
+            let name = open_tag[1..].split(|c: char| c.is_whitespace() || c == '>').next().unwrap();
             html.push_str("    ");
             html.push_str(open_tag);
             html.push('\n');
             html.push_str("      <component src=\"@[page.src]\" key=\"@[page.path]\"></component>\n");
-            html.push_str("    </component>\n");
+            html.push_str(&format!("    </{}>\n", name));
         }
         None => {
             html.push_str("    <component src=\"@[page.src]\" key=\"@[page.path]\"></component>\n");

package/src/parser/html.rs

@@ -94,7 +94,6 @@ impl HtmlParser {
     }
 
     /// Get all loaded elements
-    #[allow(dead_code)]
     pub fn elements(&self) -> &ElementCache {
         &self.cache
     }