Include the macro (#973)

levkk · web-flow · commit c232826ab49b · 2023-08-31T17:59:42.000-07:00
diff --git a/pgml-apps/cargo-pgml-components/Cargo.toml b/pgml-apps/cargo-pgml-components/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cargo-pgml-components"
-version = "0.1.10"
+version = "0.1.11"
 edition = "2021"
 authors = ["PostgresML <team@postgresml.org>"]
 license = "MIT"
diff --git a/pgml-apps/cargo-pgml-components/src/components/component.html b/pgml-apps/cargo-pgml-components/src/components/component.html
@@ -0,0 +1 @@
+<%- value %>
diff --git a/pgml-apps/cargo-pgml-components/src/components/component.rs b/pgml-apps/cargo-pgml-components/src/components/component.rs
@@ -0,0 +1,55 @@
+#![allow(dead_code, unused_macros, unused_imports)]
+//! A basic UI component. Any other component can accept this
+//! as a parameter and render it.
+
+use sailfish::TemplateOnce;
+
+#[derive(Default, Clone, TemplateOnce)]
+#[template(path = "components/component.html")]
+pub struct Component {
+    pub value: String,
+}
+
+macro_rules! component {
+    ($name:tt) => {
+        impl From<$name> for crate::components::Component {
+            fn from(thing: $name) -> crate::components::Component {
+                use sailfish::TemplateOnce;
+
+                crate::components::Component {
+                    value: thing.render_once().unwrap(),
+                }
+            }
+        }
+    };
+
+    ($name:tt, $lifetime:lifetime) => {
+        impl<$lifetime> From<$name<$lifetime>> for crate::components::Component {
+            fn from(thing: $name<$lifetime>) -> crate::components::Component {
+                use sailfish::TemplateOnce;
+
+                crate::components::Component {
+                    value: thing.render_once().unwrap(),
+                }
+            }
+        }
+    };
+}
+
+pub(crate) use component;
+
+// Render any string.
+impl From<&str> for Component {
+    fn from(value: &str) -> Component {
+        Component {
+            value: value.to_owned(),
+        }
+    }
+}
+
+// Render any string.
+impl From<String> for Component {
+    fn from(value: String) -> Component {
+        Component { value }
+    }
+}
diff --git a/pgml-apps/cargo-pgml-components/src/components/mod.rs b/pgml-apps/cargo-pgml-components/src/components/mod.rs
@@ -0,0 +1,32 @@
+use crate::util::{compare_strings, info, unwrap_or_exit, write_to_file};
+use std::fs::read_to_string;
+use std::path::Path;
+
+static COMPONENT_PATH: &str = "src/components/component.rs";
+static COMPONENT_TEMPLATE: &str = "templates/components/component.html";
+
+pub mod component;
+
+pub fn install() {
+    let source = include_str!("component.rs");
+    let template = include_str!("component.html");
+
+    compare_and_install(Path::new(COMPONENT_PATH), source);
+    compare_and_install(Path::new(COMPONENT_TEMPLATE), template);
+}
+
+fn compare_and_install(path: &Path, source: &str) {
+    if !path.exists() {
+        debug!("{} doesn't exist", path.display());
+        info(&format!("written {}", path.display()));
+        unwrap_or_exit!(write_to_file(&path, &source));
+    } else {
+        let template_source = unwrap_or_exit!(read_to_string(path));
+
+        if !compare_strings(&template_source, source) {
+            debug!("{} is different", path.display());
+            unwrap_or_exit!(write_to_file(&path, &source));
+            info(&format!("written {}", path.display()));
+        }
+    }
+}
diff --git a/pgml-apps/cargo-pgml-components/src/frontend/components.rs b/pgml-apps/cargo-pgml-components/src/frontend/components.rs
@@ -133,7 +133,7 @@ pub fn update_modules() {
     let modules = unwrap_or_exit!(templates::Mod { modules }.render_once());
     let existing_modules = unwrap_or_exit!(read_to_string(COMPONENT_MOD));
 
-    if !unwrap_or_exit!(compare_strings(&modules, &existing_modules)) {
+    if !compare_strings(&modules, &existing_modules) {
         debug!("mod.rs is different");
         unwrap_or_exit!(write_to_file(&Path::new(COMPONENT_MOD), &modules));
         info(&format!("written {}", COMPONENT_MOD));
diff --git a/pgml-apps/cargo-pgml-components/src/main.rs b/pgml-apps/cargo-pgml-components/src/main.rs
@@ -8,12 +8,19 @@ use std::path::Path;
 #[macro_use]
 extern crate log;
 
+mod components;
 mod frontend;
 mod util;
 use util::{info, unwrap_or_exit};
 
 /// These paths are exepcted to exist in the project directory.
-static PROJECT_PATHS: &[&str] = &["src", "static/js", "static/css"];
+static PROJECT_PATHS: &[&str] = &[
+    "src",
+    "static/js",
+    "static/css",
+    "templates/components",
+    "src/components",
+];
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None, propagate_version = true, bin_name = "cargo", name = "cargo")]
@@ -98,6 +105,7 @@ fn validate_project(project_path: Option<String>) {
     }
 
     unwrap_or_exit!(set_current_dir(path));
+    components::install();
 }
 
 /// Bundle SASS and JavaScript into neat bundle files.
diff --git a/pgml-apps/cargo-pgml-components/src/util.rs b/pgml-apps/cargo-pgml-components/src/util.rs
@@ -84,10 +84,10 @@ pub fn compare_files(path1: &Path, path2: &Path) -> std::io::Result<bool> {
     let content1 = read_to_string(path1)?;
     let content2 = read_to_string(path2)?;
 
-    compare_strings(&content1, &content2)
+    Ok(compare_strings(&content1, &content2))
 }
 
-pub fn compare_strings(string1: &str, string2: &str) -> std::io::Result<bool> {
+pub fn compare_strings(string1: &str, string2: &str) -> bool {
     // TODO: faster string comparison method needed.
-    Ok(string1 == string2)
+    string1.trim() == string2.trim()
 }
diff --git a/pgml-dashboard/src/components/component.rs b/pgml-dashboard/src/components/component.rs
@@ -1,3 +1,4 @@
+#![allow(dead_code, unused_macros, unused_imports)]
 //! A basic UI component. Any other component can accept this
 //! as a parameter and render it.
 

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,10 @@ pub fn compare_files(path1: &Path, path2: &Path) -> std::io::Result<bool> {`
`84`	`84`	`let content1 = read_to_string(path1)?;`
`85`	`85`	`let content2 = read_to_string(path2)?;`
`86`	`86`
`87`		`- compare_strings(&content1, &content2)`
	`87`	`+ Ok(compare_strings(&content1, &content2))`
`88`	`88`	`}`
`89`	`89`
`90`		`-pub fn compare_strings(string1: &str, string2: &str) -> std::io::Result<bool> {`
	`90`	`+pub fn compare_strings(string1: &str, string2: &str) -> bool {`
`91`	`91`	`// TODO: faster string comparison method needed.`
`92`		`- Ok(string1 == string2)`
	`92`	`+ string1.trim() == string2.trim()`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#![allow(dead_code, unused_macros, unused_imports)]`
`1`	`2`	`//! A basic UI component. Any other component can accept this`
`2`	`3`	`//! as a parameter and render it.`
`3`	`4`