rdflib 2.2.34-beta3 → 2.2.34-beta3-e2aa46ee

package/esm/store.js

@@ -844,7 +844,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     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
+      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;
@@ -852,16 +852,29 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
       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) {
-            this.removeMatches(status, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
+            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]);
+            }
+          }
+          // 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/store.js

@@ -847,7 +847,7 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
     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
+      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;
@@ -855,16 +855,29 @@ var IndexedFormula = /*#__PURE__*/function (_Formula) {
       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) {
-            this.removeMatches(status, this.sym("".concat(linkNamespaceURI, "status")), null, meta);
+            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]);
+            }
+          }
+          // 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-beta3",
+  "version": "2.2.34-beta3-e2aa46ee",
   "private": false,
   "browserslist": [
     "> 0.5%"
@@ -95,7 +95,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/store.ts

@@ -887,21 +887,36 @@ export default class IndexedFormula extends Formula { // IN future - allow pass
 
   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
+    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) {
-          this.removeMatches(status, this.sym(`${linkNamespaceURI}status`), null, meta)
+          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])
+          }
         }
-        this.removeMatches(request, 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(this.sym(doc.value), null, null, meta) // content-type