builder api

2026-03-26 02:11:56 +00:00 · 2024-01-02 12:45:13 -07:00
parent 4cbbf1a0a7
commit bb29367e94
8 changed files with 373 additions and 405 deletions
--- a/rpc-toolkit-macro-internals/src/command/build.rs
+++ b/rpc-toolkit-macro-internals/src/command/build.rs
@@ -1362,7 +1362,7 @@ fn build_inherited(parent_data: Option<Type>, generics: &Generics) -> (TokenStre
        )
    } else {
        (
-            quote! { type InheritedParams = ::rpc_toolkit::NoParams; },
+            quote! { type InheritedParams = ::rpc_toolkit::Empty; },
            inherited_generics,
        )
    }
--- a/rpc-toolkit/src/handler/adapters.rs
+++ b/rpc-toolkit/src/handler/adapters.rs
@@ -3,7 +3,6 @@ use std::collections::VecDeque;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::sync::Arc;
-use std::task::Context;

 use clap::{CommandFactory, FromArgMatches};
 use imbl_value::imbl::{OrdMap, OrdSet};
@@ -14,8 +13,8 @@ use yajrc::RpcError;

 use crate::util::{internal_error, parse_error, Flat};
 use crate::{
-    intersect_type_ids, iter_from_ctx_and_handler, AnyHandler, CallRemote, CliBindings, DynHandler,
-    HandleArgs, Handler, HandlerTypes, IntoContext, IntoHandlers, NoParams, PrintCliResult,
+    iter_from_ctx_and_handler, AnyHandler, CallRemote, CliBindings, DynHandler, EitherContext,
+    HandleArgs, Handler, HandlerTypes, IntoContext, IntoHandlers, PrintCliResult,
 };

 pub trait HandlerExt: HandlerTypes + Sized {
@@ -34,6 +33,13 @@ pub trait HandlerExt: HandlerTypes + Sized {
    ) -> CustomDisplayFn<Context, F, Self>
    where
        F: Fn(HandleArgs<Context, Self>, Self::Ok) -> Result<(), Self::Err>;
+    fn with_inherited<Params, InheritedParams, F>(
+        self,
+        f: F,
+    ) -> InheritanceHandler<Params, InheritedParams, Self, F>
+    where
+        F: Fn(Params, InheritedParams) -> Self::InheritedParams;
+    fn with_remote_cli<Context>(self) -> RemoteCli<Context, Self>;
 }

 impl<T: HandlerTypes + Sized> HandlerExt for T {
@@ -67,6 +73,25 @@ impl<T: HandlerTypes + Sized> HandlerExt for T {
            handler: self,
        }
    }
+    fn with_inherited<Params, InheritedParams, F>(
+        self,
+        f: F,
+    ) -> InheritanceHandler<Params, InheritedParams, Self, F>
+    where
+        F: Fn(Params, InheritedParams) -> Self::InheritedParams,
+    {
+        InheritanceHandler {
+            _phantom: PhantomData,
+            handler: self,
+            inherit: f,
+        }
+    }
+    fn with_remote_cli<Context>(self) -> RemoteCli<Context, Self> {
+        RemoteCli {
+            _phantom: PhantomData,
+            handler: self,
+        }
+    }
 }

 #[derive(Debug, Clone)]
@@ -77,6 +102,21 @@ impl<H: HandlerTypes> HandlerTypes for NoCli<H> {
    type Ok = H::Ok;
    type Err = H::Err;
 }
+impl<H> IntoHandlers for NoCli<H>
+where
+    H: Handler,
+    H::Params: DeserializeOwned,
+    H::InheritedParams: DeserializeOwned,
+    H::Ok: Serialize + DeserializeOwned,
+    RpcError: From<H::Err>,
+{
+    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, DynHandler)> {
+        iter_from_ctx_and_handler(
+            self.0.contexts(),
+            DynHandler::WithoutCli(Arc::new(AnyHandler::new(self.0))),
+        )
+    }
+}

 #[derive(Clone, Debug)]
 pub struct CustomDisplay<P, H> {
@@ -171,13 +211,13 @@ where
        + 'static,
 {
    type Context = P::Context;
-    fn cli_command(&self, ctx_ty: TypeId) -> clap::Command {
+    fn cli_command(&self, _: TypeId) -> clap::Command {
        H::Params::command()
    }
    fn cli_parse(
        &self,
        matches: &clap::ArgMatches,
-        ctx_ty: TypeId,
+        _: TypeId,
    ) -> Result<(VecDeque<&'static str>, Value), clap::Error> {
        Self::Params::from_arg_matches(matches).and_then(|a| {
            Ok((
@@ -212,21 +252,6 @@ where
        )
    }
 }
-impl<P, H> IntoHandlers for CustomDisplay<P, H>
-where
-    Self: HandlerTypes + Handler + CliBindings,
-    <Self as HandlerTypes>::Params: DeserializeOwned,
-    <Self as HandlerTypes>::InheritedParams: DeserializeOwned,
-    <Self as HandlerTypes>::Ok: Serialize + DeserializeOwned,
-    RpcError: From<<Self as HandlerTypes>::Err>,
-{
-    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, crate::DynHandler)> {
-        iter_from_ctx_and_handler(
-            intersect_type_ids(self.contexts(), <Self as CliBindings>::Context::type_ids()),
-            DynHandler::WithCli(Arc::new(AnyHandler::new(self))),
-        )
-    }
-}

 pub struct CustomDisplayFn<Context, F, H> {
    _phantom: PhantomData<Context>,
@@ -371,115 +396,282 @@ where
    }
 }

-// pub struct RemoteCli<CliContext, RemoteContext, H> {
-//     _phantom: PhantomData<(CliContext, RemoteContext)>,
-//     handler: H,
-// }
-// impl<CliContext, RemoteContext, H: Clone> Clone for RemoteCli<CliContext, RemoteContext, H> {
-//     fn clone(&self) -> Self {
-//         Self {
-//             _phantom: PhantomData,
-//             handler: self.handler.clone(),
-//         }
-//     }
-// }
-// impl<CliContext, RemoteContext, H: Debug> Debug for RemoteCli<CliContext, RemoteContext, H> {
-//     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-//         f.debug_tuple("RemoteCli").field(&self.handler).finish()
-//     }
-// }
-// impl<CliContext, RemoteContext, H> HandlerTypes for RemoteCli<CliContext, RemoteContext, H>
-// where
-//     H: HandlerTypes,
-// {
-//     type Params = H::Params;
-//     type InheritedParams = H::InheritedParams;
-//     type Ok = H::Ok;
-//     type Err = H::Err;
-// }
-// #[async_trait::async_trait]
-// impl<CliContext, RemoteContext, H> Handler<EitherContext<CliContext, RemoteContext>>
-//     for RemoteCli<CliContext, RemoteContext, H>
-// where
-//     CliContext: CallRemote,
-//     H: Handler<RemoteContext>,
-// {
-//     async fn handle_async(
-//         &self,
-//         HandleArgs {
-//             context,
-//             parent_method,
-//             method,
-//             params,
-//             inherited_params,
-//             raw_params,
-//         }: HandleArgs<CliContext, Self>,
-//     ) -> Result<Self::Ok, Self::Err> {
-//         let full_method = parent_method.into_iter().chain(method).collect::<Vec<_>>();
-//         match context
-//             .call_remote(
-//                 &full_method.join("."),
-//                 imbl_value::to_value(&Flat(params, inherited_params)).map_err(parse_error)?,
-//             )
-//             .await
-//         {
-//             Ok(a) => imbl_value::from_value(a)
-//                 .map_err(internal_error)
-//                 .map_err(Self::Err::from),
-//             Err(e) => Err(Self::Err::from(e)),
-//         }
-//     }
-//     fn metadata(
-//         &self,
-//         method: VecDeque<&'static str>,
-//         ctx_ty: TypeId,
-//     ) -> OrdMap<&'static str, Value> {
-//         self.handler.metadata(method, ctx_ty)
-//     }
-//     fn contexts(&self) -> Option<OrdSet<TypeId>> {
-//         todo!()
-//     }
-//     fn method_from_dots(&self, method: &str, ctx_ty: TypeId) -> Option<VecDeque<&'static str>> {
-//         self.handler.method_from_dots(method, ctx_ty)
-//     }
-// }
-// impl<Context, H> CliBindings<Context> for RemoteCli<Context, H>
-// where
-//     Context: crate::Context,
-//     H: CliBindings<Context>,
-// {
-//     fn cli_command(&self, ctx_ty: TypeId) -> clap::Command {
-//         self.handler.cli_command(ctx_ty)
-//     }
-//     fn cli_parse(
-//         &self,
-//         matches: &clap::ArgMatches,
-//         ctx_ty: TypeId,
-//     ) -> Result<(VecDeque<&'static str>, Value), clap::Error> {
-//         self.handler.cli_parse(matches, ctx_ty)
-//     }
-//     fn cli_display(
-//         &self,
-//         HandleArgs {
-//             context,
-//             parent_method,
-//             method,
-//             params,
-//             inherited_params,
-//             raw_params,
-//         }: HandleArgs<Context, Self>,
-//         result: Self::Ok,
-//     ) -> Result<(), Self::Err> {
-//         self.handler.cli_display(
-//             HandleArgs {
-//                 context,
-//                 parent_method,
-//                 method,
-//                 params,
-//                 inherited_params,
-//                 raw_params,
-//             },
-//             result,
-//         )
-//     }
-// }
+pub struct RemoteCli<Context, H> {
+    _phantom: PhantomData<Context>,
+    handler: H,
+}
+impl<Context, H: Clone> Clone for RemoteCli<Context, H> {
+    fn clone(&self) -> Self {
+        Self {
+            _phantom: PhantomData,
+            handler: self.handler.clone(),
+        }
+    }
+}
+impl<Context, H: Debug> Debug for RemoteCli<Context, H> {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("RemoteCli").field(&self.handler).finish()
+    }
+}
+impl<Context, H> HandlerTypes for RemoteCli<Context, H>
+where
+    H: HandlerTypes,
+{
+    type Params = H::Params;
+    type InheritedParams = H::InheritedParams;
+    type Ok = H::Ok;
+    type Err = H::Err;
+}
+#[async_trait::async_trait]
+impl<Context, H> Handler for RemoteCli<Context, H>
+where
+    Context: CallRemote,
+    H: Handler,
+    H::Params: Serialize,
+    H::InheritedParams: Serialize,
+    H::Ok: DeserializeOwned,
+    H::Err: From<RpcError>,
+{
+    type Context = EitherContext<Context, H::Context>;
+    async fn handle_async(
+        &self,
+        HandleArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params,
+            raw_params,
+        }: HandleArgs<Self::Context, Self>,
+    ) -> Result<Self::Ok, Self::Err> {
+        match context {
+            EitherContext::C1(context) => {
+                let full_method = parent_method.into_iter().chain(method).collect::<Vec<_>>();
+                match context
+                    .call_remote(
+                        &full_method.join("."),
+                        imbl_value::to_value(&Flat(params, inherited_params))
+                            .map_err(parse_error)?,
+                    )
+                    .await
+                {
+                    Ok(a) => imbl_value::from_value(a)
+                        .map_err(internal_error)
+                        .map_err(Self::Err::from),
+                    Err(e) => Err(Self::Err::from(e)),
+                }
+            }
+            EitherContext::C2(context) => {
+                self.handler
+                    .handle_async(HandleArgs {
+                        context,
+                        parent_method,
+                        method,
+                        params,
+                        inherited_params,
+                        raw_params,
+                    })
+                    .await
+            }
+        }
+    }
+    fn metadata(
+        &self,
+        method: VecDeque<&'static str>,
+        ctx_ty: TypeId,
+    ) -> OrdMap<&'static str, Value> {
+        self.handler.metadata(method, ctx_ty)
+    }
+    fn contexts(&self) -> Option<OrdSet<TypeId>> {
+        todo!()
+    }
+    fn method_from_dots(&self, method: &str, ctx_ty: TypeId) -> Option<VecDeque<&'static str>> {
+        self.handler.method_from_dots(method, ctx_ty)
+    }
+}
+impl<Context, H> CliBindings for RemoteCli<Context, H>
+where
+    H: CliBindings,
+{
+    type Context = H::Context;
+    fn cli_command(&self, ctx_ty: TypeId) -> clap::Command {
+        self.handler.cli_command(ctx_ty)
+    }
+    fn cli_parse(
+        &self,
+        matches: &clap::ArgMatches,
+        ctx_ty: TypeId,
+    ) -> Result<(VecDeque<&'static str>, Value), clap::Error> {
+        self.handler.cli_parse(matches, ctx_ty)
+    }
+    fn cli_display(
+        &self,
+        HandleArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params,
+            raw_params,
+        }: HandleArgs<Self::Context, Self>,
+        result: Self::Ok,
+    ) -> Result<(), Self::Err> {
+        self.handler.cli_display(
+            HandleArgs {
+                context,
+                parent_method,
+                method,
+                params,
+                inherited_params,
+                raw_params,
+            },
+            result,
+        )
+    }
+}
+
+pub struct InheritanceHandler<Params, InheritedParams, H, F> {
+    _phantom: PhantomData<(Params, InheritedParams)>,
+    handler: H,
+    inherit: F,
+}
+impl<Params, InheritedParams, H: Clone, F: Clone> Clone
+    for InheritanceHandler<Params, InheritedParams, H, F>
+{
+    fn clone(&self) -> Self {
+        Self {
+            _phantom: PhantomData,
+            handler: self.handler.clone(),
+            inherit: self.inherit.clone(),
+        }
+    }
+}
+impl<Params, InheritedParams, H: std::fmt::Debug, F> std::fmt::Debug
+    for InheritanceHandler<Params, InheritedParams, H, F>
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("InheritanceHandler")
+            .field(&self.handler)
+            .finish()
+    }
+}
+impl<Params, InheritedParams, H, F> HandlerTypes
+    for InheritanceHandler<Params, InheritedParams, H, F>
+where
+    H: HandlerTypes,
+    Params: Send + Sync,
+    InheritedParams: Send + Sync,
+{
+    type Params = H::Params;
+    type InheritedParams = Flat<Params, InheritedParams>;
+    type Ok = H::Ok;
+    type Err = H::Err;
+}
+#[async_trait::async_trait]
+impl<Params, InheritedParams, H, F> Handler for InheritanceHandler<Params, InheritedParams, H, F>
+where
+    Params: Send + Sync + 'static,
+    InheritedParams: Send + Sync + 'static,
+    H: Handler,
+    F: Fn(Params, InheritedParams) -> H::InheritedParams + Send + Sync + Clone + 'static,
+{
+    type Context = H::Context;
+    fn handle_sync(
+        &self,
+        HandleArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params,
+            raw_params,
+        }: HandleArgs<Self::Context, Self>,
+    ) -> Result<Self::Ok, Self::Err> {
+        self.handler.handle_sync(HandleArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params: (self.inherit)(inherited_params.0, inherited_params.1),
+            raw_params,
+        })
+    }
+    async fn handle_async(
+        &self,
+        HandleArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params,
+            raw_params,
+        }: HandleArgs<Self::Context, Self>,
+    ) -> Result<Self::Ok, Self::Err> {
+        self.handler.handle_sync(HandleArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params: (self.inherit)(inherited_params.0, inherited_params.1),
+            raw_params,
+        })
+    }
+    fn metadata(
+        &self,
+        method: VecDeque<&'static str>,
+        ctx_ty: TypeId,
+    ) -> OrdMap<&'static str, Value> {
+        self.handler.metadata(method, ctx_ty)
+    }
+    fn contexts(&self) -> Option<OrdSet<TypeId>> {
+        self.handler.contexts()
+    }
+    fn method_from_dots(&self, method: &str, ctx_ty: TypeId) -> Option<VecDeque<&'static str>> {
+        self.handler.method_from_dots(method, ctx_ty)
+    }
+}
+
+impl<Params, InheritedParams, H, F> CliBindings
+    for InheritanceHandler<Params, InheritedParams, H, F>
+where
+    Params: Send + Sync + 'static,
+    InheritedParams: Send + Sync + 'static,
+    H: CliBindings,
+    F: Fn(Params, InheritedParams) -> H::InheritedParams + Send + Sync + Clone + 'static,
+{
+    type Context = H::Context;
+    fn cli_command(&self, ctx_ty: TypeId) -> clap::Command {
+        self.handler.cli_command(ctx_ty)
+    }
+    fn cli_parse(
+        &self,
+        matches: &clap::ArgMatches,
+        ctx_ty: TypeId,
+    ) -> Result<(VecDeque<&'static str>, Value), clap::Error> {
+        self.handler.cli_parse(matches, ctx_ty)
+    }
+    fn cli_display(
+        &self,
+        HandleArgs {
+            context,
+            parent_method,
+            method,
+            params,
+            inherited_params,
+            raw_params,
+        }: HandleArgs<Self::Context, Self>,
+        result: Self::Ok,
+    ) -> Result<(), Self::Err> {
+        self.handler.cli_display(
+            HandleArgs {
+                context,
+                parent_method,
+                method,
+                params,
+                inherited_params: (self.inherit)(inherited_params.0, inherited_params.1),
+                raw_params,
+            },
+            result,
+        )
+    }
+}
--- a/rpc-toolkit/src/handler/from_fn.rs
+++ b/rpc-toolkit/src/handler/from_fn.rs
@@ -2,7 +2,6 @@ use std::any::TypeId;
 use std::collections::VecDeque;
 use std::fmt::Display;
 use std::marker::PhantomData;
-use std::sync::Arc;

 use clap::{ArgMatches, Command, CommandFactory, FromArgMatches};
 use futures::Future;
@@ -10,12 +9,10 @@ use imbl_value::imbl::OrdMap;
 use imbl_value::Value;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
-use yajrc::RpcError;

 use crate::marker::LeafHandler;
 use crate::{
-    intersect_type_ids, iter_from_ctx_and_handler, AnyContext, AnyHandler, CliBindings, DynHandler,
-    HandleArgs, Handler, HandlerTypes, IntoContext, IntoHandlers, NoCli, NoParams, PrintCliResult,
+    AnyContext, CliBindings, Empty, HandleArgs, Handler, HandlerTypes, IntoContext, PrintCliResult,
 };

 pub struct FromFn<F, T, E, Args> {
@@ -58,36 +55,6 @@ where
        Ok(println!("{result}"))
    }
 }
-impl<F, T, E, Args> IntoHandlers for FromFn<F, T, E, Args>
-where
-    Self: HandlerTypes + Handler + CliBindings,
-    <Self as HandlerTypes>::Params: DeserializeOwned,
-    <Self as HandlerTypes>::InheritedParams: DeserializeOwned,
-    <Self as HandlerTypes>::Ok: Serialize + DeserializeOwned,
-    RpcError: From<<Self as HandlerTypes>::Err>,
-{
-    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, crate::DynHandler)> {
-        iter_from_ctx_and_handler(
-            intersect_type_ids(self.contexts(), <Self as CliBindings>::Context::type_ids()),
-            DynHandler::WithCli(Arc::new(AnyHandler::new(self))),
-        )
-    }
-}
-impl<F, T, E, Args> IntoHandlers for NoCli<FromFn<F, T, E, Args>>
-where
-    Self: HandlerTypes + Handler,
-    <Self as HandlerTypes>::Params: DeserializeOwned,
-    <Self as HandlerTypes>::InheritedParams: DeserializeOwned,
-    <Self as HandlerTypes>::Ok: Serialize + DeserializeOwned,
-    RpcError: From<<Self as HandlerTypes>::Err>,
-{
-    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, crate::DynHandler)> {
-        iter_from_ctx_and_handler(
-            self.contexts(),
-            DynHandler::WithoutCli(Arc::new(AnyHandler::new(self))),
-        )
-    }
-}

 pub fn from_fn<F, T, E, Args>(function: F) -> FromFn<F, T, E, Args> {
    FromFn {
@@ -136,36 +103,6 @@ where
        Ok(println!("{result}"))
    }
 }
-impl<F, Fut, T, E, Args> IntoHandlers for FromFnAsync<F, Fut, T, E, Args>
-where
-    Self: HandlerTypes + Handler + CliBindings,
-    <Self as HandlerTypes>::Params: DeserializeOwned,
-    <Self as HandlerTypes>::InheritedParams: DeserializeOwned,
-    <Self as HandlerTypes>::Ok: Serialize + DeserializeOwned,
-    RpcError: From<<Self as HandlerTypes>::Err>,
-{
-    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, crate::DynHandler)> {
-        iter_from_ctx_and_handler(
-            intersect_type_ids(self.contexts(), <Self as CliBindings>::Context::type_ids()),
-            DynHandler::WithCli(Arc::new(AnyHandler::new(self))),
-        )
-    }
-}
-impl<F, Fut, T, E, Args> IntoHandlers for NoCli<FromFnAsync<F, Fut, T, E, Args>>
-where
-    Self: HandlerTypes + Handler,
-    <Self as HandlerTypes>::Params: DeserializeOwned,
-    <Self as HandlerTypes>::InheritedParams: DeserializeOwned,
-    <Self as HandlerTypes>::Ok: Serialize + DeserializeOwned,
-    RpcError: From<<Self as HandlerTypes>::Err>,
-{
-    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, crate::DynHandler)> {
-        iter_from_ctx_and_handler(
-            self.contexts(),
-            DynHandler::WithoutCli(Arc::new(AnyHandler::new(self))),
-        )
-    }
-}

 pub fn from_fn_async<F, Fut, T, E, Args>(function: F) -> FromFnAsync<F, Fut, T, E, Args> {
    FromFnAsync {
@@ -181,8 +118,8 @@ where
    T: Send + Sync + 'static,
    E: Send + Sync + 'static,
 {
-    type Params = NoParams;
-    type InheritedParams = NoParams;
+    type Params = Empty;
+    type InheritedParams = Empty;
    type Ok = T;
    type Err = E;
 }
@@ -218,8 +155,8 @@ where
    T: Send + Sync + 'static,
    E: Send + Sync + 'static,
 {
-    type Params = NoParams;
-    type InheritedParams = NoParams;
+    type Params = Empty;
+    type InheritedParams = Empty;
    type Ok = T;
    type Err = E;
 }
@@ -250,8 +187,8 @@ where
    T: Send + Sync + 'static,
    E: Send + Sync + 'static,
 {
-    type Params = NoParams;
-    type InheritedParams = NoParams;
+    type Params = Empty;
+    type InheritedParams = Empty;
    type Ok = T;
    type Err = E;
 }
@@ -292,8 +229,8 @@ where
    T: Send + Sync + 'static,
    E: Send + Sync + 'static,
 {
-    type Params = NoParams;
-    type InheritedParams = NoParams;
+    type Params = Empty;
+    type InheritedParams = Empty;
    type Ok = T;
    type Err = E;
 }
@@ -327,7 +264,7 @@ where
    E: Send + Sync + 'static,
 {
    type Params = Params;
-    type InheritedParams = NoParams;
+    type InheritedParams = Empty;
    type Ok = T;
    type Err = E;
 }
@@ -374,7 +311,7 @@ where
    E: Send + Sync + 'static,
 {
    type Params = Params;
-    type InheritedParams = NoParams;
+    type InheritedParams = Empty;
    type Ok = T;
    type Err = E;
 }
--- a/rpc-toolkit/src/handler/mod.rs
+++ b/rpc-toolkit/src/handler/mod.rs
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 use yajrc::RpcError;

 use crate::context::{AnyContext, IntoContext};
-use crate::util::{internal_error, invalid_params};
+use crate::util::{internal_error, invalid_params, Flat};

 pub mod adapters;
 pub mod from_fn;
@@ -311,7 +311,11 @@ where
 }

 #[derive(Debug, Clone, Copy, Deserialize, Serialize, Parser)]
-pub struct NoParams {}
+pub struct Empty {}
+
+pub(crate) trait OrEmpty<T> {}
+impl<T> OrEmpty<T> for T {}
+impl<A, B> OrEmpty<Flat<A, B>> for Empty {}

 #[derive(Debug, Clone, Copy, Deserialize, Serialize, Parser)]
 pub enum Never {}
--- a/rpc-toolkit/src/handler/parent.rs
+++ b/rpc-toolkit/src/handler/parent.rs
@@ -12,15 +12,22 @@ use yajrc::RpcError;

 use crate::util::{combine, Flat};
 use crate::{
-    AnyContext, AnyHandler, CliBindings, DynHandler, HandleAny, HandleAnyArgs, HandleArgs, Handler,
-    HandlerTypes, IntoContext, NoCli, NoParams,
+    AnyContext, AnyHandler, CliBindings, DynHandler, Empty, HandleAny, HandleAnyArgs, HandleArgs,
+    Handler, HandlerTypes, IntoContext, OrEmpty,
 };

 pub trait IntoHandlers: HandlerTypes {
    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, DynHandler)>;
 }

-impl<H: Handler + CliBindings> IntoHandlers for H {
+impl<H> IntoHandlers for H
+where
+    H: Handler + CliBindings,
+    H::Params: DeserializeOwned,
+    H::InheritedParams: DeserializeOwned,
+    H::Ok: Serialize + DeserializeOwned,
+    RpcError: From<H::Err>,
+{
    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, DynHandler)> {
        iter_from_ctx_and_handler(
            intersect_type_ids(self.contexts(), <Self as CliBindings>::Context::type_ids()),
@@ -89,7 +96,7 @@ impl SubcommandMap {
    }
 }

-pub struct ParentHandler<Params = NoParams, InheritedParams = NoParams> {
+pub struct ParentHandler<Params = Empty, InheritedParams = Empty> {
    _phantom: PhantomData<(Params, InheritedParams)>,
    pub(crate) subcommands: SubcommandMap,
    metadata: OrdMap<&'static str, Value>,
@@ -124,152 +131,6 @@ impl<Params, InheritedParams> std::fmt::Debug for ParentHandler<Params, Inherite
    }
 }

-struct InheritanceHandler<Params, InheritedParams, H, F> {
-    _phantom: PhantomData<(Params, InheritedParams)>,
-    handler: H,
-    inherit: F,
-}
-impl<Params, InheritedParams, H: Clone, F: Clone> Clone
-    for InheritanceHandler<Params, InheritedParams, H, F>
-{
-    fn clone(&self) -> Self {
-        Self {
-            _phantom: PhantomData,
-            handler: self.handler.clone(),
-            inherit: self.inherit.clone(),
-        }
-    }
-}
-impl<Params, InheritedParams, H: std::fmt::Debug, F> std::fmt::Debug
-    for InheritanceHandler<Params, InheritedParams, H, F>
-{
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_tuple("InheritanceHandler")
-            .field(&self.handler)
-            .finish()
-    }
-}
-impl<Params, InheritedParams, H, F> HandlerTypes
-    for InheritanceHandler<Params, InheritedParams, H, F>
-where
-    H: HandlerTypes,
-    Params: Send + Sync,
-    InheritedParams: Send + Sync,
-{
-    type Params = H::Params;
-    type InheritedParams = Flat<Params, InheritedParams>;
-    type Ok = H::Ok;
-    type Err = H::Err;
-}
-#[async_trait::async_trait]
-impl<Params, InheritedParams, H, F> Handler for InheritanceHandler<Params, InheritedParams, H, F>
-where
-    Params: Send + Sync + 'static,
-    InheritedParams: Send + Sync + 'static,
-    H: Handler,
-    F: Fn(Params, InheritedParams) -> H::InheritedParams + Send + Sync + Clone + 'static,
-{
-    type Context = H::Context;
-    fn handle_sync(
-        &self,
-        HandleArgs {
-            context,
-            parent_method,
-            method,
-            params,
-            inherited_params,
-            raw_params,
-        }: HandleArgs<Self::Context, Self>,
-    ) -> Result<Self::Ok, Self::Err> {
-        self.handler.handle_sync(HandleArgs {
-            context,
-            parent_method,
-            method,
-            params,
-            inherited_params: (self.inherit)(inherited_params.0, inherited_params.1),
-            raw_params,
-        })
-    }
-    async fn handle_async(
-        &self,
-        HandleArgs {
-            context,
-            parent_method,
-            method,
-            params,
-            inherited_params,
-            raw_params,
-        }: HandleArgs<Self::Context, Self>,
-    ) -> Result<Self::Ok, Self::Err> {
-        self.handler.handle_sync(HandleArgs {
-            context,
-            parent_method,
-            method,
-            params,
-            inherited_params: (self.inherit)(inherited_params.0, inherited_params.1),
-            raw_params,
-        })
-    }
-    fn metadata(
-        &self,
-        method: VecDeque<&'static str>,
-        ctx_ty: TypeId,
-    ) -> OrdMap<&'static str, Value> {
-        self.handler.metadata(method, ctx_ty)
-    }
-    fn contexts(&self) -> Option<OrdSet<TypeId>> {
-        self.handler.contexts()
-    }
-    fn method_from_dots(&self, method: &str, ctx_ty: TypeId) -> Option<VecDeque<&'static str>> {
-        self.handler.method_from_dots(method, ctx_ty)
-    }
-}
-
-impl<Params, InheritedParams, H, F> CliBindings
-    for InheritanceHandler<Params, InheritedParams, H, F>
-where
-    Params: Send + Sync + 'static,
-    InheritedParams: Send + Sync + 'static,
-    H: CliBindings,
-    F: Fn(Params, InheritedParams) -> H::InheritedParams + Send + Sync + Clone + 'static,
-{
-    type Context = H::Context;
-    fn cli_command(&self, ctx_ty: TypeId) -> Command {
-        self.handler.cli_command(ctx_ty)
-    }
-    fn cli_parse(
-        &self,
-        matches: &ArgMatches,
-        ctx_ty: TypeId,
-    ) -> Result<(VecDeque<&'static str>, Value), clap::Error> {
-        self.handler.cli_parse(matches, ctx_ty)
-    }
-    fn cli_display(
-        &self,
-        HandleArgs {
-            context,
-            parent_method,
-            method,
-            params,
-            inherited_params,
-            raw_params,
-        }: HandleArgs<Self::Context, Self>,
-        result: Self::Ok,
-    ) -> Result<(), Self::Err> {
-        self.handler.cli_display(
-            HandleArgs {
-                context,
-                parent_method,
-                method,
-                params,
-                inherited_params: (self.inherit)(inherited_params.0, inherited_params.1),
-                raw_params,
-            },
-            result,
-        )
-    }
-}
-
 impl<Params, InheritedParams> ParentHandler<Params, InheritedParams> {
    fn get_contexts(&self) -> Option<OrdSet<TypeId>> {
        let mut set = OrdSet::new();
@@ -278,17 +139,21 @@ impl<Params, InheritedParams> ParentHandler<Params, InheritedParams> {
        }
        Some(set)
    }
+    #[allow(private_bounds)]
    pub fn subcommand<H>(mut self, name: &'static str, handler: H) -> Self
    where
-        H: IntoHandlers<InheritedParams = Flat<Params, InheritedParams>>,
+        H: IntoHandlers,
+        H::InheritedParams: OrEmpty<Flat<Params, InheritedParams>>,
    {
        self.subcommands
            .insert(name.into(), handler.into_handlers());
        self
    }
+    #[allow(private_bounds)]
    pub fn root_handler<H>(mut self, handler: H) -> Self
    where
-        H: IntoHandlers<Params = NoParams, InheritedParams = Flat<Params, InheritedParams>>,
+        H: IntoHandlers<Params = Empty>,
+        H::InheritedParams: OrEmpty<Flat<Params, InheritedParams>>,
    {
        self.subcommands.insert(None, handler.into_handlers());
        self
@@ -488,33 +353,3 @@ where
        }
    }
 }
-impl<Params, InheritedParams> IntoHandlers for ParentHandler<Params, InheritedParams>
-where
-    Self: HandlerTypes + Handler + CliBindings,
-    <Self as HandlerTypes>::Params: DeserializeOwned,
-    <Self as HandlerTypes>::InheritedParams: DeserializeOwned,
-    <Self as HandlerTypes>::Ok: Serialize + DeserializeOwned,
-    RpcError: From<<Self as HandlerTypes>::Err>,
-{
-    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, DynHandler)> {
-        iter_from_ctx_and_handler(
-            self.contexts(),
-            DynHandler::WithoutCli(Arc::new(AnyHandler::new(self))),
-        )
-    }
-}
-impl<Params, InheritedParams> IntoHandlers for NoCli<ParentHandler<Params, InheritedParams>>
-where
-    ParentHandler<Params, InheritedParams>: HandlerTypes + Handler,
-    <ParentHandler<Params, InheritedParams> as HandlerTypes>::Params: DeserializeOwned,
-    <ParentHandler<Params, InheritedParams> as HandlerTypes>::InheritedParams: DeserializeOwned,
-    <ParentHandler<Params, InheritedParams> as HandlerTypes>::Ok: Serialize + DeserializeOwned,
-    RpcError: From<<ParentHandler<Params, InheritedParams> as HandlerTypes>::Err>,
-{
-    fn into_handlers(self) -> impl IntoIterator<Item = (Option<TypeId>, DynHandler)> {
-        iter_from_ctx_and_handler(
-            self.0.contexts(),
-            DynHandler::WithoutCli(Arc::new(AnyHandler::new(self.0))),
-        )
-    }
-}
--- a/rpc-toolkit/src/server/http.rs
+++ b/rpc-toolkit/src/server/http.rs
@@ -1,10 +1,8 @@
 use std::any::TypeId;
-use std::task::Context;

 use futures::future::{join_all, BoxFuture};
 use futures::FutureExt;
 use http::header::{CONTENT_LENGTH, CONTENT_TYPE};
-use http::request::Parts;
 use http_body_util::BodyExt;
 use hyper::body::{Bytes, Incoming};
 use hyper::service::Service;
@@ -16,7 +14,7 @@ use yajrc::{RpcError, RpcMethod};

 use crate::server::{RpcRequest, RpcResponse, SingleOrBatchRpcRequest};
 use crate::util::{internal_error, parse_error};
-use crate::{handler, HandleAny, Server};
+use crate::{HandleAny, Server};

 const FALLBACK_ERROR: &str = "{\"error\":{\"code\":-32603,\"message\":\"Internal error\",\"data\":\"Failed to serialize rpc response\"}}";

--- a/rpc-toolkit/src/server/mod.rs
+++ b/rpc-toolkit/src/server/mod.rs
@@ -8,7 +8,7 @@ use imbl_value::Value;
 use yajrc::{RpcError, RpcMethod};

 use crate::util::{invalid_request, JobRunner};
-use crate::{AnyContext, AnyHandler, HandleAny, HandleAnyArgs, IntoContext, ParentHandler};
+use crate::{AnyHandler, HandleAny, HandleAnyArgs, IntoContext, ParentHandler};

 type GenericRpcMethod = yajrc::GenericRpcMethod<String, Value, Value>;
 type RpcRequest = yajrc::RpcRequest<GenericRpcMethod>;
--- a/rpc-toolkit/tests/handler.rs
+++ b/rpc-toolkit/tests/handler.rs
@@ -8,8 +8,8 @@ use clap::Parser;
 use futures::future::ready;
 use imbl_value::Value;
 use rpc_toolkit::{
-    call_remote_socket, from_fn, from_fn_async, AnyContext, CallRemote, CliApp, Context, NoParams,
-    ParentHandler, Server,
+    call_remote_socket, from_fn, from_fn_async, AnyContext, CallRemote, CliApp, Context, Empty,
+    HandlerExt, ParentHandler, Server,
 };
 use serde::{Deserialize, Serialize};
 use tokio::runtime::{Handle, Runtime};
@@ -141,7 +141,7 @@ fn make_api() -> ParentHandler {
        .subcommand("a_hello", from_fn_async(a_hello))
        .subcommand(
            "dondes",
-            ParentHandler::<InheritParams>::new().subcommand_with_inherited_no_cli(
+            ParentHandler::<InheritParams>::new().subcommand(
                "donde",
                from_fn(|c: CliContext, _: (), donde| {
                    Ok::<_, RpcError>(
@@ -151,8 +151,9 @@ fn make_api() -> ParentHandler {
                        )
                        .to_string(),
                    )
-                }),
-                |InheritParams { donde }, _| donde,
+                })
+                .with_inherited(|InheritParams { donde }, _| donde)
+                .no_cli(),
            ),
        )
        .subcommand(
@@ -166,21 +167,22 @@ fn make_api() -> ParentHandler {
                        )
                        .to_string(),
                    )
-                }),
-                |id, _| id,
+                })
+                .with_inherited(|a, _| a),
            ),
        )
        .subcommand(
            "error",
-            ParentHandler::<InheritParams>::new().root_handler_no_cli(
+            ParentHandler::<InheritParams>::new().root_handler(
                from_fn(|c: CliContext, _, InheritParams { donde }| {
                    Err::<String, _>(RpcError {
                        code: 1,
                        message: "This is an example message".into(),
                        data: None,
                    })
-                }),
-                |id, _| id,
+                })
+                .with_inherited(|a, _| a)
+                .no_cli(),
            ),
        )
 }