@panneau/data 4.0.84 → 4.1.1

package/dist/index.js

@@ -5,11 +5,10 @@ import { getJSON, getCSRFHeaders, postJSON } from '@folklore/fetch';
 import { generatePath } from '@folklore/routes';
 import queryString from 'query-string';
 import { jsx } from 'react/jsx-runtime';
-import { useQuery, keepPreviousData, hashKey, useMutation, useQueryClient, QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { useQuery, keepPreviousData, hashKey, useQueryClient, useMutation, QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import isArray from 'lodash-es/isArray';
 import isObject from 'lodash-es/isObject';
 import isString from 'lodash-es/isString';
-import { isObject as isObject$1, isString as isString$1 } from 'lodash-es';
 
 function useItem(scope, id, loader, t0) {
   const $ = c(15);
@@ -85,7 +84,7 @@ function useItem(scope, id, loader, t0) {
 // The new, better version
 
 function useItems(scope, t0) {
-  const $ = c(52);
+  const $ = c(51);
   const {
     url: t1,
     getItems: t2,
@@ -208,14 +207,14 @@ function useItems(scope, t0) {
   }
   const [updatedItems, setUpdatedItems] = useState(t20);
   let t21;
-  if ($[11] !== updatedItems) {
+  if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
     t21 = item => {
       const {
         id: t22
       } = item || {};
       const itemId = t22 === undefined ? null : t22;
       if (itemId !== null) {
-        setUpdatedItems([...(updatedItems || []).filter(t23 => {
+        setUpdatedItems(currentUpdatedItems => [...(currentUpdatedItems || []).filter(t23 => {
           const {
             id: t24
           } = t23 === undefined ? {} : t23;
@@ -224,14 +223,13 @@ function useItems(scope, t0) {
         }), item]);
       }
     };
-    $[11] = updatedItems;
-    $[12] = t21;
+    $[11] = t21;
   } else {
-    t21 = $[12];
+    t21 = $[11];
   }
   const updateItem = t21;
   let t22;
-  if ($[13] !== updatedItems) {
+  if ($[12] !== updatedItems) {
     t22 = currentItems => {
       if (currentItems === null || updatedItems === null || updatedItems.length === 0) {
         return currentItems;
@@ -254,66 +252,66 @@ function useItems(scope, t0) {
         return item_0;
       }, []);
     };
-    $[13] = updatedItems;
-    $[14] = t22;
+    $[12] = updatedItems;
+    $[13] = t22;
   } else {
-    t22 = $[14];
+    t22 = $[13];
   }
   const replaceUpdatedItems = t22;
   let t23;
-  if ($[15] !== items || $[16] !== replaceUpdatedItems) {
+  if ($[14] !== items || $[15] !== replaceUpdatedItems) {
     t23 = replaceUpdatedItems(items);
-    $[15] = items;
-    $[16] = replaceUpdatedItems;
-    $[17] = t23;
+    $[14] = items;
+    $[15] = replaceUpdatedItems;
+    $[16] = t23;
   } else {
-    t23 = $[17];
+    t23 = $[16];
   }
   const finalItems = t23;
   const pagesKey = hashKey([scope, queryWithoutPage, count]);
   let t24;
-  if ($[18] === Symbol.for("react.memo_cache_sentinel")) {
+  if ($[17] === Symbol.for("react.memo_cache_sentinel")) {
     t24 = {};
-    $[18] = t24;
+    $[17] = t24;
   } else {
-    t24 = $[18];
+    t24 = $[17];
   }
   let t25;
-  if ($[19] !== pagesKey) {
+  if ($[18] !== pagesKey) {
     t25 = {
       key: pagesKey,
       pages: t24
     };
-    $[19] = pagesKey;
-    $[20] = t25;
+    $[18] = pagesKey;
+    $[19] = t25;
   } else {
-    t25 = $[20];
+    t25 = $[19];
   }
   const [pagesState, setPagesState] = useState(t25);
   let t26;
-  if ($[21] !== pagesKey || $[22] !== pagesState.key || $[23] !== pagesState.pages) {
+  if ($[20] !== pagesKey || $[21] !== pagesState.key || $[22] !== pagesState.pages) {
     t26 = pagesState.key === pagesKey ? pagesState.pages : {};
-    $[21] = pagesKey;
-    $[22] = pagesState.key;
-    $[23] = pagesState.pages;
-    $[24] = t26;
+    $[20] = pagesKey;
+    $[21] = pagesState.key;
+    $[22] = pagesState.pages;
+    $[23] = t26;
   } else {
-    t26 = $[24];
+    t26 = $[23];
   }
   const pages = t26;
-  if (isFetched && !isPlaceholderData && page !== null && data !== null && typeof pages[page] === "undefined") {
+  if (isFetched && !isPlaceholderData && page !== null && data !== null && pages[page] !== data) {
     let t27;
-    if ($[25] !== data || $[26] !== page || $[27] !== pages) {
+    if ($[24] !== data || $[25] !== page || $[26] !== pages) {
       t27 = {
         ...pages,
         [page]: data
       };
-      $[25] = data;
-      $[26] = page;
-      $[27] = pages;
-      $[28] = t27;
+      $[24] = data;
+      $[25] = page;
+      $[26] = pages;
+      $[27] = t27;
     } else {
-      t27 = $[28];
+      t27 = $[27];
     }
     setPagesState({
       key: pagesKey,
@@ -321,34 +319,34 @@ function useItems(scope, t0) {
     });
   }
   let t27;
-  if ($[29] !== finalItems || $[30] !== pages || $[31] !== replaceUpdatedItems) {
+  if ($[28] !== finalItems || $[29] !== pages || $[30] !== replaceUpdatedItems) {
     t27 = Object.keys(pages).length > 0 ? replaceUpdatedItems(Object.keys(pages).flatMap(k => pages[k]?.data)) : finalItems;
-    $[29] = finalItems;
-    $[30] = pages;
-    $[31] = replaceUpdatedItems;
-    $[32] = t27;
+    $[28] = finalItems;
+    $[29] = pages;
+    $[30] = replaceUpdatedItems;
+    $[31] = t27;
   } else {
-    t27 = $[32];
+    t27 = $[31];
   }
   const allItems = t27;
   const finalLoading = isLoading || isFetching || isRefetching;
   let t28;
-  if ($[33] !== currentPage || $[34] !== lastPage || $[35] !== paginated || $[36] !== total) {
+  if ($[32] !== currentPage || $[33] !== lastPage || $[34] !== paginated || $[35] !== total) {
     t28 = paginated ? {
       page: currentPage,
       lastPage,
       total
     } : null;
-    $[33] = currentPage;
-    $[34] = lastPage;
-    $[35] = paginated;
-    $[36] = total;
-    $[37] = t28;
+    $[32] = currentPage;
+    $[33] = lastPage;
+    $[34] = paginated;
+    $[35] = total;
+    $[36] = t28;
   } else {
-    t28 = $[37];
+    t28 = $[36];
   }
   let t29;
-  if ($[38] !== allItems || $[39] !== finalItems || $[40] !== finalLoading || $[41] !== isFetched || $[42] !== isFetching || $[43] !== isLoading || $[44] !== isPlaceholderData || $[45] !== isRefetching || $[46] !== otherProps || $[47] !== pages || $[48] !== reload || $[49] !== t28 || $[50] !== updateItem) {
+  if ($[37] !== allItems || $[38] !== finalItems || $[39] !== finalLoading || $[40] !== isFetched || $[41] !== isFetching || $[42] !== isLoading || $[43] !== isPlaceholderData || $[44] !== isRefetching || $[45] !== otherProps || $[46] !== pages || $[47] !== reload || $[48] !== t28 || $[49] !== updateItem) {
     t29 = {
       ...otherProps,
       isLoading,
@@ -365,22 +363,22 @@ function useItems(scope, t0) {
       updateItem,
       pagination: t28
     };
-    $[38] = allItems;
-    $[39] = finalItems;
-    $[40] = finalLoading;
-    $[41] = isFetched;
-    $[42] = isFetching;
-    $[43] = isLoading;
-    $[44] = isPlaceholderData;
-    $[45] = isRefetching;
-    $[46] = otherProps;
-    $[47] = pages;
-    $[48] = reload;
-    $[49] = t28;
-    $[50] = updateItem;
-    $[51] = t29;
-  } else {
-    t29 = $[51];
+    $[37] = allItems;
+    $[38] = finalItems;
+    $[39] = finalLoading;
+    $[40] = isFetched;
+    $[41] = isFetching;
+    $[42] = isLoading;
+    $[43] = isPlaceholderData;
+    $[44] = isRefetching;
+    $[45] = otherProps;
+    $[46] = pages;
+    $[47] = reload;
+    $[48] = t28;
+    $[49] = updateItem;
+    $[50] = t29;
+  } else {
+    t29 = $[50];
   }
   return t29;
 }
@@ -441,12 +439,19 @@ class Base {
       routes,
       generateUrl = null
     } = this.options;
-    if (generateUrl !== null) {
-      return generateUrl(route, params);
+    // The url generator returns null for routes it doesn't know: fallback to the routes option
+    const url = generateUrl !== null ? generateUrl(route, params) : null;
+    if (url !== null && typeof url !== 'undefined') {
+      return url;
     }
-    return generatePath(routes?.[route] || route, params);
+    const path = routes?.[route] ?? null;
+    // Return null for unknown routes, so callers can fallback to another route
+    return path !== null ? generatePath(path, params || {}) : null;
   }
   getFullUrl(path, query = null) {
+    if (path === null || typeof path === 'undefined') {
+      throw new Error('Api: route not found');
+    }
     const {
       baseUrl = null
     } = this.options;
@@ -748,8 +753,42 @@ function ApiProvider(t0) {
   return t6;
 }
 
+/**
+ * Resolve the arguments of resource hooks supporting these call forms:
+ * (resource), (id), (resource, id), (resource, options), (id, options), (resource, id, options)
+ *
+ * The first argument is the resource when it is an object or a known resource id, or when a
+ * non-null id is passed as second argument. Otherwise, it is considered as the item id and the
+ * resource from the context is used.
+ */
+function useResourceArguments(resource, id, options) {
+  const $ = c(4);
+  const idIsOptions = isObject(id);
+  const providedResource = usePanneauResource(resource);
+  const contextResource = useResource();
+  const resourceIsExplicit = providedResource !== null || !idIsOptions && id !== null;
+  const t0 = providedResource || contextResource || null;
+  const t1 = resourceIsExplicit ? idIsOptions ? null : id : resource;
+  const t2 = idIsOptions ? id : options;
+  let t3;
+  if ($[0] !== t0 || $[1] !== t1 || $[2] !== t2) {
+    t3 = {
+      resource: t0,
+      id: t1,
+      options: t2
+    };
+    $[0] = t0;
+    $[1] = t1;
+    $[2] = t2;
+    $[3] = t3;
+  } else {
+    t3 = $[3];
+  }
+  return t3;
+}
+
 function useResourceDestroy(t0, t1, t2) {
-  const $ = c(19);
+  const $ = c(32);
   const resource = t0 === undefined ? null : t0;
   const id = t1 === undefined ? null : t1;
   let t3;
@@ -761,62 +800,127 @@ function useResourceDestroy(t0, t1, t2) {
     t3 = $[1];
   }
   const options = t3;
-  const providedResource = usePanneauResource(id !== null && !isObject(id) ? resource : null);
-  const contextResource = useResource();
-  const finalResource = providedResource || contextResource;
-  const finalId = providedResource !== null ? id : resource;
-  const api = useApi();
+  const {
+    resource: finalResource,
+    id: finalId,
+    options: finalOptions
+  } = useResourceArguments(resource, id, options);
   let t4;
-  if ($[2] !== api || $[3] !== finalId || $[4] !== finalResource) {
-    t4 = t5 => {
-      const providedId = t5 === undefined ? null : t5;
+  if ($[2] !== finalOptions) {
+    t4 = finalOptions || {};
+    $[2] = finalOptions;
+    $[3] = t4;
+  } else {
+    t4 = $[3];
+  }
+  let otherOptions;
+  let t5;
+  if ($[4] !== t4) {
+    ({
+      onSuccess: t5,
+      ...otherOptions
+    } = t4);
+    $[4] = t4;
+    $[5] = otherOptions;
+    $[6] = t5;
+  } else {
+    otherOptions = $[5];
+    t5 = $[6];
+  }
+  const customOnSuccess = t5 === undefined ? null : t5;
+  let t6;
+  if ($[7] !== finalResource) {
+    t6 = finalResource || {};
+    $[7] = finalResource;
+    $[8] = t6;
+  } else {
+    t6 = $[8];
+  }
+  const {
+    id: t7
+  } = t6;
+  const resourceId = t7 === undefined ? null : t7;
+  const api = useApi();
+  const queryClient = useQueryClient();
+  let t8;
+  if ($[9] !== api || $[10] !== finalId || $[11] !== finalResource) {
+    t8 = t9 => {
+      const providedId = t9 === undefined ? null : t9;
       return api.resources.destroy(finalResource, providedId ?? finalId);
     };
-    $[2] = api;
-    $[3] = finalId;
-    $[4] = finalResource;
-    $[5] = t4;
+    $[9] = api;
+    $[10] = finalId;
+    $[11] = finalResource;
+    $[12] = t8;
   } else {
-    t4 = $[5];
+    t8 = $[12];
   }
-  let t5;
-  if ($[6] !== options || $[7] !== t4) {
-    t5 = {
-      mutationFn: t4,
-      ...options
+  let t9;
+  if ($[13] !== customOnSuccess || $[14] !== finalId || $[15] !== queryClient || $[16] !== resourceId) {
+    t9 = (data, variables, ...t10) => {
+      const args = t10;
+      const destroyedId = variables ?? finalId;
+      queryClient.invalidateQueries({
+        queryKey: [resourceId],
+        predicate: t11 => {
+          const {
+            queryKey
+          } = t11;
+          return String(queryKey[1]) !== String(destroyedId);
+        }
+      });
+      if (customOnSuccess !== null) {
+        return customOnSuccess(data, variables, ...args);
+      }
     };
-    $[6] = options;
-    $[7] = t4;
-    $[8] = t5;
+    $[13] = customOnSuccess;
+    $[14] = finalId;
+    $[15] = queryClient;
+    $[16] = resourceId;
+    $[17] = t9;
   } else {
-    t5 = $[8];
+    t9 = $[17];
+  }
+  let t10;
+  if ($[18] !== otherOptions || $[19] !== t8 || $[20] !== t9) {
+    t10 = {
+      mutationFn: t8,
+      onSuccess: t9,
+      ...otherOptions
+    };
+    $[18] = otherOptions;
+    $[19] = t8;
+    $[20] = t9;
+    $[21] = t10;
+  } else {
+    t10 = $[21];
   }
-  const t6 = useMutation(t5);
+  const t11 = useMutation(t10);
   let isPending;
   let mutate;
   let mutateAsync;
   let other;
-  if ($[9] !== t6) {
+  if ($[22] !== t11) {
     ({
       mutate,
       mutateAsync,
       isPending,
       ...other
-    } = t6);
-    $[9] = t6;
-    $[10] = isPending;
-    $[11] = mutate;
-    $[12] = mutateAsync;
-    $[13] = other;
+    } = t11);
+    $[22] = t11;
+    $[23] = isPending;
+    $[24] = mutate;
+    $[25] = mutateAsync;
+    $[26] = other;
   } else {
-    isPending = $[10];
-    mutate = $[11];
-    mutateAsync = $[12];
-    other = $[13];
+    isPending = $[23];
+    mutate = $[24];
+    mutateAsync = $[25];
+    other = $[26];
   }
-  let t7;
-  if ($[14] !== isPending || $[15] !== mutate || $[16] !== mutateAsync || $[17] !== other) {
-    t7 = {
+  let t12;
+  if ($[27] !== isPending || $[28] !== mutate || $[29] !== mutateAsync || $[30] !== other) {
+    t12 = {
       destroy: mutate,
       destroyAsync: mutateAsync,
       loading: isPending,
@@ -825,19 +929,19 @@ function useResourceDestroy(t0, t1, t2) {
       isPending,
       ...other
     };
-    $[14] = isPending;
-    $[15] = mutate;
-    $[16] = mutateAsync;
-    $[17] = other;
-    $[18] = t7;
+    $[27] = isPending;
+    $[28] = mutate;
+    $[29] = mutateAsync;
+    $[30] = other;
+    $[31] = t12;
   } else {
-    t7 = $[18];
+    t12 = $[31];
   }
-  return t7;
+  return t12;
 }
 
 function useResourceItem(resource, t0, t1) {
-  const $ = c(17);
+  const $ = c(19);
   const id = t0 === undefined ? null : t0;
   const opts = t1 === undefined ? null : t1;
   const api = useApi();
@@ -845,71 +949,81 @@ function useResourceItem(resource, t0, t1) {
   const contextResource = useResource();
   const finalResource = providedResource || contextResource;
   const finalId = providedResource !== null ? id : resource;
-  const {
-    id: resourceId
-  } = finalResource;
   let t2;
-  if ($[0] !== finalId || $[1] !== resourceId) {
-    t2 = [resourceId, finalId];
-    $[0] = finalId;
-    $[1] = resourceId;
-    $[2] = t2;
+  if ($[0] !== finalResource) {
+    t2 = finalResource || {};
+    $[0] = finalResource;
+    $[1] = t2;
   } else {
-    t2 = $[2];
+    t2 = $[1];
   }
-  let t3;
-  if ($[3] !== api || $[4] !== finalId || $[5] !== finalResource) {
-    t3 = () => api.resources.find(finalResource, finalId);
-    $[3] = api;
-    $[4] = finalId;
-    $[5] = finalResource;
-    $[6] = t3;
+  const {
+    id: t3
+  } = t2;
+  const resourceId = t3 === undefined ? null : t3;
+  const t4 = finalId !== null ? String(finalId) : null;
+  let t5;
+  if ($[2] !== resourceId || $[3] !== t4) {
+    t5 = [resourceId, t4];
+    $[2] = resourceId;
+    $[3] = t4;
+    $[4] = t5;
   } else {
-    t3 = $[6];
+    t5 = $[4];
   }
-  let t4;
-  if ($[7] !== opts || $[8] !== t2 || $[9] !== t3) {
-    t4 = {
-      queryKey: t2,
-      queryFn: t3,
+  let t6;
+  if ($[5] !== api || $[6] !== finalId || $[7] !== finalResource) {
+    t6 = () => api.resources.find(finalResource, finalId);
+    $[5] = api;
+    $[6] = finalId;
+    $[7] = finalResource;
+    $[8] = t6;
+  } else {
+    t6 = $[8];
+  }
+  let t7;
+  if ($[9] !== opts || $[10] !== t5 || $[11] !== t6) {
+    t7 = {
+      queryKey: t5,
+      queryFn: t6,
       ...opts
     };
-    $[7] = opts;
-    $[8] = t2;
-    $[9] = t3;
-    $[10] = t4;
+    $[9] = opts;
+    $[10] = t5;
+    $[11] = t6;
+    $[12] = t7;
   } else {
-    t4 = $[10];
+    t7 = $[12];
   }
-  const t5 = useQuery(t4);
+  const t8 = useQuery(t7);
   let request;
-  let t6;
-  if ($[11] !== t5) {
+  let t9;
+  if ($[13] !== t8) {
     ({
-      data: t6,
+      data: t9,
       ...request
-    } = t5);
-    $[11] = t5;
-    $[12] = request;
-    $[13] = t6;
+    } = t8);
+    $[13] = t8;
+    $[14] = request;
+    $[15] = t9;
   } else {
-    request = $[12];
-    t6 = $[13];
+    request = $[14];
+    t9 = $[15];
   }
-  const data = t6 === undefined ? null : t6;
-  let t7;
-  if ($[14] !== data || $[15] !== request) {
-    t7 = {
+  const data = t9 === undefined ? null : t9;
+  let t10;
+  if ($[16] !== data || $[17] !== request) {
+    t10 = {
       item: data,
       ...request
     };
-    $[14] = data;
-    $[15] = request;
-    $[16] = t7;
+    $[16] = data;
+    $[17] = request;
+    $[18] = t10;
   } else {
-    t7 = $[16];
+    t10 = $[18];
   }
-  return t7;
+  return t10;
 }
 
 function useResourceItems(t0, t1, t2, t3, t4) {
@@ -976,7 +1090,7 @@ function useResourceItems(t0, t1, t2, t3, t4) {
 }
 
 function useResourceStore(resource, t0) {
-  const $ = c(18);
+  const $ = c(30);
   let t1;
   if ($[0] !== t0) {
     t1 = t0 === undefined ? {} : t0;
@@ -989,54 +1103,110 @@ function useResourceStore(resource, t0) {
   const providedResource = usePanneauResource(resource);
   const contextResource = useResource();
   const finalResource = providedResource || contextResource;
-  const api = useApi();
   let t2;
-  if ($[2] !== api || $[3] !== finalResource) {
-    t2 = data => api.resources.store(finalResource, data);
-    $[2] = api;
-    $[3] = finalResource;
-    $[4] = t2;
+  if ($[2] !== finalResource) {
+    t2 = finalResource || {};
+    $[2] = finalResource;
+    $[3] = t2;
   } else {
-    t2 = $[4];
+    t2 = $[3];
   }
-  let t3;
-  if ($[5] !== options || $[6] !== t2) {
-    t3 = {
-      mutationFn: t2,
-      ...options
+  const {
+    id: t3
+  } = t2;
+  const resourceId = t3 === undefined ? null : t3;
+  let t4;
+  if ($[4] !== options) {
+    t4 = options || {};
+    $[4] = options;
+    $[5] = t4;
+  } else {
+    t4 = $[5];
+  }
+  let otherOptions;
+  let t5;
+  if ($[6] !== t4) {
+    ({
+      onSuccess: t5,
+      ...otherOptions
+    } = t4);
+    $[6] = t4;
+    $[7] = otherOptions;
+    $[8] = t5;
+  } else {
+    otherOptions = $[7];
+    t5 = $[8];
+  }
+  const customOnSuccess = t5 === undefined ? null : t5;
+  const api = useApi();
+  const queryClient = useQueryClient();
+  let t6;
+  if ($[9] !== api || $[10] !== finalResource) {
+    t6 = data => api.resources.store(finalResource, data);
+    $[9] = api;
+    $[10] = finalResource;
+    $[11] = t6;
+  } else {
+    t6 = $[11];
+  }
+  let t7;
+  if ($[12] !== customOnSuccess || $[13] !== queryClient || $[14] !== resourceId) {
+    t7 = (data_0, ...t8) => {
+      const args = t8;
+      queryClient.invalidateQueries({
+        queryKey: [resourceId]
+      });
+      if (customOnSuccess !== null) {
+        return customOnSuccess(data_0, ...args);
+      }
     };
-    $[5] = options;
-    $[6] = t2;
-    $[7] = t3;
+    $[12] = customOnSuccess;
+    $[13] = queryClient;
+    $[14] = resourceId;
+    $[15] = t7;
   } else {
-    t3 = $[7];
+    t7 = $[15];
   }
-  const t4 = useMutation(t3);
+  let t8;
+  if ($[16] !== otherOptions || $[17] !== t6 || $[18] !== t7) {
+    t8 = {
+      mutationFn: t6,
+      onSuccess: t7,
+      ...otherOptions
+    };
+    $[16] = otherOptions;
+    $[17] = t6;
+    $[18] = t7;
+    $[19] = t8;
+  } else {
+    t8 = $[19];
+  }
+  const t9 = useMutation(t8);
   let isPending;
   let mutate;
   let mutateAsync;
   let other;
-  if ($[8] !== t4) {
+  if ($[20] !== t9) {
     ({
       mutate,
       mutateAsync,
       isPending,
       ...other
-    } = t4);
-    $[8] = t4;
-    $[9] = isPending;
-    $[10] = mutate;
-    $[11] = mutateAsync;
-    $[12] = other;
+    } = t9);
+    $[20] = t9;
+    $[21] = isPending;
+    $[22] = mutate;
+    $[23] = mutateAsync;
+    $[24] = other;
   } else {
-    isPending = $[9];
-    mutate = $[10];
-    mutateAsync = $[11];
-    other = $[12];
+    isPending = $[21];
+    mutate = $[22];
+    mutateAsync = $[23];
+    other = $[24];
   }
-  let t5;
-  if ($[13] !== isPending || $[14] !== mutate || $[15] !== mutateAsync || $[16] !== other) {
-    t5 = {
+  let t10;
+  if ($[25] !== isPending || $[26] !== mutate || $[27] !== mutateAsync || $[28] !== other) {
+    t10 = {
       store: mutate,
       storeAsync: mutateAsync,
       loading: isPending,
@@ -1045,19 +1215,19 @@ function useResourceStore(resource, t0) {
       isPending,
       ...other
     };
-    $[13] = isPending;
-    $[14] = mutate;
-    $[15] = mutateAsync;
-    $[16] = other;
-    $[17] = t5;
+    $[25] = isPending;
+    $[26] = mutate;
+    $[27] = mutateAsync;
+    $[28] = other;
+    $[29] = t10;
   } else {
-    t5 = $[17];
+    t10 = $[29];
   }
-  return t5;
+  return t10;
 }
 
 function useResourceUpdate(resource, t0, t1) {
-  const $ = c(35);
+  const $ = c(32);
   const id = t0 === undefined ? null : t0;
   let t2;
   if ($[0] !== t1) {
@@ -1068,78 +1238,69 @@ function useResourceUpdate(resource, t0, t1) {
     t2 = $[1];
   }
   const options = t2;
-  const providedResource = usePanneauResource(isObject$1(resource) || isString$1(id) ? resource : null);
-  const contextResource = useResource();
-  const finalResource = providedResource || contextResource;
-  const finalId = !isObject$1(id) ? id : resource;
+  const {
+    resource: finalResource,
+    id: finalId,
+    options: finalOptions
+  } = useResourceArguments(resource, id, options);
   let t3;
-  if ($[2] !== id || $[3] !== options) {
-    t3 = isObject$1(id) ? id : options;
-    $[2] = id;
-    $[3] = options;
-    $[4] = t3;
+  if ($[2] !== finalOptions) {
+    t3 = finalOptions || {};
+    $[2] = finalOptions;
+    $[3] = t3;
   } else {
-    t3 = $[4];
+    t3 = $[3];
   }
-  const finalOptions = t3;
+  let otherOptions;
   let t4;
-  if ($[5] !== finalOptions) {
-    t4 = finalOptions || {};
-    $[5] = finalOptions;
+  if ($[4] !== t3) {
+    ({
+      onSuccess: t4,
+      ...otherOptions
+    } = t3);
+    $[4] = t3;
+    $[5] = otherOptions;
     $[6] = t4;
   } else {
+    otherOptions = $[5];
     t4 = $[6];
   }
-  let otherOptions;
+  const customOnSuccess = t4 === undefined ? null : t4;
   let t5;
-  if ($[7] !== t4) {
-    ({
-      onSuccess: t5,
-      ...otherOptions
-    } = t4);
-    $[7] = t4;
-    $[8] = otherOptions;
-    $[9] = t5;
-  } else {
-    otherOptions = $[8];
-    t5 = $[9];
-  }
-  const customOnSuccess = t5 === undefined ? null : t5;
-  let t6;
-  if ($[10] !== finalResource) {
-    t6 = finalResource || {};
-    $[10] = finalResource;
-    $[11] = t6;
+  if ($[7] !== finalResource) {
+    t5 = finalResource || {};
+    $[7] = finalResource;
+    $[8] = t5;
   } else {
-    t6 = $[11];
+    t5 = $[8];
   }
   const {
-    id: t7
-  } = t6;
-  const resourceId = t7 === undefined ? null : t7;
+    id: t6
+  } = t5;
+  const resourceId = t6 === undefined ? null : t6;
   const api = useApi();
   const queryClient = useQueryClient();
-  let t8;
-  if ($[12] !== api || $[13] !== finalId || $[14] !== finalResource) {
-    t8 = data => api.resources.update(finalResource, finalId, data);
-    $[12] = api;
-    $[13] = finalId;
-    $[14] = finalResource;
-    $[15] = t8;
+  let t7;
+  if ($[9] !== api || $[10] !== finalId || $[11] !== finalResource) {
+    t7 = data => api.resources.update(finalResource, finalId, data);
+    $[9] = api;
+    $[10] = finalId;
+    $[11] = finalResource;
+    $[12] = t7;
   } else {
-    t8 = $[15];
+    t7 = $[12];
   }
-  let t9;
-  if ($[16] !== customOnSuccess || $[17] !== finalId || $[18] !== queryClient || $[19] !== resourceId) {
-    t9 = (data_0, ...t10) => {
-      const args = t10;
-      queryClient.setQueryData([resourceId, finalId], data_0);
+  let t8;
+  if ($[13] !== customOnSuccess || $[14] !== finalId || $[15] !== queryClient || $[16] !== resourceId) {
+    t8 = (data_0, ...t9) => {
+      const args = t9;
+      queryClient.setQueryData([resourceId, String(finalId)], data_0);
       queryClient.invalidateQueries({
         queryKey: [resourceId],
-        predicate: t11 => {
+        predicate: t10 => {
           const {
             queryKey
-          } = t11;
+          } = t10;
           return String(queryKey[1]) !== String(finalId);
         }
       });
@@ -1147,54 +1308,54 @@ function useResourceUpdate(resource, t0, t1) {
         return customOnSuccess(data_0, ...args);
       }
     };
-    $[16] = customOnSuccess;
-    $[17] = finalId;
-    $[18] = queryClient;
-    $[19] = resourceId;
-    $[20] = t9;
+    $[13] = customOnSuccess;
+    $[14] = finalId;
+    $[15] = queryClient;
+    $[16] = resourceId;
+    $[17] = t8;
   } else {
-    t9 = $[20];
+    t8 = $[17];
   }
-  let t10;
-  if ($[21] !== otherOptions || $[22] !== t8 || $[23] !== t9) {
-    t10 = {
-      mutationFn: t8,
-      onSuccess: t9,
+  let t9;
+  if ($[18] !== otherOptions || $[19] !== t7 || $[20] !== t8) {
+    t9 = {
+      mutationFn: t7,
+      onSuccess: t8,
       ...otherOptions
     };
-    $[21] = otherOptions;
-    $[22] = t8;
-    $[23] = t9;
-    $[24] = t10;
+    $[18] = otherOptions;
+    $[19] = t7;
+    $[20] = t8;
+    $[21] = t9;
   } else {
-    t10 = $[24];
+    t9 = $[21];
   }
-  const t11 = useMutation(t10);
+  const t10 = useMutation(t9);
   let isPending;
   let mutate;
   let mutateAsync;
   let other;
-  if ($[25] !== t11) {
+  if ($[22] !== t10) {
     ({
       mutate,
       mutateAsync,
       isPending,
       ...other
-    } = t11);
-    $[25] = t11;
-    $[26] = isPending;
-    $[27] = mutate;
-    $[28] = mutateAsync;
-    $[29] = other;
+    } = t10);
+    $[22] = t10;
+    $[23] = isPending;
+    $[24] = mutate;
+    $[25] = mutateAsync;
+    $[26] = other;
   } else {
-    isPending = $[26];
-    mutate = $[27];
-    mutateAsync = $[28];
-    other = $[29];
+    isPending = $[23];
+    mutate = $[24];
+    mutateAsync = $[25];
+    other = $[26];
   }
-  let t12;
-  if ($[30] !== isPending || $[31] !== mutate || $[32] !== mutateAsync || $[33] !== other) {
-    t12 = {
+  let t11;
+  if ($[27] !== isPending || $[28] !== mutate || $[29] !== mutateAsync || $[30] !== other) {
+    t11 = {
       update: mutate,
       updateAsync: mutateAsync,
       loading: isPending,
@@ -1203,19 +1364,19 @@ function useResourceUpdate(resource, t0, t1) {
       isPending,
       ...other
     };
-    $[30] = isPending;
-    $[31] = mutate;
-    $[32] = mutateAsync;
-    $[33] = other;
-    $[34] = t12;
+    $[27] = isPending;
+    $[28] = mutate;
+    $[29] = mutateAsync;
+    $[30] = other;
+    $[31] = t11;
   } else {
-    t12 = $[34];
+    t11 = $[31];
   }
-  return t12;
+  return t11;
 }
 
 function useResourceClone(t0, t1, t2) {
-  const $ = c(19);
+  const $ = c(31);
   const resource = t0 === undefined ? null : t0;
   const id = t1 === undefined ? null : t1;
   let t3;
@@ -1227,62 +1388,119 @@ function useResourceClone(t0, t1, t2) {
     t3 = $[1];
   }
   const options = t3;
-  const providedResource = usePanneauResource(id !== null && !isObject(id) ? resource : null);
-  const contextResource = useResource();
-  const finalResource = providedResource || contextResource;
-  const finalId = providedResource !== null ? id : resource;
-  const api = useApi();
+  const {
+    resource: finalResource,
+    id: finalId,
+    options: finalOptions
+  } = useResourceArguments(resource, id, options);
   let t4;
-  if ($[2] !== api || $[3] !== finalId || $[4] !== finalResource) {
-    t4 = t5 => {
-      const providedId = t5 === undefined ? null : t5;
+  if ($[2] !== finalOptions) {
+    t4 = finalOptions || {};
+    $[2] = finalOptions;
+    $[3] = t4;
+  } else {
+    t4 = $[3];
+  }
+  let otherOptions;
+  let t5;
+  if ($[4] !== t4) {
+    ({
+      onSuccess: t5,
+      ...otherOptions
+    } = t4);
+    $[4] = t4;
+    $[5] = otherOptions;
+    $[6] = t5;
+  } else {
+    otherOptions = $[5];
+    t5 = $[6];
+  }
+  const customOnSuccess = t5 === undefined ? null : t5;
+  let t6;
+  if ($[7] !== finalResource) {
+    t6 = finalResource || {};
+    $[7] = finalResource;
+    $[8] = t6;
+  } else {
+    t6 = $[8];
+  }
+  const {
+    id: t7
+  } = t6;
+  const resourceId = t7 === undefined ? null : t7;
+  const api = useApi();
+  const queryClient = useQueryClient();
+  let t8;
+  if ($[9] !== api || $[10] !== finalId || $[11] !== finalResource) {
+    t8 = t9 => {
+      const providedId = t9 === undefined ? null : t9;
       return api.resources.clone(finalResource, providedId ?? finalId);
     };
-    $[2] = api;
-    $[3] = finalId;
-    $[4] = finalResource;
-    $[5] = t4;
+    $[9] = api;
+    $[10] = finalId;
+    $[11] = finalResource;
+    $[12] = t8;
   } else {
-    t4 = $[5];
+    t8 = $[12];
   }
-  let t5;
-  if ($[6] !== options || $[7] !== t4) {
-    t5 = {
-      mutationFn: t4,
-      ...options
+  let t9;
+  if ($[13] !== customOnSuccess || $[14] !== queryClient || $[15] !== resourceId) {
+    t9 = (data, variables, ...t10) => {
+      const args = t10;
+      queryClient.invalidateQueries({
+        queryKey: [resourceId]
+      });
+      if (customOnSuccess !== null) {
+        return customOnSuccess(data, variables, ...args);
+      }
     };
-    $[6] = options;
-    $[7] = t4;
-    $[8] = t5;
+    $[13] = customOnSuccess;
+    $[14] = queryClient;
+    $[15] = resourceId;
+    $[16] = t9;
   } else {
-    t5 = $[8];
+    t9 = $[16];
+  }
+  let t10;
+  if ($[17] !== otherOptions || $[18] !== t8 || $[19] !== t9) {
+    t10 = {
+      mutationFn: t8,
+      onSuccess: t9,
+      ...otherOptions
+    };
+    $[17] = otherOptions;
+    $[18] = t8;
+    $[19] = t9;
+    $[20] = t10;
+  } else {
+    t10 = $[20];
   }
-  const t6 = useMutation(t5);
+  const t11 = useMutation(t10);
   let isPending;
   let mutate;
   let mutateAsync;
   let other;
-  if ($[9] !== t6) {
+  if ($[21] !== t11) {
     ({
       mutate,
       mutateAsync,
       isPending,
       ...other
-    } = t6);
-    $[9] = t6;
-    $[10] = isPending;
-    $[11] = mutate;
-    $[12] = mutateAsync;
-    $[13] = other;
+    } = t11);
+    $[21] = t11;
+    $[22] = isPending;
+    $[23] = mutate;
+    $[24] = mutateAsync;
+    $[25] = other;
   } else {
-    isPending = $[10];
-    mutate = $[11];
-    mutateAsync = $[12];
-    other = $[13];
+    isPending = $[22];
+    mutate = $[23];
+    mutateAsync = $[24];
+    other = $[25];
   }
-  let t7;
-  if ($[14] !== isPending || $[15] !== mutate || $[16] !== mutateAsync || $[17] !== other) {
-    t7 = {
+  let t12;
+  if ($[26] !== isPending || $[27] !== mutate || $[28] !== mutateAsync || $[29] !== other) {
+    t12 = {
       clone: mutate,
       cloneAsync: mutateAsync,
       loading: isPending,
@@ -1291,19 +1509,19 @@ function useResourceClone(t0, t1, t2) {
       isPending,
       ...other
     };
-    $[14] = isPending;
-    $[15] = mutate;
-    $[16] = mutateAsync;
-    $[17] = other;
-    $[18] = t7;
+    $[26] = isPending;
+    $[27] = mutate;
+    $[28] = mutateAsync;
+    $[29] = other;
+    $[30] = t12;
   } else {
-    t7 = $[18];
+    t12 = $[30];
   }
-  return t7;
+  return t12;
 }
 
 function useResourceRestore(t0, t1, t2) {
-  const $ = c(19);
+  const $ = c(31);
   const resource = t0 === undefined ? null : t0;
   const id = t1 === undefined ? null : t1;
   let t3;
@@ -1315,62 +1533,119 @@ function useResourceRestore(t0, t1, t2) {
     t3 = $[1];
   }
   const options = t3;
-  const providedResource = usePanneauResource(id !== null && !isObject(id) ? resource : null);
-  const contextResource = useResource();
-  const finalResource = providedResource || contextResource;
-  const finalId = providedResource !== null ? id : resource;
-  const api = useApi();
+  const {
+    resource: finalResource,
+    id: finalId,
+    options: finalOptions
+  } = useResourceArguments(resource, id, options);
   let t4;
-  if ($[2] !== api || $[3] !== finalId || $[4] !== finalResource) {
-    t4 = t5 => {
-      const providedId = t5 === undefined ? null : t5;
+  if ($[2] !== finalOptions) {
+    t4 = finalOptions || {};
+    $[2] = finalOptions;
+    $[3] = t4;
+  } else {
+    t4 = $[3];
+  }
+  let otherOptions;
+  let t5;
+  if ($[4] !== t4) {
+    ({
+      onSuccess: t5,
+      ...otherOptions
+    } = t4);
+    $[4] = t4;
+    $[5] = otherOptions;
+    $[6] = t5;
+  } else {
+    otherOptions = $[5];
+    t5 = $[6];
+  }
+  const customOnSuccess = t5 === undefined ? null : t5;
+  let t6;
+  if ($[7] !== finalResource) {
+    t6 = finalResource || {};
+    $[7] = finalResource;
+    $[8] = t6;
+  } else {
+    t6 = $[8];
+  }
+  const {
+    id: t7
+  } = t6;
+  const resourceId = t7 === undefined ? null : t7;
+  const api = useApi();
+  const queryClient = useQueryClient();
+  let t8;
+  if ($[9] !== api || $[10] !== finalId || $[11] !== finalResource) {
+    t8 = t9 => {
+      const providedId = t9 === undefined ? null : t9;
       return api.resources.restore(finalResource, providedId ?? finalId);
     };
-    $[2] = api;
-    $[3] = finalId;
-    $[4] = finalResource;
-    $[5] = t4;
+    $[9] = api;
+    $[10] = finalId;
+    $[11] = finalResource;
+    $[12] = t8;
   } else {
-    t4 = $[5];
+    t8 = $[12];
   }
-  let t5;
-  if ($[6] !== options || $[7] !== t4) {
-    t5 = {
-      mutationFn: t4,
-      ...options
+  let t9;
+  if ($[13] !== customOnSuccess || $[14] !== queryClient || $[15] !== resourceId) {
+    t9 = (data, variables, ...t10) => {
+      const args = t10;
+      queryClient.invalidateQueries({
+        queryKey: [resourceId]
+      });
+      if (customOnSuccess !== null) {
+        return customOnSuccess(data, variables, ...args);
+      }
     };
-    $[6] = options;
-    $[7] = t4;
-    $[8] = t5;
+    $[13] = customOnSuccess;
+    $[14] = queryClient;
+    $[15] = resourceId;
+    $[16] = t9;
   } else {
-    t5 = $[8];
+    t9 = $[16];
+  }
+  let t10;
+  if ($[17] !== otherOptions || $[18] !== t8 || $[19] !== t9) {
+    t10 = {
+      mutationFn: t8,
+      onSuccess: t9,
+      ...otherOptions
+    };
+    $[17] = otherOptions;
+    $[18] = t8;
+    $[19] = t9;
+    $[20] = t10;
+  } else {
+    t10 = $[20];
   }
-  const t6 = useMutation(t5);
+  const t11 = useMutation(t10);
   let isPending;
   let mutate;
   let mutateAsync;
   let other;
-  if ($[9] !== t6) {
+  if ($[21] !== t11) {
     ({
       mutate,
       mutateAsync,
       isPending,
       ...other
-    } = t6);
-    $[9] = t6;
-    $[10] = isPending;
-    $[11] = mutate;
-    $[12] = mutateAsync;
-    $[13] = other;
+    } = t11);
+    $[21] = t11;
+    $[22] = isPending;
+    $[23] = mutate;
+    $[24] = mutateAsync;
+    $[25] = other;
   } else {
-    isPending = $[10];
-    mutate = $[11];
-    mutateAsync = $[12];
-    other = $[13];
+    isPending = $[22];
+    mutate = $[23];
+    mutateAsync = $[24];
+    other = $[25];
   }
-  let t7;
-  if ($[14] !== isPending || $[15] !== mutate || $[16] !== mutateAsync || $[17] !== other) {
-    t7 = {
+  let t12;
+  if ($[26] !== isPending || $[27] !== mutate || $[28] !== mutateAsync || $[29] !== other) {
+    t12 = {
       restore: mutate,
       restoreAsync: mutateAsync,
       loading: isPending,
@@ -1379,15 +1654,15 @@ function useResourceRestore(t0, t1, t2) {
       isPending,
       ...other
     };
-    $[14] = isPending;
-    $[15] = mutate;
-    $[16] = mutateAsync;
-    $[17] = other;
-    $[18] = t7;
+    $[26] = isPending;
+    $[27] = mutate;
+    $[28] = mutateAsync;
+    $[29] = other;
+    $[30] = t12;
   } else {
-    t7 = $[18];
+    t12 = $[30];
   }
-  return t7;
+  return t12;
 }
 
 const QueryContext = /*#__PURE__*/createContext(null);
@@ -1395,7 +1670,7 @@ function useQueryContext() {
   return use(QueryContext);
 }
 function QueryProvider(t0) {
-  const $ = c(7);
+  const $ = c(10);
   const {
     config: t1,
     initialKey: t2,
@@ -1405,39 +1680,55 @@ function QueryProvider(t0) {
   const initialConfig = t1 === undefined ? null : t1;
   const initialKey = t2 === undefined ? null : t2;
   const initialData = t3 === undefined ? null : t3;
-  let client;
+  let t4;
   if ($[0] !== initialConfig || $[1] !== initialData || $[2] !== initialKey) {
-    client = new QueryClient({
-      defaultOptions: {
-        queries: {
-          staleTime: Infinity
-        }
-      },
-      ...initialConfig
-    });
-    if (initialKey !== null && initialData !== null) {
-      client.setQueryData(initialKey, initialData);
-    }
+    t4 = () => {
+      const newClient = new QueryClient({
+        defaultOptions: {
+          queries: {
+            staleTime: Infinity
+          }
+        },
+        ...initialConfig
+      });
+      if (initialKey !== null && initialData !== null) {
+        newClient.setQueryData(initialKey, initialData);
+      }
+      return newClient;
+    };
     $[0] = initialConfig;
     $[1] = initialData;
     $[2] = initialKey;
-    $[3] = client;
+    $[3] = t4;
   } else {
-    client = $[3];
+    t4 = $[3];
   }
-  let t4;
+  const [client] = useState(t4);
+  let t5;
   if ($[4] !== children || $[5] !== client) {
-    t4 = /*#__PURE__*/jsx(QueryClientProvider, {
+    t5 = /*#__PURE__*/jsx(QueryClientProvider, {
       client: client,
       children: children
     });
     $[4] = children;
     $[5] = client;
-    $[6] = t4;
+    $[6] = t5;
   } else {
-    t4 = $[6];
+    t5 = $[6];
   }
-  return t4;
+  let t6;
+  if ($[7] !== client || $[8] !== t5) {
+    t6 = /*#__PURE__*/jsx(QueryContext, {
+      value: client,
+      children: t5
+    });
+    $[7] = client;
+    $[8] = t5;
+    $[9] = t6;
+  } else {
+    t6 = $[9];
+  }
+  return t6;
 }
 
 function DataProvider(t0) {