rdflib 2.2.33-bdac51fe → 2.2.33-e57222fb

package/esm/fetcher.js

@@ -47,7 +47,7 @@ import rdfParse from './parse';
 import { parseRDFaDOM } from './rdfaparser';
 import RDFParser from './rdfxmlparser';
 import * as Uri from './uri';
-import { isNamedNode } from './utils/terms';
+import { isCollection, isNamedNode } from './utils/terms';
 import * as Util from './utils-js';
 import serialize from './serialize';
 import crossFetch, { Headers } from 'cross-fetch';
@@ -1004,7 +1004,12 @@ var Fetcher = /*#__PURE__*/function () {
       statusMessage = '[' + now.getHours() + ':' + now.getMinutes() + ':' + now.getSeconds() + '.' + now.getMilliseconds() + '] ' + statusMessage;
       // </Debug>
       var kb = this.store;
-      kb.add(req, this.ns.link('status'), kb.rdfFactory.literal(statusMessage), this.appNode);
+      var statusNode = kb.the(req, this.ns.link('status'));
+      if (isCollection(statusNode)) {
+        statusNode.append(kb.rdfFactory.literal(statusMessage));
+      } else {
+        log.warn('web.js: No list to add to: ' + statusNode + ',' + statusMessage);
+      }
     }
 
     /**
@@ -1447,6 +1452,7 @@ var Fetcher = /*#__PURE__*/function () {
       // We store the docuri as a string, not as a node,
       // see https://github.com/linkeddata/rdflib.js/pull/427#pullrequestreview-447910061
       kb.add(req, this.ns.link('requestedURI'), kb.rdfFactory.literal(docuri), this.appNode);
+      kb.add(req, this.ns.link('status'), kb.collection(), this.appNode);
     }
   }, {
     key: "saveResponseMetadata",
@@ -1710,7 +1716,12 @@ var Fetcher = /*#__PURE__*/function () {
 
         // Before we parse new data clear old but only on 200
         if (options.clearPreviousData) {
-          kb.removeDocument(options.resource);
+          // kb.removeDocument(options.resource)
+          // only remove content, keep metatdata
+          var sts = kb.statementsMatching(undefined, undefined, undefined, options.resource).slice(); // Take a copy as this is the actual index
+          for (var i = 0; i < sts.length; i++) {
+            kb.removeStatement(sts[i]);
+          }
         }
         var isImage = contentType.includes('image/') || contentType.includes('application/pdf');
         if (contentType && isImage) {

package/esm/store.js

@@ -825,52 +825,47 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     }
 
     /**
-     * Removes all metadata
+     * 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) {
+      this.removeMetadata(doc);
+      // 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]);
+      }
+      return this;
+    }
   }, {
     key: "removeMetadata",
     value: function removeMetadata(doc) {
-      var _this$fetcher;
-      var meta = (_this$fetcher = this.fetcher) === null || _this$fetcher === void 0 ? void 0 : _this$fetcher.appNode; // this.sym('chrome://TheCurrentSession')
-      var linkNamespaceURI = 'http://www.w3.org/2007/ont/link#';
-      var requests = this.statementsMatching(null, this.sym("".concat(linkNamespaceURI, "requestedURI")), this.rdfFactory.literal(doc.value), meta).map(function (st) {
+      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 != null) {
-          // loose equality for null and undefined
+        if (request != undefined) {
           var response = this.any(request, this.sym("".concat(linkNamespaceURI, "response")), null, meta);
-          if (response != null) {
+          if (response != undefined) {
+            // ts
             this.removeMatches(response, null, null, meta);
           }
+          // may be not needed
           var status = this.any(request, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
-          if (status != null) {
+          if (status != undefined) {
+            // ts
             this.removeMatches(status, null, null, meta);
           }
           this.removeMatches(request, null, null, meta);
         }
       }
-      this.removeMatches(doc, null, null, meta);
-      return this;
-    }
-
-    /**
-     * 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) {
-      // remove request/response and metadata
-      this.removeMetadata(doc);
-
-      // 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]);
-      }
+      this.removeMatches(this.sym(doc.value), null, null, meta); // content-type
       return this;
     }
 

package/esm/update-manager.js

@@ -99,7 +99,7 @@ var UpdateManager = /*#__PURE__*/function () {
         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) {
+          if (_response != undefined) {
             // ts
             kb.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
           }
@@ -649,7 +649,7 @@ var UpdateManager = /*#__PURE__*/function () {
             }
           } else {
             control.reloading = false;
-            if (response.status === 0) {
+            if (response && response.status === 0) {
               // console.log('Network error refreshing the data. Retrying in ' +
               // retryTimeout / 1000)
               control.reloading = true;

package/lib/fetcher.js

@@ -1010,7 +1010,12 @@ var Fetcher = /*#__PURE__*/function () {
       statusMessage = '[' + now.getHours() + ':' + now.getMinutes() + ':' + now.getSeconds() + '.' + now.getMilliseconds() + '] ' + statusMessage;
       // </Debug>
       var kb = this.store;
-      kb.add(req, this.ns.link('status'), kb.rdfFactory.literal(statusMessage), this.appNode);
+      var statusNode = kb.the(req, this.ns.link('status'));
+      if ((0, _terms.isCollection)(statusNode)) {
+        statusNode.append(kb.rdfFactory.literal(statusMessage));
+      } else {
+        _log.default.warn('web.js: No list to add to: ' + statusNode + ',' + statusMessage);
+      }
     }
 
     /**
@@ -1453,6 +1458,7 @@ var Fetcher = /*#__PURE__*/function () {
       // We store the docuri as a string, not as a node,
       // see https://github.com/linkeddata/rdflib.js/pull/427#pullrequestreview-447910061
       kb.add(req, this.ns.link('requestedURI'), kb.rdfFactory.literal(docuri), this.appNode);
+      kb.add(req, this.ns.link('status'), kb.collection(), this.appNode);
     }
   }, {
     key: "saveResponseMetadata",
@@ -1716,7 +1722,12 @@ var Fetcher = /*#__PURE__*/function () {
 
         // Before we parse new data clear old but only on 200
         if (options.clearPreviousData) {
-          kb.removeDocument(options.resource);
+          // kb.removeDocument(options.resource)
+          // only remove content, keep metatdata
+          var sts = kb.statementsMatching(undefined, undefined, undefined, options.resource).slice(); // Take a copy as this is the actual index
+          for (var i = 0; i < sts.length; i++) {
+            kb.removeStatement(sts[i]);
+          }
         }
         var isImage = contentType.includes('image/') || contentType.includes('application/pdf');
         if (contentType && isImage) {

package/lib/store.d.ts

@@ -232,16 +232,12 @@ export default class IndexedFormula extends Formula {
      * @param st - A Statement or array of Statements to remove
      */
     remove(st: Quad | Quad[]): IndexedFormula;
-    /**
-     * Removes all metadata
-     * @param doc - The document / graph
-     */
-    removeMetadata(doc: Quad_Graph): IndexedFormula;
     /**
      * Removes all statements in a doc, along with the related metadata including request/response
      * @param doc - The document / graph
      */
     removeDocument(doc: Quad_Graph): IndexedFormula;
+    removeMetadata(doc: Quad_Graph): IndexedFormula;
     /**
      * Remove all statements matching args (within limit) *
      * @param subj The subject

package/lib/store.js

@@ -828,52 +828,47 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     }
 
     /**
-     * Removes all metadata
+     * 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) {
+      this.removeMetadata(doc);
+      // 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]);
+      }
+      return this;
+    }
   }, {
     key: "removeMetadata",
     value: function removeMetadata(doc) {
-      var _this$fetcher;
-      var meta = (_this$fetcher = this.fetcher) === null || _this$fetcher === void 0 ? void 0 : _this$fetcher.appNode; // this.sym('chrome://TheCurrentSession')
-      var linkNamespaceURI = 'http://www.w3.org/2007/ont/link#';
-      var requests = this.statementsMatching(null, this.sym("".concat(linkNamespaceURI, "requestedURI")), this.rdfFactory.literal(doc.value), meta).map(function (st) {
+      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 != null) {
-          // loose equality for null and undefined
+        if (request != undefined) {
           var response = this.any(request, this.sym("".concat(linkNamespaceURI, "response")), null, meta);
-          if (response != null) {
+          if (response != undefined) {
+            // ts
             this.removeMatches(response, null, null, meta);
           }
+          // may be not needed
           var status = this.any(request, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
-          if (status != null) {
+          if (status != undefined) {
+            // ts
             this.removeMatches(status, null, null, meta);
           }
           this.removeMatches(request, null, null, meta);
         }
       }
-      this.removeMatches(doc, null, null, meta);
-      return this;
-    }
-
-    /**
-     * 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) {
-      // remove request/response and metadata
-      this.removeMetadata(doc);
-
-      // 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]);
-      }
+      this.removeMatches(this.sym(doc.value), null, null, meta); // content-type
       return this;
     }
 

package/lib/update-manager.js

@@ -108,7 +108,7 @@ var UpdateManager = /*#__PURE__*/function () {
         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) {
+          if (_response != undefined) {
             // ts
             kb.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
           }
@@ -658,7 +658,7 @@ var UpdateManager = /*#__PURE__*/function () {
             }
           } else {
             control.reloading = false;
-            if (response.status === 0) {
+            if (response && response.status === 0) {
               // console.log('Network error refreshing the data. Retrying in ' +
               // retryTimeout / 1000)
               control.reloading = true;

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.33-bdac51fe",
+  "version": "2.2.33-e57222fb",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/fetcher.ts

@@ -34,7 +34,7 @@ import rdfParse from './parse'
 import { parseRDFaDOM } from './rdfaparser'
 import RDFParser from './rdfxmlparser'
 import * as Uri from './uri'
-import { isNamedNode } from './utils/terms'
+import { isCollection, isNamedNode} from './utils/terms'
 import * as Util from './utils-js'
 import serialize from './serialize'
 import crossFetch, { Headers } from 'cross-fetch'
@@ -1274,7 +1274,13 @@ export default class Fetcher implements CallbackifyInterface {
       now.getSeconds() + '.' + now.getMilliseconds() + '] ' + statusMessage
     // </Debug>
     let kb = this.store
-    kb.add(req, this.ns.link('status'), kb.rdfFactory.literal(statusMessage), this.appNode)
+
+    const statusNode = kb.the(req, this.ns.link('status'))
+    if (isCollection(statusNode)) {
+      statusNode.append(kb.rdfFactory.literal(statusMessage))
+    } else {
+      log.warn('web.js: No list to add to: ' + statusNode + ',' + statusMessage)
+    }
   }
 
   /**
@@ -1719,6 +1725,7 @@ export default class Fetcher implements CallbackifyInterface {
     // We store the docuri as a string, not as a node,
     // see https://github.com/linkeddata/rdflib.js/pull/427#pullrequestreview-447910061
     kb.add(req, this.ns.link('requestedURI'), kb.rdfFactory.literal(docuri), this.appNode)
+    kb.add(req, this.ns.link('status'), kb.collection(), this.appNode)
   }
 
   saveResponseMetadata (
@@ -1997,7 +2004,12 @@ export default class Fetcher implements CallbackifyInterface {
 
       // Before we parse new data clear old but only on 200
       if (options.clearPreviousData) {
-        kb.removeDocument(options.resource)
+        // kb.removeDocument(options.resource)
+        // only remove content, keep metatdata
+        const sts = kb.statementsMatching(undefined, undefined, undefined, options.resource).slice() // Take a copy as this is the actual index
+        for (let i = 0; i < sts.length; i++) {
+          kb.removeStatement(sts[i])
+        }
       }
 
       let isImage = contentType.includes('image/') ||

package/src/store.ts

@@ -871,44 +871,40 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
   }
 
   /**
-   * Removes all metadata
+   * Removes all statements in a doc, along with the related metadata including request/response
    * @param doc - The document / graph
    */
+  removeDocument(doc: Quad_Graph): IndexedFormula {
+    this.removeMetadata(doc)
+    // 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])
+    }
+    return this
+  }
+
   removeMetadata(doc: Quad_Graph): IndexedFormula {
-    const meta = this.fetcher?.appNode // this.sym('chrome://TheCurrentSession')
-    const linkNamespaceURI = 'http://www.w3.org/2007/ont/link#'
-    const requests = this.statementsMatching(null, this.sym(`${linkNamespaceURI}requestedURI`), this.rdfFactory.literal(doc.value), meta).map(st => st.subject)
+    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 != null) { // loose equality for null and undefined
+      if (request != undefined) {
         const response = this.any(request, this.sym(`${linkNamespaceURI}response`), null, meta) as Quad_Subject
-        if (response != null) {
+        if (response != undefined) { // ts
           this.removeMatches(response, null, null, meta)
         }
+        // may be not needed
         const status = this.any(request, this.sym(`${linkNamespaceURI}status`), null, meta) as Quad_Subject
-        if (status != null) {
+        if (status != undefined) { // ts
           this.removeMatches(status, null, null, meta)
         }
         this.removeMatches(request, null, null, meta)
       }
     }
-    this.removeMatches(doc as Quad_Subject, null, null, meta)
-    return this
-  }
-
-  /**
-   * Removes all statements in a doc, along with the related metadata including request/response
-   * @param doc - The document / graph
-   */
-  removeDocument(doc: Quad_Graph): IndexedFormula {
-    // remove request/response and metadata
-    this.removeMetadata(doc)
-
-    // 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])
-    }
+    this.removeMatches(this.sym(doc.value), null, null, meta) // content-type
     return this
   }
 

package/src/update-manager.ts

@@ -95,7 +95,7 @@ export default class UpdateManager {
     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
+      if (response != undefined) { // ts
         kb.add(response, this.ns.link('outOfDate'), true as any, meta) // @@ Boolean is fine - fix types
       }
     }
@@ -601,7 +601,7 @@ export default class UpdateManager {
           }
         } else {
           control.reloading = false
-          if ((response as Response).status === 0) {
+          if (response && (response as Response).status === 0) {
             // console.log('Network error refreshing the data. Retrying in ' +
             // retryTimeout / 1000)
             control.reloading = true