rdflib 2.2.37 → 2.3.0-08f819ce

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,15 @@ function listToCollection(kb, obj) {
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-export default function jsonldParser(str, kb, base, callback) {
+export default async 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(flattened => flattened.reduce((store, flatResource) => {
-    kb = processResource(kb, base, flatResource);
-    return kb;
-  }, kb)).then(callback).catch(callback);
+  const jsonld = await import('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`
+  const flattened = await jsonld.default.flatten(JSON.parse(str), null, {
+    base: baseString
+  });
+  return flattened.reduce((store, flatResource) => processResource(store, base, flatResource), kb);
 }
 function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {

package/esm/n3parser.js

@@ -183,9 +183,19 @@ var ws = new RegExp("^[ \\t]*", 'g');
 var signed_integer = new RegExp("^[-+]?[0-9]+", 'g');
 var number_syntax = new RegExp("^([-+]?[0-9]+)(\\.[0-9]+)?([eE][-+]?[0-9]+)?", 'g');
 var datetime_syntax = new RegExp('^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9](T[0-9][0-9]:[0-9][0-9](:[0-9][0-9](\\.[0-9]*)?)?)?Z?');
+
+// Reused in tight loops to detect whitespace or comment after a dot
+var wsOrHash = new RegExp("[\\s#]");
 var digitstring = new RegExp("^[0-9]+", 'g');
 var interesting = new RegExp("[\\\\\\r\\n\\\"]", 'g');
 var langcode = new RegExp("^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*", 'g');
+
+// Returns true when a dot at position i should terminate a name,
+// i.e., when the next character is whitespace, a comment start, or EOF
+function dotTerminatesName(str, i) {
+  var next = str.charAt(i + 1);
+  return next === '' || wsOrHash.test(next);
+}
 function createSinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
   return new SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why);
 }
@@ -674,6 +684,16 @@ export class SinkParser {
       if (j < 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when ']' expected after [ <propertyList>");
       }
+      if (str.slice(j, j + 1) == ".") {
+        // If a dot is found after a blank node, treat it as a statement terminator.
+        // Do NOT consume the '.' here: statement terminators are handled centrally by
+        // checkDot() (called by directiveOrStatement after statement()). Consuming the dot
+        // locally would bypass that unified logic and could cause inconsistencies.
+        // We do consume ']' below because it is a structural closer of the blank node,
+        // not a statement terminator.
+        res.push(subj);
+        return j; // leave '.' for checkDot()
+      }
       if (str.slice(j, j + 1) != "]") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
       }
@@ -1122,7 +1142,17 @@ export class SinkParser {
       return -1;
     }
     var i = j;
-    while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
+    while (i < pyjslib_len(str)) {
+      var c = str.charAt(i);
+      if (c === '.') {
+        if (dotTerminatesName(str, i)) {
+          break; // treat as statement terminator, not part of name
+        }
+        // else: accept '.' as part of name
+      } else if (_notNameChars.indexOf(c) >= 0) {
+        // Other invalid characters terminate the name
+        break;
+      }
       var i = i + 1;
     }
     res.push(str.slice(j, i));
@@ -1148,12 +1178,15 @@ export class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
     } else {
       var ln = "";
@@ -1164,12 +1197,15 @@ export class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
       res.push(new pyjslib_Tuple([pfx, ln]));
       return i;

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/esm/serializer.js

@@ -21,6 +21,7 @@ export default function createSerializer(store) {
 export class Serializer {
   constructor(store) {
     _defineProperty(this, "_notQNameChars", '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~');
+    // issue#228
     _defineProperty(this, "_notNameChars", this._notQNameChars + ':');
     //  stringToN3:  String escaping for N3
     _defineProperty(this, "validPrefix", new RegExp(/^[a-zA-Z][a-zA-Z0-9]*$/));

package/esm/store.js

@@ -129,7 +129,9 @@ export default class IndexedFormula extends Formula {
     /** Function to remove quads from the store arrays with */
     _defineProperty(this, "rdfArrayRemove", void 0);
     /** Callbacks which are triggered after a statement has been added to the store */
-    _defineProperty(this, "dataCallbacks", void 0);
+    _defineProperty(this, "dataCallbacks", []);
+    /** Callbacks which are triggered after a statement has been removed from the store */
+    _defineProperty(this, "dataRemovalCallbacks", []);
     this.propertyActions = {};
     this.classActions = {};
     this.redirections = [];
@@ -151,6 +153,9 @@ export default class IndexedFormula extends Formula {
     if (opts.dataCallback) {
       this.dataCallbacks = [opts.dataCallback];
     }
+    if (opts.dataRemovalCallback) {
+      this.dataRemovalCallbacks = [opts.dataRemovalCallback];
+    }
     this.initPropertyActions(this.features);
   }
 
@@ -179,11 +184,11 @@ export default class IndexedFormula extends Formula {
    * @param cb
    */
   addDataCallback(cb) {
-    if (!this.dataCallbacks) {
-      this.dataCallbacks = [];
-    }
     this.dataCallbacks.push(cb);
   }
+  addDataRemovalCallback(cb) {
+    this.dataRemovalCallbacks.push(cb);
+  }
 
   /**
    * Apply a set of statements to be deleted and to be inserted
@@ -397,10 +402,8 @@ export default class IndexedFormula extends Formula {
 
     // log.debug("ADDING    {"+subj+" "+pred+" "+objNode+"} "+why)
     this.statements.push(st);
-    if (this.dataCallbacks) {
-      for (const callback of this.dataCallbacks) {
-        callback(st);
-      }
+    for (const callback of this.dataCallbacks) {
+      callback(st);
     }
     return st;
   }
@@ -850,6 +853,9 @@ export default class IndexedFormula extends Formula {
       }
     }
     this.rdfArrayRemove(this.statements, st);
+    for (const callback of this.dataRemovalCallbacks) {
+      callback(st);
+    }
     return this;
   }
 

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/formula.d.ts

@@ -12,6 +12,7 @@ import BlankNode from './blank-node';
 import NamedNode from './named-node';
 export interface FormulaOpts {
     dataCallback?: (q: Quad) => void;
+    dataRemovalCallback?: (q: Quad) => void;
     rdfArrayRemove?: (arr: Quad[], q: Quad) => void;
     rdfFactory?: RdfJsDataFactory;
 }

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,15 @@ function listToCollection(kb, obj) {
  *
  * Ensure that {kb.rdfFactory} is a DataFactory.
  */
-function jsonldParser(str, kb, base, callback) {
+async 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, {
-      base: baseString
-    });
-  }).then(flattened => flattened.reduce((store, flatResource) => {
-    kb = processResource(kb, base, flatResource);
-    return kb;
-  }, kb)).then(callback).catch(callback);
+  const jsonld = await Promise.resolve().then(() => _interopRequireWildcard(require('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`
+  const flattened = await jsonld.default.flatten(JSON.parse(str), null, {
+    base: baseString
+  });
+  return flattened.reduce((store, flatResource) => processResource(store, base, flatResource), kb);
 }
 function nodeType(kb, obj) {
   if (obj['@id'].startsWith('_:')) {

package/lib/literal.d.ts

@@ -33,7 +33,7 @@ export default class Literal extends Node implements TFLiteral {
      * Gets whether two literals are the same
      * @param other The other statement
      */
-    equals(other: Term): boolean;
+    equals(other: Term | null | undefined): boolean;
     /**
      * The language for the literal
      * @deprecated use {language} instead

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
@@ -192,9 +191,19 @@ var ws = new RegExp("^[ \\t]*", 'g');
 var signed_integer = new RegExp("^[-+]?[0-9]+", 'g');
 var number_syntax = new RegExp("^([-+]?[0-9]+)(\\.[0-9]+)?([eE][-+]?[0-9]+)?", 'g');
 var datetime_syntax = new RegExp('^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9](T[0-9][0-9]:[0-9][0-9](:[0-9][0-9](\\.[0-9]*)?)?)?Z?');
+
+// Reused in tight loops to detect whitespace or comment after a dot
+var wsOrHash = new RegExp("[\\s#]");
 var digitstring = new RegExp("^[0-9]+", 'g');
 var interesting = new RegExp("[\\\\\\r\\n\\\"]", 'g');
 var langcode = new RegExp("^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*", 'g');
+
+// Returns true when a dot at position i should terminate a name,
+// i.e., when the next character is whitespace, a comment start, or EOF
+function dotTerminatesName(str, i) {
+  var next = str.charAt(i + 1);
+  return next === '' || wsOrHash.test(next);
+}
 function createSinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why) {
   return new SinkParser(store, openFormula, thisDoc, baseURI, genPrefix, metaURI, flags, why);
 }
@@ -683,6 +692,16 @@ class SinkParser {
       if (j < 0) {
         throw BadSyntax(this._thisDoc, this.lines, str, i, "EOF when ']' expected after [ <propertyList>");
       }
+      if (str.slice(j, j + 1) == ".") {
+        // If a dot is found after a blank node, treat it as a statement terminator.
+        // Do NOT consume the '.' here: statement terminators are handled centrally by
+        // checkDot() (called by directiveOrStatement after statement()). Consuming the dot
+        // locally would bypass that unified logic and could cause inconsistencies.
+        // We do consume ']' below because it is a structural closer of the blank node,
+        // not a statement terminator.
+        res.push(subj);
+        return j; // leave '.' for checkDot()
+      }
       if (str.slice(j, j + 1) != "]") {
         throw BadSyntax(this._thisDoc, this.lines, str, j, "']' expected");
       }
@@ -1131,7 +1150,17 @@ class SinkParser {
       return -1;
     }
     var i = j;
-    while (i < pyjslib_len(str) && _notNameChars.indexOf(str.charAt(i)) < 0) {
+    while (i < pyjslib_len(str)) {
+      var c = str.charAt(i);
+      if (c === '.') {
+        if (dotTerminatesName(str, i)) {
+          break; // treat as statement terminator, not part of name
+        }
+        // else: accept '.' as part of name
+      } else if (_notNameChars.indexOf(c) >= 0) {
+        // Other invalid characters terminate the name
+        break;
+      }
       var i = i + 1;
     }
     res.push(str.slice(j, i));
@@ -1157,12 +1186,15 @@ class SinkParser {
       var i = i + 1;
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
     } else {
       var ln = "";
@@ -1173,12 +1205,15 @@ class SinkParser {
       var ln = "";
       while (i < pyjslib_len(str)) {
         var c = str.charAt(i);
-        if (_notNameChars.indexOf(c) < 0) {
-          var ln = ln + c;
-          var i = i + 1;
-        } else {
+        if (c === '.') {
+          if (dotTerminatesName(str, i)) {
+            break; // dot ends the name here
+          }
+        } else if (_notNameChars.indexOf(c) >= 0) {
           break;
         }
+        var ln = ln + c;
+        var i = i + 1;
       }
       res.push(new pyjslib_Tuple([pfx, ln]));
       return i;

package/lib/node-internal.d.ts

@@ -33,7 +33,7 @@ export default abstract class Node {
      * Compares whether the two nodes are equal
      * @param other The other node
      */
-    equals(other: Term): boolean;
+    equals(other: Term | null | undefined): boolean;
     /**
      * Creates a hash for this node
      * @deprecated use {rdfFactory.id} instead if possible

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