H-3755: Improve validation structure for entity properties (#5850)

hashintel · Dec 11, 2024 · fed76f3 · fed76f3
1 parent b0bbac4
commit fed76f3
Show file tree

Hide file tree

Showing 21 changed files with 1,911 additions and 645 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libs/@blockprotocol/type-system/rust/src/schema/data_type/mod.rs b/libs/@blockprotocol/type-system/rust/src/schema/data_type/mod.rs
@@ -34,6 +34,7 @@ use crate::{schema::data_type::constraint::ValueConstraints, url::VersionedUrl};
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 #[cfg_attr(target_arch = "wasm32", derive(tsify::Tsify))]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
 #[serde(rename_all = "kebab-case")]
 pub enum JsonSchemaValueType {
     Null,

diff --git a/libs/@blockprotocol/type-system/rust/src/schema/mod.rs b/libs/@blockprotocol/type-system/rust/src/schema/mod.rs
@@ -51,6 +51,6 @@ pub use self::{
     one_of::{OneOfSchema, OneOfSchemaValidationError, OneOfSchemaValidator},
     property_type::{
         PropertyType, PropertyTypeReference, PropertyTypeValidationError, PropertyTypeValidator,
-        PropertyValueSchema, PropertyValues,
+        PropertyValueSchema, PropertyValueType, PropertyValues,
     },
 };
diff --git a/libs/@blockprotocol/type-system/rust/src/schema/property_type/mod.rs b/libs/@blockprotocol/type-system/rust/src/schema/property_type/mod.rs
@@ -68,6 +68,15 @@ pub enum PropertyValues {
     ArrayOfPropertyValues(PropertyValueArray<OneOfSchema<PropertyValues>>),
 }
 
+#[derive(Debug, serde::Serialize)]
+#[cfg_attr(feature = "utoipa", derive(utoipa::ToSchema))]
+#[serde(rename_all = "kebab-case")]
+pub enum PropertyValueType {
+    Value,
+    Array,
+    Object,
+}
+
 impl PropertyValues {
     #[must_use]
     fn data_type_references(&self) -> Vec<&DataTypeReference> {
@@ -103,6 +112,15 @@ impl PropertyValues {
                 .collect(),
         }
     }
+
+    #[must_use]
+    pub const fn property_value_type(&self) -> PropertyValueType {
+        match self {
+            Self::DataTypeReference(_) => PropertyValueType::Value,
+            Self::PropertyTypeObject(_) => PropertyValueType::Object,
+            Self::ArrayOfPropertyValues(_) => PropertyValueType::Array,
+        }
+    }
 }
 
 pub trait PropertyValueSchema {