Code review

Author: 0HyperCube

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

@@ -2,7 +2,7 @@ mod document_node_derive;
 
 use super::node_properties::choice::enum_choice;
 use super::node_properties::{self, ParameterWidgetsInfo};
-use super::utility_types::{FrontendNodeType, FrontendTypeConstraintForInput};
+use super::utility_types::{FrontendNodeType, InputTypeConstraint};
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::utility_types::network_interface::{
 	DocumentNodeMetadata, DocumentNodePersistentMetadata, InputMetadata, NodeNetworkInterface, NodeNetworkMetadata, NodeNetworkPersistentMetadata, NodeTemplate, NodeTypePersistentMetadata,
@@ -2017,7 +2017,7 @@ pub fn resolve_document_node_type(identifier: &DefinitionIdentifier) -> Option<&
 	DOCUMENT_NODE_TYPES.get(identifier)
 }
 
-impl FrontendTypeConstraintForInput {
+impl InputTypeConstraint {
 	#[must_use]
 	fn type_name(ty: &Type) -> String {
 		ty.nested_type().to_string()
@@ -2071,10 +2071,10 @@ impl FrontendTypeConstraintForInput {
 			// TODO: This does not consider the constrains by nodes not directly connected to the import
 			DocumentNodeImplementation::Network(nested_network) => {
 				// Find all inputs connected to the relevant import
-				fn valid_types_from_node(child_node: &DocumentNode, name: &str, input_index: usize) -> impl Iterator<Item = FrontendTypeConstraintForInput> {
+				fn valid_types_from_node(child_node: &DocumentNode, name: &str, input_index: usize) -> impl Iterator<Item = InputTypeConstraint> {
 					let all_inputs = child_node.inputs.iter().enumerate();
 					let input_for_import = all_inputs.filter(move |(_, child_input)| matches!(child_input, NodeInput::Import { import_index, .. }  if *import_index == input_index));
-					input_for_import.map(move |(index, _)| FrontendTypeConstraintForInput::compute_constraint_for_input(child_node, name, index))
+					input_for_import.map(move |(index, _)| InputTypeConstraint::compute_constraint_for_input(child_node, name, index))
 				}
 				let all_type_constraints = nested_network.nodes.values().flat_map(|node| valid_types_from_node(node, name, input_index));
 				// The type fed to the network must satisfy all protonodes it is connected to
@@ -2142,7 +2142,7 @@ pub fn collect_node_types() -> Vec<FrontendNodeType> {
 			}
 			FrontendNodeType {
 				identifier: identifier.serialized(),
-				input_types: FrontendTypeConstraintForInput::constraints_for_all_inputs(&definition.node_template.document_node, &name),
+				input_types: InputTypeConstraint::constraints_for_all_inputs(&definition.node_template.document_node, &name),
 				name,
 				category: definition.category.to_string(),
 			}
@@ -2273,9 +2273,9 @@ mod test {
 }
 
 #[cfg(test)]
-mod test_frontend_type_constraints {
+mod test_type_constraints {
 	use crate::messages::portfolio::document::node_graph::document_node_definitions::resolve_proto_node_type;
-	use crate::messages::portfolio::document::node_graph::utility_types::FrontendTypeConstraintForInput;
+	use crate::messages::portfolio::document::node_graph::utility_types::InputTypeConstraint;
 	use crate::test_utils::test_prelude::*;
 	use graph_craft::NodeNetwork;
 	use graph_craft::document::{DocumentNodeImplementation, NodeId, NodeInput};
@@ -2284,27 +2284,27 @@ mod test_frontend_type_constraints {
 	#[test]
 	fn passthrough() {
 		let node_type = resolve_proto_node_type(graphene_std::ops::passthrough::IDENTIFIER).expect("passthrough node");
-		let constraint = FrontendTypeConstraintForInput::constraints_for_all_inputs(&node_type.node_template.document_node, "name");
-		assert_eq!(constraint, vec![FrontendTypeConstraintForInput::All]);
+		let constraint = InputTypeConstraint::constraints_for_all_inputs(&node_type.node_template.document_node, "name");
+		assert_eq!(constraint, vec![InputTypeConstraint::All]);
 	}
 
 	#[test]
 	fn tangent_inverse() {
 		let node_type = resolve_proto_node_type(graphene_std::math_nodes::tangent_inverse::IDENTIFIER).expect("tangent inverse node");
-		let constraint = FrontendTypeConstraintForInput::constraints_for_all_inputs(&node_type.node_template.document_node, "name");
+		let constraint = InputTypeConstraint::constraints_for_all_inputs(&node_type.node_template.document_node, "name");
 		assert_eq!(
 			constraint,
 			vec![
-				FrontendTypeConstraintForInput::new(&[concrete!(glam::DVec2), concrete!(f32), concrete!(f64)]),
-				FrontendTypeConstraintForInput::new(&[concrete!(bool)])
+				InputTypeConstraint::new(&[concrete!(glam::DVec2), concrete!(f32), concrete!(f64)]),
+				InputTypeConstraint::new(&[concrete!(bool)])
 			]
 		);
 	}
 
 	#[test]
 	fn fill() {
 		let node_type = resolve_proto_node_type(graphene_std::graphic_nodes::index_elements::IDENTIFIER).expect("Index Elements node");
-		let constraint = FrontendTypeConstraintForInput::compute_constraint_for_input(&node_type.node_template.document_node, "name", 0);
+		let constraint = InputTypeConstraint::compute_constraint_for_input(&node_type.node_template.document_node, "name", 0);
 		assert!(constraint.satisfies(&concrete!(graphene_std::list::List<String>)));
 		assert!(constraint.satisfies(&concrete!(graphene_std::list::List<f64>)));
 		assert!(!constraint.satisfies(&concrete!(f64)));
@@ -2327,7 +2327,7 @@ mod test_frontend_type_constraints {
 			implementation: DocumentNodeImplementation::Network(inner_network),
 			..Default::default()
 		};
-		let constraint = FrontendTypeConstraintForInput::compute_constraint_for_input(&node, "name", 0);
-		assert_eq!(constraint, FrontendTypeConstraintForInput::new(&[concrete!(f32), concrete!(f64)]),);
+		let constraint = InputTypeConstraint::compute_constraint_for_input(&node, "name", 0);
+		assert_eq!(constraint, InputTypeConstraint::new(&[concrete!(f32), concrete!(f64)]),);
 	}
 }

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

@@ -104,8 +104,7 @@ pub struct FrontendNode {
 
 #[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize)]
-/// Each input may accept many types
-pub enum FrontendTypeConstraintForInput {
+pub enum InputTypeConstraint {
 	Limited(std::collections::BTreeSet<String>),
 	All,
 }
@@ -117,7 +116,7 @@ pub struct FrontendNodeType {
 	pub name: String,
 	pub category: String,
 	#[serde(rename = "inputTypes")]
-	pub input_types: Vec<FrontendTypeConstraintForInput>,
+	pub input_types: Vec<InputTypeConstraint>,
 }
 
 #[cfg_attr(feature = "wasm", derive(tsify::Tsify))]