rdflib 2.2.20 → 2.2.21-3a98cfb3

package/esm/collection.js

@@ -161,6 +161,8 @@ var Collection = /*#__PURE__*/function (_Node) {
   }], [{
     key: "toNT",
     value: function toNT(collection) {
+      // return '(' + collection.elements.map(x => x.toNT()).join(' ') + ')'
+      // As lists are not in NT and toNT() must be a reversible function, we kludge it for a list
       return RdflibBlankNode.NTAnonymousNodePrefix + collection.id;
     }
   }]);

package/esm/lists.js

@@ -0,0 +1,168 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+/* Lists form conversion
+*/
+// import DataFactory from './factories/extended-term-factory'
+// import jsonldParser from './jsonldparser'
+// @ts-ignore is this injected?
+// @@ Goal: remove this dependency
+// import N3Parser from './n3parser'
+// import { parseRDFaDOM } from './rdfaparser'
+// import RDFParser from './rdfxmlparser'
+// import sparqlUpdateParser from './patch-parser'
+// import * as Util from './utils-js'
+// import BlankNode from './blank-node'
+// import NamedNode from './named-node'
+import Collection from './collection';
+import Statement from './statement'; // import Formula from './formula'
+
+import Namespace from './namespace';
+var RDF = Namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+/* Replace a given node with another node throughout a given document
+*
+* we do the predicate as well for complenesss though we don't expect Collections to use it
+*/
+
+export function substituteInDoc(store, x, y, doc) {
+  // console.log(`substituteInDoc put ${x} for ${y} in ${doc}}`)
+  var _iterator = _createForOfIteratorHelper(store.statementsMatching(y, null, null, doc)),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var quad = _step.value;
+      var newStatement = new Statement(x, quad.predicate, quad.object, doc);
+      store.remove(quad);
+      store.add(newStatement);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  var _iterator2 = _createForOfIteratorHelper(store.statementsMatching(null, y, null, doc)),
+      _step2;
+
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _quad = _step2.value;
+      store.remove(_quad); // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
+
+      store.add(new Statement(_quad.subject, x, _quad.object, doc));
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+
+  var _iterator3 = _createForOfIteratorHelper(store.statementsMatching(null, null, y, doc)),
+      _step3;
+
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _quad2 = _step3.value;
+      store.remove(_quad2);
+      store.add(new Statement(_quad2.subject, _quad2.predicate, x, doc));
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+}
+/* Change all lone rdf:nil nodes into empty Collections
+*/
+
+export function substituteNillsInDoc(store, doc) {
+  var x = RDF('nil');
+
+  var _iterator4 = _createForOfIteratorHelper(store.statementsMatching(x, null, null, doc)),
+      _step4;
+
+  try {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var quad = _step4.value;
+      store.remove(quad);
+      var y = new Collection();
+      store.add(new Statement(y, quad.predicate, quad.object, doc));
+    }
+  } catch (err) {
+    _iterator4.e(err);
+  } finally {
+    _iterator4.f();
+  }
+
+  var _iterator5 = _createForOfIteratorHelper(store.statementsMatching(null, null, x, doc)),
+      _step5;
+
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var _quad3 = _step5.value;
+
+      if (!_quad3.predicate.sameTerm(RDF('rest'))) {
+        // If not a tail
+        store.remove(_quad3);
+
+        var _y = new Collection();
+
+        store.add(new Statement(_quad3.subject, _quad3.predicate, _y, doc));
+      }
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+}
+/**
+ * Convert lists reified as rdf:first, rest
+ * Normal method is sync.
+ * Unfortunately jsdonld is currently written to need to be called async.
+ * Hence the mess below with executeCallback.
+ * @param store - The quadstore
+ * @param doc - The document in which the conversion is done
+ */
+
+export function convertFirstRestNil(store, doc // Do whole store?
+) {
+  function preceding(ele, listSoFar, trash) {
+    var rests = store.statementsMatching(ele, RDF('rest'), null, doc);
+    if (rests.length !== 1) throw new Error("Bad list structure: no rest at ".concat(ele));
+    var firsts = store.statementsMatching(ele, RDF('first'), null, doc);
+    if (firsts.length !== 1) throw new Error("Bad list structure: rest but ".concat(firsts.length, " firsts at ").concat(ele));
+    var value = firsts[0].object;
+    var total = [value].concat(listSoFar); // console.log('  List now is: ', total)
+
+    var totalTrash = trash.concat(rests).concat(firsts);
+    var pres = store.statementsMatching(null, RDF('rest'), ele, doc);
+
+    if (pres.length === 0) {
+      // Head of the list
+      var newList = new Collection(total);
+      store.remove(totalTrash); // Replace old list with new list:
+
+      substituteInDoc(store, newList, ele, doc);
+      return;
+    }
+
+    if (pres.length !== 1) throw new Error("Bad list structure: ".concat(pres.length, " pres at ").concat(ele));
+    var pre = pres[0].subject;
+    if (pre.termType !== 'BlankNode') throw new Error("Bad list element node ".concat(pre, " type: ").concat(pre.termType, " "));
+    preceding(pre, total, totalTrash);
+    return;
+  }
+
+  substituteNillsInDoc(store, doc); // lone ones only
+
+  var tails = store.statementsMatching(null, RDF('rest'), RDF('nil'), doc);
+  tails.forEach(function (tail) {
+    if (tail.subject.termType !== 'BlankNode') throw new Error("Bad list element node ".concat(tail.subject, " type: ").concat(tail.subject.termType, " "));
+    preceding(tail.subject, [], []);
+  });
+}

package/esm/statement.js

@@ -118,6 +118,13 @@ var Statement = /*#__PURE__*/function () {
   }, {
     key: "toString",
     value: function toString() {
+      /*
+      return [
+        this.subject.toString(),
+        this.predicate.toString(),
+        this.object.toString(),
+      ].join(' ') + ' .'
+      */
       return this.toNT();
     }
   }]);

package/esm/store.js

@@ -43,7 +43,9 @@ import { defaultGraphURI } from './factories/canonical-data-factory';
 import Formula from './formula';
 import { ArrayIndexOf } from './utils';
 import { RDFArrayRemove } from './utils-js';
-import { isRDFlibObject, isStore, isGraph, isPredicate, isQuad, isSubject } from './utils/terms';
+import { isRDFlibSubject, isRDFlibPredicate, isRDFlibObject, isStore, isGraph, // isPredicate,
+isQuad // isSubject
+} from './utils/terms';
 import Node from './node';
 import Variable from './variable';
 import { Query, indexedFormulaQuery } from './query';
@@ -449,11 +451,11 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
       var objNode = Node.fromValue(obj);
       why = Node.fromValue(why);
 
-      if (!isSubject(subj)) {
+      if (!isRDFlibSubject(subj)) {
         throw new Error('Subject is not a subject type');
       }
 
-      if (!isPredicate(pred)) {
+      if (!isRDFlibPredicate(pred)) {
         throw new Error("Predicate ".concat(pred, " is not a predicate type"));
       }
 
@@ -1010,7 +1012,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
   }, {
     key: "removeMatches",
     value: function removeMatches(subject, predicate, object, graph) {
-      this.removeStatements(this.statementsMatching(subject, predicate, object, graph));
+      this.removeMany(subject, predicate, object, graph);
       return this;
     }
     /**

package/esm/update-manager.js

@@ -789,8 +789,7 @@ var UpdateManager = /*#__PURE__*/function () {
         }));
       });
 
-      if (updates.length > 1) {
-        console.log("@@ updateMany to ".concat(updates.length, ": ").concat(uniqueDocs));
+      if (updates.length > 1) {// console.log(`@@ updateMany to ${updates.length}: ${uniqueDocs}`)
       }
 
       return Promise.all(updates);
@@ -964,7 +963,10 @@ var UpdateManager = /*#__PURE__*/function () {
 
           this.fire(doc.value, query, function (uri, success, body, response) {
             response.elapsedTimeMs = Date.now() - startTime;
-            console.log('    UpdateManager: Return ' + (success ? 'success ' : 'FAILURE ') + response.status + ' elapsed ' + response.elapsedTimeMs + 'ms');
+            /* console.log('    UpdateManager: Return ' +
+              (success ? 'success ' : 'FAILURE ') + (response as Response).status +
+              ' elapsed ' + (response as any).elapsedTimeMs + 'ms')
+              */
 
             if (success) {
               try {

package/esm/utils/terms.js

@@ -15,11 +15,22 @@ export function isStore(obj) {
 export function isCollection(obj) {
   return isTerm(obj) && obj.termType === CollectionTermType;
 }
-/** TypeGuard for valid RDFlib Object types, also allows Collections */
+/** TypeGuard for valid RDFlib Object types, also allows Collections, Graphs */
 
 export function isRDFlibObject(obj) {
   return obj && Object.prototype.hasOwnProperty.call(obj, 'termType') && (obj.termType === NamedNodeTermType || obj.termType === VariableTermType || obj.termType === BlankNodeTermType || obj.termType === CollectionTermType || obj.termType === LiteralTermType || obj.termType === GraphTermType);
 }
+/** TypeGuard for valid RDFlib Subject types, same as Object as RDFLib symmetrical.
+*/
+
+export function isRDFlibSubject(obj) {
+  return obj && Object.prototype.hasOwnProperty.call(obj, 'termType') && (obj.termType === NamedNodeTermType || obj.termType === VariableTermType || obj.termType === BlankNodeTermType || obj.termType === CollectionTermType || obj.termType === LiteralTermType || obj.termType === GraphTermType);
+}
+/** TypeGuard for valid RDF/JS spec Predicate types */
+
+export function isRDFlibPredicate(obj) {
+  return isTerm(obj) && (obj.termType === NamedNodeTermType || obj.termType === BlankNodeTermType || obj.termType === VariableTermType);
+}
 /** TypeGuard for RDFLib Variables */
 
 export function isVariable(obj) {

package/lib/collection.js

@@ -176,6 +176,8 @@ var Collection = /*#__PURE__*/function (_Node) {
   }], [{
     key: "toNT",
     value: function toNT(collection) {
+      // return '(' + collection.elements.map(x => x.toNT()).join(' ') + ')'
+      // As lists are not in NT and toNT() must be a reversible function, we kludge it for a list
       return _blankNode.default.NTAnonymousNodePrefix + collection.id;
     }
   }]);

package/lib/lists.d.ts

@@ -0,0 +1,13 @@
+import Store from './store';
+import { NamedNode, Term } from './tf-types';
+export declare function substituteInDoc(store: Store, x: Term, y: Term, doc?: NamedNode): void;
+export declare function substituteNillsInDoc(store: Store, doc?: NamedNode): void;
+/**
+ * Convert lists reified as rdf:first, rest
+ * Normal method is sync.
+ * Unfortunately jsdonld is currently written to need to be called async.
+ * Hence the mess below with executeCallback.
+ * @param store - The quadstore
+ * @param doc - The document in which the conversion is done
+ */
+export declare function convertFirstRestNil(store: Store, doc: NamedNode | undefined): void;

package/lib/lists.js

@@ -0,0 +1,170 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.convertFirstRestNil = convertFirstRestNil;
+exports.substituteInDoc = substituteInDoc;
+exports.substituteNillsInDoc = substituteNillsInDoc;
+
+var _collection = _interopRequireDefault(require("./collection"));
+
+var _statement = _interopRequireDefault(require("./statement"));
+
+var _namespace = _interopRequireDefault(require("./namespace"));
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+var RDF = (0, _namespace.default)('http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+/* Replace a given node with another node throughout a given document
+*
+* we do the predicate as well for complenesss though we don't expect Collections to use it
+*/
+
+function substituteInDoc(store, x, y, doc) {
+  // console.log(`substituteInDoc put ${x} for ${y} in ${doc}}`)
+  var _iterator = _createForOfIteratorHelper(store.statementsMatching(y, null, null, doc)),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var quad = _step.value;
+      var newStatement = new _statement.default(x, quad.predicate, quad.object, doc);
+      store.remove(quad);
+      store.add(newStatement);
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  var _iterator2 = _createForOfIteratorHelper(store.statementsMatching(null, y, null, doc)),
+      _step2;
+
+  try {
+    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+      var _quad = _step2.value;
+      store.remove(_quad); // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
+
+      store.add(new _statement.default(_quad.subject, x, _quad.object, doc));
+    }
+  } catch (err) {
+    _iterator2.e(err);
+  } finally {
+    _iterator2.f();
+  }
+
+  var _iterator3 = _createForOfIteratorHelper(store.statementsMatching(null, null, y, doc)),
+      _step3;
+
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _quad2 = _step3.value;
+      store.remove(_quad2);
+      store.add(new _statement.default(_quad2.subject, _quad2.predicate, x, doc));
+    }
+  } catch (err) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+}
+/* Change all lone rdf:nil nodes into empty Collections
+*/
+
+
+function substituteNillsInDoc(store, doc) {
+  var x = RDF('nil');
+
+  var _iterator4 = _createForOfIteratorHelper(store.statementsMatching(x, null, null, doc)),
+      _step4;
+
+  try {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var quad = _step4.value;
+      store.remove(quad);
+      var y = new _collection.default();
+      store.add(new _statement.default(y, quad.predicate, quad.object, doc));
+    }
+  } catch (err) {
+    _iterator4.e(err);
+  } finally {
+    _iterator4.f();
+  }
+
+  var _iterator5 = _createForOfIteratorHelper(store.statementsMatching(null, null, x, doc)),
+      _step5;
+
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var _quad3 = _step5.value;
+
+      if (!_quad3.predicate.sameTerm(RDF('rest'))) {
+        // If not a tail
+        store.remove(_quad3);
+
+        var _y = new _collection.default();
+
+        store.add(new _statement.default(_quad3.subject, _quad3.predicate, _y, doc));
+      }
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+}
+/**
+ * Convert lists reified as rdf:first, rest
+ * Normal method is sync.
+ * Unfortunately jsdonld is currently written to need to be called async.
+ * Hence the mess below with executeCallback.
+ * @param store - The quadstore
+ * @param doc - The document in which the conversion is done
+ */
+
+
+function convertFirstRestNil(store, doc // Do whole store?
+) {
+  function preceding(ele, listSoFar, trash) {
+    var rests = store.statementsMatching(ele, RDF('rest'), null, doc);
+    if (rests.length !== 1) throw new Error("Bad list structure: no rest at ".concat(ele));
+    var firsts = store.statementsMatching(ele, RDF('first'), null, doc);
+    if (firsts.length !== 1) throw new Error("Bad list structure: rest but ".concat(firsts.length, " firsts at ").concat(ele));
+    var value = firsts[0].object;
+    var total = [value].concat(listSoFar); // console.log('  List now is: ', total)
+
+    var totalTrash = trash.concat(rests).concat(firsts);
+    var pres = store.statementsMatching(null, RDF('rest'), ele, doc);
+
+    if (pres.length === 0) {
+      // Head of the list
+      var newList = new _collection.default(total);
+      store.remove(totalTrash); // Replace old list with new list:
+
+      substituteInDoc(store, newList, ele, doc);
+      return;
+    }
+
+    if (pres.length !== 1) throw new Error("Bad list structure: ".concat(pres.length, " pres at ").concat(ele));
+    var pre = pres[0].subject;
+    if (pre.termType !== 'BlankNode') throw new Error("Bad list element node ".concat(pre, " type: ").concat(pre.termType, " "));
+    preceding(pre, total, totalTrash);
+    return;
+  }
+
+  substituteNillsInDoc(store, doc); // lone ones only
+
+  var tails = store.statementsMatching(null, RDF('rest'), RDF('nil'), doc);
+  tails.forEach(function (tail) {
+    if (tail.subject.termType !== 'BlankNode') throw new Error("Bad list element node ".concat(tail.subject, " type: ").concat(tail.subject.termType, " "));
+    preceding(tail.subject, [], []);
+  });
+}

package/lib/statement.js

@@ -134,6 +134,13 @@ var Statement = /*#__PURE__*/function () {
   }, {
     key: "toString",
     value: function toString() {
+      /*
+      return [
+        this.subject.toString(),
+        this.predicate.toString(),
+        this.object.toString(),
+      ].join(' ') + ' .'
+      */
       return this.toNT();
     }
   }]);

package/lib/store.js

@@ -450,11 +450,11 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
 
       why = _node.default.fromValue(why);
 
-      if (!(0, _terms.isSubject)(subj)) {
+      if (!(0, _terms.isRDFlibSubject)(subj)) {
         throw new Error('Subject is not a subject type');
       }
 
-      if (!(0, _terms.isPredicate)(pred)) {
+      if (!(0, _terms.isRDFlibPredicate)(pred)) {
         throw new Error("Predicate ".concat(pred, " is not a predicate type"));
       }
 
@@ -1012,7 +1012,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
   }, {
     key: "removeMatches",
     value: function removeMatches(subject, predicate, object, graph) {
-      this.removeStatements(this.statementsMatching(subject, predicate, object, graph));
+      this.removeMany(subject, predicate, object, graph);
       return this;
     }
     /**

package/lib/update-manager.js

@@ -802,8 +802,7 @@ var UpdateManager = /*#__PURE__*/function () {
         }));
       });
 
-      if (updates.length > 1) {
-        console.log("@@ updateMany to ".concat(updates.length, ": ").concat(uniqueDocs));
+      if (updates.length > 1) {// console.log(`@@ updateMany to ${updates.length}: ${uniqueDocs}`)
       }
 
       return Promise.all(updates);
@@ -977,7 +976,10 @@ var UpdateManager = /*#__PURE__*/function () {
 
           this.fire(doc.value, query, function (uri, success, body, response) {
             response.elapsedTimeMs = Date.now() - startTime;
-            console.log('    UpdateManager: Return ' + (success ? 'success ' : 'FAILURE ') + response.status + ' elapsed ' + response.elapsedTimeMs + 'ms');
+            /* console.log('    UpdateManager: Return ' +
+              (success ? 'success ' : 'FAILURE ') + (response as Response).status +
+              ' elapsed ' + (response as any).elapsedTimeMs + 'ms')
+              */
 
             if (success) {
               try {

package/lib/utils/terms.d.ts

@@ -9,8 +9,13 @@ export declare function isStatement(obj: any): obj is Statement;
 export declare function isStore(obj: any): obj is IndexedFormula;
 /** TypeGuard for RDFLib Collections */
 export declare function isCollection(obj: any): obj is Collection<any>;
-/** TypeGuard for valid RDFlib Object types, also allows Collections */
+/** TypeGuard for valid RDFlib Object types, also allows Collections, Graphs */
 export declare function isRDFlibObject(obj: any): obj is ObjectType;
+/** TypeGuard for valid RDFlib Subject types, same as Object as RDFLib symmetrical.
+*/
+export declare function isRDFlibSubject(obj: any): obj is ObjectType;
+/** TypeGuard for valid RDF/JS spec Predicate types */
+export declare function isRDFlibPredicate(obj: any): obj is Quad_Predicate;
 /** TypeGuard for RDFLib Variables */
 export declare function isVariable(obj: any): obj is Variable;
 /** TypeGuard for RDF/JS spec Terms */

package/lib/utils/terms.js

@@ -14,6 +14,8 @@ exports.isPredicate = isPredicate;
 exports.isQuad = isQuad;
 exports.isRDFObject = isRDFObject;
 exports.isRDFlibObject = isRDFlibObject;
+exports.isRDFlibPredicate = isRDFlibPredicate;
+exports.isRDFlibSubject = isRDFlibSubject;
 exports.isStatement = isStatement;
 exports.isStore = isStore;
 exports.isSubject = isSubject;
@@ -40,12 +42,25 @@ function isStore(obj) {
 function isCollection(obj) {
   return isTerm(obj) && obj.termType === _types.CollectionTermType;
 }
-/** TypeGuard for valid RDFlib Object types, also allows Collections */
+/** TypeGuard for valid RDFlib Object types, also allows Collections, Graphs */
 
 
 function isRDFlibObject(obj) {
   return obj && Object.prototype.hasOwnProperty.call(obj, 'termType') && (obj.termType === _types.NamedNodeTermType || obj.termType === _types.VariableTermType || obj.termType === _types.BlankNodeTermType || obj.termType === _types.CollectionTermType || obj.termType === _types.LiteralTermType || obj.termType === _types.GraphTermType);
 }
+/** TypeGuard for valid RDFlib Subject types, same as Object as RDFLib symmetrical.
+*/
+
+
+function isRDFlibSubject(obj) {
+  return obj && Object.prototype.hasOwnProperty.call(obj, 'termType') && (obj.termType === _types.NamedNodeTermType || obj.termType === _types.VariableTermType || obj.termType === _types.BlankNodeTermType || obj.termType === _types.CollectionTermType || obj.termType === _types.LiteralTermType || obj.termType === _types.GraphTermType);
+}
+/** TypeGuard for valid RDF/JS spec Predicate types */
+
+
+function isRDFlibPredicate(obj) {
+  return isTerm(obj) && (obj.termType === _types.NamedNodeTermType || obj.termType === _types.BlankNodeTermType || obj.termType === _types.VariableTermType);
+}
 /** TypeGuard for RDFLib 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.20",
+  "version": "2.2.21-3a98cfb3",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -64,7 +64,6 @@
     "@types/dirty-chai": "^2.0.2",
     "@types/express": "^4.17.13",
     "@types/jsonld": "^1.5.6",
-    "@types/mocha": "^9.1.0",
     "@types/rdf-js": "^4.0.2",
     "@types/sinon-chai": "^3.2.8",
     "babel-loader": "^8.2.4",

package/src/collection.ts

@@ -112,6 +112,8 @@ export default class Collection<
   }
 
   static toNT (collection) {
+    // return '(' + collection.elements.map(x => x.toNT()).join(' ') + ')'
+    // As lists are not in NT and toNT() must be a reversible function, we kludge it for a list
     return RdflibBlankNode.NTAnonymousNodePrefix + collection.id
   }