Make fields on common structs pub

apps/hash-graph/bench/Cargo.toml

@@ -21,7 +21,7 @@ serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.91"
 tokio = { version = "1.25.0", features = ["rt-multi-thread", "macros"] }
 tokio-postgres = { version = "0.7.7", default-features = false }
-type-system = { git = "https://github.com/blockprotocol/blockprotocol", rev = "646b7d1" }
+type-system = { git = "https://github.com/blockprotocol/blockprotocol", rev = "adab205" }
 uuid = { version = "1.3.0", features = ["v4", "serde"] }
 
 [[bench]]

apps/hash-graph/bench/read_scaling/knowledge/complete/entity.rs

@@ -10,7 +10,7 @@ use graph::{
             UnresolvedTimeProjection,
         },
     },
-    knowledge::{EntityMetadata, EntityProperties, LinkData},
+    knowledge::{EntityLinkOrder, EntityMetadata, EntityProperties, LinkData},
     provenance::{OwnedById, UpdatedById},
     store::{query::Filter, AccountStore, EntityStore},
     subgraph::{
@@ -105,12 +105,14 @@ async fn seed_db(
                             owned_by_id,
                             None,
                             properties.clone(),
-                            Some(LinkData::new(
-                                entity_a_metadata.record_id().entity_id(),
-                                entity_b_metadata.record_id().entity_id(),
-                                None,
-                                None,
-                            )),
+                            Some(LinkData {
+                                left_entity_id: entity_a_metadata.record_id().entity_id,
+                                right_entity_id: entity_b_metadata.record_id().entity_id,
+                                order: EntityLinkOrder {
+                                    left_to_right: None,
+                                    right_to_left: None,
+                                },
+                            }),
                             None,
                         )
                     })
@@ -161,7 +163,7 @@ pub fn bench_get_entity_by_id(
         |entity_record_id| async move {
             store
                 .get_entity(&StructuralQuery {
-                    filter: Filter::for_entity_by_entity_id(entity_record_id.entity_id()),
+                    filter: Filter::for_entity_by_entity_id(entity_record_id.entity_id),
                     graph_resolve_depths,
                     time_projection: UnresolvedTimeProjection::DecisionTime(UnresolvedProjection {
                         pinned: UnresolvedKernel::new(None),

apps/hash-graph/bench/read_scaling/knowledge/linkless/entity.rs

@@ -115,7 +115,7 @@ pub fn bench_get_entity_by_id(
         |entity_record_id| async move {
             store
                 .get_entity(&StructuralQuery {
-                    filter: Filter::for_entity_by_entity_id(entity_record_id.entity_id()),
+                    filter: Filter::for_entity_by_entity_id(entity_record_id.entity_id),
                     graph_resolve_depths: GraphResolveDepths::default(),
                     time_projection: UnresolvedTimeProjection::DecisionTime(UnresolvedProjection {
                         pinned: UnresolvedKernel::new(None),

apps/hash-graph/bench/representative_read/seed.rs

@@ -6,7 +6,7 @@ use std::{
 
 use graph::{
     identifier::account::AccountId,
-    knowledge::{EntityProperties, EntityUuid, LinkData},
+    knowledge::{EntityLinkOrder, EntityProperties, EntityUuid, LinkData},
     provenance::{OwnedById, UpdatedById},
     store::{AccountStore, AsClient, EntityStore},
 };
@@ -180,12 +180,14 @@ async fn seed_db(account_id: AccountId, store_wrapper: &mut StoreWrapper) {
                             OwnedById::new(account_id),
                             None,
                             EntityProperties::empty(),
-                            Some(LinkData::new(
-                                left_entity_metadata.record_id().entity_id(),
-                                right_entity_metadata.record_id().entity_id(),
-                                None,
-                                None,
-                            )),
+                            Some(LinkData {
+                                left_entity_id: left_entity_metadata.record_id().entity_id,
+                                right_entity_id: right_entity_metadata.record_id().entity_id,
+                                order: EntityLinkOrder {
+                                    left_to_right: None,
+                                    right_to_left: None,
+                                },
+                            }),
                             None,
                         )
                     }),
@@ -267,8 +269,8 @@ async fn get_samples(account_id: AccountId, store_wrapper: &mut StoreWrapper) ->
                 LIMIT 50
                 "#,
                 &[
-                    &entity_type_id.base_uri().as_str(),
-                    &i64::from(entity_type_id.version()),
+                    &entity_type_id.base_uri.as_str(),
+                    &i64::from(entity_type_id.version),
                 ],
             )
             .await

apps/hash-graph/bench/util.rs

@@ -201,7 +201,7 @@ pub async fn seed<D, P, E, C>(
             .create_data_type(
                 data_type.clone(),
                 &OntologyElementMetadata::Owned(OwnedOntologyElementMetadata::new(
-                    data_type.id().into(),
+                    data_type.id().clone().into(),
                     ProvenanceMetadata::new(UpdatedById::new(account_id)),
                     OwnedById::new(account_id),
                 )),
@@ -232,7 +232,7 @@ pub async fn seed<D, P, E, C>(
             .create_property_type(
                 property_type.clone(),
                 &OntologyElementMetadata::Owned(OwnedOntologyElementMetadata::new(
-                    property_type.id().into(),
+                    property_type.id().clone().into(),
                     ProvenanceMetadata::new(UpdatedById::new(account_id)),
                     OwnedById::new(account_id),
                 )),
@@ -263,7 +263,7 @@ pub async fn seed<D, P, E, C>(
             .create_entity_type(
                 entity_type.clone(),
                 &OntologyElementMetadata::Owned(OwnedOntologyElementMetadata::new(
-                    entity_type.id().into(),
+                    entity_type.id().clone().into(),
                     ProvenanceMetadata::new(UpdatedById::new(account_id)),
                     OwnedById::new(account_id),
                 )),

apps/hash-graph/bin/cli/Cargo.toml

@@ -24,7 +24,7 @@ tokio = { version = "1.25.0", features = ["rt-multi-thread", "macros"] }
 tokio-postgres = { version = "0.7.7", default-features = false }
 tokio-serde = { version = "0.8", features = ["messagepack"], optional = true }
 tracing = "0.1.37"
-type-system = { git = "https://github.com/blockprotocol/blockprotocol", rev = "646b7d1" }
+type-system = { git = "https://github.com/blockprotocol/blockprotocol", rev = "adab205" }
 uuid = "1.3.0"
 
 # Remove again when the type fetcher is used in the graph

apps/hash-graph/bin/cli/src/subcommand/server.rs

@@ -98,83 +98,83 @@ async fn stop_gap_setup(pool: &PostgresStorePool<NoTls>) -> Result<(), GraphErro
 
     // TODO: how do we make these URIs compliant
     let text = DataType::new(
-        VersionedUri::new(
-            BaseUri::new(
+        VersionedUri {
+            base_uri: BaseUri::new(
                 "https://blockprotocol.org/@blockprotocol/types/data-type/text/".to_owned(),
             )
             .expect("failed to construct base URI"),
-            1,
-        ),
+            version: 1,
+        },
         "Text".to_owned(),
         Some("An ordered sequence of characters".to_owned()),
         "string".to_owned(),
         HashMap::default(),
     );
 
     let number = DataType::new(
-        VersionedUri::new(
-            BaseUri::new(
+        VersionedUri {
+            base_uri: BaseUri::new(
                 "https://blockprotocol.org/@blockprotocol/types/data-type/number/".to_owned(),
             )
             .expect("failed to construct base URI"),
-            1,
-        ),
+            version: 1,
+        },
         "Number".to_owned(),
         Some("An arithmetical value (in the Real number system)".to_owned()),
         "number".to_owned(),
         HashMap::default(),
     );
 
     let boolean = DataType::new(
-        VersionedUri::new(
-            BaseUri::new(
+        VersionedUri {
+            base_uri: BaseUri::new(
                 "https://blockprotocol.org/@blockprotocol/types/data-type/boolean/".to_owned(),
             )
             .expect("failed to construct base URI"),
-            1,
-        ),
+            version: 1,
+        },
         "Boolean".to_owned(),
         Some("A True or False value".to_owned()),
         "boolean".to_owned(),
         HashMap::default(),
     );
 
     let null = DataType::new(
-        VersionedUri::new(
-            BaseUri::new(
+        VersionedUri {
+            base_uri: BaseUri::new(
                 "https://blockprotocol.org/@blockprotocol/types/data-type/null/".to_owned(),
             )
             .expect("failed to construct base URI"),
-            1,
-        ),
+            version: 1,
+        },
         "Null".to_owned(),
         Some("A placeholder value representing 'nothing'".to_owned()),
         "null".to_owned(),
         HashMap::default(),
     );
 
     let object = DataType::new(
-        VersionedUri::new(
-            BaseUri::new(
+        VersionedUri {
+            base_uri: BaseUri::new(
                 "https://blockprotocol.org/@blockprotocol/types/data-type/object/".to_owned(),
             )
             .expect("failed to construct base URI"),
-            1,
-        ),
+            version: 1,
+        },
         "Object".to_owned(),
         Some("A plain JSON object with no pre-defined structure".to_owned()),
         "object".to_owned(),
         HashMap::default(),
     );
 
     let empty_list = DataType::new(
-        VersionedUri::new(
-            BaseUri::new(
+        VersionedUri {
+            base_uri: BaseUri::new(
                 "https://blockprotocol.org/@blockprotocol/types/data-type/empty-list/".to_owned(),
             )
             .expect("failed to construct base URI"),
-            1,
-        ),
+            version: 1,
+        },
         "Empty List".to_owned(),
         Some("An Empty List".to_owned()),
         "array".to_owned(),
@@ -212,7 +212,7 @@ async fn stop_gap_setup(pool: &PostgresStorePool<NoTls>) -> Result<(), GraphErro
 
         let data_type_metadata =
             OntologyElementMetadata::External(ExternalOntologyElementMetadata::new(
-                data_type.id().into(),
+                data_type.id().clone().into(),
                 ProvenanceMetadata::new(UpdatedById::new(root_account_id)),
                 OffsetDateTime::now_utc(),
             ));
@@ -232,13 +232,13 @@ async fn stop_gap_setup(pool: &PostgresStorePool<NoTls>) -> Result<(), GraphErro
         }
     }
     let link_entity_type = EntityType::new(
-        VersionedUri::new(
-            BaseUri::new(
+        VersionedUri {
+            base_uri: BaseUri::new(
                 "https://blockprotocol.org/@blockprotocol/types/entity-type/link/".to_owned(),
             )
             .expect("failed to construct base URI"),
-            1,
-        ),
+            version: 1,
+        },
         "Link".to_owned(),
         Some("A link".to_owned()),
         Object::new(HashMap::default(), Vec::default()).expect("invalid property object"),
@@ -250,7 +250,7 @@ async fn stop_gap_setup(pool: &PostgresStorePool<NoTls>) -> Result<(), GraphErro
 
     let link_entity_type_metadata =
         OntologyElementMetadata::External(ExternalOntologyElementMetadata::new(
-            link_entity_type.id().into(),
+            link_entity_type.id().clone().into(),
             ProvenanceMetadata::new(UpdatedById::new(root_account_id)),
             OffsetDateTime::now_utc(),
         ));

apps/hash-graph/lib/graph/Cargo.toml

@@ -34,7 +34,7 @@ tonic = "0.8.3"
 opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
 opentelemetry-otlp = "0.11.0"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter", "json"] }
-type-system = { git = "https://github.com/blockprotocol/blockprotocol", rev = "646b7d1" }
+type-system = { git = "https://github.com/blockprotocol/blockprotocol", rev = "adab205" }
 uuid = { version = "1.3.0", features = ["v4", "serde"] }
 utoipa = { version = "3.0.1", features = ["uuid"] }
 include_dir = "0.7.3"

apps/hash-graph/lib/graph/src/api/rest.rs

@@ -54,7 +54,7 @@ use crate::{
             UnresolvedTransactionTimeImage, UnresolvedTransactionTimeKernel,
             UnresolvedTransactionTimeProjection,
         },
-        EntityVertexId, GraphElementId, GraphElementVertexId, OntologyTypeVertexId,
+        EntityVertexId, GraphElementVertexId, OntologyTypeVertexId,
     },
     ontology::{
         domain_validator::DomainValidator, ExternalOntologyElementMetadata,
@@ -186,7 +186,6 @@ async fn serve_static_schema(Path(path): Path<String>) -> Result<Response, Statu
             OntologyTypeVersion,
             Selector,
 
-            GraphElementId,
             GraphElementVertexId,
             OntologyVertex,
             KnowledgeGraphVertex,

apps/hash-graph/lib/graph/src/api/rest/data_type.rs

@@ -111,7 +111,7 @@ async fn create_data_type<P: StorePool + Send>(
     })?;
 
     let metadata = OntologyElementMetadata::Owned(OwnedOntologyElementMetadata::new(
-        data_type.id().into(),
+        data_type.id().clone().into(),
         ProvenanceMetadata::new(actor_id),
         owned_by_id,
     ));
@@ -204,16 +204,13 @@ async fn update_data_type<P: StorePool + Send>(
 ) -> Result<Json<OntologyElementMetadata>, StatusCode> {
     let Json(UpdateDataTypeRequest {
         schema,
-        type_to_update,
+        mut type_to_update,
         actor_id,
     }) = body;
 
-    let new_type_id = VersionedUri::new(
-        type_to_update.base_uri().clone(),
-        type_to_update.version() + 1,
-    );
+    type_to_update.version += 1;
 
-    let data_type = patch_id_and_parse(&new_type_id, schema).map_err(|report| {
+    let data_type = patch_id_and_parse(&type_to_update, schema).map_err(|report| {
         tracing::error!(error=?report, "Couldn't patch schema and convert to Data Type");
         StatusCode::UNPROCESSABLE_ENTITY
         // TODO - We should probably return more information to the client

apps/hash-graph/lib/graph/src/api/rest/entity_type.rs

@@ -119,7 +119,7 @@ async fn create_entity_type<P: StorePool + Send>(
     })?;
 
     let metadata = OntologyElementMetadata::Owned(OwnedOntologyElementMetadata::new(
-        entity_type.id().into(),
+        entity_type.id().clone().into(),
         ProvenanceMetadata::new(actor_id),
         owned_by_id,
     ));
@@ -213,16 +213,13 @@ async fn update_entity_type<P: StorePool + Send>(
 ) -> Result<Json<OntologyElementMetadata>, StatusCode> {
     let Json(UpdateEntityTypeRequest {
         schema,
-        type_to_update,
+        mut type_to_update,
         actor_id,
     }) = body;
 
-    let new_type_id = VersionedUri::new(
-        type_to_update.base_uri().clone(),
-        type_to_update.version() + 1,
-    );
+    type_to_update.version += 1;
 
-    let entity_type = patch_id_and_parse(&new_type_id, schema).map_err(|report| {
+    let entity_type = patch_id_and_parse(&type_to_update, schema).map_err(|report| {
         tracing::error!(error=?report, "Couldn't convert schema to Entity Type");
         // Shame there isn't an UNPROCESSABLE_ENTITY_TYPE code :D
         StatusCode::UNPROCESSABLE_ENTITY

apps/hash-graph/lib/graph/src/api/rest/property_type.rs

@@ -116,7 +116,7 @@ async fn create_property_type<P: StorePool + Send>(
     })?;
 
     let metadata = OntologyElementMetadata::Owned(OwnedOntologyElementMetadata::new(
-        property_type.id().into(),
+        property_type.id().clone().into(),
         ProvenanceMetadata::new(actor_id),
         owned_by_id,
     ));
@@ -211,16 +211,13 @@ async fn update_property_type<P: StorePool + Send>(
 ) -> Result<Json<OntologyElementMetadata>, StatusCode> {
     let Json(UpdatePropertyTypeRequest {
         schema,
-        type_to_update,
+        mut type_to_update,
         actor_id,
     }) = body;
 
-    let new_type_id = VersionedUri::new(
-        type_to_update.base_uri().clone(),
-        type_to_update.version() + 1,
-    );
+    type_to_update.version += 1;
 
-    let property_type = patch_id_and_parse(&new_type_id, schema).map_err(|report| {
+    let property_type = patch_id_and_parse(&type_to_update, schema).map_err(|report| {
         tracing::error!(error=?report, "Couldn't patch schema and convert to Property Type");
         StatusCode::UNPROCESSABLE_ENTITY
         // TODO - We should probably return more information to the client