Fix blank node prefixes in datasources not being relative to base

Author: rubensworks

Diff for: packages/core/lib/UrlData.js

@@ -11,6 +11,7 @@ class UrlData {
     this.baseURLPath = this.baseURL.substr(this.baseURLRoot.length);
     this.blankNodePath = this.baseURLRoot ? '/.well-known/genid/' : '';
     this.blankNodePrefix = this.blankNodePath ? this.baseURLRoot + this.blankNodePath : 'genid:';
+    this.blankNodePrefixLength = this.blankNodePrefix.length;
     this.assetsPath = this.baseURLPath + 'assets/' || options.assetsPath;
     this.protocol = options.protocol;
     if (!this.protocol) {

Diff for: packages/core/lib/datasources/Datasource.js

@@ -14,10 +14,9 @@ class Datasource extends EventEmitter {
 
     // Set the options
     options = options || {};
-    let urlData = options.urlData || new UrlData();
+    this.urlData = options.urlData || new UrlData();
     let path = (options.path || '').replace(/^\//, '');
-    this._datasourcePath = urlData.baseURLPath + encodeURI(path);
-    this._blankNodePrefix = urlData.blankNodePath || 'genid:';
+    this._datasourcePath = this.urlData.baseURLPath + encodeURI(path);
     this._skolemizeBlacklist = options.skolemizeBlacklist || {};
     this.title = options.title;
     this.id = options.id;
@@ -27,14 +26,12 @@ class Datasource extends EventEmitter {
       this.hide = true;
     this.description = options.description;
     this.path = this._datasourcePath;
-    this.url = urlData.baseURLRoot + this._datasourcePath + '#dataset';
+    this.url = this.urlData.baseURLRoot + this._datasourcePath + '#dataset';
     this.license = options.license;
     this.licenseUrl = options.licenseUrl;
     this.copyright = options.copyright;
     this.homepage = options.homepage;
     this._request = options.request || require('request');
-    this._blankNodePrefix = options.blankNodePrefix || this._blankNodePrefix;
-    this._blankNodePrefixLength = this._blankNodePrefix.length;
     this.dataFactory = options.dataFactory;
     if (options.graph) {
       this._graph = this.dataFactory.namedNode(options.graph);
@@ -121,12 +118,12 @@ class Datasource extends EventEmitter {
     query = { ...query };
 
     // Translate blank nodes IRIs in the query to blank nodes
-    let blankNodePrefix = this._blankNodePrefix, blankNodePrefixLength = this._blankNodePrefixLength;
-    if (query.subject && query.subject.value.indexOf(blankNodePrefix) === 0)
+    let blankNodePrefix = this.urlData.blankNodePrefix, blankNodePrefixLength = this.urlData.blankNodePrefixLength;
+    if (query.subject && query.subject.termType === 'NamedNode' && query.subject.value.indexOf(blankNodePrefix) === 0)
       query.subject = this.dataFactory.blankNode(query.subject.value.substr(blankNodePrefixLength));
-    if (query.object  && query.object.value.indexOf(blankNodePrefix) === 0)
+    if (query.object && query.object.termType === 'NamedNode'  && query.object.value.indexOf(blankNodePrefix) === 0)
       query.object  = this.dataFactory.blankNode(query.object.value.substr(blankNodePrefixLength));
-    if (query.graph   && query.graph.value.indexOf(blankNodePrefix) === 0)
+    if (query.graph && query.graph.termType === 'NamedNode'   && query.graph.value.indexOf(blankNodePrefix) === 0)
       query.graph   = this.dataFactory.blankNode(query.graph.value.substr(blankNodePrefixLength));
 
     // Force the default graph if QPF support is disable

Diff for: packages/datasource-hdt/test/datasources/HdtDatasource-test.js

@@ -2,6 +2,7 @@
 let HdtDatasource = require('../../').datasources.HdtDatasource;
 
 let Datasource = require('@ldf/core').datasources.Datasource,
+    UrlData = require('@ldf/core').UrlData,
     path = require('path'),
     dataFactory = require('n3').DataFactory,
     RdfString = require('rdf-string');
@@ -149,7 +150,7 @@ describe('HdtDatasource', () => {
       datasource = new HdtDatasource({
         dataFactory,
         file: exampleHdtFileWithBlanks,
-        blankNodePrefix: 'http://example.org/.well-known/genid/',
+        urlData: new UrlData({ baseURL: 'http://example.org/' }),
       });
       datasource.initialize();
       datasource.on('initialized', done);