* wip: fix manganis import path * upgrade tauri bundler, convert todo!() to unimplemented!() * feat: mobile hotreloading + ios asset configuration * remove oid demo and its associated env vars * nuke all the things that cause cache thrashing * swap to Asset type * add some more logs * display impl for attrvalue * dont panic on collect failure * cut down web deps to 150 * clean up deps in a lot of places, simplify build scripts * clean up asset resolution and cli-dev profile * wire up absolute paths for manganis asset in a particular mode * move document related things around to shorten compile times * move most things to `document::Item` and then decompose the cli-config * switch link to stylesheet for clarity in examples * move manganis workspace example to examples folder * decompose manganis-cli-support * dont need mobile demo anymore * remove gloo dialogs * html doesnt need document * rename hotreload to devtools * really clean up the html crate * fix weird rsx spacing * clean up desktop to use callback * clean up document a bit * re-wire up devsocket * fix utf css * yeeeet that js out of here * synthetic web system works * web crate almost done being cleaned up * desktop mostly cleaned up too * clean up cli a bit * more cli cleanup * cli builds again * clean up cli, inline structs, cut down number of unique types where possible * hotreload works again for desktop and this time, mobile too * cfg out tungstenite * devserver err * more refactor to cli builder * switch to unbounded_send * new structure is much cleaner * add http serve subcommand * bundled hotreload * kick stylsheets * clean up a bit more, split up eventloop * amazingly serve seems done * change from pub to pub(crate) in cli * remove tools * bit more polish to cli * fix issue with join * gracefully handle fullstack without a server * fullstack mobile demo * fix launch function, move projects into example-projects folder * hoist examples * add "run" command * clean up launch * remove old manual websocket receiver * doctor command * allow desktop to scroll * cut apart router crate * dont put launch in prelude * use dioxus::launch where possible * rename rsx, cut out hotreload tests * remove liveview project * bump native * fix compile for renderers * move sync event response out of interpreter * move render in serve * rollback settings change * cli compiles, huzzah! * change uris for asset * fix asset * new tui screen * new cargo-like tui works * very very verty close * it works! very small bug with incorrect grapheme calc * Clean up devserver a bit * status sytem * tidy up debug filters * clean up logging situation * Fix a number of bugs with log printing * new printing system is more reliable * wire up more stuff * things working but fullstack is having issues * fullstack works again! * hotreloading bundled assets works again * bundled hotreload and beginnings of macos bundling * Hotreload desktop * combined server builds * add build handle * fix fullstack assets * make open async, add some hooks for ios * migrate filemap to runner * wip global crate system * fixup bundles + organize asset * fix asset location bug * all the bundled reloading! * open ios simulator! * full hotreload support for mobile + serverfn * basic cleanups * clean up dx * Move filemap * fix cutting of newlines * assets workibg, some android * hoist wry/tao * use sync locks and headers to fix issues with android * desktop -> mac/win/linux with alias * better logging * feat: workspace (entire computer!) hotreload * should rebuild toggle, ios simulator bootup * proper mobile support in launch * more robust handling of assets * fix cargo * bring back some of tauri bundle * make warnings go away, clippy happy on cli * some final clippy cleanups * fmt * move manganis to its own folder * upgrade bundle to stable * drastically slim down manganis, prepping for merge * typos, failing test, docsrs config * remove static gen test * nix static gen test * we use --platform web instead of --platform fullstack now * only bind dev urls in desktop/mobile * install gtk * nix static gen * split build dir by app name
150 lines
4.3 KiB
Rust
150 lines
4.3 KiB
Rust
//! Compare two files and find any rsx calls that have changed
|
|
//!
|
|
//! This is used to determine if a hotreload is needed.
|
|
//! We use a special syn visitor to find all the rsx! calls in the file and then compare them to see
|
|
//! if they are the same. This visitor will actually remove the rsx! calls and replace them with a
|
|
//! dummy rsx! call. The final file type is thus mutated in place, leaving the original file idents
|
|
//! in place. We then compare the two files to see if they are the same. We're able to differentiate
|
|
//! between rust code changes and rsx code changes with much less code than the previous manual diff
|
|
//! approach.
|
|
|
|
use syn::visit_mut::VisitMut;
|
|
use syn::{File, Macro};
|
|
|
|
pub struct ChangedRsx {
|
|
/// The old macro - the original RSX from the original file
|
|
pub old: Macro,
|
|
|
|
/// The new macro
|
|
pub new: Macro,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub enum ReloadableRustCode {
|
|
Rsx { old: Macro, new: Macro },
|
|
}
|
|
|
|
/// Find any rsx calls in the given file and return a list of all the rsx calls that have changed.
|
|
///
|
|
/// Takes in the two files, clones them, removes the rsx! contents and prunes any doc comments.
|
|
/// Then it compares the two files to see if they are different - if they are, the code changed.
|
|
/// Otherwise, the code is the same and we can move on to handling the changed rsx
|
|
///
|
|
/// Returns `None` if the files are the same and `Some` if they are different
|
|
/// If there are no rsx! calls in the files, the vec will be empty.
|
|
pub fn diff_rsx(new: &File, old: &File) -> Option<Vec<ChangedRsx>> {
|
|
// Make a clone of these files in place so we don't have to worry about mutating the original
|
|
let mut old = old.clone();
|
|
let mut new = new.clone();
|
|
|
|
// Collect all the rsx! macros from the old file - modifying the files in place
|
|
let old_macros = collect_from_file(&mut old);
|
|
let new_macros = collect_from_file(&mut new);
|
|
|
|
// If the number of rsx! macros is different, then it's not hotreloadable
|
|
if old_macros.len() != new_macros.len() {
|
|
return None;
|
|
}
|
|
|
|
// If the files are not the same, then it's not hotreloadable
|
|
if old != new {
|
|
return None;
|
|
}
|
|
|
|
Some(
|
|
old_macros
|
|
.into_iter()
|
|
.zip(new_macros)
|
|
.map(|(old, new)| ChangedRsx { old, new })
|
|
.collect(),
|
|
)
|
|
}
|
|
|
|
pub fn collect_from_file(file: &mut File) -> Vec<Macro> {
|
|
struct MacroCollector(Vec<Macro>);
|
|
impl VisitMut for MacroCollector {
|
|
/// Take out the rsx! macros, leaving a default in their place
|
|
fn visit_macro_mut(&mut self, dest: &mut syn::Macro) {
|
|
let name = &dest.path.segments.last().map(|i| i.ident.to_string());
|
|
if let Some("rsx" | "render") = name.as_deref() {
|
|
let mut default: syn::Macro = syn::parse_quote! { rsx! {} };
|
|
std::mem::swap(dest, &mut default);
|
|
self.0.push(default)
|
|
}
|
|
}
|
|
|
|
/// Ignore doc comments by swapping them out with a default
|
|
fn visit_attribute_mut(&mut self, i: &mut syn::Attribute) {
|
|
if i.path().is_ident("doc") {
|
|
*i = syn::parse_quote! { #[doc = ""] };
|
|
}
|
|
}
|
|
}
|
|
|
|
let mut macros = MacroCollector(vec![]);
|
|
macros.visit_file_mut(file);
|
|
macros.0
|
|
}
|
|
|
|
#[test]
|
|
fn changing_files() {
|
|
let old = r#"
|
|
use dioxus::prelude::*;
|
|
|
|
/// some comment
|
|
pub fn CoolChild() -> Element {
|
|
let a = 123;
|
|
|
|
rsx! {
|
|
div {
|
|
{some_expr()}
|
|
}
|
|
}
|
|
}"#;
|
|
|
|
let new = r#"
|
|
use dioxus::prelude::*;
|
|
|
|
/// some comment
|
|
pub fn CoolChild() -> Element {
|
|
rsx! {
|
|
div {
|
|
{some_expr()}
|
|
}
|
|
}
|
|
}"#;
|
|
|
|
let same = r#"
|
|
use dioxus::prelude::*;
|
|
|
|
/// some comment!!!!!
|
|
pub fn CoolChild() -> Element {
|
|
let a = 123;
|
|
|
|
rsx! {
|
|
div {
|
|
{some_expr()}
|
|
}
|
|
}
|
|
}"#;
|
|
|
|
let old = syn::parse_file(old).unwrap();
|
|
let new = syn::parse_file(new).unwrap();
|
|
let same = syn::parse_file(same).unwrap();
|
|
|
|
assert!(
|
|
diff_rsx(&old, &new).is_none(),
|
|
"Files with different expressions should not be hotreloadable"
|
|
);
|
|
|
|
assert!(
|
|
diff_rsx(&new, &new).is_some(),
|
|
"The same file should be reloadable with itself"
|
|
);
|
|
|
|
assert!(
|
|
diff_rsx(&old, &same).is_some(),
|
|
"Files with changed comments should be hotreloadable"
|
|
);
|
|
}
|