Make wasm wrapper not depend on editor on native

desktop/src/app.rs

@@ -14,13 +14,12 @@ use winit::event::{ButtonSource, ElementState, MouseButton, StartCause, WindowEv
 use winit::event_loop::{ActiveEventLoop, ControlFlow, EventLoop};
 use winit::window::WindowId;
 
-use graphite_desktop_ui::{UiCommand, UiInstance};
-
 use crate::dirs;
 use crate::event::{AppEvent, AppEventScheduler};
 use crate::persist;
 use crate::preferences;
 use crate::render::{RenderError, RenderState};
+use crate::ui::{UiCommand, UiInstance};
 use crate::window::Window;
 use crate::wrapper::messages::{DesktopFrontendMessage, DesktopWrapperMessage, InputMessage, MouseKeys, MouseState, Preferences};
 use crate::wrapper::{DesktopWrapper, MmapResourceStorage, NodeGraphExecutionResult, WgpuContext, serialize_frontend_messages};

desktop/src/event.rs

@@ -1,9 +1,10 @@
+use crate::ui::Cursor;
 use crate::wrapper::NodeGraphExecutionResult;
 use crate::wrapper::messages::DesktopWrapperMessage;
 
 pub(crate) enum AppEvent {
 	UiUpdate(wgpu::Texture),
-	CursorChange(graphite_desktop_ui::Cursor),
+	CursorChange(Cursor),
 	WebCommunicationInitialized,
 	DesktopWrapperMessage(DesktopWrapperMessage),
 	NodeGraphExecutionResult(NodeGraphExecutionResult),

desktop/src/lib.rs

@@ -3,12 +3,13 @@ use crate::cli::Cli;
 use crate::consts::APP_LOCK_FILE_NAME;
 use crate::event::{AppEvent, CreateAppEventSchedulerEventLoopExt};
 use clap::Parser;
-use graphite_desktop_ui::{Acceleration, UiConfig, UiContext, UiEvent, UiSetupResult};
 use std::io::Write;
 use std::process::ExitCode;
 use tracing_subscriber::EnvFilter;
+use ui::{Acceleration, UiConfig, UiContext, UiEvent, UiSetupResult};
 use winit::event_loop::EventLoop;
 
+pub(crate) use graphite_desktop_ui as ui;
 pub(crate) use graphite_desktop_wrapper as wrapper;
 
 mod app;
@@ -69,7 +70,7 @@ pub fn start() -> ExitCode {
 		}
 	};
 
-	dirs::clear_dir(&graphite_desktop_ui::temp_dir_root());
+	dirs::clear_dir(&ui::temp_dir_root());
 
 	// TODO: Eventually remove this cleanup code for the old "browser" CEF directory
 	dirs::delete_old_cef_browser_directory();

desktop/src/window.rs

@@ -1,8 +1,8 @@
 use crate::consts::APP_NAME;
 use crate::event::AppEventScheduler;
+use crate::ui::Cursor;
 use crate::wrapper::messages::MenuItem;
 use crate::wrapper::{WgpuInstance, WgpuSurface};
-use graphite_desktop_ui::Cursor;
 use std::collections::HashMap;
 use std::sync::Arc;
 use winit::cursor::{CustomCursor, CustomCursorSource};

desktop/wrapper/Cargo.toml

@@ -14,6 +14,7 @@ gpu = ["graphite-editor/gpu", "graphene-std/shader-nodes"]
 [dependencies]
 # Local dependencies
 graphite-editor = { workspace = true }
+graphite-wasm-wrapper = { path = "../../frontend/wrapper", default-features = false, features = ["editor"] }
 graphene-std = { workspace = true }
 graph-craft = { workspace = true }
 wgpu-executor = { workspace = true }
@@ -22,7 +23,6 @@ wgpu = { workspace = true }
 thiserror = { workspace = true }
 tracing = { workspace = true }
 dirs = { workspace = true }
-ron = { workspace = true}
 vello = { workspace = true }
 image = { workspace = true }
 serde = { workspace = true }

desktop/wrapper/src/lib.rs

@@ -1,7 +1,9 @@
 use graph_craft::application_io::PlatformApplicationIo;
 use graph_craft::application_io::resource::ResourceStorage;
 use graphite_editor::application::{Editor, Environment, Host, Platform};
-use graphite_editor::messages::prelude::{FrontendMessage, Message, Wake};
+use graphite_editor::messages::frontend::FrontendMessage;
+use graphite_editor::messages::prelude::Wake;
+
 use message_dispatcher::DesktopWrapperMessageDispatcher;
 use messages::{DesktopFrontendMessage, DesktopWrapperMessage};
 use std::sync::Arc;
@@ -65,21 +67,10 @@ pub enum NodeGraphExecutionResult {
 }
 
 pub fn deserialize_editor_message(data: &[u8]) -> Option<DesktopWrapperMessage> {
-	if let Ok(string) = std::str::from_utf8(data) {
-		if let Ok(message) = ron::de::from_str::<Message>(string) {
-			Some(DesktopWrapperMessage::FromWeb(message.into()))
-		} else {
-			None
-		}
-	} else {
-		None
-	}
+	let message = graphite_wasm_wrapper::native_communication::decode_editor_command(data)?;
+	Some(DesktopWrapperMessage::FromWeb(message.into()))
 }
 
 pub fn serialize_frontend_messages(messages: Vec<FrontendMessage>) -> Option<Vec<u8>> {
-	if let Ok(serialized) = ron::ser::to_string(&messages) {
-		Some(serialized.into_bytes())
-	} else {
-		None
-	}
+	graphite_wasm_wrapper::native_communication::encode_frontend_messages(messages)
 }

document/graph-storage/src/resources.rs

@@ -45,7 +45,7 @@ impl<'de> Deserialize<'de> for ResourceEntry {
 		}
 
 		let Raw { mut sources, hash, hash_timestamp } = Raw::deserialize(deserializer)?;
-		sources.sort_by(|(a, _), (b, _)| a.cmp(b));
+		sources.sort_by_key(|(a, _)| *a);
 		sources.dedup_by(|(later_key, later_value), (kept_key, kept_value)| {
 			// `dedup_by` keeps the first of each run; sorting is stable, so resolve duplicates by LWW.
 			if later_key != kept_key {

editor/src/messages/frontend/frontend_message.rs

@@ -1,7 +1,7 @@
 use super::IconName;
 use super::utility_types::{MouseCursorIcon, PersistedState};
 use crate::messages::app_window::app_window_message_handler::AppWindowPlatform;
-use crate::messages::frontend::utility_types::{DocumentInfo, EyedropperPreviewImage};
+use crate::messages::frontend::utility_types::{DocumentInfo, EyedropperPreviewImage, RasterizedImage};
 use crate::messages::input_mapper::utility_types::misc::ActionShortcut;
 use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::node_graph::utility_types::{
@@ -14,7 +14,6 @@ use crate::messages::prelude::*;
 use crate::messages::tool::tool_messages::eyedropper_tool::PrimarySecondary;
 use graph_craft::document::NodeId;
 use graphene_std::color::SRGBA8;
-use graphene_std::raster::Image;
 use graphene_std::vector::style::FillChoiceUI;
 use std::path::PathBuf;
 
@@ -235,7 +234,7 @@ pub enum FrontendMessage {
 		svg: String,
 	},
 	UpdateImageData {
-		image_data: Vec<(u64, Image<SRGBA8>)>,
+		image_data: Vec<RasterizedImage>,
 	},
 	UpdateDocumentLayerDetails {
 		data: LayerPanelEntry,

editor/src/messages/frontend/utility_types.rs

@@ -82,3 +82,12 @@ pub struct EyedropperPreviewImage {
 	pub width: u32,
 	pub height: u32,
 }
+
+#[cfg_attr(feature = "wasm", derive(tsify::Tsify), tsify(large_number_types_as_bigints))]
+#[derive(Clone, Debug, Default, Eq, PartialEq, Hash, serde::Serialize, serde::Deserialize)]
+pub struct RasterizedImage {
+	pub id: u64,
+	pub width: u32,
+	pub height: u32,
+	pub pixels: serde_bytes::ByteBuf,
+}

editor/src/node_graph_executor.rs

@@ -1,4 +1,4 @@
-use crate::messages::frontend::utility_types::{ExportBounds, FileType};
+use crate::messages::frontend::utility_types::{ExportBounds, FileType, RasterizedImage};
 use crate::messages::portfolio::document::utility_types::network_interface::InputConnector;
 use crate::messages::prelude::*;
 use glam::{DAffine2, DVec2, UVec2};
@@ -660,19 +660,15 @@ impl NodeGraphExecutor {
 
 		match render_output.data {
 			RenderOutputType::Svg { svg, image_data } => {
-				// Convert each linear-light `Image<Color>` into the JS-boundary `Image<SRGBA8>` form (gamma byte channels) before dispatching.
+				// Convert each linear-light `Image<Color>` into gamma sRGB bytes (the DOM boundary form) before dispatching.
+				let rgba8_bytes = |&color: &_| <[u8; 4]>::from(SRGBA8::from(color));
 				let image_data = image_data
 					.into_iter()
-					.map(|(id, image)| {
-						(
-							id,
-							graphene_std::raster::Image {
-								width: image.width,
-								height: image.height,
-								data: image.data.iter().map(|&c| SRGBA8::from(c)).collect(),
-								base64_string: image.base64_string,
-							},
-						)
+					.map(|(id, image)| RasterizedImage {
+						id,
+						width: image.width,
+						height: image.height,
+						pixels: image.data.iter().flat_map(rgba8_bytes).collect::<Vec<u8>>().into(),
 					})
 					.collect();
 				responses.add(FrontendMessage::UpdateImageData { image_data });

frontend/.gitignore

@@ -1,4 +1,5 @@
 node_modules/
 wrapper/pkg/
+wrapper/pkg-native/
 public/build/
 dist/

frontend/vite.config.ts

@@ -23,7 +23,10 @@ export default defineConfig(({ mode }) => {
 		// Default for builds that exclude the `wasmSplitting` plugin, which overrides this when active
 		define: { __WASM_PART_COUNT__: "1" },
 		resolve: {
-			alias: [{ find: /\/..\/branding\/(.*\.svg)/, replacement: path.resolve(projectRootDir, "../branding", "$1?raw") }],
+			alias: [
+				...(mode === "native" ? [{ find: /^\/wrapper\/pkg\//, replacement: "/wrapper/pkg-native/" }] : []),
+				{ find: /\/..\/branding\/(.*\.svg)/, replacement: path.resolve(projectRootDir, "../branding", "$1?raw") },
+			],
 		},
 		server: {
 			port: 8080,

frontend/wrapper/Cargo.toml

@@ -11,33 +11,38 @@ repository = "https://github.com/GraphiteEditor/Graphite"
 license = "Apache-2.0"
 
 [features]
-default = ["gpu", "shader-nodes"]
-gpu = ["editor/gpu"]
-shader-nodes = ["graphene-std/shader-nodes", "gpu"]
-native = ["node-macro/disable-registration"]
+default = ["gpu", "shader-nodes", "web"]
+web = ["editor", "editor?/wasm"]
+editor = ["dep:editor", "dep:graphene-std", "dep:graph-craft", "dep:node-macro", "dep:wgpu"]
+gpu = ["editor?/gpu"]
+shader-nodes = ["graphene-std?/shader-nodes", "gpu"]
+native = ["node-macro?/disable-registration"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 # Local dependencies
-editor = { path = "../../editor", package = "graphite-editor", features = ["gpu", "wasm"] }
-graphene-std = { workspace = true }
+editor = { path = "../../editor", package = "graphite-editor", optional = true }
+graphite-proc-macros = { workspace = true }
+graphene-std = { workspace = true, optional = true }
 
 # Workspace dependencies
-bytemuck = { workspace = true }
-graph-craft = { workspace = true }
+graph-craft = { workspace = true, optional = true }
 log = { workspace = true }
 serde = { workspace = true }
 wasm-bindgen = { workspace = true }
 serde-wasm-bindgen = { workspace = true }
 js-sys = { workspace = true }
 wasm-bindgen-futures = { workspace = true }
-wgpu = { workspace = true }
+wgpu = { workspace = true, optional = true }
 web-sys = { workspace = true }
-ron = { workspace = true }
 serde_json = { workspace = true }
-node-macro = { workspace = true }
+tsify = { workspace = true }
+node-macro = { workspace = true, optional = true }
+
+[dev-dependencies]
+serde_bytes = { workspace = true }
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = [