fix bugs

lucasavila00 · Dec 14, 2024 · 92189f7 · 92189f7
1 parent a399d7d
commit 92189f7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/packages/beff-core/src/diag.rs b/packages/beff-core/src/diag.rs
@@ -7,6 +7,7 @@ use crate::{BffFileName, ParsedModule};
 
 #[derive(Debug, Clone)]
 pub enum DiagnosticInfoMessage {
+    ObjectHasConflictingKeyValueInIntersection,
     CannotResolveNamedImport,
     EnumMemberNotFound,
     TplLitTypeUnsupported,
@@ -461,6 +462,9 @@ impl DiagnosticInfoMessage {
             DiagnosticInfoMessage::CannotResolveNamedImport => {
                 "Cannot resolve named import".to_string()
             }
+            DiagnosticInfoMessage::ObjectHasConflictingKeyValueInIntersection => {
+                "Object has conflicting key value in intersection".to_string()
+            }
         }
     }
 }

diff --git a/packages/beff-core/src/type_to_schema.rs b/packages/beff-core/src/type_to_schema.rs
@@ -290,14 +290,26 @@ impl<'a, 'b, R: FileManager> TypeToSchema<'a, 'b, R> {
                 let map = self.components.get(r).and_then(|it| it.as_ref()).cloned();
                 match map {
                     Some(Validator { schema, .. }) => self.extract_object(&schema, span),
-                    _ => self.error(span, DiagnosticInfoMessage::ShouldHaveObjectAsTypeArgument),
+                    None => self.error(span, DiagnosticInfoMessage::ShouldHaveObjectAsTypeArgument),
                 }
             }
             JsonSchema::AllOf(vs) => {
                 let mut acc = BTreeMap::new();
 
                 for v in vs {
                     let extracted = self.extract_object(v, span)?;
+
+                    // check that if items have the same key, they have the same value
+
+                    for (k, v) in &extracted {
+                        if let Some(existing) = acc.get(k) {
+                            if existing != v {
+                                return self
+                                    .error(span, DiagnosticInfoMessage::ObjectHasConflictingKeyValueInIntersection);
+                            }
+                        }
+                    }
+
                     acc.extend(extracted);
                 }