Move StoreBundle from re_viewer_context to re_entity_db (#9971)

Title. Small refactor to make my life easier.

Author: abey79

Cargo.lock

@@ -8123,15 +8123,13 @@ dependencies = [
  "once_cell",
  "parking_lot",
  "pollster 0.4.0",
- "re_build_info",
  "re_capabilities",
  "re_chunk",
  "re_chunk_store",
  "re_data_source",
  "re_entity_db",
  "re_format",
  "re_log",
- "re_log_encoding",
  "re_log_types",
  "re_math",
  "re_query",

crates/store/re_entity_db/src/lib.rs

@@ -7,6 +7,7 @@
 pub mod entity_db;
 pub mod entity_tree;
 mod instance_path;
+mod store_bundle;
 mod time_histogram_per_timeline;
 mod times_per_timeline;
 mod versioned_instance_path;
@@ -15,6 +16,7 @@ pub use self::{
     entity_db::{DEFAULT_GC_TIME_BUDGET, EntityDb},
     entity_tree::EntityTree,
     instance_path::{InstancePath, InstancePathHash},
+    store_bundle::{StoreBundle, StoreLoadError},
     time_histogram_per_timeline::{TimeHistogram, TimeHistogramPerTimeline},
     times_per_timeline::{TimeCounts, TimesPerTimeline},
     versioned_instance_path::{VersionedInstancePath, VersionedInstancePathHash},

crates/viewer/re_viewer_context/src/store_bundle.rs renamed to crates/store/re_entity_db/src/store_bundle.rs

@@ -1,15 +1,16 @@
 use itertools::Itertools as _;
 
-use re_entity_db::EntityDb;
 use re_log_types::{StoreId, StoreKind};
 
+use crate::EntityDb;
+
 #[derive(thiserror::Error, Debug)]
 pub enum StoreLoadError {
     #[error(transparent)]
     Decode(#[from] re_log_encoding::decoder::DecodeError),
 
     #[error(transparent)]
-    ChunkStore(#[from] re_entity_db::Error),
+    ChunkStore(#[from] crate::Error),
 }
 
 /// Stores many [`EntityDb`]s of recordings and blueprints.

crates/viewer/re_viewer/src/app.rs

@@ -1963,7 +1963,7 @@ fn blueprint_loader() -> BlueprintPersistence {
 
 #[cfg(not(target_arch = "wasm32"))]
 fn blueprint_loader() -> BlueprintPersistence {
-    use re_viewer_context::StoreBundle;
+    use re_entity_db::StoreBundle;
 
     fn load_blueprint_from_disk(app_id: &ApplicationId) -> anyhow::Result<Option<StoreBundle>> {
         let blueprint_path = crate::saving::default_blueprint_path(app_id)?;

crates/viewer/re_viewer/src/loading.rs

@@ -1,4 +1,4 @@
-use re_viewer_context::{StoreBundle, StoreLoadError};
+use re_entity_db::{StoreBundle, StoreLoadError};
 
 #[derive(thiserror::Error, Debug)]
 enum BlueprintLoadError {

crates/viewer/re_viewer_context/Cargo.toml

@@ -26,14 +26,12 @@ ignored = ["home"]
 testing = ["dep:pollster", "dep:egui_kittest"]
 
 [dependencies]
-re_build_info.workspace = true
 re_capabilities.workspace = true
 re_chunk_store.workspace = true
 re_chunk.workspace = true
 re_data_source.workspace = true
 re_entity_db = { workspace = true, features = ["serde"] }
 re_format.workspace = true
-re_log_encoding.workspace = true
 re_log_types.workspace = true
 re_log.workspace = true
 re_math.workspace = true

crates/viewer/re_viewer_context/src/lib.rs

@@ -19,7 +19,6 @@ mod query_context;
 mod query_range;
 mod selection_state;
 mod storage_context;
-mod store_bundle;
 mod store_context;
 pub mod store_hub;
 mod tables;
@@ -67,7 +66,6 @@ pub use self::{
         ItemContext, SelectionChange, SelectionHighlight,
     },
     storage_context::StorageContext,
-    store_bundle::{StoreBundle, StoreLoadError},
     store_context::StoreContext,
     store_hub::{StoreHub, StoreHubEntry},
     tables::{TableStore, TableStores},

crates/viewer/re_viewer_context/src/storage_context.rs

@@ -1,8 +1,8 @@
-use crate::{StoreBundle, StoreHub, TableStores};
+use crate::{StoreHub, TableStores};
 
 /// Provides read-only references over the different kinds of storage used throughout the viewer.
 pub struct StorageContext<'a> {
     pub hub: &'a StoreHub,
-    pub bundle: &'a StoreBundle,
+    pub bundle: &'a re_entity_db::StoreBundle,
     pub tables: &'a TableStores,
 }

crates/viewer/re_viewer_context/src/store_hub.rs

@@ -8,14 +8,12 @@ use re_chunk_store::{
     ChunkStoreConfig, ChunkStoreGeneration, ChunkStoreStats, GarbageCollectionOptions,
     GarbageCollectionTarget,
 };
-use re_entity_db::EntityDb;
+use re_entity_db::{EntityDb, StoreBundle};
 use re_log_types::{ApplicationId, ResolvedTimeRange, StoreId, StoreKind, TableId};
 use re_query::CachesStats;
 use re_types::{archetypes, components::Timestamp};
 
-use crate::{
-    BlueprintUndoState, Caches, StorageContext, StoreBundle, StoreContext, TableStore, TableStores,
-};
+use crate::{BlueprintUndoState, Caches, StorageContext, StoreContext, TableStore, TableStores};
 
 #[derive(Clone, Debug)]
 pub enum StoreHubEntry {