Deprecate LetNodes in favor of new scope API (#1814)

* WIP

* Start deprecating let nodes

* Replace WasmEditorApi network imports with new Scope input

* Add missing unwrap

* Add #[serde(default)] to scope_injections

* Restructure WasmEditorApi definition to be available as a TaggedValue

* Fix text node

* Use stable toolchain in nix shell again

* Code review

* FIx text node and remove all remaining warnings

* Require executor input to be 'static

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>

Author: TrueDoctor

Cargo.lock

@@ -30,6 +30,7 @@ resolver = "2"
 dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam"] }
 graphene-core = { path = "node-graph/gcore" }
 graph-craft = { path = "node-graph/graph-craft", features = ["serde"] }
+wgpu-executor = { path = "node-graph/wgpu-executor" }
 bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any"] }
 node-macro = { path = "node-graph/node-macro" }
 

Cargo.toml

@@ -410,65 +410,78 @@ mod test {
 		assert_eq!(layers_after_copy[5], shape_id);
 	}
 
-	#[tokio::test]
+	#[test]
 	/// This test will fail when you make changes to the underlying serialization format for a document.
-	async fn check_if_demo_art_opens() {
-		use crate::messages::layout::utility_types::widget_prelude::*;
-
-		let print_problem_to_terminal_on_failure = |value: &String| {
-			println!();
-			println!("-------------------------------------------------");
-			println!("Failed test due to receiving a DisplayDialogError while loading a Graphite demo file.");
-			println!();
-			println!("DisplayDialogError details:");
-			println!();
-			println!("Description: {value}");
-			println!("-------------------------------------------------");
-			println!();
-
-			panic!()
-		};
-
-		init_logger();
-		let mut editor = Editor::create();
-
-		for (document_name, _, file_name) in crate::messages::dialog::simple_dialogs::ARTWORK {
-			let document_serialized_content = std::fs::read_to_string(format!("../demo-artwork/{file_name}")).unwrap();
-
-			assert_eq!(
-				document_serialized_content.lines().count(),
-				1,
-				"Demo artwork '{document_name}' has more than 1 line (remember to open and re-save it in Graphite)",
-			);
-
-			let responses = editor.handle_message(PortfolioMessage::OpenDocumentFile {
-				document_name: document_name.into(),
-				document_serialized_content,
-			});
-			println!("Responses:\n{responses:#?}");
-
-			// Check if the graph renders
-			let portfolio = &mut editor.dispatcher.message_handlers.portfolio_message_handler;
-			portfolio
-				.executor
-				.submit_node_graph_evaluation(portfolio.documents.get_mut(&portfolio.active_document_id.unwrap()).unwrap(), glam::UVec2::ONE)
-				.expect("submit_node_graph_evaluation failed");
-			crate::node_graph_executor::run_node_graph().await;
-			let mut messages = VecDeque::new();
-			editor.poll_node_graph_evaluation(&mut messages).expect("Graph should render");
-
-			for response in responses {
-				// Check for the existence of the file format incompatibility warning dialog after opening the test file
-				if let FrontendMessage::UpdateDialogColumn1 { layout_target: _, diff } = response {
-					if let DiffUpdate::SubLayout(sub_layout) = &diff[0].new_value {
-						if let LayoutGroup::Row { widgets } = &sub_layout[0] {
-							if let Widget::TextLabel(TextLabel { value, .. }) = &widgets[0].widget {
-								print_problem_to_terminal_on_failure(value);
+	fn check_if_demo_art_opens() {
+		futures::executor::block_on(async {
+			use crate::messages::layout::utility_types::widget_prelude::*;
+
+			let print_problem_to_terminal_on_failure = |value: &String| {
+				println!();
+				println!("-------------------------------------------------");
+				println!("Failed test due to receiving a DisplayDialogError while loading a Graphite demo file.");
+				println!();
+				println!("DisplayDialogError details:");
+				println!();
+				println!("Description: {value}");
+				println!("-------------------------------------------------");
+				println!();
+
+				panic!()
+			};
+
+			init_logger();
+			let mut editor = Editor::create();
+
+			// UNCOMMENT THIS FOR RUNNING UNDER MIRI
+			//
+			// let files = [
+			// 	include_str!("../../demo-artwork/isometric-fountain.graphite"),
+			// 	include_str!("../../demo-artwork/just-a-potted-cactus.graphite"),
+			// 	include_str!("../../demo-artwork/procedural-string-lights.graphite"),
+			// 	include_str!("../../demo-artwork/red-dress.graphite"),
+			// 	include_str!("../../demo-artwork/valley-of-spires.graphite"),
+			// ];
+			// for (id, document_serialized_content) in files.iter().enumerate() {
+			// let document_name = format!("document {id}");
+
+			for (document_name, _, file_name) in crate::messages::dialog::simple_dialogs::ARTWORK {
+				let document_serialized_content = std::fs::read_to_string(format!("../demo-artwork/{file_name}")).unwrap();
+
+				assert_eq!(
+					document_serialized_content.lines().count(),
+					1,
+					"Demo artwork '{document_name}' has more than 1 line (remember to open and re-save it in Graphite)",
+				);
+
+				let responses = editor.handle_message(PortfolioMessage::OpenDocumentFile {
+					document_name: document_name.into(),
+					document_serialized_content: document_serialized_content.into(),
+				});
+
+				// Check if the graph renders
+				let portfolio = &mut editor.dispatcher.message_handlers.portfolio_message_handler;
+				portfolio
+					.executor
+					.submit_node_graph_evaluation(portfolio.documents.get_mut(&portfolio.active_document_id.unwrap()).unwrap(), glam::UVec2::ONE)
+					.expect("submit_node_graph_evaluation failed");
+				crate::node_graph_executor::run_node_graph().await;
+				let mut messages = VecDeque::new();
+				editor.poll_node_graph_evaluation(&mut messages).expect("Graph should render");
+
+				for response in responses {
+					// Check for the existence of the file format incompatibility warning dialog after opening the test file
+					if let FrontendMessage::UpdateDialogColumn1 { layout_target: _, diff } = response {
+						if let DiffUpdate::SubLayout(sub_layout) = &diff[0].new_value {
+							if let LayoutGroup::Row { widgets } = &sub_layout[0] {
+								if let Widget::TextLabel(TextLabel { value, .. }) = &widgets[0].widget {
+									print_problem_to_terminal_on_failure(value);
+								}
 							}
 						}
 					}
 				}
 			}
-		}
+		});
 	}
 }

editor/src/dispatcher.rs

@@ -84,7 +84,7 @@ impl LayoutHolder for ExportDialogMessageHandler {
 			NumberInput::new(Some(self.scale_factor))
 				.unit("")
 				.min(0.)
-				.max((1_u64 << std::f64::MANTISSA_DIGITS) as f64)
+				.max((1_u64 << f64::MANTISSA_DIGITS) as f64)
 				.disabled(self.file_type == FileType::Svg)
 				.on_update(|number_input: &NumberInput| ExportDialogMessage::ScaleFactor(number_input.value.unwrap()).into())
 				.min_width(200)

editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs

@@ -95,7 +95,7 @@ impl LayoutHolder for NewDocumentDialogMessageHandler {
 				.label("W")
 				.unit(" px")
 				.min(0.)
-				.max((1_u64 << std::f64::MANTISSA_DIGITS) as f64)
+				.max((1_u64 << f64::MANTISSA_DIGITS) as f64)
 				.is_integer(true)
 				.disabled(self.infinite)
 				.min_width(100)
@@ -106,7 +106,7 @@ impl LayoutHolder for NewDocumentDialogMessageHandler {
 				.label("H")
 				.unit(" px")
 				.min(0.)
-				.max((1_u64 << std::f64::MANTISSA_DIGITS) as f64)
+				.max((1_u64 << f64::MANTISSA_DIGITS) as f64)
 				.is_integer(true)
 				.disabled(self.infinite)
 				.min_width(100)

editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs

@@ -63,7 +63,7 @@ impl PreferencesDialogMessageHandler {
 			NumberInput::new(Some(preferences.imaginate_refresh_frequency))
 				.unit(" seconds")
 				.min(0.)
-				.max((1_u64 << std::f64::MANTISSA_DIGITS) as f64)
+				.max((1_u64 << f64::MANTISSA_DIGITS) as f64)
 				.min_width(200)
 				.on_update(|number_input: &NumberInput| PreferencesMessage::ImaginateRefreshFrequency { seconds: number_input.value.unwrap() }.into())
 				.widget_holder(),

editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs

@@ -306,7 +306,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 				let insert_index = parent
 					.children(self.metadata())
 					.enumerate()
-					.find_map(|(index, item)| self.selected_nodes.selected_layers(self.metadata()).any(|x| x == item).then_some(index as usize))
+					.find_map(|(index, item)| self.selected_nodes.selected_layers(self.metadata()).any(|x| x == item).then_some(index))
 					.unwrap_or(0);
 
 				// Store a history step before doing anything

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -321,7 +321,7 @@ impl<'a> ModifyInputsContext<'a> {
 	pub fn insert_text(&mut self, text: String, font: Font, size: f64, layer: NodeId) {
 		let text = resolve_document_node_type("Text").expect("Text node does not exist").to_document_node(
 			[
-				NodeInput::network(graph_craft::concrete!(graphene_std::wasm_application_io::WasmEditorApi), 0),
+				NodeInput::scope("editor-api"),
 				NodeInput::value(TaggedValue::String(text), false),
 				NodeInput::value(TaggedValue::Font(font), false),
 				NodeInput::value(TaggedValue::F64(size), false),