Fix blank nodes in triple terms not being converted to variables

joachimvh · Jan 29, 2025 · 0840757 · 0840757
1 parent 2fc786f
commit 0840757
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/lib/sparqlAlgebra.ts b/lib/sparqlAlgebra.ts
@@ -920,8 +920,8 @@ function translateBlankNodesToVariables (res: Algebra.Operation) : Algebra.Opera
     return Util.mapOperation(res, {
         [Algebra.types.DELETE_INSERT]: (op: Algebra.DeleteInsert) => {
             // Make sure blank nodes remain in the INSERT block, but do update the WHERE block
-            return { 
-                result: factory.createDeleteInsert(op.delete, op.insert, op.where && translateBlankNodesToVariables(op.where)), 
+            return {
+                result: factory.createDeleteInsert(op.delete, op.insert, op.where && translateBlankNodesToVariables(op.where)),
                 recurse: false,
             };
         },
@@ -967,6 +967,14 @@ function translateBlankNodesToVariables (res: Algebra.Operation) : Algebra.Opera
             }
             return variable;
         }
+        if (term.termType === 'Quad') {
+            return factory.dataFactory.quad(
+              blankToVariable(term.subject),
+              blankToVariable(term.predicate),
+              blankToVariable(term.object),
+              blankToVariable(term.graph),
+            );
+        }
         return term;
   }
 }
diff --git a/test/algebra-blank-to-var/sparqlstar-annotated/sparql-star-annotated-1.json b/test/algebra-blank-to-var/sparqlstar-annotated/sparql-star-annotated-1.json
@@ -142,7 +142,7 @@
           "type": "pattern",
           "termType": "Quad",
           "subject": {
-            "termType": "BlankNode",
+            "termType": "Variable",
             "value": "e_b"
           },
           "predicate": {
@@ -195,4 +195,4 @@
       "value": "s"
     }
   ]
-}
+}
diff --git a/test/algebra-blank-to-var/sparqlstar-annotated/sparql-star-annotated-list-object.json b/test/algebra-blank-to-var/sparqlstar-annotated/sparql-star-annotated-list-object.json
@@ -38,7 +38,7 @@
             "value": "http://example.com/ns#p"
           },
           "object": {
-            "termType": "BlankNode",
+            "termType": "Variable",
             "value": "g_0"
           },
           "graph": {
@@ -115,4 +115,4 @@
       "value": "s"
     }
   ]
-}
+}
diff --git a/test/algebra-blank-to-var/sparqlstar-annotated/sparql-star-annotated-list-subject.json b/test/algebra-blank-to-var/sparqlstar-annotated/sparql-star-annotated-list-subject.json
@@ -30,7 +30,7 @@
           "type": "pattern",
           "termType": "Quad",
           "subject": {
-            "termType": "BlankNode",
+            "termType": "Variable",
             "value": "g_0"
           },
           "predicate": {
@@ -110,4 +110,4 @@
     ]
   },
   "variables": []
-}
+}
diff --git a/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-bnode-01.json b/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-bnode-01.json
@@ -10,7 +10,7 @@
           "type": "pattern",
           "termType": "Quad",
           "subject": {
-            "termType": "BlankNode",
+            "termType": "Variable",
             "value": "e_a"
           },
           "predicate": {
@@ -46,4 +46,4 @@
     ]
   },
   "variables": []
-}
+}
diff --git a/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-bnode-02.json b/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-bnode-02.json
@@ -18,7 +18,7 @@
             "value": "http://example.com/ns#p"
           },
           "object": {
-            "termType": "BlankNode",
+            "termType": "Variable",
             "value": "e_a"
           },
           "graph": {
@@ -46,4 +46,4 @@
     ]
   },
   "variables": []
-}
+}
diff --git a/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-bnode-03.json b/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-bnode-03.json
@@ -10,15 +10,15 @@
           "type": "pattern",
           "termType": "Quad",
           "subject": {
-            "termType": "BlankNode",
+            "termType": "Variable",
             "value": "g_0"
           },
           "predicate": {
             "termType": "NamedNode",
             "value": "http://example.com/ns#p"
           },
           "object": {
-            "termType": "BlankNode",
+            "termType": "Variable",
             "value": "g_1"
           },
           "graph": {
@@ -42,4 +42,4 @@
     ]
   },
   "variables": []
-}
+}
diff --git a/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-compound.json b/test/algebra-blank-to-var/sparqlstar-spec/sparql-star-syntax-compound.json
@@ -97,7 +97,7 @@
               "value": "http://example.com/ns#b"
             },
             "object": {
-              "termType": "BlankNode",
+              "termType": "Variable",
               "value": "g_0"
             },
             "graph": {
@@ -121,7 +121,7 @@
             "type": "pattern",
             "termType": "Quad",
             "subject": {
-              "termType": "BlankNode",
+              "termType": "Variable",
               "value": "g_1"
             },
             "predicate": {
@@ -153,7 +153,7 @@
               "value": "http://example.com/ns#b"
             },
             "object": {
-              "termType": "BlankNode",
+              "termType": "Variable",
               "value": "g_2"
             },
             "graph": {
@@ -183,4 +183,4 @@
       "value": "R"
     }
   ]
-}
+}