rdflib 2.2.19 → 2.2.20-1f25cea3

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/fetcher.js

@@ -1441,8 +1441,8 @@ var Fetcher = /*#__PURE__*/function () {
       }
     }
     /**
-     * A generic web opeation, at the fetch() level.
-     * does not invole the quadstore.
+     * A generic web operation, at the fetch() level.
+     * does not involve the quad store.
      *
      *  Returns promise of Response
      *  If data is returned, copies it to response.responseText before returning

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

@@ -60,7 +60,7 @@ export var Serializer = /*#__PURE__*/function () {
     this.prefixchars = 'abcdefghijklmnopqustuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
     this.incoming = null; // Array not calculated yet
 
-    this.formulas = []; // remebering original formulae from hashes
+    this.formulas = []; // remembering original formulae from hashes
 
     this.store = store;
     this.rdfFactory = store.rdfFactory || CanonicalDataFactory;
@@ -102,7 +102,7 @@ export var Serializer = /*#__PURE__*/function () {
       return this.store.fromNT(s);
     }
     /**
-     * Defines a set of [prefix, namespace] pairs to be uised by this Serializer instance.
+     * Defines a set of [prefix, namespace] pairs to be used by this Serializer instance.
      * Overrides previous prefixes if any
      * @param namespaces
      * @return {Serializer}
@@ -665,7 +665,7 @@ export var Serializer = /*#__PURE__*/function () {
                 return val;
 
               case 'http://www.w3.org/2001/XMLSchema#decimal':
-                // In urtle must have dot
+                // In Turtle, must have dot
                 if (val.indexOf('.') < 0) val += '.0';
                 return val;
 
@@ -696,6 +696,9 @@ export var Serializer = /*#__PURE__*/function () {
         case 'NamedNode':
           return this.symbolToN3(expr);
 
+        case 'DefaultGraph':
+          return '';
+
         default:
           throw new Error('Internal: atomicTermToN3 cannot handle ' + expr + ' of termType: ' + expr.termType);
       }

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

@@ -16,12 +16,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 ** 2010-12-07 TimBL addred local file write code
 */
 import IndexedFormula from './store';
-import { docpart } from './uri';
+import { docpart, join as uriJoin } from './uri';
 import Fetcher from './fetcher';
 import Namespace from './namespace';
 import Serializer from './serializer';
-import { join as uriJoin } from './uri';
-import { isStore, isBlankNode } from './utils/terms';
+import { isBlankNode, isStore } from './utils/terms';
 import * as Util from './utils-js';
 import { termValue } from './utils/termValue';
 
@@ -224,6 +223,11 @@ var UpdateManager = /*#__PURE__*/function () {
     value: function anonymizeNT(stmt) {
       return this.anonymize(stmt.subject) + ' ' + this.anonymize(stmt.predicate) + ' ' + this.anonymize(stmt.object) + ' .';
     }
+  }, {
+    key: "nTriples",
+    value: function nTriples(stmt) {
+      return "".concat(stmt.subject.toNT(), " ").concat(stmt.predicate.toNT(), " ").concat(stmt.object.toNT(), " .");
+    }
     /**
      * Returns a list of all bnodes occurring in a statement
      * @private
@@ -425,17 +429,16 @@ var UpdateManager = /*#__PURE__*/function () {
     value: function fire(uri, query, callbackFunction) {
       var _this = this;
 
+      var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
       return Promise.resolve().then(function () {
         if (!uri) {
           throw new Error('No URI given for remote editing operation: ' + query);
         } // console.log('UpdateManager: sending update to <' + uri + '>')
 
 
-        var options = {
-          noMeta: true,
-          contentType: 'application/sparql-update',
-          body: query
-        };
+        options.noMeta = true;
+        options.contentType = 'application/sparql-update';
+        options.body = query;
         return _this.store.fetcher.webOperation('PATCH', uri, options);
       }).then(function (response) {
         if (!response.ok) {
@@ -786,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);
@@ -800,6 +802,7 @@ var UpdateManager = /*#__PURE__*/function () {
      * @param insertions - Statement or statements to be inserted.
      * @param callback - called as callbackFunction(uri, success, errorbody)
      *           OR returns a promise
+     * @param options - Options for the fetch call
      */
 
   }, {
@@ -807,6 +810,8 @@ var UpdateManager = /*#__PURE__*/function () {
     value: function update(deletions, insertions, callback, secondTry) {
       var _this3 = this;
 
+      var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+
       if (!callback) {
         var thisUpdater = this;
         return new Promise(function (resolve, reject) {
@@ -817,7 +822,7 @@ var UpdateManager = /*#__PURE__*/function () {
             } else {
               resolve();
             }
-          }); // callbackFunction
+          }, secondTry, options); // callbackFunction
         }); // promise
       } // if
 
@@ -883,11 +888,11 @@ var UpdateManager = /*#__PURE__*/function () {
 
 
           this.store.fetcher.load(doc).then(function (response) {
-            _this3.update(deletions, insertions, callback, true);
+            _this3.update(deletions, insertions, callback, true, options);
           }, function (err) {
             if (err.response.status === 404) {
               // nonexistent files are fine
-              _this3.update(deletions, insertions, callback, true);
+              _this3.update(deletions, insertions, callback, true, options);
             } else {
               throw new Error("Update: Can't get updatability status ".concat(doc, " before patching: ").concat(err));
             }
@@ -941,7 +946,7 @@ var UpdateManager = /*#__PURE__*/function () {
               query += 'INSERT DATA { ';
 
               for (var _i7 = 0; _i7 < is.length; _i7++) {
-                query += this.anonymizeNT(is[_i7]) + '\n';
+                query += this.nTriples(is[_i7]) + '\n';
               }
 
               query += ' }\n';
@@ -958,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 {
@@ -983,13 +991,13 @@ var UpdateManager = /*#__PURE__*/function () {
 
               downstreamAction(doc);
             }
-          });
+          }, options);
         } else if (protocol.indexOf('DAV') >= 0) {
-          this.updateDav(doc, ds, is, callback);
+          this.updateDav(doc, ds, is, callback, options);
         } else {
           if (protocol.indexOf('LOCALFILE') >= 0) {
             try {
-              this.updateLocalFile(doc, ds, is, callback);
+              this.updateLocalFile(doc, ds, is, callback, options);
             } catch (e) {
               callback(doc.value, false, 'Exception trying to write back file <' + doc.value + '>\n' // + tabulator.Util.stackString(e))
               );
@@ -1005,6 +1013,7 @@ var UpdateManager = /*#__PURE__*/function () {
   }, {
     key: "updateDav",
     value: function updateDav(doc, ds, is, callbackFunction) {
+      var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
       var kb = this.store; // The code below is derived from Kenny's UpdateCenter.js
 
       var request = kb.any(doc, this.ns.link('request'));
@@ -1041,11 +1050,9 @@ var UpdateManager = /*#__PURE__*/function () {
         targetURI = uriJoin(candidateTarget.value, targetURI);
       }
 
-      var options = {
-        contentType: contentType,
-        noMeta: true,
-        body: documentString
-      };
+      options.contentType = contentType;
+      options.noMeta = true;
+      options.body = documentString;
       return kb.fetcher.webOperation('PUT', targetURI, options).then(function (response) {
         if (!response.ok) {
           throw new Error(response.error);
@@ -1071,11 +1078,13 @@ var UpdateManager = /*#__PURE__*/function () {
      * @param ds
      * @param is
      * @param callbackFunction
+     * @param options
      */
 
   }, {
     key: "updateLocalFile",
     value: function updateLocalFile(doc, ds, is, callbackFunction) {
+      var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
       var kb = this.store; // console.log('Writing back to local file\n')
       // prepare contents of revised document
 
@@ -1103,11 +1112,9 @@ var UpdateManager = /*#__PURE__*/function () {
         throw new Error('File extension .' + ext + ' not supported for data write');
       }
 
-      var documentString = this.serialize(doc.value, newSts, contentType);
-      kb.fetcher.webOperation('PUT', doc.value, {
-        "body": documentString,
-        contentType: contentType
-      }).then(function (response) {
+      options.body = this.serialize(doc.value, newSts, contentType);
+      options.contentType = contentType;
+      kb.fetcher.webOperation('PUT', doc.value, options).then(function (response) {
         if (!response.ok) return callbackFunction(doc.value, false, response.error);
 
         for (var _i13 = 0; _i13 < ds.length; _i13++) {

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

@@ -56,7 +56,7 @@ declare global {
 declare type UserCallback = (ok: boolean, message: string, response?: any) => void;
 declare type HTTPMethods = 'GET' | 'PUT' | 'POST' | 'PATCH' | 'HEAD' | 'DELETE' | 'CONNECT' | 'TRACE' | 'OPTIONS';
 /** All valid inputs for initFetchOptions */
-declare type Options = Partial<AutoInitOptions>;
+export declare type Options = Partial<AutoInitOptions>;
 /** Initiated by initFetchOptions, which runs on load */
 export interface AutoInitOptions extends RequestInit {
     /** The used Fetch function */
@@ -370,8 +370,8 @@ export default class Fetcher implements CallbackifyInterface {
     createContainer(parentURI: string, folderName: string, data: string): Promise<Response>;
     invalidateCache(iri: string | NamedNode): void;
     /**
-     * A generic web opeation, at the fetch() level.
-     * does not invole the quadstore.
+     * A generic web operation, at the fetch() level.
+     * does not involve the quad store.
      *
      *  Returns promise of Response
      *  If data is returned, copies it to response.responseText before returning

package/lib/fetcher.js

@@ -1415,8 +1415,8 @@ var Fetcher = /*#__PURE__*/function () {
       }
     }
     /**
-     * A generic web opeation, at the fetch() level.
-     * does not invole the quadstore.
+     * A generic web operation, at the fetch() level.
+     * does not involve the quad store.
      *
      *  Returns promise of Response
      *  If data is returned, copies it to response.responseText before returning

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;