@wow-two-beta/ui-vue 0.0.4 → 0.0.6

package/dist/query/index.js

@@ -1,25 +1,42 @@
-import { QueryClient, MutationCache, QueryCache, CancelledError, VUE_QUERY_CLIENT, useQuery, useInfiniteQuery, useQueryClient, useMutation, useQueries, keepPreviousData, useIsFetching, useIsMutating, hydrate, dehydrate } from "@tanstack/vue-query";
-import { i as isAbortError } from "../chunks/ErrorRecognizers-oTklha6D.js";
+import { defineComponent, provide, onMounted, onUnmounted, renderSlot, toValue, computed, shallowRef, onScopeDispose, watch, openBlock, createBlock, resolveDynamicComponent, createCommentVNode } from "vue";
+import { CancelledError, QueryClient, MutationCache, QueryCache, VUE_QUERY_CLIENT, useQuery, useInfiniteQuery, useQueryClient, useMutation, useQueries, keepPreviousData, useIsFetching, useIsMutating, hydrate, dehydrate } from "@tanstack/vue-query";
+import { u as useNavigationProgress } from "../chunks/UseNavigationProgress-Bx_MWd39.js";
+import { a as isTimeoutError, i as isAbortError } from "../chunks/ErrorRecognizers-DO2SHD6N.js";
+import { A as ApiError, a as ApiFailureFactory } from "../chunks/ApiError-_AOua_XE.js";
 import { DefaultRetryPolicy, computeRetryDelay, shouldRetry } from "../foundation/resilience/index.js";
-import { g as getErrorMessage } from "../chunks/ErrorMessage-Cqt7WaFn.js";
-import { A as ApiError } from "../chunks/ApiError-l0YdcqqV.js";
+import { R as ResultExtensions } from "../chunks/ResultExtensions-B7dWH0FZ.js";
 import { q } from "../chunks/QueryPlugin-CfotNm6j.js";
-import { defineComponent, provide, onMounted, onUnmounted, renderSlot, toValue, computed, shallowRef, onScopeDispose, watch, openBlock, createBlock, resolveDynamicComponent, createCommentVNode } from "vue";
-import { u as useNavigationProgress } from "../chunks/UseNavigationProgress-TQIkkXyU.js";
-function toApiError(error) {
-  if (error instanceof ApiError) return error;
-  return new ApiError(0, null, getErrorMessage(error, "Unknown error"));
+async function resolveQueryResult(pending) {
+  const outcome = await pending;
+  if (!outcome.ok) throw new ApiError(outcome.failure);
+  return outcome.value;
+}
+function toApiFailure(error) {
+  if (error instanceof ApiError) return error.failure;
+  if (isTimeoutError(error)) return ApiFailureFactory.create("timeout");
+  if (error instanceof CancelledError || isAbortError(error)) return ApiFailureFactory.create("cancelled");
+  return ApiFailureFactory.create("protocol");
+}
+async function queryOutcome(run) {
+  try {
+    return ResultExtensions.ok(await run());
+  } catch (error) {
+    if (error instanceof ApiError || error instanceof CancelledError || isAbortError(error) || isTimeoutError(error)) {
+      return ResultExtensions.fail(toApiFailure(error));
+    }
+    throw error;
+  }
 }
 const StaleTimeMs = 3e4;
 const GcTimeMs = 5 * 6e4;
 function isCancellation(error) {
-  return error instanceof CancelledError || isAbortError(error);
+  return error instanceof CancelledError || isAbortError(error) || error instanceof ApiError && error.failure.code === "cancelled";
 }
 function createQueryClient(options = {}) {
   const handleError = (error, meta) => {
     if (isCancellation(error)) return;
     if (meta?.suppressGlobalError === true) return;
-    options.onError?.(toApiError(error), { meta });
+    options.onError?.(toApiFailure(error), { meta });
   };
   const policy = options.retry ?? DefaultRetryPolicy;
   return new QueryClient({
@@ -32,7 +49,7 @@ function createQueryClient(options = {}) {
         staleTime: StaleTimeMs,
         gcTime: GcTimeMs,
         refetchOnWindowFocus: false,
-        retry: (failureCount, error) => !isCancellation(error) && shouldRetry(policy, failureCount, toApiError(error).status),
+        retry: (failureCount, error) => error instanceof ApiError && ["http", "transport"].includes(error.failure.code) && shouldRetry(policy, failureCount, error.status),
         retryDelay: (attemptIndex) => computeRetryDelay(policy, attemptIndex + 1)
       },
       mutations: { retry: 0 }
@@ -47,9 +64,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    provide(VUE_QUERY_CLIENT, props.client);
-    onMounted(() => props.client.mount());
-    onUnmounted(() => props.client.unmount());
+    const client = props.client;
+    provide(VUE_QUERY_CLIENT, client);
+    onMounted(() => client.mount());
+    onUnmounted(() => client.unmount());
     return (_ctx, _cache) => {
       return renderSlot(_ctx.$slots, "default");
     };
@@ -67,7 +85,7 @@ function useAppQuery({
 }) {
   const query = useQuery(() => ({
     queryKey: toValue(key),
-    queryFn: ({ signal }) => queryFn({ signal }),
+    queryFn: ({ signal }) => resolveQueryResult(queryFn({ signal })),
     select: map ?? ((raw) => raw),
     enabled: toValue(enabled),
     meta
@@ -75,7 +93,7 @@ function useAppQuery({
   return {
     data: query.data,
     loading: computed(() => query.isPending.value && query.isFetching.value),
-    error: computed(() => query.error.value ? toApiError(query.error.value) : null),
+    error: computed(() => query.error.value ? toApiFailure(query.error.value) : null),
     refetch: query.refetch
   };
 }
@@ -92,7 +110,7 @@ function useAppInfiniteQuery({
   const extract = (page) => mapPage ? mapPage(page) : page;
   const query = useInfiniteQuery(() => ({
     queryKey: toValue(key),
-    queryFn: ({ pageParam, signal }) => queryFn({ pageParam, signal }),
+    queryFn: ({ pageParam, signal }) => resolveQueryResult(queryFn({ pageParam, signal })),
     getNextPageParam,
     initialPageParam,
     enabled: toValue(enabled),
@@ -106,7 +124,7 @@ function useAppInfiniteQuery({
   return {
     items: computed(() => (query.data.value?.pages ?? []).flatMap((page) => [...extract(page)])),
     loading: computed(() => query.isPending.value && query.isFetching.value),
-    error: computed(() => query.error.value ? toApiError(query.error.value) : null),
+    error: computed(() => query.error.value ? toApiFailure(query.error.value) : null),
     hasNextPage: query.hasNextPage,
     fetchNextPage: query.fetchNextPage,
     isFetchingNextPage: query.isFetchingNextPage,
@@ -121,7 +139,7 @@ function useAppMutation({
 }) {
   const queryClient = useQueryClient();
   const mutation = useMutation({
-    mutationFn,
+    mutationFn: (vars) => resolveQueryResult(mutationFn(vars)),
     meta,
     onSuccess: async (data, vars) => {
       const keys = invalidates?.(vars, data) ?? [];
@@ -131,13 +149,29 @@ function useAppMutation({
   });
   return {
     mutate: mutation.mutate,
-    mutateAsync: mutation.mutateAsync,
+    mutateAsync: (vars) => queryOutcome(() => mutation.mutateAsync(vars)),
     data: mutation.data,
     loading: mutation.isPending,
-    error: computed(() => mutation.error.value ? toApiError(mutation.error.value) : null),
+    error: computed(() => mutation.error.value ? toApiFailure(mutation.error.value) : null),
     reset: mutation.reset
   };
 }
+const tails = /* @__PURE__ */ new WeakMap();
+async function runOptimisticTransaction(client, run) {
+  const previous = tails.get(client) ?? Promise.resolve();
+  let release;
+  const current = new Promise((resolve) => {
+    release = resolve;
+  });
+  tails.set(client, current);
+  await previous;
+  try {
+    return await run();
+  } finally {
+    release();
+    if (tails.get(client) === current) tails.delete(client);
+  }
+}
 function resolveKey(key) {
   return "queryFn" in key ? key.key : key;
 }
@@ -148,37 +182,36 @@ function useOptimisticMutation({
 }) {
   const queryClient = useQueryClient();
   const mutation = useMutation({
-    mutationFn,
-    onMutate: async (vars) => {
-      await Promise.all(
-        targets.map((target) => queryClient.cancelQueries({ queryKey: resolveKey(target.key) }))
-      );
-      return targets.map((target) => {
-        const queryKey = resolveKey(target.key);
-        const previous = queryClient.getQueryData(queryKey);
-        queryClient.setQueryData(queryKey, () => target.apply(previous, vars));
-        return { queryKey, previous };
-      });
-    },
-    onError: (_error, _vars, snapshots) => {
-      for (const { queryKey, previous } of snapshots ?? []) {
-        if (previous === void 0) queryClient.removeQueries({ queryKey, exact: true });
-        else queryClient.setQueryData(queryKey, () => previous);
+    mutationFn: (vars) => runOptimisticTransaction(queryClient, async () => {
+      const keys = targets.map((target) => resolveKey(target.key));
+      await Promise.all(keys.map((queryKey) => queryClient.cancelQueries({ queryKey, exact: true })));
+      const snapshots = [];
+      try {
+        for (const target of targets) {
+          const queryKey = resolveKey(target.key);
+          const previous = queryClient.getQueryData(queryKey);
+          snapshots.push({ queryKey, previous });
+          queryClient.setQueryData(queryKey, () => target.apply(previous, vars));
+        }
+        return await resolveQueryResult(mutationFn(vars));
+      } catch (error) {
+        for (const { queryKey, previous } of [...snapshots].reverse()) {
+          if (previous === void 0) queryClient.removeQueries({ queryKey, exact: true });
+          else queryClient.setQueryData(queryKey, () => previous);
+        }
+        throw error;
+      } finally {
+        if (invalidateOnSettle)
+          await Promise.all(keys.map((queryKey) => queryClient.invalidateQueries({ queryKey, exact: true })));
       }
-    },
-    onSettled: async () => {
-      if (!invalidateOnSettle) return;
-      await Promise.all(
-        targets.map((target) => queryClient.invalidateQueries({ queryKey: resolveKey(target.key) }))
-      );
-    }
+    })
   });
   return {
     mutate: mutation.mutate,
-    mutateAsync: mutation.mutateAsync,
+    mutateAsync: (vars) => queryOutcome(() => mutation.mutateAsync(vars)),
     data: mutation.data,
     loading: mutation.isPending,
-    error: computed(() => mutation.error.value ? toApiError(mutation.error.value) : null),
+    error: computed(() => mutation.error.value ? toApiFailure(mutation.error.value) : null),
     reset: mutation.reset
   };
 }
@@ -190,7 +223,7 @@ function useAppQueries({
     queries: computed(
       () => toValue(queries).map((entry) => ({
         queryKey: entry.key,
-        queryFn: ({ signal }) => entry.queryFn({ signal }),
+        queryFn: ({ signal }) => resolveQueryResult(entry.queryFn({ signal })),
         select: entry.map ?? ((raw) => raw),
         enabled: toValue(enabled)
       }))
@@ -200,7 +233,7 @@ function useAppQueries({
     () => results.value.map((query) => ({
       data: query.data,
       loading: query.isPending && query.isFetching,
-      error: query.error ? toApiError(query.error) : null
+      error: query.error ? toApiFailure(query.error) : null
     }))
   );
   return {
@@ -218,13 +251,16 @@ function useAppPaginatedQuery({
   enabled,
   meta
 }) {
-  const query = useQuery(() => ({
-    queryKey: [...toValue(key), toValue(page)],
-    queryFn: ({ signal }) => queryFn({ page: toValue(page), signal }),
-    placeholderData: keepPreviousData,
-    enabled: toValue(enabled),
-    meta
-  }));
+  const query = useQuery(() => {
+    const currentPage = toValue(page);
+    return {
+      queryKey: [...toValue(key), currentPage],
+      queryFn: ({ signal }) => resolveQueryResult(queryFn({ page: currentPage, signal })),
+      placeholderData: keepPreviousData,
+      enabled: toValue(enabled),
+      meta
+    };
+  });
   const items = computed(() => {
     const data = query.data.value;
     if (data === void 0) return [];
@@ -234,17 +270,29 @@ function useAppPaginatedQuery({
     items,
     page: query.data,
     loading: computed(() => query.isPending.value && query.isFetching.value),
-    error: computed(() => query.error.value ? toApiError(query.error.value) : null),
+    error: computed(() => query.error.value ? toApiFailure(query.error.value) : null),
     isPlaceholder: query.isPlaceholderData,
     refetch: query.refetch
   };
 }
-function byPageToken() {
-  return (lastPage) => lastPage.nextPageToken;
-}
-function pageItems(page) {
-  return page.items;
-}
+const PageExtensions = {
+  /**
+   * A ready `getNextPageParam` for `useAppInfiniteQuery` over `TokenPage` pages — reads `nextPageToken`,
+   * returning `undefined` on the last page (an absent token stops paging).
+   *
+   * `useAppInfiniteQuery<TItem, TokenPage<TItem>>({ getNextPageParam: PageExtensions.byPageToken<TItem>() })`
+   */
+  byPageToken() {
+    return (lastPage) => lastPage.nextPageToken;
+  },
+  /**
+   * A ready `mapPage` for any `IHasItems` page — pass `mapPage: PageExtensions.pageItems` instead of
+   * `(p) => p.items`.
+   */
+  pageItems(page) {
+    return page.items;
+  }
+};
 function useAppLazyQuery({
   key,
   queryFn,
@@ -261,20 +309,30 @@ function useAppLazyQuery({
     loading.value = true;
     error.value = null;
     try {
-      const raw = await client.fetchQuery({
-        queryKey: toValue(key),
-        queryFn: ({ signal }) => queryFn({ signal }),
-        meta
-      });
+      const outcome = await queryOutcome(
+        () => client.fetchQuery({
+          queryKey: toValue(key),
+          queryFn: ({ signal }) => resolveQueryResult(queryFn({ signal })),
+          meta
+        })
+      );
+      if (!outcome.ok) {
+        if (current === sequence) {
+          error.value = outcome.failure;
+          loading.value = false;
+        }
+        return outcome;
+      }
+      const raw = outcome.value;
       const mapped = map ? map(raw) : raw;
       if (current === sequence) {
         data.value = mapped;
         loading.value = false;
       }
-      return mapped;
+      return ResultExtensions.ok(mapped);
     } catch (caught) {
       if (current === sequence) {
-        error.value = toApiError(caught);
+        error.value = toApiFailure(caught);
         loading.value = false;
       }
       throw caught;
@@ -286,6 +344,7 @@ function useAppLazyQuery({
     error.value = null;
     loading.value = false;
   };
+  onScopeDispose(reset);
   return { data, loading, error, fetch, reset };
 }
 function useQueryCache() {
@@ -299,24 +358,19 @@ function useQueryCache() {
     remove: (key) => {
       client.removeQueries({ queryKey: key });
     },
-    prefetch: ({ key, queryFn }) => client.prefetchQuery({ queryKey: key, queryFn: ({ signal }) => queryFn({ signal }) })
+    prefetch: ({ key, queryFn }) => client.prefetchQuery({ queryKey: key, queryFn: ({ signal }) => resolveQueryResult(queryFn({ signal })) })
   };
 }
-let activeClient;
 function warm(client, { key, queryFn }) {
-  void client.prefetchQuery({ queryKey: key, queryFn });
+  void client.prefetchQuery({ queryKey: key, queryFn: ({ signal }) => resolveQueryResult(queryFn({ signal })) });
 }
 function usePrefetchQuery() {
   const client = useQueryClient();
-  activeClient = client;
-  onScopeDispose(() => {
-    if (activeClient === client) activeClient = void 0;
-  });
   return (target) => warm(client, target);
 }
-function prefetchProps(target) {
+function prefetchProps(target, client) {
   const run = () => {
-    if (activeClient) warm(activeClient, target);
+    warm(client, target);
   };
   return { onMouseenter: run, onFocus: run };
 }
@@ -328,7 +382,7 @@ async function useAppSuspenseQuery({
 }) {
   const query = useQuery(() => ({
     queryKey: toValue(key),
-    queryFn: ({ signal }) => queryFn({ signal }),
+    queryFn: ({ signal }) => resolveQueryResult(queryFn({ signal })),
     select: map,
     meta
   }));
@@ -366,7 +420,7 @@ const QueryProgressBridge = defineComponent({
 });
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "QueryDevtools" },
-  __name: "Devtools",
+  __name: "QueryDevtools",
   props: {
     initialIsOpen: { type: Boolean, default: false }
   },
@@ -387,16 +441,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 const DefaultStorageKey = "app:query-cache";
 const DefaultMaxAgeMs = 24 * 60 * 6e4;
 const WriteThrottleMs = 1e3;
-function setupQueryPersistence(client, options = {}) {
+function setupQueryPersistence(client, options) {
   if (typeof window === "undefined") return null;
-  const { storageKey = DefaultStorageKey, maxAgeMs = DefaultMaxAgeMs, buster = "" } = options;
-  restore(client, storageKey, maxAgeMs, buster);
+  const { storageKey = DefaultStorageKey, maxAgeMs = DefaultMaxAgeMs, buster = "", includes } = options;
+  restore(client, storageKey, maxAgeMs, buster, includes);
   let timer = null;
   const schedule = () => {
     if (timer !== null) return;
     timer = setTimeout(() => {
       timer = null;
-      write(client, storageKey, buster);
+      write(client, storageKey, buster, includes);
     }, WriteThrottleMs);
   };
   const unsubscribeQueries = client.getQueryCache().subscribe(schedule);
@@ -413,39 +467,47 @@ function setupQueryPersistence(client, options = {}) {
     restored: Promise.resolve()
   };
 }
-function restore(client, storageKey, maxAgeMs, buster) {
+function restore(client, storageKey, maxAgeMs, buster, includes) {
   try {
     const raw = window.localStorage.getItem(storageKey);
     if (!raw) return;
     const snapshot = JSON.parse(raw);
-    const isStale = Date.now() - snapshot.timestamp > maxAgeMs;
+    const isStale = !Number.isFinite(snapshot.timestamp) || snapshot.timestamp > Date.now() || Date.now() - snapshot.timestamp > maxAgeMs;
     if (snapshot.buster !== buster || isStale) {
       window.localStorage.removeItem(storageKey);
       return;
     }
-    hydrate(client, snapshot.state);
+    if (!snapshot.state || !Array.isArray(snapshot.state.queries)) return;
+    const queries = snapshot.state.queries.filter((query) => Array.isArray(query.queryKey) && includes(query.queryKey));
+    hydrate(client, { queries, mutations: [] });
   } catch {
   }
 }
-function write(client, storageKey, buster) {
+function write(client, storageKey, buster, includes) {
   try {
-    const snapshot = { buster, timestamp: Date.now(), state: dehydrate(client) };
+    const snapshot = {
+      buster,
+      timestamp: Date.now(),
+      state: dehydrate(client, {
+        shouldDehydrateQuery: (query) => query.state.status === "success" && includes(query.queryKey),
+        shouldDehydrateMutation: () => false
+      })
+    };
     window.localStorage.setItem(storageKey, JSON.stringify(snapshot));
   } catch {
   }
 }
 export {
+  PageExtensions,
   _sfc_main as QueryDevtools,
   QueryProgressBridge,
   _sfc_main$1 as QueryProvider,
-  byPageToken,
   createQueryClient,
   defineEndpoint,
-  pageItems,
   prefetchProps,
   q as queryPlugin,
   setupQueryPersistence,
-  toApiError,
+  toApiFailure,
   useAppInfiniteQuery,
   useAppLazyQuery,
   useAppMutation,