@ereo/client 0.2.36 → 0.2.37

package/dist/index.js

@@ -570,17 +570,47 @@ var defaultOptions = {
 function isCacheValid(entry, cacheDuration) {
   return Date.now() - entry.timestamp < cacheDuration;
 }
+function normalizePrefetchUrl(url) {
+  if (typeof window !== "undefined") {
+    try {
+      const parsed = new URL(url, window.location.origin);
+      if (parsed.origin !== window.location.origin) {
+        return url;
+      }
+      return parsed.pathname + parsed.search;
+    } catch {
+      return url;
+    }
+  }
+  try {
+    const parsed = new URL(url);
+    return parsed.pathname + parsed.search;
+  } catch {
+    return url;
+  }
+}
+function isSameOriginHref(href) {
+  if (typeof window === "undefined" || !href) {
+    return false;
+  }
+  try {
+    return new URL(href, window.location.origin).origin === window.location.origin;
+  } catch {
+    return false;
+  }
+}
 async function prefetch(url) {
-  const cached = prefetchCache.get(url);
+  const cacheKey = normalizePrefetchUrl(url);
+  const cached = prefetchCache.get(cacheKey);
   if (cached && (cached.loading || isCacheValid(cached, defaultOptions.cacheDuration))) {
     return;
   }
   const entry = {
-    url,
+    url: cacheKey,
     timestamp: Date.now(),
     loading: true
   };
-  prefetchCache.set(url, entry);
+  prefetchCache.set(cacheKey, entry);
   try {
     const response = await fetch(url, {
       method: "GET",
@@ -602,7 +632,7 @@ async function prefetch(url) {
   }
 }
 function getPrefetchedData(url) {
-  const entry = prefetchCache.get(url);
+  const entry = prefetchCache.get(normalizePrefetchUrl(url));
   if (entry && isCacheValid(entry, defaultOptions.cacheDuration) && entry.data) {
     return entry.data;
   }
@@ -614,10 +644,10 @@ function clearPrefetchCache() {
 function setupLinkPrefetch(element, options = {}) {
   const { strategy, threshold } = { ...defaultOptions, ...options };
   const href = element.href;
-  if (!href || !href.startsWith(window.location.origin)) {
+  if (!isSameOriginHref(href)) {
     return () => {};
   }
-  const url = new URL(href).pathname;
+  const url = normalizePrefetchUrl(href);
   let cleanup = null;
   switch (strategy) {
     case "hover": {
@@ -657,18 +687,18 @@ function setupAutoPrefetch(options = {}) {
   if (typeof document === "undefined")
     return () => {};
   const cleanups = [];
-  const links = document.querySelectorAll('a[href^="/"]');
+  const links = document.querySelectorAll("a[href]");
   links.forEach((link) => {
     cleanups.push(setupLinkPrefetch(link, options));
   });
   const observer = new MutationObserver((mutations) => {
     for (const mutation of mutations) {
       for (const node of mutation.addedNodes) {
-        if (node instanceof HTMLAnchorElement && node.href.startsWith("/")) {
+        if (node instanceof HTMLAnchorElement && isSameOriginHref(node.href)) {
           cleanups.push(setupLinkPrefetch(node, options));
         }
         if (node instanceof Element) {
-          const newLinks = node.querySelectorAll('a[href^="/"]');
+          const newLinks = node.querySelectorAll("a[href]");
           newLinks.forEach((link) => {
             cleanups.push(setupLinkPrefetch(link, options));
           });
@@ -686,11 +716,11 @@ async function prefetchAll(urls) {
   await Promise.all(urls.map(prefetch));
 }
 function isPrefetching(url) {
-  const entry = prefetchCache.get(url);
+  const entry = prefetchCache.get(normalizePrefetchUrl(url));
   return entry?.loading ?? false;
 }
 function isPrefetched(url) {
-  const entry = prefetchCache.get(url);
+  const entry = prefetchCache.get(normalizePrefetchUrl(url));
   return entry?.data !== undefined;
 }
 // src/hooks.ts

package/dist/prefetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prefetch.d.ts","sourceRoot":"","sources":["../src/prefetch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAkBH;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,wBAAwB;IACxB,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,CAAC;IACnD,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkBD;;GAEG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoCzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAM/D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,GAAE,eAAoB,GAC5B,MAAM,IAAI,CAmDZ;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,eAAoB,GAAG,MAAM,IAAI,CAkC3E;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGlD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGjD"}
+{"version":3,"file":"prefetch.d.ts","sourceRoot":"","sources":["../src/prefetch.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAkBH;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,wBAAwB;IACxB,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,CAAC;IACnD,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAmDD;;GAEG;AACH,wBAAsB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAsCzD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS,CAM/D;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAEzC;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,iBAAiB,EAC1B,OAAO,GAAE,eAAoB,GAC5B,MAAM,IAAI,CAmDZ;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,GAAE,eAAoB,GAAG,MAAM,IAAI,CAkC3E;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGlD;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGjD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ereo/client",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "license": "MIT",
   "author": "Enoch Kujem Abassey",
   "homepage": "https://ereojs.github.io/ereoJS",
@@ -32,7 +32,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@ereo/core": "^0.2.36"
+    "@ereo/core": "^0.2.37"
   },
   "devDependencies": {
     "@types/react": "^18.2.0",