Enable runtime rust hot patching. * roll back wry to 0.45 * cleanup rustc * wip * wip: fix client/server * get the subsecond cli thing working again * back to list of builds but with accessors * migrate some methods to workspace, clean up impl a bit * pass mode through build context * use a build context, similar to cargo/rustc * merge BuildUpdate and HandleUpdate into BuilderUpdate * Move more resolution of args into runner * migrate some methods to runner * hoist out fullstack * fix build request resolver * yay request is cleaned up * fixup resolution a bit * spawn off the build! * re-wire android autodetection * re-wire android autodetection * wire back up a few more things * re-wire tooling verification * I think it's mostly in the right condition for regular app * add depinfo parser * yay okay works with regular apps again * full rebuilds are back * rewire file wtcher * wire patch! * yayyyyyy patching works and is really fast * yay android works * clean up stdout piping * yayyy memap on android so we don't need root * create a static wasm jump table * wip: global offset table for wasm * wip... thinking about making the patches relocatable * wip: customized relocation * YESSSSSS RELOCATABLE WASM * clean up impl a bit * lil bit more cleanup * lil bit more * lil bit more cleanup * lil bit more cleanup, support 32 bit platforms * sick, wasm is completely pic * hmmmm not quite working yet * woooo, patches loading from rust+wasm * integrated into the cli 😎 * condense a bit * cleaned up request a bit * bust fingerprints * Make the file diffing logic a bit more sensible * still working through a few issues, server launches but is acting weird * fix merge conflict * more merge issues * remove stuff we don't want anymore * revert name change * wip: server not working anymore :( * split apart "dioxus fullstack" into "dioxus server" and "dioxus web" * fixup a few more compile errors * grrr opening server * simultaneous frontend and backend patching * use rustc wrapper * wip: passing assets to jumptable * migrate project-like examples * patchy patchy server fns! * rollback some random changes * unwind the js files * rollback hash * no need for patch * more cleanups * lil bit more cleanup, remove some old cruft * allow patching when wasm webpage is closed * tiny bit more robust * lil bit of clean up * clean up ws code * bit more clean ups * condense * undo file moves * move back other project * move other project * migrate out harness and janky CLI * fix compile * anonymize some files, heavily document others * lots more documentation, for posterity! * ton more docs * clean up the cli a bit more * more ws cleanup * more cleanup * migrate build id to cli-config * add command file handling * random small cleanups * wip.... * wip.... * fix: use workspace for krate discovery * fix panic logging on serve by placing it *after* the logs * reorder logging to be sensible on success * bring back swc * ws cruft * small patches to relocs in loader * bump krates * hoist main funcs into the ifunc table, fixing wasm * fix tui output for long lines * add more linker logging * wow, incredible, we build fat binaries, holy heckkkkk * fix args for frontend/backend * small cleanups * properly send along build IDs to clients * fix workspace compiles * clean up jump table work a bit * clean up logging a bit * open existing * fixup some commands * open existing browser integration * wire up the new dx serve client/server syntax * fixup `dx run` command * bring back some old functionality * fix serverfn feature sets * remove toast animation and simplify its code a bit * less intrusive toast * dont change build status when patching on web * add proper cache busting to vcomponent * clean up the patch file a bit * more lints/checks cleaned up * go back to TargetArgs but a BuildTargets resolved struct * clean up more nits * use an atomicptr for jumptable * fix interaction with initial web load + suspense * don't run asset system on wasm/bindgen js in dev * reduce blast radius of PR * use profile to determine if we're in release * cleanup prod html template * cleanup profiles * fix feature resolution of fullstack * if fullstack is explicitly false, don't use it * light cleanups * drop carg config2 * pass along linker args properly * make workspace examples compile with dx again * fewer unwraps and better error loggign * bit more error handlign * small cleanup * drive-by cleanups * use queries instead of initialize for aslr stuff * fix hotpatch with higher opt level * fix aslr bug from multiple clients * fix merge conflict * fix typos * clippy * fix miscompile * fix doctest * properly rollback wry to 0.45 * fix markdown path issues, other test issues * fix test in router * fix release mode test * fix some more tests, clean up a few more items * use fnptr instead of typeid * clean up memozation via subsecond in core * use "main" as sentinel * fix imports and re-exports * get off __rust_alloc for aslr offset detection * wip * wip... fixing unoptimized web * hmmmm mmmm * close,ish, still missing the wasmbindgen dynaimc imports * aha! full wasm works now - disable externref when compilng patch modules - manually link wasm instrinsics - displace the __wbindgen_placeholder__ table with the synthesized wbg imports what an awful pain. There might be a few items missing, so will test against the docsite shortly * remove failing test * hmmmm things aren't perfect * from what I can tell, relocatable wasm just doesn't work with wasm-bindgen sad https://github.com/rustwasm/wasm-bindgen/issues/1420 * AI IS LITERALLY THE WORST * preserve wasm snippets across compiles * IT HOTPATCHES THE DOCSITE, WE ARE LIVING IN THE FUTURE * remove the macos cfg-out * fix: need to allocate 1 more page * fix url issue * properly span props * properly fill in extra symbols * light cleanups and good docs * delete cruft, better docs * More cleanups and simplifications * clippy, typos * remove harnesses * wasm-bindgen error logging * clean up deps * remove cruft * proper priv/pub * use ifuncs for all env imports * cruft * use par_iter, better output * implement a cache for the base module * delete custom sections * cache the main native module too * add par iter in a few more places * clippy, map ident * better logging and status bars * wip: some small windows support * wip more windowss * fix weird regression * implement windows jump table * small fixes for windows * better windows support * windows support pt2 * rust lld is not msvc * whole archive the rlibs * ignore windows and sys crates * logging * ohhhhhh, pop out dlls * dedupe * thANK GOD FAT LINKING WORKS ON WINDOWS * hoist caching * implement patch based on cache * fix location for pdb * pass data symbols, correct object * add all symbol for windows * add log * treat none rva as undefined * whoops * handle windows calling convention * dont use relocated arm64 stub windows * not all are text? * WINDOWS FUNCTION PATCHING WORKS but issue with statics? * use our own entry * handle windows imp symbols * add log * jump to the real symbol not the layout * whoops * hotpatching windows works completely holy heck yay * drop linker args crate * disable ssg playwright for now * light cleanups * some cleanups / preps: - bump to serverfn 0.8.2 - fix playwright test - fix clippy * use fix from #4042 * bring in other fix for liveview * hoist some configuration * use __aslr_reference instead of aslr_reference * add better errors to patcherror * fix android * panic if patching fails * clean up tomls * wip: fixing wasm compile for server * fullstack wasm again * fix cfg * fixup feature detection * fix issue with features * fix playwright! * add barebones template test harness * fix compatibility between the two hotreload engines * fix preldue of server * fix check for wasm-opt * small fixes
308 lines
9.7 KiB
Rust
308 lines
9.7 KiB
Rust
use std::fmt::Arguments;
|
|
|
|
use crate::innerlude::*;
|
|
|
|
/// Every "Props" used for a component must implement the `Properties` trait. This trait gives some hints to Dioxus
|
|
/// on how to memoize the props and some additional optimizations that can be made. We strongly encourage using the
|
|
/// derive macro to implement the `Properties` trait automatically.
|
|
///
|
|
/// Dioxus requires your props to be 'static, `Clone`, and `PartialEq`. We use the `PartialEq` trait to determine if
|
|
/// the props have changed when we diff the component.
|
|
///
|
|
/// ## Example
|
|
///
|
|
/// ```rust
|
|
/// # use dioxus::prelude::*;
|
|
/// #[derive(Props, PartialEq, Clone)]
|
|
/// struct MyComponentProps {
|
|
/// data: String
|
|
/// }
|
|
///
|
|
/// fn MyComponent(props: MyComponentProps) -> Element {
|
|
/// rsx! {
|
|
/// div { "Hello {props.data}" }
|
|
/// }
|
|
/// }
|
|
/// ```
|
|
///
|
|
/// Or even better, derive your entire props struct with the [`#[crate::component]`] macro:
|
|
///
|
|
/// ```rust
|
|
/// # use dioxus::prelude::*;
|
|
/// #[component]
|
|
/// fn MyComponent(data: String) -> Element {
|
|
/// rsx! {
|
|
/// div { "Hello {data}" }
|
|
/// }
|
|
/// }
|
|
/// ```
|
|
#[rustversion::attr(
|
|
since(1.78.0),
|
|
diagnostic::on_unimplemented(
|
|
message = "`Props` is not implemented for `{Self}`",
|
|
label = "Props",
|
|
note = "Props is a trait that is automatically implemented for all structs that can be used as props for a component",
|
|
note = "If you manually created a new properties struct, you may have forgotten to add `#[derive(Props, PartialEq, Clone)]` to your struct",
|
|
)
|
|
)]
|
|
pub trait Properties: Clone + Sized + 'static {
|
|
/// The type of the builder for this component.
|
|
/// Used to create "in-progress" versions of the props.
|
|
type Builder;
|
|
|
|
/// Create a builder for this component.
|
|
fn builder() -> Self::Builder;
|
|
|
|
/// Make the old props equal to the new props. Return if the props were equal and should be memoized.
|
|
fn memoize(&mut self, other: &Self) -> bool;
|
|
|
|
/// Create a component from the props.
|
|
fn into_vcomponent<M: 'static>(self, render_fn: impl ComponentFunction<Self, M>) -> VComponent {
|
|
let type_name = std::any::type_name_of_val(&render_fn);
|
|
VComponent::new(render_fn, self, type_name)
|
|
}
|
|
}
|
|
|
|
impl Properties for () {
|
|
type Builder = EmptyBuilder;
|
|
fn builder() -> Self::Builder {
|
|
EmptyBuilder {}
|
|
}
|
|
fn memoize(&mut self, _other: &Self) -> bool {
|
|
true
|
|
}
|
|
}
|
|
|
|
/// Root properties never need to be memoized, so we can use a dummy implementation.
|
|
pub(crate) struct RootProps<P>(pub P);
|
|
|
|
impl<P> Clone for RootProps<P>
|
|
where
|
|
P: Clone,
|
|
{
|
|
fn clone(&self) -> Self {
|
|
Self(self.0.clone())
|
|
}
|
|
}
|
|
|
|
impl<P> Properties for RootProps<P>
|
|
where
|
|
P: Clone + 'static,
|
|
{
|
|
type Builder = P;
|
|
fn builder() -> Self::Builder {
|
|
unreachable!("Root props technically are never built")
|
|
}
|
|
fn memoize(&mut self, _other: &Self) -> bool {
|
|
true
|
|
}
|
|
}
|
|
|
|
// We allow components to use the () generic parameter if they have no props. This impl enables the "build" method
|
|
// that the macros use to anonymously complete prop construction.
|
|
pub struct EmptyBuilder;
|
|
impl EmptyBuilder {
|
|
pub fn build(self) {}
|
|
}
|
|
|
|
/// This utility function launches the builder method so that the rsx! macro can use the typed-builder pattern
|
|
/// to initialize a component's props.
|
|
pub fn fc_to_builder<P, M>(_: impl ComponentFunction<P, M>) -> <P as Properties>::Builder
|
|
where
|
|
P: Properties,
|
|
{
|
|
P::builder()
|
|
}
|
|
|
|
/// A warning that will trigger if a component is called as a function
|
|
#[warnings::warning]
|
|
pub(crate) fn component_called_as_function<C: ComponentFunction<P, M>, P, M>(_: C) {
|
|
// We trim WithOwner from the end of the type name for component with a builder that include a special owner which may not match the function name directly
|
|
let type_name = std::any::type_name::<C>();
|
|
let component_name = Runtime::with(|rt| {
|
|
current_scope_id()
|
|
.ok()
|
|
.and_then(|id| rt.get_state(id).map(|scope| scope.name))
|
|
})
|
|
.ok()
|
|
.flatten();
|
|
|
|
// If we are in a component, and the type name is the same as the active component name, then we can just return
|
|
if component_name == Some(type_name) {
|
|
return;
|
|
}
|
|
|
|
// Otherwise the component was called like a function, so we should log an error
|
|
tracing::error!("It looks like you called the component {type_name} like a function instead of a component. Components should be called with braces like `{type_name} {{ prop: value }}` instead of as a function");
|
|
}
|
|
|
|
/// Make sure that this component is currently running as a component, not a function call
|
|
#[doc(hidden)]
|
|
#[allow(clippy::no_effect)]
|
|
pub fn verify_component_called_as_component<C: ComponentFunction<P, M>, P, M>(component: C) {
|
|
component_called_as_function(component);
|
|
}
|
|
|
|
/// Any component that implements the `ComponentFn` trait can be used as a component.
|
|
///
|
|
/// This trait is automatically implemented for functions that are in one of the following forms:
|
|
/// - `fn() -> Element`
|
|
/// - `fn(props: Properties) -> Element`
|
|
///
|
|
/// You can derive it automatically for any function with arguments that implement PartialEq with the `#[component]` attribute:
|
|
/// ```rust
|
|
/// # use dioxus::prelude::*;
|
|
/// #[component]
|
|
/// fn MyComponent(a: u32, b: u32) -> Element {
|
|
/// rsx! { "a: {a}, b: {b}" }
|
|
/// }
|
|
/// ```
|
|
#[rustversion::attr(
|
|
since(1.78.0),
|
|
diagnostic::on_unimplemented(
|
|
message = "`Component<{Props}>` is not implemented for `{Self}`",
|
|
label = "Component",
|
|
note = "Components are functions in the form `fn() -> Element`, `fn(props: Properties) -> Element`, or `#[component] fn(partial_eq1: u32, partial_eq2: u32) -> Element`.",
|
|
note = "You may have forgotten to add `#[component]` to your function to automatically implement the `ComponentFunction` trait."
|
|
)
|
|
)]
|
|
pub trait ComponentFunction<Props, Marker = ()>: Clone + 'static {
|
|
/// Get the raw address of the component render function.
|
|
fn fn_ptr(&self) -> usize;
|
|
|
|
/// Convert the component to a function that takes props and returns an element.
|
|
fn rebuild(&self, props: Props) -> Element;
|
|
}
|
|
|
|
/// Accept any callbacks that take props
|
|
impl<F, P> ComponentFunction<P> for F
|
|
where
|
|
F: Fn(P) -> Element + Clone + 'static,
|
|
{
|
|
fn rebuild(&self, props: P) -> Element {
|
|
subsecond::HotFn::current(self.clone()).call((props,))
|
|
}
|
|
|
|
fn fn_ptr(&self) -> usize {
|
|
subsecond::HotFn::current(self.clone()).ptr_address() as usize
|
|
}
|
|
}
|
|
|
|
/// Accept any callbacks that take no props
|
|
pub struct EmptyMarker;
|
|
impl<F> ComponentFunction<(), EmptyMarker> for F
|
|
where
|
|
F: Fn() -> Element + Clone + 'static,
|
|
{
|
|
fn rebuild(&self, props: ()) -> Element {
|
|
subsecond::HotFn::current(self.clone()).call(props)
|
|
}
|
|
|
|
fn fn_ptr(&self) -> usize {
|
|
subsecond::HotFn::current(self.clone()).ptr_address() as usize
|
|
}
|
|
}
|
|
|
|
/// A enhanced version of the `Into` trait that allows with more flexibility.
|
|
pub trait SuperInto<O, M = ()> {
|
|
/// Convert from a type to another type.
|
|
fn super_into(self) -> O;
|
|
}
|
|
|
|
impl<T, O, M> SuperInto<O, M> for T
|
|
where
|
|
O: SuperFrom<T, M>,
|
|
{
|
|
fn super_into(self) -> O {
|
|
O::super_from(self)
|
|
}
|
|
}
|
|
|
|
/// A enhanced version of the `From` trait that allows with more flexibility.
|
|
pub trait SuperFrom<T, M = ()> {
|
|
/// Convert from a type to another type.
|
|
fn super_from(_: T) -> Self;
|
|
}
|
|
|
|
// first implement for all types that are that implement the From trait
|
|
impl<T, O> SuperFrom<T, ()> for O
|
|
where
|
|
O: From<T>,
|
|
{
|
|
fn super_from(input: T) -> Self {
|
|
Self::from(input)
|
|
}
|
|
}
|
|
|
|
#[doc(hidden)]
|
|
pub struct OptionStringFromMarker;
|
|
|
|
impl<'a> SuperFrom<&'a str, OptionStringFromMarker> for Option<String> {
|
|
fn super_from(input: &'a str) -> Self {
|
|
Some(String::from(input))
|
|
}
|
|
}
|
|
|
|
#[doc(hidden)]
|
|
pub struct OptionArgumentsFromMarker;
|
|
|
|
impl<'a> SuperFrom<Arguments<'a>, OptionArgumentsFromMarker> for Option<String> {
|
|
fn super_from(input: Arguments<'a>) -> Self {
|
|
Some(input.to_string())
|
|
}
|
|
}
|
|
|
|
#[doc(hidden)]
|
|
pub struct OptionCallbackMarker<T>(std::marker::PhantomData<T>);
|
|
|
|
// Closure can be created from FnMut -> async { anything } or FnMut -> Ret
|
|
impl<
|
|
Function: FnMut(Args) -> Spawn + 'static,
|
|
Args: 'static,
|
|
Spawn: SpawnIfAsync<Marker, Ret> + 'static,
|
|
Ret: 'static,
|
|
Marker,
|
|
> SuperFrom<Function, OptionCallbackMarker<Marker>> for Option<Callback<Args, Ret>>
|
|
{
|
|
fn super_from(input: Function) -> Self {
|
|
Some(Callback::new(input))
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
#[allow(unused)]
|
|
fn optional_callback_compiles() {
|
|
fn compiles() {
|
|
// Converting from closures (without type hints in the closure works)
|
|
let callback: Callback<i32, i32> = (|num| num * num).super_into();
|
|
let callback: Callback<i32, ()> = (|num| async move { println!("{num}") }).super_into();
|
|
|
|
// Converting from closures to optional callbacks works
|
|
let optional: Option<Callback<i32, i32>> = (|num| num * num).super_into();
|
|
let optional: Option<Callback<i32, ()>> =
|
|
(|num| async move { println!("{num}") }).super_into();
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
#[allow(unused)]
|
|
fn from_props_compiles() {
|
|
// T -> T works
|
|
let option: i32 = 0i32.super_into();
|
|
let option: i32 = 0.super_into(); // Note we don't need type hints on all inputs
|
|
let option: i128 = 0.super_into();
|
|
let option: &'static str = "hello world".super_into();
|
|
|
|
// // T -> From<T> works
|
|
let option: i64 = 0i32.super_into();
|
|
let option: String = "hello world".super_into();
|
|
|
|
// T -> Option works
|
|
let option: Option<i32> = 0i32.super_into();
|
|
let option: Option<i32> = 0.super_into();
|
|
let option: Option<i128> = 0.super_into();
|
|
fn takes_option_string<M>(_: impl SuperInto<Option<String>, M>) {}
|
|
takes_option_string("hello world");
|
|
takes_option_string("hello world".to_string());
|
|
}
|