Frontend refactor

crates/database/src/serializers.rs

@@ -184,6 +184,11 @@ pub struct SerializationDataBuffer {
     /// Used in cases where multiple elements should refer to a particular instance.
     /// E.g. multiple properties referring to the same instance of owl:Thing.
     global_element_mappings: HashMap<ElementType, usize>,
+    /// Canonical synthesized Thing node per resolved domain.
+    ///
+    /// This lets structurally-defined ranges like complement/union expressions
+    /// collapse to the same Thing node that direct owl:Thing ranges use.
+    anchor_thing_map: HashMap<Term, Term>,
 
     /// Stores the edges of a property.
     ///
@@ -237,6 +242,7 @@ impl SerializationDataBuffer {
             edge_redirection: HashMap::new(),
             edges_include_map: HashMap::new(),
             global_element_mappings: HashMap::new(),
+            anchor_thing_map: HashMap::new(),
             label_buffer: HashMap::new(),
             edge_label_buffer: HashMap::new(),
             edge_buffer: HashSet::new(),

crates/sparql_queries/src/assembly.rs

@@ -27,7 +27,7 @@ impl QueryAssembler {
         format!(
             r#"
             {}
-            SELECT ?id ?nodeType ?target ?label
+            SELECT DISTINCT ?id ?nodeType ?target ?label
             WHERE {{
                 {}
                 BIND(

crates/sparql_queries/src/snippets/general.rs

@@ -6,10 +6,7 @@ pub const COLLECTIONS: &str = r#"{
             ?intermediate rdf:first ?firstItem .
             ?intermediate rdf:rest*/rdf:first ?target .
             FILTER(?nodeType IN (
-                owl:intersectionOf, 
-                owl:unionOf, 
-                owl:oneOf,
-                owl:disjointUnionOf
+                owl:oneOf
             ))
 
             # 6. Safety: Remove nil to avoid phantom edges

crates/sparql_queries/src/snippets/owl.rs

@@ -44,13 +44,13 @@ impl SparqlSnippet for OwlNode {
             }
             OwlNode::DisjointUnion => {
                 r#"{
-                ?id owl:disjointUnionOf ?target .
+                ?id owl:disjointUnionOf/rdf:rest*/rdf:first ?target .
                 BIND(owl:disjointUnionOf AS ?nodeType)
                 }"#
             }
             OwlNode::IntersectionOf => {
                 r#"{
-                ?id owl:intersectionOf ?target .
+                ?id owl:intersectionOf/rdf:rest*/rdf:first ?target .
                 BIND(owl:intersectionOf AS ?nodeType)
                 }"#
             }
@@ -62,7 +62,8 @@ impl SparqlSnippet for OwlNode {
             }
             OwlNode::UnionOf => {
                 r#"{
-                ?id owl:unionOf ?list .
+                ?id owl:unionOf/rdf:rest*/rdf:first ?target .
+                FILTER(?target != rdf:nil)
                 BIND(owl:unionOf AS ?nodeType)
                 }"#
             }

crates/sparql_queries/src/snippets/rdfs.rs

@@ -9,6 +9,7 @@ impl SparqlSnippet for RdfsNode {
                 r#"{
                 ?id a rdfs:Class .
                 FILTER(?id != owl:Class)
+                FILTER NOT EXISTS { ?id a owl:Class }
                 BIND(rdfs:Class AS ?nodeType)
                 }"#
             }

src/errors.rs

@@ -0,0 +1 @@
+