rdflib 2.2.34-beta → 2.2.34-beta3-e2aa46ee

package/esm/fetcher.js

@@ -703,7 +703,7 @@ var Fetcher = /*#__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
             var quad = kb.statementsMatching(_response, this.ns.link('outOfDate'), true, meta);
             kb.remove(quad);

package/esm/store.js

@@ -825,7 +825,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     }
 
     /**
-     * Removes all statements in a doc, along with the related metadata including request/response
+     * Removes all statements in a doc, along with the related metadata including request/response/status
      * @param doc - The document / graph
      */
   }, {
@@ -837,32 +837,44 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
       for (var i = 0; i < sts.length; i++) {
         this.removeStatement(sts[i]);
       }
+      this.removeMatches(doc, null, null);
       return this;
     }
   }, {
     key: "removeMetadata",
     value: function removeMetadata(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 linkNamespaceURI = 'http://www.w3.org/2007/ont/link#';
+      // remove status/response/request 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) {
+          // removeMatches unresolved issue with collection https://github.com/linkeddata/rdflib.js/issues/631
+          var sts = void 0;
+          // status collection
+          var status = this.any(request, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
+          if (status != undefined) {
+            sts = this.statementsMatching(status, this.sym("".concat(linkNamespaceURI, "status")), null, meta).slice();
+            for (var i = 0; i < sts.length; i++) {
+              this.removeStatement(sts[i]);
+            }
+          }
+          // response items list
           var response = this.any(request, this.sym("".concat(linkNamespaceURI, "response")), null, meta);
           if (response != undefined) {
-            // ts
-            this.removeMatches(response, null, null, meta);
+            sts = this.statementsMatching(response, null, null, meta).slice();
+            for (var i = 0; i < sts.length; i++) {
+              this.removeStatement(sts[i]);
+            }
           }
-          // may be not needed
-          var status = this.any(request, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
-          if (status != undefined) {
-            // ts
-            this.removeMatches(status, null, null, meta);
+          // request triples
+          sts = this.statementsMatching(request, null, null, meta).slice();
+          for (var i = 0; i < sts.length; i++) {
+            this.removeStatement(sts[i]);
           }
-          this.removeMatches(request, null, null, meta);
         }
       }
       this.removeMatches(this.sym(doc.value), null, null, meta); // content-type

package/lib/fetcher.js

@@ -709,7 +709,7 @@ var Fetcher = /*#__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
             var quad = kb.statementsMatching(_response, this.ns.link('outOfDate'), true, meta);
             kb.remove(quad);

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, along with the related metadata including request/response
+     * Removes all statements in a doc, along with the related metadata including request/response/status
      * @param doc - The document / graph
      */
     removeDocument(doc: Quad_Graph): IndexedFormula;

package/lib/store.js

@@ -828,7 +828,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     }
 
     /**
-     * Removes all statements in a doc, along with the related metadata including request/response
+     * Removes all statements in a doc, along with the related metadata including request/response/status
      * @param doc - The document / graph
      */
   }, {
@@ -840,32 +840,44 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
       for (var i = 0; i < sts.length; i++) {
         this.removeStatement(sts[i]);
       }
+      this.removeMatches(doc, null, null);
       return this;
     }
   }, {
     key: "removeMetadata",
     value: function removeMetadata(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 linkNamespaceURI = 'http://www.w3.org/2007/ont/link#';
+      // remove status/response/request 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) {
+          // removeMatches unresolved issue with collection https://github.com/linkeddata/rdflib.js/issues/631
+          var sts = void 0;
+          // status collection
+          var status = this.any(request, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
+          if (status != undefined) {
+            sts = this.statementsMatching(status, this.sym("".concat(linkNamespaceURI, "status")), null, meta).slice();
+            for (var i = 0; i < sts.length; i++) {
+              this.removeStatement(sts[i]);
+            }
+          }
+          // response items list
           var response = this.any(request, this.sym("".concat(linkNamespaceURI, "response")), null, meta);
           if (response != undefined) {
-            // ts
-            this.removeMatches(response, null, null, meta);
+            sts = this.statementsMatching(response, null, null, meta).slice();
+            for (var i = 0; i < sts.length; i++) {
+              this.removeStatement(sts[i]);
+            }
           }
-          // may be not needed
-          var status = this.any(request, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
-          if (status != undefined) {
-            // ts
-            this.removeMatches(status, null, null, meta);
+          // request triples
+          sts = this.statementsMatching(request, null, null, meta).slice();
+          for (var i = 0; i < sts.length; i++) {
+            this.removeStatement(sts[i]);
           }
-          this.removeMatches(request, null, null, meta);
         }
       }
       this.removeMatches(this.sym(doc.value), null, null, meta); // content-type

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.34-beta",
+  "version": "2.2.34-beta3-e2aa46ee",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/fetcher.ts

@@ -980,7 +980,7 @@ export default class Fetcher implements CallbackifyInterface {
     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
+      if (response != undefined) { // ts
         const quad = kb.statementsMatching(response, this.ns.link('outOfDate'), true as any, meta)
         kb.remove(quad)
         options.force = true

package/src/store.ts

@@ -871,7 +871,7 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
   }
 
   /**
-   * Removes all statements in a doc, along with the related metadata including request/response
+   * Removes all statements in a doc, along with the related metadata including request/response/status
    * @param doc - The document / graph
    */
   removeDocument(doc: Quad_Graph): IndexedFormula {
@@ -881,27 +881,42 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
     for (var i = 0; i < sts.length; i++) {
       this.removeStatement(sts[i])
     }
+    this.removeMatches(doc as Quad_Subject, null, null)
     return this
   }
 
   removeMetadata(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 linkNamespaceURI = 'http://www.w3.org/2007/ont/link#'
+    // remove status/response/request 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) {
+        // removeMatches unresolved issue with collection https://github.com/linkeddata/rdflib.js/issues/631
+        let sts: Quad[]
+        // status collection
+        const status = this.any(request, this.sym(`${linkNamespaceURI}status`), null, meta) as Quad_Subject
+        if (status != undefined) {
+          sts = this.statementsMatching(status, this.sym(`${linkNamespaceURI}status`), null, meta).slice()
+          for (var i = 0; i < sts.length; i++) {
+            this.removeStatement(sts[i])
+          }
+        }
+        // response items list
         const response = this.any(request, this.sym(`${linkNamespaceURI}response`), null, meta) as Quad_Subject
-        if (response != undefined) { // ts
-          this.removeMatches(response, null, null, meta)
+        if (response != undefined) {
+          sts = this.statementsMatching(response, null, null, meta).slice()
+          for (var i = 0; i < sts.length; i++) {
+            this.removeStatement(sts[i])
+          }
         }
-        // may be not needed
-        const status = this.any(request, this.sym(`${linkNamespaceURI}status`), null, meta) as Quad_Subject
-        if (status != undefined) { // ts
-          this.removeMatches(status, null, null, meta)
+        // request triples
+        sts = this.statementsMatching(request, null, null, meta).slice()
+        for (var i = 0; i < sts.length; i++) {
+          this.removeStatement(sts[i])
         }
-        this.removeMatches(request, null, null, meta)
+
       }
     }
     this.removeMatches(this.sym(doc.value), null, null, meta) // content-type