@inertiajs/core 2.1.1 → 2.1.3

package/dist/index.js

@@ -34,6 +34,7 @@ __export(index_exports, {
   formDataToObject: () => formDataToObject,
   hideProgress: () => hide,
   hrefToUrl: () => hrefToUrl,
+  isUrlMethodPair: () => isUrlMethodPair,
   mergeDataIntoQueryString: () => mergeDataIntoQueryString,
   objectToFormData: () => objectToFormData,
   resetFormFields: () => resetFormFields,
@@ -41,6 +42,7 @@ __export(index_exports, {
   router: () => router,
   setupProgress: () => setupProgress,
   shouldIntercept: () => shouldIntercept,
+  shouldNavigate: () => shouldNavigate,
   urlWithoutHash: () => urlWithoutHash
 });
 module.exports = __toCommonJS(index_exports);
@@ -431,6 +433,9 @@ var setHashIfSameUrl = (originUrl, destinationUrl) => {
 var isSameUrlWithoutHash = (url1, url2) => {
   return urlWithoutHash(url1).href === urlWithoutHash(url2).href;
 };
+function isUrlMethodPair(href) {
+  return href !== null && typeof href === "object" && href !== void 0 && "url" in href && "method" in href;
+}
 
 // src/page.ts
 var CurrentPage = class {
@@ -652,12 +657,10 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState(
-          {
-            page: window.history.state.page,
-            scrollRegions
-          }
-        );
+        this.doReplaceState({
+          page: window.history.state.page,
+          scrollRegions
+        });
       });
     });
   }
@@ -667,12 +670,10 @@ var History = class {
         if (!window.history.state?.page) {
           return;
         }
-        this.doReplaceState(
-          {
-            page: window.history.state.page,
-            documentScrollPosition: scrollRegion
-          }
-        );
+        this.doReplaceState({
+          page: window.history.state.page,
+          documentScrollPosition: scrollRegion
+        });
       });
     });
   }
@@ -993,7 +994,7 @@ var Polls = class {
 var polls = new Polls();
 
 // src/prefetched.ts
-var import_es_toolkit = require("es-toolkit");
+var import_lodash_es = require("lodash-es");
 
 // src/objectUtils.ts
 var objectsAreEqual = (obj1, obj2, excludeKeys) => {
@@ -1052,7 +1053,7 @@ var PrefetchedRequests = class {
     this.removalTimers = [];
     this.currentUseId = null;
   }
-  add(params, sendFunc, { cacheFor }) {
+  add(params, sendFunc, { cacheFor, cacheTags }) {
     const inFlight = this.findInFlight(params);
     if (inFlight) {
       return Promise.resolve();
@@ -1097,7 +1098,8 @@ var PrefetchedRequests = class {
         response: promise,
         singleUse: expires === 0,
         timestamp: Date.now(),
-        inFlight: false
+        inFlight: false,
+        tags: Array.isArray(cacheTags) ? cacheTags : [cacheTags]
       });
       this.scheduleForRemoval(params, expires);
       this.removeFromInFlight(params);
@@ -1119,6 +1121,11 @@ var PrefetchedRequests = class {
     });
     this.removalTimers = [];
   }
+  removeByTags(tags) {
+    this.cached = this.cached.filter((prefetched) => {
+      return !prefetched.tags.some((tag) => tags.includes(tag));
+    });
+  }
   remove(params) {
     this.cached = this.cached.filter((prefetched) => {
       return !this.paramsAreEqual(prefetched.params, params);
@@ -1204,7 +1211,7 @@ var PrefetchedRequests = class {
     }) || null;
   }
   withoutPurposePrefetchHeader(params) {
-    const newParams = (0, import_es_toolkit.cloneDeep)(params);
+    const newParams = (0, import_lodash_es.cloneDeep)(params);
     if (newParams.headers["Purpose"] === "prefetch") {
       delete newParams.headers["Purpose"];
     }
@@ -1468,6 +1475,7 @@ var Response = class _Response {
       fireErrorEvent(scopedErrors);
       return this.requestParams.all().onError(scopedErrors);
     }
+    router.flushByCacheTags(this.requestParams.all().invalidateCacheTags || []);
     fireSuccessEvent(page.get());
     await this.requestParams.all().onSuccess(page.get());
     history.preserveUrl = false;
@@ -1910,11 +1918,15 @@ var Router = class {
   flushAll() {
     prefetchedRequests.removeAll();
   }
+  flushByCacheTags(tags) {
+    prefetchedRequests.removeByTags(Array.isArray(tags) ? tags : [tags]);
+  }
   getPrefetching(href, options = {}) {
     return prefetchedRequests.findInFlight(this.getPrefetchParams(href, options));
   }
-  prefetch(href, options = {}, { cacheFor = 3e4 }) {
-    if (options.method !== "get") {
+  prefetch(href, options = {}, prefetchOptions = {}) {
+    const method = options.method ?? (isUrlMethodPair(href) ? href.method : "get");
+    if (method !== "get") {
       throw new Error("Prefetch requests must use the GET method");
     }
     const visit = this.getPendingVisit(href, {
@@ -1956,7 +1968,11 @@ var Router = class {
         (params) => {
           this.asyncRequestStream.send(Request.create(params, page.get()));
         },
-        { cacheFor }
+        {
+          cacheFor: 3e4,
+          cacheTags: [],
+          ...prefetchOptions
+        }
       );
     });
   }
@@ -2011,6 +2027,11 @@ var Router = class {
     };
   }
   getPendingVisit(href, options, pendingVisitOptions = {}) {
+    if (isUrlMethodPair(href)) {
+      const urlMethodPair = href;
+      href = urlMethodPair.url;
+      options.method = options.method ?? urlMethodPair.method;
+    }
     const mergedOptions = {
       method: "get",
       data: {},
@@ -2029,6 +2050,7 @@ var Router = class {
       reset: [],
       preserveUrl: false,
       prefetch: false,
+      invalidateCacheTags: [],
       ...options
     };
     const [url, _data] = transformUrlAndData(
@@ -2087,7 +2109,7 @@ var Router = class {
 };
 
 // src/formObject.ts
-var import_compat = require("es-toolkit/compat");
+var import_lodash_es2 = require("lodash-es");
 function undotKey(key) {
   if (!key.includes(".")) {
     return key;
@@ -2122,150 +2144,19 @@ function formDataToObject(source) {
     const path = parseKey(undotKey(key));
     if (path[path.length - 1] === "") {
       const arrayPath = path.slice(0, -1);
-      const existing = (0, import_compat.get)(form, arrayPath);
+      const existing = (0, import_lodash_es2.get)(form, arrayPath);
       if (Array.isArray(existing)) {
         existing.push(value);
       } else {
-        (0, import_compat.set)(form, arrayPath, [value]);
+        (0, import_lodash_es2.set)(form, arrayPath, [value]);
       }
       continue;
     }
-    (0, import_compat.set)(form, path, value);
+    (0, import_lodash_es2.set)(form, path, value);
   }
   return form;
 }
 
-// src/resetFormFields.ts
-function isFormElement(element) {
-  return element instanceof HTMLInputElement || element instanceof HTMLSelectElement || element instanceof HTMLTextAreaElement;
-}
-function resetInputElement(input, defaultValues) {
-  const oldValue = input.value;
-  const oldChecked = input.checked;
-  switch (input.type.toLowerCase()) {
-    case "checkbox":
-      input.checked = defaultValues.includes(input.value);
-      break;
-    case "radio":
-      input.checked = defaultValues[0] === input.value;
-      break;
-    case "file":
-      input.value = "";
-      break;
-    case "button":
-    case "submit":
-    case "reset":
-    case "image":
-      break;
-    default:
-      input.value = defaultValues[0] !== null && defaultValues[0] !== void 0 ? String(defaultValues[0]) : "";
-  }
-  return input.value !== oldValue || input.checked !== oldChecked;
-}
-function resetSelectElement(select, defaultValues) {
-  const oldValue = select.value;
-  const oldSelectedOptions = Array.from(select.selectedOptions).map((opt) => opt.value);
-  if (select.multiple) {
-    const defaultStrings = defaultValues.map((value) => String(value));
-    Array.from(select.options).forEach((option) => {
-      option.selected = defaultStrings.includes(option.value);
-    });
-  } else {
-    select.value = defaultValues[0] !== void 0 ? String(defaultValues[0]) : "";
-  }
-  const newSelectedOptions = Array.from(select.selectedOptions).map((opt) => opt.value);
-  const hasChanged = select.multiple ? JSON.stringify(oldSelectedOptions.sort()) !== JSON.stringify(newSelectedOptions.sort()) : select.value !== oldValue;
-  return hasChanged;
-}
-function resetFormElement(element, defaultValues) {
-  if (element.disabled) {
-    if (element instanceof HTMLInputElement) {
-      const oldValue = element.value;
-      const oldChecked = element.checked;
-      switch (element.type.toLowerCase()) {
-        case "checkbox":
-        case "radio":
-          element.checked = element.defaultChecked;
-          return element.checked !== oldChecked;
-        case "file":
-          element.value = "";
-          return oldValue !== "";
-        case "button":
-        case "submit":
-        case "reset":
-        case "image":
-          return false;
-        default:
-          element.value = element.defaultValue;
-          return element.value !== oldValue;
-      }
-    } else if (element instanceof HTMLSelectElement) {
-      const oldSelectedOptions = Array.from(element.selectedOptions).map((opt) => opt.value);
-      Array.from(element.options).forEach((option) => {
-        option.selected = option.defaultSelected;
-      });
-      const newSelectedOptions = Array.from(element.selectedOptions).map((opt) => opt.value);
-      return JSON.stringify(oldSelectedOptions.sort()) !== JSON.stringify(newSelectedOptions.sort());
-    } else if (element instanceof HTMLTextAreaElement) {
-      const oldValue = element.value;
-      element.value = element.defaultValue;
-      return element.value !== oldValue;
-    }
-    return false;
-  }
-  if (element instanceof HTMLInputElement) {
-    return resetInputElement(element, defaultValues);
-  } else if (element instanceof HTMLSelectElement) {
-    return resetSelectElement(element, defaultValues);
-  } else if (element instanceof HTMLTextAreaElement) {
-    const oldValue = element.value;
-    element.value = defaultValues[0] !== void 0 ? String(defaultValues[0]) : "";
-    return element.value !== oldValue;
-  }
-  return false;
-}
-function resetFieldElements(elements, defaultValues) {
-  let hasChanged = false;
-  if (elements instanceof RadioNodeList || elements instanceof HTMLCollection) {
-    Array.from(elements).forEach((node, index) => {
-      if (node instanceof Element && isFormElement(node)) {
-        if (node instanceof HTMLInputElement && ["checkbox", "radio"].includes(node.type.toLowerCase())) {
-          if (resetFormElement(node, defaultValues)) {
-            hasChanged = true;
-          }
-        } else {
-          const indexedDefaultValues = defaultValues[index] !== void 0 ? [defaultValues[index]] : [defaultValues[0] ?? null].filter(Boolean);
-          if (resetFormElement(node, indexedDefaultValues)) {
-            hasChanged = true;
-          }
-        }
-      }
-    });
-  } else if (isFormElement(elements)) {
-    hasChanged = resetFormElement(elements, defaultValues);
-  }
-  return hasChanged;
-}
-function resetFormFields(formElement, defaults, fieldNames) {
-  if (!fieldNames || fieldNames.length === 0) {
-    const formData = new FormData(formElement);
-    const formElementNames = Array.from(formElement.elements).map((el) => isFormElement(el) ? el.name : "").filter(Boolean);
-    fieldNames = [.../* @__PURE__ */ new Set([...defaults.keys(), ...formData.keys(), ...formElementNames])];
-  }
-  let hasChanged = false;
-  fieldNames.forEach((fieldName) => {
-    const elements = formElement.elements.namedItem(fieldName);
-    if (elements) {
-      if (resetFieldElements(elements, defaults.getAll(fieldName))) {
-        hasChanged = true;
-      }
-    }
-  });
-  if (hasChanged) {
-    formElement.dispatchEvent(new Event("reset", { bubbles: true }));
-  }
-}
-
 // src/head.ts
 var Renderer = {
   buildDOMElement(tag) {
@@ -2378,6 +2269,16 @@ function createHeadManager(isServer2, titleCallback, onUpdate) {
   };
 }
 
+// src/navigationEvents.ts
+function shouldIntercept(event) {
+  const isLink = event.currentTarget.tagName.toLowerCase() === "a";
+  return !(event.target && (event?.target).isContentEditable || event.defaultPrevented || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && "button" in event && event.button !== 0);
+}
+function shouldNavigate(event) {
+  const isButton = event.currentTarget.tagName.toLowerCase() === "button";
+  return event.key === "Enter" || isButton && event.key === " ";
+}
+
 // src/progress-component.ts
 var baseComponentSelector = "nprogress";
 var progress;
@@ -2712,10 +2613,138 @@ function setupProgress({
   progress_component_default.configure({ showSpinner, includeCSS, color });
 }
 
-// src/shouldIntercept.ts
-function shouldIntercept(event) {
-  const isLink = event.currentTarget.tagName.toLowerCase() === "a";
-  return !(event.target && (event?.target).isContentEditable || event.defaultPrevented || isLink && event.altKey || isLink && event.ctrlKey || isLink && event.metaKey || isLink && event.shiftKey || isLink && "button" in event && event.button !== 0);
+// src/resetFormFields.ts
+function isFormElement(element) {
+  return element instanceof HTMLInputElement || element instanceof HTMLSelectElement || element instanceof HTMLTextAreaElement;
+}
+function resetInputElement(input, defaultValues) {
+  const oldValue = input.value;
+  const oldChecked = input.checked;
+  switch (input.type.toLowerCase()) {
+    case "checkbox":
+      input.checked = defaultValues.includes(input.value);
+      break;
+    case "radio":
+      input.checked = defaultValues[0] === input.value;
+      break;
+    case "file":
+      input.value = "";
+      break;
+    case "button":
+    case "submit":
+    case "reset":
+    case "image":
+      break;
+    default:
+      input.value = defaultValues[0] !== null && defaultValues[0] !== void 0 ? String(defaultValues[0]) : "";
+  }
+  return input.value !== oldValue || input.checked !== oldChecked;
+}
+function resetSelectElement(select, defaultValues) {
+  const oldValue = select.value;
+  const oldSelectedOptions = Array.from(select.selectedOptions).map((opt) => opt.value);
+  if (select.multiple) {
+    const defaultStrings = defaultValues.map((value) => String(value));
+    Array.from(select.options).forEach((option) => {
+      option.selected = defaultStrings.includes(option.value);
+    });
+  } else {
+    select.value = defaultValues[0] !== void 0 ? String(defaultValues[0]) : "";
+  }
+  const newSelectedOptions = Array.from(select.selectedOptions).map((opt) => opt.value);
+  const hasChanged = select.multiple ? JSON.stringify(oldSelectedOptions.sort()) !== JSON.stringify(newSelectedOptions.sort()) : select.value !== oldValue;
+  return hasChanged;
+}
+function resetFormElement(element, defaultValues) {
+  if (element.disabled) {
+    if (element instanceof HTMLInputElement) {
+      const oldValue = element.value;
+      const oldChecked = element.checked;
+      switch (element.type.toLowerCase()) {
+        case "checkbox":
+        case "radio":
+          element.checked = element.defaultChecked;
+          return element.checked !== oldChecked;
+        case "file":
+          element.value = "";
+          return oldValue !== "";
+        case "button":
+        case "submit":
+        case "reset":
+        case "image":
+          return false;
+        default:
+          element.value = element.defaultValue;
+          return element.value !== oldValue;
+      }
+    } else if (element instanceof HTMLSelectElement) {
+      const oldSelectedOptions = Array.from(element.selectedOptions).map((opt) => opt.value);
+      Array.from(element.options).forEach((option) => {
+        option.selected = option.defaultSelected;
+      });
+      const newSelectedOptions = Array.from(element.selectedOptions).map((opt) => opt.value);
+      return JSON.stringify(oldSelectedOptions.sort()) !== JSON.stringify(newSelectedOptions.sort());
+    } else if (element instanceof HTMLTextAreaElement) {
+      const oldValue = element.value;
+      element.value = element.defaultValue;
+      return element.value !== oldValue;
+    }
+    return false;
+  }
+  if (element instanceof HTMLInputElement) {
+    return resetInputElement(element, defaultValues);
+  } else if (element instanceof HTMLSelectElement) {
+    return resetSelectElement(element, defaultValues);
+  } else if (element instanceof HTMLTextAreaElement) {
+    const oldValue = element.value;
+    element.value = defaultValues[0] !== void 0 ? String(defaultValues[0]) : "";
+    return element.value !== oldValue;
+  }
+  return false;
+}
+function resetFieldElements(elements, defaultValues) {
+  let hasChanged = false;
+  if (elements instanceof RadioNodeList || elements instanceof HTMLCollection) {
+    Array.from(elements).forEach((node, index) => {
+      if (node instanceof Element && isFormElement(node)) {
+        if (node instanceof HTMLInputElement && ["checkbox", "radio"].includes(node.type.toLowerCase())) {
+          if (resetFormElement(node, defaultValues)) {
+            hasChanged = true;
+          }
+        } else {
+          const indexedDefaultValues = defaultValues[index] !== void 0 ? [defaultValues[index]] : [defaultValues[0] ?? null].filter(Boolean);
+          if (resetFormElement(node, indexedDefaultValues)) {
+            hasChanged = true;
+          }
+        }
+      }
+    });
+  } else if (isFormElement(elements)) {
+    hasChanged = resetFormElement(elements, defaultValues);
+  }
+  return hasChanged;
+}
+function resetFormFields(formElement, defaults, fieldNames) {
+  if (!formElement) {
+    return;
+  }
+  if (!fieldNames || fieldNames.length === 0) {
+    const formData = new FormData(formElement);
+    const formElementNames = Array.from(formElement.elements).map((el) => isFormElement(el) ? el.name : "").filter(Boolean);
+    fieldNames = [.../* @__PURE__ */ new Set([...defaults.keys(), ...formData.keys(), ...formElementNames])];
+  }
+  let hasChanged = false;
+  fieldNames.forEach((fieldName) => {
+    const elements = formElement.elements.namedItem(fieldName);
+    if (elements) {
+      if (resetFieldElements(elements, defaults.getAll(fieldName))) {
+        hasChanged = true;
+      }
+    }
+  });
+  if (hasChanged) {
+    formElement.dispatchEvent(new Event("reset", { bubbles: true }));
+  }
 }
 
 // src/index.ts