@ape-egg/vibe-compiler 4.2.0 → 4.2.1

package/package.json

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

package/src/Cargo.toml

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

package/src/compiler/iteration_optimizer.rs

@@ -1,7 +1,7 @@
 use regex::Regex;
 use serde::{Serialize, Deserialize};
 use std::collections::HashMap;
-use crate::constants::NAMEBIND_ATTR;
+use crate::constants::{NAMEBIND_ATTR, DEFER_ATTR_PREFIX, INTERNAL_ATTR_PREFIX};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -180,6 +180,55 @@ fn restore_relocated_name_bindings(template: &str) -> String {
         .to_string()
 }
 
+fn map_tag_spans(html: &str, f: impl Fn(&str) -> String) -> String {
+    let bytes = html.as_bytes();
+    let mut out = String::with_capacity(html.len());
+    let mut i = 0;
+    while i < bytes.len() {
+        let Some(rel) = html[i..].find('<') else {
+            out.push_str(&html[i..]);
+            break;
+        };
+        let lt = i + rel;
+        out.push_str(&html[i..lt]);
+        let mut j = lt + 1;
+        let mut quote = None;
+        while j < bytes.len() {
+            let c = bytes[j];
+            match quote {
+                Some(q) if c == q => quote = None,
+                Some(_) => {}
+                None if c == b'"' || c == b'\'' => quote = Some(c),
+                None if c == b'>' => break,
+                None => {}
+            }
+            j += 1;
+        }
+        let span = &html[lt..(j + 1).min(bytes.len())];
+        let is_tag = span.len() > 1
+            && span[1..].trim_start_matches('/').starts_with(|c: char| c.is_ascii_alphabetic());
+        if is_tag { out.push_str(&f(span)) } else { out.push_str(span) }
+        i = j + 1;
+    }
+    out
+}
+
+fn unpark_deferred_attrs(template: &str) -> String {
+    let deferred = Regex::new(&format!(r"(\s){}([\w-]+)", DEFER_ATTR_PREFIX)).unwrap();
+    let internal = &INTERNAL_ATTR_PREFIX[DEFER_ATTR_PREFIX.len()..];
+    map_tag_spans(template, |tag| {
+        deferred
+            .replace_all(tag, |caps: &regex::Captures| {
+                if caps[2].starts_with(internal) {
+                    caps[0].to_string()
+                } else {
+                    format!("{}{}", &caps[1], &caps[2])
+                }
+            })
+            .to_string()
+    })
+}
+
 fn is_value_style_attr(name: &str) -> bool {
     VALUE_ATTRS.contains(&name)
         || name.starts_with("data-")
@@ -235,7 +284,7 @@ fn emit_template_literal(template: &str) -> String {
     // expression has whitespace, so it could not be an HTML attribute name) back to the
     // `@[expr]=""` form the binding pass below renders as ` resolvedName=""`. The compiled
     // twin of the same step in runtime/iterate.js compileBatchFn.
-    let template = &restore_relocated_name_bindings(template);
+    let template = &unpark_deferred_attrs(&restore_relocated_name_bindings(template));
 
     let each_re = Regex::new(r"<!--\s*each\s+([^\s]+)\s+as\s+([^\s,]+)(?:\s*,\s*([^\s]+))?\s*-->").unwrap();
     let end_re = Regex::new(r"<!--\s*/each\s*-->").unwrap();
@@ -416,6 +465,27 @@ mod tests {
         assert!(compiled.batch_fn.contains(r#"value="${item.v}""#));
     }
 
+    #[test]
+    fn test_deferred_attr_binding_lands_under_its_real_name() {
+        let html = r#"
+            <!-- each shots as shot -->
+            <img data-vibe-src="@[shot.thumb]" data-vibe-glow="@[shot.on]" data-vibe-alt="shot @[shot.n]" data-vibe-internal-component-id="_c1">
+            <!-- /each -->
+        "#;
+
+        let opts = build_iteration_optimizations(html);
+        let iterations = &opts.unwrap().iterations;
+        let (_, compiled) = iterations.iter().next().unwrap();
+
+        assert!(compiled.batch_fn.contains(r#" src="${shot.thumb}""#));
+        assert!(compiled.batch_fn.contains(r#"${(shot.on) ? ' glow=""' : ''}"#));
+        assert!(compiled.batch_fn.contains(r#" alt="shot ${shot.n}""#));
+        assert!(compiled.batch_fn.contains(r#"data-vibe-internal-component-id="_c1""#));
+        assert!(!compiled.batch_fn.contains("data-vibe-src"));
+        assert!(!compiled.batch_fn.contains("data-vibe-glow"));
+        assert!(!compiled.batch_fn.contains("data-vibe-alt"));
+    }
+
     #[test]
     fn test_unsafe_template_skips_batch_fn() {
         let html = r#"

package/src/constants.rs

@@ -1,7 +1,4 @@
 pub const DEFER_ATTR_PREFIX: &str = "data-vibe-";
-// Declared for the JS↔Rust drift check; the compiler only ever names the
-// derived attributes below, and narrowing to internal is DEFER_ATTR_PREFIX's job.
-#[allow(dead_code)]
 pub const INTERNAL_ATTR_PREFIX: &str = "data-vibe-internal-";
 pub const COMPONENT_ID_ATTR: &str = "data-vibe-internal-component-id";
 pub const NAMEBIND_ATTR: &str = "data-vibe-internal-namebind";