rdflib 2.2.22-1e22b5ce → 2.2.22-2f49e8ef

package/esm/convert.js

@@ -0,0 +1,60 @@
+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(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/esm/index.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import BlankNode from './blank-node';
 import Collection from './collection';
+import * as convert from './convert';
 import Empty from './empty';
 import Fetcher from './fetcher';
 import Formula from './formula';
@@ -56,7 +57,7 @@ const term = Node.fromValue;
 // it exports the _current_ value of nextId, which is always 0
 const NextId = BlankNode.nextId;
 export * from './utils/terms';
-export { BlankNode, Collection, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula,
+export { BlankNode, Collection, convert, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula,
 // Alias
 
 NextId, fromNT, fetcher, graph, lit, st, namedNode as sym,

package/esm/jsonldparser.js

@@ -18,7 +18,7 @@ export function jsonldObjectToTerm(kb, obj) {
     return listToStatements(kb, obj);
   }
   if (Object.prototype.hasOwnProperty.call(obj, '@id')) {
-    return nodeType(kb, obj);
+    return kb.rdfFactory.namedNode(obj['@id']);
   }
   if (Object.prototype.hasOwnProperty.call(obj, '@language')) {
     return kb.rdfFactory.literal(obj['@value'], obj['@language']);
@@ -36,7 +36,7 @@ export function jsonldObjectToTerm(kb, obj) {
  * Adds the statements in a json-ld list object to {kb}.
  */
 function listToStatements(kb, obj) {
-  const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode();
+  const listId = obj['@id'] ? kb.rdfFactory.namedNode(obj['@id']) : kb.rdfFactory.blankNode();
   const items = obj['@list'].map(listItem => jsonldObjectToTerm(kb, listItem));
   const statements = arrayToStatements(kb.rdfFactory, listId, items);
   kb.addAll(statements);
@@ -63,17 +63,8 @@ export default function jsonldParser(str, kb, base, callback) {
     return kb;
   }, kb)).then(callback).catch(callback);
 }
-function nodeType(kb, obj) {
-  if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node.. pass the id without the preceding _:
-    return kb.rdfFactory.blankNode(obj['@id'].substring(2));
-  } else {
-    // This object is a Named Node
-    return kb.rdfFactory.namedNode(obj['@id']);
-  }
-}
 function processResource(kb, base, flatResource) {
-  const id = flatResource['@id'] ? nodeType(kb, flatResource) : kb.rdfFactory.blankNode();
+  const id = flatResource['@id'] ? kb.rdfFactory.namedNode(flatResource['@id']) : kb.rdfFactory.blankNode();
   for (const property of Object.keys(flatResource)) {
     if (property === '@id') {
       continue;

package/esm/serialize.js

@@ -1,7 +1,6 @@
+import * as convert from './convert';
 import Serializer from './serializer';
 import { JSONLDContentType, N3ContentType, N3LegacyContentType, NQuadsAltContentType, NQuadsContentType, NTriplesContentType, RDFXMLContentType, TurtleContentType, TurtleLegacyContentType } from './types';
-import * as jsonld from 'jsonld';
-
 /**
  * Serialize to the appropriate format
  */
@@ -54,13 +53,17 @@ contentType, callback, options) {
         sz.setFlags('deinprstux'); // Use adapters to connect to incmpatible parser
         n3String = sz.statementsToNTriples(newSts);
         // n3String = sz.statementsToN3(newSts)
-        return toJsonld(n3String);
+        convert.convertToJson(n3String, callback);
+        break;
       case NQuadsContentType:
       case NQuadsAltContentType:
         // @@@ just outpout the quads? Does not work for collections
         sz.setFlags('deinprstux q'); // Suppress nice parts of N3 to make ntriples
         documentString = sz.statementsToNTriples(newSts); // q in flag means actually quads
         return executeCallback(null, documentString);
+      // n3String = sz.statementsToN3(newSts)
+      // documentString = convert.convertToNQuads(n3String, callback)
+      // break
       default:
         throw new Error('Serialize: Content-type ' + contentType + ' not supported for data write.');
     }
@@ -80,16 +83,4 @@ contentType, callback, options) {
       return result;
     }
   }
-  function toJsonld(item) {
-    try {
-      return jsonld.fromRDF(item, {
-        format: 'application/n-quads'
-      }).then(docJsonld => {
-        return JSON.stringify(docJsonld);
-      });
-      // return JSON.stringify(await jsonld.fromRDF(item, {format: 'application/n-quads'}))
-    } catch (e) {
-      throw e;
-    }
-  }
 }

package/lib/convert.d.ts

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

package/lib/convert.js

@@ -0,0 +1,71 @@
+"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(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);
+  });
+}

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import BlankNode from './blank-node';
 import Collection from './collection';
+import * as convert from './convert';
 import Empty from './empty';
 import Fetcher from './fetcher';
 import Formula from './formula';
@@ -34,7 +35,7 @@ declare const term: <T extends import("./types").FromValueReturns<any>>(value: i
 declare const NextId: number;
 export * from './utils/terms';
 export type { AutoInitOptions, ExtendedResponse, FetchError } from './fetcher';
-export { BlankNode, Collection, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula, // Alias
+export { BlankNode, Collection, convert, DataFactory, Empty, Fetcher, Formula, Store, jsonParser, Literal, log, N3Parser, NamedNode, Namespace, Node, parse, Query, queryToSPARQL, RDFaProcessor, RDFParser, serialize, Serializer, SPARQLToQuery, sparqlUpdateParser, Statement, term, UpdateManager, UpdatesSocket, UpdatesVia, uri, Util, Variable, Store as IndexedFormula, // Alias
 NextId, fromNT, fetcher, graph, lit, st, namedNode as sym, blankNode, defaultGraph, literal, namedNode, quad, triple, variable, };
 export { termValue } from './utils/termValue';
 export declare class ConnectedStore extends Store {

package/lib/index.js

@@ -24,6 +24,7 @@ var _exportNames = {
   LiveStore: true,
   BlankNode: true,
   Collection: true,
+  convert: true,
   Empty: true,
   Fetcher: true,
   Formula: true,
@@ -197,7 +198,7 @@ Object.defineProperty(exports, "Variable", {
     return _variable.default;
   }
 });
-exports.graph = exports.fromNT = exports.fetcher = exports.defaultGraph = exports.blankNode = void 0;
+exports.graph = exports.fromNT = exports.fetcher = exports.defaultGraph = exports.convert = exports.blankNode = void 0;
 Object.defineProperty(exports, "jsonParser", {
   enumerable: true,
   get: function () {
@@ -248,6 +249,8 @@ exports.variable = exports.uri = exports.triple = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _blankNode = _interopRequireDefault(require("./blank-node"));
 var _collection = _interopRequireDefault(require("./collection"));
+var convert = _interopRequireWildcard(require("./convert"));
+exports.convert = convert;
 var _empty = _interopRequireDefault(require("./empty"));
 var _fetcher = _interopRequireDefault(require("./fetcher"));
 var _formula = _interopRequireDefault(require("./formula"));

package/lib/jsonldparser.js

@@ -25,7 +25,7 @@ function jsonldObjectToTerm(kb, obj) {
     return listToStatements(kb, obj);
   }
   if (Object.prototype.hasOwnProperty.call(obj, '@id')) {
-    return nodeType(kb, obj);
+    return kb.rdfFactory.namedNode(obj['@id']);
   }
   if (Object.prototype.hasOwnProperty.call(obj, '@language')) {
     return kb.rdfFactory.literal(obj['@value'], obj['@language']);
@@ -43,7 +43,7 @@ function jsonldObjectToTerm(kb, obj) {
  * Adds the statements in a json-ld list object to {kb}.
  */
 function listToStatements(kb, obj) {
-  const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode();
+  const listId = obj['@id'] ? kb.rdfFactory.namedNode(obj['@id']) : kb.rdfFactory.blankNode();
   const items = obj['@list'].map(listItem => jsonldObjectToTerm(kb, listItem));
   const statements = (0, _utils.arrayToStatements)(kb.rdfFactory, listId, items);
   kb.addAll(statements);
@@ -70,17 +70,8 @@ function jsonldParser(str, kb, base, callback) {
     return kb;
   }, kb)).then(callback).catch(callback);
 }
-function nodeType(kb, obj) {
-  if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node.. pass the id without the preceding _:
-    return kb.rdfFactory.blankNode(obj['@id'].substring(2));
-  } else {
-    // This object is a Named Node
-    return kb.rdfFactory.namedNode(obj['@id']);
-  }
-}
 function processResource(kb, base, flatResource) {
-  const id = flatResource['@id'] ? nodeType(kb, flatResource) : kb.rdfFactory.blankNode();
+  const id = flatResource['@id'] ? kb.rdfFactory.namedNode(flatResource['@id']) : kb.rdfFactory.blankNode();
   for (const property of Object.keys(flatResource)) {
     if (property === '@id') {
       continue;

package/lib/serialize.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = serialize;
+var convert = _interopRequireWildcard(require("./convert"));
 var _serializer = _interopRequireDefault(require("./serializer"));
 var _types = require("./types");
-var jsonld = _interopRequireWildcard(require("jsonld"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
@@ -62,13 +62,17 @@ contentType, callback, options) {
         sz.setFlags('deinprstux'); // Use adapters to connect to incmpatible parser
         n3String = sz.statementsToNTriples(newSts);
         // n3String = sz.statementsToN3(newSts)
-        return toJsonld(n3String);
+        convert.convertToJson(n3String, callback);
+        break;
       case _types.NQuadsContentType:
       case _types.NQuadsAltContentType:
         // @@@ just outpout the quads? Does not work for collections
         sz.setFlags('deinprstux q'); // Suppress nice parts of N3 to make ntriples
         documentString = sz.statementsToNTriples(newSts); // q in flag means actually quads
         return executeCallback(null, documentString);
+      // n3String = sz.statementsToN3(newSts)
+      // documentString = convert.convertToNQuads(n3String, callback)
+      // break
       default:
         throw new Error('Serialize: Content-type ' + contentType + ' not supported for data write.');
     }
@@ -88,16 +92,4 @@ contentType, callback, options) {
       return result;
     }
   }
-  function toJsonld(item) {
-    try {
-      return jsonld.fromRDF(item, {
-        format: 'application/n-quads'
-      }).then(docJsonld => {
-        return JSON.stringify(docJsonld);
-      });
-      // return JSON.stringify(await jsonld.fromRDF(item, {format: 'application/n-quads'}))
-    } catch (e) {
-      throw e;
-    }
-  }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.2.22-1e22b5ce",
+  "version": "2.2.22-2f49e8ef",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -46,6 +46,7 @@
   "dependencies": {
     "@babel/runtime": "^7.20.1",
     "@xmldom/xmldom": "^0.8.6",
+    "async": "^3.2.4",
     "cross-fetch": "^3.1.5",
     "jsonld": "^8.1.0",
     "n3": "^1.16.3",
@@ -91,15 +92,14 @@
     "build:esm": "babel src --extensions \".ts,.js\" --env-name esm -d esm",
     "build:browser": "webpack --progress",
     "build:types": "tsc --emitDeclarationOnly -d --moduleResolution node --declarationDir lib",
-    "build:all": "npm run build && npm run build:types && npm run build:browser && npm run build:esm ",
     "doc": "typedoc --out ./doc ./src/index.ts --excludePrivate --excludeInternal --tsconfig ./tsconfig.json",
-    "ignore:prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
+    "ignore:prepublishOnly": "npm ci && npm run build && npm run build:types && npm run build:browser && npm run build:esm",
     "postversion": "git push --follow-tags",
     "start": "webpack serve --port 4800",
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",
     "test:clean": "rimraf tests/serialize/,*",
     "test:serialize": "npm run build && npm run test:serialize:all && npm run test:clean",
-    "test:serialize:all": "npm run test:serialize:8 && npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:8 && npm run test:serialize:9 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14 && npm run test:serialize:15 && npm run test:serialize:16",
+    "test:serialize:all": "npm run test:serialize:1 && npm run test:serialize:2 && npm run test:serialize:3 && npm run test:serialize:4 && npm run test:serialize:5 && npm run test:serialize:6 && npm run test:serialize:7 && npm run test:serialize:10 && npm run test:serialize:11 && npm run test:serialize:12 && npm run test:serialize:13 && npm run test:serialize:14 && npm run test:serialize:15",
     "test:serialize:1": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/rdf+xml -out=,t1.xml && fs-grep http://www.w3.org/2001/XMLSchema#integer ,t1.xml",
     "test:serialize:2": "cd ./tests/serialize && node ./data.js -in=t2.ttl -format=application/rdf+xml  -out=,t2.xml && node diff ,t2.xml t2-ref.xml",
     "test:serialize:3": "cd ./tests/serialize && node ./data.js -in=t3.ttl -format=application/rdf+xml  -out=,t3.xml && node diff ,t3.xml t3-ref.xml",
@@ -107,15 +107,14 @@
     "test:serialize:5": "cd ./tests/serialize && node ./data.js -in=t5.n3 -format=text/turtle -out=,t5.ttl && node diff ,t5.ttl t5-ref.ttl",
     "test:serialize:6": "cd ./tests/serialize && node ./data.js -in=t5.n3 -format=text/n3 -out=,t6.n3 && node diff ,t6.n3 t6-ref.n3",
     "test:serialize:7": "cd ./tests/serialize && node ./data.js -in=t7.n3 -format=application/n-triples -out=,t7.nt && node diff ,t7.nt t7-ref.nt",
-    "test:serialize:8": "cd ./tests/serialize && node ./data.js -in=t5.n3  -format=application/n-quads -out=,t8.nq && node diff ,t8.nq t8-ref.nq",
-    "test:serialize:9": "cd ./tests/serialize && node ./data.js -in=t7.n3 -format=application/ld+json -out=,t9.jsonld && node diff ,t9.jsonld t9-ref.jsonld",
+    "test:serialize:8": "cd ./tests/serialize && node ./data.js -in=t5.n3  -format=application/n-quads -dump=,t8.nq && node diff ,t8.nq t8-ref.nq",
+    "test:serialize:9": "cd ./tests/serialize && node ./data.js -in=t7.n3 -format=application/ld+json -out=,t9.json && node diff ,t9.json t9-ref.json",
     "test:serialize:10": "cd ./tests/serialize && node ./data.js -in=details.ttl -format=text/turtle -out=,t10.ttl && node diff ,t10.ttl t10-ref.ttl",
     "test:serialize:11": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=application/rdf+xml  -out=,structures.xml && node diff ,structures.xml t11-ref.xml",
     "test:serialize:12": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=text/turtle -out=,structures.ttl && node diff ,structures.ttl t12-ref.ttl",
     "test:serialize:13": "cd ./tests/serialize && node ./data.js -in=structures.n3 -format=application/n-triples -out=,structures.nt && node ./data.js -format=application/n-triples -in=,structures.nt -format=text/turtle -out=,structures.nt.ttl && node diff ,structures.nt.ttl t13-ref.ttl",
     "test:serialize:14": "cd ./tests/serialize && node ./data.js -in=t14.html -format=text/turtle -out=,t14.ttl && node diff ,t14.ttl t14-ref.ttl",
     "test:serialize:15": "cd ./tests/serialize && node ./data.js -in=t15.html -format=text/turtle -out=,t15.ttl && node diff ,t15.ttl t15-ref.ttl",
-    "test:serialize:16": "cd ./tests/serialize && node ./data.js -in=t1.ttl -format=application/ld+json -out=,t1.jsonld && node diff ,t1.jsonld t16-ref.jsonld",
     "test:types": "tsc --noEmit --target es2019 --moduleResolution node tests/types/*.ts",
     "test:unit": "mocha --growl --require  ./tests/babel-register.js tests/unit/**-test.*",
     "test:unit:egp": "mocha --require ./tests/babel-register.js tests/unit/fetcher-egp-test.js",

package/src/convert.js

@@ -0,0 +1,70 @@
+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((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/src/index.ts

@@ -2,6 +2,7 @@ import { IRDFlibDataFactory } from './types'
 
 import BlankNode from './blank-node'
 import Collection from './collection'
+import * as convert from './convert'
 import Empty from './empty'
 import Fetcher from './fetcher'
 import Formula from './formula'
@@ -65,6 +66,7 @@ export type { AutoInitOptions, ExtendedResponse, FetchError } from './fetcher'
 export {
   BlankNode,
   Collection,
+  convert,
   DataFactory,
   Empty,
   Fetcher,

package/src/jsonldparser.js

@@ -22,7 +22,7 @@ export function jsonldObjectToTerm (kb, obj) {
   }
 
   if (Object.prototype.hasOwnProperty.call(obj, '@id')) {
-    return nodeType(kb, obj)
+    return kb.rdfFactory.namedNode(obj['@id'])
   }
 
   if (Object.prototype.hasOwnProperty.call(obj, '@language')) {
@@ -44,7 +44,7 @@ export function jsonldObjectToTerm (kb, obj) {
  * Adds the statements in a json-ld list object to {kb}.
  */
 function listToStatements (kb, obj) {
-  const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode()
+  const listId = obj['@id'] ? kb.rdfFactory.namedNode(obj['@id']) : kb.rdfFactory.blankNode()
 
   const items = obj['@list'].map((listItem => jsonldObjectToTerm(kb, listItem)))
   const statements = arrayToStatements(kb.rdfFactory, listId, items)
@@ -82,19 +82,10 @@ export default function jsonldParser (str, kb, base, callback) {
     .catch(callback)
 }
 
-function nodeType (kb, obj) {
-  if (obj['@id'].startsWith('_:')) {
-    // This object is a Blank Node.. pass the id without the preceding _:
-    return kb.rdfFactory.blankNode(obj['@id'].substring(2));
-  } else {
-    // This object is a Named Node
-    return kb.rdfFactory.namedNode(obj['@id']);
-  }
-}
 
 function processResource(kb, base, flatResource) {
   const id = flatResource['@id']
-    ? nodeType(kb, flatResource)
+    ? kb.rdfFactory.namedNode(flatResource['@id'])
     : kb.rdfFactory.blankNode()
 
   for (const property of Object.keys(flatResource)) {
@@ -145,4 +136,4 @@ function createStatement(kb, id, property, value, base) {
     object = jsonldObjectToTerm(kb, value)
   }
   return kb.rdfFactory.quad(id, predicate, object, kb.rdfFactory.namedNode(base))
-}
+}

package/src/serialize.ts

@@ -1,3 +1,4 @@
+import * as convert from './convert'
 import Formula from './formula'
 import Serializer from './serializer'
 import {
@@ -14,7 +15,6 @@ import {
 } from './types'
 import IndexedFormula from './store'
 import { BlankNode, NamedNode } from './tf-types'
-import * as jsonld from 'jsonld'
 
 /**
  * Serialize to the appropriate format
@@ -85,12 +85,16 @@ export default function serialize (
         sz.setFlags('deinprstux') // Use adapters to connect to incmpatible parser
         n3String = sz.statementsToNTriples(newSts)
         // n3String = sz.statementsToN3(newSts)
-        return toJsonld(n3String) as any
+        convert.convertToJson(n3String, callback)
+        break
       case NQuadsContentType:
       case NQuadsAltContentType: // @@@ just outpout the quads? Does not work for collections
         sz.setFlags('deinprstux q') // Suppress nice parts of N3 to make ntriples
         documentString = sz.statementsToNTriples(newSts) // q in flag means actually quads
         return executeCallback(null, documentString)
+        // n3String = sz.statementsToN3(newSts)
+        // documentString = convert.convertToNQuads(n3String, callback)
+        // break
       default:
         throw new Error('Serialize: Content-type ' + contentType + ' not supported for data write.')
     }
@@ -110,11 +114,4 @@ export default function serialize (
       return result as string
     }
   }
-
-  function toJsonld (item ) {
-    try {
-      return jsonld.fromRDF(item, {format: 'application/n-quads'}).then( docJsonld => { return JSON.stringify(docJsonld) })
-      // return JSON.stringify(await jsonld.fromRDF(item, {format: 'application/n-quads'}))
-    } catch (e) { throw e }
-  }
 }