rdflib 2.2.30 → 2.2.31-10c4e145

package/lib/update-manager.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -80,13 +82,100 @@ var UpdateManager = /*#__PURE__*/function () {
       return uri.slice(0, 4) === 'http';
     }
 
+    /** Remove from the store HTTP authorization metadata
+    * The editble function below relies on copies we have in the store
+    * of the results of previous HTTP transactions. Howver, when
+    * the user logs in, then that data misrepresents what would happen
+    * if the user tried again.
+    */
+  }, {
+    key: "flagAuthorizationMetadata",
+    value: function flagAuthorizationMetadata(kb) {
+      var _kb$fetcher;
+      if (!kb) {
+        kb = this.store;
+      }
+      var meta = (_kb$fetcher = kb.fetcher) === null || _kb$fetcher === void 0 ? void 0 : _kb$fetcher.appNode;
+      var requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), undefined, meta).map(function (st) {
+        return st.subject;
+      });
+      var _iterator = _createForOfIteratorHelper(requests),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var request = _step.value;
+          var _response = kb.any(request, this.ns.link('response'), null, meta);
+          if (_response !== undefined) {
+            // ts
+            kb.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+
     /**
      * Tests whether a file is editable.
      * If the file has a specific annotation that it is machine written,
      * for safety, it is editable (this doesn't actually check for write access)
      * If the file has wac-allow and accept patch headers, those are respected.
      * and local write access is determined by those headers.
-     * This version only looks at past HTTP requests, does not make new ones.
+     * This async version not only looks at past HTTP requests, it also makes new ones if necessary.
+     *
+     * @returns The method string SPARQL or DAV or
+     *   LOCALFILE or false if known, undefined if not known.
+     */
+  }, {
+    key: "checkEditable",
+    value: function () {
+      var _checkEditable = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(uri, kb) {
+        var _kb$fetcher2;
+        var initial, final;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (uri) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return", false);
+            case 2:
+              if (!kb) {
+                kb = this.store;
+              }
+              initial = this.editable(uri, kb);
+              if (!(initial !== undefined)) {
+                _context.next = 6;
+                break;
+              }
+              return _context.abrupt("return", initial);
+            case 6:
+              _context.next = 8;
+              return (_kb$fetcher2 = kb.fetcher) === null || _kb$fetcher2 === void 0 ? void 0 : _kb$fetcher2.load(uri);
+            case 8:
+              final = this.editable(uri, kb); // console.log(`Loaded ${uri} just to check editable, result: ${final}.`)
+              return _context.abrupt("return", final);
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function checkEditable(_x, _x2) {
+        return _checkEditable.apply(this, arguments);
+      }
+      return checkEditable;
+    }()
+    /**
+     * Tests whether a file is editable.
+     * If the file has a specific annotation that it is machine written,
+     * for safety, it is editable (this doesn't actually check for write access)
+     * If the file has wac-allow and accept patch headers, those are respected.
+     * and local write access is determined by those headers.
+     * This synchronous version only looks at past HTTP requests, does not make new ones.
      *
      * @returns The method string SPARQL or DAV or
      *   LOCALFILE or false if known, undefined if not known.
@@ -94,6 +183,7 @@ var UpdateManager = /*#__PURE__*/function () {
   }, {
     key: "editable",
     value: function editable(uri, kb) {
+      var _kb$fetcher3;
       if (!uri) {
         return false; // Eg subject is bnode, no known doc to write to
       }
@@ -103,27 +193,34 @@ var UpdateManager = /*#__PURE__*/function () {
       }
       uri = (0, _termValue.termValue)(uri);
       if (!this.isHttpUri(uri)) {
-        if (kb.holds(this.store.rdfFactory.namedNode(uri), this.store.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), this.store.rdfFactory.namedNode('http://www.w3.org/2007/ont/link#MachineEditableDocument'))) {
+        if (kb.holds(kb.rdfFactory.namedNode(uri), kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'), kb.rdfFactory.namedNode('http://www.w3.org/2007/ont/link#MachineEditableDocument'))) {
           return 'LOCALFILE';
         }
       }
       var request;
       var definitive = false;
+      var meta = (_kb$fetcher3 = kb.fetcher) === null || _kb$fetcher3 === void 0 ? void 0 : _kb$fetcher3.appNode;
+      // const kb = s
+
       // @ts-ignore passes a string to kb.each, which expects a term. Should this work?
-      var requests = kb.each(undefined, this.ns.link('requestedURI'), (0, _uri.docpart)(uri));
+      var requests = kb.each(undefined, this.ns.link('requestedURI'), (0, _uri.docpart)(uri), meta);
       var method;
       for (var r = 0; r < requests.length; r++) {
         request = requests[r];
         if (request !== undefined) {
-          var response = kb.any(request, this.ns.link('response'));
-          if (request !== undefined) {
-            var wacAllow = kb.anyValue(response, this.ns.httph('wac-allow'));
+          var _response2 = kb.any(request, this.ns.link('response'), null, meta);
+          if (_response2 !== undefined) {
+            // ts
+
+            var outOfDate = kb.anyJS(_response2, this.ns.link('outOfDate'), null, meta);
+            if (outOfDate) continue;
+            var wacAllow = kb.anyValue(_response2, this.ns.httph('wac-allow'));
             if (wacAllow) {
-              var _iterator = _createForOfIteratorHelper(wacAllow.split(',')),
-                _step;
+              var _iterator2 = _createForOfIteratorHelper(wacAllow.split(',')),
+                _step2;
               try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  var bit = _step.value;
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  var bit = _step2.value;
                   var lr = bit.split('=');
                   if (lr[0].includes('user') && !lr[1].includes('write') && !lr[1].includes('append')) {
                     // console.log('    editable? excluded by WAC-Allow: ', wacAllow)
@@ -131,12 +228,12 @@ var UpdateManager = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator.e(err);
+                _iterator2.e(err);
               } finally {
-                _iterator.f();
+                _iterator2.f();
               }
             }
-            var acceptPatch = kb.each(response, this.ns.httph('accept-patch'));
+            var acceptPatch = kb.each(_response2, this.ns.httph('accept-patch'));
             if (acceptPatch.length) {
               for (var i = 0; i < acceptPatch.length; i++) {
                 method = acceptPatch[i].value.trim();
@@ -144,7 +241,7 @@ var UpdateManager = /*#__PURE__*/function () {
                 if (method.indexOf('application/sparql-update-single-match') >= 0) return 'SPARQL';
               }
             }
-            var authorVia = kb.each(response, this.ns.httph('ms-author-via'));
+            var authorVia = kb.each(_response2, this.ns.httph('ms-author-via'));
             if (authorVia.length) {
               for (var _i = 0; _i < authorVia.length; _i++) {
                 method = authorVia[_i].value.trim();
@@ -159,7 +256,7 @@ var UpdateManager = /*#__PURE__*/function () {
             if (!this.isHttpUri(uri)) {
               if (!wacAllow) return false;else return 'LOCALFILE';
             }
-            var status = kb.each(response, this.ns.http('status'));
+            var status = kb.each(_response2, this.ns.http('status'));
             if (status.length) {
               for (var _i2 = 0; _i2 < status.length; _i2++) {
                 // @ts-ignore since statuses should be TFTerms, this should always be false

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.30",
+  "version": "2.2.31-10c4e145",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -48,7 +48,7 @@
     "@frogcat/ttl2jsonld": "^0.0.9",
     "@xmldom/xmldom": "^0.8.6",
     "cross-fetch": "^3.1.5",
-    "jsonld": "^5.2.0",
+    "jsonld": "^8.1.1",
     "n3": "^1.16.3",
     "solid-namespace": "^0.5.2"
   },
@@ -94,7 +94,7 @@
     "build:types": "tsc --emitDeclarationOnly -d --moduleResolution node --declarationDir lib",
     "build:all": "npm run build && npm run build:types && npm run build:browser && npm run build:esm",
     "doc": "typedoc --out ./doc ./src/index.ts --excludePrivate --excludeInternal --tsconfig ./tsconfig.json",
-    "prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
+    "ignore:prepublishOnly": "npm ci && npm run build:all && npm run doc && npm run test",
     "postversion": "git push --follow-tags",
     "start": "webpack serve --port 4800",
     "test": "npm run test:unit && npm run test:serialize && npm run test:types",

package/src/fetcher.ts

@@ -721,7 +721,7 @@ export default class Fetcher implements CallbackifyInterface {
   _fetch: Fetch
   mediatypes: MediatypesMap
   /** Denoting this session */
-  appNode: BlankNode
+  appNode: NamedNode
   /**
    * this.requested[uri] states:
    * undefined     no record of web access or records reset
@@ -771,8 +771,9 @@ export default class Fetcher implements CallbackifyInterface {
     if (!this._fetch) {
       throw new Error('No _fetch function available for Fetcher')
     }
-
-    this.appNode = this.store.rdfFactory.blankNode()
+    // This is the name of the graph we store all the HTTP metadata in
+    this.appNode = this.store.sym('chrome://TheCurrentSession')
+    // this.appNode = this.store.rdfFactory.blankNode() // Needs to have a URI in tests
     this.store.fetcher = this // Bi-linked
     this.requested = {}
     this.timeouts = {}
@@ -973,6 +974,19 @@ export default class Fetcher implements CallbackifyInterface {
     docuri = docuri.split('#')[0]
 
     options = this.initFetchOptions(docuri, options)
+    // if metadata flaged clear cache and removeDocument
+    const meta = this.appNode
+    const kb = this.store
+    const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.sym(docuri), meta).map(st => st.subject)
+    for (const request of requests) {
+      const response = kb.any(request, this.ns.link('response'), null, meta) as Quad_Subject
+      if (response !== undefined) { // ts
+        const quad = kb.statementsMatching(response, this.ns.link('outOfDate'), true as any, meta)
+        kb.remove(quad)
+        options.force = true
+        options.clearPreviousData = true
+      }
+    }
 
     const initialisedOptions = this.initFetchOptions(docuri, options)
 
@@ -1725,22 +1739,22 @@ export default class Fetcher implements CallbackifyInterface {
 
     let responseNode = kb.bnode()
 
-    kb.add(options.req, this.ns.link('response'), responseNode, responseNode)
+    kb.add(options.req, this.ns.link('response'), responseNode, this.appNode)
     kb.add(responseNode, this.ns.http('status'),
-    kb.rdfFactory.literal(response.status as any), responseNode)
+    kb.rdfFactory.literal(response.status as any), this.appNode)
     kb.add(responseNode, this.ns.http('statusText'),
-    kb.rdfFactory.literal(response.statusText), responseNode)
+    kb.rdfFactory.literal(response.statusText), this.appNode)
 
     // Save the response headers
     response.headers.forEach((value, header) => {
-      kb.add(responseNode, this.ns.httph(header), this.store.rdfFactory.literal(value), responseNode)
+      kb.add(responseNode, this.ns.httph(header), this.store.rdfFactory.literal(value), this.appNode)
 
       if (header === 'content-type') {
         kb.add(
           options.resource,
           this.ns.rdf('type'),
           kb.rdfFactory.namedNode(Util.mediaTypeClass(value).value),
-          responseNode
+          this.appNode // responseNode
         )
       }
     })

package/src/jsonldparser.js

@@ -1,5 +1,3 @@
-
-import jsonld from 'jsonld'
 import { arrayToStatements } from './utils'
 
 /**
@@ -70,8 +68,8 @@ export default function jsonldParser (str, kb, base, callback) {
     ? base.value
     : base
 
-  return jsonld
-    .flatten(JSON.parse(str), null, { base: baseString })
+  return import('jsonld')
+    .then(jsonld => { return jsonld.flatten(JSON.parse(str), null, { base: baseString }) })
     .then((flattened) => flattened.reduce((store, flatResource) => {
 
       kb = processResource(kb, base, flatResource)

package/src/store.ts

@@ -871,10 +871,27 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
   }
 
   /**
-   * Removes all statements in a doc
+   * Removes all statements in a doc, along with the related metadata including request/response
    * @param doc - The document / graph
    */
   removeDocument(doc: Quad_Graph): IndexedFormula {
+    const meta = this.sym('chrome://TheCurrentSession') // or this.rdfFactory.namedNode('chrome://TheCurrentSession')
+    const linkNamespaceURI = 'http://www.w3.org/2007/ont/link#' // alain
+    // remove request/response and metadata
+    const requests = this.statementsMatching(undefined, this.sym(`${linkNamespaceURI}requestedURI`), this.rdfFactory.literal(doc.value), meta).map(st => st.subject)
+    for (var r = 0; r < requests.length; r++) {
+      const request = requests[r]
+      if (request !== undefined) {
+        this.removeMatches(request, null, null, meta)
+        const response = this.any(request, this.sym(`${linkNamespaceURI}response`), null, meta) as Quad_Subject
+        if (response !== undefined) { // ts
+          this.removeMatches(response, null, null, meta)
+        }
+      }
+    }
+    this.removeMatches(this.sym(doc.value), null, null, meta) // content-type
+
+    // remove document
     var sts: Quad[] = this.statementsMatching(undefined, undefined, undefined, doc).slice() // Take a copy as this is the actual index
     for (var i = 0; i < sts.length; i++) {
       this.removeStatement(sts[i])

package/src/update-manager.ts

@@ -81,14 +81,61 @@ export default class UpdateManager {
     return( uri.slice(0,4) === 'http' )
   }
 
+/** Remove from the store HTTP authorization metadata
+* The editble function below relies on copies we have in the store
+* of the results of previous HTTP transactions. Howver, when
+* the user logs in, then that data misrepresents what would happen
+* if the user tried again.
+*/
+flagAuthorizationMetadata (kb?: IndexedFormula) {
+  if (!kb) {
+    kb = this.store
+  }
+  const meta = kb.fetcher?.appNode
+  const requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), undefined, meta).map(st => st.subject)
+  for (const request of requests) {
+    const response = kb.any(request, this.ns.link('response'), null, meta) as Quad_Subject
+    if (response !== undefined) { // ts
+      kb.add(response, this.ns.link('outOfDate'), true as any, meta) // @@ Boolean is fine - fix types
+    }
+  }
+}
+
+/**
+ * Tests whether a file is editable.
+ * If the file has a specific annotation that it is machine written,
+ * for safety, it is editable (this doesn't actually check for write access)
+ * If the file has wac-allow and accept patch headers, those are respected.
+ * and local write access is determined by those headers.
+ * This async version not only looks at past HTTP requests, it also makes new ones if necessary.
+ *
+ * @returns The method string SPARQL or DAV or
+ *   LOCALFILE or false if known, undefined if not known.
+ */
+ async checkEditable (uri: string | NamedNode, kb?: IndexedFormula): Promise<string | boolean | undefined> {
+  if (!uri) {
+    return false // Eg subject is bnode, no known doc to write to
+  }
+  if (!kb) {
+    kb = this.store
+  }
 
+  const initial = this.editable(uri, kb)
+   if (initial !==  undefined) {
+     return initial
+   }
+   await kb.fetcher?.load(uri)
+   const final = this.editable(uri, kb)
+   // console.log(`Loaded ${uri} just to check editable, result: ${final}.`)
+   return final
+ }
   /**
    * Tests whether a file is editable.
    * If the file has a specific annotation that it is machine written,
    * for safety, it is editable (this doesn't actually check for write access)
    * If the file has wac-allow and accept patch headers, those are respected.
    * and local write access is determined by those headers.
-   * This version only looks at past HTTP requests, does not make new ones.
+   * This synchronous version only looks at past HTTP requests, does not make new ones.
    *
    * @returns The method string SPARQL or DAV or
    *   LOCALFILE or false if known, undefined if not known.
@@ -104,23 +151,30 @@ export default class UpdateManager {
 
     if ( !this.isHttpUri(uri as string) ) {
       if (kb.holds(
-          this.store.rdfFactory.namedNode(uri),
-          this.store.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
-          this.store.rdfFactory.namedNode('http://www.w3.org/2007/ont/link#MachineEditableDocument'))) {
+          kb.rdfFactory.namedNode(uri),
+          kb.rdfFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
+          kb.rdfFactory.namedNode('http://www.w3.org/2007/ont/link#MachineEditableDocument'))) {
         return 'LOCALFILE'
       }
     }
 
     var request
     var definitive = false
+    const meta = kb.fetcher?.appNode
+    // const kb = s
+
      // @ts-ignore passes a string to kb.each, which expects a term. Should this work?
-    var requests = kb.each(undefined, this.ns.link('requestedURI'), docpart(uri))
+    var requests = kb.each(undefined, this.ns.link('requestedURI'), docpart(uri), meta)
     var method: string
     for (var r = 0; r < requests.length; r++) {
       request = requests[r]
       if (request !== undefined) {
-        var response = kb.any(request, this.ns.link('response')) as Quad_Subject
-        if (request !== undefined) {
+        const response = kb.any(request, this.ns.link('response'), null, meta) as Quad_Subject
+        if (response !== undefined) { // ts
+
+          const outOfDate = kb.anyJS(response, this.ns.link('outOfDate'), null, meta) as Quad_Subject
+          if (outOfDate) continue
+
           var wacAllow = kb.anyValue(response, this.ns.httph('wac-allow'))
           if (wacAllow) {
             for (var bit of wacAllow.split(',')) {

package/esm/convert.js

@@ -1,60 +0,0 @@
-import asyncLib from 'async'; // @@ Goal: remove this dependency
-import jsonld from 'jsonld';
-import { Parser, Writer } from 'n3'; // @@ Goal: remove this dependency
-
-export function convertToJson(n3String, jsonCallback) {
-  var jsonString;
-  var n3Parser = new Parser();
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  });
-  asyncLib.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, quad, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    try {
-      jsonld.fromRDF(result, {
-        format: 'application/nquads'
-      }).then(result => {
-        callback(null, result);
-      });
-    } catch (err) {
-      callback(err);
-    }
-  }, function (json, callback) {
-    jsonString = JSON.stringify(json);
-    jsonCallback(null, jsonString);
-  }], function (err, result) {
-    jsonCallback(err, jsonString);
-  });
-}
-export function convertToNQuads(n3String, nquadCallback) {
-  var nquadString;
-  var n3Parser = new Parser();
-  var n3Writer = new Writer({
-    format: 'N-Quads'
-  });
-  asyncLib.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, triple, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    nquadString = result;
-    nquadCallback(null, nquadString);
-  }], function (err, result) {
-    nquadCallback(err, nquadString);
-  });
-}

package/lib/convert.d.ts

@@ -1,2 +0,0 @@
-export function convertToJson(n3String: any, jsonCallback: any): void;
-export function convertToNQuads(n3String: any, nquadCallback: any): void;

package/lib/convert.js

@@ -1,71 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.convertToJson = convertToJson;
-exports.convertToNQuads = convertToNQuads;
-var _async = _interopRequireDefault(require("async"));
-var _jsonld = _interopRequireDefault(require("jsonld"));
-var _n = require("n3");
-// @@ Goal: remove this dependency
-
-// @@ Goal: remove this dependency
-
-function convertToJson(n3String, jsonCallback) {
-  var jsonString;
-  var n3Parser = new _n.Parser();
-  var n3Writer = new _n.Writer({
-    format: 'N-Quads'
-  });
-  _async.default.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, quad, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    try {
-      _jsonld.default.fromRDF(result, {
-        format: 'application/nquads'
-      }).then(result => {
-        callback(null, result);
-      });
-    } catch (err) {
-      callback(err);
-    }
-  }, function (json, callback) {
-    jsonString = JSON.stringify(json);
-    jsonCallback(null, jsonString);
-  }], function (err, result) {
-    jsonCallback(err, jsonString);
-  });
-}
-function convertToNQuads(n3String, nquadCallback) {
-  var nquadString;
-  var n3Parser = new _n.Parser();
-  var n3Writer = new _n.Writer({
-    format: 'N-Quads'
-  });
-  _async.default.waterfall([function (callback) {
-    n3Parser.parse(n3String, function (error, triple, prefixes) {
-      if (error) {
-        callback(error);
-      } else if (quad !== null) {
-        n3Writer.addQuad(quad);
-      } else {
-        n3Writer.end(callback);
-      }
-    });
-  }, function (result, callback) {
-    nquadString = result;
-    nquadCallback(null, nquadString);
-  }], function (err, result) {
-    nquadCallback(err, nquadString);
-  });
-}