rdflib 2.2.30-c488dd5d → 2.2.31-10c4e145

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

@@ -87,14 +87,16 @@ export default class UpdateManager {
 * the user logs in, then that data misrepresents what would happen
 * if the user tried again.
 */
-flagAuthorizationMetadata () {
-  const kb = this.store
-  const meta = kb.fetcher.appNode
+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
-      this.store.add(response, this.ns.link('outOfDate'), true as any, meta) // @@ Boolean is fine - fix types
+      kb.add(response, this.ns.link('outOfDate'), true as any, meta) // @@ Boolean is fine - fix types
     }
   }
 }
@@ -111,13 +113,20 @@ flagAuthorizationMetadata () {
  *   LOCALFILE or false if known, undefined if not known.
  */
  async checkEditable (uri: string | NamedNode, kb?: IndexedFormula): Promise<string | boolean | undefined> {
-   const initial = this.editable(uri, kb)
+  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 this.store.fetcher.load(uri)
+   await kb.fetcher?.load(uri)
    const final = this.editable(uri, kb)
-   console.log(`Loaded ${uri} just to check editable, result: ${final}.`)
+   // console.log(`Loaded ${uri} just to check editable, result: ${final}.`)
    return final
  }
   /**
@@ -141,17 +150,17 @@ flagAuthorizationMetadata () {
     uri = termValue(uri)
 
     if ( !this.isHttpUri(uri as string) ) {
-      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
-    const meta = this.store.fetcher.appNode
+    const meta = kb.fetcher?.appNode
     // const kb = s
 
      // @ts-ignore passes a string to kb.each, which expects a term. Should this work?
@@ -160,10 +169,10 @@ flagAuthorizationMetadata () {
     for (var r = 0; r < requests.length; r++) {
       request = requests[r]
       if (request !== undefined) {
-        const response = kb.any(request, this.ns.link('response')) as Quad_Subject
+        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')) as Quad_Subject
+          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'))