More consistent document crate names

Author: timon-schelling

Cargo.lock

@@ -7,9 +7,9 @@ members = [
 	"desktop/platform/linux",
 	"desktop/platform/mac",
 	"desktop/platform/win",
-	"document/graph-storage",
+	"document/graph",
 	"document/container",
-	"document/document-format",
+	"document/format",
 	"editor",
 	"frontend/wrapper",
 	"libraries/dyn-any",
@@ -91,8 +91,8 @@ repeat-nodes = { path = "node-graph/nodes/repeat" }
 math-nodes = { path = "node-graph/nodes/math" }
 path-bool-nodes = { path = "node-graph/nodes/path-bool" }
 graph-craft = { path = "node-graph/graph-craft" }
-graph-storage = { path = "document/graph-storage", default-features = false }
-document-format = { path = "document/document-format" }
+document-graph = { path = "document/graph", default-features = false }
+document-format = { path = "document/format" }
 document-container = { path = "document/container" }
 raster-nodes = { path = "node-graph/nodes/raster" }
 graphene-std = { path = "node-graph/nodes/gstd" }

Cargo.toml

@@ -1,16 +1,16 @@
 [package]
 name = "document-format"
-description = "Typed handle for the .gdd document format, sitting over graph-storage and document-container"
+description = "Typed handle for the .gdd document format, sitting over document-graph and document-container"
 edition.workspace = true
 version.workspace = true
 license.workspace = true
 authors.workspace = true
 
 [features]
-# Runtime bridge: the editor↔storage conversion methods (stage/commit from a `NodeNetwork`,
+# Runtime bridge: the editor <-> storage conversion methods (stage/commit from a `NodeNetwork`,
 # `network_ids`, `declarations`). Off lets a standalone migration tool build without `graph-craft`
-# or `core-types`. Forwards to `graph-storage/conversion`.
-conversion = ["graph-storage/conversion", "dep:graph-craft", "dep:core-types"]
+# or `core-types`. Forwards to `document-graph/conversion`.
+conversion = ["document-graph/conversion", "dep:graph-craft", "dep:core-types"]
 # Compressed-archive export/open. Each forwards to the matching `document-container` feature and
 # gates that format's `ExportFormat` arm and sink. The folder/memory codec-free core needs neither.
 zip = ["document-container/zip"]
@@ -19,7 +19,7 @@ default = ["conversion", "zip", "xz"]
 
 [dependencies]
 document-container = { workspace = true }
-graph-storage = { workspace = true, default-features = false }
+document-graph = { workspace = true, default-features = false }
 graph-craft = { workspace = true, optional = true }
 graphene-resource = { workspace = true }
 core-types = { workspace = true, optional = true }

document/document-format/Cargo.toml document/format/Cargo.tomldocument/document-format/Cargo.toml renamed to document/format/Cargo.toml

@@ -5,8 +5,8 @@
 
 use document_container::ContainerError;
 #[cfg(feature = "conversion")]
-use graph_storage::CommitError;
-use graph_storage::CrdtError;
+use document_graph::CommitError;
+use document_graph::CrdtError;
 use graphene_resource::ResourceHash;
 
 use crate::codec::CodecError;

document/document-format/src/codec.rs document/format/src/codec.rsdocument/document-format/src/codec.rs renamed to document/format/src/codec.rs

@@ -162,7 +162,7 @@ impl<L: Layout> Gdd<L> {
 		// below, so only the gap is loaded from the byte store here.
 		let mut export_session = self.session.clone();
 		let mut hashes_from_store: Vec<ResourceHash> = Vec::new();
-		let mut links_to_promote: Vec<graph_storage::ResourceId> = Vec::new();
+		let mut links_to_promote: Vec<document_graph::ResourceId> = Vec::new();
 		for (id, entry) in &export_session.registry().resources {
 			let Some(hash) = entry.hash else { continue };
 			let embed = entry.has_embedded_source() || options.embed_all_resources;

document/document-format/src/error.rs document/format/src/error.rsdocument/document-format/src/error.rs renamed to document/format/src/error.rs

@@ -1,6 +1,6 @@
 //! Typed handle for `.gdd` documents.
 //!
-//! [`Gdd`] owns a [`graph_storage::Session`] plus a working-copy [`document_container::AnyContainer`].
+//! [`Gdd`] owns a [`document_graph::Session`] plus a working-copy [`document_container::AnyContainer`].
 //! Mutations flow through `Gdd` to keep the session and the on-disk working copy mirrored.
 //! Export is a separate, explicit operation — see [`export::ExportFormat`].
 //!
@@ -16,8 +16,8 @@ use std::path::Path;
 use document_container::backends::folder::FolderBackend;
 use document_container::{AnyContainer, AsyncContainer, ByteHolder, ContainerError};
 #[cfg(feature = "conversion")]
-use graph_storage::{CommitError, NodeMetadataSource};
-use graph_storage::{Delta, HotOp, PeerId, Registry, Session};
+use document_graph::{CommitError, NodeMetadataSource};
+use document_graph::{Delta, HotOp, PeerId, Registry, Session};
 #[cfg(feature = "conversion")]
 use graphene_resource::LoadResource;
 use graphene_resource::ResourceHash;
@@ -83,7 +83,7 @@ pub struct Gdd<L: Layout = GddV1Layout> {
 	pub(crate) view_settings: std::collections::BTreeMap<String, serde_json::Value>,
 	/// Per-network view settings (node-graph nav + previewing), keyed by stable [`NetworkId`]. Same per-peer
 	/// `session.json` treatment as [`view_settings`](Self::view_settings), but scoped per network.
-	pub(crate) network_view_settings: std::collections::BTreeMap<graph_storage::NetworkId, std::collections::BTreeMap<String, serde_json::Value>>,
+	pub(crate) network_view_settings: std::collections::BTreeMap<document_graph::NetworkId, std::collections::BTreeMap<String, serde_json::Value>>,
 }
 
 /// Native folder-backed convenience constructors. On wasm the editor builds an OPFS-backed
@@ -261,19 +261,19 @@ impl<L: Layout> Gdd<L> {
 	}
 
 	/// The per-network view settings read from `session.json` (node-graph nav + previewing), keyed by
-	/// [`NetworkId`](graph_storage::NetworkId). Opaque `ui::nav::*` / `ui::previewing` blobs the editor decodes.
-	pub fn network_view_settings(&self) -> &std::collections::BTreeMap<graph_storage::NetworkId, std::collections::BTreeMap<String, serde_json::Value>> {
+	/// [`NetworkId`](document_graph::NetworkId). Opaque `ui::nav::*` / `ui::previewing` blobs the editor decodes.
+	pub fn network_view_settings(&self) -> &std::collections::BTreeMap<document_graph::NetworkId, std::collections::BTreeMap<String, serde_json::Value>> {
 		&self.network_view_settings
 	}
 
-	/// Resolve each runtime `network_path` to its stable [`NetworkId`](graph_storage::NetworkId), so the
+	/// Resolve each runtime `network_path` to its stable [`NetworkId`](document_graph::NetworkId), so the
 	/// editor can key per-network, per-peer view state by a stable id. See [`Session::network_ids`].
 	#[cfg(feature = "conversion")]
 	pub fn network_ids<M: NodeMetadataSource>(
 		&self,
 		network: &graph_craft::document::NodeNetwork,
 		metadata: &M,
-	) -> Result<std::collections::HashMap<Vec<core_types::uuid::NodeId>, graph_storage::NetworkId>, CommitError> {
+	) -> Result<std::collections::HashMap<Vec<core_types::uuid::NodeId>, document_graph::NetworkId>, CommitError> {
 		self.session.network_ids(network, metadata)
 	}
 
@@ -292,17 +292,17 @@ impl<L: Layout> Gdd<L> {
 		(working, self.layout)
 	}
 
-	/// Resolve the proto-node declarations referenced by the registry into a [`graph_storage::Declarations`]
+	/// Resolve the proto-node declarations referenced by the registry into a [`document_graph::Declarations`]
 	/// map, loading each `ProtoNode`'s bytes from `byte_store` (the global cache in the editor, the
 	/// working-copy container for standalone). Only resources referenced by `Implementation::ProtoNode`
 	/// are visited, so image/font resources are skipped. Cold-path (open / `to_runtime`); async
 	/// because resource loads are.
 	#[cfg(feature = "conversion")]
-	pub async fn declarations(&self, byte_store: &dyn LoadResource) -> graph_storage::Declarations {
-		use graph_storage::Implementation;
+	pub async fn declarations(&self, byte_store: &dyn LoadResource) -> document_graph::Declarations {
+		use document_graph::Implementation;
 
 		let registry = self.session.registry();
-		let mut declarations = graph_storage::Declarations::new();
+		let mut declarations = document_graph::Declarations::new();
 
 		for node in registry.node_instances.values() {
 			let Implementation::ProtoNode(id) = node.implementation() else { continue };
@@ -317,7 +317,7 @@ impl<L: Layout> Gdd<L> {
 				log::error!("Declaration bytes for {id} (hash {hash}) missing from byte store");
 				continue;
 			};
-			match graph_storage::decode_declaration(resource.as_ref()) {
+			match document_graph::decode_declaration(resource.as_ref()) {
 				Ok(proto) => {
 					declarations.insert(*id, proto);
 				}