@tishlang/tish 1.0.10 → 1.0.12

package/crates/tish_compile_js/src/tests_jsx.rs

@@ -1,8 +1,10 @@
 #[cfg(test)]
 mod tests {
+    use std::io::Write;
+
     use tish_parser::parse;
 
-    use crate::{compile_with_jsx, JsxMode};
+    use crate::{compile_project_with_jsx, compile_with_jsx, JsxMode};
 
     #[test]
     fn lattish_jsx_emits_h_with_children_array() {
@@ -21,6 +23,54 @@ mod tests {
         assert!(js.contains("h(Fragment, null, ["));
     }
 
+    #[test]
+    fn jsx_text_whitespace_coalesced() {
+        let src = r#"fn X() { return <p>First paragraph</p> }"#;
+        let program = parse(src).unwrap();
+        let js = compile_with_jsx(&program, false, JsxMode::LattishH).unwrap();
+        assert!(
+            js.contains("\"First paragraph\""),
+            "expected \"First paragraph\" in output, got: {}",
+            &js[..400.min(js.len())]
+        );
+        assert!(
+            !js.contains("\"First\", \"paragraph\""),
+            "text should be coalesced, not split"
+        );
+    }
+
+    #[test]
+    fn jsx_text_whitespace_coalesced_multiline() {
+        let src = "fn App() {\n  return <p>First paragraph</p>\n}";
+        let program = parse(src).unwrap();
+        let js = compile_with_jsx(&program, false, JsxMode::LattishH).unwrap();
+        assert!(
+            js.contains("\"First paragraph\""),
+            "multiline: expected \"First paragraph\", got: {}",
+            &js[..400.min(js.len())]
+        );
+    }
+
+    #[test]
+    fn jsx_text_whitespace_via_compile_project() {
+        let dir = std::env::temp_dir().join("tish_compile_project_test");
+        let _ = std::fs::create_dir_all(&dir);
+        let path = dir.join("test.tish");
+        let src = "fn App() {\n  return <p>First paragraph</p>\n}";
+        let mut f = std::fs::File::create(&path).unwrap();
+        f.write_all(src.as_bytes()).unwrap();
+        f.sync_all().unwrap();
+        drop(f);
+        let js = compile_project_with_jsx(&path, Some(&dir), false, JsxMode::LattishH)
+            .expect("compile_project_with_jsx failed");
+        assert!(
+            js.contains("\"First paragraph\""),
+            "compile_project: expected \"First paragraph\", got: {}",
+            &js[..500.min(js.len())]
+        );
+        let _ = std::fs::remove_file(&path);
+    }
+
     #[test]
     fn vdom_emits_vdom_h() {
         let src = r#"fn X() { return <p/> }"#;

package/crates/tish_jsx_web/vendor/Lattish.tish

@@ -27,6 +27,21 @@ export fn h(tag, props, children) {
   if (children === undefined || children === null) {
     children = []
   }
+  if (typeof tag === "function") {
+    let p = props && props !== null ? props : {}
+    if (children.length > 0) {
+      let newProps = {}
+      let keys = Object.keys(p)
+      let i = 0
+      while (i < keys.length) {
+        newProps[keys[i]] = p[keys[i]]
+        i = i + 1
+      }
+      newProps.children = children
+      p = newProps
+    }
+    return tag(p)
+  }
   if (tag === Fragment) {
     let f = document.createDocumentFragment()
     let i = 0

package/crates/tish_parser/src/parser.rs

@@ -1561,6 +1561,17 @@ impl<'a> Parser<'a> {
         })
     }
 
+    /// Push text child, merging with previous Text if any (preserves spaces between tokens).
+    fn push_or_merge_text(&self, children: &mut Vec<JsxChild>, s: Arc<str>) {
+        if let Some(JsxChild::Text(prev)) = children.last() {
+            let merged = format!("{} {}", prev.as_ref(), s.as_ref());
+            let last = children.len() - 1;
+            children[last] = JsxChild::Text(Arc::from(merged.as_str()));
+        } else {
+            children.push(JsxChild::Text(s));
+        }
+    }
+
     /// Parse JSX children until </Tag> or </>
     fn parse_jsx_children(&mut self, close_tag: &str) -> Result<Vec<JsxChild>, String> {
         let mut children = Vec::new();
@@ -1601,7 +1612,7 @@ impl<'a> Parser<'a> {
                     let t = self.advance().unwrap();
                     let s = t.literal.clone().unwrap_or_default();
                     if !s.is_empty() {
-                        children.push(JsxChild::Text(s));
+                        self.push_or_merge_text(&mut children, s);
                     }
                 }
                 Some(TokenKind::Ident) => {
@@ -1609,7 +1620,7 @@ impl<'a> Parser<'a> {
                     let t = self.advance().unwrap();
                     let s = t.literal.clone().unwrap_or_default();
                     if !s.is_empty() {
-                        children.push(JsxChild::Text(s));
+                        self.push_or_merge_text(&mut children, s);
                     }
                 }
                 _ => {
@@ -1659,7 +1670,14 @@ impl<'a> Parser<'a> {
                     let t = self.advance().unwrap();
                     let s = t.literal.clone().unwrap_or_default();
                     if !s.is_empty() {
-                        children.push(JsxChild::Text(s));
+                        self.push_or_merge_text(&mut children, s);
+                    }
+                }
+                Some(TokenKind::Ident) => {
+                    let t = self.advance().unwrap();
+                    let s = t.literal.clone().unwrap_or_default();
+                    if !s.is_empty() {
+                        self.push_or_merge_text(&mut children, s);
                     }
                 }
                 _ => return Err(format!("Unexpected token in JSX fragment: {:?}", self.peek_kind())),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tishlang/tish",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Tish - minimal TS/JS-compatible language. Run, REPL, compile to native.",
   "license": "SEE LICENSE IN LICENSE",
   "repository": {