Code cleanup and refactoring to enhance consistency (#1695)

- Move message handler payload data into structs
- Organize the file structure used by `editor/src/messages/portfolio/document` `/node_graph` and `/graph_operation`
- Make derive attributes use `serde::Serialize, serde::Deserialize` consistently instead of `use serde::{Deserialize, Serialize};` imports
- Various other code cleanup and refactoring

node-graph/gcore/src/raster.rs

@@ -621,9 +621,8 @@ pub(crate) mod image;
 
 #[cfg(test)]
 mod test {
-	use crate::{ops::CloneNode, structural::Then, value::ValueNode, Node};
-
 	use super::*;
+	use crate::{ops::CloneNode, structural::Then, value::ValueNode, Node};
 
 	#[ignore]
 	#[test]

node-graph/gcore/src/raster/adjustments.rs

@@ -12,7 +12,6 @@ use dyn_any::{DynAny, StaticType};
 
 use core::fmt::Debug;
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::float::Float;
 
@@ -588,7 +587,7 @@ fn vibrance_node(color: Color, vibrance: f64) -> Color {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum RedGreenBlue {
@@ -607,7 +606,7 @@ impl core::fmt::Display for RedGreenBlue {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum NoiseType {
@@ -648,7 +647,7 @@ impl NoiseType {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum FractalType {
@@ -686,7 +685,7 @@ impl FractalType {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum CellularDistanceFunction {
@@ -718,7 +717,7 @@ impl CellularDistanceFunction {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum CellularReturnType {
@@ -759,7 +758,7 @@ impl CellularReturnType {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum DomainWarpType {
@@ -853,7 +852,7 @@ fn channel_mixer_node(
 	color.to_linear_srgb()
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum RelativeAbsolute {
@@ -871,7 +870,7 @@ impl core::fmt::Display for RelativeAbsolute {
 }
 
 #[repr(C)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, DynAny)]
 pub enum SelectiveColorChoice {

node-graph/gcore/src/raster/color.rs

@@ -2,8 +2,6 @@ use core::hash::Hash;
 
 use dyn_any::{DynAny, StaticType};
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
-
 #[cfg(target_arch = "spirv")]
 use spirv_std::num_traits::float::Float;
 
@@ -18,7 +16,7 @@ use super::{
 };
 
 #[repr(C)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Default, Clone, Copy, PartialEq, DynAny, Pod, Zeroable)]
 pub struct SRGBA8 {
@@ -100,7 +98,7 @@ impl Alpha for SRGBA8 {
 impl Pixel for SRGBA8 {}
 
 #[repr(C)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Default, Clone, Copy, PartialEq, DynAny, Pod, Zeroable)]
 pub struct Luma(pub f32);
@@ -142,7 +140,7 @@ impl Pixel for Luma {}
 /// The other components (RGB) are stored as `f32` that range from `0.0` up to `f32::MAX`,
 /// the values encode the brightness of each channel proportional to the light intensity in cd/m² (nits) in HDR, and `0.0` (black) to `1.0` (white) in SDR color.
 #[repr(C)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[cfg_attr(feature = "std", derive(specta::Type))]
 #[derive(Debug, Default, Clone, Copy, PartialEq, DynAny, Pod, Zeroable)]
 pub struct Color {

node-graph/gcore/src/storage.rs

@@ -82,10 +82,10 @@ where
 
 #[cfg(test)]
 mod test {
+	use super::*;
 	use crate::value::{CopiedNode, OnceCellNode};
 	use crate::Node;
 
-	use super::*;
 	#[test]
 	fn get_node_array() {
 		let storage = [1, 2, 3];

node-graph/gcore/src/structural.rs

@@ -175,9 +175,8 @@ impl<'input, S0: 'input, O: 'static> ApplyNode<O, S0> {
 
 #[cfg(test)]
 mod test {
-	use crate::{ops::IdentityNode, value::ValueNode};
-
 	use super::*;
+	use crate::{ops::IdentityNode, value::ValueNode};
 
 	#[test]
 	fn compose() {

node-graph/gcore/src/text/font_cache.rs

@@ -1,9 +1,9 @@
 use dyn_any::{DynAny, StaticType};
-use serde::{Deserialize, Serialize};
+
 use std::collections::HashMap;
 
 /// A font type (storing font family and font style and an optional preview URL)
-#[derive(Debug, Clone, Serialize, Deserialize, Hash, PartialEq, Eq, DynAny, specta::Type)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Hash, PartialEq, Eq, DynAny, specta::Type)]
 pub struct Font {
 	#[serde(rename = "fontFamily")]
 	pub font_family: String,
@@ -17,7 +17,7 @@ impl Font {
 }
 
 /// A cache of all loaded font data and preview urls along with the default font (send from `init_app` in `editor_api.rs`)
-#[derive(Debug, Clone, Serialize, Deserialize, Default, PartialEq)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize, Default, PartialEq)]
 pub struct FontCache {
 	/// Actual font file data used for rendering a font with ttf_parser and rustybuzz
 	font_file_data: HashMap<Font, Vec<u8>>,

node-graph/gcore/src/uuid.rs

@@ -1,7 +1,6 @@
 use dyn_any::{DynAny, StaticType};
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Copy, Serialize, Deserialize, specta::Type)]
+#[derive(Clone, Copy, serde::Serialize, serde::Deserialize, specta::Type)]
 pub struct Uuid(
 	#[serde(with = "u64_string")]
 	#[specta(type = String)]

node-graph/gcore/src/vector/style.rs

@@ -5,7 +5,7 @@ use crate::Color;
 
 use dyn_any::{DynAny, StaticType};
 use glam::{DAffine2, DVec2};
-use serde::{Deserialize, Serialize};
+
 use std::fmt::{self, Display, Write};
 
 /// Precision of the opacity value in digits after the decimal point.
@@ -20,7 +20,7 @@ fn format_opacity(attribute: &str, opacity: f32) -> String {
 	}
 }
 
-#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, Hash, Serialize, Deserialize, DynAny, specta::Type)]
+#[derive(Default, PartialEq, Eq, Clone, Copy, Debug, Hash, serde::Serialize, serde::Deserialize, DynAny, specta::Type)]
 pub enum GradientType {
 	#[default]
 	Linear,
@@ -31,7 +31,7 @@ pub enum GradientType {
 ///
 /// Contains the start and end points, along with the colors at varying points along the length.
 #[repr(C)]
-#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize, DynAny, specta::Type)]
+#[derive(Debug, Clone, PartialEq, Default, serde::Serialize, serde::Deserialize, DynAny, specta::Type)]
 pub struct Gradient {
 	pub start: DVec2,
 	pub end: DVec2,
@@ -180,7 +180,7 @@ impl Gradient {
 ///
 /// Can be None, a solid [Color], a linear [Gradient], a radial [Gradient] or potentially some sort of image or pattern in the future
 #[repr(C)]
-#[derive(Default, Debug, Clone, PartialEq, Serialize, Deserialize, DynAny, Hash, specta::Type)]
+#[derive(Default, Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, DynAny, Hash, specta::Type)]
 pub enum Fill {
 	#[default]
 	None,
@@ -265,7 +265,7 @@ impl Fill {
 
 /// Enum describing the type of [Fill]
 #[repr(C)]
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize, DynAny, Hash, specta::Type)]
+#[derive(Debug, Clone, Copy, PartialEq, serde::Serialize, serde::Deserialize, DynAny, Hash, specta::Type)]
 pub enum FillType {
 	Solid,
 	Gradient,
@@ -273,7 +273,7 @@ pub enum FillType {
 
 /// The stroke (outline) style of an SVG element.
 #[repr(C)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Hash, DynAny, specta::Type)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash, DynAny, specta::Type)]
 pub enum LineCap {
 	Butt,
 	Round,
@@ -291,7 +291,7 @@ impl Display for LineCap {
 }
 
 #[repr(C)]
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Hash, DynAny, specta::Type)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash, DynAny, specta::Type)]
 pub enum LineJoin {
 	Miter,
 	Bevel,
@@ -309,7 +309,7 @@ impl Display for LineJoin {
 }
 
 #[repr(C)]
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, DynAny, specta::Type)]
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, DynAny, specta::Type)]
 pub struct Stroke {
 	/// Stroke color
 	pub color: Option<Color>,
@@ -474,7 +474,7 @@ impl Default for Stroke {
 }
 
 #[repr(C)]
-#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize, DynAny, specta::Type)]
+#[derive(Debug, Clone, PartialEq, Default, serde::Serialize, serde::Deserialize, DynAny, specta::Type)]
 pub struct PathStyle {
 	stroke: Option<Stroke>,
 	fill: Fill,
@@ -638,7 +638,7 @@ impl PathStyle {
 }
 
 /// Represents different ways of rendering an object
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, Deserialize, Serialize, Hash, DynAny, specta::Type)]
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize, Hash, DynAny, specta::Type)]
 pub enum ViewMode {
 	/// Render with normal coloration at the current viewport resolution
 	#[default]

node-graph/gcore/src/vector/vector_data/attributes.rs

@@ -190,7 +190,7 @@ impl RegionDomain {
 		self.fill.push(fill);
 	}
 
-	fn resolve_id(&self, id: RegionId) -> Option<usize> {
+	fn _resolve_id(&self, id: RegionId) -> Option<usize> {
 		self.ids.iter().position(|&check_id| check_id == id)
 	}
 

node-graph/gcore/src/vector/vector_nodes.rs

@@ -2,7 +2,6 @@ use super::style::{Fill, FillType, Gradient, GradientType, Stroke};
 use super::{PointId, SegmentId, StrokeId, VectorData};
 use crate::renderer::GraphicElementRendered;
 use crate::transform::{Footprint, Transform, TransformMut};
-use crate::uuid::ManipulatorGroupId;
 use crate::{Color, GraphicGroup, Node};
 use core::future::Future;
 
@@ -510,12 +509,14 @@ async fn morph<SourceFuture: Future<Output = VectorData>, TargetFuture: Future<O
 
 #[cfg(test)]
 mod test {
-	use bezier_rs::Bezier;
-
 	use super::*;
 	use crate::transform::CullNode;
 	use crate::value::ClonedNode;
+
+	use bezier_rs::Bezier;
+
 	use std::pin::Pin;
+
 	#[derive(Clone)]
 	pub struct FutureWrapperNode<Node: Clone>(Node);
 

node-graph/gpu-compiler/gpu-compiler-bin-wrapper/src/lib.rs

@@ -1,7 +1,6 @@
 use gpu_executor::ShaderIO;
 use graph_craft::{proto::ProtoNetwork, Type};
 
-use serde::{Deserialize, Serialize};
 use std::io::Write;
 
 pub fn compile_spirv(request: &CompileRequest, compile_dir: Option<&str>, manifest_path: &str) -> anyhow::Result<Vec<u8>> {
@@ -41,7 +40,7 @@ pub fn compile_spirv(request: &CompileRequest, compile_dir: Option<&str>, manife
 	Ok(std::fs::read(compile_dir.unwrap().to_owned() + "/shader.spv")?)
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Hash, Eq)]
+#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq, Hash, Eq)]
 pub struct CompileRequest {
 	networks: Vec<graph_craft::proto::ProtoNetwork>,
 	input_types: Vec<Type>,

node-graph/gpu-executor/src/lib.rs

@@ -8,14 +8,14 @@ use futures::Future;
 use glam::{DAffine2, UVec3};
 use graphene_core::application_io::{ApplicationIo, EditorApi, SurfaceHandle};
 use graphene_core::raster::{Image, ImageFrame, Pixel, SRGBA8};
-use serde::{Deserialize, Serialize};
+
 use std::borrow::Cow;
 use std::pin::Pin;
 use std::sync::Arc;
 
 type ReadBackFuture = Pin<Box<dyn Future<Output = Result<Vec<u8>>>>>;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, dyn_any::DynAny)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, dyn_any::DynAny)]
 pub enum ComputePassDimensions {
 	X(u32),
 	XY(u32, u32),
@@ -65,13 +65,13 @@ pub trait SpirVCompiler {
 	fn compile(&self, network: &[ProtoNetwork], io: &ShaderIO) -> Result<Shader>;
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct CompileRequest {
 	pub networks: Vec<ProtoNetwork>,
 	pub io: ShaderIO,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 /// GPU constants that can be used as inputs to a shader.
 pub enum GPUConstant {
 	SubGroupId,
@@ -102,7 +102,7 @@ impl GPUConstant {
 		}
 	}
 }
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct DummyExecutor;
 
 impl GpuExecutor for DummyExecutor {
@@ -161,7 +161,7 @@ impl GpuExecutor for DummyExecutor {
 
 type AbstractShaderInput = ShaderInput<DummyExecutor>;
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 /// All the possible inputs to a shader.
 pub enum ShaderInput<E: GpuExecutor + ?Sized> {
 	UniformBuffer(E::BufferHandle, Type),
@@ -255,7 +255,7 @@ pub struct Shader<'a> {
 	pub io: ShaderIO,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize)]
 pub struct ShaderIO {
 	pub inputs: Vec<AbstractShaderInput>,
 	pub output: AbstractShaderInput,

node-graph/graph-craft/src/document.rs

@@ -1233,12 +1233,13 @@ impl<'a> Iterator for RecursiveNodeIter<'a> {
 
 #[cfg(test)]
 mod test {
-	use std::sync::atomic::AtomicU64;
-
 	use super::*;
 	use crate::proto::{ConstructionArgs, ProtoNetwork, ProtoNode, ProtoNodeInput};
+
 	use graphene_core::ProtoNodeIdentifier;
 
+	use std::sync::atomic::AtomicU64;
+
 	fn gen_node_id() -> NodeId {
 		static NODE_ID: AtomicU64 = AtomicU64::new(4);
 		NodeId(NODE_ID.fetch_add(1, std::sync::atomic::Ordering::SeqCst))

node-graph/graph-craft/src/proto.rs

@@ -5,7 +5,6 @@ use dyn_any::DynAny;
 use graphene_core::*;
 
 #[cfg(feature = "serde")]
-use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::fmt::Debug;
@@ -76,7 +75,7 @@ impl NodeContainer {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Default, PartialEq, Clone, Hash, Eq)]
 /// A list of [`ProtoNode`]s, which is an intermediate step between the [`crate::document::NodeNetwork`] and the `BorrowTree` containing a single flattened network.
 pub struct ProtoNetwork {
@@ -139,7 +138,7 @@ impl core::fmt::Display for ProtoNetwork {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Clone)]
 /// Defines the arguments used to construct the boxed node struct. This is used to call the constructor function in the `node_registry.rs` file - which is hidden behind a wall of macros.
 pub enum ConstructionArgs {
@@ -199,7 +198,7 @@ impl ConstructionArgs {
 	}
 }
 
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Clone, PartialEq, Hash, Eq)]
 /// A protonode is an intermediate step between the `DocumentNode` and the boxed struct that actually runs the node (found in the [`BorrowTree`]). It has one primary input and several secondary inputs in [`ConstructionArgs`].
 pub struct ProtoNode {
@@ -229,7 +228,7 @@ impl Default for ProtoNode {
 /// A ProtoNodeInput represents the primary input of a node in a ProtoNetwork.
 /// Similar to [`crate::document::NodeInput`].
 #[derive(Debug, PartialEq, Eq, Clone, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum ProtoNodeInput {
 	/// [`ProtoNode`]s do not require any input, e.g. the value node just takes in [`ConstructionArgs`].
 	None,

node-graph/gstd/src/any.rs

@@ -265,6 +265,7 @@ impl<I, O> PanicNode<I, O> {
 #[cfg(test)]
 mod test {
 	use super::*;
+
 	use graphene_core::{ops::AddPairNode, ops::IdentityNode};
 
 	#[test]

node-graph/gstd/src/image_color_palette.rs

@@ -62,10 +62,10 @@ fn image_color_palette(frame: ImageFrame<Color>, max_size: u32) -> Vec<Color> {
 
 #[cfg(test)]
 mod test {
-	use graphene_core::{raster::Image, value::CopiedNode};
-
 	use super::*;
 
+	use graphene_core::{raster::Image, value::CopiedNode};
+
 	#[test]
 	fn test_image_color_palette() {
 		assert_eq!(

node-graph/interpreted-executor/src/dynamic_executor.rs

@@ -227,10 +227,10 @@ impl BorrowTree {
 
 #[cfg(test)]
 mod test {
-	use graph_craft::document::value::TaggedValue;
-
 	use super::*;
 
+	use graph_craft::document::value::TaggedValue;
+
 	#[test]
 	fn push_node_sync() {
 		let mut tree = BorrowTree::default();

node-graph/interpreted-executor/src/lib.rs

@@ -11,7 +11,6 @@ mod tests {
 	#[test]
 	fn execute_add() {
 		use graph_craft::document::*;
-
 		use graph_craft::*;
 
 		fn add_network() -> NodeNetwork {
@@ -82,7 +81,6 @@ mod tests {
 	#[test]
 	fn double_number() {
 		use graph_craft::document::*;
-
 		use graph_craft::*;
 
 		let network = NodeNetwork {

node-graph/wgpu-executor/src/executor.rs

@@ -180,6 +180,7 @@ async fn execute_shader<I: Pod + Send + Sync, O: Pod + Send + Sync>(device: Arc<
 // #[cfg(test)]
 // mod test {
 // 	use super::*;
+//
 // 	use graph_craft::concrete;
 // 	use graph_craft::generic;
 // 	use graph_craft::proto::*;