rdflib 2.2.20 → 2.2.21-acff123a

package/lib/variable.js

@@ -1,44 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _classOrder = _interopRequireDefault(require("./class-order"));
-
 var _nodeInternal = _interopRequireDefault(require("./node-internal"));
-
 var _types = require("./types");
-
 var Uri = _interopRequireWildcard(require("./uri"));
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
 * Variables are placeholders used in patterns to be matched.
 * In cwm they are symbols which are the formula's list of quantified variables.
@@ -46,11 +19,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 * a common special base URI for variables. Their names are uris,
 * but the ? notation has an implicit base uri of 'varid:'
 */
-var Variable = /*#__PURE__*/function (_Node) {
-  (0, _inherits2.default)(Variable, _Node);
-
-  var _super = _createSuper(Variable);
-
+class Variable extends _nodeInternal.default {
   /** The base string for a variable's name */
 
   /** The unique identifier of this variable */
@@ -59,58 +28,38 @@ var Variable = /*#__PURE__*/function (_Node) {
    * Initializes this variable
    * @param name The variable's name
    */
-  function Variable() {
-    var _this;
-
-    var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-    (0, _classCallCheck2.default)(this, Variable);
-    _this = _super.call(this, name);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "termType", _types.VariableTermType);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "base", 'varid:');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "classOrder", _classOrder.default.Variable);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "isVar", 1);
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "uri", void 0);
-    _this.base = 'varid:';
-    _this.uri = Uri.join(name, _this.base);
-    return _this;
+  constructor() {
+    let name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    super(name);
+    (0, _defineProperty2.default)(this, "termType", _types.VariableTermType);
+    (0, _defineProperty2.default)(this, "base", 'varid:');
+    (0, _defineProperty2.default)(this, "classOrder", _classOrder.default.Variable);
+    (0, _defineProperty2.default)(this, "isVar", 1);
+    (0, _defineProperty2.default)(this, "uri", void 0);
+    this.base = 'varid:';
+    this.uri = Uri.join(name, this.base);
   }
-
-  (0, _createClass2.default)(Variable, [{
-    key: "equals",
-    value: function equals(other) {
-      if (!other) {
-        return false;
-      }
-
-      return this.termType === other.termType && this.value === other.value;
-    }
-  }, {
-    key: "hashString",
-    value: function hashString() {
-      return this.toString();
-    }
-  }, {
-    key: "substitute",
-    value: function substitute(bindings) {
-      var ref;
-      return (ref = bindings[this.toNT()]) != null ? ref : this;
+  equals(other) {
+    if (!other) {
+      return false;
     }
-  }, {
-    key: "toString",
-    value: function toString() {
-      return Variable.toString(this);
-    }
-  }], [{
-    key: "toString",
-    value: function toString(variable) {
-      if (variable.uri.slice(0, variable.base.length) === variable.base) {
-        return "?".concat(variable.uri.slice(variable.base.length));
-      }
-
-      return "?".concat(variable.uri);
+    return this.termType === other.termType && this.value === other.value;
+  }
+  hashString() {
+    return this.toString();
+  }
+  substitute(bindings) {
+    var ref;
+    return (ref = bindings[this.toNT()]) != null ? ref : this;
+  }
+  toString() {
+    return Variable.toString(this);
+  }
+  static toString(variable) {
+    if (variable.uri.slice(0, variable.base.length) === variable.base) {
+      return `?${variable.uri.slice(variable.base.length)}`;
     }
-  }]);
-  return Variable;
-}(_nodeInternal.default);
-
+    return `?${variable.uri}`;
+  }
+}
 exports.default = Variable;

package/lib/xsd-internal.js

@@ -1,14 +1,11 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _namedNode = _interopRequireDefault(require("./named-node"));
-
 var _default = {
   boolean: new _namedNode.default('http://www.w3.org/2001/XMLSchema#boolean'),
   dateTime: new _namedNode.default('http://www.w3.org/2001/XMLSchema#dateTime'),

package/lib/xsd.js

@@ -1,17 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createXSD = createXSD;
 exports.default = void 0;
-
 var _canonicalDataFactory = _interopRequireDefault(require("./factories/canonical-data-factory"));
-
 function createXSD() {
-  var localFactory = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _canonicalDataFactory.default;
+  let localFactory = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _canonicalDataFactory.default;
   return {
     boolean: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#boolean"),
     dateTime: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#dateTime"),
@@ -22,7 +19,6 @@ function createXSD() {
     string: localFactory.namedNode("http://www.w3.org/2001/XMLSchema#string")
   };
 }
-
-var defaultXSD = createXSD(_canonicalDataFactory.default);
+const defaultXSD = createXSD(_canonicalDataFactory.default);
 var _default = defaultXSD;
 exports.default = _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.20",
+  "version": "2.2.21-acff123a",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -44,49 +44,48 @@
   "homepage": "http://github.com/linkeddata/rdflib.js",
   "bugs": "http://github.com/linkeddata/rdflib.js/issues",
   "dependencies": {
-    "@babel/runtime": "^7.17.8",
-    "@xmldom/xmldom": "^0.8.1",
-    "async": "^3.2.3",
+    "@babel/runtime": "^7.20.1",
+    "@xmldom/xmldom": "^0.8.6",
+    "async": "^3.2.4",
     "cross-fetch": "^3.1.5",
-    "jsonld": "^5.2.0",
-    "n3": "^1.16.0",
+    "jsonld": "^8.1.0",
+    "n3": "^1.16.3",
     "solid-namespace": "^0.5.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.17.6",
-    "@babel/core": "^7.17.8",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/preset-env": "^7.16.11",
-    "@babel/preset-typescript": "^7.16.7",
-    "@babel/register": "^7.17.7",
-    "@types/chai": "^4.3.0",
+    "@babel/cli": "^7.19.3",
+    "@babel/core": "^7.20.2",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.18.6",
+    "@babel/register": "^7.18.9",
+    "@types/chai": "^4.3.4",
     "@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",
-    "chai": "^4.3.6",
-    "diff": "^5.0.0",
+    "@types/express": "^4.17.14",
+    "@types/jsonld": "^1.5.8",
+    "@types/sinon-chai": "^3.2.9",
+    "babel-loader": "^9.1.0",
+    "chai": "^4.3.7",
+    "diff": "^5.1.0",
     "dirty-chai": "^2.0.1",
-    "eslint": "^8.12.0",
+    "eslint": "^8.28.0",
     "fs-grep": "0.0.5",
-    "locate-path": "^7.1.0",
-    "mocha": "^9.2.2",
-    "nock": "^13.2.4",
-    "node-fetch": "^2.6.7",
-    "node-polyfill-webpack-plugin": "^1.1.4",
-    "sinon": "^13.0.1",
+    "locate-path": "^7.1.1",
+    "mocha": "^10.1.0",
+    "nock": "^13.2.9",
+    "node-fetch": "^3.3.0",
+    "node-polyfill-webpack-plugin": "^2.0.1",
+    "rdf-js": "^4.0.2",
+    "sinon": "^14.0.2",
     "sinon-chai": "^3.7.0",
-    "source-map-loader": "^3.0.1",
-    "ts-node": "^10.7.0",
-    "typedoc": "^0.22.13",
-    "typescript": "^4.6.3",
-    "webpack": "^5.70.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-dev-server": "^4.7.4"
+    "source-map-loader": "^4.0.1",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.21",
+    "typescript": "^4.9.3",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.0",
+    "webpack-dev-server": "4.11"
   },
   "scripts": {
     "build": "babel src --extensions \".ts,.js\" -d lib",

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
   }
 

package/src/fetcher.ts

@@ -979,7 +979,7 @@ export default class Fetcher implements CallbackifyInterface {
     return this.pendingFetchPromise(docuri, initialisedOptions.baseURI, initialisedOptions) as any
   }
 
-  pendingFetchPromise (
+  async pendingFetchPromise (
     uri: string,
     originalUri: string,
     options: AutoInitOptions
@@ -987,7 +987,7 @@ export default class Fetcher implements CallbackifyInterface {
     let pendingPromise
 
     // Check to see if some request is already dealing with this uri
-    if (!options.force && this.fetchQueue[originalUri]) {
+    if (!options.force && await this.fetchQueue[originalUri]) {
       pendingPromise = this.fetchQueue[originalUri]
     } else {
       pendingPromise = Promise

package/src/lists.ts

@@ -0,0 +1,121 @@
+/* Lists form conversion
+*/
+
+
+// import DataFactory from './factories/extended-term-factory'
+// import jsonldParser from './jsonldparser'
+// @ts-ignore is this injected?
+import { Parser as N3jsParser } from 'n3'  // @@ 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 Node from './node-internal'
+// import BlankNode from './blank-node'
+// import NamedNode from './named-node'
+import Collection from './collection'
+import Statement from './statement'
+// import Formula from './formula'
+import Store from './store'
+// import { ContentType, TurtleContentType, N3ContentType, RDFXMLContentType, XHTMLContentType, HTMLContentType, SPARQLUpdateContentType, SPARQLUpdateSingleMatchContentType, JSONLDContentType, NQuadsContentType, NQuadsAltContentType } from './types'
+
+// import { Quad } from './tf-types'
+
+import {BlankNode, NamedNode, Quad, Term,} from './tf-types'
+import Namespace from './namespace'
+
+const 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:Store, x:Term, y:Term, doc?: NamedNode ) {
+  // console.log(`substituteInDoc put ${x} for ${y} in ${doc}}`)
+  for (const quad of store.statementsMatching(y as any, null, null, doc as any)) {
+    const newStatement = new Statement(x as any, quad.predicate, quad.object, doc as any)
+    store.remove(quad)
+    store.add(newStatement)
+  }
+  for (const quad of store.statementsMatching(null, y as any, null, doc) as any) {
+    store.remove(quad)
+    // console.log(`  substituteInDoc predicate ${x} in ${quad}}`)
+    store.add(new Statement(quad.subject, x as any, quad.object, doc as any))
+  }
+  for (const quad of store.statementsMatching(null, null, y as any, doc) as any) {
+    store.remove(quad)
+    store.add(new Statement(quad.subject, quad.predicate, x as any, doc as any))
+  }
+}
+
+/* Change all lone rdf:nil nodes into empty Collections
+*/
+export function substituteNillsInDoc (store:Store, doc?: NamedNode) {
+  const x = RDF('nil')
+  for (const quad of store.statementsMatching(x as any, null, null, doc as any)) {
+    store.remove(quad)
+    const y = new Collection()
+    store.add(new Statement(y as any, quad.predicate, quad.object, doc as any))
+  }
+  for (const quad of store.statementsMatching(null, null, x as any, doc) as any) {
+    if (!quad.predicate.sameTerm(RDF('rest'))) { // If not a tail
+      store.remove(quad)
+      const y = new Collection()
+      store.add(new Statement(quad.subject, quad.predicate, y as any, doc as any))
+    }
+  }
+}
+/**
+ * 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: Store,
+  doc: NamedNode | undefined,  // Do whole store?
+) {
+
+  function preceding (ele:BlankNode, listSoFar: Node[], trash: Quad[]): undefined {
+
+    const rests = store.statementsMatching(ele, RDF('rest'), null, doc)
+    if (rests.length !== 1) throw new Error(`Bad list structure: no rest at ${ele}`)
+
+    const firsts = store.statementsMatching(ele, RDF('first'), null, doc)
+    if (firsts.length !== 1) throw new Error(`Bad list structure: rest but ${firsts.length} firsts at ${ele}`)
+    const value = firsts[0].object
+    const total = [value].concat(listSoFar as any)
+    // console.log('  List now is: ', total)
+    const totalTrash =  trash.concat(rests).concat(firsts)
+
+    const pres = store.statementsMatching(null, RDF('rest'), ele, doc)
+    if (pres.length === 0) { // Head of the list
+      const 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: ${pres.length} pres at ${ele}`)
+    const pre = pres[0].subject
+    if (pre.termType !== 'BlankNode')  throw new Error(`Bad list element node ${pre} type: ${pre.termType} `)
+
+    preceding(pre, total, totalTrash)
+    return
+  }
+
+  substituteNillsInDoc(store, doc) // lone ones only
+
+  const tails = store.statementsMatching(null, RDF('rest'), RDF('nil'), doc)
+  tails.forEach(tail => {
+    if (tail.subject.termType !== 'BlankNode')
+      throw new Error(`Bad list element node ${tail.subject} type: ${tail.subject.termType} `)
+    preceding(tail.subject, [], [])
+  })
+
+}

package/src/statement.ts

@@ -137,6 +137,13 @@ export default class Statement<
 
   /** Creates a string representation of this statement */
   toString (): string {
+    /*
+    return [
+      this.subject.toString(),
+      this.predicate.toString(),
+      this.object.toString(),
+    ].join(' ') + ' .'
+    */
     return this.toNT()
   }
 }

package/src/store.ts

@@ -23,12 +23,14 @@ import Formula, { FormulaOpts } from './formula'
 import { ArrayIndexOf } from './utils'
 import { RDFArrayRemove } from './utils-js'
 import {
+  isRDFlibSubject,
+  isRDFlibPredicate,
   isRDFlibObject,
   isStore,
   isGraph,
-  isPredicate,
+  // isPredicate,
   isQuad,
-  isSubject
+  // isSubject
 } from './utils/terms'
 import Node from './node'
 import Variable from './variable'
@@ -429,10 +431,10 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
     pred = Node.fromValue(pred)
     const objNode = Node.fromValue(obj) as Term
     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 ${pred} is not a predicate type`)
     }
     if (!isRDFlibObject(objNode)) {
@@ -920,9 +922,7 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
     object?: Quad_Object | null,
     graph?: Quad_Graph | null
   ): IndexedFormula {
-    this.removeStatements(
-      this.statementsMatching(subject, predicate, object, graph)
-    )
+    this.removeMany(subject, predicate, object, graph)
     return this
   }
 

package/src/update-manager.ts

@@ -689,7 +689,7 @@ export default class UpdateManager {
       thisUpdater.update(deletions.filter(st => st.why.equals(doc)),
         insertions.filter(st => st.why.equals(doc))))
     if (updates.length > 1) {
-      console.log(`@@ updateMany to ${updates.length}: ${uniqueDocs}`)
+      // console.log(`@@ updateMany to ${updates.length}: ${uniqueDocs}`)
     }
     return Promise.all(updates)
   }
@@ -752,7 +752,7 @@ export default class UpdateManager {
         // console.log(message)
         throw new Error(message)
       }
-      var control = this.patchControlFor(doc)
+      var control = this.patchControlFor(doc as NamedNode)
       var startTime = Date.now()
 
       var props = ['subject', 'predicate', 'object', 'why']
@@ -781,7 +781,7 @@ export default class UpdateManager {
           throw new Error('Update: Loaded ' + doc + "but stil can't figure out what editing protcol it supports.")
         }
         // console.log(`Update: have not loaded ${doc} before: loading now...`);
-        (this.store.fetcher.load(doc) as Promise<Response>).then(response => {
+        (this.store.fetcher.load(doc as NamedNode) as Promise<Response>).then(response => {
           this.update(deletions, insertions, callback, true, options)
         }, err => {
             if (err.response.status === 404) { // nonexistent files are fine
@@ -793,8 +793,13 @@ export default class UpdateManager {
         return
       } else if ((protocol as string).indexOf('SPARQL') >= 0) {
         var bnodes: BlankNode[] = []
-        if (ds.length) bnodes = this.statementArrayBnodes(ds)
-        if (is.length) bnodes = bnodes.concat(this.statementArrayBnodes(is))
+        // change ReadOnly type to Mutable type
+        type Mutable<Type> = {
+          -readonly [Key in keyof Type]: Type[Key];
+        }
+        
+        if (ds.length) bnodes = this.statementArrayBnodes(ds as Mutable<typeof ds>)
+        if (is.length) bnodes = bnodes.concat(this.statementArrayBnodes(is as Mutable<typeof is>))
         var context = this.bnodeContext(bnodes, doc)
         var whereClause = this.contextWhere(context)
         var query = ''
@@ -840,12 +845,13 @@ export default class UpdateManager {
 
         this.fire(doc.value, query, (uri, success, body, response) => {
           (response as any).elapsedTimeMs = Date.now() - startTime
-          console.log('    UpdateManager: Return ' +
+          /* console.log('    UpdateManager: Return ' +
             (success ? 'success ' : 'FAILURE ') + (response as Response).status +
             ' elapsed ' + (response as any).elapsedTimeMs + 'ms')
+            */
           if (success) {
             try {
-              kb.remove(ds)
+              kb.remove(ds as Mutable<typeof ds>)
             } catch (e) {
               success = false
               body = 'Remote Ok BUT error deleting ' + ds.length + ' from store!!! ' + e
@@ -866,11 +872,11 @@ export default class UpdateManager {
           }
         }, options)
       } else if ((protocol as string).indexOf('DAV') >= 0) {
-        this.updateDav(doc, ds, is, callback, options)
+        this.updateDav(doc as NamedNode, ds, is, callback, options)
       } else {
         if ((protocol as string).indexOf('LOCALFILE') >= 0) {
           try {
-            this.updateLocalFile(doc, ds, is, callback, options)
+            this.updateLocalFile(doc as NamedNode, ds, is, callback, options)
           } catch (e) {
             callback(doc.value, false,
               'Exception trying to write back file <' + doc.value + '>\n'

package/src/utils/terms.ts

@@ -33,7 +33,7 @@ export function isCollection(obj: any): obj is Collection<any> {
     && (obj as Term).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: any): obj is ObjectType {
   return obj && Object.prototype.hasOwnProperty.call(obj, 'termType') && (
     obj.termType === NamedNodeTermType ||
@@ -45,6 +45,28 @@ export function isRDFlibObject(obj: any): obj is ObjectType {
   )
 }
 
+/** TypeGuard for valid RDFlib Subject types, same as Object as RDFLib symmetrical.
+*/
+export function isRDFlibSubject(obj: any): obj is ObjectType {
+  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: any): obj is Quad_Predicate {
+  return isTerm(obj) && (
+    obj.termType === NamedNodeTermType ||
+    obj.termType === BlankNodeTermType ||
+    obj.termType === VariableTermType
+  )
+}
+
 /** TypeGuard for RDFLib Variables */
 export function isVariable(obj: any): obj is Variable {
   return isTerm(obj)