rdflib 2.2.19-c14dfd57 → 2.2.19-e127c2a5

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/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/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) {
@@ -800,6 +803,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 +811,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 +823,7 @@ var UpdateManager = /*#__PURE__*/function () {
             } else {
               resolve();
             }
-          }); // callbackFunction
+          }, secondTry, options); // callbackFunction
         }); // promise
       } // if
 
@@ -883,11 +889,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 +947,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';
@@ -983,13 +989,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 +1011,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 +1048,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 +1076,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 +1110,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/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/serializer.d.ts

@@ -26,7 +26,7 @@ export class Serializer {
     toStr(x: any): any;
     fromStr(s: any): any;
     /**
-     * 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}

package/lib/serializer.js

@@ -81,7 +81,7 @@ 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.default;
@@ -123,7 +123,7 @@ 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}
@@ -686,7 +686,7 @@ 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;
 
@@ -717,6 +717,9 @@ 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/lib/update-manager.d.ts

@@ -1,8 +1,8 @@
 import IndexedFormula from './store';
-import Fetcher from './fetcher';
+import Fetcher, { Options } from './fetcher';
 import Statement from './statement';
 import RDFlibNamedNode from './named-node';
-import { BlankNode, NamedNode, Quad_Subject, Quad, Term } from './tf-types';
+import { BlankNode, NamedNode, Quad, Quad_Subject, Term } from './tf-types';
 interface UpdateManagerFormula extends IndexedFormula {
     fetcher: Fetcher;
 }
@@ -41,6 +41,7 @@ export default class UpdateManager {
     editable(uri: string | NamedNode, kb?: IndexedFormula): string | boolean | undefined;
     anonymize(obj: any): any;
     anonymizeNT(stmt: Quad): string;
+    nTriples(stmt: any): string;
     /**
      * Returns a list of all bnodes occurring in a statement
      * @private
@@ -86,7 +87,7 @@ export default class UpdateManager {
     /**
      * @private
      */
-    fire(uri: string, query: string, callbackFunction: CallBackFunction): Promise<void>;
+    fire(uri: string, query: string, callbackFunction: CallBackFunction, options?: Options): Promise<void>;
     /** return a statemnet updating function
      *
      * This does NOT update the statement.
@@ -155,9 +156,10 @@ export default class UpdateManager {
      * @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
      */
-    update(deletions: ReadonlyArray<Statement>, insertions: ReadonlyArray<Statement>, callback?: (uri: string | undefined | null, success: boolean, errorBody?: string, response?: Response | Error) => void, secondTry?: boolean): void | Promise<void>;
-    updateDav(doc: Quad_Subject, ds: any, is: any, callbackFunction: any): null | Promise<void>;
+    update(deletions: ReadonlyArray<Statement>, insertions: ReadonlyArray<Statement>, callback?: (uri: string | undefined | null, success: boolean, errorBody?: string, response?: Response | Error) => void, secondTry?: boolean, options?: Options): void | Promise<void>;
+    updateDav(doc: Quad_Subject, ds: any, is: any, callbackFunction: any, options?: Options): null | Promise<void>;
     /**
      * Likely deprecated, since this lib no longer deals with browser extension
      *
@@ -165,8 +167,9 @@ export default class UpdateManager {
      * @param ds
      * @param is
      * @param callbackFunction
+     * @param options
      */
-    updateLocalFile(doc: NamedNode, ds: any, is: any, callbackFunction: any): void;
+    updateLocalFile(doc: NamedNode, ds: any, is: any, callbackFunction: any, options?: Options): void;
     /**
      * @throws {Error} On unsupported content type
      *

package/lib/update-manager.js

@@ -236,6 +236,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
@@ -437,17 +442,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) {
@@ -812,6 +816,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
      */
 
   }, {
@@ -819,6 +824,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) {
@@ -829,7 +836,7 @@ var UpdateManager = /*#__PURE__*/function () {
             } else {
               resolve();
             }
-          }); // callbackFunction
+          }, secondTry, options); // callbackFunction
         }); // promise
       } // if
 
@@ -895,11 +902,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));
             }
@@ -953,7 +960,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';
@@ -995,13 +1002,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))
               );
@@ -1017,6 +1024,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'));
@@ -1053,11 +1061,9 @@ var UpdateManager = /*#__PURE__*/function () {
         targetURI = (0, _uri.join)(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);
@@ -1083,11 +1089,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
 
@@ -1115,11 +1123,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rdflib",
   "description": "an RDF library for node.js. Suitable for client and server side.",
-  "version": "2.2.19-c14dfd57",
+  "version": "2.2.19-e127c2a5",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/fetcher.ts

@@ -133,7 +133,7 @@ type UserCallback = (
 type HTTPMethods = 'GET' | 'PUT' | 'POST' | 'PATCH' | 'HEAD' | 'DELETE' | 'CONNECT' | 'TRACE' | 'OPTIONS'
 
 /** All valid inputs for initFetchOptions */
-type Options = Partial<AutoInitOptions>
+export type Options = Partial<AutoInitOptions>
 
 /** Initiated by initFetchOptions, which runs on load */
 export interface AutoInitOptions extends RequestInit{
@@ -1571,8 +1571,8 @@ export default class Fetcher implements CallbackifyInterface {
   }
 
   /**
-   * 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/src/serializer.js

@@ -40,7 +40,7 @@ export class Serializer {
     this.keywords = ['a'] // The only one we generate at the moment
     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
     this.xsd = createXSD(this.rdfFactory)
@@ -74,7 +74,7 @@ export class Serializer {
   }
 
   /**
-   * 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}
@@ -536,7 +536,7 @@ export class Serializer {
             case 'http://www.w3.org/2001/XMLSchema#integer':
               return val
 
-            case 'http://www.w3.org/2001/XMLSchema#decimal': // In urtle must have dot
+            case 'http://www.w3.org/2001/XMLSchema#decimal': // In Turtle, must have dot
               if (val.indexOf('.') < 0) val += '.0'
               return val
 
@@ -561,6 +561,8 @@ export class Serializer {
         return str
       case 'NamedNode':
         return this.symbolToN3(expr)
+      case 'DefaultGraph':
+        return '';
       default:
         throw new Error('Internal: atomicTermToN3 cannot handle ' + expr + ' of termType: ' + expr.termType)
     }
@@ -1031,4 +1033,4 @@ function backslashUify (str) {
     }
   }
   return res
-}
+}