contextgeneric · soareschen · May 26, 2026 · May 17, 2026 · May 17, 2026 · May 17, 2026
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,11 +4,14 @@ resolver = "3"
 
 members = [
     "crates/cgp",
+    "crates/cgp-base",
+    "crates/cgp-base-types",
     "crates/cgp-core",
     "crates/cgp-extra",
     "crates/cgp-async-macro",
     "crates/cgp-component",
     "crates/cgp-macro",
+    "crates/cgp-macro-core",
     "crates/cgp-macro-lib",
     "crates/cgp-type",
     "crates/cgp-field",
@@ -38,11 +41,14 @@ keywords        = ["cgp"]
 
 [workspace.dependencies]
 cgp                         = { version = "0.7.0", path = "./crates/cgp" }
+cgp-base                    = { version = "0.7.0", path = "./crates/cgp-base" }
+cgp-base-types              = { version = "0.7.0", path = "./crates/cgp-base-types" }
 cgp-core                    = { version = "0.7.0", path = "./crates/cgp-core" }
 cgp-extra                   = { version = "0.7.0", path = "./crates/cgp-extra" }
 cgp-async-macro             = { version = "0.7.0", path = "./crates/cgp-async-macro" }
 cgp-component               = { version = "0.7.0", path = "./crates/cgp-component" }
 cgp-macro                   = { version = "0.7.0", path = "./crates/cgp-macro" }
+cgp-macro-core              = { version = "0.7.0", path = "./crates/cgp-macro-core" }
 cgp-macro-lib               = { version = "0.7.0", path = "./crates/cgp-macro-lib" }
 cgp-type                    = { version = "0.7.0", path = "./crates/cgp-type" }
 cgp-field                   = { version = "0.7.0", path = "./crates/cgp-field" }

diff --git a/crates/cgp-base-types/Cargo.toml b/crates/cgp-base-types/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name         = "cgp-base-types"
+version      = "0.7.0"
+edition      = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+authors      = { workspace = true }
+rust-version = { workspace = true }
+keywords     = { workspace = true }
+
+[dependencies]
diff --git a/crates/cgp-base-types/src/lib.rs b/crates/cgp-base-types/src/lib.rs
@@ -0,0 +1,5 @@
+#![allow(non_camel_case_types)]
+
+pub mod macro_prelude;
+pub mod traits;
+pub mod types;
diff --git a/crates/cgp-base-types/src/macro_prelude.rs b/crates/cgp-base-types/src/macro_prelude.rs
@@ -0,0 +1,2 @@
+pub use crate::traits::ConcatPath;
+pub use crate::types::*;
diff --git a/crates/cgp-component/src/types/path.rs → .../cgp-base-types/src/traits/concat_path.rs b/crates/cgp-component/src/types/path.rs → .../cgp-base-types/src/traits/concat_path.rs
@@ -1,8 +1,4 @@
-use core::marker::PhantomData;
-
-pub struct PathCons<Head: ?Sized, Tail: ?Sized>(pub PhantomData<Head>, pub PhantomData<Tail>);
-
-pub struct PathNil;
+use crate::types::{Nil, PathCons};
 
 pub trait ConcatPath<Other: ?Sized> {
     type Output: ?Sized;
@@ -15,6 +11,6 @@ where
     type Output = PathCons<Head, <Tail as ConcatPath<Other>>::Output>;
 }
 
-impl<Other: ?Sized> ConcatPath<Other> for PathNil {
+impl<Other: ?Sized> ConcatPath<Other> for Nil {
     type Output = Other;
 }
diff --git a/crates/cgp-base-types/src/traits/mod.rs b/crates/cgp-base-types/src/traits/mod.rs
@@ -0,0 +1,5 @@
+mod concat_path;
+mod static_format;
+
+pub use concat_path::*;
+pub use static_format::*;
diff --git a/crates/cgp-field/src/traits/static_format.rs → ...gp-base-types/src/traits/static_format.rs b/crates/cgp-field/src/traits/static_format.rs → ...gp-base-types/src/traits/static_format.rs
diff --git a/crates/cgp-field/src/types/chars.rs → crates/cgp-base-types/src/types/chars.rs b/crates/cgp-field/src/types/chars.rs → crates/cgp-base-types/src/types/chars.rs
diff --git a/crates/cgp-field/src/types/product.rs → crates/cgp-base-types/src/types/cons.rs b/crates/cgp-field/src/types/product.rs → crates/cgp-base-types/src/types/cons.rs
@@ -34,18 +34,4 @@
 #[allow(non_camel_case_types)]
 pub struct π<Head, Tail>(pub Head, pub Tail);
 
-/**
-    The `Nil` type, a.k.a. `ε`, is used to represent the end of a _type-level list_,
-    or an empty type-level list.
-
-    `Nil` is commonly used as the `Tail` of a [`Cons`] type, to terminate the list.
-    When used on its own, it represents an empty type-level list.
-
-    Read more about type-level lists, a.k.a. the product types, in [`Cons`].
-*/
-#[derive(Eq, PartialEq, Clone, Default, Debug)]
-#[allow(non_camel_case_types)]
-pub struct ε;
-
-pub use ε as Nil;
 pub use π as Cons;
diff --git a/crates/cgp-base-types/src/types/mod.rs b/crates/cgp-base-types/src/types/mod.rs
@@ -0,0 +1,11 @@
+mod chars;
+mod cons;
+mod nil;
+mod path;
+mod symbol;
+
+pub use chars::*;
+pub use cons::*;
+pub use nil::*;
+pub use path::*;
+pub use symbol::*;
diff --git a/crates/cgp-base-types/src/types/nil.rs b/crates/cgp-base-types/src/types/nil.rs
@@ -0,0 +1,14 @@
+/**
+    The `Nil` type, a.k.a. `ε`, is used to represent the end of a _type-level list_,
+    or an empty type-level list.
+
+    `Nil` is commonly used as the `Tail` of a [`Cons`] type, to terminate the list.
+    When used on its own, it represents an empty type-level list.
+
+    Read more about type-level lists, a.k.a. the product types, in [`Cons`].
+*/
+#[derive(Eq, PartialEq, Clone, Default, Debug)]
+#[allow(non_camel_case_types)]
+pub struct ε;
+
+pub use ε as Nil;
diff --git a/crates/cgp-base-types/src/types/path.rs b/crates/cgp-base-types/src/types/path.rs
@@ -0,0 +1,3 @@
+use core::marker::PhantomData;
+
+pub struct PathCons<Head: ?Sized, Tail: ?Sized>(pub PhantomData<Head>, pub PhantomData<Tail>);
diff --git a/crates/cgp-field/src/types/symbol.rs → crates/cgp-base-types/src/types/symbol.rs b/crates/cgp-field/src/types/symbol.rs → crates/cgp-base-types/src/types/symbol.rs
diff --git a/crates/cgp-base/Cargo.toml b/crates/cgp-base/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name         = "cgp-base"
+version      = "0.7.0"
+edition      = { workspace = true }
+license      = { workspace = true }
+repository   = { workspace = true }
+authors      = { workspace = true }
+rust-version = { workspace = true }
+keywords     = { workspace = true }
+
+[dependencies]
+cgp-base-types  = { workspace = true }
+cgp-component   = { workspace = true }
+cgp-macro       = { workspace = true }
diff --git a/crates/cgp-base/src/lib.rs b/crates/cgp-base/src/lib.rs
@@ -0,0 +1 @@
+pub mod macro_prelude;
diff --git a/crates/cgp-base/src/macro_prelude.rs b/crates/cgp-base/src/macro_prelude.rs
@@ -0,0 +1,2 @@
+pub use cgp_base_types::macro_prelude::*;
+pub use cgp_component::macro_prelude::*;
diff --git a/crates/cgp-component/src/lib.rs b/crates/cgp-component/src/lib.rs
@@ -5,13 +5,14 @@
    CGP component implementation.
 */
 
+pub mod macro_prelude;
+
 mod namespaces;
+mod providers;
 mod traits;
-mod types;
 
-pub use namespaces::DefaultNamespace;
-pub use traits::{CanUseComponent, DelegateComponent, IsProviderFor};
-pub use types::{
-    ConcatPath, PathCons, PathNil, RedirectLookup, UseContext, UseDefault, UseDelegate, UseFields,
-    WithContext, WithProvider,
+pub use namespaces::{DefaultImpls1, DefaultImpls2, DefaultNamespace};
+pub use providers::{
+    RedirectLookup, UseContext, UseDefault, UseDelegate, UseFields, WithContext, WithProvider,
 };
+pub use traits::{CanUseComponent, DelegateComponent, IsProviderFor};
diff --git a/crates/cgp-component/src/macro_prelude.rs b/crates/cgp-component/src/macro_prelude.rs
@@ -0,0 +1,5 @@
+pub use crate::namespaces::DefaultNamespace;
+pub use crate::providers::{
+    RedirectLookup, UseContext, UseDefault, UseDelegate, UseFields, WithContext, WithProvider,
+};
+pub use crate::traits::{CanUseComponent, DelegateComponent, IsProviderFor};
diff --git a/crates/cgp-component/src/namespaces.rs b/crates/cgp-component/src/namespaces.rs
@@ -1,3 +1,11 @@
 pub trait DefaultNamespace<Components> {
-    type Provider;
+    type Delegate;
+}
+
+pub trait DefaultImpls1<T, Components> {
+    type Delegate;
+}
+
+pub trait DefaultImpls2<T1, T2, Components> {
+    type Delegate;
 }
diff --git a/crates/cgp-component/src/types/mod.rs → crates/cgp-component/src/providers/mod.rs b/crates/cgp-component/src/types/mod.rs → crates/cgp-component/src/providers/mod.rs
@@ -1,12 +1,10 @@
-mod path;
 mod redirect_lookup;
 mod use_context;
 mod use_default;
 mod use_delegate;
 mod use_fields;
 mod with_provider;
 
-pub use path::{ConcatPath, PathCons, PathNil};
 pub use redirect_lookup::RedirectLookup;
 pub use use_context::{UseContext, WithContext};
 pub use use_default::UseDefault;

diff --git a/...gp-component/src/types/redirect_lookup.rs → ...omponent/src/providers/redirect_lookup.rs b/...gp-component/src/types/redirect_lookup.rs → ...omponent/src/providers/redirect_lookup.rs
diff --git a/...es/cgp-component/src/types/use_context.rs → ...gp-component/src/providers/use_context.rs b/...es/cgp-component/src/types/use_context.rs → ...gp-component/src/providers/use_context.rs
diff --git a/...es/cgp-component/src/types/use_default.rs → ...gp-component/src/providers/use_default.rs b/...es/cgp-component/src/types/use_default.rs → ...gp-component/src/providers/use_default.rs
diff --git a/...s/cgp-component/src/types/use_delegate.rs → ...p-component/src/providers/use_delegate.rs b/...s/cgp-component/src/types/use_delegate.rs → ...p-component/src/providers/use_delegate.rs
diff --git a/crates/cgp-component/src/types/use_field.rs → .../cgp-component/src/providers/use_field.rs b/crates/cgp-component/src/types/use_field.rs → .../cgp-component/src/providers/use_field.rs
diff --git a/crates/cgp-component/src/types/use_fields.rs → ...cgp-component/src/providers/use_fields.rs b/crates/cgp-component/src/types/use_fields.rs → ...cgp-component/src/providers/use_fields.rs
diff --git a/.../cgp-component/src/types/with_provider.rs → ...-component/src/providers/with_provider.rs b/.../cgp-component/src/types/with_provider.rs → ...-component/src/providers/with_provider.rs
diff --git a/crates/cgp-core/Cargo.toml b/crates/cgp-core/Cargo.toml
@@ -12,6 +12,7 @@ description  = """
 """
 
 [dependencies]
+cgp-base            = { workspace = true }
 cgp-async-macro     = { workspace = true }
 cgp-component       = { workspace = true }
 cgp-macro           = { workspace = true }

diff --git a/crates/cgp-core/src/lib.rs b/crates/cgp-core/src/lib.rs
@@ -3,6 +3,7 @@
 
 pub mod prelude;
 
+pub use prelude as macro_prelude;
 #[doc(inline)]
 pub use {
     cgp_async_macro::async_trait, cgp_component as component, cgp_error as error,

diff --git a/crates/cgp-core/src/prelude.rs b/crates/cgp-core/src/prelude.rs
@@ -1,9 +1,10 @@
 pub use core::marker::PhantomData;
 
 pub use cgp_async_macro::async_trait;
+pub use cgp_base::macro_prelude::{ConcatPath, PathCons};
 pub use cgp_component::{
-    CanUseComponent, ConcatPath, DefaultNamespace, DelegateComponent, IsProviderFor, PathCons,
-    PathNil, RedirectLookup, UseContext, UseDelegate, UseFields, WithContext, WithProvider,
+    CanUseComponent, DefaultNamespace, DelegateComponent, IsProviderFor, RedirectLookup,
+    UseContext, UseDelegate, UseFields, WithContext, WithProvider,
 };
 pub use cgp_error::{CanRaiseError, CanWrapError, HasErrorType};
 pub use cgp_field::impls::{IsMut, IsNothing, IsPresent, IsRef, IsVoid, UseField};

diff --git a/crates/cgp-dispatch/Cargo.toml b/crates/cgp-dispatch/Cargo.toml
@@ -10,6 +10,6 @@ keywords     = { workspace = true }
 description  = "Extensible data type dispatchers for CGP handlers"
 
 [dependencies]
-cgp-core    = { workspace = true }
+cgp         = { version = "0.7.0", path = "../cgp-core", package = "cgp-core" }
 cgp-monad   = { workspace = true }
 cgp-handler = { workspace = true }
diff --git a/crates/cgp-dispatch/src/providers/builders/build_and_merge_outputs.rs b/crates/cgp-dispatch/src/providers/builders/build_and_merge_outputs.rs
@@ -1,5 +1,5 @@
-use cgp_core::field::traits::MapFields;
-use cgp_core::prelude::*;
+use cgp::field::traits::MapFields;
+use cgp::prelude::*;
 use cgp_handler::{
     ComputerComponent, ComputerRefComponent, HandlerComponent, HandlerRefComponent,
     TryComputerComponent, TryComputerRefComponent,

diff --git a/crates/cgp-dispatch/src/providers/field_builders/build_and_merge.rs b/crates/cgp-dispatch/src/providers/field_builders/build_and_merge.rs
@@ -1,5 +1,5 @@
-use cgp_core::field::impls::CanBuildFrom;
-use cgp_core::prelude::*;
+use cgp::field::impls::CanBuildFrom;
+use cgp::prelude::*;
 use cgp_handler::{
     Computer, ComputerComponent, Handler, HandlerComponent, TryComputer, TryComputerComponent,
 };

diff --git a/crates/cgp-dispatch/src/providers/field_builders/build_and_set_field.rs b/crates/cgp-dispatch/src/providers/field_builders/build_and_set_field.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{
     Computer, ComputerComponent, Handler, HandlerComponent, TryComputer, TryComputerComponent,
 };

diff --git a/crates/cgp-dispatch/src/providers/field_matchers/extract_field.rs b/crates/cgp-dispatch/src/providers/field_matchers/extract_field.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{AsyncComputer, AsyncComputerComponent, Computer, ComputerComponent};
 
 pub struct ExtractFieldAndHandle<Tag, Provider = UseContext>(pub PhantomData<(Tag, Provider)>);

diff --git a/crates/cgp-dispatch/src/providers/field_matchers/extract_first_field.rs b/crates/cgp-dispatch/src/providers/field_matchers/extract_first_field.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{AsyncComputer, AsyncComputerComponent, Computer, ComputerComponent};
 
 pub struct ExtractFirstFieldAndHandle<Tag, Provider = UseContext>(pub PhantomData<(Tag, Provider)>);

diff --git a/crates/cgp-dispatch/src/providers/field_matchers/extract_handle.rs b/crates/cgp-dispatch/src/providers/field_matchers/extract_handle.rs
@@ -1,5 +1,5 @@
-use cgp_core::field::impls::CanDowncastFields;
-use cgp_core::prelude::*;
+use cgp::field::impls::CanDowncastFields;
+use cgp::prelude::*;
 use cgp_handler::{AsyncComputer, AsyncComputerComponent, Computer, ComputerComponent};
 
 pub struct DowncastAndHandle<Input, Provider = UseContext>(pub PhantomData<(Input, Provider)>);

diff --git a/crates/cgp-dispatch/src/providers/field_matchers/field_value.rs b/crates/cgp-dispatch/src/providers/field_matchers/field_value.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{AsyncComputer, AsyncComputerComponent, Computer, ComputerComponent};
 
 pub struct HandleFieldValue<Provider = UseContext>(pub PhantomData<Provider>);

diff --git a/crates/cgp-dispatch/src/providers/field_matchers/first_field_value.rs b/crates/cgp-dispatch/src/providers/field_matchers/first_field_value.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{AsyncComputer, AsyncComputerComponent, Computer, ComputerComponent};
 
 pub struct HandleFirstFieldValue<Provider = UseContext>(pub PhantomData<Provider>);

diff --git a/crates/cgp-dispatch/src/providers/matchers/match_first_with_field_handlers.rs b/crates/cgp-dispatch/src/providers/matchers/match_first_with_field_handlers.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::UseInputDelegate;
 
 use crate::providers::matchers::to_field_handlers::{

diff --git a/crates/cgp-dispatch/src/providers/matchers/match_with_field_handlers.rs b/crates/cgp-dispatch/src/providers/matchers/match_with_field_handlers.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{
     AsyncComputerComponent, AsyncComputerRefComponent, ComputerComponent, ComputerRefComponent,
     HandlerComponent, HandlerRefComponent, PromoteRef, TryComputerComponent,

diff --git a/crates/cgp-dispatch/src/providers/matchers/to_field_handlers.rs b/crates/cgp-dispatch/src/providers/matchers/to_field_handlers.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 
 use crate::{ExtractFieldAndHandle, ExtractFirstFieldAndHandle};
 

diff --git a/crates/cgp-dispatch/src/providers/with_handlers/build_with_handlers.rs b/crates/cgp-dispatch/src/providers/with_handlers/build_with_handlers.rs
@@ -1,4 +1,4 @@
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{
     Computer, ComputerComponent, Handler, HandlerComponent, PipeHandlers, TryComputer,
     TryComputerComponent,

diff --git a/crates/cgp-dispatch/src/providers/with_handlers/match_first_with_handlers.rs b/crates/cgp-dispatch/src/providers/with_handlers/match_first_with_handlers.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use cgp_core::prelude::*;
+use cgp::prelude::*;
 use cgp_handler::{AsyncComputer, AsyncComputerComponent, Computer, ComputerComponent};
 
 use crate::DispatchMatchers;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		pub use crate::traits::ConcatPath;
		pub use crate::types::*;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		use core::marker::PhantomData;

		pub struct PathCons<Head: ?Sized, Tail: ?Sized>(pub PhantomData<Head>, pub PhantomData<Tail>);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		pub use cgp_base_types::macro_prelude::*;
		pub use cgp_component::macro_prelude::*;