Remove const in arrays

hashintel · Sep 27, 2024 · c5bfb3b · c5bfb3b
1 parent 775284c
commit c5bfb3b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 41 deletions.
diff --git a/libs/@blockprotocol/type-system/rust/src/schema/data_type/constraint/array.rs b/libs/@blockprotocol/type-system/rust/src/schema/data_type/constraint/array.rs
@@ -95,9 +95,6 @@ mod wasm {
 pub enum ArraySchema {
     Constrained(ArrayConstraints),
     Tuple(TupleConstraints),
-    // TODO: Remove
-    //   see https://linear.app/hash/issue/H-3368/remove-const-from-array-constraints
-    Const { r#const: [JsonValue; 0] },
 }
 
 impl ArraySchema {
@@ -116,14 +113,6 @@ impl ArraySchema {
             Self::Tuple(constraints) => constraints
                 .validate_value(array)
                 .change_context(ConstraintError::ValueConstraint)?,
-            Self::Const { r#const } => {
-                if array != *r#const {
-                    bail!(ConstraintError::InvalidConstValue {
-                        actual: JsonValue::Array(array.to_vec()),
-                        expected: JsonValue::Array(r#const.to_vec()),
-                    });
-                }
-            }
         }
         Ok(())
     }

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
@@ -107,7 +107,6 @@ mod raw {
     use std::collections::HashSet;
 
     use serde::{Deserialize, Serialize};
-    use serde_json::Value as JsonValue;
 
     use super::{DataTypeSchemaTag, DataTypeTag};
     use crate::{
@@ -216,12 +215,6 @@ mod raw {
             #[serde(flatten)]
             constraints: TupleConstraints,
         },
-        ArrayConst {
-            r#type: ArrayTypeTag,
-            #[serde(flatten)]
-            common: ValueSchemaMetadata,
-            r#const: [JsonValue; 0],
-        },
         AnyOf {
             #[serde(flatten)]
             common: ValueSchemaMetadata,
@@ -352,16 +345,6 @@ mod raw {
                         constraints,
                     ))),
                 ),
-                DataType::ArrayConst {
-                    r#type: _,
-                    common,
-                    r#const,
-                } => (
-                    common,
-                    ValueConstraints::Typed(SingleValueConstraints::Array(ArraySchema::Const {
-                        r#const,
-                    })),
-                ),
                 DataType::AnyOf {
                     common,
                     constraints: any_of,

diff --git a/libs/@hashintel/type-editor/src/shared/data-types-options-context.tsx b/libs/@hashintel/type-editor/src/shared/data-types-options-context.tsx
@@ -180,19 +180,13 @@ export const DataTypesOptionsContext =
 const isArrayConstraints = (
   schema: ArraySchema,
 ): schema is ArrayConstraints => {
-  // TODO: Remove `"items" in schema` check when `const` is not allowed on arrays
-  //   see https://linear.app/hash/issue/H-3368/remove-const-from-array-constraints
-  return (
-    "items" in schema && schema.items !== undefined && schema.items !== false
-  );
+  return schema.items !== undefined && schema.items !== false;
 };
 
 const isTupleConstraints = (
   schema: ArraySchema,
 ): schema is TupleConstraints => {
-  // TODO: Remove `"items" in schema` check when `const` is not allowed on arrays
-  //   see https://linear.app/hash/issue/H-3368/remove-const-from-array-constraints
-  return "items" in schema && schema.items === false;
+  schema.items === false;
 };
 
 const isArrayItemsSchema = (
@@ -213,11 +207,6 @@ const getArrayDataTypeDisplay = (
     }
 
     items = dataType.prefixItems;
-
-    // TODO: Remove when `const` is not allowed on arrays
-    //   see https://linear.app/hash/issue/H-3368/remove-const-from-array-constraints
-  } else if (!isArrayConstraints(dataType)) {
-    return expectedValuesDisplayMap.emptyList;
   } else if (!dataType.items) {
     return expectedValuesDisplayMap.mixedArray;
   } else {