@very-simple/ajax 0.6.0 → 0.7.1

package/dist/index.d.ts

@@ -8,6 +8,7 @@ interface VisitOptions {
     loadingDelay?: number;
     progressHideDelay?: number;
     request?: RequestInit;
+    regions?: string[];
 }
 type MergeStrategy = 'replace' | 'morph' | 'before' | 'after' | 'prepend' | 'append' | 'update';
 interface Config {
@@ -42,7 +43,7 @@ declare global {
 
 declare const _default: {
     start: ({ watchHistory, merge, morphHeads, loadingDelay, }?: Config) => void;
-    visit: (url: string, { action, emitEvents, isBackForward, morphHeads, merge: mergeStrategy, loadingDelay, progressHideDelay, autoFocus, request, }?: VisitOptions) => Promise<void>;
+    visit: (url: string, { action, emitEvents, isBackForward, morphHeads, merge: mergeStrategy, loadingDelay, progressHideDelay, autoFocus, request, regions, }?: VisitOptions) => Promise<void>;
 };
 
 export { _default as default };

package/dist/index.js

@@ -12,7 +12,7 @@ var parser = new DOMParser();
 var currentLoadController;
 var progress = 0;
 var trickleInterval;
-var load = async (url, regionIds, options) => {
+var load = async (url, regions, options) => {
   let progressDelayTimeout;
   try {
     currentLoadController?.abort();
@@ -28,13 +28,13 @@ var load = async (url, regionIds, options) => {
       headers: {
         ...options.request?.headers,
         "X-Very-Simple-Request": "true",
-        "X-Very-Simple-Regions": regionIds.join(" ")
+        "X-Very-Simple-Regions": regions.join(" ")
       },
       signal: currentLoadController.signal
     });
     const html = await response.text();
     const document2 = parser.parseFromString(html, "text/html");
-    return { document: document2, url: response.url };
+    return { document: document2, response };
   } catch (e) {
     setProgress(0);
     const isAbortError = e instanceof DOMException && e.name === "AbortError";
@@ -147,39 +147,41 @@ var visit = async (url, {
   loadingDelay = globalConfig.loadingDelay,
   progressHideDelay = globalConfig.progressHideDelay,
   autoFocus = true,
-  request
+  request,
+  regions = []
 } = {}) => {
-  prevUrl = currentUrl;
-  currentUrl = url;
   if (emitEvents) emit("before-visit", { url, prevUrl });
   let newDocument;
   if (isBackForward) {
     newDocument = cache.get(url)?.cloneNode(true);
   }
-  const regions = findRegions(document);
   if (!newDocument) {
     const options = { loadingDelay, progressHideDelay, request };
-    const result = await load(url, Array.from(regions.keys()), options);
-    if (result) ({ url, document: newDocument } = result);
+    const result = await load(url, regions, options);
+    if (result) {
+      newDocument = result.document;
+      url = result.response.redirected ? result.response.url : url;
+    }
   }
   if (!newDocument) return;
+  prevUrl = currentUrl;
+  currentUrl = url;
   if (emitEvents) emit("before-render", { url, prevUrl, newDocument });
   if (!isBackForward) {
     const cacheId = window.location.pathname + window.location.search;
     cache.set(cacheId, document.cloneNode(true));
   }
   if (morphHeads) Idiomorph2.morph(document.head, newDocument.head);
-  const getMergeStrategy = (oldEl, newEl) => newEl.dataset.simpleAjax || oldEl.dataset.simpleAjax || mergeStrategy;
+  const getMergeStrategy = (oldEl, newEl) => newEl.dataset.simpleMerge || oldEl.dataset.simpleMerge || mergeStrategy;
   let autoFocusEl;
-  const newRegions = findRegions(newDocument);
-  const regionKeys = new Set(regions.keys());
-  const newRegionKeys = new Set(newRegions.keys());
-  const commonRegionKeys = regionKeys.intersection(newRegionKeys);
-  const hasCommonRegions = commonRegionKeys.size > 0;
-  if (hasCommonRegions) {
-    for (const id of commonRegionKeys) {
-      const region = regions.get(id);
-      const newRegion = newRegions.get(id);
+  const hasMatchingRegions = regions?.some(
+    (selector) => document.querySelector(selector) && newDocument.querySelector(selector)
+  );
+  if (hasMatchingRegions) {
+    for (const id of regions) {
+      const region = document.querySelector(id);
+      const newRegion = newDocument.querySelector(id);
+      if (!region || !newRegion) continue;
       const strategy = getMergeStrategy(region, newRegion);
       const result = merge(region, newRegion, strategy);
       autoFocusEl ??= result.autoFocusEl;
@@ -196,14 +198,6 @@ var visit = async (url, {
   else if (action === "push") history.pushState(null, "", url);
   if (emitEvents) emit("visit", { url, prevUrl });
 };
-var findRegions = (doc) => {
-  let regions = /* @__PURE__ */ new Map();
-  doc.querySelectorAll("[data-simple-ajax]").forEach((el) => {
-    if (!el.id) console.warn(`Ajax region is missing an id:`, el);
-    else regions.set(el.id, el);
-  });
-  return regions;
-};
 
 // src/start.ts
 var start = ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@very-simple/ajax",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "A very simple turbolinks inspired library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",