* create static site generation helpers in the router crate * work on integrating static site generation into fullstack * move ssg into a separate crate * integrate ssg with the launch builder * simplify ssg example * fix static_routes for child routes * move CLI hot reloading websocket code into dioxus-hot-reload * fix some unused imports * use the same hot reloading websocket code for fullstack * fix fullstack hot reloading * move cli hot reloading logic into the hot reload crate * ssg example working with dx serve * add more examples * fix clippy * switch to a result for Element * fix formatting * fix hot reload doctest imports * fix axum imports * add show method to error context * implement retaining nodes during suspense * fix unterminated if statements * communicate between tasks and suspense boundaries * make suspense placeholders easier to use * implement IntoDynNode and IntoVNode for more wrappers * fix clippy examples * fix rsx tests * add streaming html utilities to the ssr package * unify hydration and non-hydration ssr cache * fix router with Result Element * don't run server doc tests * Fix hot reload websocket doc examples * simple apps working with fullstack streaming * fix preloading wasm * Report errors encountered while streaming * remove async from incremental renderer * document new VirtualDom suspense methods * make streaming work with incremental rendering * fix static site generation * document suspense structs * create closure type; allow async event handlers in props; allow shorthand event handlers * test forwarding event handlers with the shorthand syntax * fix clippy * fix imports in spawn async doctest * fix empty rsx * fix async result event handlers * fix mounting router in multiple places * Fix task dead cancel race condition * simplify diffing before adding suspense * fix binary size increase * fix attribute diffing * more diffing fixes * create minimal fullstack feature * smaller fullstack bundles * allow mounting nodes that are already created and creating nodes without mounting them * fix hot reload feature * fix replacing components * don't reclaim virtual nodes * client side suspense working! * fix CLI * slightly smaller fullstack builds * fix multiple suspended scopes * fix merge errors * yield back to tokio every few polls to fix suspending on many tasks at once * remove logs * document suspense boundary and update suspense example * fix ssg * make streaming optional * fix some router and core tests * fix suspense example * fix serialization with out of order server futures * add incremental streaming hackernews demo * fix hackernews demo * fix root hackernews redirect * fix formatting * add tests for suspense cases * slightly smaller binaries * slightly smaller * improve error handling docs * fix errors example link * fix doc tests * remove log file * fix ssr cache type inference * remove index.html * fix ssg render template * fix assigning ids on elements with dynamic attributes * add desktop feature to the workspace examples * remove router static generation example; ssg lives in the dioxus-static-generation package * add a test for effects during suspense * only run effects on mounted nodes * fix multiple suspense roots * fix node iterator * fix closures without arguments * fix dioxus-core readme doctest * remove suspense logs * fix scope stack * fix clippy * remove unused suspense boundary from hackernews * assert that launch never returns for better compiler errors * fix static generation launch function * fix web renderer * pass context providers into server functions * add an example for FromContext * clean up DioxusRouterExt * fix server function context * fix fullstack desktop example * forward CLI serve settings to fullstack * re-export serve config at the root of fullstack * forward env directly instead of using a guard * just set the port in the CLI for fullstack playwright tests * fix fullstack dioxus-cli-config feature * fix launch server merge conflicts * fix fullstack launch context * Merge branch 'main' into suspense-2.0 * fix fullstack html data * remove drop virtual dom feature * add a comment about only_write_templates binary size workaround * remove explicit dependencies from use_server_future * make ErrorContext and SuspenseContext more similar * Tweak: small tweaks to tomls to make diff smaller * only rerun components under suspense after the initial placeholders are sent to the client * add module docs for suspense * keep track of when suspense boundaries are resolved * start implementing JS out of order streaming * fix core tests * implement the server side of suspense with js * fix streaming ssr with nested suspense * move streaming ssr code into fullstack * revert minification changes * serialize server future data as the html streams * start loading scripts wasm immediately instead of defering the script * very basic nested suspense example working with minimal html updates * clean up some suspense/error docs * fix hydrating nested pending server futures * sort resolved boundaries by height * Fix disconnecting clients while streaming * fix static generation crate * don't insert extra divs when hydrating streamed chunks * wait to swap in the elements until they are hydrated * remove inline streaming script * hackernews partially working * fix spa mode * banish the open shadow dom * fix removing placeholder * set up streaming playwright test * run web playwright tests on 9999 to avoid port conflicts with other local servers * remove suspense nodes if the suspense boundary is replaced before the suspense resolves on the server * ignore hydration of removed suspense boundaries * use path based indexing to fix hydrating suspense after parent suspense with child is removed * re-export dioxus error * remove resolved suspense divs if the suspense boundary has been removed * Fix client side initialized server futures * ignore comment nodes while traversing nodes in core to avoid lists getting swapped out with suspense * Pass initial hydration data to the client * hide pre nodes * don't panic if reclaiming an element fails * fix scope stack when polling tasks * improve deserialization out of length message * Ok(VNode::placeholder()) -> VNode::empty() * fix typo in rsx usage * restore testing changes from suspense example * clean up some logs and comments * fix playwright tests * clean up more changes in core * clean up core tests * remove anymap dependency * clean up changes to hooks * clean up changes in the router, rsx, and web * revert changes to axum-hello-world * fix use_server_future * fix clippy in dioxus-core * check that the next or previous node exist before checking if we should ignore them * fix formatting * fix suspense playwright test * remove unused suspense code * add more suspense playwright tests * add more docs for error boundaries * fix suspense core tests * fix ErrorBoundary example * remove a bunch of debug logging in js * fix router failure_external_navigation * use absolute paths in the interpreter build.rs * strip '\r' while hashing ts files * add a wrapper with a default error boundary and suspense boundary * restore hot reloading * ignore non-ts files when hashing * sort ts files before hashing them * fix rsx tests * fix fullstack doc tests * fix core tests * fix axum auth example * update suspense hydration diagram * longer playwright build limit * tiny fixes - spelling, formatting * update diagram link * remove comment and template nodes for suspense placeholders * remove comment nodes as we hydrate text * simplify hackernews example * clean up hydrating text nodes * switch to a separate environment variable for the base path for smaller binaries * clean up file system html trait * fix form data * move streaming code into fullstack * implement serialize and deserialize for CapturedError * remove waits in the nested suspense playwright spec * force sequential fullstack builds for CI * longer nested suspense delay for CI * fix --force-sequential flag * wait to launch server until client build is done --------- Co-authored-by: Jonathan Kelley <jkelleyrtp@gmail.com>
234 lines
8.8 KiB
Rust
234 lines
8.8 KiB
Rust
#![doc(html_logo_url = "https://avatars.githubusercontent.com/u/79236386")]
|
|
#![doc(html_favicon_url = "https://avatars.githubusercontent.com/u/79236386")]
|
|
|
|
//! Parse the root tokens in the rsx!{} macro
|
|
//! =========================================
|
|
//!
|
|
//! This parsing path emerges directly from the macro call, with `RsxRender` being the primary entrance into parsing.
|
|
//! This feature must support:
|
|
//! - [x] Optionally rendering if the `in XYZ` pattern is present
|
|
//! - [x] Fragments as top-level element (through ambiguous)
|
|
//! - [x] Components as top-level element (through ambiguous)
|
|
//! - [x] Tags as top-level elements (through ambiguous)
|
|
//! - [x] Good errors if parsing fails
|
|
//!
|
|
//! Any errors in using rsx! will likely occur when people start using it, so the first errors must be really helpful.
|
|
//!
|
|
//! # Completions
|
|
//! Rust analyzer completes macros by looking at the expansion of the macro and trying to match the start of identifiers in the macro to identifiers in the current scope
|
|
//!
|
|
//! Eg, if a macro expands to this:
|
|
//! ```rust, ignore
|
|
//! struct MyStruct;
|
|
//!
|
|
//! // macro expansion
|
|
//! My
|
|
//! ```
|
|
//! Then the analyzer will try to match the start of the identifier "My" to an identifier in the current scope (MyStruct in this case).
|
|
//!
|
|
//! In dioxus, our macros expand to the completions module if we know the identifier is incomplete:
|
|
//! ```rust, ignore
|
|
//! // In the root of the macro, identifiers must be elements
|
|
//! // rsx! { di }
|
|
//! dioxus_elements::elements::di
|
|
//!
|
|
//! // Before the first child element, every following identifier is either an attribute or an element
|
|
//! // rsx! { div { ta } }
|
|
//! // Isolate completions scope
|
|
//! mod completions__ {
|
|
//! // import both the attributes and elements this could complete to
|
|
//! use dioxus_elements::elements::div::*;
|
|
//! use dioxus_elements::elements::*;
|
|
//! fn complete() {
|
|
//! ta;
|
|
//! }
|
|
//! }
|
|
//!
|
|
//! // After the first child element, every following identifier is another element
|
|
//! // rsx! { div { attribute: value, child {} di } }
|
|
//! dioxus_elements::elements::di
|
|
//! ```
|
|
|
|
#[macro_use]
|
|
mod errors;
|
|
mod attribute;
|
|
mod component;
|
|
mod element;
|
|
mod ifmt;
|
|
mod location;
|
|
mod node;
|
|
mod util;
|
|
|
|
pub(crate) mod context;
|
|
pub(crate) mod renderer;
|
|
mod sub_templates;
|
|
|
|
// Re-export the namespaces into each other
|
|
pub use attribute::*;
|
|
pub use component::*;
|
|
pub use context::DynamicContext;
|
|
pub use element::*;
|
|
pub use ifmt::*;
|
|
pub use node::*;
|
|
|
|
pub mod hot_reload;
|
|
|
|
#[cfg(feature = "hot_reload")]
|
|
use dioxus_core::{Template, TemplateAttribute, TemplateNode};
|
|
#[cfg(feature = "hot_reload_traits")]
|
|
pub use hot_reload::HotReloadingContext;
|
|
#[cfg(feature = "hot_reload")]
|
|
use internment::Intern;
|
|
|
|
use proc_macro2::TokenStream as TokenStream2;
|
|
use quote::{quote, ToTokens, TokenStreamExt};
|
|
use renderer::TemplateRenderer;
|
|
use std::{fmt::Debug, hash::Hash};
|
|
use syn::{
|
|
parse::{Parse, ParseStream},
|
|
Result, Token,
|
|
};
|
|
|
|
/// The Callbody is the contents of the rsx! macro
|
|
///
|
|
/// It is a list of BodyNodes, which are the different parts of the template.
|
|
/// The Callbody contains no information about how the template will be rendered, only information about the parsed tokens.
|
|
///
|
|
/// Every callbody should be valid, so you can use it to build a template.
|
|
/// To generate the code used to render the template, use the ToTokens impl on the Callbody, or with the `render_with_location` method.
|
|
#[derive(Default, Debug)]
|
|
pub struct CallBody {
|
|
pub roots: Vec<BodyNode>,
|
|
}
|
|
|
|
impl CallBody {
|
|
/// Render the template with a manually set file location. This should be used when multiple rsx! calls are used in the same macro
|
|
pub fn render_with_location(&self, location: String) -> TokenStream2 {
|
|
// Empty templates just are placeholders for "none"
|
|
if self.roots.is_empty() {
|
|
return quote! { None };
|
|
}
|
|
|
|
let body = TemplateRenderer::as_tokens(&self.roots, Some(location));
|
|
|
|
quote! { { #body } }
|
|
}
|
|
|
|
/// This will try to create a new template from the current body and the previous body. This will return None if the
|
|
/// rsx has some dynamic part that has changed.
|
|
///
|
|
/// The previous_location is the location of the previous template at the time the template was originally compiled.
|
|
/// It's up to you the implementor to trace the template location back to the original source code. Generally you
|
|
/// can simply just match the location from the syn::File type to the template map living in the renderer.
|
|
///
|
|
/// When you implement hotreloading, you're likely just going to parse the source code into the Syn::File type, which
|
|
/// should make retrieving the template location easy.
|
|
///
|
|
/// ## Note:
|
|
///
|
|
/// - This function intentionally leaks memory to create a static template.
|
|
/// - Keeping the template static allows us to simplify the core of dioxus and leaking memory in dev mode is less of an issue.
|
|
///
|
|
/// ## Longer note about sub templates:
|
|
///
|
|
/// Sub templates when expanded in rustc use the same file/lin/col information as the parent template. This can
|
|
/// be annoying when you're trying to get a location for a sub template and it's pretending that it's its parent.
|
|
/// The new implementation of this aggregates all subtemplates into the TemplateRenderer and then assigns them
|
|
/// unique IDs based on the byte index of the template, working around this issue.
|
|
///
|
|
/// ## TODO:
|
|
///
|
|
/// A longer term goal would be to provide some sort of diagnostics to the user as to why the template was not
|
|
/// updated, giving them an option to revert to the previous template as to not require a full rebuild.
|
|
#[cfg(feature = "hot_reload")]
|
|
pub fn update_template<Ctx: HotReloadingContext>(
|
|
&self,
|
|
old: Option<CallBody>,
|
|
location: &'static str,
|
|
) -> Option<Template> {
|
|
// Create a context that will be used to update the template
|
|
let mut context = DynamicContext::new_with_old(old);
|
|
|
|
// Force the template node to generate us TemplateNodes, and fill in the location information
|
|
let roots = context.populate_by_updating::<Ctx>(&self.roots)?;
|
|
|
|
// We've received the dioxus-core TemplateNodess, and need to assemble them into a Template
|
|
// We could just use them directly, but we want to intern them to do our best to avoid
|
|
// egregious memory leaks. We're sitll leaking memory, but at least we can blame it on
|
|
// the `Intern` crate and not just the fact that we call Box::leak.
|
|
//
|
|
// We should also note that order of these nodes could be all scrambeled
|
|
Some(Template {
|
|
name: location,
|
|
roots: intern(roots.as_slice()),
|
|
node_paths: intern(
|
|
context
|
|
.node_paths
|
|
.into_iter()
|
|
.map(|path| intern(path.as_slice()))
|
|
.collect::<Vec<_>>()
|
|
.as_slice(),
|
|
),
|
|
attr_paths: intern(
|
|
context
|
|
.attr_paths
|
|
.into_iter()
|
|
.map(|path| intern(path.as_slice()))
|
|
.collect::<Vec<_>>()
|
|
.as_slice(),
|
|
),
|
|
})
|
|
}
|
|
|
|
/// Parse a stream into a CallBody. Return all error immediately instead of trying to partially expand the macro
|
|
///
|
|
/// This should be preferred over `parse` if you are outside of a macro
|
|
pub fn parse_strict(input: ParseStream) -> Result<Self> {
|
|
Self::parse_with_options(input, false)
|
|
}
|
|
|
|
fn parse_with_options(input: ParseStream, partial_completions: bool) -> Result<Self> {
|
|
let mut roots = Vec::new();
|
|
|
|
while !input.is_empty() {
|
|
let node = BodyNode::parse_with_options(input, partial_completions)?;
|
|
|
|
if input.peek(Token![,]) {
|
|
let _ = input.parse::<Token![,]>();
|
|
}
|
|
|
|
roots.push(node);
|
|
}
|
|
|
|
Ok(CallBody { roots })
|
|
}
|
|
}
|
|
|
|
impl Parse for CallBody {
|
|
fn parse(input: ParseStream) -> Result<Self> {
|
|
Self::parse_with_options(input, true)
|
|
}
|
|
}
|
|
|
|
impl ToTokens for CallBody {
|
|
fn to_tokens(&self, out_tokens: &mut TokenStream2) {
|
|
// Empty templates just are placeholders for "none"
|
|
match self.roots.is_empty() {
|
|
true => out_tokens
|
|
.append_all(quote! { dioxus_core::prelude::Element::Ok(dioxus_core::prelude::VNode::placeholder()) }),
|
|
false => {
|
|
let body = TemplateRenderer::as_tokens(&self.roots, None);
|
|
out_tokens.append_all(quote! { { #body } })
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "hot_reload")]
|
|
// interns a object into a static object, resusing the value if it already exists
|
|
pub(crate) fn intern<T: Eq + Hash + Send + Sync + ?Sized + 'static>(
|
|
s: impl Into<Intern<T>>,
|
|
) -> &'static T {
|
|
s.into().as_ref()
|
|
}
|