rdflib 2.2.24-4e18cd59 → 2.2.24-ce092266

package/esm/fetcher.js

@@ -691,55 +691,32 @@ var Fetcher = /*#__PURE__*/function () {
     }
   }, {
     key: "pendingFetchPromise",
-    value: function () {
-      var _pendingFetchPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(uri, originalUri, options) {
-        var _this3 = this;
-        var pendingPromise;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.t0 = !options.force;
-              if (!_context.t0) {
-                _context.next = 5;
-                break;
-              }
-              _context.next = 4;
-              return this.fetchQueue[originalUri];
-            case 4:
-              _context.t0 = _context.sent;
-            case 5:
-              if (!_context.t0) {
-                _context.next = 9;
-                break;
-              }
-              pendingPromise = this.fetchQueue[originalUri];
-              _context.next = 12;
-              break;
-            case 9:
-              pendingPromise = Promise.race([this.setRequestTimeout(uri, options), this.fetchUri(uri, options)]);
-              this.fetchQueue[originalUri] = pendingPromise;
-
-              // Clean up the queued promise after a time, if it's resolved
-              this.cleanupFetchRequest(originalUri, undefined, this.timeout);
-            case 12:
-              return _context.abrupt("return", pendingPromise.then(function (x) {
-                if (uri in _this3.timeouts) {
-                  _this3.timeouts[uri].forEach(clearTimeout);
-                  delete _this3.timeouts[uri];
-                }
-                return x;
-              }));
-            case 13:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function pendingFetchPromise(_x, _x2, _x3) {
-        return _pendingFetchPromise.apply(this, arguments);
+    value: function pendingFetchPromise(uri, originalUri, options) {
+      var _this3 = this;
+      var pendingPromise;
+      function fetchQueueResolvePromise(fetchQueue) {
+        return fetchQueue;
       }
-      return pendingFetchPromise;
-    }()
+
+      // Check to see if some request is already dealing with this uri
+      if (!options.force && fetchQueueResolvePromise(this.fetchQueue[originalUri])) {
+        pendingPromise = this.fetchQueue[originalUri];
+      } else {
+        pendingPromise = Promise.race([this.setRequestTimeout(uri, options), this.fetchUri(uri, options)]);
+        this.fetchQueue[originalUri] = pendingPromise;
+
+        // Clean up the queued promise after a time, if it's resolved
+        this.cleanupFetchRequest(originalUri, undefined, this.timeout);
+      }
+      return pendingPromise.then(function (x) {
+        if (uri in _this3.timeouts) {
+          _this3.timeouts[uri].forEach(clearTimeout);
+          delete _this3.timeouts[uri];
+        }
+        return x;
+      });
+    }
+
     /**
      * @param _options - DEPRECATED
      */
@@ -1179,64 +1156,64 @@ var Fetcher = /*#__PURE__*/function () {
   }, {
     key: "createIfNotExists",
     value: function () {
-      var _createIfNotExists = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(doc) {
+      var _createIfNotExists = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(doc) {
         var contentType,
           data,
           fetcher,
           response,
-          _args2 = arguments;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+          _args = arguments;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
-              contentType = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : TurtleContentType;
-              data = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : '';
+              contentType = _args.length > 1 && _args[1] !== undefined ? _args[1] : TurtleContentType;
+              data = _args.length > 2 && _args[2] !== undefined ? _args[2] : '';
               fetcher = this;
-              _context2.prev = 3;
-              _context2.next = 6;
+              _context.prev = 3;
+              _context.next = 6;
               return fetcher.load(doc);
             case 6:
-              response = _context2.sent;
-              _context2.next = 29;
+              response = _context.sent;
+              _context.next = 29;
               break;
             case 9:
-              _context2.prev = 9;
-              _context2.t0 = _context2["catch"](3);
-              if (!(_context2.t0.response.status === 404)) {
-                _context2.next = 27;
+              _context.prev = 9;
+              _context.t0 = _context["catch"](3);
+              if (!(_context.t0.response.status === 404)) {
+                _context.next = 27;
                 break;
               }
               console.log('createIfNotExists: doc does NOT exist, will create... ' + doc);
-              _context2.prev = 13;
-              _context2.next = 16;
+              _context.prev = 13;
+              _context.next = 16;
               return fetcher.webOperation('PUT', doc.value, {
                 data: data,
                 contentType: contentType
               });
             case 16:
-              response = _context2.sent;
-              _context2.next = 23;
+              response = _context.sent;
+              _context.next = 23;
               break;
             case 19:
-              _context2.prev = 19;
-              _context2.t1 = _context2["catch"](13);
-              console.log('createIfNotExists doc FAILED: ' + doc + ': ' + _context2.t1);
-              throw _context2.t1;
+              _context.prev = 19;
+              _context.t1 = _context["catch"](13);
+              console.log('createIfNotExists doc FAILED: ' + doc + ': ' + _context.t1);
+              throw _context.t1;
             case 23:
               delete fetcher.requested[doc.value]; // delete cached 404 error
               // console.log('createIfNotExists doc created ok ' + doc)
-              return _context2.abrupt("return", response);
+              return _context.abrupt("return", response);
             case 27:
-              console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + _context2.t0);
-              throw _context2.t0;
+              console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + _context.t0);
+              throw _context.t0;
             case 29:
-              return _context2.abrupt("return", response);
+              return _context.abrupt("return", response);
             case 30:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2, this, [[3, 9], [13, 19]]);
+        }, _callee, this, [[3, 9], [13, 19]]);
       }));
-      function createIfNotExists(_x4) {
+      function createIfNotExists(_x) {
         return _createIfNotExists.apply(this, arguments);
       }
       return createIfNotExists;

package/lib/fetcher.js

@@ -674,55 +674,32 @@ var Fetcher = /*#__PURE__*/function () {
     }
   }, {
     key: "pendingFetchPromise",
-    value: function () {
-      var _pendingFetchPromise = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(uri, originalUri, options) {
-        var _this3 = this;
-        var pendingPromise;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.t0 = !options.force;
-              if (!_context.t0) {
-                _context.next = 5;
-                break;
-              }
-              _context.next = 4;
-              return this.fetchQueue[originalUri];
-            case 4:
-              _context.t0 = _context.sent;
-            case 5:
-              if (!_context.t0) {
-                _context.next = 9;
-                break;
-              }
-              pendingPromise = this.fetchQueue[originalUri];
-              _context.next = 12;
-              break;
-            case 9:
-              pendingPromise = Promise.race([this.setRequestTimeout(uri, options), this.fetchUri(uri, options)]);
-              this.fetchQueue[originalUri] = pendingPromise;
-
-              // Clean up the queued promise after a time, if it's resolved
-              this.cleanupFetchRequest(originalUri, undefined, this.timeout);
-            case 12:
-              return _context.abrupt("return", pendingPromise.then(function (x) {
-                if (uri in _this3.timeouts) {
-                  _this3.timeouts[uri].forEach(clearTimeout);
-                  delete _this3.timeouts[uri];
-                }
-                return x;
-              }));
-            case 13:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function pendingFetchPromise(_x, _x2, _x3) {
-        return _pendingFetchPromise.apply(this, arguments);
+    value: function pendingFetchPromise(uri, originalUri, options) {
+      var _this3 = this;
+      var pendingPromise;
+      function fetchQueueResolvePromise(fetchQueue) {
+        return fetchQueue;
       }
-      return pendingFetchPromise;
-    }()
+
+      // Check to see if some request is already dealing with this uri
+      if (!options.force && fetchQueueResolvePromise(this.fetchQueue[originalUri])) {
+        pendingPromise = this.fetchQueue[originalUri];
+      } else {
+        pendingPromise = Promise.race([this.setRequestTimeout(uri, options), this.fetchUri(uri, options)]);
+        this.fetchQueue[originalUri] = pendingPromise;
+
+        // Clean up the queued promise after a time, if it's resolved
+        this.cleanupFetchRequest(originalUri, undefined, this.timeout);
+      }
+      return pendingPromise.then(function (x) {
+        if (uri in _this3.timeouts) {
+          _this3.timeouts[uri].forEach(clearTimeout);
+          delete _this3.timeouts[uri];
+        }
+        return x;
+      });
+    }
+
     /**
      * @param _options - DEPRECATED
      */
@@ -1162,64 +1139,64 @@ var Fetcher = /*#__PURE__*/function () {
   }, {
     key: "createIfNotExists",
     value: function () {
-      var _createIfNotExists = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(doc) {
+      var _createIfNotExists = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(doc) {
         var contentType,
           data,
           fetcher,
           response,
-          _args2 = arguments;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+          _args = arguments;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
             case 0:
-              contentType = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : _types.TurtleContentType;
-              data = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : '';
+              contentType = _args.length > 1 && _args[1] !== undefined ? _args[1] : _types.TurtleContentType;
+              data = _args.length > 2 && _args[2] !== undefined ? _args[2] : '';
               fetcher = this;
-              _context2.prev = 3;
-              _context2.next = 6;
+              _context.prev = 3;
+              _context.next = 6;
               return fetcher.load(doc);
             case 6:
-              response = _context2.sent;
-              _context2.next = 29;
+              response = _context.sent;
+              _context.next = 29;
               break;
             case 9:
-              _context2.prev = 9;
-              _context2.t0 = _context2["catch"](3);
-              if (!(_context2.t0.response.status === 404)) {
-                _context2.next = 27;
+              _context.prev = 9;
+              _context.t0 = _context["catch"](3);
+              if (!(_context.t0.response.status === 404)) {
+                _context.next = 27;
                 break;
               }
               console.log('createIfNotExists: doc does NOT exist, will create... ' + doc);
-              _context2.prev = 13;
-              _context2.next = 16;
+              _context.prev = 13;
+              _context.next = 16;
               return fetcher.webOperation('PUT', doc.value, {
                 data: data,
                 contentType: contentType
               });
             case 16:
-              response = _context2.sent;
-              _context2.next = 23;
+              response = _context.sent;
+              _context.next = 23;
               break;
             case 19:
-              _context2.prev = 19;
-              _context2.t1 = _context2["catch"](13);
-              console.log('createIfNotExists doc FAILED: ' + doc + ': ' + _context2.t1);
-              throw _context2.t1;
+              _context.prev = 19;
+              _context.t1 = _context["catch"](13);
+              console.log('createIfNotExists doc FAILED: ' + doc + ': ' + _context.t1);
+              throw _context.t1;
             case 23:
               delete fetcher.requested[doc.value]; // delete cached 404 error
               // console.log('createIfNotExists doc created ok ' + doc)
-              return _context2.abrupt("return", response);
+              return _context.abrupt("return", response);
             case 27:
-              console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + _context2.t0);
-              throw _context2.t0;
+              console.log('createIfNotExists doc load error NOT 404:  ' + doc + ': ' + _context.t0);
+              throw _context.t0;
             case 29:
-              return _context2.abrupt("return", response);
+              return _context.abrupt("return", response);
             case 30:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2, this, [[3, 9], [13, 19]]);
+        }, _callee, this, [[3, 9], [13, 19]]);
       }));
-      function createIfNotExists(_x4) {
+      function createIfNotExists(_x) {
         return _createIfNotExists.apply(this, arguments);
       }
       return createIfNotExists;

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.24-4e18cd59",
+  "version": "2.2.24-ce092266",
   "private": false,
   "browserslist": [
     "> 0.5%"

package/src/fetcher.ts

@@ -979,15 +979,16 @@ export default class Fetcher implements CallbackifyInterface {
     return this.pendingFetchPromise(docuri, initialisedOptions.baseURI, initialisedOptions) as any
   }
 
-  async pendingFetchPromise (
+  pendingFetchPromise (
     uri: string,
     originalUri: string,
     options: AutoInitOptions
   ): Promise<Result> {
     let pendingPromise
+    function fetchQueueResolvePromise (fetchQueue) { return fetchQueue }
 
     // Check to see if some request is already dealing with this uri
-    if (!options.force && await this.fetchQueue[originalUri]) {
+    if (!options.force && fetchQueueResolvePromise(this.fetchQueue[originalUri])) {
       pendingPromise = this.fetchQueue[originalUri]
     } else {
       pendingPromise = Promise