Use #[cgp_impl] and remove #[cgp_context]

Cargo.toml

@@ -58,5 +58,5 @@ hypershell-tungstenite-components   = { path = "./crates/hypershell-tungstenite-
 hypershell-hash-components          = { path = "./crates/hypershell-hash-components" }
 hypershell-macro                    = { path = "./crates/hypershell-macro" }
 
-# cgp                         = { git = "https://github.com/contextgeneric/cgp.git", branch = "v0.5.0-release" }
-# cgp-error-anyhow            = { git = "https://github.com/contextgeneric/cgp.git", branch = "v0.5.0-release" }
+cgp                         = { git = "https://github.com/contextgeneric/cgp.git" }
+cgp-error-anyhow            = { git = "https://github.com/contextgeneric/cgp.git" }

crates/hypershell-components/src/providers/box_async.rs

@@ -5,8 +5,8 @@ use core::pin::Pin;
 use cgp::extra::handler::{Handler, HandlerComponent};
 use cgp::prelude::*;
 
-#[cgp_new_provider]
-impl<Context, Code, Input, InHandler> Handler<Context, Code, Input> for BoxHandler<InHandler>
+#[cgp_impl(new BoxHandler<InHandler>)]
+impl<Context, Code, Input, InHandler> Handler<Code, Input> for Context
 where
     Context: HasErrorType,
     InHandler: 'static + Handler<Context, Code, Input>,

crates/hypershell-components/src/providers/call.rs

@@ -3,8 +3,8 @@ use core::marker::PhantomData;
 use cgp::extra::handler::{CanHandle, Handler, HandlerComponent};
 use cgp::prelude::*;
 
-#[cgp_new_provider]
-impl<Context, OutCode, InCode, Input> Handler<Context, OutCode, Input> for Call<InCode>
+#[cgp_impl(new Call<InCode>)]
+impl<Context, OutCode, InCode, Input> Handler<OutCode, Input> for Context
 where
     Context: CanHandle<InCode, Input>,
 {

crates/hypershell-components/src/providers/convert.rs

@@ -9,8 +9,8 @@ use cgp::prelude::*;
 
 use crate::dsl::ConvertTo;
 
-#[cgp_new_provider]
-impl<Context, Input, Output> Computer<Context, ConvertTo<Output>, Input> for HandleConvert
+#[cgp_impl(new HandleConvert)]
+impl<Context, Input, Output> Computer<ConvertTo<Output>, Input> for Context
 where
     Input: Into<Output>,
 {
@@ -21,8 +21,8 @@ where
     }
 }
 
-#[cgp_new_provider]
-impl<Context, Code, Input> Handler<Context, Code, Input> for DecodeUtf8Bytes
+#[cgp_impl(new DecodeUtf8Bytes)]
+impl<Context, Code, Input> Handler<Code, Input> for Context
 where
     Context: CanRaiseError<Utf8Error> + for<'a> CanWrapError<DecodeUtf8InputError<'a>>,
     Input: AsRef<[u8]>,

crates/hypershell-components/src/providers/method_arg.rs

@@ -5,8 +5,8 @@ use cgp::prelude::*;
 use crate::components::{HasHttpMethodType, MethodArgExtractor, MethodArgExtractorComponent};
 use crate::dsl::FieldArg;
 
-#[cgp_new_provider]
-impl<Context, Tag> MethodArgExtractor<Context, FieldArg<Tag>> for ExtractMethodFieldArg
+#[cgp_impl(new ExtractMethodFieldArg)]
+impl<Context, Tag> MethodArgExtractor<FieldArg<Tag>> for Context
 where
     Context: HasHttpMethodType + HasField<Tag, Value = Context::HttpMethod>,
     Context::HttpMethod: Clone,

crates/hypershell-components/src/providers/return.rs

@@ -3,8 +3,8 @@ use core::marker::PhantomData;
 use cgp::extra::handler::{Handler, HandlerComponent};
 use cgp::prelude::*;
 
-#[cgp_new_provider]
-impl<Context, Code, Input> Handler<Context, Code, Input> for ReturnInput
+#[cgp_impl(new ReturnInput)]
+impl<Context, Code, Input> Handler<Code, Input> for Context
 where
     Context: HasErrorType,
 {

crates/hypershell-components/src/providers/string_arg.rs

@@ -12,8 +12,8 @@ use crate::components::{
 };
 use crate::dsl::{FieldArg, JoinArgs, StaticArg};
 
-#[cgp_new_provider]
-impl<Context, Arg> CommandArgExtractor<Context, Arg> for ExtractStringCommandArg
+#[cgp_impl(new ExtractStringCommandArg)]
+impl<Context, Arg> CommandArgExtractor<Arg> for Context
 where
     Context: HasCommandArgType + CanExtractStringArg<Arg>,
     Context::CommandArg: From<String>,
@@ -23,8 +23,8 @@ where
     }
 }
 
-#[cgp_new_provider]
-impl<Context, Arg> StringArgExtractor<Context, StaticArg<Arg>> for ExtractStaticArg
+#[cgp_impl(new ExtractStaticArg)]
+impl<Context, Arg> StringArgExtractor<StaticArg<Arg>> for Context
 where
     Arg: Default + Display,
 {
@@ -36,8 +36,8 @@ where
     }
 }
 
-#[cgp_new_provider]
-impl<Context, Tag> StringArgExtractor<Context, FieldArg<Tag>> for ExtractFieldArg
+#[cgp_impl(new ExtractFieldArg)]
+impl<Context, Tag> StringArgExtractor<FieldArg<Tag>> for Context
 where
     Context: HasField<Tag, Value: Display>,
 {
@@ -48,25 +48,25 @@ where
 
 pub struct JoinStringArgs;
 
-#[cgp_provider]
-impl<Context, Arg, Args> StringArgExtractor<Context, JoinArgs<Cons<Arg, Args>>> for JoinStringArgs
+#[cgp_impl(JoinStringArgs)]
+impl<Context, Arg, Args> StringArgExtractor<JoinArgs<Cons<Arg, Args>>> for Context
 where
     Context: CanExtractStringArg<Arg>,
-    Self: StringArgExtractor<Context, JoinArgs<Args>>,
+    JoinStringArgs: StringArgExtractor<Context, JoinArgs<Args>>,
 {
     fn extract_string_arg(
         context: &Context,
         _phantom: PhantomData<JoinArgs<Cons<Arg, Args>>>,
     ) -> Cow<'_, str> {
         let arg = context.extract_string_arg(PhantomData);
-        let args = Self::extract_string_arg(context, PhantomData::<JoinArgs<Args>>);
+        let args = JoinStringArgs::extract_string_arg(context, PhantomData::<JoinArgs<Args>>);
 
         format!("{arg}{args}").into()
     }
 }
 
-#[cgp_provider]
-impl<Context> StringArgExtractor<Context, JoinArgs<Nil>> for JoinStringArgs {
+#[cgp_impl(JoinStringArgs)]
+impl<Context> StringArgExtractor<JoinArgs<Nil>> for Context {
     fn extract_string_arg(
         _context: &Context,
         _phantom: PhantomData<JoinArgs<Nil>>,

crates/hypershell-components/src/providers/url_arg.rs

@@ -8,8 +8,8 @@ use crate::components::{
 };
 use crate::dsl::FieldArg;
 
-#[cgp_new_provider]
-impl<Context, Arg> UrlArgExtractor<Context, Arg> for ExtractStringUrlArg
+#[cgp_impl(new ExtractStringUrlArg)]
+impl<Context, Arg> UrlArgExtractor<Arg> for Context
 where
     Context: HasUrlType + CanExtractStringArg<Arg> + CanRaiseError<<Context::Url as FromStr>::Err>,
     Context::Url: FromStr,
@@ -23,8 +23,8 @@ where
     }
 }
 
-#[cgp_new_provider]
-impl<Context, Tag> UrlArgExtractor<Context, FieldArg<Tag>> for ExtractUrlFieldArg
+#[cgp_impl(new ExtractUrlFieldArg)]
+impl<Context, Tag> UrlArgExtractor<FieldArg<Tag>> for Context
 where
     Context: HasUrlType + HasErrorType + HasField<Tag, Value = Context::Url>,
     Context::Url: Clone,

crates/hypershell-components/src/providers/use.rs

@@ -5,11 +5,8 @@ use cgp::prelude::*;
 
 use crate::dsl::Use;
 
-pub struct HandleUseProvider;
-
-#[cgp_provider]
-impl<Context, Provider, Code, Input> Handler<Context, Use<Provider, Code>, Input>
-    for HandleUseProvider
+#[cgp_impl(new HandleUseProvider)]
+impl<Context, Provider, Code, Input> Handler<Use<Provider, Code>, Input> for Context
 where
     Context: HasErrorType,
     Provider: Handler<Context, Code, Input>,

crates/hypershell-examples/examples/bluesky.rs

@@ -47,7 +47,7 @@ pub type Program = hypershell! {
     |   StreamToStdout
 };
 
-#[cgp_context(MyAppComponents: HypershellPreset)]
+#[cgp_inherit(HypershellPreset)]
 #[derive(HasField)]
 pub struct MyApp {
     pub keyword: String,

crates/hypershell-examples/examples/bluesky_websocket.rs

@@ -46,7 +46,7 @@ pub type Program = hypershell! {
     |   StreamToStdout
 };
 
-#[cgp_context(MyAppComponents: MyAppPreset)]
+#[cgp_inherit(MyAppPreset)]
 #[derive(HasField)]
 pub struct MyApp {
     pub keyword: String,

crates/hypershell-examples/examples/compare_and_branch.rs

@@ -39,7 +39,7 @@ pub type Program = hypershell! {
     | StreamToStdout
 };
 
-#[cgp_context(MyAppComponents: HypershellComparePreset)]
+#[cgp_inherit(HypershellComparePreset)]
 #[derive(HasField)]
 pub struct MyApp {
     pub http_client: Client,