wip-19

aspect · aspect · commit 3fec33503f5a · 2025-02-18T20:16:55.000-05:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -179,16 +179,16 @@ ctrlc = { version = "3.2", features = ["termination"] }
 dirs = "5.0.1"
 downcast = "0.11.0"
 downcast-rs = "1.2.0"
-faster-hex = "0.9.0"
-filetime = "0.2.22"
-futures = "0.3.29"
+faster-hex = "0.10.0"
+filetime = "0.2.25"
+futures = "0.3.31"
 futures-util = { version = "0.3.29", default-features = false, features = ["sink", "std"] }
 getrandom = {version = "0.2.10", features=["js"]}
 hexplay = "0.3.0"
-home = "0.5.5"
+home = "0.5.11"
 instant = { version ="0.1.12", features = ['wasm-bindgen'] }
-itertools = "0.13.0"
-js-sys = "0.3.64"
+itertools = "0.14.0"
+js-sys = "0.3.77"
 lazy_static = "1.4.0"
 log = "0.4.20"
 manual_future = "0.1.1"
@@ -198,10 +198,10 @@ numtoa = "0.2.4"
 # nw-sys= { path = "../nw-sys" }
 nw-sys = { version = "0.1.6" }
 pad = "0.1.6"
-parse-variants = "1.0.1"
+parse-variants = "1.0.4"
 proc-macro-error = { version = "1.0.4", default-features = false }
 proc-macro2 = { version = "1.0.50" }
-quote = "1.0.23"
+quote = "1.0.38"
 rand = { version = "0.8.5", features = ["getrandom"] }
 regex = "1.10.2"
 reqwest = { version = "0.12.4", default-features = false }
@@ -216,30 +216,30 @@ sha2 = "0.10.8"
 # syn = {version="2.0",features=["full","fold","extra-traits","parsing","proc-macro"]}
 syn = {version="1.0.107",features=["full","fold","extra-traits","parsing","proc-macro"]}
 termcolor="1.3.0"
-termion = "4.0.2"
+termion = "4.0.3"
 textwrap = "0.16.0"
-thiserror = "1.0.50"
+thiserror = "2.0.11"
 tokio = { version = "1.33.0", default-features = false, features = ['io-util','time','sync','macros','rt','rt-multi-thread'] }
 tokio-tungstenite = { version = "0.23.1", default-features = false, features = ["handshake", "connect"] }
 tungstenite = { version = "0.23.0", default-features = false }
 triggered = "0.1.2"
-wasm-bindgen = "0.2.93"
-wasm-bindgen-futures = "0.4.43"
-web-sys = "0.3.70"
+wasm-bindgen = "0.2.100"
+wasm-bindgen-futures = "0.4.50"
+web-sys = "0.3.77"
 # chrome-sys = {path = "../chrome-sys"}
 chrome-sys = { version = "0.2.0" }
 chacha20poly1305 = "0.10.1"
 zeroize = { version = "1.6.0", default-features = false, features = ["alloc"] }
 
 
 
-egui = "0.28.1"
+egui = "0.31.0"
 # epaint = "=0.28.1"
 # egui_plot = "=0.28.1"
 # egui_extras = { version = "=0.28.1", features = ["svg","image"] }
 # eframe = "0.28.1"
-eframe = { version = "0.28.1", default-features = false, features = [
-#     # "accesskit",     # Make egui comptaible with screen readers. NOTE: adds a lot of dependencies.
+eframe = { version = "0.31.0", default-features = false, features = [
+#     # "accesskit",     # Make egui compatible with screen readers. NOTE: adds a lot of dependencies.
 #     # "default_fonts", # Embed the default egui fonts.
     "glow",          # Use the glow rendering backend. Alternative: "wgpu".
 #     # "persistence",   # Enable restoring app state when restarting the app.
diff --git a/core/macros/src/enums.rs b/core/macros/src/enums.rs
@@ -106,6 +106,9 @@ pub fn macro_handler(item: TokenStream) -> TokenStream {
 
     let mut descr: Vec<String> = Vec::new();
     let mut docs: Vec<String> = Vec::new();
+    let wrappers = regex::Regex::new(r#"(^\"|\"$)"#).unwrap();
+    let collapse_spaces_regex = regex::Regex::new(r"\s+").unwrap();
+
     for e in enums.iter() {
         let have_key = e.args.has("default");
         if !have_key {
@@ -125,8 +128,6 @@ pub fn macro_handler(item: TokenStream) -> TokenStream {
                 .map(|doc| doc.to_token_stream().to_string())
                 .collect::<Vec<String>>()
                 .join(" ");
-            let collapse_spaces_regex = regex::Regex::new(r"\s+").unwrap();
-            let wrappers = regex::Regex::new(r#"(^\"|\"$)"#).unwrap();
             let doc = wrappers
                 .replace_all(&doc, "")
                 .replace("\\\"", "\"")
diff --git a/core/src/enums.rs b/core/src/enums.rs
@@ -115,7 +115,6 @@ pub use u32_try_from;
 /// assert_eq!(v1, v2);
 /// ```
 ///
-
 #[macro_export]
 macro_rules! u16_try_from {
     ($(#[$meta:meta])* $vis:vis enum $name:ident {
@@ -173,7 +172,6 @@ pub use u16_try_from;
 /// assert_eq!(v1, v2);
 /// ```
 ///
-
 #[macro_export]
 macro_rules! u8_try_from {
     ($(#[$meta:meta])* $vis:vis enum $name:ident {
diff --git a/core/src/utils.rs b/core/src/utils.rs
@@ -22,7 +22,7 @@ pub fn buffer_as_slice_mut<'data, T: 'data>(
     data: &'data mut [u8],
     byte_offset: usize,
     elements: usize,
-) -> &mut [T] {
+) -> &'data mut [T] {
     unsafe {
         std::slice::from_raw_parts_mut::<T>(
             std::mem::transmute::<*mut u8, *mut T>(data.as_mut_ptr().add(byte_offset)),
diff --git a/d3/src/graph.rs b/d3/src/graph.rs
@@ -16,7 +16,7 @@ static mut DOM_INIT: bool = false;
 
 const ONE_DAY_MSEC: u64 = DAYS;
 const ONE_DAY_SEC: u64 = DAYS / 1000;
-const LOWREW_CELL_SIZE: u64 = ONE_DAY_SEC / 4096;
+const LOWREZ_CELL_SIZE: u64 = ONE_DAY_SEC / 4096;
 
 #[derive(Clone)]
 pub struct GraphDuration;
@@ -588,7 +588,7 @@ impl Graph {
         context.begin_path();
         context.move_to(0.0, height as f64);
         context.line_to(width as f64, height as f64);
-        context.set_stroke_style(&JsValue::from(&options.x_axis_color));
+        context.set_stroke_style_str(&options.x_axis_color);
         context.stroke();
 
         context.begin_path();
@@ -604,14 +604,14 @@ impl Graph {
             context.move_to(x, height as f64);
             context.line_to(x, height as f64 + tick_size);
         }
-        context.set_stroke_style(&JsValue::from(&options.x_axis_color));
+        context.set_stroke_style_str(&options.x_axis_color);
         context.stroke();
 
         // used for debugging
 
         context.set_text_align("center");
         context.set_text_baseline("top");
-        context.set_fill_style(&JsValue::from(&options.x_axis_color));
+        context.set_fill_style_str(&options.x_axis_color);
         context.set_font(&options.x_axis_font);
         // context.fill_text(
         //     &format!("{tick_width}/{width}/{count}/{count2}"),
@@ -663,20 +663,20 @@ impl Graph {
             context.move_to(0.0, y);
             context.line_to(-tick_size, y);
         }
-        context.set_stroke_style(&JsValue::from(&options.y_axis_color));
+        context.set_stroke_style_str(&options.y_axis_color);
         context.stroke();
         let height = self.height();
         context.begin_path();
         context.move_to(-tick_size, 0.0);
         context.line_to(0.0, 0.0);
         context.line_to(0.0, height as f64);
         context.line_to(-tick_size, height as f64);
-        context.set_stroke_style(&JsValue::from(&options.y_axis_color));
+        context.set_stroke_style_str(&options.y_axis_color);
         context.stroke();
 
         context.set_text_align("right");
         context.set_text_baseline("middle");
-        context.set_fill_style(&JsValue::from(&options.y_axis_color));
+        context.set_fill_style_str(&options.y_axis_color);
         context.set_font(&options.y_axis_font);
         for tick in ticks {
             let y = self
@@ -704,7 +704,7 @@ impl Graph {
         context.save();
         context.set_text_baseline("top");
         context.set_font(&title_font);
-        context.set_fill_style(&JsValue::from(&title_color));
+        context.set_fill_style_str(&title_color);
         let metrics = if let Some(title) = self.title.as_ref() {
             context.measure_text(&format!("{} {}", title, self.value()))?
         } else {
@@ -743,7 +743,7 @@ impl Graph {
         context.set_text_align("right");
         context.set_text_baseline("top");
         context.set_font(&y_caption_font);
-        context.set_fill_style(&JsValue::from(&y_caption_color));
+        context.set_fill_style_str(&y_caption_color);
         context.fill_text(&self.y_caption, -10.0, 10.0)?;
         context.restore();
 
@@ -760,7 +760,7 @@ impl Graph {
         context.set_text_align("left");
         context.set_text_baseline("top");
         context.set_font(&title_font);
-        context.set_fill_style(&JsValue::from(&title_color));
+        context.set_fill_style_str(&title_color);
 
         {
             let (y, height, width) = {
@@ -877,7 +877,7 @@ impl Graph {
         self.data_hirez.push(&item.into());
 
         let lowrez_cell = self.lowrez_cell.fetch_add(1, Ordering::SeqCst);
-        if lowrez_cell % LOWREW_CELL_SIZE == 0 {
+        if lowrez_cell % LOWREZ_CELL_SIZE == 0 {
             let lowrez_cell_value = self.lowrez_cell_value.load(Ordering::SeqCst);
             let lowrez_value = JsValue::from(lowrez_cell_value);
             let item = js_sys::Object::new();
@@ -931,7 +931,7 @@ impl Graph {
 
         let data = if secs > ONE_DAY_SEC as u32 {
             let len = self.data_lowrez.length();
-            let cells = secs / LOWREW_CELL_SIZE as u32;
+            let cells = secs / LOWREZ_CELL_SIZE as u32;
             if let Some(start) = len.checked_sub(cells) {
                 self.data_lowrez.slice(start, len)
             } else {
@@ -953,8 +953,8 @@ impl Graph {
         let context = &self.context;
         context.begin_path();
         self.area.call1(&JsValue::NULL, &data)?;
-        context.set_fill_style(&JsValue::from(&area_fill_color));
-        context.set_stroke_style(&JsValue::from(&area_stroke_color));
+        context.set_fill_style_str(&area_fill_color);
+        context.set_stroke_style_str(&area_stroke_color);
         context.fill();
         context.stroke();
 
diff --git a/egui/Cargo.toml b/egui/Cargo.toml
@@ -68,6 +68,7 @@ wasm-bindgen-futures.workspace = true
 workspace = true
 features = [
     'VisibilityState',
+    'HtmlCanvasElement',
 ]
 
 [lints.clippy]
diff --git a/egui/src/fonts.rs b/egui/src/fonts.rs
@@ -1,4 +1,7 @@
-use egui::{FontData, FontDefinitions, FontFamily};
+use {
+    egui::{FontData, FontDefinitions, FontFamily},
+    std::sync::Arc,
+};
 
 pub trait RegisterStaticFont {
     fn add_static(&mut self, family: FontFamily, name: &str, bytes: &'static [u8]);
@@ -7,7 +10,7 @@ pub trait RegisterStaticFont {
 impl RegisterStaticFont for FontDefinitions {
     fn add_static(&mut self, family: FontFamily, name: &str, bytes: &'static [u8]) {
         self.font_data
-            .insert(name.to_owned(), FontData::from_static(bytes));
+            .insert(name.to_owned(), Arc::new(FontData::from_static(bytes)));
 
         self.families
             .entry(family)
diff --git a/egui/src/frame/mod.rs b/egui/src/frame/mod.rs
@@ -110,6 +110,8 @@ cfg_if! {
         where T : App
         {
             use workflow_dom::utils::document;
+            use web_sys::HtmlCanvasElement;
+            use wasm_bindgen::JsCast;
 
             // Redirect `log` message to `console.log` and friends:
             eframe::WebLogger::init(log::LevelFilter::Debug).ok();
@@ -118,9 +120,14 @@ cfg_if! {
                 element.remove();
             }
 
+            let Some(canvas) = document().get_element_by_id(options.canvas_id.as_str()) else {
+                return Err(Error::custom("canvas_id is required (workflow-egui/frame.rs)"));
+            };
+
             eframe::WebRunner::new()
                 .start(
-                    options.canvas_id.as_str(),
+                    canvas.dyn_into::<HtmlCanvasElement>()
+                        .map_err(|_| Error::custom("Element is not a canvas"))?,
                     options.web_options,
                     Box::new(move |cc| {
                         let runtime = Runtime::new(&cc.egui_ctx, events);
diff --git a/egui/src/imports.rs b/egui/src/imports.rs
@@ -31,4 +31,4 @@ pub use egui::{Rect, Vec2};
 pub use owning_ref::{OwningRef, OwningRefMut};
 pub use std::collections::VecDeque;
 pub use std::marker::PhantomData;
-pub use web_sys::VisibilityState;
+pub use web_sys::{HtmlCanvasElement, VisibilityState};
diff --git a/html/macros/src/attributes.rs b/html/macros/src/attributes.rs
@@ -31,7 +31,7 @@ pub struct Attributes<'a> {
     list: Vec<Attribute<'a>>,
 }
 
-impl<'a> Attributes<'a> {
+impl Attributes<'_> {
     /*
     pub fn get_names(&self)->Vec<String>{
         let mut list = vec![];
@@ -230,7 +230,7 @@ impl<'a> Attribute<'a> {
     }
 }
 
-impl<'a> Parse for Attribute<'a> {
+impl Parse for Attribute<'_> {
     fn parse(input: ParseStream) -> Result<Self> {
         let mut attr_type = AttributeType::Str;
         if input.peek(Token![?]) {
diff --git a/html/macros/src/element.rs b/html/macros/src/element.rs
@@ -39,7 +39,7 @@ pub struct Element<'a> {
     pub children: Option<Nodes<'a>>,
 }
 
-impl<'a> Parse for Element<'a> {
+impl Parse for Element<'_> {
     fn parse(input: ParseStream) -> Result<Self> {
         //println!("================== start: Element parsing #######################");
         let span = input.span();
@@ -66,7 +66,7 @@ impl<'a> Parse for Element<'a> {
     }
 }
 
-impl<'a> Element<'a> {
+impl Element<'_> {
     fn is_custom_element(&self) -> bool {
         self.tag.name.is_custom_element()
     }
@@ -89,7 +89,7 @@ impl<'a> Element<'a> {
     }
 }
 
-impl<'a> ToTokens for Element<'a> {
+impl ToTokens for Element<'_> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         //let mut properties:Vec<TokenStream> = vec![];
         let children = self.children_stream();
@@ -143,7 +143,7 @@ pub struct OpeningTag<'a> {
 fn get_fragment_tag_name() -> TagName {
     Punctuated::new() // Ident::new("x", Span::call_site())
 }
-impl<'a> Parse for OpeningTag<'a> {
+impl Parse for OpeningTag<'_> {
     fn parse(input: ParseStream) -> Result<Self> {
         let mut self_closing = false;
         let name;
@@ -221,7 +221,7 @@ pub struct Nodes<'a> {
     list: Vec<Node<'a>>,
 }
 
-impl<'a> Nodes<'a> {
+impl Nodes<'_> {
     pub fn len(&self) -> usize {
         self.list.len()
     }
@@ -246,7 +246,7 @@ impl<'a> Nodes<'a> {
     }
 }
 
-impl<'a> Parse for Nodes<'a> {
+impl Parse for Nodes<'_> {
     fn parse(input: ParseStream) -> Result<Self> {
         let mut list: Vec<Node> = vec![];
         //println!("================== start: Nodes parsing ==================");
@@ -260,7 +260,7 @@ impl<'a> Parse for Nodes<'a> {
         Ok(Nodes { list })
     }
 }
-impl<'a> ToTokens for Nodes<'a> {
+impl ToTokens for Nodes<'_> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         self.get_tuples().to_tokens(tokens);
     }
@@ -273,7 +273,7 @@ pub enum Node<'a> {
     Literal(Literal),
 }
 
-impl<'a> Parse for Node<'a> {
+impl Parse for Node<'_> {
     fn parse(input: ParseStream) -> Result<Self> {
         let node = if input.peek(Token![<]) {
             Node::Element(input.parse::<Element>()?)
@@ -314,7 +314,8 @@ impl<'a> Parse for Node<'a> {
         Ok(node)
     }
 }
-impl<'a> ToTokens for Node<'a> {
+
+impl ToTokens for Node<'_> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         match self {
             Node::Element(el) => {
diff --git a/i18n/src/i18n.rs b/i18n/src/i18n.rs
@@ -610,7 +610,7 @@ pub struct Data<'data> {
     translations: FxHashMap<&'data str, Arc<FxHashMap<&'data str, &'data str>>>,
 }
 
-impl<'data> Default for Data<'data> {
+impl Default for Data<'_> {
     fn default() -> Self {
         let languages = Languages::default().into_inner();
 
diff --git a/nw/src/ipc/ipc.rs b/nw/src/ipc/ipc.rs
diff --git a/panic-hook/src/lib.rs b/panic-hook/src/lib.rs
diff --git a/rpc/src/server/interface/notification.rs b/rpc/src/server/interface/notification.rs
diff --git a/serializer/src/payload.rs b/serializer/src/payload.rs
diff --git a/wasm/src/convert.rs b/wasm/src/convert.rs

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ wasm-bindgen-futures.workspace = true`
`68`	`68`	`workspace = true`
`69`	`69`	`features = [`
`70`	`70`	`'VisibilityState',`
	`71`	`+ 'HtmlCanvasElement',`
`71`	`72`	`]`
`72`	`73`
`73`	`74`	`[lints.clippy]`