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
420 lines
14 KiB
Rust
420 lines
14 KiB
Rust
use proc_macro2::{Span, TokenStream};
|
|
use quote::{quote, quote_spanned, ToTokens, TokenStreamExt};
|
|
use std::collections::HashMap;
|
|
use syn::{
|
|
parse::{Parse, ParseStream},
|
|
*,
|
|
};
|
|
|
|
/// A hot-reloadable formatted string, boolean, number or other literal
|
|
///
|
|
/// This wraps LitStr with some extra goodies like inline expressions and hot-reloading.
|
|
/// Originally this was intended to provide named inline string interpolation but eventually Rust
|
|
/// actually shipped this!
|
|
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
|
|
pub struct IfmtInput {
|
|
pub source: LitStr,
|
|
pub segments: Vec<Segment>,
|
|
}
|
|
|
|
impl IfmtInput {
|
|
pub fn new(span: Span) -> Self {
|
|
Self {
|
|
source: LitStr::new("", span),
|
|
segments: Vec::new(),
|
|
}
|
|
}
|
|
|
|
pub fn new_litstr(source: LitStr) -> Result<Self> {
|
|
let segments = IfmtInput::from_raw(&source.value()).map_err(|e| {
|
|
// If there is an error creating the formatted string, attribute it to the litstr span
|
|
let span = source.span();
|
|
syn::Error::new(span, e)
|
|
})?;
|
|
Ok(Self { segments, source })
|
|
}
|
|
|
|
pub fn span(&self) -> Span {
|
|
self.source.span()
|
|
}
|
|
|
|
pub fn push_raw_str(&mut self, other: String) {
|
|
self.segments.push(Segment::Literal(other.to_string()))
|
|
}
|
|
|
|
pub fn push_ifmt(&mut self, other: IfmtInput) {
|
|
self.segments.extend(other.segments);
|
|
}
|
|
|
|
pub fn push_expr(&mut self, expr: Expr) {
|
|
self.segments.push(Segment::Formatted(FormattedSegment {
|
|
format_args: String::new(),
|
|
segment: FormattedSegmentType::Expr(Box::new(expr)),
|
|
}));
|
|
}
|
|
|
|
pub fn is_static(&self) -> bool {
|
|
self.segments
|
|
.iter()
|
|
.all(|seg| matches!(seg, Segment::Literal(_)))
|
|
}
|
|
|
|
pub fn to_static(&self) -> Option<String> {
|
|
self.segments
|
|
.iter()
|
|
.try_fold(String::new(), |acc, segment| {
|
|
if let Segment::Literal(seg) = segment {
|
|
Some(acc + seg)
|
|
} else {
|
|
None
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn dynamic_segments(&self) -> Vec<&FormattedSegment> {
|
|
self.segments
|
|
.iter()
|
|
.filter_map(|seg| match seg {
|
|
Segment::Formatted(seg) => Some(seg),
|
|
_ => None,
|
|
})
|
|
.collect::<Vec<_>>()
|
|
}
|
|
|
|
pub fn dynamic_seg_frequency_map(&self) -> HashMap<&FormattedSegment, usize> {
|
|
let mut map = HashMap::new();
|
|
for seg in self.dynamic_segments() {
|
|
*map.entry(seg).or_insert(0) += 1;
|
|
}
|
|
map
|
|
}
|
|
|
|
fn is_simple_expr(&self) -> bool {
|
|
// If there are segments but the source is empty, it's not a simple expression.
|
|
if !self.segments.is_empty() && self.source.span().byte_range().is_empty() {
|
|
return false;
|
|
}
|
|
|
|
self.segments.iter().all(|seg| match seg {
|
|
Segment::Literal(_) => true,
|
|
Segment::Formatted(FormattedSegment { segment, .. }) => {
|
|
matches!(segment, FormattedSegmentType::Ident(_))
|
|
}
|
|
})
|
|
}
|
|
|
|
/// Try to convert this into a single _.to_string() call if possible
|
|
///
|
|
/// Using "{single_expression}" is pretty common, but you don't need to go through the whole format! machinery for that, so we optimize it here.
|
|
fn try_to_string(&self) -> Option<TokenStream> {
|
|
let mut single_dynamic = None;
|
|
for segment in &self.segments {
|
|
match segment {
|
|
Segment::Literal(literal) => {
|
|
if !literal.is_empty() {
|
|
return None;
|
|
}
|
|
}
|
|
Segment::Formatted(FormattedSegment {
|
|
segment,
|
|
format_args,
|
|
}) => {
|
|
if format_args.is_empty() {
|
|
match single_dynamic {
|
|
Some(current_string) => {
|
|
single_dynamic =
|
|
Some(quote!(#current_string + &(#segment).to_string()));
|
|
}
|
|
None => {
|
|
single_dynamic = Some(quote!((#segment).to_string()));
|
|
}
|
|
}
|
|
} else {
|
|
return None;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
single_dynamic
|
|
}
|
|
|
|
/// print the original source string - this handles escapes and stuff for us
|
|
pub fn to_string_with_quotes(&self) -> String {
|
|
self.source.to_token_stream().to_string()
|
|
}
|
|
|
|
/// Parse the source into segments
|
|
fn from_raw(input: &str) -> Result<Vec<Segment>> {
|
|
let mut chars = input.chars().peekable();
|
|
let mut segments = Vec::new();
|
|
let mut current_literal = String::new();
|
|
while let Some(c) = chars.next() {
|
|
if c == '{' {
|
|
if let Some(c) = chars.next_if(|c| *c == '{') {
|
|
current_literal.push(c);
|
|
continue;
|
|
}
|
|
if !current_literal.is_empty() {
|
|
segments.push(Segment::Literal(current_literal));
|
|
}
|
|
current_literal = String::new();
|
|
let mut current_captured = String::new();
|
|
while let Some(c) = chars.next() {
|
|
if c == ':' {
|
|
// two :s in a row is a path, not a format arg
|
|
if chars.next_if(|c| *c == ':').is_some() {
|
|
current_captured.push_str("::");
|
|
continue;
|
|
}
|
|
let mut current_format_args = String::new();
|
|
for c in chars.by_ref() {
|
|
if c == '}' {
|
|
segments.push(Segment::Formatted(FormattedSegment {
|
|
format_args: current_format_args,
|
|
segment: FormattedSegmentType::parse(¤t_captured)?,
|
|
}));
|
|
break;
|
|
}
|
|
current_format_args.push(c);
|
|
}
|
|
break;
|
|
}
|
|
if c == '}' {
|
|
segments.push(Segment::Formatted(FormattedSegment {
|
|
format_args: String::new(),
|
|
segment: FormattedSegmentType::parse(¤t_captured)?,
|
|
}));
|
|
break;
|
|
}
|
|
current_captured.push(c);
|
|
}
|
|
} else {
|
|
if '}' == c {
|
|
if let Some(c) = chars.next_if(|c| *c == '}') {
|
|
current_literal.push(c);
|
|
continue;
|
|
} else {
|
|
return Err(Error::new(
|
|
Span::call_site(),
|
|
"unmatched closing '}' in format string",
|
|
));
|
|
}
|
|
}
|
|
current_literal.push(c);
|
|
}
|
|
}
|
|
|
|
if !current_literal.is_empty() {
|
|
segments.push(Segment::Literal(current_literal));
|
|
}
|
|
|
|
Ok(segments)
|
|
}
|
|
}
|
|
|
|
impl ToTokens for IfmtInput {
|
|
fn to_tokens(&self, tokens: &mut TokenStream) {
|
|
// If the input is a string literal, we can just return it
|
|
if let Some(static_str) = self.to_static() {
|
|
return quote_spanned! { self.span() => #static_str }.to_tokens(tokens);
|
|
}
|
|
|
|
// Try to turn it into a single _.to_string() call
|
|
if !cfg!(debug_assertions) {
|
|
if let Some(single_dynamic) = self.try_to_string() {
|
|
tokens.extend(single_dynamic);
|
|
return;
|
|
}
|
|
}
|
|
|
|
// If the segments are not complex exprs, we can just use format! directly to take advantage of RA rename/expansion
|
|
if self.is_simple_expr() {
|
|
let raw = &self.source;
|
|
return quote_spanned! { raw.span() => ::std::format!(#raw) }.to_tokens(tokens);
|
|
}
|
|
|
|
// build format_literal
|
|
let mut format_literal = String::new();
|
|
let mut expr_counter = 0;
|
|
for segment in self.segments.iter() {
|
|
match segment {
|
|
Segment::Literal(s) => format_literal += &s.replace('{', "{{").replace('}', "}}"),
|
|
Segment::Formatted(FormattedSegment { format_args, .. }) => {
|
|
format_literal += "{";
|
|
format_literal += &expr_counter.to_string();
|
|
expr_counter += 1;
|
|
format_literal += ":";
|
|
format_literal += format_args;
|
|
format_literal += "}";
|
|
}
|
|
}
|
|
}
|
|
|
|
let span = self.span();
|
|
|
|
let positional_args = self.segments.iter().filter_map(|seg| {
|
|
if let Segment::Formatted(FormattedSegment { segment, .. }) = seg {
|
|
let mut segment = segment.clone();
|
|
// We set the span of the ident here, so that we can use it in diagnostics
|
|
if let FormattedSegmentType::Ident(ident) = &mut segment {
|
|
ident.set_span(span);
|
|
}
|
|
Some(segment)
|
|
} else {
|
|
None
|
|
}
|
|
});
|
|
|
|
quote_spanned! {
|
|
span =>
|
|
::std::format!(
|
|
#format_literal
|
|
#(, #positional_args)*
|
|
)
|
|
}
|
|
.to_tokens(tokens)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
|
|
pub enum Segment {
|
|
Literal(String),
|
|
Formatted(FormattedSegment),
|
|
}
|
|
|
|
impl Segment {
|
|
pub fn is_literal(&self) -> bool {
|
|
matches!(self, Segment::Literal(_))
|
|
}
|
|
|
|
pub fn is_formatted(&self) -> bool {
|
|
matches!(self, Segment::Formatted(_))
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
|
|
pub struct FormattedSegment {
|
|
pub format_args: String,
|
|
pub segment: FormattedSegmentType,
|
|
}
|
|
|
|
impl ToTokens for FormattedSegment {
|
|
fn to_tokens(&self, tokens: &mut TokenStream) {
|
|
let (fmt, seg) = (&self.format_args, &self.segment);
|
|
let fmt = format!("{{0:{fmt}}}");
|
|
tokens.append_all(quote! {
|
|
format!(#fmt, #seg)
|
|
});
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Hash)]
|
|
pub enum FormattedSegmentType {
|
|
Expr(Box<Expr>),
|
|
Ident(Ident),
|
|
}
|
|
|
|
impl FormattedSegmentType {
|
|
fn parse(input: &str) -> Result<Self> {
|
|
if let Ok(ident) = parse_str::<Ident>(input) {
|
|
if ident == input {
|
|
return Ok(Self::Ident(ident));
|
|
}
|
|
}
|
|
if let Ok(expr) = parse_str(input) {
|
|
Ok(Self::Expr(Box::new(expr)))
|
|
} else {
|
|
Err(Error::new(
|
|
Span::call_site(),
|
|
"Failed to parse formatted segment: Expected Ident or Expression",
|
|
))
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ToTokens for FormattedSegmentType {
|
|
fn to_tokens(&self, tokens: &mut TokenStream) {
|
|
match self {
|
|
Self::Expr(expr) => expr.to_tokens(tokens),
|
|
Self::Ident(ident) => ident.to_tokens(tokens),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Parse for IfmtInput {
|
|
fn parse(input: ParseStream) -> Result<Self> {
|
|
let source: LitStr = input.parse()?;
|
|
Self::new_litstr(source)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use prettier_please::PrettyUnparse;
|
|
|
|
#[test]
|
|
fn raw_tokens() {
|
|
let input = syn::parse2::<IfmtInput>(quote! { r#"hello world"# }).unwrap();
|
|
println!("{}", input.to_token_stream().pretty_unparse());
|
|
assert_eq!(input.source.value(), "hello world");
|
|
assert_eq!(input.to_string_with_quotes(), "r#\"hello world\"#");
|
|
}
|
|
|
|
#[test]
|
|
fn segments_parse() {
|
|
let input: IfmtInput = parse_quote! { "blah {abc} {def}" };
|
|
assert_eq!(
|
|
input.segments,
|
|
vec![
|
|
Segment::Literal("blah ".to_string()),
|
|
Segment::Formatted(FormattedSegment {
|
|
format_args: String::new(),
|
|
segment: FormattedSegmentType::Ident(Ident::new("abc", Span::call_site()))
|
|
}),
|
|
Segment::Literal(" ".to_string()),
|
|
Segment::Formatted(FormattedSegment {
|
|
format_args: String::new(),
|
|
segment: FormattedSegmentType::Ident(Ident::new("def", Span::call_site()))
|
|
}),
|
|
]
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn printing_raw() {
|
|
let input = syn::parse2::<IfmtInput>(quote! { "hello {world}" }).unwrap();
|
|
println!("{}", input.to_string_with_quotes());
|
|
|
|
let input = syn::parse2::<IfmtInput>(quote! { "hello {world} {world} {world}" }).unwrap();
|
|
println!("{}", input.to_string_with_quotes());
|
|
|
|
let input = syn::parse2::<IfmtInput>(quote! { "hello {world} {world} {world()}" }).unwrap();
|
|
println!("{}", input.to_string_with_quotes());
|
|
|
|
let input =
|
|
syn::parse2::<IfmtInput>(quote! { r#"hello {world} {world} {world()}"# }).unwrap();
|
|
println!("{}", input.to_string_with_quotes());
|
|
assert!(!input.is_static());
|
|
|
|
let input = syn::parse2::<IfmtInput>(quote! { r#"hello"# }).unwrap();
|
|
println!("{}", input.to_string_with_quotes());
|
|
assert!(input.is_static());
|
|
}
|
|
|
|
#[test]
|
|
fn to_static() {
|
|
let input = syn::parse2::<IfmtInput>(quote! { "body {{ background: red; }}" }).unwrap();
|
|
assert_eq!(
|
|
input.to_static(),
|
|
Some("body { background: red; }".to_string())
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn error_spans() {
|
|
let input = syn::parse2::<IfmtInput>(quote! { "body {{ background: red; }" }).unwrap_err();
|
|
assert_eq!(input.span().byte_range(), 0..28);
|
|
}
|
|
}
|