rdflib 2.2.37-e9f5dc29 → 2.2.37-ed84c0fa

package/esm/fetcher.js

@@ -142,7 +142,9 @@ class XHTMLHandler extends Handler {
     return 'XHTMLHandler';
   }
   static register(fetcher) {
-    fetcher.mediatypes[XHTMLContentType] = {};
+    fetcher.mediatypes[XHTMLContentType] = {
+      'q': 0.8
+    };
   }
   parse(fetcher, responseText, options) {
     let relation, reverse;
@@ -275,7 +277,7 @@ class HTMLHandler extends Handler {
   }
   static register(fetcher) {
     fetcher.mediatypes['text/html'] = {
-      'q': 0.9
+      'q': 0.8
     };
   }
   parse(fetcher, responseText, options) {
@@ -324,21 +326,19 @@ class JsonLdHandler extends Handler {
       'q': 0.9
     };
   }
-  parse(fetcher, responseText, options, response) {
+  async parse(fetcher, responseText, options, response) {
     const kb = fetcher.store;
-    return new Promise((resolve, reject) => {
-      try {
-        jsonldParser(responseText, kb, options.original.value, () => {
-          resolve(fetcher.doneFetch(options, response));
-        });
-      } catch (err) {
-        const msg = 'Error trying to parse ' + options.resource + ' as JSON-LD:\n' + err; // not err.stack -- irrelevant
-        resolve(fetcher.failFetch(options, msg, 'parse_error', response));
-      }
-    });
+    try {
+      await jsonldParser(responseText, kb, options.original.value);
+      fetcher.store.add(options.original, ns.rdf('type'), ns.link('RDFDocument'), fetcher.appNode);
+      return fetcher.doneFetch(options, response);
+    } catch (err) {
+      const msg = 'Error trying to parse ' + options.resource + ' as JSON-LD:\n' + err; // not err.stack -- irrelevant
+      return fetcher.failFetch(options, msg, 'parse_error', response);
+    }
   }
 }
-JsonLdHandler.pattern = /application\/ld\+json/;
+JsonLdHandler.pattern = /application\/(ld\+json|activity\+json)/;
 class TextHandler extends Handler {
   static toString() {
     return 'TextHandler';
@@ -376,17 +376,8 @@ class N3Handler extends Handler {
     return 'N3Handler';
   }
   static register(fetcher) {
-    fetcher.mediatypes['text/n3'] = {
-      'q': '1.0'
-    }; // as per 2008 spec
-    /*
-     fetcher.mediatypes['application/x-turtle'] = {
-     'q': 1.0
-     } // pre 2008
-     */
-    fetcher.mediatypes['text/turtle'] = {
-      'q': 1.0
-    }; // post 2008
+    fetcher.mediatypes['text/n3'] = {};
+    fetcher.mediatypes['text/turtle'] = {};
   }
   parse(fetcher, responseText, options, response) {
     // Parse the text of this N3 file
@@ -736,7 +727,7 @@ export default class Fetcher {
     options.baseURI = options.baseURI || uri; // Preserve though proxying etc
     options.original = kb.rdfFactory.namedNode(options.baseURI);
     options.req = kb.bnode();
-    options.headers = options.headers || new Headers();
+    options.headers = options.headers || {};
     if (options.contentType) {
       // @ts-ignore
       options.headers['content-type'] = options.contentType;

package/esm/jsonldparser.js

@@ -53,16 +53,18 @@ function listToCollection(kb, obj) {
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-export default function jsonldParser(str, kb, base, callback) {
+export default function jsonldParser(str, kb, base) {
   const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
   return import('jsonld').then(jsonld => {
-    return jsonld.flatten(JSON.parse(str), null, {
+    // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
+    // just calling `jsonld.flatten`, so please do not remove `default`
+    return jsonld.default.flatten(JSON.parse(str), null, {
       base: baseString
     });
   }).then(flattened => flattened.reduce((store, flatResource) => {
     kb = processResource(kb, base, flatResource);
     return kb;
-  }, kb)).then(callback).catch(callback);
+  }, kb));
 }
 function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {

package/esm/parse.js

@@ -12,7 +12,7 @@ import { TurtleContentType, N3ContentType, RDFXMLContentType, XHTMLContentType,
  * Parse a string and put the result into the graph kb.
  * Normal method is sync.
  * Unfortunately jsdonld is currently written to need to be called async.
- * Hence the mess below with executeCallback.
+ * If you are parsing JSON-LD and want to know when and whether it succeeded, you need to use the callback param.
  * @param str - The input string to parse
  * @param kb - The store to use
  * @param base - The base URI to use
@@ -48,7 +48,10 @@ export default function parse(str, kb, base) {
       sparqlUpdateParser(str, kb, base);
       executeCallback();
     } else if (contentType === JSONLDContentType) {
-      jsonldParser(str, kb, base, executeCallback);
+      // since we do not await the promise here, rejections will not be covered by the surrounding try catch
+      // we do not use await, because parse() should stay sync
+      // so, to not lose the async error, we need to catch the rejection and call the error callback here too
+      jsonldParser(str, kb, base).then(executeCallback).catch(executeErrorCallback);
     } else if (contentType === NQuadsContentType || contentType === NQuadsAltContentType) {
       var n3Parser = new N3jsParser({
         factory: DataFactory

package/lib/fetcher.js

@@ -22,8 +22,7 @@ var _crossFetch = _interopRequireWildcard(require("cross-fetch"));
 var _types = require("./types");
 var _termValue = require("./utils/termValue");
 var _jsonldparser = _interopRequireDefault(require("./jsonldparser"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /* global $SolidTestEnvironment */
 /**
  *
@@ -152,7 +151,9 @@ class XHTMLHandler extends Handler {
     return 'XHTMLHandler';
   }
   static register(fetcher) {
-    fetcher.mediatypes[_types.XHTMLContentType] = {};
+    fetcher.mediatypes[_types.XHTMLContentType] = {
+      'q': 0.8
+    };
   }
   parse(fetcher, responseText, options) {
     let relation, reverse;
@@ -285,7 +286,7 @@ class HTMLHandler extends Handler {
   }
   static register(fetcher) {
     fetcher.mediatypes['text/html'] = {
-      'q': 0.9
+      'q': 0.8
     };
   }
   parse(fetcher, responseText, options) {
@@ -334,21 +335,19 @@ class JsonLdHandler extends Handler {
       'q': 0.9
     };
   }
-  parse(fetcher, responseText, options, response) {
+  async parse(fetcher, responseText, options, response) {
     const kb = fetcher.store;
-    return new Promise((resolve, reject) => {
-      try {
-        (0, _jsonldparser.default)(responseText, kb, options.original.value, () => {
-          resolve(fetcher.doneFetch(options, response));
-        });
-      } catch (err) {
-        const msg = 'Error trying to parse ' + options.resource + ' as JSON-LD:\n' + err; // not err.stack -- irrelevant
-        resolve(fetcher.failFetch(options, msg, 'parse_error', response));
-      }
-    });
+    try {
+      await (0, _jsonldparser.default)(responseText, kb, options.original.value);
+      fetcher.store.add(options.original, ns.rdf('type'), ns.link('RDFDocument'), fetcher.appNode);
+      return fetcher.doneFetch(options, response);
+    } catch (err) {
+      const msg = 'Error trying to parse ' + options.resource + ' as JSON-LD:\n' + err; // not err.stack -- irrelevant
+      return fetcher.failFetch(options, msg, 'parse_error', response);
+    }
   }
 }
-JsonLdHandler.pattern = /application\/ld\+json/;
+JsonLdHandler.pattern = /application\/(ld\+json|activity\+json)/;
 class TextHandler extends Handler {
   static toString() {
     return 'TextHandler';
@@ -386,17 +385,8 @@ class N3Handler extends Handler {
     return 'N3Handler';
   }
   static register(fetcher) {
-    fetcher.mediatypes['text/n3'] = {
-      'q': '1.0'
-    }; // as per 2008 spec
-    /*
-     fetcher.mediatypes['application/x-turtle'] = {
-     'q': 1.0
-     } // pre 2008
-     */
-    fetcher.mediatypes['text/turtle'] = {
-      'q': 1.0
-    }; // post 2008
+    fetcher.mediatypes['text/n3'] = {};
+    fetcher.mediatypes['text/turtle'] = {};
   }
   parse(fetcher, responseText, options, response) {
     // Parse the text of this N3 file
@@ -746,7 +736,7 @@ class Fetcher {
     options.baseURI = options.baseURI || uri; // Preserve though proxying etc
     options.original = kb.rdfFactory.namedNode(options.baseURI);
     options.req = kb.bnode();
-    options.headers = options.headers || new _crossFetch.Headers();
+    options.headers = options.headers || {};
     if (options.contentType) {
       // @ts-ignore
       options.headers['content-type'] = options.contentType;

package/lib/index.js

@@ -290,8 +290,7 @@ Object.keys(_terms).forEach(function (key) {
   });
 });
 var _termValue = require("./utils/termValue");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Prepare bound versions of data factory methods for export
 const boundDataFactory = {};
 for (const name in _rdflibDataFactory.default) {

package/lib/jsonldparser.d.ts

@@ -10,4 +10,4 @@ export function jsonldObjectToTerm(kb: any, obj: any): Literal | NamedNode | Bla
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-export default function jsonldParser(str: any, kb: any, base: any, callback: any): Promise<any>;
+export default function jsonldParser(str: any, kb: any, base: any): Promise<any>;

package/lib/jsonldparser.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = jsonldParser;
 exports.jsonldObjectToTerm = jsonldObjectToTerm;
 var _utils = require("./utils");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * Parses json-ld formatted JS objects to a rdf Term.
  * @param kb - The DataFactory to use.
@@ -61,16 +60,18 @@ function listToCollection(kb, obj) {
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-function jsonldParser(str, kb, base, callback) {
+function jsonldParser(str, kb, base) {
   const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
   return Promise.resolve().then(() => _interopRequireWildcard(require('jsonld'))).then(jsonld => {
-    return jsonld.flatten(JSON.parse(str), null, {
+    // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
+    // just calling `jsonld.flatten`, so please do not remove `default`
+    return jsonld.default.flatten(JSON.parse(str), null, {
       base: baseString
     });
   }).then(flattened => flattened.reduce((store, flatResource) => {
     kb = processResource(kb, base, flatResource);
     return kb;
-  }, kb)).then(callback).catch(callback);
+  }, kb));
 }
 function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {

package/lib/n3parser.js

@@ -7,8 +7,7 @@ exports.default = exports.SinkParser = void 0;
 var Uri = _interopRequireWildcard(require("./uri"));
 var _utils = require("./utils");
 var _lists = require("./lists");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
 *
 *  UTF-8 data encode / decode

package/lib/parse.d.ts

@@ -5,7 +5,7 @@ type CallbackFunc = (error: any, kb: Formula | null) => void;
  * Parse a string and put the result into the graph kb.
  * Normal method is sync.
  * Unfortunately jsdonld is currently written to need to be called async.
- * Hence the mess below with executeCallback.
+ * If you are parsing JSON-LD and want to know when and whether it succeeded, you need to use the callback param.
  * @param str - The input string to parse
  * @param kb - The store to use
  * @param base - The base URI to use

package/lib/parse.js

@@ -14,8 +14,7 @@ var _rdfxmlparser = _interopRequireDefault(require("./rdfxmlparser"));
 var _patchParser = _interopRequireDefault(require("./patch-parser"));
 var Util = _interopRequireWildcard(require("./utils-js"));
 var _types = require("./types");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // @ts-ignore is this injected?
 // @@ Goal: remove this dependency
 
@@ -23,7 +22,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * Parse a string and put the result into the graph kb.
  * Normal method is sync.
  * Unfortunately jsdonld is currently written to need to be called async.
- * Hence the mess below with executeCallback.
+ * If you are parsing JSON-LD and want to know when and whether it succeeded, you need to use the callback param.
  * @param str - The input string to parse
  * @param kb - The store to use
  * @param base - The base URI to use
@@ -59,7 +58,10 @@ function parse(str, kb, base) {
       (0, _patchParser.default)(str, kb, base);
       executeCallback();
     } else if (contentType === _types.JSONLDContentType) {
-      (0, _jsonldparser.default)(str, kb, base, executeCallback);
+      // since we do not await the promise here, rejections will not be covered by the surrounding try catch
+      // we do not use await, because parse() should stay sync
+      // so, to not lose the async error, we need to catch the rejection and call the error callback here too
+      (0, _jsonldparser.default)(str, kb, base).then(executeCallback).catch(executeErrorCallback);
     } else if (contentType === _types.NQuadsContentType || contentType === _types.NQuadsAltContentType) {
       var n3Parser = new _n.Parser({
         factory: _extendedTermFactory.default

package/lib/rdfaparser.js

@@ -11,8 +11,7 @@ var _namedNode = _interopRequireDefault(require("./named-node"));
 var Uri = _interopRequireWildcard(require("./uri"));
 var Util = _interopRequireWildcard(require("./utils-js"));
 var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 //  RDFa Parser for rdflib.js
 
 // Originally by: Alex Milowski

package/lib/rdfxmlparser.js

@@ -7,8 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var uriUtil = _interopRequireWildcard(require("./uri"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  *  RDF/XML PARSER
  *

package/lib/serializer.js

@@ -15,8 +15,7 @@ var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonica
 var _xsd = require("./xsd");
 var _solidNamespace = _interopRequireDefault(require("solid-namespace"));
 var ttl2jsonld = _interopRequireWildcard(require("@frogcat/ttl2jsonld"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /*      Serialization of RDF Graphs
 **
 ** Tim Berners-Lee 2006

package/lib/statement.js

@@ -9,8 +9,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _nodeInternal = _interopRequireDefault(require("./node-internal"));
 var _types = require("./types");
 var _defaultGraph = _interopRequireWildcard(require("./default-graph"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const defaultGraph = new _defaultGraph.default();
 
 /** A Statement represents an RDF Triple or Quad. */

package/lib/update-manager.js

@@ -14,8 +14,7 @@ var _serializer = _interopRequireDefault(require("./serializer"));
 var _terms = require("./utils/terms");
 var Util = _interopRequireWildcard(require("./utils-js"));
 var _termValue = require("./utils/termValue");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /* @file Update Manager Class
 **
 ** 2007-07-15 original SPARQL Update module by Joe Presbrey <presbrey@mit.edu>

package/lib/utils-js.js

@@ -32,8 +32,7 @@ exports.uri = _uri;
 var _log = _interopRequireDefault(require("./log"));
 var _namedNode = _interopRequireDefault(require("./named-node"));
 var _xmldom = require("@xmldom/xmldom");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * Utility functions for $rdf
  * @module util

package/lib/variable.js

@@ -10,8 +10,7 @@ var _classOrder = _interopRequireDefault(require("./class-order"));
 var _nodeInternal = _interopRequireDefault(require("./node-internal"));
 var _types = require("./types");
 var Uri = _interopRequireWildcard(require("./uri"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
 * Variables are placeholders used in patterns to be matched.
 * In cwm they are symbols which are the formula's list of quantified variables.

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.37-e9f5dc29",
+  "version": "2.2.37-ed84c0fa",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/fetcher.ts

@@ -262,7 +262,9 @@ class XHTMLHandler extends Handler {
   }
 
   static register (fetcher: Fetcher) {
-    fetcher.mediatypes[XHTMLContentType] = {}
+    fetcher.mediatypes[XHTMLContentType] = {
+      'q': 0.8
+    }
   }
 
   parse (
@@ -429,7 +431,7 @@ class HTMLHandler extends Handler {
 
   static register (fetcher: Fetcher) {
     fetcher.mediatypes['text/html'] = {
-      'q': 0.9
+      'q': 0.8
     }
   }
 
@@ -496,31 +498,30 @@ class JsonLdHandler extends Handler {
       'q': 0.9
     }
   }
-  parse (
-    fetcher: Fetcher,
-    responseText: string,
-    options: {
-      req: Quad_Subject
-      original: Quad_Subject
-      resource: Quad_Subject
-    } & Options,
-    response: ExtendedResponse
+  async parse(
+      fetcher: Fetcher,
+      responseText: string,
+      options: {
+        req: Quad_Subject
+        original: Quad_Subject
+        resource: Quad_Subject
+      } & Options,
+      response: ExtendedResponse
   ): Promise<ExtendedResponse | FetchError> {
     const kb = fetcher.store
-    return new Promise((resolve, reject) => {
-      try {
-        jsonldParser (responseText, kb, options.original.value, () => {
-          resolve(fetcher.doneFetch(options, response))
-        })
-      } catch (err) {
-        const msg = 'Error trying to parse ' + options.resource +
+    try {
+      await jsonldParser(responseText, kb, options.original.value)
+      fetcher.store.add(options.original, ns.rdf('type'), ns.link('RDFDocument'), fetcher.appNode)
+      return fetcher.doneFetch(options, response)
+    } catch (err) {
+      const msg = 'Error trying to parse ' + options.resource +
           ' as JSON-LD:\n' + err  // not err.stack -- irrelevant
-        resolve(fetcher.failFetch(options, msg, 'parse_error', response))
-      }
-    })
+      return fetcher.failFetch(options, msg, 'parse_error', response)
+    }
   }
 }
-JsonLdHandler.pattern = /application\/ld\+json/
+
+JsonLdHandler.pattern = /application\/(ld\+json|activity\+json)/
 
 class TextHandler extends Handler {
   static toString () {
@@ -577,17 +578,8 @@ class N3Handler extends Handler {
   }
 
   static register (fetcher: Fetcher) {
-    fetcher.mediatypes['text/n3'] = {
-      'q': '1.0'
-    } // as per 2008 spec
-    /*
-     fetcher.mediatypes['application/x-turtle'] = {
-     'q': 1.0
-     } // pre 2008
-     */
-    fetcher.mediatypes['text/turtle'] = {
-      'q': 1.0
-    } // post 2008
+    fetcher.mediatypes['text/n3'] = {}
+    fetcher.mediatypes['text/turtle'] = {}
   }
 
   parse (
@@ -1057,7 +1049,7 @@ export default class Fetcher implements CallbackifyInterface {
     options.baseURI = options.baseURI || uri // Preserve though proxying etc
     options.original = kb.rdfFactory.namedNode(options.baseURI)
     options.req = kb.bnode()
-    options.headers = options.headers || new Headers()
+    options.headers = options.headers || {}
 
     if (options.contentType) {
       // @ts-ignore

package/src/jsonldparser.js

@@ -1,4 +1,4 @@
-import { arrayToStatements } from './utils'
+import {arrayToStatements} from './utils'
 
 /**
  * Parses json-ld formatted JS objects to a rdf Term.
@@ -6,7 +6,7 @@ import { arrayToStatements } from './utils'
  * @param obj - The json-ld object to process.
  * @return {Literal|NamedNode|BlankNode|Collection}
  */
-export function jsonldObjectToTerm (kb, obj) {
+export function jsonldObjectToTerm(kb, obj) {
   if (typeof obj === 'string') {
     return kb.rdfFactory.literal(obj)
   }
@@ -41,7 +41,7 @@ export function jsonldObjectToTerm (kb, obj) {
 /**
  * Adds the statements in a json-ld list object to {kb}.
  */
-function listToStatements (kb, obj) {
+function listToStatements(kb, obj) {
   const listId = obj['@id'] ? nodeType(kb, obj) : kb.rdfFactory.blankNode()
 
   const items = obj['@list'].map((listItem => jsonldObjectToTerm(kb, listItem)))
@@ -51,7 +51,7 @@ function listToStatements (kb, obj) {
   return listId
 }
 
-function listToCollection (kb, obj) {
+function listToCollection(kb, obj) {
   if (!Array.isArray(obj)) {
     throw new TypeError("Object must be an array")
   }
@@ -63,24 +63,24 @@ function listToCollection (kb, obj) {
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-export default function jsonldParser (str, kb, base, callback) {
+export default function jsonldParser(str, kb, base) {
   const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType')
     ? base.value
     : base
 
   return import('jsonld')
-    .then(jsonld => { return jsonld.flatten(JSON.parse(str), null, { base: baseString }) })
+    .then(jsonld => {
+      // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
+      // just calling `jsonld.flatten`, so please do not remove `default`
+      return jsonld.default.flatten(JSON.parse(str), null, {base: baseString})
+    })
     .then((flattened) => flattened.reduce((store, flatResource) => {
-
       kb = processResource(kb, base, flatResource)
-
       return kb
     }, kb))
-    .then(callback)
-    .catch(callback)
 }
 
-function nodeType (kb, obj) {
+function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {
     // This object is a Blank Node. Pass the id without the `_:` prefix
     return kb.rdfFactory.blankNode(obj['@id'].substring(2));
@@ -106,7 +106,7 @@ function processResource(kb, base, flatResource) {
       const nestedFlatResources = flatResource[property]
 
       // recursively process all flat resources in the array, but with the graphId as base.
-      for (let i = 0; i < nestedFlatResources.length; i++ ) {
+      for (let i = 0; i < nestedFlatResources.length; i++) {
         kb = processResource(kb, graphId, nestedFlatResources[i])
       }
     }

package/src/parse.ts

@@ -17,7 +17,7 @@ type CallbackFunc = (error: any, kb: Formula | null) => void
  * Parse a string and put the result into the graph kb.
  * Normal method is sync.
  * Unfortunately jsdonld is currently written to need to be called async.
- * Hence the mess below with executeCallback.
+ * If you are parsing JSON-LD and want to know when and whether it succeeded, you need to use the callback param.
  * @param str - The input string to parse
  * @param kb - The store to use
  * @param base - The base URI to use
@@ -52,7 +52,12 @@ export default function parse (
       sparqlUpdateParser(str, kb, base)
       executeCallback()
     } else if (contentType === JSONLDContentType) {
-      jsonldParser(str, kb, base, executeCallback)
+      // since we do not await the promise here, rejections will not be covered by the surrounding try catch
+      // we do not use await, because parse() should stay sync
+      // so, to not lose the async error, we need to catch the rejection and call the error callback here too
+      jsonldParser(str, kb, base)
+          .then(executeCallback)
+          .catch(executeErrorCallback)
     } else if (contentType === NQuadsContentType ||
                contentType === NQuadsAltContentType) {
       var n3Parser = new N3jsParser({ factory: DataFactory })