rdflib 2.2.37 → 2.3.0-08f819ce

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

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

@@ -61,7 +61,9 @@ export default class IndexedFormula extends Formula {
     /** Function to remove quads from the store arrays with */
     private rdfArrayRemove;
     /** Callbacks which are triggered after a statement has been added to the store */
-    private dataCallbacks?;
+    private dataCallbacks;
+    /** Callbacks which are triggered after a statement has been removed from the store */
+    private dataRemovalCallbacks;
     /**
      * Creates a new formula
      * @param features - What sort of automatic processing to do? Array of string
@@ -86,6 +88,7 @@ export default class IndexedFormula extends Formula {
      * @param cb
      */
     addDataCallback(cb: (q: Quad) => void): void;
+    addDataRemovalCallback(cb: (q: Quad) => void): void;
     /**
      * Apply a set of statements to be deleted and to be inserted
      *

package/lib/store.js

@@ -137,7 +137,9 @@ class IndexedFormula extends _formula.default {
     /** Function to remove quads from the store arrays with */
     (0, _defineProperty2.default)(this, "rdfArrayRemove", void 0);
     /** Callbacks which are triggered after a statement has been added to the store */
-    (0, _defineProperty2.default)(this, "dataCallbacks", void 0);
+    (0, _defineProperty2.default)(this, "dataCallbacks", []);
+    /** Callbacks which are triggered after a statement has been removed from the store */
+    (0, _defineProperty2.default)(this, "dataRemovalCallbacks", []);
     this.propertyActions = {};
     this.classActions = {};
     this.redirections = [];
@@ -159,6 +161,9 @@ class IndexedFormula extends _formula.default {
     if (opts.dataCallback) {
       this.dataCallbacks = [opts.dataCallback];
     }
+    if (opts.dataRemovalCallback) {
+      this.dataRemovalCallbacks = [opts.dataRemovalCallback];
+    }
     this.initPropertyActions(this.features);
   }
 
@@ -187,11 +192,11 @@ class IndexedFormula extends _formula.default {
    * @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
@@ -405,10 +410,8 @@ class IndexedFormula extends _formula.default {
 
     // 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;
   }
@@ -858,6 +861,9 @@ class IndexedFormula extends _formula.default {
       }
     }
     this.rdfArrayRemove(this.statements, st);
+    for (const callback of this.dataRemovalCallbacks) {
+      callback(st);
+    }
     return this;
   }
 

package/lib/tf-types.d.ts

@@ -12,7 +12,7 @@ export interface Term {
      *
      * Note that the task force spec only allows comparison with other terms
      */
-    equals(other: Term): boolean;
+    equals(other: Term | null | undefined): boolean;
 }
 /**
  * RDF/JS spec NamedNode

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",
+  "version": "2.3.0-08f819ce",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -46,6 +46,7 @@
   "dependencies": {
     "@babel/runtime": "^7.26.9",
     "@frogcat/ttl2jsonld": "^0.0.10",
+    "@rdfjs/types": "^2.0.1",
     "@xmldom/xmldom": "^0.8.10",
     "cross-fetch": "^3.2.0",
     "jsonld": "^8.3.3",
@@ -77,7 +78,6 @@
     "nock": "^13.5.6",
     "node-fetch": "^3.3.2",
     "node-polyfill-webpack-plugin": "^2.0.1",
-    "rdf-js": "^4.0.2",
     "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
     "source-map-loader": "^4.0.2",

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

@@ -33,6 +33,7 @@ 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/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,19 @@ 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) {
+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 +101,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/literal.ts

@@ -61,7 +61,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 {
     if (!other) {
       return false
     }

package/src/n3parser.js

@@ -212,10 +212,20 @@ 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);
 }
@@ -554,7 +564,7 @@ export class SinkParser {
         <- prop -<
         _operator_*/
 
-        var j = this.skipSpace(str, i);
+    var j = this.skipSpace(str, i);
         if ((j < 0)) {
             return j;
         }
@@ -703,22 +713,17 @@ export class SinkParser {
                 if ((j >= 0)) {
                     var subj = objs[0];
                     if ((pyjslib_len(objs) > 1)) {
-
                         var __obj = new pyjslib_Iterator(objs);
                         try {
                             while (true) {
                                 var obj = __obj.next();
-
-
                                 this.makeStatement(new pyjslib_Tuple([this._context, this._store.sym(DAML_sameAs_URI), subj, obj]));
-
                             }
                         } catch (e) {
                             if (e != StopIteration) {
                                 throw e;
                             }
                         }
-
                     }
                     var j = this.skipSpace(str, j);
                     if ((j < 0)) {
@@ -743,6 +748,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");
             }
@@ -1208,7 +1223,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));
@@ -1235,13 +1260,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 {
@@ -1253,13 +1280,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/src/node-internal.ts

@@ -61,7 +61,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 {
     if (!other) {
       return false
     }

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

package/src/serializer.js

@@ -251,7 +251,7 @@ export class Serializer {
     return this.statementsToN3(f.statements)
   }
 
-  _notQNameChars = '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~'
+  _notQNameChars = '\t\r\n !"#$%&\'()*.,+/;<=>?@[\\]^`{|}~' // issue#228
   _notNameChars =
     (this._notQNameChars + ':')
 

package/src/store.ts

@@ -168,7 +168,9 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
   /** Function to remove quads from the store arrays with */
   private rdfArrayRemove: (arr: Quad[], q: Quad) => void
   /** Callbacks which are triggered after a statement has been added to the store */
-  private dataCallbacks?: Array<(q: Quad) => void>
+  private dataCallbacks: Array<(q: Quad) => void> = []
+  /** Callbacks which are triggered after a statement has been removed from the store */
+  private dataRemovalCallbacks: Array<(q: Quad) => void> = []
 
   /**
    * Creates a new formula
@@ -208,6 +210,9 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
     if (opts.dataCallback) {
       this.dataCallbacks = [opts.dataCallback]
     }
+    if (opts.dataRemovalCallback) {
+      this.dataRemovalCallbacks = [opts.dataRemovalCallback]
+    }
 
     this.initPropertyActions(this.features)
   }
@@ -237,12 +242,13 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
    * @param cb
    */
   addDataCallback(cb: (q: Quad) => void): void {
-    if (!this.dataCallbacks) {
-      this.dataCallbacks = []
-    }
     this.dataCallbacks.push(cb)
   }
 
+  addDataRemovalCallback(cb: (q: Quad) => void): void {
+    this.dataRemovalCallbacks.push(cb)
+  }
+
   /**
    * Apply a set of statements to be deleted and to be inserted
    *
@@ -486,10 +492,8 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
     // 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
@@ -987,6 +991,9 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
       }
     }
     this.rdfArrayRemove(this.statements, st)
+    for (const callback of this.dataRemovalCallbacks) {
+      callback(st)
+    }
     return this
   }
 

package/src/tf-types.ts

@@ -20,7 +20,7 @@ export interface Term {
    *
    * Note that the task force spec only allows comparison with other terms
    */
-  equals (other: Term): boolean
+  equals (other: Term | null | undefined): boolean
 }
 
 /**