Update to HDT-Node 3.x.x

Author: rubensworks

packages/datasource-hdt/lib/datasources/ExternalHdtDatasource.js

@@ -5,7 +5,6 @@ let Datasource = require('@ldf/core').datasources.Datasource,
     fs = require('fs'),
     path = require('path'),
     N3Parser = require('n3').Parser,
-    RdfString = require('rdf-string'),
     spawn = require('child_process').spawn;
 
 let hdtUtility = path.join(__dirname, '../../node_modules/.bin/hdt');
@@ -51,12 +50,12 @@ class ExternalHdtDatasource extends Datasource {
         ], { stdio: ['ignore', 'pipe', 'ignore'] });
     // Parse the result triples
     hdt.stdout.setEncoding('utf8');
-    let parser = new N3Parser(), tripleCount = 0, estimatedTotalCount = 0, hasExactCount = true, dataFactory = this.dataFactory;
+    let parser = new N3Parser(), tripleCount = 0, estimatedTotalCount = 0, hasExactCount = true;
     parser.parse(hdt.stdout, (error, triple) => {
       if (error)
         destination.emit('error', new Error('Invalid query result: ' + error.message));
       else if (triple)
-        tripleCount++, destination._push(RdfString.stringQuadToQuad(triple, dataFactory));
+        tripleCount++, destination._push(triple);
       else {
         // Ensure the estimated total count is as least as large as the number of triples
         if (tripleCount && estimatedTotalCount < offset + tripleCount)

packages/datasource-hdt/lib/datasources/HdtDatasource.js

@@ -3,8 +3,7 @@
 
 let Datasource = require('@ldf/core').datasources.Datasource,
     hdt = require('hdt'),
-    ExternalHdtDatasource = require('./ExternalHdtDatasource'),
-    RdfString = require('rdf-string');
+    ExternalHdtDatasource = require('./ExternalHdtDatasource');
 
 // Creates a new HdtDatasource
 class HdtDatasource extends Datasource {
@@ -21,7 +20,7 @@ class HdtDatasource extends Datasource {
 
   // Loads the HDT datasource
   async _initialize() {
-    this._hdtDocument = await hdt.fromFile(this._hdtFile);
+    this._hdtDocument = await hdt.fromFile(this._hdtFile, { dataFactory: this.dataFactory });
   }
 
   // Writes the results of the query to the given quad stream
@@ -32,10 +31,7 @@ class HdtDatasource extends Datasource {
       destination.close();
       return;
     }
-    let dataFactory = this.dataFactory;
-    this._hdtDocument.searchTriples(query.subject ? RdfString.termToString(query.subject) : null,
-      query.predicate ? RdfString.termToString(query.predicate) : null,
-      query.object ? RdfString.termToString(query.object) : null,
+    this._hdtDocument.searchTriples(query.subject, query.predicate, query.object,
       { limit: query.limit, offset: query.offset })
       .then((result) => {
         let triples = result.triples,
@@ -48,7 +44,7 @@ class HdtDatasource extends Datasource {
         destination.setProperty('metadata', { totalCount: estimatedTotalCount, hasExactCount: hasExactCount });
         // Add the triples to the output
         for (let i = 0; i < tripleCount; i++)
-          destination._push(RdfString.stringQuadToQuad(triples[i], dataFactory));
+          destination._push(triples[i]);
         destination.close();
       },
       (error) => { destination.emit('error', error); });

packages/datasource-hdt/package.json

@@ -38,6 +38,6 @@
     "@ldf/core": "^3.0.7"
   },
   "optionalDependencies": {
-    "hdt": "^2.2.2"
+    "hdt": "^3.0.1"
   }
 }

yarn.lock

@@ -3187,14 +3187,15 @@ hasha@^5.0.0:
     is-stream "^2.0.0"
     type-fest "^0.8.0"
 
-hdt@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/hdt/-/hdt-2.2.2.tgz#4e570250a42043050a345dc7b84d2838c40fa7ca"
-  integrity sha512-CaGQ6z/ncMgL9BXBAbBcjAxEZhozfQKXFi/1Ov2gz7WwYH3muv1PGsml7r8FdhtErRf45owKkITEfpJ2h8+64w==
+hdt@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/hdt/-/hdt-3.0.1.tgz#2180e7d1942133da083bc1d55ee8aca8e9f6a2c1"
+  integrity sha512-SMHwNMEVwET8r2cPvIJR3TBUByA73kzD15XANjnfZdxnqSZlvj8FIlHftNBuNMDegM/ClrBNZTcY1BRnc0SE3w==
   dependencies:
     minimist "^1.1.0"
-    n3 "^0.11.2"
+    n3 "^1.3.5"
     nan "^2.14.0"
+    rdf-string "^1.3.1"
 
 [email protected]:
   version "1.2.0"
@@ -4488,11 +4489,6 @@ mz@^2.5.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-n3@^0.11.2:
-  version "0.11.3"
-  resolved "https://registry.yarnpkg.com/n3/-/n3-0.11.3.tgz#8e587495240dd21408c2c3aae385ec1651a837f8"
-  integrity sha512-Hk5GSXBeAZrYoqi+NeS/U0H47Hx0Lzj7K6nLWCZpC9E04iUwEwBcrlMb/5foAli7QF4newPNQQQGgM6IAxTxGg==
-
 n3@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/n3/-/n3-0.9.1.tgz#430b547d58dc7381408c45784dd8058171903932"