bug fix LDflex/LDflex-Comunica#22

jeswr · Nov 20, 2020 · cdb7f52 · cdb7f52
1 parent 409cb62
commit cdb7f52
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/packages/actor-init-sparql/.gitignore b/packages/actor-init-sparql/.gitignore
@@ -5,3 +5,4 @@ index-browser.js
 index-browser.js.map
 *.sparql
 dist
+test/system/assets/
diff --git a/packages/actor-init-sparql/test/ActorInitSparql-test.ts b/packages/actor-init-sparql/test/ActorInitSparql-test.ts
@@ -622,6 +622,13 @@ describe('ActorInitSparql', () => {
       });
     });
 
+    it('should correctly convert skolemized blank nodes in SPARQL queries', () => {
+      return expect(actor.query(`
+      SELECT ?label WHERE {
+        <urn:comunica_skolem:source_0:nodeID://b12796> <http://www.w3.org/2000/01/rdf-schema#label> ?label.
+      }`)).resolves.toBeTruthy();
+    });
+
     it('bindings() should collect all bindings until "end" event occurs on triples', async() => {
       const ctx = { sources: []};
       const result = await actor.query('SELECT * WHERE { ?s ?p ?o }', ctx);

diff --git a/packages/actor-rdf-resolve-quad-pattern-federated/lib/FederatedQuadSource.ts b/packages/actor-rdf-resolve-quad-pattern-federated/lib/FederatedQuadSource.ts
@@ -85,9 +85,10 @@ export class FederatedQuadSource implements IQuadSource {
    * @return If the given term was a blank node, this will return a skolemized named node, otherwise the original term.
    */
   public static skolemizeTerm(term: RDF.Term, sourceId: string): RDF.Term | BlankNodeScoped {
+    const value = /[\da-z]+$/ui.exec(term.value)?.[0];
     if (term.termType === 'BlankNode') {
-      return new BlankNodeScoped(`bc_${sourceId}_${term.value}`,
-        DF.namedNode(`${FederatedQuadSource.SKOLEM_PREFIX}${sourceId}:${term.value}`));
+      return new BlankNodeScoped(`bc_${sourceId}_${value}`,
+        DF.namedNode(`${FederatedQuadSource.SKOLEM_PREFIX}${sourceId}:${value}`));
     }
     return term;
   }

diff --git a/packages/actor-rdf-resolve-quad-pattern-federated/test/FederatedQuadSource-test.ts b/packages/actor-rdf-resolve-quad-pattern-federated/test/FederatedQuadSource-test.ts
@@ -118,6 +118,13 @@ describe('FederatedQuadSource', () => {
       expect((<BlankNodeScoped> FederatedQuadSource.skolemizeTerm(DF.blankNode('abc'), '0')).skolemized)
         .toEqualRdfTerm(DF.namedNode('urn:comunica_skolem:source_0:abc'));
     });
+
+    it('should change a blank node of form nodeID://b12796', () => {
+      expect(FederatedQuadSource.skolemizeTerm(DF.blankNode('nodeID://b12796'), '0'))
+        .toEqualRdfTerm(DF.blankNode('urn:comunica_skolem:source_0:b12796'));
+      expect((<BlankNodeScoped> FederatedQuadSource.skolemizeTerm(DF.blankNode('nodeID://b12796'), '0')).skolemized)
+        .toEqualRdfTerm(DF.namedNode('urn:comunica_skolem:source_0:b12796'));
+    });
   });
 
   describe('#skolemizeQuad', () => {