@dereekb/util 10.2.0 → 11.0.0

package/fetch/index.cjs.js

@@ -164,8 +164,9 @@ exports.BaseError = BaseError;
  */
 class FetchRequestFactoryError extends makeError.exports.BaseError {
   constructor(error) {
-    var _a;
-    super(`Fetch request failed to build due to an unexpected error: ${typeof error === 'object' ? (_a = error.message) !== null && _a !== void 0 ? _a : '' : error}`);
+    var _error$message;
+    super(`Fetch request failed to build due to an unexpected error: ${typeof error === 'object' ? (_error$message = error.message) != null ? _error$message : '' : error}`);
+    this.error = void 0;
     this.error = error;
   }
 }
@@ -181,6 +182,7 @@ function fetchOk(inputFetch) {
 class FetchResponseError extends makeError.exports.BaseError {
   constructor(response) {
     super(`Fetch response was a non-ok status code (${response.status}): ${response.statusText}`);
+    this.response = void 0;
     this.response = response;
   }
 }
@@ -4834,36 +4836,6 @@ $$1({ global: true, constructor: true, forced: !USE_NATIVE_URL, sham: !DESCRIPTO
   URL: URLConstructor
 });
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 var $ = _export;
 var NativePromiseConstructor = promiseNativeConstructor;
 var fails$1 = fails$g;
@@ -4909,20 +4881,22 @@ if (isCallable(NativePromiseConstructor)) {
 class FetchTimeoutError extends makeError.exports.BaseError {
   constructor(response, timeout) {
     super(`Fetch response was timed out (${timeout})`);
+    this.response = void 0;
+    this.timeout = void 0;
     this.response = response;
     this.timeout = timeout;
   }
 }
 function fetchTimeout(inputFetch) {
   return (input, init) => {
-    var _a;
+    var _init$timeout, _init, _init2;
     let controller;
-    const timeout = (_a = init === null || init === void 0 ? void 0 : init.timeout) !== null && _a !== void 0 ? _a : input.timeout;
+    const timeout = (_init$timeout = (_init = init) == null ? void 0 : _init.timeout) != null ? _init$timeout : input.timeout;
     // if signal is not provided, and a timeout is specified, configure the timeout
-    if (!(init === null || init === void 0 ? void 0 : init.signal) && timeout) {
+    if (!((_init2 = init) != null && _init2.signal) && timeout) {
       const abortController = new AbortController();
       controller = abortController;
-      init = Object.assign(Object.assign({}, init), {
+      init = Object.assign({}, init, {
         signal: abortController.signal // pass the abort signal
       });
     }
@@ -4930,7 +4904,8 @@ function fetchTimeout(inputFetch) {
     let responsePromise = inputFetch(input, init);
     if (timeout) {
       const timeoutId = setTimeout(() => {
-        controller === null || controller === void 0 ? void 0 : controller.abort();
+        var _controller;
+        (_controller = controller) == null || _controller.abort();
       }, timeout);
       responsePromise = responsePromise.finally(() => {
         clearTimeout(timeoutId);
@@ -4946,6 +4921,70 @@ function fetchTimeout(inputFetch) {
  * @param config
  * @returns
  */
+
+function _await$1(value, then, direct) {
+  if (direct) {
+    return then ? then(value) : value;
+  }
+  if (!value || !value.then) {
+    value = Promise.resolve(value);
+  }
+  return then ? value.then(then) : value;
+} /**
+   * Creates a function that wraps fetch and uses a FetchRequestFactory to generate a Request before invoking Fetch.
+   *
+   * @param config
+   * @returns
+   */
+
+function _async$1(f) {
+  return function () {
+    for (var args = [], i = 0; i < arguments.length; i++) {
+      args[i] = arguments[i];
+    }
+    try {
+      return Promise.resolve(f.apply(this, args));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+}
+function _empty() {}
+function _invokeIgnored(body) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(_empty);
+  }
+}
+function _invoke(body, then) {
+  var result = body();
+  if (result && result.then) {
+    return result.then(then);
+  }
+  return then(result);
+}
+function _call(body, then, direct) {
+  if (direct) {
+    return then ? then(body()) : body();
+  }
+  try {
+    var result = Promise.resolve(body());
+    return then ? result.then(then) : result;
+  } catch (e) {
+    return Promise.reject(e);
+  }
+}
+function _catch(body, recover) {
+  try {
+    var result = body();
+  } catch (e) {
+    return recover(e);
+  }
+  if (result && result.then) {
+    return result.then(void 0, recover);
+  }
+  return result;
+}
 function fetchService(config) {
   const {
     makeFetch: inputMakeFetch,
@@ -4966,12 +5005,6 @@ function fetchService(config) {
   };
   return factory;
 }
-/**
- * Creates a function that wraps fetch and uses a FetchRequestFactory to generate a Request before invoking Fetch.
- *
- * @param config
- * @returns
- */
 function configureFetch(config) {
   const {
     makeFetch: inputMakeFetch = fetch,
@@ -4989,16 +5022,27 @@ function configureFetch(config) {
     makeFetch = fetchOk(makeFetch);
   }
   const makeFetchRequest = fetchRequestFactory(config);
-  return (input, init) => __awaiter(this, void 0, void 0, function* () {
-    const request = yield makeFetchRequest(input, init);
-    let response = makeFetch(request);
-    if (mapResponse) {
-      response = mapResponse(response);
-    }
-    return response;
+  return _async$1(function (input, init) {
+    return _await$1(makeFetchRequest(input, init), function (request) {
+      let response = makeFetch(request);
+      if (mapResponse) {
+        response = mapResponse(response);
+      }
+      return response;
+    });
   });
 }
 function fetchRequestFactory(config) {
+  const asFetchRequest = _async$1(function (input) {
+    const _isPromiseLike = util.isPromiseLike(input);
+    return _await$1(input, function (awaitedInput) {
+      if (isFetchRequest(awaitedInput)) {
+        return awaitedInput;
+      } else {
+        return makeRequest(awaitedInput);
+      }
+    }, !_isPromiseLike);
+  });
   const {
     makeRequest = (input, init) => new Request(input, init),
     baseUrl: inputBaseUrl,
@@ -5014,60 +5058,62 @@ function fetchRequestFactory(config) {
     const result = new URL(urlPath, baseUrl);
     return result;
   } : undefined;
-  function asFetchRequest(input) {
-    return __awaiter(this, void 0, void 0, function* () {
-      const awaitedInput = util.isPromiseLike(input) ? yield input : input;
-      if (isFetchRequest(awaitedInput)) {
-        return awaitedInput;
-      } else {
-        return makeRequest(awaitedInput);
-      }
-    });
-  }
-  const buildRequestWithFixedUrl = buildUrl ? input => __awaiter(this, void 0, void 0, function* () {
+  const buildRequestWithFixedUrl = buildUrl ? _async$1(function (input) {
     let relativeUrl;
     let baseRequest;
     let request;
-    if (typeof input === 'string') {
-      relativeUrl = input;
-    } else if (isFetchRequest(input)) {
-      if (useBaseUrlForConfiguredFetchRequests) {
-        relativeUrl = input.url; // copy the url, and use it as the base.
-        baseRequest = input;
-      } else {
-        request = input;
-      }
-    } else {
-      request = yield makeRequest(input);
-    }
-    if (!request) {
-      const url = buildUrl(relativeUrl);
-      request = yield makeRequest(url.href, baseRequest);
-    }
-    return request;
+    return _invoke(function () {
+      if (typeof input === 'string') {
+        relativeUrl = input;
+      } else return _invokeIgnored(function () {
+        if (isFetchRequest(input)) {
+          if (useBaseUrlForConfiguredFetchRequests) {
+            relativeUrl = input.url; // copy the url, and use it as the base.
+            baseRequest = input;
+          } else {
+            request = input;
+          }
+        } else {
+          return _await$1(makeRequest(input), function (_makeRequest) {
+            request = _makeRequest;
+          });
+        }
+      });
+    }, function () {
+      return _invoke(function () {
+        if (!request) {
+          const url = buildUrl(relativeUrl);
+          return _await$1(makeRequest(url.href, baseRequest), function (_makeRequest2) {
+            request = _makeRequest2;
+          });
+        }
+      }, function () {
+        return request;
+      });
+    });
   }) : asFetchRequest;
   let buildRequestInit;
   if (inputBaseRequest != null || timeout != null) {
-    const inputBaseRequestAsGetter = util.asGetter(inputBaseRequest);
-    function computeBaseRequest() {
-      return __awaiter(this, void 0, void 0, function* () {
-        const computedBaseRequest = yield inputBaseRequestAsGetter();
-        const baseRequest = timeout ? Object.assign(Object.assign({}, computedBaseRequest), {
+    const combineRequestInits = function combineRequestInits(request, requestInit) {
+      return _call(computeBaseRequest, function (baseRequest) {
+        return _await$1(requestInit, function (_requestInit) {
+          const merged = mergeRequestInits(baseRequest, _requestInit);
+          const timeout = merged.timeout === undefined ? request.timeout : merged.timeout;
+          return Object.assign({}, merged, {
+            timeout
+          });
+        });
+      });
+    };
+    const computeBaseRequest = function computeBaseRequest() {
+      return _call(inputBaseRequestAsGetter, function (computedBaseRequest) {
+        const baseRequest = timeout ? Object.assign({}, computedBaseRequest, {
           timeout
         }) : computedBaseRequest;
         return baseRequest;
       });
-    }
-    function combineRequestInits(request, requestInit) {
-      return __awaiter(this, void 0, void 0, function* () {
-        const baseRequest = yield computeBaseRequest();
-        const merged = mergeRequestInits(baseRequest, yield requestInit);
-        const timeout = merged.timeout === undefined ? request.timeout : merged.timeout;
-        return Object.assign(Object.assign({}, merged), {
-          timeout
-        });
-      });
-    }
+    };
+    const inputBaseRequestAsGetter = util.asGetter(inputBaseRequest);
     if (requestInitFactory) {
       buildRequestInit = (req, x) => requestInitFactory(req, combineRequestInits(req, x));
     } else {
@@ -5078,26 +5124,30 @@ function fetchRequestFactory(config) {
   } else {
     buildRequestInit = (_, x) => x;
   }
-  return (input, init) => __awaiter(this, void 0, void 0, function* () {
-    try {
-      const fixedRequest = yield buildRequestWithFixedUrl(input);
-      init = yield buildRequestInit(fixedRequest, init);
-      const request = yield makeRequest(fixedRequest, init);
-      request.timeout = timeout; // copy/set timeout on the request directly
-      return request;
-    } catch (e) {
+  return _async$1(function (input, init) {
+    return _catch(function () {
+      return _await$1(buildRequestWithFixedUrl(input), function (fixedRequest) {
+        return _await$1(buildRequestInit(fixedRequest, init), function (_buildRequestInit) {
+          init = _buildRequestInit;
+          return _await$1(makeRequest(fixedRequest, init), function (request) {
+            request.timeout = timeout; // copy/set timeout on the request directly
+            return request;
+          });
+        });
+      });
+    }, function (e) {
       if (e instanceof FetchRequestFactoryError) {
         throw e;
       } else {
         throw new FetchRequestFactoryError(e);
       }
-    }
+    });
   });
 }
 function mergeRequestInits(base, requestInit) {
   if (requestInit) {
-    const headers = mergeRequestHeaders([base.headers, requestInit === null || requestInit === void 0 ? void 0 : requestInit.headers]);
-    return Object.assign(Object.assign(Object.assign({}, base), requestInit), {
+    const headers = mergeRequestHeaders([base.headers, requestInit == null ? void 0 : requestInit.headers]);
+    return Object.assign({}, base, requestInit, {
       headers
     });
   } else {
@@ -5141,15 +5191,39 @@ function isFetchRequest(input) {
   return Boolean(input.url);
 }
 
+function _await(value, then, direct) {
+  if (direct) {
+    return then ? then(value) : value;
+  }
+  if (!value || !value.then) {
+    value = Promise.resolve(value);
+  }
+  return then ? value.then(then) : value;
+}
+function _async(f) {
+  return function () {
+    for (var args = [], i = 0; i < arguments.length; i++) {
+      args[i] = arguments[i];
+    }
+    try {
+      return Promise.resolve(f.apply(this, args));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+}
 class FetchPageNoNextPageError extends FetchRequestFactoryError {
   constructor(page) {
     super(`There was no next page for this.`);
+    this.page = void 0;
     this.page = page;
   }
 }
 class FetchPageLimitReachedError extends FetchRequestFactoryError {
   constructor(page, limit) {
     super(`The limit of ${limit} for the number of pages to read was reached.`);
+    this.page = void 0;
+    this.limit = void 0;
     this.page = page;
     this.limit = limit;
   }
@@ -5174,40 +5248,43 @@ function fetchPageFactory(config) {
   return (initalInput, options) => {
     const {
       maxPage: inputMaxPage = defaultMaxPage
-    } = options !== null && options !== void 0 ? options : {};
-    const maxPage = inputMaxPage === null ? Number.MAX_SAFE_INTEGER : inputMaxPage !== null && inputMaxPage !== void 0 ? inputMaxPage : FETCH_PAGE_FACTORY_DEFAULT_MAX_PAGE;
+    } = options != null ? options : {};
+    const maxPage = inputMaxPage === null ? Number.MAX_SAFE_INTEGER : inputMaxPage != null ? inputMaxPage : FETCH_PAGE_FACTORY_DEFAULT_MAX_PAGE;
     function fetchNextWithInput(input, previous = undefined) {
-      return () => __awaiter(this, void 0, void 0, function* () {
-        const result = yield fetch(input);
-        const {
-          cursor,
-          hasNext: readHasNext
-        } = yield readFetchPageResultInfo(result);
-        const hasNext = readHasNext !== false;
-        const page = previous ? previous.page + 1 : util.FIRST_PAGE;
-        const isAtMaxPage = page >= maxPage;
-        const nextPageResult = {
-          input,
-          result,
-          page,
-          previous,
-          hasNext,
-          isAtMaxPage,
-          cursor,
-          fetchNext: util.cachedGetter(() => __awaiter(this, void 0, void 0, function* () {
-            // assert max page
-            if (isAtMaxPage) {
-              throw new FetchPageLimitReachedError(nextPageResult, maxPage);
-            }
-            // assert next page
-            const nextPageInfo = hasNext ? yield buildInputForNextPage(nextPageResult, input) : undefined;
-            if (!nextPageInfo) {
-              throw new FetchPageNoNextPageError(nextPageResult);
-            }
-            return fetchNextWithInput(Object.assign(Object.assign({}, input), nextPageInfo), nextPageResult)();
-          }))
-        };
-        return nextPageResult;
+      return _async(function () {
+        return _await(fetch(input), function (result) {
+          return _await(readFetchPageResultInfo(result), function ({
+            cursor,
+            hasNext: readHasNext
+          }) {
+            const hasNext = readHasNext !== false;
+            const page = previous ? previous.page + 1 : util.FIRST_PAGE;
+            const isAtMaxPage = page >= maxPage;
+            const nextPageResult = {
+              input,
+              result,
+              page,
+              previous,
+              hasNext,
+              isAtMaxPage,
+              cursor,
+              fetchNext: util.cachedGetter(_async(function () {
+                // assert max page
+                if (isAtMaxPage) {
+                  throw new FetchPageLimitReachedError(nextPageResult, maxPage);
+                }
+                // assert next page
+                return _await(hasNext ? buildInputForNextPage(nextPageResult, input) : undefined, function (nextPageInfo) {
+                  if (!nextPageInfo) {
+                    throw new FetchPageNoNextPageError(nextPageResult);
+                  }
+                  return fetchNextWithInput(Object.assign({}, input, nextPageInfo), nextPageResult)();
+                }, !hasNext);
+              }))
+            };
+            return nextPageResult;
+          });
+        });
       });
     }
     const page = {
@@ -5363,6 +5440,7 @@ function fetchURLSearchParamsObjectToURLSearchParams(input) {
 class JsonResponseParseError extends Error {
   constructor(response) {
     super('Failed to parse the JSON body.');
+    this.response = void 0;
     this.response = response;
   }
 }
@@ -5383,17 +5461,17 @@ const returnNullHandleFetchJsonParseErrorFunction = response => null;
  * Creates a FetchJsonFunction from the input ConfiguredFetch.
  */
 function fetchJsonFunction(fetch, inputConfig) {
-  var _a;
+  var _config$handleFetchJs;
   let config;
   if (typeof inputConfig === 'function') {
     config = {
       handleFetchJsonParseErrorFunction: inputConfig
     };
   } else {
-    config = inputConfig !== null && inputConfig !== void 0 ? inputConfig : {};
+    config = inputConfig != null ? inputConfig : {};
   }
-  config = Object.assign(Object.assign({}, config), {
-    handleFetchJsonParseErrorFunction: (_a = config.handleFetchJsonParseErrorFunction) !== null && _a !== void 0 ? _a : throwJsonResponseParseErrorFunction
+  config = Object.assign({}, config, {
+    handleFetchJsonParseErrorFunction: (_config$handleFetchJs = config.handleFetchJsonParseErrorFunction) != null ? _config$handleFetchJs : throwJsonResponseParseErrorFunction
   });
   const {
     handleFetchJsonParseErrorFunction,
@@ -5418,7 +5496,7 @@ function fetchJsonRequestInitFunction(config = {}) {
     mapFetchJsonInput = util.mapIdentityFunction()
   } = config;
   return (methodOrInput = defaultMethod, body) => {
-    var _a;
+    var _config$method;
     let config;
     if (methodOrInput === null) {
       config = {
@@ -5433,8 +5511,8 @@ function fetchJsonRequestInitFunction(config = {}) {
       config = methodOrInput;
     }
     config = mapFetchJsonInput(config);
-    const requestInit = Object.assign(Object.assign({}, config), {
-      method: (_a = config.method) !== null && _a !== void 0 ? _a : defaultMethod,
+    const requestInit = Object.assign({}, config, {
+      method: (_config$method = config.method) != null ? _config$method : defaultMethod,
       body: fetchJsonBodyString(config.body)
     });
     return requestInit;

package/fetch/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/util/fetch",
-  "version": "10.2.0",
+  "version": "11.0.0",
   ".": {
     "types": "./src/index.d.ts",
     "node": {