From 75ca777bbeb618e14b1cf8854ebb37b7a2c884b5 Mon Sep 17 00:00:00 2001 From: HampusM Date: Sat, 16 Sep 2023 16:04:47 +0200 Subject: refactor: make castable factory take DI container param --- macros/src/factory/build_declare_interfaces.rs | 12 ++-- src/di_container/blocking/mod.rs | 12 ++-- src/private/castable_factory/blocking.rs | 85 ++++++++++++-------------- src/private/factory.rs | 9 ++- 4 files changed, 56 insertions(+), 62 deletions(-) diff --git a/macros/src/factory/build_declare_interfaces.rs b/macros/src/factory/build_declare_interfaces.rs index e4fc01b..38dd35d 100644 --- a/macros/src/factory/build_declare_interfaces.rs +++ b/macros/src/factory/build_declare_interfaces.rs @@ -33,18 +33,18 @@ pub fn build_declare_factory_interfaces( quote! { syrette::declare_interface!( syrette::private::castable_factory::blocking::CastableFactory< - (std::rc::Rc,), - #factory_interface + #factory_interface, + syrette::di_container::blocking::DIContainer > -> syrette::private::factory::IFactory< - (std::rc::Rc,), - #factory_interface + #factory_interface, + syrette::di_container::blocking::DIContainer > ); syrette::declare_interface!( syrette::private::castable_factory::blocking::CastableFactory< - (std::rc::Rc,), - #factory_interface + #factory_interface, + syrette::di_container::blocking::DIContainer > -> syrette::private::any_factory::AnyFactory ); } diff --git a/src/di_container/blocking/mod.rs b/src/di_container/blocking/mod.rs index 1ee0294..702141a 100644 --- a/src/di_container/blocking/mod.rs +++ b/src/di_container/blocking/mod.rs @@ -209,7 +209,7 @@ impl DIContainer use crate::private::factory::IFactory; let factory = factory_binding - .cast::,), Interface>>() + .cast::>() .map_err(|_| DIContainerError::CastFailed { interface: type_name::(), binding_kind: "factory", @@ -222,11 +222,13 @@ impl DIContainer use crate::private::factory::IFactory; use crate::ptr::TransientPtr; + type DefaultFactoryFn = dyn IFactory< + dyn Fn<(), Output = TransientPtr>, + DIContainer, + >; + let default_factory = factory_binding - .cast::,), - dyn Fn<(), Output = TransientPtr>, - >>() + .cast::>() .map_err(|_| DIContainerError::CastFailed { interface: type_name::(), binding_kind: "default factory", diff --git a/src/private/castable_factory/blocking.rs b/src/private/castable_factory/blocking.rs index bf0dde8..24c653e 100644 --- a/src/private/castable_factory/blocking.rs +++ b/src/private/castable_factory/blocking.rs @@ -1,109 +1,95 @@ use std::any::type_name; use std::fmt::Debug; -use std::marker::Tuple; +use std::rc::Rc; use crate::private::any_factory::AnyFactory; use crate::private::factory::IFactory; use crate::ptr::TransientPtr; -pub struct CastableFactory +pub struct CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, + DIContainerT: 'static, { - func: &'static dyn Fn>, + func: &'static dyn Fn<(Rc,), Output = TransientPtr>, } -impl CastableFactory +impl CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, { pub fn new( - func: &'static dyn Fn>, + func: &'static dyn Fn< + (Rc,), + Output = TransientPtr, + >, ) -> Self { Self { func } } } -impl IFactory - for CastableFactory +impl IFactory + for CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, { } -impl Fn for CastableFactory +impl Fn<(Rc,)> + for CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, { - extern "rust-call" fn call(&self, args: Args) -> Self::Output + extern "rust-call" fn call(&self, args: (Rc,)) -> Self::Output { self.func.call(args) } } -impl FnMut for CastableFactory +impl FnMut<(Rc,)> + for CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, { - extern "rust-call" fn call_mut(&mut self, args: Args) -> Self::Output + extern "rust-call" fn call_mut(&mut self, args: (Rc,)) -> Self::Output { self.call(args) } } -impl FnOnce for CastableFactory +impl FnOnce<(Rc,)> + for CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, { type Output = TransientPtr; - extern "rust-call" fn call_once(self, args: Args) -> Self::Output + extern "rust-call" fn call_once(self, args: (Rc,)) -> Self::Output { self.call(args) } } -impl AnyFactory for CastableFactory +impl AnyFactory + for CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, + DIContainerT: 'static, { } -impl Debug for CastableFactory +impl Debug + for CastableFactory where - Args: Tuple + 'static, ReturnInterface: 'static + ?Sized, { #[cfg(not(tarpaulin_include))] fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - let mut args = type_name::(); - - if args.len() < 2 { - return Err(std::fmt::Error); - } - - args = args - .get(1..args.len() - 1) - .map_or_else(|| Err(std::fmt::Error), Ok)?; - - if args.ends_with(',') { - args = args - .get(..args.len() - 1) - .map_or_else(|| Err(std::fmt::Error), Ok)?; - } - let ret = type_name::>(); - formatter.write_fmt(format_args!("CastableFactory ({args}) -> {ret}")) + formatter.write_fmt(format_args!("CastableFactory (Rc) -> {ret}")) } } @@ -111,6 +97,7 @@ where mod tests { use super::*; + use crate::di_container::blocking::MockDIContainer; #[derive(Debug, PartialEq, Eq)] struct Bacon @@ -122,9 +109,11 @@ mod tests fn can_call() { let castable_factory = - CastableFactory::new(&|heal_amount| TransientPtr::new(Bacon { heal_amount })); + CastableFactory::new(&|_| TransientPtr::new(Bacon { heal_amount: 27 })); - let output = castable_factory.call((27,)); + let mock_di_container = Rc::new(MockDIContainer::new()); + + let output = castable_factory.call((mock_di_container,)); assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 27 })); } @@ -133,9 +122,11 @@ mod tests fn can_call_mut() { let mut castable_factory = - CastableFactory::new(&|heal_amount| TransientPtr::new(Bacon { heal_amount })); + CastableFactory::new(&|_| TransientPtr::new(Bacon { heal_amount: 103 })); + + let mock_di_container = Rc::new(MockDIContainer::new()); - let output = castable_factory.call_mut((103,)); + let output = castable_factory.call_mut((mock_di_container,)); assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 103 })); } @@ -144,9 +135,11 @@ mod tests fn can_call_once() { let castable_factory = - CastableFactory::new(&|heal_amount| TransientPtr::new(Bacon { heal_amount })); + CastableFactory::new(&|_| TransientPtr::new(Bacon { heal_amount: 19 })); + + let mock_di_container = Rc::new(MockDIContainer::new()); - let output = castable_factory.call_once((19,)); + let output = castable_factory.call_once((mock_di_container,)); assert_eq!(output, TransientPtr::new(Bacon { heal_amount: 19 })); } diff --git a/src/private/factory.rs b/src/private/factory.rs index 84b00c6..af6df8a 100644 --- a/src/private/factory.rs +++ b/src/private/factory.rs @@ -1,13 +1,12 @@ -use std::marker::Tuple; +use std::rc::Rc; use crate::private::cast::CastFrom; use crate::ptr::TransientPtr; /// Interface for a factory. -pub trait IFactory: - Fn> + CastFrom +pub trait IFactory: + Fn<(Rc,), Output = TransientPtr> + CastFrom where - Args: Tuple, ReturnInterface: 'static + ?Sized, { } @@ -17,7 +16,7 @@ where pub trait IThreadsafeFactory: Fn> + crate::private::cast::CastFromArc where - Args: Tuple, + Args: std::marker::Tuple, ReturnInterface: 'static + ?Sized, { } -- cgit v1.2.3-18-g5258