Instance tables refactor part 8: Make repeater nodes use pivot not bbox and output instance type not group; rename 'Flatten Vector Elements' to 'Flatten Path' and add 'Flatten Vector' (#2697)

Make repeater nodes use pivot not bbox and output instance type not group; rename 'Flatten Vector Elements' to 'Flatten Path' and add 'Flatten Vector'

editor/src/messages/portfolio/document/graph_operation/utility_types.rs

@@ -289,17 +289,17 @@ impl<'a> ModifyInputsContext<'a> {
 			log::error!("Node type {} does not exist in ModifyInputsContext::existing_node_id", reference);
 			return None;
 		};
-		// If inserting a path node, insert a flatten vector elements if the type is a graphic group.
+		// If inserting a path node, insert a Flatten Path if the type is a graphic group.
 		// TODO: Allow the path node to operate on Graphic Group data by utilizing the reference for each vector data in a group.
 		if node_definition.identifier == "Path" {
 			let layer_input_type = self.network_interface.input_type(&InputConnector::node(output_layer.to_node(), 1), &[]).0.nested_type().clone();
 			if layer_input_type == concrete!(GraphicGroupTable) {
-				let Some(flatten_vector_elements_definition) = resolve_document_node_type("Flatten Vector Elements") else {
-					log::error!("Flatten Vector Elements does not exist in ModifyInputsContext::existing_node_id");
+				let Some(flatten_path_definition) = resolve_document_node_type("Flatten Path") else {
+					log::error!("Flatten Path does not exist in ModifyInputsContext::existing_node_id");
 					return None;
 				};
 				let node_id = NodeId::new();
-				self.network_interface.insert_node(node_id, flatten_vector_elements_definition.default_node_template(), &[]);
+				self.network_interface.insert_node(node_id, flatten_path_definition.default_node_template(), &[]);
 				self.network_interface.move_node_to_chain_start(&node_id, output_layer, &[]);
 			}
 		}

editor/src/messages/portfolio/document/utility_types/network_interface.rs

@@ -3805,6 +3805,15 @@ impl NodeNetworkInterface {
 		node_metadata.persistent_metadata.network_metadata = metadata.network_metadata;
 	}
 
+	/// Keep metadata in sync with the new implementation if this is used by anything other than the upgrade scripts
+	pub fn replace_reference_name(&mut self, node_id: &NodeId, network_path: &[NodeId], reference_name: String) {
+		let Some(node_metadata) = self.node_metadata_mut(node_id, network_path) else {
+			log::error!("Could not get node metadata in replace_reference_name");
+			return;
+		};
+		node_metadata.persistent_metadata.reference = Some(reference_name);
+	}
+
 	/// Keep metadata in sync with the new implementation if this is used by anything other than the upgrade scripts
 	pub fn set_manual_compostion(&mut self, node_id: &NodeId, network_path: &[NodeId], manual_composition: Option<Type>) {
 		let Some(network) = self.network_mut(network_path) else {

editor/src/messages/portfolio/portfolio_message_handler.rs

@@ -467,7 +467,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageData<'_>> for PortfolioMes
 					}
 				};
 
-				const REPLACEMENTS: [(&str, &str); 36] = [
+				const REPLACEMENTS: [(&str, &str); 37] = [
 					("graphene_core::AddArtboardNode", "graphene_core::graphic_element::AppendArtboardNode"),
 					("graphene_core::ConstructArtboardNode", "graphene_core::graphic_element::ToArtboardNode"),
 					("graphene_core::ToGraphicElementNode", "graphene_core::graphic_element::ToElementNode"),
@@ -507,6 +507,7 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageData<'_>> for PortfolioMes
 					("graphene_std::raster::SampleNode", "graphene_std::raster::SampleImageNode"),
 					("graphene_core::transform::CullNode", "graphene_core::ops::IdentityNode"),
 					("graphene_std::raster::MaskImageNode", "graphene_std::raster::MaskNode"),
+					("graphene_core::vector::FlattenVectorElementsNode", "graphene_core::vector::FlattenPathNode"),
 				];
 				let mut network = document.network_interface.document_network().clone();
 				network.generate_node_paths(&[]);
@@ -946,6 +947,22 @@ impl MessageHandler<PortfolioMessage, PortfolioMessageData<'_>> for PortfolioMes
 						document.network_interface.set_input(&InputConnector::node(*node_id, 1), old_inputs[2].clone(), network_path);
 						document.network_interface.set_input(&InputConnector::node(*node_id, 2), old_inputs[3].clone(), network_path);
 					}
+
+					if reference == "Flatten Vector Elements" {
+						let node_definition = resolve_document_node_type("Flatten Path").unwrap();
+						let new_node_template = node_definition.default_node_template();
+						let document_node = new_node_template.document_node;
+						document.network_interface.replace_implementation(node_id, network_path, document_node.implementation.clone());
+						document
+							.network_interface
+							.replace_implementation_metadata(node_id, network_path, new_node_template.persistent_node_metadata);
+
+						let old_inputs = document.network_interface.replace_inputs(node_id, document_node.inputs.clone(), network_path);
+
+						document.network_interface.set_input(&InputConnector::node(*node_id, 0), old_inputs[0].clone(), network_path);
+
+						document.network_interface.replace_reference_name(node_id, network_path, "Flatten Path".to_string());
+					}
 				}
 
 				// TODO: Eventually remove this document upgrade code

editor/src/messages/tool/common_functionality/graph_modification_utils.rs

@@ -91,9 +91,9 @@ pub fn merge_layers(document: &DocumentMessageHandler, first_layer: LayerNodeIde
 		delete_children: false,
 	});
 
-	// Add a flatten vector elements node after the merge
+	// Add a Flatten Path node after the merge
 	let flatten_node_id = NodeId::new();
-	let flatten_node = document_node_definitions::resolve_document_node_type("Flatten Vector Elements")
+	let flatten_node = document_node_definitions::resolve_document_node_type("Flatten Path")
 		.expect("Failed to create flatten node")
 		.default_node_template();
 	responses.add(NodeGraphMessage::InsertNode {

editor/src/messages/tool/tool_messages/artboard_tool.rs

@@ -563,7 +563,10 @@ mod test_artboard {
 	pub use crate::test_utils::test_prelude::*;
 
 	async fn get_artboards(editor: &mut EditorTestUtils) -> Vec<graphene_core::Artboard> {
-		let instrumented = editor.eval_graph().await;
+		let instrumented = match editor.eval_graph().await {
+			Ok(instrumented) => instrumented,
+			Err(e) => panic!("Failed to evaluate graph: {}", e),
+		};
 		instrumented.grab_all_input::<graphene_core::append_artboard::ArtboardInput>(&editor.runtime).collect()
 	}
 

editor/src/messages/tool/tool_messages/ellipse_tool.rs

@@ -330,7 +330,10 @@ mod test_ellipse {
 	}
 
 	async fn get_ellipse(editor: &mut EditorTestUtils) -> Vec<ResolvedEllipse> {
-		let instrumented = editor.eval_graph().await;
+		let instrumented = match editor.eval_graph().await {
+			Ok(instrumented) => instrumented,
+			Err(e) => panic!("Failed to evaluate graph: {e}"),
+		};
 
 		let document = editor.active_document();
 		let layers = document.metadata().all_layers();

editor/src/messages/tool/tool_messages/fill_tool.rs

@@ -161,7 +161,10 @@ mod test_fill {
 	use graphene_std::vector::style::Fill;
 
 	async fn get_fills(editor: &mut EditorTestUtils) -> Vec<Fill> {
-		let instrumented = editor.eval_graph().await;
+		let instrumented = match editor.eval_graph().await {
+			Ok(instrumented) => instrumented,
+			Err(e) => panic!("Failed to evaluate graph: {e}"),
+		};
 
 		instrumented.grab_all_input::<fill::FillInput<Fill>>(&editor.runtime).collect()
 	}

editor/src/messages/tool/tool_messages/gradient_tool.rs

@@ -545,7 +545,10 @@ mod test_gradient {
 	use super::gradient_space_transform;
 
 	async fn get_fills(editor: &mut EditorTestUtils) -> Vec<(Fill, DAffine2)> {
-		let instrumented = editor.eval_graph().await;
+		let instrumented = match editor.eval_graph().await {
+			Ok(instrumented) => instrumented,
+			Err(e) => panic!("Failed to evaluate graph: {}", e),
+		};
 
 		let document = editor.active_document();
 		let layers = document.metadata().all_layers();

editor/src/messages/tool/tool_messages/spline_tool.rs

@@ -670,7 +670,9 @@ mod test_spline_tool {
 		editor.handle_message(SplineToolMessage::Confirm).await;
 
 		// Evaluate the graph to ensure everything is processed
-		editor.eval_graph().await;
+		if let Err(e) = editor.eval_graph().await {
+			panic!("Graph evaluation failed: {}", e);
+		}
 
 		// Get the layer and vector data
 		let document = editor.active_document();
@@ -708,7 +710,9 @@ mod test_spline_tool {
 		editor.handle_message(SplineToolMessage::Confirm).await;
 
 		// Evaluating the graph to ensure everything is processed
-		editor.eval_graph().await;
+		if let Err(e) = editor.eval_graph().await {
+			panic!("Graph evaluation failed: {}", e);
+		}
 
 		// Get the layer and vector data
 		let document = editor.active_document();
@@ -744,7 +748,9 @@ mod test_spline_tool {
 		editor.handle_message(SplineToolMessage::Confirm).await;
 
 		// Evaluating the graph to ensure everything is processed
-		editor.eval_graph().await;
+		if let Err(e) = editor.eval_graph().await {
+			panic!("Graph evaluation failed: {}", e);
+		}
 
 		// Get the layer and vector data
 		let document = editor.active_document();
@@ -781,7 +787,9 @@ mod test_spline_tool {
 		editor.click_tool(ToolType::Spline, MouseKeys::LEFT, DVec2::new(150.0, 100.0), ModifierKeys::empty()).await;
 
 		editor.handle_message(SplineToolMessage::Confirm).await;
-		editor.eval_graph().await;
+		if let Err(e) = editor.eval_graph().await {
+			panic!("Graph evaluation failed: {}", e);
+		}
 
 		// Get the layer and vector data
 		let document = editor.active_document();