Migrate SpaceView from a singular Component to an Archetype

crates/re_types/definitions/rerun/blueprint.fbs

@@ -1,14 +1,18 @@
 include "./blueprint/datatypes/query_expressions.fbs";
-include "./blueprint/datatypes/space_view_component.fbs";
 
 include "./blueprint/components/auto_layout.fbs";
 include "./blueprint/components/auto_space_views.fbs";
+include "./blueprint/components/entities_determined_by_user.fbs";
 include "./blueprint/components/entity_properties_component.fbs";
+include "./blueprint/components/name.fbs";
 include "./blueprint/components/panel_view.fbs";
 include "./blueprint/components/query_expressions.fbs";
-include "./blueprint/components/space_view_component.fbs";
 include "./blueprint/components/space_view_maximized.fbs";
+include "./blueprint/components/space_view_origin.fbs";
+include "./blueprint/components/space_view_class.fbs";
 include "./blueprint/components/included_space_views.fbs";
+include "./blueprint/components/included_queries.fbs";
 include "./blueprint/components/viewport_layout.fbs";
 
+include "./blueprint/archetypes/space_view_blueprint.fbs";
 include "./blueprint/archetypes/viewport_blueprint.fbs";

crates/re_types/definitions/rerun/blueprint/archetypes/space_view_blueprint.fbs

@@ -0,0 +1,40 @@
+include "fbs/attributes.fbs";
+include "rust/attributes.fbs";
+
+include "rerun/datatypes.fbs";
+
+namespace rerun.blueprint.archetypes;
+
+// ---
+
+/// The top-level description of the Viewport.
+table SpaceViewBlueprint (
+    "attr.docs.unreleased",
+    "attr.rerun.scope": "blueprint",
+    "attr.rust.derive": "Default"
+) {
+    // --- Required ---
+
+    /// The class of the view.
+    class_identifier: rerun.blueprint.components.SpaceViewClass ("attr.rerun.component_required", order: 100);
+
+    // --- Optional ---
+
+    /// The name of the view.
+    display_name: rerun.blueprint.components.Name ("attr.rerun.component_optional", nullable, order: 200);
+
+    /// The "anchor point" of this space view.
+    ///
+    /// The transform at this path forms the reference point for all scene->world transforms in this space view.
+    /// I.e. the position of this entity path in space forms the origin of the coordinate system in this space view.
+    /// Furthermore, this is the primary indicator for heuristics on what entities we show in this space view.
+    space_origin: rerun.blueprint.components.SpaceViewOrigin  ("attr.rerun.component_optional", nullable, order: 300);
+
+    /// True if the user is has added entities themselves. False otherwise.
+    entities_determined_by_user: rerun.blueprint.components.EntitiesDeterminedByUser ("attr.rerun.component_optional", nullable, order: 400);
+
+    /// `BlueprintId`s of the `DataQuery`s that make up this `SpaceView`.
+    ///
+    /// It determines which entities are part of the spaceview.
+    contents: rerun.blueprint.components.IncludedQueries ("attr.rerun.component_optional", nullable, order: 500);
+}

crates/re_types/definitions/rerun/blueprint/components/entities_determined_by_user.fbs

@@ -0,0 +1,20 @@
+include "arrow/attributes.fbs";
+include "python/attributes.fbs";
+include "rust/attributes.fbs";
+
+include "rerun/datatypes.fbs";
+include "rerun/attributes.fbs";
+
+namespace rerun.blueprint.components;
+
+// ---
+
+/// Whether the space view entities were manually edited.
+table EntitiesDeterminedByUser (
+    "attr.rerun.scope": "blueprint",
+    "attr.docs.unreleased",
+    "attr.rust.derive": "Default, PartialEq, Eq, PartialOrd, Ord",
+    "attr.rust.repr": "transparent"
+) {
+    value: bool (order: 100);
+}

crates/re_types/definitions/rerun/blueprint/components/space_view_component.fbs → crates/re_types/definitions/rerun/blueprint/components/included_queries.fbs

@@ -1,23 +1,23 @@
 include "arrow/attributes.fbs";
-include "docs/attributes.fbs";
 include "python/attributes.fbs";
 include "rust/attributes.fbs";
 
-include "rerun/attributes.fbs";
 include "rerun/datatypes.fbs";
+include "rerun/attributes.fbs";
 
 namespace rerun.blueprint.components;
 
 // ---
 
-/// A view of a space.
+
+/// All the queries belonging to a given `SpaceView`.
 ///
 /// Unstable. Used for the ongoing blueprint experimentations.
-table SpaceViewComponent (
+table IncludedQueries (
   "attr.docs.unreleased",
   "attr.rerun.scope": "blueprint",
-  "attr.docs.unreleased",
-  "attr.rust.derive_only": "Clone"
+  "attr.rust.derive": "Default",
+  "attr.rust.repr": "transparent"
 ) {
-  component: rerun.blueprint.datatypes.SpaceViewComponent (order: 100);
+  query_ids: [rerun.datatypes.Uuid] (order: 100);
 }

crates/re_types/definitions/rerun/blueprint/components/name.fbs

@@ -0,0 +1,20 @@
+include "arrow/attributes.fbs";
+include "python/attributes.fbs";
+include "rust/attributes.fbs";
+
+include "rerun/datatypes.fbs";
+include "rerun/attributes.fbs";
+
+namespace rerun.blueprint.components;
+
+// ---
+
+/// The name of a blueprint entity.
+table Name (
+    "attr.rerun.scope": "blueprint",
+    "attr.docs.unreleased",
+    "attr.rust.derive": "PartialEq, Eq, PartialOrd, Ord",
+    "attr.rust.repr": "transparent"
+) {
+    value: string (order: 100);
+}

crates/re_types/definitions/rerun/blueprint/components/space_view_class.fbs

@@ -0,0 +1,20 @@
+include "arrow/attributes.fbs";
+include "python/attributes.fbs";
+include "rust/attributes.fbs";
+
+include "rerun/datatypes.fbs";
+include "rerun/attributes.fbs";
+
+namespace rerun.blueprint.components;
+
+// ---
+
+/// The class of a `SpaceView`.
+table SpaceViewClass (
+    "attr.rerun.scope": "blueprint",
+    "attr.docs.unreleased",
+    "attr.rust.derive": "Default, PartialEq, Eq, PartialOrd, Ord",
+    "attr.rust.repr": "transparent"
+) {
+    value: string (order: 100);
+}

crates/re_types/definitions/rerun/blueprint/components/space_view_origin.fbs

@@ -0,0 +1,20 @@
+include "arrow/attributes.fbs";
+include "python/attributes.fbs";
+include "rust/attributes.fbs";
+
+include "rerun/datatypes.fbs";
+include "rerun/attributes.fbs";
+
+namespace rerun.blueprint.components;
+
+// ---
+
+/// The origin of a `SpaceView`.
+table SpaceViewOrigin (
+    "attr.rerun.scope": "blueprint",
+    "attr.docs.unreleased",
+    "attr.rust.derive": "PartialEq, Eq, PartialOrd, Ord",
+    "attr.rust.repr": "transparent"
+) {
+    value: rerun.datatypes.EntityPath (order: 100);
+}

crates/re_types/definitions/rerun/datatypes/entity_path.fbs

@@ -14,7 +14,7 @@ namespace rerun.datatypes;
 table EntityPath  (
   "attr.arrow.transparent",
   "attr.docs.unreleased",
-  "attr.rust.derive": "Default",
+  "attr.rust.derive": "PartialEq, Eq, PartialOrd, Ord, Default",
   "attr.rust.repr": "transparent",
   "attr.rust.tuple_struct",
   "attr.rust.override_crate": "re_types_core"