@ape-egg/vibe-compiler 4.3.3 → 4.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ape-egg/vibe-compiler",
-  "version": "4.3.3",
+  "version": "4.3.6",
   "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.3"
+version = "4.3.6"
 dependencies = [
  "clap",
  "colored",

package/src/Cargo.toml

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

package/src/parser/html.rs

@@ -653,6 +653,51 @@ fn is_iter_prop_root(template: &str) -> bool {
 /// literal props inject the value (bare boolean attrs → true, strings
 /// JSON-quoted, numerics raw).
 fn substitute_props(template: &str, props: &[(String, String)]) -> String {
+    let raw_text_re =
+        regex::Regex::new(r"(?is)(<(?:script|style)\b[^>]*>)(.*?)(</(?:script|style)\s*>)").unwrap();
+
+    let mut out = String::with_capacity(template.len());
+    let mut last = 0;
+    for caps in raw_text_re.captures_iter(template) {
+        let whole = caps.get(0).unwrap();
+        out.push_str(&substitute_props_in(&template[last..whole.start()], props, true));
+        out.push_str(&substitute_props_in(caps.get(1).unwrap().as_str(), props, true));
+        out.push_str(&substitute_props_in(caps.get(2).unwrap().as_str(), props, false));
+        out.push_str(caps.get(3).unwrap().as_str());
+        last = whole.end();
+    }
+    out.push_str(&substitute_props_in(&template[last..], props, true));
+    out
+}
+
+fn escape_attr_value(value: &str) -> String {
+    value
+        .replace('&', "&amp;")
+        .replace('"', "&quot;")
+        .replace('\'', "&#39;")
+}
+
+fn decode_entities(value: &str) -> String {
+    value
+        .replace("&quot;", "\"")
+        .replace("&#34;", "\"")
+        .replace("&apos;", "'")
+        .replace("&#39;", "'")
+        .replace("&lt;", "<")
+        .replace("&gt;", ">")
+        .replace("&nbsp;", "\u{a0}")
+        .replace("&amp;", "&")
+}
+
+fn substitute_props_in(template: &str, props: &[(String, String)], entity_decoded: bool) -> String {
+    let escaped = |value: &str| {
+        if entity_decoded {
+            escape_attr_value(value)
+        } else {
+            value.to_string()
+        }
+    };
+
     let binding_re = regex::Regex::new(r"@\[([^\]]+)\]").unwrap();
     let directive_re = regex::Regex::new(r"(?s)<!--\s*(if|else if|each)\s+(.*?)\s*-->").unwrap();
     let event_re = regex::Regex::new(r#"\bon(\w+)="([^"]*)""#).unwrap();
@@ -660,7 +705,8 @@ fn substitute_props(template: &str, props: &[(String, String)]) -> String {
 
     let mut html = template.to_string();
 
-    for (prop_name, prop_value) in props {
+    for (prop_name, raw_value) in props {
+        let prop_value = decode_entities(raw_value);
         let exact_re =
             regex::Regex::new(&format!(r"(?i)@\[{}\]", regex::escape(prop_name))).unwrap();
 
@@ -668,23 +714,31 @@ fn substitute_props(template: &str, props: &[(String, String)]) -> String {
             .strip_prefix("@[")
             .and_then(|v| v.strip_suffix(']'));
 
-        let (exact_repl, ident_repl, each_repl, state_repl) = if let Some(path) = binding_path {
-            (
-                format!("@[{}]", path),
-                format!("({})", path),
-                path.to_string(),
-                path.to_string(),
-            )
-        } else {
-            let literal = if prop_value.is_empty() {
-                "true".to_string()
-            } else if numeric_re.is_match(prop_value) {
-                prop_value.clone()
+        let (exact_repl, ident_repl, directive_repl, each_repl, state_repl) =
+            if let Some(path) = binding_path {
+                (
+                    format!("@[{}]", path),
+                    format!("({})", path),
+                    format!("({})", path),
+                    path.to_string(),
+                    path.to_string(),
+                )
             } else {
-                serde_json::to_string(prop_value).unwrap()
+                let literal = if prop_value.is_empty() {
+                    "true".to_string()
+                } else if numeric_re.is_match(&prop_value) {
+                    prop_value.clone()
+                } else {
+                    serde_json::to_string(&prop_value).unwrap()
+                };
+                (
+                    escaped(&prop_value),
+                    escaped(&literal),
+                    literal.clone(),
+                    literal.clone(),
+                    escaped(&literal),
+                )
             };
-            (prop_value.clone(), literal.clone(), literal.clone(), literal)
-        };
 
         html = exact_re
             .replace_all(&html, regex::NoExpand(exact_repl.as_str()))
@@ -706,7 +760,7 @@ fn substitute_props(template: &str, props: &[(String, String)]) -> String {
             .replace_all(&html, |c: &regex::Captures| {
                 let kw = c.get(1).unwrap().as_str();
                 let expr = c.get(2).unwrap().as_str();
-                let repl = if kw == "each" { each_repl.as_str() } else { ident_repl.as_str() };
+                let repl = if kw == "each" { each_repl.as_str() } else { directive_repl.as_str() };
                 let rewritten = substitute_identifier(expr, prop_name, repl);
                 if rewritten == expr {
                     c.get(0).unwrap().as_str().to_string()