fix deserialization

Author: adamgerhant

editor/src/messages/layout/utility_types/layout_widget.rs

@@ -789,25 +789,6 @@ impl DiffUpdate {
 			}
 		};
 
-		// Recursively fill menu list entries with their realized shortcut keys specific to the current bindings and platform
-		let apply_action_shortcut_to_menu_lists = |entry_sections: &mut MenuListEntrySections| {
-			struct RecursiveWrapper<'a>(&'a dyn Fn(&mut MenuListEntrySections, &RecursiveWrapper));
-			let recursive_wrapper = RecursiveWrapper(&|entry_sections: &mut MenuListEntrySections, recursive_wrapper| {
-				for entries in entry_sections {
-					for entry in entries {
-						// Convert `ActionShortcut::Action` to `ActionShortcut::Shortcut`
-						if let Some(tooltip_shortcut) = &mut entry.tooltip_shortcut {
-							tooltip_shortcut.realize_shortcut(action_input_mapping);
-						}
-
-						// Recursively call this inner closure on the menu's children
-						(recursive_wrapper.0)(&mut entry.children, recursive_wrapper);
-					}
-				}
-			});
-			(recursive_wrapper.0)(entry_sections, &recursive_wrapper)
-		};
-
 		// Hash the menu list entry sections for caching purposes
 		let hash_menu_list_entry_sections = |entry_sections: &MenuListEntrySections| {
 			struct RecursiveHasher<'a> {
@@ -833,11 +814,11 @@ impl DiffUpdate {
 		// Apply shortcut conversions to all widgets that have menu lists
 		let convert_menu_lists = |widget_instance: &mut WidgetInstance| match &mut *widget_instance.widget {
 			Widget::DropdownInput(dropdown_input) => {
-				apply_action_shortcut_to_menu_lists(&mut dropdown_input.entries);
+				apply_action_shortcut_to_menu_lists(&mut dropdown_input.entries, action_input_mapping);
 				dropdown_input.entries_hash = hash_menu_list_entry_sections(&dropdown_input.entries);
 			}
 			Widget::TextButton(text_button) => {
-				apply_action_shortcut_to_menu_lists(&mut text_button.menu_list_children);
+				apply_action_shortcut_to_menu_lists(&mut text_button.menu_list_children, action_input_mapping);
 				text_button.menu_list_children_hash = hash_menu_list_entry_sections(&text_button.menu_list_children);
 			}
 			_ => {}
@@ -859,3 +840,16 @@ impl DiffUpdate {
 		}
 	}
 }
+
+// Recursively fill menu list entries with their realized shortcut keys specific to the current bindings and platform
+fn apply_action_shortcut_to_menu_lists(entry_sections: &mut MenuListEntrySections, action_input_mapping: &impl Fn(&MessageDiscriminant) -> Option<KeysGroup>) {
+	for entries in entry_sections {
+		for entry in entries {
+			if let Some(tooltip_shortcut) = &mut entry.tooltip_shortcut {
+				tooltip_shortcut.realize_shortcut(action_input_mapping);
+			}
+
+			apply_action_shortcut_to_menu_lists(&mut entry.children, action_input_mapping);
+		}
+	}
+}

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

@@ -2723,7 +2723,7 @@ impl NodeGraphMessageHandler {
 				let clippable = layer.can_be_clipped(network_interface.document_metadata());
 				let data = LayerPanelEntry {
 					id: node_id,
-					reference: network_interface.reference(&node_id, &[]).and_then(|x| x.as_ref()).cloned().unwrap_or_default(),
+					reference: network_interface.reference(&node_id, &[]).unwrap_or(DefinitionIdentifier::Network("".to_string())),
 					alias: network_interface.display_name(&node_id, &[]),
 					in_selected_network: selection_network_path.is_empty(),
 					children_allowed,

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

@@ -6227,6 +6227,7 @@ struct InputTransientMetadata {
 
 /// Persistent metadata for each node in the network, which must be included when creating, serializing, and deserializing saving a node.
 #[derive(Default, Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+#[serde(deny_unknown_fields)]
 pub struct DocumentNodePersistentMetadata {
 	/// A name chosen by the user for this instance of the node. Empty indicates no given name, in which case the implementation name is displayed to the user in italics.
 	/// This is empty for all newly created nodes, except protonodes with #[skip_impl]

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

@@ -19,12 +19,14 @@ pub struct DocumentNodePersistentMetadataInputNames {
 	pub network_metadata: Option<NodeNetworkMetadata>,
 }
 
-impl From<DocumentNodePersistentMetadataInputNames> for DocumentNodePersistentMetadata {
+impl From<DocumentNodePersistentMetadataInputNames> for DocumentNodePersistentMetadataPropertiesRow {
 	fn from(old: DocumentNodePersistentMetadataInputNames) -> Self {
-		DocumentNodePersistentMetadata {
-			input_metadata: Vec::new(),
+		DocumentNodePersistentMetadataPropertiesRow {
+			reference: old.reference,
+			input_properties: Vec::new(),
 			display_name: old.display_name,
 			output_names: old.output_names,
+			has_primary_output: old.has_primary_output,
 			locked: old.locked,
 			pinned: old.pinned,
 			node_type_metadata: old.node_type_metadata,
@@ -59,7 +61,7 @@ pub struct PropertiesRow {
 	pub input_description: String,
 }
 
-impl From<DocumentNodePersistentMetadataPropertiesRow> for DocumentNodePersistentMetadata {
+impl From<DocumentNodePersistentMetadataPropertiesRow> for DocumentNodePersistentMetadataHasPrimaryOutput {
 	fn from(old: DocumentNodePersistentMetadataPropertiesRow) -> Self {
 		let mut input_metadata = Vec::new();
 		for properties_row in old.input_properties {
@@ -73,10 +75,12 @@ impl From<DocumentNodePersistentMetadataPropertiesRow> for DocumentNodePersisten
 				..Default::default()
 			})
 		}
-		DocumentNodePersistentMetadata {
+		DocumentNodePersistentMetadataHasPrimaryOutput {
+			reference: old.reference,
 			display_name: old.display_name,
 			input_metadata: Vec::new(),
 			output_names: old.output_names,
+			has_primary_output: old.has_primary_output,
 			locked: old.locked,
 			pinned: old.pinned,
 			node_type_metadata: old.node_type_metadata,
@@ -102,9 +106,10 @@ pub struct DocumentNodePersistentMetadataHasPrimaryOutput {
 	pub network_metadata: Option<NodeNetworkMetadata>,
 }
 
-impl From<DocumentNodePersistentMetadataHasPrimaryOutput> for DocumentNodePersistentMetadata {
+impl From<DocumentNodePersistentMetadataHasPrimaryOutput> for DocumentNodePersistentMetadataStringReference {
 	fn from(old: DocumentNodePersistentMetadataHasPrimaryOutput) -> Self {
-		DocumentNodePersistentMetadata {
+		DocumentNodePersistentMetadataStringReference {
+			reference: old.reference,
 			display_name: old.display_name,
 			input_metadata: old.input_metadata,
 			output_names: old.output_names,
@@ -133,6 +138,7 @@ struct DocumentNodePersistentMetadataStringReference {
 
 impl From<DocumentNodePersistentMetadataStringReference> for DocumentNodePersistentMetadata {
 	fn from(mut old: DocumentNodePersistentMetadataStringReference) -> Self {
+		log::debug!("Converting from DocumentNodePersistentMetadataStringReference with reference: {:?}", old.reference);
 		if let Some(metadata) = old.network_metadata.as_mut() {
 			metadata.persistent_metadata.reference = old.reference;
 		}
@@ -148,27 +154,57 @@ impl From<DocumentNodePersistentMetadataStringReference> for DocumentNodePersist
 	}
 }
 
+#[derive(serde::Deserialize)]
+#[serde(untagged)]
+enum DocumentNodePersistentMetadataVersioned {
+	// Newest first
+	Current(DocumentNodePersistentMetadata),
+
+	StringReference(DocumentNodePersistentMetadataStringReference),
+
+	HasPrimaryOutput(DocumentNodePersistentMetadataHasPrimaryOutput),
+
+	PropertiesRow(DocumentNodePersistentMetadataPropertiesRow),
+
+	InputNames(DocumentNodePersistentMetadataInputNames),
+}
+
 pub fn deserialize_node_persistent_metadata<'de, D>(deserializer: D) -> Result<DocumentNodePersistentMetadata, D::Error>
 where
 	D: serde::Deserializer<'de>,
 {
 	use serde::Deserialize;
 
 	let value = Value::deserialize(deserializer)?;
-	if let Ok(document) = serde_json::from_value::<DocumentNodePersistentMetadata>(value.clone()) {
-		return Ok(document);
-	};
-	if let Ok(document) = serde_json::from_value::<DocumentNodePersistentMetadataHasPrimaryOutput>(value.clone()) {
-		return Ok(document.into());
-	};
-	if let Ok(document) = serde_json::from_value::<DocumentNodePersistentMetadataPropertiesRow>(value.clone()) {
-		return Ok(document.into());
-	};
-	if let Ok(document) = serde_json::from_value::<DocumentNodePersistentMetadataStringReference>(value.clone()) {
-		return Ok(document.into());
+
+	let versioned_document = serde_json::from_value::<DocumentNodePersistentMetadataVersioned>(value).map_err(serde::de::Error::custom)?;
+
+	let current: DocumentNodePersistentMetadata = match versioned_document {
+		DocumentNodePersistentMetadataVersioned::Current(v) => v,
+
+		DocumentNodePersistentMetadataVersioned::StringReference(v) => {
+			let v: DocumentNodePersistentMetadataStringReference = v;
+			v.into()
+		}
+
+		DocumentNodePersistentMetadataVersioned::HasPrimaryOutput(v) => {
+			let v: DocumentNodePersistentMetadataStringReference = v.into();
+			v.into()
+		}
+
+		DocumentNodePersistentMetadataVersioned::PropertiesRow(v) => {
+			let v: DocumentNodePersistentMetadataHasPrimaryOutput = v.into();
+			let v: DocumentNodePersistentMetadataStringReference = v.into();
+			v.into()
+		}
+
+		DocumentNodePersistentMetadataVersioned::InputNames(v) => {
+			let v: DocumentNodePersistentMetadataPropertiesRow = v.into();
+			let v: DocumentNodePersistentMetadataHasPrimaryOutput = v.into();
+			let v: DocumentNodePersistentMetadataStringReference = v.into();
+			v.into()
+		}
 	};
-	match serde_json::from_value::<DocumentNodePersistentMetadataInputNames>(value.clone()) {
-		Ok(document) => Ok(document.into()),
-		Err(e) => Err(serde::de::Error::custom(e)),
-	}
+
+	Ok(current)
 }

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

@@ -1,5 +1,7 @@
 use super::document_metadata::{DocumentMetadata, LayerNodeIdentifier};
 use super::network_interface::NodeNetworkInterface;
+use crate::messages::portfolio::document::node_graph::document_node_definitions::DefinitionIdentifier;
+
 use crate::messages::tool::common_functionality::graph_modification_utils;
 use glam::DVec2;
 use graph_craft::document::{NodeId, NodeNetwork};
@@ -34,7 +36,7 @@ impl serde::Serialize for JsRawBuffer {
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize, PartialEq, Eq, specta::Type)]
 pub struct LayerPanelEntry {
 	pub id: NodeId,
-	pub reference: String,
+	pub reference: DefinitionIdentifier,
 	pub alias: String,
 	#[serde(rename = "inSelectedNetwork")]
 	pub in_selected_network: bool,

frontend/package-lock.json

@@ -644,7 +644,7 @@
 							{@html $nodeGraph.thumbnails.get(listing.entry.id)}
 						{/if}
 					</div>
-					{#if listing.entry.reference === "Artboard"}
+					{#if listing.entry.reference.type === "Network" && listing.entry.reference.data === "Artboard"}
 						<IconLabel icon="Artboard" class="layer-type-icon" tooltipLabel="Artboard" />
 					{/if}
 					<LayoutRow class="layer-name" on:dblclick={() => onEditLayerName(listing)}>

frontend/src/components/panels/Layers.svelte

@@ -833,7 +833,7 @@ export class UpdateDocumentLayerDetails extends JsMessage {
 export class LayerPanelEntry {
 	id!: bigint;
 
-	reference!: string;
+	reference!: DefinitionIdentifier;
 
 	alias!: string;