rdflib 2.2.25 → 2.2.26-0aa57642

package/src/fetcher.ts

@@ -1551,13 +1551,13 @@ export default class Fetcher implements CallbackifyInterface {
     const fetcher = this
     // @ts-ignore
     if (fetcher.fetchQueue && fetcher.fetchQueue[uri]) {
-      console.log('Internal error - fetchQueue exists ' + uri)
+      // console.log('Internal error - fetchQueue exists ' + uri)
       var promise = fetcher.fetchQueue[uri]
       if (promise['PromiseStatus'] === 'resolved') {
         delete fetcher.fetchQueue[uri]
       } else { // pending
         delete fetcher.fetchQueue[uri]
-        console.log('*** Fetcher: pending fetchQueue deleted ' + uri)
+        // console.log('*** Fetcher: pending fetchQueue deleted ' + uri)
       }
     } if (fetcher.requested[uri] && fetcher.requested[uri] !== 'done' &&
      fetcher.requested[uri] !== 'failed' && fetcher.requested[uri] !== 404) {

package/src/jsonldparser.js

@@ -1,5 +1,3 @@
-import jsonld from 'jsonld'
-
 import { arrayToStatements } from './utils'
 
 /**
@@ -70,8 +68,8 @@ export default function jsonldParser (str, kb, base, callback) {
     ? base.value
     : base
 
-  return jsonld
-    .flatten(JSON.parse(str), null, { base: baseString })
+  return import('jsonld')
+    .then(jsonld => { return jsonld.flatten(JSON.parse(str), null, { base: baseString }) })
     .then((flattened) => flattened.reduce((store, flatResource) => {
 
       kb = processResource(kb, base, flatResource)

package/src/serialize.ts

@@ -80,7 +80,7 @@ export default function serialize (
         documentString = sz.statementsToNTriples(newSts)
         return executeCallback(null, documentString)
       case JSONLDContentType:
-        sz.setFlags('si') // use turtle parameters
+        sz.setFlags('si dr') // turtle + dr (means no default, no relative prefix)
         documentString = sz.statementsToJsonld(newSts) // convert via turtle
         return executeCallback(null, documentString)
       case NQuadsContentType:

package/src/serializer.js

@@ -12,7 +12,6 @@ import * as Util from './utils-js'
 import CanonicalDataFactory from './factories/canonical-data-factory'
 import { createXSD } from './xsd'
 import solidNs from 'solid-namespace'
-// import * as jsonld from 'jsonld'
 import * as ttl2jsonld from '@frogcat/ttl2jsonld'
 
 
@@ -502,7 +501,7 @@ export class Serializer {
 
     function prefixDirectivesMethod () {
       var str = ''
-      if (this.defaultNamespace) {
+      if (this.flags.indexOf('d') < 0 && this.defaultNamespace) {
         str += '@prefix : ' + this.explicitURI(this.defaultNamespace) + '.\n'
       }
       for (var ns in this.prefixes) {
@@ -1016,8 +1015,8 @@ export class Serializer {
 
   statementsToJsonld (sts) {
     // ttl2jsonld creates context keys for all ttl prefix
-    // context keys must be full IRI
-    function findId (itemObj) {
+    // context keys must be absolute IRI ttl2jsonld@0.0.8
+    /* function findId (itemObj) {
       if (itemObj['@id']) {
         const item = itemObj['@id'].split(':')
         if (keys[item[0]]) itemObj['@id'] = jsonldObj['@context'][item[0]] + item[1]
@@ -1028,10 +1027,9 @@ export class Serializer {
           findId(itemValues[i])
         }
       }
-    }
+    } */
     const turtleDoc = this.statementsToN3(sts)
     const jsonldObj = ttl2jsonld.parse(turtleDoc)
-
     return JSON.stringify(jsonldObj, null, 2)
   }
 

package/esm/convert.js

@@ -1,60 +0,0 @@
-import asyncLib from 'async'; // @@ Goal: remove this dependency
-import jsonld from 'jsonld';
-import { Parser, Writer } from 'n3'; // @@ Goal: remove this dependency
-
-export function convertToJson(n3String, jsonCallback) {
-  var jsonString;
-  var n3Parser = new Parser();
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  });
-  asyncLib.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, quad, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    try {
-      jsonld.fromRDF(result, {
-        format: 'application/nquads'
-      }).then(function (result) {
-        callback(null, result);
-      });
-    } catch (err) {
-      callback(err);
-    }
-  }, function (json, callback) {
-    jsonString = JSON.stringify(json);
-    jsonCallback(null, jsonString);
-  }], function (err, result) {
-    jsonCallback(err, jsonString);
-  });
-}
-export function convertToNQuads(n3String, nquadCallback) {
-  var nquadString;
-  var n3Parser = new Parser();
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  });
-  asyncLib.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, triple, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    nquadString = result;
-    nquadCallback(null, nquadString);
-  }], function (err, result) {
-    nquadCallback(err, nquadString);
-  });
-}

package/lib/convert.d.ts

@@ -1,2 +0,0 @@
-export function convertToJson(n3String: any, jsonCallback: any): void;
-export function convertToNQuads(n3String: any, nquadCallback: any): void;

package/lib/convert.js

@@ -1,71 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.convertToJson = convertToJson;
-exports.convertToNQuads = convertToNQuads;
-var _async = _interopRequireDefault(require("async"));
-var _jsonld = _interopRequireDefault(require("jsonld"));
-var _n = require("n3");
-// @@ Goal: remove this dependency
-
-// @@ Goal: remove this dependency
-
-function convertToJson(n3String, jsonCallback) {
-  var jsonString;
-  var n3Parser = new _n.Parser();
-  var n3Writer = new _n.Writer({
-    format: 'N-Quads'
-  });
-  _async.default.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, quad, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    try {
-      _jsonld.default.fromRDF(result, {
-        format: 'application/nquads'
-      }).then(function (result) {
-        callback(null, result);
-      });
-    } catch (err) {
-      callback(err);
-    }
-  }, function (json, callback) {
-    jsonString = JSON.stringify(json);
-    jsonCallback(null, jsonString);
-  }], function (err, result) {
-    jsonCallback(err, jsonString);
-  });
-}
-function convertToNQuads(n3String, nquadCallback) {
-  var nquadString;
-  var n3Parser = new _n.Parser();
-  var n3Writer = new _n.Writer({
-    format: 'N-Quads'
-  });
-  _async.default.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, triple, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    nquadString = result;
-    nquadCallback(null, nquadString);
-  }], function (err, result) {
-    nquadCallback(err, nquadString);
-  });
-}