grab-url 1.0.6 → 1.0.8

package/dist/grab-api.es.js

@@ -1,180 +1,6 @@
-function log(message = "", options = {}) {
-  let {
-    color = null,
-    style = "color: blue; font-size: 11pt;",
-    hideInProduction = void 0,
-    startSpinner = false,
-    stopSpinner = false
-  } = options;
-  if (typeof hideInProduction === "undefined")
-    hideInProduction = typeof window !== "undefined" && (window == null ? void 0 : window.location.hostname.includes("localhost"));
-  if (typeof message === "object")
-    message = printJSONStructure(message) + "\n\n" + JSON.stringify(message, null, 2);
-  if (color && typeof process !== void 0)
-    message = (colors[color] || "") + message + colors.reset;
-  var i = 0;
-  if (startSpinner)
-    (global || globalThis).interval = setInterval(() => {
-      process.stdout.write(
-        (colors[color] || "") + "\r" + "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏".split("")[i = ++i % 10] + " " + message + colors.reset
-      );
-    }, 50);
-  else if (stopSpinner) {
-    clearInterval((global || globalThis).interval);
-    process.stdout.write(
-      "\r" + (message || "✔ Done") + " ".repeat(message.length + 20) + "\n"
-    );
-  } else if (typeof style === "string") {
-    if (style.split(" ").length == 1 || color) {
-      style = `color: ${color || style}; font-size: 11pt;`;
-    } else {
-      if (style.match(/^#[0-9a-fA-F]{6}$/)) {
-        style = `color: ${style}; font-size: 11pt;`;
-      }
-    }
-    if (hideInProduction)
-      console.debug((style ? "%c" : "") + (message || ""), style);
-    else console.log((style ? "%c" : "") + (message || ""), style);
-  } else if (typeof style === "object") console.log(message, ...style);
-  return true;
-}
-const colors = {
-  reset: "\x1B[0m",
-  // Reset to default color
-  black: "\x1B[30m",
-  red: "\x1B[31m",
-  // Functions, errors
-  green: "\x1B[32m",
-  // Object braces, success
-  yellow: "\x1B[33m",
-  // Strings, warnings
-  blue: "\x1B[34m",
-  // Array brackets, info
-  magenta: "\x1B[35m",
-  // Booleans
-  cyan: "\x1B[36m",
-  // Numbers
-  white: "\x1B[37m",
-  // Default color, plain text
-  gray: "\x1B[90m",
-  // Null, undefined, subtle
-  // Bright variants
-  brightRed: "\x1B[91m",
-  brightGreen: "\x1B[92m",
-  brightYellow: "\x1B[93m",
-  brightBlue: "\x1B[94m",
-  brightMagenta: "\x1B[95m",
-  brightCyan: "\x1B[96m",
-  brightWhite: "\x1B[97m",
-  // Background colors (optional)
-  bgRed: "\x1B[41m",
-  bgGreen: "\x1B[42m",
-  bgYellow: "\x1B[43m",
-  bgBlue: "\x1B[44m",
-  bgMagenta: "\x1B[45m",
-  bgCyan: "\x1B[46m",
-  bgWhite: "\x1B[47m",
-  bgGray: "\x1B[100m"
-};
-function getColorForType(value) {
-  if (typeof value === "string") return colors.yellow;
-  if (typeof value === "number") return colors.cyan;
-  if (typeof value === "boolean") return colors.magenta;
-  if (typeof value === "function") return colors.red;
-  if (value === null) return colors.gray;
-  if (Array.isArray(value)) return colors.blue;
-  if (typeof value === "object") return colors.green;
-  return colors.white;
-}
-function getTypeString(value) {
-  if (typeof value === "string") return '""';
-  if (typeof value === "number") return "number";
-  if (typeof value === "boolean") return "bool";
-  if (typeof value === "function") return "function";
-  if (value === null) return "null";
-  if (Array.isArray(value)) {
-    if (value.length) return "[" + getTypeString(value[0]) + "]";
-    else return "[]";
-  }
-  if (typeof value === "object") return "{...}";
-  return typeof value;
-}
-function printJSONStructure(obj, indent = 0) {
-  const pad = "  ".repeat(indent);
-  if (typeof obj !== "object" || obj === null) {
-    const color = getColorForType(obj);
-    return color + getTypeString(obj) + colors.reset;
-  }
-  if (Array.isArray(obj)) {
-    let result2 = colors.blue + "[" + colors.reset;
-    if (obj.length) result2 += "\n";
-    obj.forEach((item, idx) => {
-      result2 += pad + "  " + printJSONStructure(item, indent + 1);
-      if (idx < obj.length - 1) result2 += ",";
-      result2 += "\n";
-    });
-    result2 += pad + colors.blue + "]" + colors.reset;
-    return result2;
-  }
-  let result = colors.green + "{" + colors.reset;
-  const keys = Object.keys(obj);
-  if (keys.length) result += "\n";
-  keys.forEach((key, index) => {
-    const value = obj[key];
-    const color = getColorForType(value);
-    result += pad + "  ";
-    if (typeof value === "object" && value !== null && !Array.isArray(value)) {
-      result += color + key + colors.reset + ": " + printJSONStructure(value, indent + 1);
-    } else if (Array.isArray(value)) {
-      result += color + key + colors.reset + ": " + printJSONStructure(value, indent + 1);
-    } else {
-      result += color + key + ": " + getTypeString(value) + colors.reset;
-    }
-    if (index < keys.length - 1) result += ",";
-    result += "\n";
-  });
-  result += pad + colors.green + "}" + colors.reset;
-  return result;
-}
-function showAlert(msg) {
-  if (typeof document === "undefined") return;
-  let o = document.getElementById("alert-overlay"), list;
-  if (!o) {
-    o = document.body.appendChild(document.createElement("div"));
-    o.id = "alert-overlay";
-    o.setAttribute(
-      "style",
-      "position:fixed;inset:0;z-index:9999;background:rgba(0,0,0,0.5);display:flex;align-items:center;justify-content:center"
-    );
-    o.innerHTML = `<div id="alert-box" style="background:#fff;padding:1.5em 2em;border-radius:8px;box-shadow:0 2px 16px #0003;min-width:220px;max-height:80vh;position:relative;display:flex;flex-direction:column;">
-      <button id="close-alert" style="position:absolute;top:12px;right:20px;font-size:1.5em;background:none;border:none;cursor:pointer;color:black;">&times;</button>
-      <div id="alert-list" style="overflow:auto;flex:1;"></div>
-    </div>`;
-    o.addEventListener("click", (e) => e.target == o && o.remove());
-    document.getElementById("close-alert").onclick = () => o.remove();
-  }
-  list = o.querySelector("#alert-list");
-  list.innerHTML += `<div style="border-bottom:1px solid #333; font-size:1.2em;margin:0.5em 0;">${msg}</div>`;
-}
-function setupDevTools() {
-  document.addEventListener("keydown", (e) => {
-    if (e.key === "i" && e.ctrlKey) {
-      let html = " ";
-      for (let request of grab.log) {
-        html += `<div style="margin-bottom:1em; border-bottom:1px solid #ccc; padding-bottom:1em;">
-          <b>Path:</b> ${request.path}<br>
-          <b>Request:</b> ${request.request}<br>
-          <b>Response:</b> ${JSON.stringify(request.response, null, 2)}<br>
-          <b>Time:</b> ${new Date(request.lastFetchTime).toLocaleString()}
-        </div>`;
-      }
-      showAlert(html);
-    }
-  });
-}
-async function grab$1(path, options) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
-  let {
+import { log, printJSONStructure } from "./log.es.js";
+async function grab(path, options) {
+  var {
     headers,
     response = {},
     // Pre-initialized object to set the response in. isLoading and error are also set on this object.
@@ -232,7 +58,7 @@ async function grab$1(path, options) {
     // All other params become request params/query
   } = {
     // Destructure options with defaults, merging with any globally set defaults
-    ...typeof window !== "undefined" ? (_a = window == null ? void 0 : window.grab) == null ? void 0 : _a.defaults : ((_c = (_b = global || globalThis) == null ? void 0 : _b.grab) == null ? void 0 : _c.defaults) || {},
+    ...typeof window !== "undefined" ? window?.grab?.defaults : (global || globalThis)?.grab?.defaults || {},
     ...options
   };
   let s = (t) => path.startsWith(t);
@@ -242,21 +68,21 @@ async function grab$1(path, options) {
   try {
     if (debounce > 0)
       return await debouncer(async () => {
-        await grab$1(path, { ...options, debounce: 0 });
+        await grab(path, { ...options, debounce: 0 });
       }, debounce * 1e3);
     if (repeat > 1) {
       for (let i = 0; i < repeat; i++) {
-        await grab$1(path, { ...options, repeat: 0 });
+        await grab(path, { ...options, repeat: 0 });
       }
       return response;
     }
     if (repeatEvery) {
       setInterval(async () => {
-        await grab$1(path, { ...options, repeat: 0, repeatEvery: null });
+        await grab(path, { ...options, repeat: 0, repeatEvery: null });
       }, repeatEvery * 1e3);
       return response;
     }
-    if (options == null ? void 0 : options.setDefaults) {
+    if (options?.setDefaults) {
       if (typeof window !== "undefined")
         window.grab.defaults = { ...options, setDefaults: void 0 };
       else if (typeof (global || globalThis).grab !== "undefined")
@@ -266,8 +92,8 @@ async function grab$1(path, options) {
         };
       return;
     }
-    if (typeof window !== void 0) {
-      const regrab = async () => await grab$1(path, { ...options, cache: false });
+    if (typeof window !== "undefined") {
+      const regrab = async () => await grab(path, { ...options, cache: false });
       if (regrabOnStale && cache) setTimeout(regrab, 1e3 * cacheForTime);
       if (regrabOnNetwork) window.addEventListener("online", regrab);
       if (regrabOnFocus) {
@@ -280,9 +106,10 @@ async function grab$1(path, options) {
     let resFunction = typeof response === "function" ? response : null;
     if (!response || resFunction) response = {};
     var [paginateKey, paginateResult, paginateElement] = infiniteScroll || [];
-    if ((infiniteScroll == null ? void 0 : infiniteScroll.length) && typeof window !== "undefined") {
+    if (infiniteScroll?.length && typeof paginateElement !== "undefined" && typeof window !== "undefined") {
       let paginateDOM = typeof paginateElement === "string" ? document.querySelector(paginateElement) : paginateElement;
-      if (window.scrollListener)
+      if (!paginateDOM) log("paginateDOM not found", { color: "red" });
+      else if (window.scrollListener && typeof paginateDOM !== "undefined" && typeof paginateDOM.removeEventListener === "function")
         paginateDOM.removeEventListener("scroll", window.scrollListener);
       window.scrollListener = async (event) => {
         const t = event.target;
@@ -291,49 +118,50 @@ async function grab$1(path, options) {
           JSON.stringify([t.scrollTop, t.scrollLeft, paginateElement])
         );
         if (t.scrollHeight - t.scrollTop <= t.clientHeight + 200) {
-          await grab$1(path, {
+          await grab(path, {
             ...options,
             cache: false,
-            [paginateKey]: (priorRequest == null ? void 0 : priorRequest.currentPage) + 1
+            [paginateKey]: priorRequest?.currentPage + 1
           });
         }
       };
-      paginateDOM.addEventListener("scroll", window.scrollListener);
+      if (paginateDOM)
+        paginateDOM.addEventListener("scroll", window.scrollListener);
     }
     let paramsAsText = JSON.stringify(
       paginateKey ? { ...params, [paginateKey]: void 0 } : params
     );
-    let priorRequest = (_d = grab$1 == null ? void 0 : grab$1.log) == null ? void 0 : _d.find(
+    let priorRequest = grab?.log?.find(
       (e) => e.request == paramsAsText && e.path == path
     );
     if (!paginateKey) {
       for (let key of Object.keys(response)) response[key] = void 0;
-      if (cache && (!cacheForTime || (priorRequest == null ? void 0 : priorRequest.lastFetchTime) > Date.now() - 1e3 * cacheForTime)) {
+      if (cache && (!cacheForTime || priorRequest?.lastFetchTime > Date.now() - 1e3 * cacheForTime)) {
         for (let key of Object.keys(priorRequest.res))
           response[key] = priorRequest.res[key];
         if (resFunction) response = resFunction(response);
       }
     } else {
-      let pageNumber = (priorRequest == null ? void 0 : priorRequest.currentPage) + 1 || (params == null ? void 0 : params[paginateKey]) || 1;
+      let pageNumber = priorRequest?.currentPage + 1 || params?.[paginateKey] || 1;
       if (!priorRequest) {
         response[paginateResult] = [];
         pageNumber = 1;
       }
       if (priorRequest) priorRequest.currentPage = pageNumber;
-      params[paginateKey] = pageNumber;
+      params = { ...params, [paginateKey]: pageNumber };
     }
     if (resFunction) resFunction({ isLoading: true });
     else if (typeof response === "object") response.isLoading = true;
     if (resFunction) response = resFunction(response);
-    if (rateLimit > 0 && (priorRequest == null ? void 0 : priorRequest.lastFetchTime) && priorRequest.lastFetchTime > Date.now() - 1e3 * rateLimit)
+    if (rateLimit > 0 && priorRequest?.lastFetchTime && priorRequest.lastFetchTime > Date.now() - 1e3 * rateLimit)
       throw new Error(`Fetch rate limit exceeded for ${path}. 
         Wait ${rateLimit}s between requests.`);
-    if (priorRequest == null ? void 0 : priorRequest.controller) {
+    if (priorRequest?.controller) {
       if (cancelOngoingIfNew) priorRequest.controller.abort();
       else if (cancelNewIfOngoing) return { isLoading: true };
     }
-    if (typeof grab$1.log != "undefined")
-      (_e = grab$1.log) == null ? void 0 : _e.unshift({
+    if (typeof grab.log != "undefined")
+      grab.log?.unshift({
         path,
         request: paramsAsText,
         lastFetchTime: Date.now(),
@@ -349,7 +177,7 @@ async function grab$1(path, options) {
       body: params.body,
       redirect: "follow",
       cache: cache ? "force-cache" : "no-store",
-      signal: cancelOngoingIfNew ? (_g = (_f = grab$1.log[0]) == null ? void 0 : _f.controller) == null ? void 0 : _g.signal : AbortSignal.timeout(timeout * 1e3)
+      signal: cancelOngoingIfNew ? grab.log[0]?.controller?.signal : AbortSignal.timeout(timeout * 1e3)
     };
     let paramsGETRequest = "";
     if (["POST", "PUT", "PATCH"].includes(method))
@@ -363,7 +191,7 @@ async function grab$1(path, options) {
         params,
         fetchParams
       );
-    let res = null, startTime = /* @__PURE__ */ new Date(), mockHandler = (_h = grab$1.mock) == null ? void 0 : _h[path];
+    let res = null, startTime = /* @__PURE__ */ new Date(), mockHandler = grab.mock?.[path];
     let wait = (s2) => new Promise((res2) => setTimeout(res2, s2 * 1e3 || 0));
     if (mockHandler && (!mockHandler.params || mockHandler.method == method) && (!mockHandler.params || paramsAsText == JSON.stringify(mockHandler.params))) {
       await wait(mockHandler.delay);
@@ -371,7 +199,7 @@ async function grab$1(path, options) {
     } else {
       res = await fetch(baseURL + path + paramsGETRequest, fetchParams).catch(
         (e) => {
-          throw new Error(e);
+          throw new Error(e.message);
         }
       );
       if (!res.ok)
@@ -391,8 +219,8 @@ async function grab$1(path, options) {
         fetchParams
       );
     if (resFunction) resFunction({ isLoading: void 0 });
-    else if (typeof response === "object") response == null ? true : delete response.isLoading;
-    priorRequest == null ? true : delete priorRequest.controller;
+    else if (typeof response === "object") delete response?.isLoading;
+    delete priorRequest?.controller;
     const elapsedTime = ((Number(/* @__PURE__ */ new Date()) - Number(startTime)) / 1e3).toFixed(1);
     if (debug) {
       logger(
@@ -401,12 +229,12 @@ async function grab$1(path, options) {
     }
     if (typeof res === "object") {
       for (let key of Object.keys(res))
-        response[key] = paginateResult == key && ((_i = response[key]) == null ? void 0 : _i.length) ? [...response[key], ...res[key]] : res[key];
+        response[key] = paginateResult == key && response[key]?.length ? [...response[key], ...res[key]] : res[key];
       if (typeof response !== "undefined") response.data = res;
     } else if (resFunction) resFunction({ data: res, ...res });
     else if (typeof response === "object") response.data = res;
-    if (typeof grab$1.log != "undefined")
-      (_j = grab$1.log) == null ? void 0 : _j.unshift({
+    if (typeof grab.log != "undefined")
+      grab.log?.unshift({
         path,
         request: JSON.stringify({ ...params, paginateKey: void 0 }),
         response,
@@ -416,25 +244,24 @@ async function grab$1(path, options) {
     return response;
   } catch (error) {
     let errorMessage = "Error: " + error.message + "\nPath:" + baseURL + path + "\n";
-    JSON.stringify(params);
     if (typeof onError === "function")
       onError(error.message, baseURL + path, params);
     if (options.retryAttempts > 0)
-      return await grab$1(path, {
+      return await grab(path, {
         ...options,
         retryAttempts: --options.retryAttempts
       });
     if (!error.message.includes("signal") && options.debug) {
       logger(errorMessage, { color: "red" });
-      if (debug && typeof document !== void 0) showAlert(errorMessage);
+      if (debug && typeof document !== "undefined") showAlert(errorMessage);
     }
     response.error = error.message;
     if (typeof response === "function") {
       response.data = response({ isLoading: void 0, error: error.message });
       response = response.data;
-    } else response == null ? true : delete response.isLoading;
-    if (typeof grab$1.log != "undefined")
-      (_k = grab$1.log) == null ? void 0 : _k.unshift({
+    } else delete response?.isLoading;
+    if (typeof grab.log != "undefined")
+      grab.log?.unshift({
         path,
         request: JSON.stringify(params),
         error: error.message
@@ -442,7 +269,7 @@ async function grab$1(path, options) {
     return response;
   }
 }
-grab$1.instance = (defaults = {}) => (path, options = {}) => grab$1(path, { ...defaults, ...options });
+grab.instance = (defaults = {}) => (path, options = {}) => grab(path, { ...defaults, ...options });
 const debouncer = async (func, wait) => {
   let timeout;
   return async function executedFunction(...args) {
@@ -456,7 +283,7 @@ const debouncer = async (func, wait) => {
 };
 if (typeof window !== "undefined") {
   window.log = log;
-  window.grab = grab$1;
+  window.grab = grab;
   window.grab.log = [];
   window.grab.mock = {};
   window.grab.defaults = {};
@@ -468,23 +295,60 @@ if (typeof window !== "undefined") {
     document.querySelector(paginateElement).scrollLeft = scrollLeft;
   });
 } else if (typeof global !== "undefined") {
-  grab$1.log = [];
-  grab$1.mock = {};
-  grab$1.defaults = {};
+  grab.log = [];
+  grab.mock = {};
+  grab.defaults = {};
   global.log = log;
-  global.grab = grab$1.instance();
+  global.grab = grab.instance();
 } else if (typeof globalThis !== "undefined") {
-  grab$1.log = [];
-  grab$1.mock = {};
-  grab$1.defaults = {};
+  grab.log = [];
+  grab.mock = {};
+  grab.defaults = {};
   globalThis.log = log;
-  globalThis.grab = grab$1.instance();
+  globalThis.grab = grab.instance();
+}
+function showAlert(msg) {
+  if (typeof document === "undefined") return;
+  let o = document.getElementById("alert-overlay"), list;
+  if (!o) {
+    o = document.body.appendChild(document.createElement("div"));
+    o.id = "alert-overlay";
+    o.setAttribute(
+      "style",
+      "position:fixed;inset:0;z-index:9999;background:rgba(0,0,0,0.5);display:flex;align-items:center;justify-content:center"
+    );
+    o.innerHTML = `<div id="alert-box" style="background:#fff;padding:1.5em 2em;border-radius:8px;box-shadow:0 2px 16px #0003;min-width:220px;max-height:80vh;position:relative;display:flex;flex-direction:column;">
+      <button id="close-alert" style="position:absolute;top:12px;right:20px;font-size:1.5em;background:none;border:none;cursor:pointer;color:black;">&times;</button>
+      <div id="alert-list" style="overflow:auto;flex:1;"></div>
+    </div>`;
+    o.addEventListener("click", (e) => e.target == o && o.remove());
+    document.getElementById("close-alert").onclick = () => o.remove();
+  }
+  list = o.querySelector("#alert-list");
+  list.innerHTML += `<div style="border-bottom:1px solid #333; font-size:1.2em;margin:0.5em 0;">${msg}</div>`;
+}
+function setupDevTools() {
+  document.addEventListener("keydown", (e) => {
+    if (e.key === "i" && e.ctrlKey && e.altKey) {
+      let html = " ";
+      for (let request of grab.log) {
+        html += `<div style="margin-bottom:1em; border-bottom:1px solid #ccc; padding-bottom:1em;">
+          <b>Path:</b> ${request.path}<br>
+          <b>Request:</b> ${printJSONStructure(request.request, 0, "html")}<br>
+          <b>Response:</b> ${printJSONStructure(request.response, 0, "html")}<br> 
+          <b>Time:</b> ${new Date(request.lastFetchTime).toLocaleString()}
+        </div>`;
+      }
+      showAlert(html);
+    }
+  });
 }
 export {
-  grab$1 as default,
-  grab$1 as grab,
+  grab as default,
+  grab,
   log,
   printJSONStructure,
+  setupDevTools,
   showAlert
 };
 //# sourceMappingURL=grab-api.es.js.map