refactor!: remove factory & declare_default_factory macros

BREAKING CHANGE: The factory and the declare_default_factory macros have been removed. They are no longer needed to use factories

5 files changed, 0 insertions, 462 deletions

diff --git a/macros/src/factory/build_declare_interfaces.rs b/macros/src/factory/build_declare_interfaces.rs
deleted file mode 100644
index 1e2d62e..0000000
--- a/macros/src/factory/build_declare_interfaces.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-use proc_macro2::TokenStream;
-use quote::quote;
-
-use crate::fn_trait::FnTrait;
-
-pub fn build_declare_factory_interfaces(
-    factory_interface: &FnTrait,
-    is_threadsafe: bool,
-) -> TokenStream
-{
-    if is_threadsafe {
-        quote! {
-            syrette::declare_interface!(
-                syrette::private::castable_factory::threadsafe::ThreadsafeCastableFactory<
-                    #factory_interface,
-                    syrette::di_container::asynchronous::AsyncDIContainer,
-                > -> syrette::private::factory::IThreadsafeFactory<
-                    #factory_interface,
-                    syrette::di_container::asynchronous::AsyncDIContainer,
-                >,
-                threadsafe_sharable = true
-            );
-
-            syrette::declare_interface!(
-                syrette::private::castable_factory::threadsafe::ThreadsafeCastableFactory<
-                    #factory_interface,
-                    syrette::di_container::asynchronous::AsyncDIContainer,
-                > -> syrette::private::any_factory::AnyThreadsafeFactory,
-                threadsafe_sharable = true
-            );
-        }
-    } else {
-        quote! {
-            syrette::declare_interface!(
-                syrette::private::castable_factory::CastableFactory<
-                    #factory_interface,
-                    syrette::di_container::blocking::DIContainer
-                > -> syrette::private::factory::IFactory<
-                    #factory_interface,
-                    syrette::di_container::blocking::DIContainer
-                >
-            );
-
-            syrette::declare_interface!(
-                syrette::private::castable_factory::CastableFactory<
-                    #factory_interface,
-                    syrette::di_container::blocking::DIContainer
-                > -> syrette::private::any_factory::AnyFactory
-            );
-        }
-    }
-}
diff --git a/macros/src/factory/declare_default_args.rs b/macros/src/factory/declare_default_args.rs
deleted file mode 100644
index 9930f4f..0000000
--- a/macros/src/factory/declare_default_args.rs
+++ /dev/null
@@ -1,232 +0,0 @@
-use syn::parse::Parse;
-use syn::punctuated::Punctuated;
-use syn::{Token, Type};
-
-use crate::macro_flag::MacroFlag;
-use crate::util::iterator_ext::IteratorExt;
-
-pub const FACTORY_MACRO_FLAGS: &[&str] = &["threadsafe", "async"];
-
-pub struct DeclareDefaultFactoryMacroArgs
-{
-    pub interface: Type,
-    pub flags: Punctuated<MacroFlag, Token![,]>,
-}
-
-impl Parse for DeclareDefaultFactoryMacroArgs
-{
-    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self>
-    {
-        let interface = input.parse()?;
-
-        if !input.peek(Token![,]) {
-            return Ok(Self {
-                interface,
-                flags: Punctuated::new(),
-            });
-        }
-
-        input.parse::<Token![,]>()?;
-
-        let flags = Punctuated::<MacroFlag, Token![,]>::parse_terminated(input)?;
-
-        for flag in &flags {
-            let name = flag.name().to_string();
-
-            if !FACTORY_MACRO_FLAGS.contains(&name.as_str()) {
-                return Err(input.error(format!(
-                    "Unknown flag '{name}'. Expected one of [ {} ]",
-                    FACTORY_MACRO_FLAGS.join(",")
-                )));
-            }
-        }
-
-        let flag_names = flags
-            .iter()
-            .map(|flag| flag.name().to_string())
-            .collect::<Vec<_>>();
-
-        if let Some((dupe_flag_name, _)) = flag_names.iter().find_duplicate() {
-            return Err(input.error(format!("Duplicate flag '{dupe_flag_name}'")));
-        }
-
-        Ok(Self { interface, flags })
-    }
-}
-
-#[cfg(test)]
-mod tests
-{
-    use proc_macro2::Span;
-    use quote::{format_ident, quote};
-    use syn::token::Dyn;
-    use syn::{
-        parse2,
-        Lit,
-        LitBool,
-        Path,
-        PathArguments,
-        PathSegment,
-        TraitBound,
-        TraitBoundModifier,
-        Type,
-        TypeParamBound,
-        TypeTraitObject,
-    };
-
-    use super::*;
-    use crate::macro_flag::MacroFlagValue;
-
-    #[test]
-    fn can_parse_with_interface_only()
-    {
-        let input_args = quote! {
-            dyn IFoo
-        };
-
-        let dec_def_fac_args =
-            parse2::<DeclareDefaultFactoryMacroArgs>(input_args).unwrap();
-
-        assert_eq!(
-            dec_def_fac_args.interface,
-            Type::TraitObject(TypeTraitObject {
-                dyn_token: Some(Dyn::default()),
-                bounds: Punctuated::from_iter(vec![TypeParamBound::Trait(TraitBound {
-                    paren_token: None,
-                    modifier: TraitBoundModifier::None,
-                    lifetimes: None,
-                    path: Path {
-                        leading_colon: None,
-                        segments: Punctuated::from_iter(vec![PathSegment {
-                            ident: format_ident!("IFoo"),
-                            arguments: PathArguments::None
-                        }])
-                    }
-                })])
-            })
-        );
-
-        assert!(dec_def_fac_args.flags.is_empty());
-    }
-
-    #[test]
-    fn can_parse_with_interface_and_single_flag()
-    {
-        let input_args = quote! {
-            dyn IBar, threadsafe = true
-        };
-
-        let dec_def_fac_args =
-            parse2::<DeclareDefaultFactoryMacroArgs>(input_args).unwrap();
-
-        assert_eq!(
-            dec_def_fac_args.interface,
-            Type::TraitObject(TypeTraitObject {
-                dyn_token: Some(Dyn::default()),
-                bounds: Punctuated::from_iter(vec![TypeParamBound::Trait(TraitBound {
-                    paren_token: None,
-                    modifier: TraitBoundModifier::None,
-                    lifetimes: None,
-                    path: Path {
-                        leading_colon: None,
-                        segments: Punctuated::from_iter(vec![PathSegment {
-                            ident: format_ident!("IBar"),
-                            arguments: PathArguments::None
-                        }])
-                    }
-                })])
-            })
-        );
-
-        assert_eq!(
-            dec_def_fac_args.flags,
-            Punctuated::from_iter(vec![MacroFlag {
-                name: format_ident!("threadsafe"),
-                value: MacroFlagValue::Literal(Lit::Bool(LitBool::new(
-                    true,
-                    Span::call_site()
-                )))
-            }])
-        );
-    }
-
-    #[test]
-    fn can_parse_with_interface_and_multiple_flags()
-    {
-        let input_args = quote! {
-            dyn IBar, threadsafe = true, async = false
-        };
-
-        let dec_def_fac_args =
-            parse2::<DeclareDefaultFactoryMacroArgs>(input_args).unwrap();
-
-        assert_eq!(
-            dec_def_fac_args.interface,
-            Type::TraitObject(TypeTraitObject {
-                dyn_token: Some(Dyn::default()),
-                bounds: Punctuated::from_iter(vec![TypeParamBound::Trait(TraitBound {
-                    paren_token: None,
-                    modifier: TraitBoundModifier::None,
-                    lifetimes: None,
-                    path: Path {
-                        leading_colon: None,
-                        segments: Punctuated::from_iter(vec![PathSegment {
-                            ident: format_ident!("IBar"),
-                            arguments: PathArguments::None
-                        }])
-                    }
-                })])
-            })
-        );
-
-        assert_eq!(
-            dec_def_fac_args.flags,
-            Punctuated::from_iter(vec![
-                MacroFlag {
-                    name: format_ident!("threadsafe"),
-                    value: MacroFlagValue::Literal(Lit::Bool(LitBool::new(
-                        true,
-                        Span::call_site()
-                    )))
-                },
-                MacroFlag {
-                    name: format_ident!("async"),
-                    value: MacroFlagValue::Literal(Lit::Bool(LitBool::new(
-                        false,
-                        Span::call_site()
-                    )))
-                }
-            ])
-        );
-    }
-
-    #[test]
-    fn cannot_parse_with_interface_and_invalid_flag()
-    {
-        let input_args = quote! {
-            dyn IBar, async = true, foo = false
-        };
-
-        assert!(parse2::<DeclareDefaultFactoryMacroArgs>(input_args).is_err());
-    }
-
-    #[test]
-    fn cannot_parse_with_interface_and_duplicate_flag()
-    {
-        assert!(
-            // Formatting is weird without this comment
-            parse2::<DeclareDefaultFactoryMacroArgs>(quote! {
-                dyn IBar, async = true, threadsafe = false, async = true
-            })
-            .is_err()
-        );
-
-        assert!(
-            // Formatting is weird without this comment
-            parse2::<DeclareDefaultFactoryMacroArgs>(quote! {
-                dyn IBar, async = true, threadsafe = false, async = false
-            })
-            .is_err()
-        );
-    }
-}
diff --git a/macros/src/factory/macro_args.rs b/macros/src/factory/macro_args.rs
deleted file mode 100644
index 676b412..0000000
--- a/macros/src/factory/macro_args.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-use syn::parse::Parse;
-use syn::punctuated::Punctuated;
-use syn::Token;
-
-use crate::macro_flag::MacroFlag;
-use crate::util::iterator_ext::IteratorExt;
-
-pub const FACTORY_MACRO_FLAGS: &[&str] = &["threadsafe"];
-
-pub struct FactoryMacroArgs
-{
-    pub flags: Punctuated<MacroFlag, Token![,]>,
-}
-
-impl Parse for FactoryMacroArgs
-{
-    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self>
-    {
-        let flags = Punctuated::<MacroFlag, Token![,]>::parse_terminated(input)?;
-
-        for flag in &flags {
-            let name = flag.name().to_string();
-
-            if !FACTORY_MACRO_FLAGS.contains(&name.as_str()) {
-                return Err(input.error(format!(
-                    "Unknown flag '{}'. Expected one of [ {} ]",
-                    name,
-                    FACTORY_MACRO_FLAGS.join(",")
-                )));
-            }
-        }
-
-        let flag_names = flags
-            .iter()
-            .map(|flag| flag.name().to_string())
-            .collect::<Vec<_>>();
-
-        if let Some((dupe_flag_name, _)) = flag_names.iter().find_duplicate() {
-            return Err(input.error(format!("Duplicate flag '{dupe_flag_name}'")));
-        }
-
-        Ok(Self { flags })
-    }
-}
-
-#[cfg(test)]
-mod tests
-{
-    use proc_macro2::Span;
-    use quote::{format_ident, quote};
-    use syn::{parse2, Lit, LitBool};
-
-    use super::*;
-    use crate::macro_flag::MacroFlagValue;
-
-    #[test]
-    fn can_parse_with_single_flag()
-    {
-        let input_args = quote! {
-            threadsafe = true
-        };
-
-        let factory_macro_args = parse2::<FactoryMacroArgs>(input_args).unwrap();
-
-        assert_eq!(
-            factory_macro_args.flags,
-            Punctuated::from_iter(vec![MacroFlag {
-                name: format_ident!("threadsafe"),
-                value: MacroFlagValue::Literal(Lit::Bool(LitBool::new(
-                    true,
-                    Span::call_site()
-                )))
-            }])
-        );
-    }
-
-    #[test]
-    fn cannot_parse_with_invalid_flag()
-    {
-        let input_args = quote! {
-            threadsafe = false, foo = true
-        };
-
-        assert!(parse2::<FactoryMacroArgs>(input_args).is_err());
-    }
-
-    #[test]
-    fn cannot_parse_with_duplicate_flag()
-    {
-        assert!(
-            // Formatting is weird without this comment
-            parse2::<FactoryMacroArgs>(quote! {
-                threadsafe = true, threadsafe = true
-            })
-            .is_err()
-        );
-
-        assert!(
-            // Formatting is weird without this comment
-            parse2::<FactoryMacroArgs>(quote! {
-                threadsafe = true, threadsafe = false
-            })
-            .is_err()
-        );
-    }
-}
diff --git a/macros/src/factory/mod.rs b/macros/src/factory/mod.rs
deleted file mode 100644
index 18bad8f..0000000
--- a/macros/src/factory/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod build_declare_interfaces;
-pub mod declare_default_args;
-pub mod macro_args;
-pub mod type_alias;
diff --git a/macros/src/factory/type_alias.rs b/macros/src/factory/type_alias.rs
deleted file mode 100644
index cfa254f..0000000
--- a/macros/src/factory/type_alias.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use quote::ToTokens;
-use syn::parse::{Parse, ParseStream};
-use syn::{parse2, ItemType};
-
-use crate::fn_trait::FnTrait;
-
-pub struct FactoryTypeAlias
-{
-    pub type_alias: ItemType,
-    pub factory_interface: FnTrait,
-}
-
-impl Parse for FactoryTypeAlias
-{
-    fn parse(input: ParseStream) -> syn::Result<Self>
-    {
-        let type_alias = input
-            .parse::<ItemType>()
-            .map_err(|_| input.error("Expected a type alias"))?;
-
-        let aliased_fn_trait =
-            parse2::<FnTrait>(type_alias.ty.as_ref().to_token_stream())?;
-
-        Ok(Self {
-            type_alias,
-            factory_interface: aliased_fn_trait.clone(),
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests
-{
-    use quote::{format_ident, quote};
-    use syn::punctuated::Punctuated;
-    use syn::token::And;
-    use syn::{Type, TypeReference};
-
-    use super::*;
-    use crate::test_utils;
-
-    #[test]
-    fn can_parse()
-    {
-        let input_args = quote! {
-            type FooFactory = dyn Fn(String, &u32) -> Foo;
-        };
-
-        let factory_type_alias = parse2::<FactoryTypeAlias>(input_args).unwrap();
-
-        assert_eq!(
-            factory_type_alias.factory_interface.inputs,
-            Punctuated::from_iter(vec![
-                test_utils::create_type(test_utils::create_path(&[
-                    test_utils::create_path_segment(format_ident!("String"), &[])
-                ])),
-                Type::Reference(TypeReference {
-                    and_token: And::default(),
-                    lifetime: None,
-                    mutability: None,
-                    elem: Box::new(test_utils::create_type(test_utils::create_path(&[
-                        test_utils::create_path_segment(format_ident!("u32"), &[])
-                    ])))
-                })
-            ])
-        );
-    }
-}