rdflib 2.2.30-c488dd5d → 2.2.31-10c4e145

package/esm/fetcher.js

@@ -6,6 +6,9 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
 /* global $SolidTestEnvironment */
@@ -598,7 +601,7 @@ var Fetcher = /*#__PURE__*/function () {
     if (!this._fetch) {
       throw new Error('No _fetch function available for Fetcher');
     }
-    // This is the name of the graphh we store all the HTTP metadata in
+    // 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
@@ -688,6 +691,31 @@ var Fetcher = /*#__PURE__*/function () {
       var docuri = termValue(uriIn);
       docuri = docuri.split('#')[0];
       options = this.initFetchOptions(docuri, options);
+      // if metadata flaged clear cache and removeDocument
+      var meta = this.appNode;
+      var kb = this.store;
+      var requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.sym(docuri), 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
+            var quad = kb.statementsMatching(_response, this.ns.link('outOfDate'), true, meta);
+            kb.remove(quad);
+            options.force = true;
+            options.clearPreviousData = true;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
       var initialisedOptions = this.initFetchOptions(docuri, options);
       return this.pendingFetchPromise(docuri, initialisedOptions.baseURI, initialisedOptions);
     }
@@ -1390,10 +1418,10 @@ var Fetcher = /*#__PURE__*/function () {
       for (var r = 0; r < requests.length; r++) {
         var request = requests[r];
         if (request !== undefined) {
-          var _response = kb.any(request, this.ns.link('response'));
-          if (_response !== undefined && kb.anyValue(_response, this.ns.http('status')) && kb.anyValue(_response, this.ns.http('status')).startsWith('2')) {
+          var _response2 = kb.any(request, this.ns.link('response'));
+          if (_response2 !== undefined && kb.anyValue(_response2, this.ns.http('status')) && kb.anyValue(_response2, this.ns.http('status')).startsWith('2')) {
             // Only look at success returns - not 401 error messagess etc
-            var results = kb.each(_response, this.ns.httph(header.toLowerCase()));
+            var results = kb.each(_response2, this.ns.httph(header.toLowerCase()));
             if (results.length) {
               return results.map(function (v) {
                 return v.value;
@@ -1432,17 +1460,19 @@ var Fetcher = /*#__PURE__*/function () {
       var _this10 = this;
       var kb = this.store;
       var responseNode = kb.bnode();
-      kb.add(options.req, this.ns.link('response'), responseNode, responseNode);
-      kb.add(responseNode, this.ns.http('status'), kb.rdfFactory.literal(response.status), responseNode);
-      kb.add(responseNode, this.ns.http('statusText'), kb.rdfFactory.literal(response.statusText), responseNode);
+      kb.add(options.req, this.ns.link('response'), responseNode, this.appNode);
+      kb.add(responseNode, this.ns.http('status'), kb.rdfFactory.literal(response.status), this.appNode);
+      kb.add(responseNode, this.ns.http('statusText'), kb.rdfFactory.literal(response.statusText), this.appNode);
 
       // Save the response headers
       response.headers.forEach(function (value, header) {
-        kb.add(responseNode, _this10.ns.httph(header), _this10.store.rdfFactory.literal(value), responseNode);
+        kb.add(responseNode, _this10.ns.httph(header), _this10.store.rdfFactory.literal(value), _this10.appNode);
         if (header === 'content-type') {
-          kb.add(options.resource, _this10.ns.rdf('type'), kb.rdfFactory.namedNode(Util.mediaTypeClass(value).value), responseNode);
+          kb.add(options.resource, _this10.ns.rdf('type'), kb.rdfFactory.namedNode(Util.mediaTypeClass(value).value), _this10.appNode // responseNode
+          );
         }
       });
+
       return responseNode;
     }
   }, {

package/esm/jsonldparser.js

@@ -1,4 +1,3 @@
-import jsonld from 'jsonld';
 import { arrayToStatements } from './utils';
 
 /**
@@ -60,8 +59,10 @@ function listToCollection(kb, obj) {
  */
 export default function jsonldParser(str, kb, base, callback) {
   var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
-  return jsonld.flatten(JSON.parse(str), null, {
-    base: baseString
+  return import('jsonld').then(function (jsonld) {
+    return jsonld.flatten(JSON.parse(str), null, {
+      base: baseString
+    });
   }).then(function (flattened) {
     return flattened.reduce(function (store, flatResource) {
       kb = processResource(kb, base, flatResource);

package/esm/store.js

@@ -838,12 +838,32 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     }
 
     /**
-     * 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
      */
   }, {
     key: "removeDocument",
     value: function removeDocument(doc) {
+      var meta = this.sym('chrome://TheCurrentSession'); // or this.rdfFactory.namedNode('chrome://TheCurrentSession')
+      var linkNamespaceURI = 'http://www.w3.org/2007/ont/link#'; // alain
+      // remove request/response and metadata
+      var requests = this.statementsMatching(undefined, this.sym("".concat(linkNamespaceURI, "requestedURI")), this.rdfFactory.literal(doc.value), meta).map(function (st) {
+        return st.subject;
+      });
+      for (var r = 0; r < requests.length; r++) {
+        var request = requests[r];
+        if (request !== undefined) {
+          this.removeMatches(request, null, null, meta);
+          var response = this.any(request, this.sym("".concat(linkNamespaceURI, "response")), null, meta);
+          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 = 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/esm/update-manager.js

@@ -86,9 +86,12 @@ var UpdateManager = /*#__PURE__*/function () {
     */
   }, {
     key: "flagAuthorizationMetadata",
-    value: function flagAuthorizationMetadata() {
-      var kb = this.store;
-      var meta = kb.fetcher.appNode;
+    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;
       });
@@ -100,7 +103,7 @@ var UpdateManager = /*#__PURE__*/function () {
           var _response = kb.any(request, this.ns.link('response'), null, meta);
           if (_response !== undefined) {
             // ts
-            this.store.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
+            kb.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
           }
         }
       } catch (err) {
@@ -125,24 +128,33 @@ var UpdateManager = /*#__PURE__*/function () {
     key: "checkEditable",
     value: function () {
       var _checkEditable = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(uri, kb) {
+        var _kb$fetcher2;
         var initial, final;
         return _regeneratorRuntime.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 = 3;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return", initial);
-            case 3:
-              _context.next = 5;
-              return this.store.fetcher.load(uri);
-            case 5:
-              final = this.editable(uri, kb);
-              console.log("Loaded ".concat(uri, " just to check editable, result: ").concat(final, "."));
-              return _context.abrupt("return", final);
+            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();
           }
@@ -167,6 +179,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
       }
@@ -176,13 +189,13 @@ var UpdateManager = /*#__PURE__*/function () {
       }
       uri = termValue(uri);
       if (!this.isHttpUri(uri)) {
-        if (this.store.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 = this.store.fetcher.appNode;
+      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?
@@ -191,11 +204,11 @@ var UpdateManager = /*#__PURE__*/function () {
       for (var r = 0; r < requests.length; r++) {
         request = requests[r];
         if (request !== undefined) {
-          var _response2 = kb.any(request, this.ns.link('response'));
+          var _response2 = kb.any(request, this.ns.link('response'), null, meta);
           if (_response2 !== undefined) {
             // ts
 
-            var outOfDate = kb.anyJS(_response2, this.ns.link('outOfDate'));
+            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) {

package/lib/fetcher.js

@@ -32,6 +32,9 @@ var _termValue = require("./utils/termValue");
 var _jsonldparser = _interopRequireDefault(require("./jsonldparser"));
 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 _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; }
 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; } }
 var Parsable = {
@@ -581,7 +584,7 @@ var Fetcher = /*#__PURE__*/function () {
     if (!this._fetch) {
       throw new Error('No _fetch function available for Fetcher');
     }
-    // This is the name of the graphh we store all the HTTP metadata in
+    // 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
@@ -671,6 +674,31 @@ var Fetcher = /*#__PURE__*/function () {
       var docuri = (0, _termValue.termValue)(uriIn);
       docuri = docuri.split('#')[0];
       options = this.initFetchOptions(docuri, options);
+      // if metadata flaged clear cache and removeDocument
+      var meta = this.appNode;
+      var kb = this.store;
+      var requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), kb.sym(docuri), 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
+            var quad = kb.statementsMatching(_response, this.ns.link('outOfDate'), true, meta);
+            kb.remove(quad);
+            options.force = true;
+            options.clearPreviousData = true;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
       var initialisedOptions = this.initFetchOptions(docuri, options);
       return this.pendingFetchPromise(docuri, initialisedOptions.baseURI, initialisedOptions);
     }
@@ -1373,10 +1401,10 @@ var Fetcher = /*#__PURE__*/function () {
       for (var r = 0; r < requests.length; r++) {
         var request = requests[r];
         if (request !== undefined) {
-          var _response = kb.any(request, this.ns.link('response'));
-          if (_response !== undefined && kb.anyValue(_response, this.ns.http('status')) && kb.anyValue(_response, this.ns.http('status')).startsWith('2')) {
+          var _response2 = kb.any(request, this.ns.link('response'));
+          if (_response2 !== undefined && kb.anyValue(_response2, this.ns.http('status')) && kb.anyValue(_response2, this.ns.http('status')).startsWith('2')) {
             // Only look at success returns - not 401 error messagess etc
-            var results = kb.each(_response, this.ns.httph(header.toLowerCase()));
+            var results = kb.each(_response2, this.ns.httph(header.toLowerCase()));
             if (results.length) {
               return results.map(function (v) {
                 return v.value;
@@ -1415,17 +1443,19 @@ var Fetcher = /*#__PURE__*/function () {
       var _this10 = this;
       var kb = this.store;
       var responseNode = kb.bnode();
-      kb.add(options.req, this.ns.link('response'), responseNode, responseNode);
-      kb.add(responseNode, this.ns.http('status'), kb.rdfFactory.literal(response.status), responseNode);
-      kb.add(responseNode, this.ns.http('statusText'), kb.rdfFactory.literal(response.statusText), responseNode);
+      kb.add(options.req, this.ns.link('response'), responseNode, this.appNode);
+      kb.add(responseNode, this.ns.http('status'), kb.rdfFactory.literal(response.status), this.appNode);
+      kb.add(responseNode, this.ns.http('statusText'), kb.rdfFactory.literal(response.statusText), this.appNode);
 
       // Save the response headers
       response.headers.forEach(function (value, header) {
-        kb.add(responseNode, _this10.ns.httph(header), _this10.store.rdfFactory.literal(value), responseNode);
+        kb.add(responseNode, _this10.ns.httph(header), _this10.store.rdfFactory.literal(value), _this10.appNode);
         if (header === 'content-type') {
-          kb.add(options.resource, _this10.ns.rdf('type'), kb.rdfFactory.namedNode(Util.mediaTypeClass(value).value), responseNode);
+          kb.add(options.resource, _this10.ns.rdf('type'), kb.rdfFactory.namedNode(Util.mediaTypeClass(value).value), _this10.appNode // responseNode
+          );
         }
       });
+
       return responseNode;
     }
   }, {

package/lib/jsonldparser.js

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = jsonldParser;
 exports.jsonldObjectToTerm = jsonldObjectToTerm;
-var _jsonld = _interopRequireDefault(require("jsonld"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _utils = require("./utils");
+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 || (0, _typeof2.default)(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; }
 /**
  * Parses json-ld formatted JS objects to a rdf Term.
  * @param kb - The DataFactory to use.
@@ -67,8 +69,12 @@ function listToCollection(kb, obj) {
  */
 function jsonldParser(str, kb, base, callback) {
   var baseString = base && Object.prototype.hasOwnProperty.call(base, 'termType') ? base.value : base;
-  return _jsonld.default.flatten(JSON.parse(str), null, {
-    base: baseString
+  return Promise.resolve().then(function () {
+    return _interopRequireWildcard(require('jsonld'));
+  }).then(function (jsonld) {
+    return jsonld.flatten(JSON.parse(str), null, {
+      base: baseString
+    });
   }).then(function (flattened) {
     return flattened.reduce(function (store, flatResource) {
       kb = processResource(kb, base, flatResource);

package/lib/store.d.ts

@@ -233,7 +233,7 @@ export default class IndexedFormula extends Formula {
      */
     remove(st: Quad | Quad[]): IndexedFormula;
     /**
-     * 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;

package/lib/store.js

@@ -827,12 +827,32 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     }
 
     /**
-     * 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
      */
   }, {
     key: "removeDocument",
     value: function removeDocument(doc) {
+      var meta = this.sym('chrome://TheCurrentSession'); // or this.rdfFactory.namedNode('chrome://TheCurrentSession')
+      var linkNamespaceURI = 'http://www.w3.org/2007/ont/link#'; // alain
+      // remove request/response and metadata
+      var requests = this.statementsMatching(undefined, this.sym("".concat(linkNamespaceURI, "requestedURI")), this.rdfFactory.literal(doc.value), meta).map(function (st) {
+        return st.subject;
+      });
+      for (var r = 0; r < requests.length; r++) {
+        var request = requests[r];
+        if (request !== undefined) {
+          this.removeMatches(request, null, null, meta);
+          var response = this.any(request, this.sym("".concat(linkNamespaceURI, "response")), null, meta);
+          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 = 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/lib/update-manager.d.ts

@@ -33,7 +33,7 @@ export default class UpdateManager {
     * the user logs in, then that data misrepresents what would happen
     * if the user tried again.
     */
-    flagAuthorizationMetadata(): void;
+    flagAuthorizationMetadata(kb?: IndexedFormula): void;
     /**
      * Tests whether a file is editable.
      * If the file has a specific annotation that it is machine written,

package/lib/update-manager.js

@@ -90,9 +90,12 @@ var UpdateManager = /*#__PURE__*/function () {
     */
   }, {
     key: "flagAuthorizationMetadata",
-    value: function flagAuthorizationMetadata() {
-      var kb = this.store;
-      var meta = kb.fetcher.appNode;
+    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;
       });
@@ -104,7 +107,7 @@ var UpdateManager = /*#__PURE__*/function () {
           var _response = kb.any(request, this.ns.link('response'), null, meta);
           if (_response !== undefined) {
             // ts
-            this.store.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
+            kb.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
           }
         }
       } catch (err) {
@@ -129,24 +132,33 @@ var UpdateManager = /*#__PURE__*/function () {
     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 = 3;
+                _context.next = 6;
                 break;
               }
               return _context.abrupt("return", initial);
-            case 3:
-              _context.next = 5;
-              return this.store.fetcher.load(uri);
-            case 5:
-              final = this.editable(uri, kb);
-              console.log("Loaded ".concat(uri, " just to check editable, result: ").concat(final, "."));
-              return _context.abrupt("return", final);
+            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();
           }
@@ -171,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
       }
@@ -180,13 +193,13 @@ var UpdateManager = /*#__PURE__*/function () {
       }
       uri = (0, _termValue.termValue)(uri);
       if (!this.isHttpUri(uri)) {
-        if (this.store.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 = this.store.fetcher.appNode;
+      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?
@@ -195,11 +208,11 @@ var UpdateManager = /*#__PURE__*/function () {
       for (var r = 0; r < requests.length; r++) {
         request = requests[r];
         if (request !== undefined) {
-          var _response2 = kb.any(request, this.ns.link('response'));
+          var _response2 = kb.any(request, this.ns.link('response'), null, meta);
           if (_response2 !== undefined) {
             // ts
 
-            var outOfDate = kb.anyJS(_response2, this.ns.link('outOfDate'));
+            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) {

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-c488dd5d",
+  "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"
   },

package/src/fetcher.ts

@@ -771,7 +771,7 @@ export default class Fetcher implements CallbackifyInterface {
     if (!this._fetch) {
       throw new Error('No _fetch function available for Fetcher')
     }
-    // This is the name of the graphh we store all the HTTP metadata in
+    // 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
@@ -974,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)
 
@@ -1726,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)