@inertiajs/core 2.0.17 → 2.1.1

package/dist/index.esm.js

@@ -342,14 +342,15 @@ var transformUrlAndData = (href, data, method, forceFormData, queryStringArrayFo
   return [hrefToUrl(_href), _data];
 };
 function mergeDataIntoQueryString(method, href, data, qsArrayFormat = "brackets") {
+  const hasDataForQueryString = method === "get" && !isFormData(data) && Object.keys(data).length > 0;
   const hasHost = /^[a-z][a-z0-9+.-]*:\/\//i.test(href.toString());
-  const hasAbsolutePath = hasHost || href.toString().startsWith("/");
+  const hasAbsolutePath = hasHost || href.toString().startsWith("/") || href.toString() === "";
   const hasRelativePath = !hasAbsolutePath && !href.toString().startsWith("#") && !href.toString().startsWith("?");
   const hasRelativePathWithDotPrefix = /^[.]{1,2}([/]|$)/.test(href.toString());
-  const hasSearch = href.toString().includes("?") || method === "get" && Object.keys(data).length;
+  const hasSearch = href.toString().includes("?") || hasDataForQueryString;
   const hasHash = href.toString().includes("#");
   const url = new URL(href.toString(), typeof window === "undefined" ? "http://localhost" : window.location.toString());
-  if (method === "get" && Object.keys(data).length) {
+  if (hasDataForQueryString) {
     const parseOptions = { ignoreQueryPrefix: true, parseArrays: false };
     url.search = qs.stringify(
       { ...qs.parse(url.search, parseOptions), ...data },
@@ -358,7 +359,6 @@ function mergeDataIntoQueryString(method, href, data, qsArrayFormat = "brackets"
         arrayFormat: qsArrayFormat
       }
     );
-    data = {};
   }
   return [
     [
@@ -368,7 +368,7 @@ function mergeDataIntoQueryString(method, href, data, qsArrayFormat = "brackets"
       hasSearch ? url.search : "",
       hasHash ? url.hash : ""
     ].join(""),
-    data
+    hasDataForQueryString ? {} : data
   ];
 }
 function urlWithoutHash(url) {
@@ -507,7 +507,7 @@ var Queue = class {
     return this.process();
   }
   process() {
-    this.processingPromise ?? (this.processingPromise = this.processNext().then(() => {
+    this.processingPromise ?? (this.processingPromise = this.processNext().finally(() => {
       this.processingPromise = null;
     }));
     return this.processingPromise;
@@ -1036,6 +1036,10 @@ var PrefetchedRequests = class {
         },
         onPrefetchResponse(response) {
           resolve(response);
+        },
+        onPrefetchError(error) {
+          prefetchedRequests.removeFromInFlight(params);
+          reject(error);
         }
       });
     }).then((response) => {
@@ -1049,9 +1053,7 @@ var PrefetchedRequests = class {
         inFlight: false
       });
       this.scheduleForRemoval(params, expires);
-      this.inFlightRequests = this.inFlightRequests.filter((prefetching) => {
-        return !this.paramsAreEqual(prefetching.params, params);
-      });
+      this.removeFromInFlight(params);
       response.handlePrefetch();
       return response;
     });
@@ -1076,6 +1078,11 @@ var PrefetchedRequests = class {
     });
     this.clearTimer(params);
   }
+  removeFromInFlight(params) {
+    this.inFlightRequests = this.inFlightRequests.filter((prefetching) => {
+      return !this.paramsAreEqual(prefetching.params, params);
+    });
+  }
   extractStaleValues(cacheFor) {
     const [stale, expires] = this.cacheForToStaleAndExpires(cacheFor);
     return [timeToMs(stale), timeToMs(expires)];
@@ -1207,6 +1214,8 @@ var RequestParams = class _RequestParams {
         ...params,
         ...wrappedCallbacks,
         onPrefetchResponse: params.onPrefetchResponse || (() => {
+        }),
+        onPrefetchError: params.onPrefetchError || (() => {
         })
       };
     }
@@ -1256,6 +1265,11 @@ var RequestParams = class _RequestParams {
       this.params.onPrefetchResponse(response);
     }
   }
+  onPrefetchError(error) {
+    if (this.params.onPrefetchError) {
+      this.params.onPrefetchError(error);
+    }
+  }
   all() {
     return this.params;
   }
@@ -1638,6 +1652,9 @@ var Request = class _Request {
         return;
       }
       if (fireExceptionEvent(error)) {
+        if (originallyPrefetch) {
+          this.requestParams.onPrefetchError(error);
+        }
         return Promise.reject(error);
       }
     }).finally(() => {
@@ -2022,6 +2039,186 @@ var Router = class {
   }
 };
 
+// src/formObject.ts
+import { get, set } from "es-toolkit/compat";
+function undotKey(key) {
+  if (!key.includes(".")) {
+    return key;
+  }
+  const transformSegment = (segment) => {
+    if (segment.startsWith("[") && segment.endsWith("]")) {
+      return segment;
+    }
+    return segment.split(".").reduce((result, part, index) => index === 0 ? part : `${result}[${part}]`);
+  };
+  return key.replace(/\\\./g, "__ESCAPED_DOT__").split(/(\[[^\]]*\])/).filter(Boolean).map(transformSegment).join("").replace(/__ESCAPED_DOT__/g, ".");
+}
+function parseKey(key) {
+  const path = [];
+  const pattern = /([^\[\]]+)|\[(\d*)\]/g;
+  let match;
+  while ((match = pattern.exec(key)) !== null) {
+    if (match[1] !== void 0) {
+      path.push(match[1]);
+    } else if (match[2] !== void 0) {
+      path.push(match[2] === "" ? "" : Number(match[2]));
+    }
+  }
+  return path;
+}
+function formDataToObject(source) {
+  const form = {};
+  for (const [key, value] of source.entries()) {
+    if (value instanceof File && value.size === 0 && value.name === "") {
+      continue;
+    }
+    const path = parseKey(undotKey(key));
+    if (path[path.length - 1] === "") {
+      const arrayPath = path.slice(0, -1);
+      const existing = get(form, arrayPath);
+      if (Array.isArray(existing)) {
+        existing.push(value);
+      } else {
+        set(form, arrayPath, [value]);
+      }
+      continue;
+    }
+    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) {
@@ -2169,7 +2366,7 @@ var configure = (options) => {
   progress.id = baseComponentSelector;
   progress.innerHTML = settings.template;
 };
-var set = (n) => {
+var set2 = (n) => {
   const started = isStarted();
   n = clamp(n, settings.minimum, 1);
   status = n === 1 ? null : n;
@@ -2218,7 +2415,7 @@ var set = (n) => {
 var isStarted = () => typeof status === "number";
 var start = () => {
   if (!status) {
-    set(0);
+    set2(0);
   }
   const work = function() {
     setTimeout(function() {
@@ -2238,7 +2435,7 @@ var done = (force) => {
     return;
   }
   increaseByRandom(0.3 + 0.5 * Math.random());
-  set(1);
+  set2(1);
 };
 var increaseByRandom = (amount) => {
   const n = status;
@@ -2262,7 +2459,7 @@ var increaseByRandom = (amount) => {
     }
     return 0;
   })();
-  return set(clamp(n + amount, 0, 0.994));
+  return set2(clamp(n + amount, 0, 0.994));
 };
 var render = (fromStart) => {
   if (isRendered()) {
@@ -2408,7 +2605,7 @@ var progress_component_default = {
   configure,
   isStarted,
   done,
-  set,
+  set: set2,
   remove,
   start,
   status,
@@ -2478,9 +2675,12 @@ function shouldIntercept(event) {
 var router = new Router();
 export {
   createHeadManager,
+  formDataToObject,
   hide as hideProgress,
   hrefToUrl,
   mergeDataIntoQueryString,
+  objectToFormData,
+  resetFormFields,
   reveal as revealProgress,
   router,
   setupProgress,