Use shared pgml_components library

postgresml · levkk · Sep 6, 2023 · Sep 6, 2023 · Sep 6, 2023 · Sep 6, 2023
commit a59fd57c2bd7a959138a2595526197ee1c39e715
diff --git a/packages/pgml-components/src/lib.rs b/packages/pgml-components/src/lib.rs
@@ -1,14 +1,56 @@
-pub fn add(left: usize, right: usize) -> usize {
-    left + right
+#![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_export]
+macro_rules! component {
+    ($name:tt) => {
+        impl From<$name> for pgml_components::Component {
+            fn from(thing: $name) -> pgml_components::Component {
+                use sailfish::TemplateOnce;
+
+                pgml_components::Component {
+                    value: thing.render_once().unwrap(),
+                }
+            }
+        }
+    };
+
+    ($name:tt, $lifetime:lifetime) => {
+        impl<$lifetime> From<$name<$lifetime>> for pgml_components::Component {
+            fn from(thing: $name<$lifetime>) -> pgml_components::Component {
+                use sailfish::TemplateOnce;
+
+                pgml_components::Component {
+                    value: thing.render_once().unwrap(),
+                }
+            }
+        }
+    };
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
+// pub use component;
+
+// Render any string.
+impl From<&str> for Component {
+    fn from(value: &str) -> Component {
+        Component {
+            value: value.to_owned(),
+        }
+    }
+}
 
-    #[test]
-    fn it_works() {
-        let result = add(2, 2);
-        assert_eq!(result, 4);
+// Render any string.
+impl From<String> for Component {
+    fn from(value: String) -> Component {
+        Component { value }
     }
 }
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.14"
+version = "0.1.15"
 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
diff --git a/pgml-apps/cargo-pgml-components/src/components/component.rs b/pgml-apps/cargo-pgml-components/src/components/component.rs
diff --git a/pgml-apps/cargo-pgml-components/src/components/mod.rs b/pgml-apps/cargo-pgml-components/src/components/mod.rs
diff --git a/pgml-apps/cargo-pgml-components/src/frontend/components.rs b/pgml-apps/cargo-pgml-components/src/frontend/components.rs
@@ -171,12 +171,12 @@ pub fn add(path: &Path, overwrite: bool) {
 
 /// Update `mod.rs` with all the components in `src/components`.
 pub fn update_modules() {
-    update_module(Path::new(COMPONENT_DIRECTORY), true);
+    update_module(Path::new(COMPONENT_DIRECTORY));
 }
 
 /// Recusively write `mod.rs` in every Rust module directory
 /// that has other modules in it.
-fn update_module(path: &Path, root: bool) {
+fn update_module(path: &Path) {
     debug!("updating {} module", path.display());
     let mut modules = Vec::new();
     let mut paths: Vec<_> = unwrap_or_exit!(read_dir(path))
@@ -192,7 +192,7 @@ fn update_module(path: &Path, root: bool) {
 
         if has_more_modules(&path) {
             debug!("{} has more modules", path.display());
-            update_module(&path, false);
+            update_module(&path);
         } else {
             debug!("it does not really no");
         }
@@ -206,7 +206,7 @@ fn update_module(path: &Path, root: bool) {
 
     let components_mod = path.join("mod.rs");
     let modules =
-        unwrap_or_exit!(templates::Mod { modules, root }.render_once()).replace("\n\n", "\n");
+        unwrap_or_exit!(templates::Mod { modules }.render_once()).replace("\n\n", "\n");
 
     let existing_modules = if components_mod.is_file() {
         unwrap_or_exit!(read_to_string(&components_mod))

diff --git a/pgml-apps/cargo-pgml-components/src/frontend/templates/component.rs.tpl b/pgml-apps/cargo-pgml-components/src/frontend/templates/component.rs.tpl
@@ -1,5 +1,5 @@
 use sailfish::TemplateOnce;
-use crate::components::component;
+use pgml_components::component;
 
 #[derive(TemplateOnce, Default)]
 #[template(path = "<%= component.path() %>/template.html")]

diff --git a/pgml-apps/cargo-pgml-components/src/frontend/templates/mod.rs b/pgml-apps/cargo-pgml-components/src/frontend/templates/mod.rs
@@ -48,7 +48,6 @@ impl Stimulus {
 #[template(path = "frontend/templates/mod.rs.tpl")]
 pub struct Mod {
     pub modules: Vec<ComponentModel>,
-    pub root: bool,
 }
 
 #[derive(TemplateOnce)]

diff --git a/pgml-apps/cargo-pgml-components/src/frontend/templates/mod.rs.tpl b/pgml-apps/cargo-pgml-components/src/frontend/templates/mod.rs.tpl
@@ -1,10 +1,6 @@
 // This file is automatically generated.
 // You shouldn't modify it manually.
 
-<% if root { %>
-pub mod component;
-pub use component::{component, Component};
-<% } %>
 <% for component in modules.iter() { %>
 // <%= component.full_path() %>
 pub mod <%= component.name() %>;

diff --git a/pgml-apps/cargo-pgml-components/src/main.rs b/pgml-apps/cargo-pgml-components/src/main.rs
@@ -9,7 +9,6 @@ use std::path::Path;
 extern crate log;
 
 mod backend;
-mod components;
 mod frontend;
 mod util;
 use util::{info, unwrap_or_exit};
@@ -106,7 +105,6 @@ 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-dashboard/Cargo.lock b/pgml-dashboard/Cargo.lock
diff --git a/pgml-dashboard/Cargo.toml b/pgml-dashboard/Cargo.toml
@@ -44,3 +44,4 @@ zoomies = { git="https://github.com/HyperparamAI/zoomies.git", branch="master" }
 pgvector = { version = "0.2.2", features = [ "sqlx", "postgres" ] }
 console-subscriber = "*"
 glob = "*"
+pgml-components = { path = "../packages/pgml-components" }
diff --git a/pgml-dashboard/src/components/breadcrumbs/mod.rs b/pgml-dashboard/src/components/breadcrumbs/mod.rs
@@ -1,5 +1,5 @@
-use crate::components::component;
 use crate::components::NavLink;
+use pgml_components::component;
 use sailfish::TemplateOnce;
 
 #[derive(TemplateOnce)]

diff --git a/pgml-dashboard/src/components/component.rs b/pgml-dashboard/src/components/component.rs
diff --git a/pgml-dashboard/src/components/confirm_modal/mod.rs b/pgml-dashboard/src/components/confirm_modal/mod.rs
@@ -1,4 +1,4 @@
-use crate::components::component;
+use pgml_components::component;
 use sailfish::TemplateOnce;
 
 #[derive(TemplateOnce)]

diff --git a/pgml-dashboard/src/components/dropdown/mod.rs b/pgml-dashboard/src/components/dropdown/mod.rs
@@ -1,5 +1,5 @@
-use crate::components::component;
-use crate::components::component::Component;
+use pgml_components::component;
+use pgml_components::Component;
 use sailfish::TemplateOnce;
 
 use crate::components::StaticNavLink;

diff --git a/pgml-dashboard/src/components/github_icon/mod.rs b/pgml-dashboard/src/components/github_icon/mod.rs
@@ -1,4 +1,4 @@
-use crate::components::component;
+use pgml_components::component;
 use sailfish::TemplateOnce;
 
 #[derive(TemplateOnce, Default)]

diff --git a/pgml-dashboard/src/components/left_nav_menu/mod.rs b/pgml-dashboard/src/components/left_nav_menu/mod.rs
@@ -1,5 +1,5 @@
-use crate::components::component;
 use crate::components::StaticNav;
+use pgml_components::component;
 use sailfish::TemplateOnce;
 
 #[derive(TemplateOnce)]

diff --git a/pgml-dashboard/src/components/left_nav_web_app/mod.rs b/pgml-dashboard/src/components/left_nav_web_app/mod.rs
@@ -1,4 +1,4 @@
-use crate::components::component;
+use pgml_components::component;
 use sailfish::TemplateOnce;
 
 use crate::components::StaticNav;

diff --git a/pgml-dashboard/src/components/mod.rs b/pgml-dashboard/src/components/mod.rs
@@ -1,9 +1,6 @@
 // This file is automatically generated.
 // You shouldn't modify it manually.
 
-pub mod component;
-pub use component::{component, Component};
-
 // src/components/breadcrumbs
 pub mod breadcrumbs;
 pub use breadcrumbs::Breadcrumbs;

diff --git a/pgml-dashboard/src/components/modal/mod.rs b/pgml-dashboard/src/components/modal/mod.rs
@@ -1,4 +1,4 @@
-use crate::components::{component, Component};
+use pgml_components::{component, Component};
 use sailfish::TemplateOnce;
 
 /// A component that renders a Bootstrap modal.

diff --git a/pgml-dashboard/src/components/nav/mod.rs b/pgml-dashboard/src/components/nav/mod.rs
@@ -1,5 +1,5 @@
-use crate::components::component;
 use crate::components::nav_link::NavLink;
+use pgml_components::component;
 use sailfish::TemplateOnce;
 
 #[derive(TemplateOnce, Clone, Default, Debug)]

diff --git a/pgml-dashboard/src/components/navbar/mod.rs b/pgml-dashboard/src/components/navbar/mod.rs
@@ -1,6 +1,6 @@
-use crate::components::component;
 use crate::models;
 use crate::utils::config;
+use pgml_components::component;
 use sailfish::TemplateOnce;
 
 #[derive(TemplateOnce)]