Experiment with a structless variant of Yew

examples/ssr_router/Cargo.toml

@@ -32,6 +32,7 @@ env_logger = "0.9"
 clap = { version = "3.1.7", features = ["derive"] }
 hyper = { version = "0.14", features = ["server", "http1"] }
 jemallocator = "0.5"
+tracing = { version = "0.1", features = ["log-always"] }
 
 [features]
 ssr = ["yew/ssr"]

packages/yew-macro/src/function_component.rs

@@ -270,64 +270,6 @@ impl FunctionComponent {
         }
     }
 
-    fn print_base_component_impl(&self) -> TokenStream {
-        let component_name = self.component_name();
-        let props_type = &self.props_type;
-        let static_comp_generics = self.create_static_component_generics();
-
-        let (impl_generics, ty_generics, where_clause) = static_comp_generics.split_for_impl();
-
-        // TODO: replace with blanket implementation when specialisation becomes stable.
-        quote! {
-            #[automatically_derived]
-            impl #impl_generics ::yew::html::BaseComponent for #component_name #ty_generics #where_clause {
-                type Message = ();
-                type Properties = #props_type;
-
-                #[inline]
-                fn create(ctx: &::yew::html::Context<Self>) -> Self {
-                    Self {
-                        _marker: ::std::marker::PhantomData,
-                        function_component: ::yew::functional::FunctionComponent::<Self>::new(ctx),
-                    }
-                }
-
-                #[inline]
-                fn update(&mut self, _ctx: &::yew::html::Context<Self>, _msg: Self::Message) -> ::std::primitive::bool {
-                    true
-                }
-
-                #[inline]
-                fn changed(&mut self, _ctx: &::yew::html::Context<Self>, _old_props: &Self::Properties) -> ::std::primitive::bool {
-                    true
-                }
-
-                #[inline]
-                fn view(&self, ctx: &::yew::html::Context<Self>) -> ::yew::html::HtmlResult {
-                    ::yew::functional::FunctionComponent::<Self>::render(
-                        &self.function_component,
-                        ::yew::html::Context::<Self>::props(ctx)
-                    )
-                }
-
-                #[inline]
-                fn rendered(&mut self, _ctx: &::yew::html::Context<Self>, _first_render: ::std::primitive::bool) {
-                    ::yew::functional::FunctionComponent::<Self>::rendered(&self.function_component)
-                }
-
-                #[inline]
-                fn destroy(&mut self, _ctx: &::yew::html::Context<Self>) {
-                    ::yew::functional::FunctionComponent::<Self>::destroy(&self.function_component)
-                }
-
-                #[inline]
-                fn prepare_state(&self) -> ::std::option::Option<::std::string::String> {
-                    ::yew::functional::FunctionComponent::<Self>::prepare_state(&self.function_component)
-                }
-            }
-        }
-    }
-
     fn print_debug_impl(&self) -> TokenStream {
         let component_name = self.component_name();
         let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();
@@ -349,7 +291,8 @@ impl FunctionComponent {
         let component_impl_attrs = self.filter_attrs_for_component_impl();
         let component_name = self.component_name();
         let fn_name = self.inner_fn_ident();
-        let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();
+        let static_ty_generics = self.create_static_component_generics();
+        let (impl_generics, ty_generics, where_clause) = static_ty_generics.split_for_impl();
         let props_type = &self.props_type;
         let fn_generics = ty_generics.as_turbofish();
 
@@ -360,7 +303,7 @@ impl FunctionComponent {
             // we cannot disable any lints here because it will be applied to the function body
             // as well.
             #(#component_impl_attrs)*
-            impl #impl_generics ::yew::functional::FunctionProvider for #component_name #ty_generics #where_clause {
+            impl #impl_generics ::yew::html::Component for #component_name #ty_generics #where_clause {
                 type Properties = #props_type;
 
                 fn run(#ctx_ident: &mut ::yew::functional::HookContext, #component_props: &Self::Properties) -> ::yew::html::HtmlResult {
@@ -386,7 +329,6 @@ impl FunctionComponent {
             #[allow(unused_parens)]
             #vis struct #component_name #generics #where_clause {
                 _marker: ::std::marker::PhantomData<(#phantom_generics)>,
-                function_component: ::yew::functional::FunctionComponent<Self>,
             }
         }
     }
@@ -418,7 +360,6 @@ pub fn function_component_impl(
 ) -> syn::Result<TokenStream> {
     component.merge_component_name(name)?;
 
-    let base_comp_impl = component.print_base_component_impl();
     let debug_impl = component.print_debug_impl();
     let provider_fn_impl = component.print_fn_provider_impl();
     let struct_def = component.print_struct_def();
@@ -428,7 +369,6 @@ pub fn function_component_impl(
 
         #provider_fn_impl
         #debug_impl
-        #base_comp_impl
     };
 
     Ok(quoted)

packages/yew-macro/src/html_tree/html_component.rs

@@ -124,7 +124,7 @@ impl ToTokens for HtmlComponent {
         } = self;
 
         let ty_span = ty.span().resolved_at(Span::call_site());
-        let props_ty = quote_spanned!(ty_span=> <#ty as ::yew::html::BaseComponent>::Properties);
+        let props_ty = quote_spanned!(ty_span=> <#ty as ::yew::html::Component>::Properties);
         let children_renderer = if children.is_empty() {
             None
         } else {

packages/yew-router/src/lib.rs

@@ -73,7 +73,6 @@ pub mod hooks;
 pub mod navigator;
 mod routable;
 pub mod router;
-pub mod scope_ext;
 pub mod switch;
 pub mod utils;
 
@@ -99,7 +98,6 @@ pub mod prelude {
     pub use crate::history::Location;
     pub use crate::hooks::*;
     pub use crate::navigator::{NavigationError, NavigationResult, Navigator};
-    pub use crate::scope_ext::{LocationHandle, NavigatorHandle, RouterScopeExt};
     #[doc(no_inline)]
     pub use crate::Routable;
     pub use crate::{BrowserRouter, HashRouter, Router, Switch};

packages/yew/Cargo.toml

@@ -34,6 +34,7 @@ serde = { version = "1", features = ["derive"] }
 tracing = "0.1.36"
 prokio = "0.1.0"
 rustversion = "1"
+typed-builder = "0.11.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen-futures = "0.4"