Decouple component and field macro crates from the library crates (#47)

* Decouple cgp-component-macro crate from cgp-component * Decouple cgp-field-macro from cgp-field * Reformat Cargo.toml files * Add changelog
contextgeneric · Jan 5, 2025 · 9a79e8e · 9a79e8e
1 parent 25581f3
commit 9a79e8e
Show file tree

Hide file tree

Showing 25 changed files with 64 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v0.3.0 (pre-release)
+
+- Decouple component and field macro crates from the library crates - [#47](https://github.com/contextgeneric/cgp/pull/47)
+    - Remove `cgp-component-macro` crate from being a dependency of `cgp-component`.
+    - Remove `cgp-field-macro` crate from being a dependency of `cgp-field`.
+
 ## v0.2.0 (2025-12-08)
 
 - Rename `define_components!` to `cgp_preset!` with slight improvement - [#41](https://github.com/contextgeneric/cgp/pull/41)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cgp-async-macro/Cargo.toml b/crates/cgp-async-macro/Cargo.toml
@@ -17,6 +17,6 @@ proc-macro = true
 [features]
 
 [dependencies]
-syn = { version = "2.0.90", features = [ "full" ] }
-quote = "1.0.33"
+syn         = { version = "2.0.90", features = [ "full" ] }
+quote       = "1.0.33"
 proc-macro2 = "1.0.92"
diff --git a/crates/cgp-async/Cargo.toml b/crates/cgp-async/Cargo.toml
@@ -26,4 +26,4 @@ static = [ "async" ]
 
 [dependencies]
 cgp-async-macro = { version = "0.2.0" }
-cgp-sync = { version = "0.2.0" }
+cgp-sync        = { version = "0.2.0" }
diff --git a/crates/cgp-component-macro-lib/Cargo.toml b/crates/cgp-component-macro-lib/Cargo.toml
@@ -12,8 +12,8 @@ description  = """
 """
 
 [dependencies]
-syn = { version = "2.0.90", features = [ "full", "extra-traits" ] }
-quote = "1.0.33"
-proc-macro2 = "1.0.92"
-itertools = "0.13.0"
-prettyplease = "0.2.25"
+syn             = { version = "2.0.90", features = [ "full", "extra-traits" ] }
+quote           = "1.0.33"
+proc-macro2     = "1.0.92"
+itertools       = "0.13.0"
+prettyplease    = "0.2.25"
diff --git a/crates/cgp-component-macro/Cargo.toml b/crates/cgp-component-macro/Cargo.toml
@@ -15,5 +15,4 @@ description  = """
 proc-macro = true
 
 [dependencies]
-cgp-component-macro-lib = { version = "0.2.0" }
-proc-macro2     = "1.0.92"
+cgp-component-macro-lib = { version = "0.2.0" }
diff --git a/crates/cgp-component/Cargo.toml b/crates/cgp-component/Cargo.toml
@@ -12,4 +12,3 @@ description  = """
 """
 
 [dependencies]
-cgp-component-macro = { version = "0.2.0" }
diff --git a/crates/cgp-component/src/lib.rs b/crates/cgp-component/src/lib.rs
@@ -8,8 +8,5 @@
 pub mod traits;
 pub mod types;
 
-pub use cgp_component_macro::{
-    cgp_component, cgp_preset, delegate_components, for_each_replace, replace_with,
-};
 pub use traits::{DelegateComponent, HasComponents};
 pub use types::{UseContext, UseDelegate, WithContext, WithProvider};
diff --git a/crates/cgp-core/Cargo.toml b/crates/cgp-core/Cargo.toml
@@ -16,9 +16,11 @@ default = [ "full" ]
 full = [ "cgp-async/full" ]
 
 [dependencies]
-cgp-async       = { version = "0.2.0", default-features = false }
-cgp-component   = { version = "0.2.0" }
-cgp-type        = { version = "0.2.0" }
-cgp-error       = { version = "0.2.0" }
-cgp-field       = { version = "0.2.0" }
-cgp-inner       = { version = "0.2.0" }
+cgp-async           = { version = "0.2.0", default-features = false }
+cgp-component       = { version = "0.2.0" }
+cgp-component-macro = { version = "0.2.0" }
+cgp-type            = { version = "0.2.0" }
+cgp-error           = { version = "0.2.0" }
+cgp-field           = { version = "0.2.0" }
+cgp-field-macro     = { version = "0.2.0" }
+cgp-inner           = { version = "0.2.0" }
diff --git a/crates/cgp-core/src/prelude.rs b/crates/cgp-core/src/prelude.rs
@@ -1,9 +1,8 @@
 pub use cgp_async::{async_trait, Async, MaybeSend, MaybeStatic, MaybeSync};
-pub use cgp_component::{
+pub use cgp_component::{DelegateComponent, HasComponents};
+pub use cgp_component_macro::{
     cgp_component, cgp_preset, delegate_components, for_each_replace, replace_with,
-    DelegateComponent, HasComponents,
 };
 pub use cgp_error::{CanRaiseError, HasErrorType};
-pub use cgp_field::{
-    product, symbol, Char, Cons, Either, HasField, HasFieldMut, Nil, Product, Sum, Void,
-};
+pub use cgp_field::{Char, Cons, Either, HasField, HasFieldMut, Nil, Void};
+pub use cgp_field_macro::{product, symbol, HasField, Product, Sum};
diff --git a/crates/cgp-error-std/Cargo.toml b/crates/cgp-error-std/Cargo.toml
@@ -12,4 +12,4 @@ description  = """
 """
 
 [dependencies]
-cgp-core    = { version = "0.2.0", default-features = false }
+cgp-core = { version = "0.2.0", default-features = false }
diff --git a/crates/cgp-error/Cargo.toml b/crates/cgp-error/Cargo.toml
@@ -12,6 +12,7 @@ description  = """
 """
 
 [dependencies]
-cgp-async       = { version = "0.2.0", default-features = false }
-cgp-component   = { version = "0.2.0" }
-cgp-type        = { version = "0.2.0" }
+cgp-async           = { version = "0.2.0", default-features = false }
+cgp-component       = { version = "0.2.0" }
+cgp-component-macro = { version = "0.2.0" }
+cgp-type            = { version = "0.2.0" }
diff --git a/crates/cgp-error/src/can_raise_error.rs b/crates/cgp-error/src/can_raise_error.rs
@@ -1,4 +1,5 @@
-use cgp_component::{cgp_component, DelegateComponent, HasComponents, UseDelegate};
+use cgp_component::{DelegateComponent, HasComponents, UseDelegate};
+use cgp_component_macro::cgp_component;
 
 use crate::has_error_type::HasErrorType;
 

diff --git a/crates/cgp-error/src/has_error_type.rs b/crates/cgp-error/src/has_error_type.rs
@@ -1,7 +1,8 @@
 use core::fmt::Debug;
 
 use cgp_async::Async;
-use cgp_component::{cgp_component, DelegateComponent, HasComponents, WithProvider};
+use cgp_component::{DelegateComponent, HasComponents, WithProvider};
+use cgp_component_macro::cgp_component;
 use cgp_type::traits::has_type::ProvideType;
 
 /**

diff --git a/crates/cgp-extra/Cargo.toml b/crates/cgp-extra/Cargo.toml
@@ -12,4 +12,4 @@ description  = """
 """
 
 [dependencies]
-cgp-run        = { version = "0.2.0" }
+cgp-run = { version = "0.2.0" }
diff --git a/crates/cgp-field-macro-lib/Cargo.toml b/crates/cgp-field-macro-lib/Cargo.toml
@@ -12,8 +12,8 @@ description  = """
 """
 
 [dependencies]
-syn = { version = "2.0.90", features = [ "full" ] }
-quote = "1.0.33"
-proc-macro2 = "1.0.92"
-itertools = "0.13.0"
-prettyplease = "0.2.20"
+syn             = { version = "2.0.90", features = [ "full" ] }
+quote           = "1.0.33"
+proc-macro2     = "1.0.92"
+itertools       = "0.13.0"
+prettyplease    = "0.2.20"
diff --git a/crates/cgp-field-macro/Cargo.toml b/crates/cgp-field-macro/Cargo.toml
@@ -16,4 +16,4 @@ proc-macro = true
 
 [dependencies]
 cgp-field-macro-lib = { version = "0.2.0" }
-proc-macro2     = "1.0.92"
+proc-macro2         = "1.0.92"
diff --git a/crates/cgp-field/Cargo.toml b/crates/cgp-field/Cargo.toml
@@ -12,6 +12,5 @@ description  = """
 """
 
 [dependencies]
-cgp-field-macro = { version = "0.2.0" }
 cgp-component   = { version = "0.2.0" }
 cgp-type        = { version = "0.2.0" }
diff --git a/crates/cgp-field/src/lib.rs b/crates/cgp-field/src/lib.rs
@@ -4,6 +4,5 @@ pub mod impls;
 pub mod traits;
 pub mod types;
 
-pub use cgp_field_macro::{product, symbol, HasField, Product, Sum};
 pub use traits::{FieldGetter, HasField, HasFieldMut, MutFieldGetter};
 pub use types::{Char, Cons, Either, Field, Index, Nil, Void};
diff --git a/crates/cgp-inner/Cargo.toml b/crates/cgp-inner/Cargo.toml
@@ -12,4 +12,5 @@ description  = """
 """
 
 [dependencies]
-cgp-component = { version = "0.2.0" }
+cgp-component       = { version = "0.2.0" }
+cgp-component-macro = { version = "0.2.0" }
diff --git a/crates/cgp-inner/src/lib.rs b/crates/cgp-inner/src/lib.rs
@@ -2,7 +2,8 @@
 
 extern crate alloc;
 
-use cgp_component::{cgp_component, DelegateComponent, HasComponents};
+use cgp_component::{DelegateComponent, HasComponents};
+use cgp_component_macro::cgp_component;
 
 #[cgp_component {
     name: InnerComponent,

diff --git a/crates/cgp-run/Cargo.toml b/crates/cgp-run/Cargo.toml
@@ -12,6 +12,7 @@ description  = """
 """
 
 [dependencies]
-cgp-async = { version = "0.2.0", default-features = false }
-cgp-error = { version = "0.2.0" }
-cgp-component = { version = "0.2.0" }
+cgp-async           = { version = "0.2.0", default-features = false }
+cgp-error           = { version = "0.2.0" }
+cgp-component       = { version = "0.2.0" }
+cgp-component-macro = { version = "0.2.0" }
diff --git a/crates/cgp-run/src/lib.rs b/crates/cgp-run/src/lib.rs
@@ -7,6 +7,7 @@ use alloc::boxed::Box;
 
 use cgp_async::*;
 use cgp_component::*;
+use cgp_component_macro::*;
 use cgp_error::HasErrorType;
 
 #[cgp_component {

diff --git a/crates/cgp-type/Cargo.toml b/crates/cgp-type/Cargo.toml
@@ -12,4 +12,5 @@ description  = """
 """
 
 [dependencies]
-cgp-component = { version = "0.2.0" }
+cgp-component       = { version = "0.2.0" }
+cgp-component-macro = { version = "0.2.0" }
diff --git a/crates/cgp-type/src/traits/has_type.rs b/crates/cgp-type/src/traits/has_type.rs
@@ -1,4 +1,5 @@
-use cgp_component::{cgp_component, DelegateComponent, HasComponents, UseContext, UseDelegate};
+use cgp_component::{DelegateComponent, HasComponents, UseContext, UseDelegate};
+use cgp_component_macro::cgp_component;
 
 #[cgp_component {
     name: TypeComponent,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ description = """
		"""

		[dependencies]
		cgp-component-macro = { version = "0.2.0" }