rdflib 2.2.37-dbccd446 → 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,7 +53,7 @@ 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 => {
     // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
@@ -64,7 +64,7 @@ export default function jsonldParser(str, kb, base, callback) {
   }).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

@@ -151,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;
@@ -284,7 +286,7 @@ class HTMLHandler extends Handler {
   }
   static register(fetcher) {
     fetcher.mediatypes['text/html'] = {
-      'q': 0.9
+      'q': 0.8
     };
   }
   parse(fetcher, responseText, options) {
@@ -333,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';
@@ -385,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
@@ -745,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/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

@@ -60,7 +60,7 @@ 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 => {
     // ⚠ Unit tests also work without accessing `jsonld.default` explicitly, but real browser usage will fail with
@@ -71,7 +71,7 @@ function jsonldParser(str, kb, base, callback) {
   }).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/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

@@ -22,7 +22,7 @@ function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r
  * 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
@@ -58,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/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-dbccd446",
+  "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

@@ -63,8 +63,10 @@ function listToCollection(kb, obj) {
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-export default function jsonldParser(str, kb, base, callback) {
-  const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base
+export default function jsonldParser(str, kb, base) {
+  const baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType')
+    ? base.value
+    : base
 
   return import('jsonld')
     .then(jsonld => {
@@ -73,13 +75,9 @@ export default function jsonldParser(str, kb, base, callback) {
       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) {

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 })