@jsenv/core 23.1.1 → 23.2.0

package/dist/jsenv_browser_system.js

@@ -1310,29 +1310,6 @@
     return target;
   });
 
-  var createCancellationToken = function createCancellationToken() {
-    var register = function register(callback) {
-      if (typeof callback !== "function") {
-        throw new Error("callback must be a function, got ".concat(callback));
-      }
-
-      return {
-        callback: callback,
-        unregister: function unregister() {}
-      };
-    };
-
-    var throwIfRequested = function throwIfRequested() {
-      return undefined;
-    };
-
-    return {
-      register: register,
-      cancellationRequested: false,
-      throwIfRequested: throwIfRequested
-    };
-  };
-
   var createDetailedMessage = function createDetailedMessage(message) {
     var details = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     var string = "".concat(message);
@@ -1343,9 +1320,6 @@
     return string;
   };
 
-  // fallback to this polyfill (or even use an existing polyfill would be better)
-  // https://github.com/github/fetch/blob/master/fetch.js
-
   function _await$c(value, then, direct) {
     if (direct) {
       return then ? then(value) : value;
@@ -1387,8 +1361,7 @@
 
   var fetchUsingXHR = _async$c(function (url) {
     var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-        _ref$cancellationToke = _ref.cancellationToken,
-        cancellationToken = _ref$cancellationToke === void 0 ? createCancellationToken() : _ref$cancellationToke,
+        signal = _ref.signal,
         _ref$method = _ref.method,
         method = _ref$method === void 0 ? "GET" : _ref$method,
         _ref$credentials = _ref.credentials,
@@ -1437,9 +1410,11 @@
       bodyPromise.resolve();
     };
 
-    cancellationToken.register(function (cancelError) {
+    signal.addEventListener("abort", function () {
       xhr.abort();
-      failure(cancelError);
+      var abortError = new Error("aborted");
+      abortError.name = "AbortError";
+      failure(abortError);
     });
 
     xhr.onreadystatechange = function () {
@@ -1779,7 +1754,7 @@
     return view.buffer;
   };
 
-  var _excluded = ["cancellationToken", "mode"];
+  var _excluded = ["mode"];
 
   function _await$b(value, then, direct) {
     if (direct) {
@@ -1794,36 +1769,15 @@
   }
 
   var fetchNative = _async$b(function (url) {
-
     var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
-    var _ref$cancellationToke = _ref.cancellationToken,
-        cancellationToken = _ref$cancellationToke === void 0 ? createCancellationToken() : _ref$cancellationToke,
-        _ref$mode = _ref.mode,
+    var _ref$mode = _ref.mode,
         mode = _ref$mode === void 0 ? "cors" : _ref$mode,
         options = _objectWithoutProperties(_ref, _excluded);
 
-    var abortController = new AbortController();
-    var cancelError;
-    cancellationToken.register(function (reason) {
-      cancelError = reason;
-      abortController.abort(reason);
-    });
-    var response;
-    return _continue$3(_catch$5(function () {
-      return _await$b(window.fetch(url, _objectSpread2({
-        signal: abortController.signal,
-        mode: mode
-      }, options)), function (_window$fetch) {
-        response = _window$fetch;
-      });
-    }, function (e) {
-      if (cancelError && e.name === "AbortError") {
-        throw cancelError;
-      }
-
-      throw e;
-    }), function (_result) {
+    return _await$b(window.fetch(url, _objectSpread2({
+      mode: mode
+    }, options)), function (response) {
       return {
         url: response.url,
         status: response.status,
@@ -1848,32 +1802,6 @@
     });
   });
 
-  function _catch$5(body, recover) {
-    try {
-      var result = body();
-    } catch (e) {
-      return recover(e);
-    }
-
-    if (result && result.then) {
-      return result.then(void 0, recover);
-    }
-
-    return result;
-  }
-
-  var responseToHeaders$1 = function responseToHeaders(response) {
-    var headers = {};
-    response.headers.forEach(function (value, name) {
-      headers[name] = value;
-    });
-    return headers;
-  };
-
-  function _continue$3(value, then) {
-    return value && value.then ? value.then(then) : then(value);
-  }
-
   function _async$b(f) {
     return function () {
       for (var args = [], i = 0; i < arguments.length; i++) {
@@ -1888,6 +1816,14 @@
     };
   }
 
+  var responseToHeaders$1 = function responseToHeaders(response) {
+    var headers = {};
+    response.headers.forEach(function (value, name) {
+      headers[name] = value;
+    });
+    return headers;
+  };
+
   var fetchUrl = typeof window.fetch === "function" && typeof window.AbortController === "function" ? fetchNative : fetchUsingXHR;
 
   var pathnameToExtension$1 = function pathnameToExtension(pathname) {