rdflib 2.2.28 → 2.2.30-19be4b6a

package/lib/update-manager.js

@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -80,13 +82,87 @@ var UpdateManager = /*#__PURE__*/function () {
       return uri.slice(0, 4) === 'http';
     }
 
+    /** Remove from the store HTTP authorization metadata
+    * The editble function below relies on copies we have in the store
+    * of the results of previous HTTP transactions. Howver, when
+    * the user logs in, then that data misrepresents what would happen
+    * if the user tried again.
+    */
+  }, {
+    key: "flagAuthorizationMetadata",
+    value: function flagAuthorizationMetadata() {
+      var kb = this.store;
+      var meta = kb.fetcher.appNode;
+      var requests = kb.statementsMatching(undefined, this.ns.link('requestedURI'), undefined, 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
+            this.store.add(_response, this.ns.link('outOfDate'), true, meta); // @@ Boolean is fine - fix types
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    }
+
     /**
      * Tests whether a file is editable.
      * If the file has a specific annotation that it is machine written,
      * for safety, it is editable (this doesn't actually check for write access)
      * If the file has wac-allow and accept patch headers, those are respected.
      * and local write access is determined by those headers.
-     * This version only looks at past HTTP requests, does not make new ones.
+     * This async version not only looks at past HTTP requests, it also makes new ones if necessary.
+     *
+     * @returns The method string SPARQL or DAV or
+     *   LOCALFILE or false if known, undefined if not known.
+     */
+  }, {
+    key: "checkEditable",
+    value: function () {
+      var _checkEditable = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(uri, kb) {
+        var initial, final;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              initial = this.editable(uri, kb);
+              if (!(initial !== undefined)) {
+                _context.next = 3;
+                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 ${uri} just to check editable, result: ${final}.`)
+              return _context.abrupt("return", final);
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function checkEditable(_x, _x2) {
+        return _checkEditable.apply(this, arguments);
+      }
+      return checkEditable;
+    }()
+    /**
+     * Tests whether a file is editable.
+     * If the file has a specific annotation that it is machine written,
+     * for safety, it is editable (this doesn't actually check for write access)
+     * If the file has wac-allow and accept patch headers, those are respected.
+     * and local write access is determined by those headers.
+     * This synchronous version only looks at past HTTP requests, does not make new ones.
      *
      * @returns The method string SPARQL or DAV or
      *   LOCALFILE or false if known, undefined if not known.
@@ -103,27 +179,34 @@ var UpdateManager = /*#__PURE__*/function () {
       }
       uri = (0, _termValue.termValue)(uri);
       if (!this.isHttpUri(uri)) {
-        if (kb.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 (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'))) {
           return 'LOCALFILE';
         }
       }
       var request;
       var definitive = false;
+      var meta = this.store.fetcher.appNode;
+      // const kb = s
+
       // @ts-ignore passes a string to kb.each, which expects a term. Should this work?
-      var requests = kb.each(undefined, this.ns.link('requestedURI'), (0, _uri.docpart)(uri));
+      var requests = kb.each(undefined, this.ns.link('requestedURI'), (0, _uri.docpart)(uri), meta);
       var method;
       for (var r = 0; r < requests.length; r++) {
         request = requests[r];
         if (request !== undefined) {
-          var response = kb.any(request, this.ns.link('response'));
-          if (request !== undefined) {
-            var wacAllow = kb.anyValue(response, this.ns.httph('wac-allow'));
+          var _response2 = kb.any(request, this.ns.link('response'), null, meta);
+          if (_response2 !== undefined) {
+            // ts
+
+            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) {
-              var _iterator = _createForOfIteratorHelper(wacAllow.split(',')),
-                _step;
+              var _iterator2 = _createForOfIteratorHelper(wacAllow.split(',')),
+                _step2;
               try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  var bit = _step.value;
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  var bit = _step2.value;
                   var lr = bit.split('=');
                   if (lr[0].includes('user') && !lr[1].includes('write') && !lr[1].includes('append')) {
                     // console.log('    editable? excluded by WAC-Allow: ', wacAllow)
@@ -131,12 +214,12 @@ var UpdateManager = /*#__PURE__*/function () {
                   }
                 }
               } catch (err) {
-                _iterator.e(err);
+                _iterator2.e(err);
               } finally {
-                _iterator.f();
+                _iterator2.f();
               }
             }
-            var acceptPatch = kb.each(response, this.ns.httph('accept-patch'));
+            var acceptPatch = kb.each(_response2, this.ns.httph('accept-patch'));
             if (acceptPatch.length) {
               for (var i = 0; i < acceptPatch.length; i++) {
                 method = acceptPatch[i].value.trim();
@@ -144,7 +227,7 @@ var UpdateManager = /*#__PURE__*/function () {
                 if (method.indexOf('application/sparql-update-single-match') >= 0) return 'SPARQL';
               }
             }
-            var authorVia = kb.each(response, this.ns.httph('ms-author-via'));
+            var authorVia = kb.each(_response2, this.ns.httph('ms-author-via'));
             if (authorVia.length) {
               for (var _i = 0; _i < authorVia.length; _i++) {
                 method = authorVia[_i].value.trim();
@@ -159,7 +242,7 @@ var UpdateManager = /*#__PURE__*/function () {
             if (!this.isHttpUri(uri)) {
               if (!wacAllow) return false;else return 'LOCALFILE';
             }
-            var status = kb.each(response, this.ns.http('status'));
+            var status = kb.each(_response2, this.ns.http('status'));
             if (status.length) {
               for (var _i2 = 0; _i2 < status.length; _i2++) {
                 // @ts-ignore since statuses should be TFTerms, this should always be false

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.28",
+  "version": "2.2.30-19be4b6a",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/blank-node.ts

@@ -19,7 +19,6 @@ export default class BlankNode extends Node implements TFBlankNode {
   private static getId (id: string | unknown): string {
     if (id) {
       if (typeof id !== 'string') {
-        console.log('Bad blank id:', id)
         throw new Error('Bad id argument to new blank node: ' + id)
       }
 

package/src/fetcher.ts

@@ -721,7 +721,7 @@ export default class Fetcher implements CallbackifyInterface {
   _fetch: Fetch
   mediatypes: MediatypesMap
   /** Denoting this session */
-  appNode: BlankNode
+  appNode: NamedNode
   /**
    * this.requested[uri] states:
    * undefined     no record of web access or records reset
@@ -771,8 +771,9 @@ export default class Fetcher implements CallbackifyInterface {
     if (!this._fetch) {
       throw new Error('No _fetch function available for Fetcher')
     }
-
-    this.appNode = this.store.rdfFactory.blankNode()
+    // 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
     this.requested = {}
     this.timeouts = {}
@@ -1160,7 +1161,7 @@ export default class Fetcher implements CallbackifyInterface {
           size: 0,
           timeout: 0
         }
-        console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error)
+        // console.log('Fetcher: <' + actualProxyURI + '> Non-HTTP fetch exception: ' + error)
         return this.handleError(dummyResponse, docuri, options) // possible credentials retry
         // return this.failFetch(options, 'fetch failed: ' + error, 999, dummyResponse) // Fake status code: fetch exception
 
@@ -1227,24 +1228,20 @@ export default class Fetcher implements CallbackifyInterface {
             if ((fetchResponse as Response).ok) {
               userCallback(true, 'OK', fetchResponse)
             } else {
-              // console.log('@@@ fetcher.js Should not take this path !!!!!!!!!!!!')
               let oops = 'HTTP error: Status ' + fetchResponse.status + ' (' + fetchResponse.statusText + ')'
               if (fetchResponse.responseText) {
                 oops += ' ' + fetchResponse.responseText // not in 404, dns error, nock failure
               }
-              console.log(oops + ' fetching ' + uri)
               userCallback(false, oops, fetchResponse)
             }
           } else {
             let oops = ('@@ nowOrWhenFetched:  no response object!')
-            console.log(oops)
             userCallback(false, oops)
           }
         }
       }, function (err: FetchError) {
         var message = err.message || err.statusText
         message = 'Failed to load  <' + uri + '> ' + message
-        console.log(message)
         if (err.response && err.response.status) {
           message += ' status: ' + err.response.status
         }
@@ -1497,18 +1494,18 @@ export default class Fetcher implements CallbackifyInterface {
     } catch (err) {
       // @ts-ignore
       if (err.response.status === 404) {
-        console.log('createIfNotExists: doc does NOT exist, will create... ' + doc)
+        // console.log('createIfNotExists: doc does NOT exist, will create... ' + doc)
         try {
           response = await fetcher.webOperation('PUT', doc.value, {data, contentType})
         } catch (err) {
-          console.log('createIfNotExists doc FAILED: ' + doc + ': ' + err)
+          // console.log('createIfNotExists doc FAILED: ' + doc + ': ' + err)
           throw err
         }
         delete fetcher.requested[doc.value] // delete cached 404 error
         // console.log('createIfNotExists doc created ok ' + doc)
         return response
       } else {
-        console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err)
+        // console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err)
         throw err
       }
     }
@@ -1729,22 +1726,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
         )
       }
     })
@@ -1837,7 +1834,7 @@ export default class Fetcher implements CallbackifyInterface {
     docuri: string,
     options
   ): Promise<Result> {
-    console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource)
+    // console.log('Fetcher: CORS: RETRYING with NO CREDENTIALS for ' + options.resource)
 
     options.retriedWithNoCredentials = true // protect against being called twice
 
@@ -1886,8 +1883,7 @@ export default class Fetcher implements CallbackifyInterface {
       let proxyUri = Fetcher.crossSiteProxy(docuri)
 
       if (proxyUri && !options.proxyUsed) {
-        console.log('web: Direct failed so trying proxy ' + proxyUri)
-
+        // console.log('web: Direct failed so trying proxy ' + proxyUri)
         return this.redirectToProxy(proxyUri, options)
       }
     }
@@ -1960,7 +1956,7 @@ export default class Fetcher implements CallbackifyInterface {
 
     // Check for masked errors (CORS, etc)
     if (response.status === 0) {
-      console.log('Masked error - status 0 for ' + docuri)
+      // console.log('Masked error - status 0 for ' + docuri)
       return this.handleError(response, docuri, options)
     }
 

package/src/formula.ts

@@ -589,7 +589,6 @@ export default class Formula extends Node {
     while (todo.length) {
       follow(todo.shift())
     }
-    // console.log('' + result.length + ' statements about ' + subject)
     return result
   }
 
@@ -736,10 +735,10 @@ export default class Formula extends Node {
     let statementsCopy = this.statements.map(function (ea) {
       return (ea as Statement).substitute(bindings)
     })
-    console.log('Formula subs statmnts:' + statementsCopy)
+    // console.log('Formula subs statmnts:' + statementsCopy)
     const y = new Formula()
     y.addAll(statementsCopy as Quad[])
-    console.log('indexed-form subs formula:' + y)
+    // console.log('indexed-form subs formula:' + y)
     return y as unknown as T
   }
 

package/src/node-internal.ts

@@ -33,7 +33,6 @@ export default abstract class Node {
    * @param bindings - Bindings of identifiers to nodes
    */
   substitute <T extends Node = Node>(bindings: Bindings): T {
-    console.log('@@@ node substitute' + this)
     return this as unknown as T
   }
 

package/src/statement.ts

@@ -99,7 +99,7 @@ export default class Statement<
       isDefaultGraph(this.graph) ? this.graph :
         (this.graph as G).substitute(bindings)
     ) // 2016
-    console.log('@@@ statement substitute:' + y)
+    // console.log('@@@ statement substitute:' + y)
     return y
   }
 

package/src/update-manager.ts

@@ -81,14 +81,52 @@ export default class UpdateManager {
     return( uri.slice(0,4) === 'http' )
   }
 
+/** Remove from the store HTTP authorization metadata
+* The editble function below relies on copies we have in the store
+* of the results of previous HTTP transactions. Howver, when
+* 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
+  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
+    }
+  }
+}
 
+/**
+ * Tests whether a file is editable.
+ * If the file has a specific annotation that it is machine written,
+ * for safety, it is editable (this doesn't actually check for write access)
+ * If the file has wac-allow and accept patch headers, those are respected.
+ * and local write access is determined by those headers.
+ * This async version not only looks at past HTTP requests, it also makes new ones if necessary.
+ *
+ * @returns The method string SPARQL or DAV or
+ *   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 (initial !==  undefined) {
+     return initial
+   }
+   await this.store.fetcher.load(uri)
+   const final = this.editable(uri, kb)
+   // console.log(`Loaded ${uri} just to check editable, result: ${final}.`)
+   return final
+ }
   /**
    * Tests whether a file is editable.
    * If the file has a specific annotation that it is machine written,
    * for safety, it is editable (this doesn't actually check for write access)
    * If the file has wac-allow and accept patch headers, those are respected.
    * and local write access is determined by those headers.
-   * This version only looks at past HTTP requests, does not make new ones.
+   * This synchronous version only looks at past HTTP requests, does not make new ones.
    *
    * @returns The method string SPARQL or DAV or
    *   LOCALFILE or false if known, undefined if not known.
@@ -103,7 +141,7 @@ export default class UpdateManager {
     uri = termValue(uri)
 
     if ( !this.isHttpUri(uri as string) ) {
-      if (kb.holds(
+      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'))) {
@@ -113,14 +151,21 @@ export default class UpdateManager {
 
     var request
     var definitive = false
+    const meta = this.store.fetcher.appNode
+    // const kb = s
+
      // @ts-ignore passes a string to kb.each, which expects a term. Should this work?
-    var requests = kb.each(undefined, this.ns.link('requestedURI'), docpart(uri))
+    var requests = kb.each(undefined, this.ns.link('requestedURI'), docpart(uri), meta)
     var method: string
     for (var r = 0; r < requests.length; r++) {
       request = requests[r]
       if (request !== undefined) {
-        var response = kb.any(request, this.ns.link('response')) as Quad_Subject
-        if (request !== undefined) {
+        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'), null, meta) as Quad_Subject
+          if (outOfDate) continue
+
           var wacAllow = kb.anyValue(response, this.ns.httph('wac-allow'))
           if (wacAllow) {
             for (var bit of wacAllow.split(',')) {