@tanstack/solid-query 6.0.0-rc.0 → 6.0.0-rc.2

package/build/index.cjs

@@ -3,160 +3,17 @@
 var queryCore = require('@tanstack/query-core');
 var solidJs = require('solid-js');
 var web = require('@solidjs/web');
+var serverFunctions = require('@solidjs/web/server-functions');
 
-// src/useQuery.ts
-function createServerDehydrationChannel(client) {
-  const cache = client.getQueryCache();
-  const entryCache = /* @__PURE__ */ new Map();
-  const snapshot2 = () => {
-    const entries = [];
-    for (const query of cache.getAll()) {
-      if (query.state.status !== "success") continue;
-      let cached = entryCache.get(query.queryHash);
-      if (!cached || cached.state !== query.state) {
-        cached = {
-          state: query.state,
-          entry: {
-            dehydratedAt: Date.now(),
-            state: query.state,
-            queryKey: query.queryKey,
-            queryHash: query.queryHash,
-            ...query.meta && { meta: query.meta },
-            ...query.queryType && { queryType: query.queryType }
-          }
-        };
-        entryCache.set(query.queryHash, cached);
-      }
-      entries.push(cached.entry);
-    }
-    return entries;
-  };
-  let closed = false;
-  let pull = null;
-  const buffered = [];
-  const emit = (value) => {
-    if (closed) return;
-    if (value.done) closed = true;
-    if (pull) {
-      const resolve = pull;
-      pull = null;
-      resolve({ done: false, value });
-    } else {
-      buffered.push(value);
-    }
-  };
-  let closeTimer = null;
-  const scheduleCloseCheck = () => {
-    if (closed || closeTimer !== null) return;
-    closeTimer = setTimeout(() => {
-      closeTimer = null;
-      if (closed) return;
-      if (client.isFetching() === 0) {
-        unsubscribe();
-        emit({ entries: snapshot2(), done: true });
-      }
-    }, 0);
-  };
-  const unsubscribe = cache.subscribe((event) => {
-    if (closed) return;
-    if (event.type === "updated" && event.action.type === "success") {
-      emit({ entries: snapshot2(), done: false });
-    }
-    scheduleCloseCheck();
-  });
-  scheduleCloseCheck();
-  return {
-    [Symbol.asyncIterator]() {
-      return {
-        next() {
-          if (buffered.length > 0) {
-            return Promise.resolve({ done: false, value: buffered.shift() });
-          }
-          if (closed) {
-            return Promise.resolve({
-              done: true,
-              value: void 0
-            });
-          }
-          return new Promise(
-            (resolve) => {
-              pull = resolve;
-            }
-          );
-        },
-        return(value) {
-          if (!closed) {
-            closed = true;
-            unsubscribe();
-            if (closeTimer !== null) {
-              clearTimeout(closeTimer);
-              closeTimer = null;
-            }
-            const resolve = pull;
-            pull = null;
-            resolve?.({ done: true, value: void 0 });
-          }
-          return Promise.resolve({
-            done: true,
-            value
-          });
-        }
-      };
-    }
-  };
-}
-function createHydrationCoordinator(client) {
-  const applied = /* @__PURE__ */ new Map();
-  const waiters = /* @__PURE__ */ new Map();
-  let channelDone = false;
-  const fireWaiters = (queryHash) => {
-    const callbacks = waiters.get(queryHash);
-    if (!callbacks) return;
-    waiters.delete(queryHash);
-    for (const callback of callbacks) queueMicrotask(callback);
-  };
-  return {
-    applyYield(value) {
-      const fresh = value.entries.filter(
-        (entry) => applied.get(entry.queryHash) !== entry.state.dataUpdatedAt
-      );
-      if (fresh.length > 0) {
-        solidJs.runWithOwner(
-          null,
-          () => queryCore.hydrate(client(), { queries: fresh, mutations: [] })
-        );
-        for (const entry of fresh) {
-          applied.set(entry.queryHash, entry.state.dataUpdatedAt);
-          fireWaiters(entry.queryHash);
-        }
-      }
-      if (value.done && !channelDone) {
-        channelDone = true;
-        const remaining = [...waiters.values()];
-        waiters.clear();
-        for (const callbacks of remaining) {
-          for (const callback of callbacks) queueMicrotask(callback);
-        }
-      }
-    },
-    whenQueryPrimed(queryHash, callback) {
-      if (channelDone || applied.has(queryHash)) {
-        queueMicrotask(callback);
-        return;
-      }
-      let list = waiters.get(queryHash);
-      if (!list) {
-        list = [];
-        waiters.set(queryHash, list);
-      }
-      list.push(callback);
-    }
-  };
-}
-var HydrationCoordinatorContext = solidJs.createContext(null);
-
-// src/QueryClientProvider.tsx
+// src/index.ts
+exports.QueryClient = class QueryClient extends queryCore.QueryClient {
+  constructor(config = {}) {
+    super(config);
+  }
+};
 var isServer = typeof window === "undefined";
+var HYDRATION_KEY_PREFIX = "sq:";
+exports.FLIGHT_DATA_SOURCE = "sq";
 exports.QueryClientContext = solidJs.createContext(null);
 exports.useQueryClient = (queryClient) => {
   if (queryClient) {
@@ -168,25 +25,53 @@ exports.useQueryClient = (queryClient) => {
   }
   return client();
 };
+function serializeCacheOnServer(client) {
+  const ctx = solidJs.sharedConfig.context;
+  if (!ctx || !ctx.async || ctx.noHydrate) return;
+  const cache = client.getQueryCache();
+  const shouldDehydrateQuery = client.getDefaultOptions().dehydrate?.shouldDehydrateQuery;
+  const seen = /* @__PURE__ */ new Set();
+  const serializeQuery = (query) => {
+    if (seen.has(query.queryHash)) return;
+    if (shouldDehydrateQuery && !shouldDehydrateQuery(query)) return;
+    const state = query.state;
+    if (state.status === "success") {
+      seen.add(query.queryHash);
+      ctx.serialize(HYDRATION_KEY_PREFIX + query.queryHash, {
+        data: state.data,
+        t: state.dataUpdatedAt
+      });
+    } else if (state.fetchStatus !== "idle") {
+      const promise = query.promise;
+      if (!promise) return;
+      seen.add(query.queryHash);
+      ctx.serialize(HYDRATION_KEY_PREFIX + query.queryHash, promise.then(() => ({
+        data: query.state.data,
+        t: query.state.dataUpdatedAt
+      })));
+    }
+  };
+  for (const query of cache.getAll()) serializeQuery(query);
+  solidJs.onCleanup(cache.subscribe((event) => serializeQuery(event.query)));
+}
 exports.QueryClientProvider = (props) => {
   props.client.mount();
   solidJs.onCleanup(() => props.client.unmount());
-  const [channelValue] = solidJs.createSignal(() => isServer ? createServerDehydrationChannel(props.client) : void 0);
-  const coordinator = isServer ? null : createHydrationCoordinator(() => props.client);
-  solidJs.createRenderEffect(() => isServer ? void 0 : channelValue(), (value) => {
-    if (value && coordinator) {
-      coordinator.applyYield(value);
-    }
-  });
+  if (isServer) {
+    serializeCacheOnServer(props.client);
+    solidJs.onCleanup(() => {
+      props.client.cancelQueries().catch(() => void 0);
+      props.client.clear();
+    });
+  } else {
+    solidJs.onCleanup(serverFunctions.subscribeFlightData(exports.FLIGHT_DATA_SOURCE, (data) => {
+      queryCore.hydrate(props.client, data);
+    }));
+  }
   return web.createComponent(exports.QueryClientContext, {
     value: () => props.client,
     get children() {
-      return web.createComponent(HydrationCoordinatorContext, {
-        value: coordinator,
-        get children() {
-          return props.children;
-        }
-      });
+      return props.children;
     }
   });
 };
@@ -195,251 +80,357 @@ exports.useIsRestoring = () => solidJs.useContext(exports.IsRestoringContext);
 
 // src/useBaseQuery.ts
 var isServer2 = typeof window === "undefined";
-function _stripFnsForSSR(obj) {
-  if (!isServer2) return obj;
-  const out = {};
-  for (const k of Object.keys(obj)) {
-    if (k === "refetch" || k === "fetchNextPage" || k === "fetchPreviousPage") {
-      out[k] = void 0;
-    } else {
-      out[k] = obj[k];
-    }
-  }
-  return out;
-}
-function reconcileFn(store, result, reconcileOption, queryHash) {
-  if (typeof reconcileOption === "function") {
-    const newData = reconcileOption(store.data, result.data);
-    return { ...result, data: newData };
-  }
-  if (reconcileOption === false) return result;
-  const key = reconcileOption;
-  let data = result.data;
-  if (store.data === void 0) {
-    try {
-      data = structuredClone(data);
-    } catch (error) {
-    }
-  }
-  if (store.data !== void 0 && data !== void 0) {
-    solidJs.reconcile(data, key)(store.data);
-    return { ...result, data: store.data };
-  }
-  return { ...result, data };
-}
-var hydratableObserverResult = (_query, result) => {
-  if (!isServer2) return result;
-  const obj = {
-    ...solidJs.snapshot(result),
-    // During SSR, functions cannot be serialized, so we need to remove them
-    // This is safe because we will add these functions back when the query is hydrated
-    refetch: void 0
+var NEVER = new Promise(queryCore.noop);
+function metaFrom(state) {
+  return {
+    dataUpdateCount: state.dataUpdateCount,
+    dataUpdatedAt: state.dataUpdatedAt,
+    error: state.error,
+    errorUpdateCount: state.errorUpdateCount,
+    errorUpdatedAt: state.errorUpdatedAt,
+    fetchFailureCount: state.fetchFailureCount,
+    fetchFailureReason: state.fetchFailureReason,
+    fetchStatus: state.fetchStatus,
+    isInvalidated: state.isInvalidated,
+    status: state.status
   };
-  if ("fetchNextPage" in result) {
-    obj.fetchNextPage = void 0;
-    obj.fetchPreviousPage = void 0;
-  }
-  return obj;
-};
+}
 function useBaseQuery(options, Observer, queryClient) {
-  const [client] = solidJs.createSignal(() => exports.useQueryClient(queryClient?.()));
+  return useBaseQueryLayer(options, Observer, queryClient).result;
+}
+function useBaseQueryLayer(options, Observer, queryClient) {
+  const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
   const isRestoring = exports.useIsRestoring();
-  let unsubscribeQueued = false;
-  const [defaultedOptions] = solidJs.createSignal(() => {
-    const defaultOptions = client().defaultQueryOptions(options());
-    defaultOptions._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
-    defaultOptions.structuralSharing = false;
+  let latestHash;
+  let latestOptions;
+  const defaultedOptions = solidJs.createMemo(() => {
+    const defaulted = client().defaultQueryOptions(options());
+    defaulted._optimisticResults = isRestoring() ? "isRestoring" : "optimistic";
     if (isServer2) {
-      defaultOptions.retry = false;
-      defaultOptions.throwOnError = true;
-      defaultOptions.experimental_prefetchInRender = true;
+      defaulted.retry = false;
+      defaulted.throwOnError = true;
     }
-    return defaultOptions;
+    latestHash = defaulted.queryHash;
+    latestOptions = defaulted;
+    return defaulted;
   });
-  const observer = solidJs.untrack(() => new Observer(client(), defaultedOptions()));
-  const [trackedDefaultedOptions] = solidJs.createSignal(() => defaultedOptions());
+  let observer = solidJs.untrack(() => new Observer(client(), defaultedOptions()));
   solidJs.createRenderEffect(
-    () => trackedDefaultedOptions(),
-    (opts) => {
-      solidJs.runWithOwner(null, () => observer.setOptions(opts));
-    }
+    () => defaultedOptions(),
+    (opts) => observer.setOptions(opts)
   );
-  let observerResult = solidJs.untrack(
-    () => observer.getOptimisticResult(defaultedOptions())
-  );
-  const [state, setState] = solidJs.createStore(
-    _stripFnsForSSR(observerResult)
-  );
-  const createServerSubscriber = (resolve, reject) => {
-    return observer.subscribe((result) => {
-      queryCore.notifyManager.batchCalls(() => {
-        const query = observer.getCurrentQuery();
-        const unwrappedResult = hydratableObserverResult(query, result);
-        if (result.data !== void 0 && unwrappedResult.isError) {
-          reject(unwrappedResult.error);
-          unsubscribeIfQueued();
-        } else {
-          resolve(unwrappedResult);
-          unsubscribeIfQueued();
-        }
-      })();
-    });
-  };
-  const unsubscribeIfQueued = () => {
-    if (unsubscribeQueued) {
-      unsubscribe?.();
-      unsubscribeQueued = false;
+  const hydratedMount = !isServer2 && solidJs.sharedConfig.hydrating === true;
+  const [version, setVersion] = solidJs.createSignal(0, { ownedWrite: true });
+  const [primed, setPrimed] = solidJs.createSignal(!hydratedMount, {
+    ownedWrite: true
+  });
+  const onCacheEvent = (event) => {
+    if (event.query.queryHash === solidJs.untrack(defaultedOptions).queryHash || event.query.queryHash === latestHash) {
+      setVersion((v) => v + 1);
     }
   };
-  const createClientSubscriber = () => {
-    return observer.subscribe((result) => {
-      const previousResult = observerResult;
-      observerResult = result;
-      solidJs.runWithOwner(null, () => {
-        setStateWithReconciliation(result);
-        if (unsubscribe && !disposed && (previousResult.isLoading !== result.isLoading || previousResult.isError !== result.isError)) {
-          try {
-            solidJs.refresh(queryResource);
-          } catch {
-          }
-        }
-      });
-    });
-  };
-  function setStateWithReconciliation(res) {
-    const opts = observer.options;
-    const reconcileOptions = opts.reconcile;
-    const sanitized = _stripFnsForSSR(res);
-    setState((store) => {
-      return reconcileFn(
-        store,
-        sanitized,
-        reconcileOptions === void 0 ? false : reconcileOptions,
-        opts.queryHash
-      );
-    });
-  }
-  let unsubscribe = null;
+  let observerSub = null;
+  let cacheSub = null;
   let disposed = false;
-  const coordinator = solidJs.useContext(HydrationCoordinatorContext);
-  const attachHydratedSubscriber = () => {
-    if (!unsubscribe && !disposed && !isRestoring()) {
-      unsubscribe = createClientSubscriber();
+  let shouldAttach = false;
+  let activeClient = solidJs.untrack(client);
+  const attach = () => {
+    if (!disposed && !observerSub && !solidJs.untrack(isRestoring)) {
+      shouldAttach = true;
+      observerSub = observer.subscribe(queryCore.noop);
     }
   };
-  const scheduleHydratedAttach = () => {
-    const queryHash = solidJs.untrack(() => observer.getCurrentQuery().queryHash);
-    if (coordinator) {
-      coordinator.whenQueryPrimed(queryHash, attachHydratedSubscriber);
-    } else {
-      queueMicrotask(attachHydratedSubscriber);
+  const syncClient = (c) => {
+    if (isServer2 || c === activeClient) return;
+    activeClient = c;
+    cacheSub?.();
+    cacheSub = c.getQueryCache().subscribe(onCacheEvent);
+    observerSub?.();
+    observerSub = null;
+    observer = new Observer(c, solidJs.untrack(defaultedOptions));
+    if (shouldAttach && !disposed && !solidJs.untrack(isRestoring)) {
+      observerSub = observer.subscribe(queryCore.noop);
     }
   };
-  let resolver = null;
-  const [queryResource] = solidJs.createSignal(() => {
-    const opts = trackedDefaultedOptions();
-    const restoring = isRestoring();
-    if (isServer2) {
-      const cached = observer.getOptimisticResult(opts);
-      if (!cached.isLoading) {
-        observerResult = cached;
-        solidJs.runWithOwner(null, () => {
-          setStateWithReconciliation(cached);
-        });
-        return hydratableObserverResult(
-          observer.getCurrentQuery(),
-          cached
-        );
-      }
+  const prime = (entry) => {
+    if (entry != null && typeof entry === "object" && (entry.t ?? 0) > 0) {
+      const c = solidJs.untrack(client);
+      const opts = solidJs.untrack(defaultedOptions);
+      solidJs.runWithOwner(
+        null,
+        () => queryCore.hydrate(c, {
+          mutations: [],
+          queries: [
+            {
+              queryKey: opts.queryKey,
+              queryHash: opts.queryHash,
+              dehydratedAt: entry.t,
+              ...opts.meta && { meta: opts.meta },
+              ...opts._type && {
+                queryType: opts._type
+              },
+              state: {
+                data: entry.data,
+                dataUpdatedAt: entry.t,
+                dataUpdateCount: 1,
+                error: null,
+                errorUpdateCount: 0,
+                errorUpdatedAt: 0,
+                fetchFailureCount: 0,
+                fetchFailureReason: null,
+                fetchMeta: null,
+                isInvalidated: false,
+                status: "success",
+                fetchStatus: "idle"
+              }
+            }
+          ]
+        })
+      );
     }
-    const replayProbe = { executorRan: false };
-    const resource = new Promise((resolve, reject) => {
-      replayProbe.executorRan = true;
-      resolver = resolve;
-      if (isServer2) {
-        unsubscribe = createServerSubscriber((data) => {
-          resolve(data);
-        }, reject);
-      } else if (!unsubscribe && !restoring) {
-        unsubscribe = createClientSubscriber();
-      }
-      const currentResult = observer.getOptimisticResult(opts);
-      observerResult = currentResult;
-      solidJs.runWithOwner(null, () => {
-        if (currentResult.isError && !currentResult.isFetching && !restoring && queryCore.shouldThrowError(opts.throwOnError, [
-          currentResult.error,
-          observer.getCurrentQuery()
-        ])) {
-          setStateWithReconciliation(currentResult);
-          reject(currentResult.error);
-          return;
-        }
-        setStateWithReconciliation(currentResult);
-      });
-      if (currentResult.isError && !currentResult.isFetching && !restoring && queryCore.shouldThrowError(opts.throwOnError, [
-        currentResult.error,
-        observer.getCurrentQuery()
-      ])) {
-        return;
-      }
-      if (!currentResult.isLoading) {
-        resolver = null;
-        return resolve(
-          hydratableObserverResult(observer.getCurrentQuery(), currentResult)
-        );
+  };
+  if (!isServer2) {
+    cacheSub = activeClient.getQueryCache().subscribe(onCacheEvent);
+    const sc = solidJs.sharedConfig;
+    const registryKey = HYDRATION_KEY_PREFIX + solidJs.untrack(defaultedOptions).queryHash;
+    const primeAndAttach = (entry) => {
+      prime(entry);
+      setPrimed(true);
+      attach();
+    };
+    const settle = hydratedMount ? primeAndAttach : prime;
+    if (sc.has?.(registryKey)) {
+      const entry = sc.load(registryKey);
+      delete globalThis._$HY.r[registryKey];
+      if (entry != null && typeof entry === "object") {
+        if (entry.s === 1) settle(entry.v);
+        else if (entry.s === 2) settle();
+        else if (typeof entry.then === "function")
+          entry.then(settle, () => settle());
+        else settle(entry);
+      } else {
+        settle(entry);
       }
-    });
-    if (!isServer2 && !replayProbe.executorRan) {
-      scheduleHydratedAttach();
+    } else if (hydratedMount) {
+      primeAndAttach();
     }
-    return resource;
-  });
-  solidJs.onCleanup(() => {
-    disposed = true;
-    if (isServer2 && solidJs.isPending(queryResource)) {
-      unsubscribeQueued = true;
-      return;
+    if (!hydratedMount) {
+      solidJs.createRenderEffect(
+        () => isRestoring(),
+        (restoring) => {
+          if (!restoring) attach();
+        }
+      );
     }
-    if (unsubscribe) {
-      unsubscribe();
-      unsubscribe = null;
+    solidJs.onCleanup(() => {
+      disposed = true;
+      observerSub?.();
+      observerSub = null;
+      cacheSub?.();
+      cacheSub = null;
+    });
+  }
+  const query = () => {
+    version();
+    const c = client();
+    syncClient(c);
+    return c.getQueryCache().build(c, defaultedOptions());
+  };
+  const isEnabled = () => {
+    const opts = defaultedOptions();
+    const enabled = typeof opts.enabled === "function" ? opts.enabled(solidJs.untrack(query)) : opts.enabled;
+    return enabled !== false;
+  };
+  const resolvePlaceholder = (opts) => {
+    const placeholder = opts.placeholderData;
+    if (placeholder === void 0) return void 0;
+    return typeof placeholder === "function" ? placeholder() : placeholder;
+  };
+  let chained = null;
+  const chainOnce = (base, select, wrap) => {
+    if (chained?.base !== base || chained.select !== select) {
+      chained = { base, select, value: base.then(wrap) };
     }
-    if (resolver && !isServer2) {
-      resolver(observerResult);
-      resolver = null;
+    return chained.value;
+  };
+  const computeData = (prev) => {
+    const opts = defaultedOptions();
+    const q = query();
+    const state = q.state;
+    const select = opts.select;
+    const wrap = (d) => ({
+      value: select ? select(d) : d
+    });
+    if (state.data === void 0 && state.status === "pending") {
+      const placeholder = resolvePlaceholder(opts);
+      if (placeholder !== void 0) return wrap(placeholder);
     }
-  });
-  const errorPassthroughProps = /* @__PURE__ */ new Set([
-    "error",
-    "isError",
-    "failureCount",
-    "failureReason",
-    "errorUpdateCount",
-    "errorUpdatedAt"
-  ]);
-  return new Proxy(state, {
-    get(target, prop, receiver) {
-      if (typeof prop === "symbol") {
-        return Reflect.get(target, prop, receiver);
-      }
-      if (isServer2) {
-        const resolved = queryResource();
-        if (prop in resolved) {
-          return Reflect.get(resolved, prop);
-        }
+    if (state.fetchStatus !== "idle") {
+      if (state.data === void 0 || prev !== void 0) {
+        const promise = q.promise;
+        if (promise) return chainOnce(promise, select, wrap);
       }
-      if (errorPassthroughProps.has(prop)) {
-        return Reflect.get(target, prop, receiver);
-      }
-      if (state.isError && !state.isFetching && queryCore.shouldThrowError(observer.options.throwOnError, [
+    }
+    if (state.status === "error") {
+      if (state.data === void 0 || queryCore.shouldThrowError(opts.throwOnError, [
         state.error,
-        observer.getCurrentQuery()
+        q
       ])) {
         throw state.error;
       }
-      return Reflect.get(target, prop, receiver);
     }
+    if (state.data !== void 0) return wrap(state.data);
+    if (isEnabled()) {
+      if (!isServer2 && solidJs.sharedConfig.hydrating) {
+        return NEVER;
+      }
+      if (!primed()) {
+        return NEVER;
+      }
+      if (isRestoring()) {
+        return NEVER;
+      }
+      if (!isServer2) observer.setOptions(opts);
+      return chainOnce(q.fetch(opts), select, wrap);
+    }
+    return NEVER;
+  };
+  const dataStore = solidJs.createProjection(
+    (draft) => computeData(draft.value),
+    {},
+    {
+      key: solidJs.untrack(() => options().reconcile),
+      deferStream: solidJs.untrack(() => options().deferStream)
+    }
+  );
+  const data = () => dataStore.value;
+  const serverMeta = () => {
+    if (query().state.status === "pending" && isEnabled()) data();
+    return metaFrom(query().state);
+  };
+  const metaProjection = solidJs.createProjection(
+    (draft) => {
+      Object.assign(draft, metaFrom(query().state));
+    },
+    solidJs.untrack(() => metaFrom(query().state))
+  );
+  const meta = isServer2 ? new Proxy({}, {
+    get: (_, key) => serverMeta()[key]
+  }) : metaProjection;
+  const mountedAt = isServer2 ? {
+    get dataUpdateCount() {
+      return solidJs.untrack(query).state.dataUpdateCount;
+    },
+    get errorUpdateCount() {
+      return solidJs.untrack(query).state.errorUpdateCount;
+    }
+  } : solidJs.untrack(() => {
+    const state = query().state;
+    return {
+      dataUpdateCount: state.dataUpdateCount,
+      errorUpdateCount: state.errorUpdateCount
+    };
   });
+  const hasPlaceholder = () => meta.status === "pending" && solidJs.untrack(() => resolvePlaceholder(defaultedOptions())) !== void 0;
+  const status = () => hasPlaceholder() ? "success" : meta.status;
+  const isPending = () => status() === "pending";
+  const isFetching = () => meta.fetchStatus === "fetching" || solidJs.isPending(() => data());
+  const isError = () => status() === "error";
+  const isStale = () => {
+    const opts = defaultedOptions();
+    const q = solidJs.untrack(query);
+    const staleTime = typeof opts.staleTime === "function" ? opts.staleTime(q) : opts.staleTime;
+    version();
+    return q.isStaleByTime(staleTime);
+  };
+  const result = {
+    get data() {
+      return data();
+    },
+    get error() {
+      return meta.error;
+    },
+    get status() {
+      return status();
+    },
+    get fetchStatus() {
+      return meta.fetchStatus;
+    },
+    get isPending() {
+      return isPending();
+    },
+    get isSuccess() {
+      return status() === "success";
+    },
+    get isError() {
+      return isError();
+    },
+    get isLoading() {
+      return isPending() && isFetching();
+    },
+    get isFetching() {
+      return isFetching();
+    },
+    get isRefetching() {
+      return isFetching() && !isPending();
+    },
+    get isPaused() {
+      return meta.fetchStatus === "paused";
+    },
+    get isEnabled() {
+      return isEnabled();
+    },
+    get isLoadingError() {
+      return isError() && meta.dataUpdatedAt === 0;
+    },
+    get isRefetchError() {
+      return isError() && meta.dataUpdatedAt !== 0;
+    },
+    get isPlaceholderData() {
+      return hasPlaceholder();
+    },
+    get isStale() {
+      return isStale();
+    },
+    get isFetched() {
+      return meta.dataUpdateCount > 0 || meta.errorUpdateCount > 0;
+    },
+    get isFetchedAfterMount() {
+      return meta.dataUpdateCount > mountedAt.dataUpdateCount || meta.errorUpdateCount > mountedAt.errorUpdateCount;
+    },
+    get dataUpdatedAt() {
+      return meta.dataUpdatedAt;
+    },
+    get errorUpdatedAt() {
+      return meta.errorUpdatedAt;
+    },
+    get failureCount() {
+      return meta.fetchFailureCount;
+    },
+    get failureReason() {
+      return meta.fetchFailureReason;
+    },
+    get errorUpdateCount() {
+      return meta.errorUpdateCount;
+    },
+    get promise() {
+      return solidJs.resolve(() => data());
+    },
+    refetch: ((refetchOptions) => {
+      if (!isServer2 && latestOptions) {
+        observer.setOptions(latestOptions);
+      }
+      return observer.refetch(refetchOptions);
+    })
+  };
+  return {
+    result,
+    observer,
+    query,
+    defaultedOptions,
+    isFetching,
+    status
+  };
 }
 
 // src/useQuery.ts
@@ -450,157 +441,356 @@ function useQuery(options, queryClient) {
     queryClient
   );
 }
-function useInfiniteQuery(options, queryClient) {
-  return useBaseQuery(
-    solidJs.createMemo(() => options()),
-    queryCore.InfiniteQueryObserver,
-    queryClient
-  );
+
+// src/queryOptions.ts
+function queryOptions(options) {
+  return options;
 }
-function useMutation(options, queryClient) {
-  const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
-  const observer = solidJs.untrack(
-    () => new queryCore.MutationObserver(
-      client(),
-      options()
-    )
-  );
-  solidJs.createRenderEffect(
-    () => options(),
-    (opts) => {
-      observer.setOptions(opts);
-    }
+async function dehydrateSettled(client, options) {
+  const cache = client.getQueryCache();
+  for (; ; ) {
+    const pending = cache.getAll().filter((query) => query.state.fetchStatus !== "idle").map((query) => query.promise);
+    if (pending.length === 0) break;
+    await Promise.allSettled(pending);
+  }
+  return queryCore.dehydrate(client, options);
+}
+var isServer3 = typeof window === "undefined";
+function createCacheAggregate(subscribe, read, empty) {
+  const hydratedMount = !isServer3 && solidJs.sharedConfig.hydrating === true;
+  const [durable, setDurable] = solidJs.createSignal(
+    hydratedMount || isServer3 ? empty : solidJs.untrack(() => read(empty)),
+    { ownedWrite: true }
   );
-  const mutate = (variables, mutateOptions) => {
-    observer.mutate(variables, mutateOptions).catch(queryCore.noop);
-  };
-  const initialResult = solidJs.untrack(() => observer.getCurrentResult());
-  const [state, setState] = solidJs.createStore({
-    ...initialResult,
-    mutate,
-    mutateAsync: initialResult.mutate
+  const [value, setValue] = solidJs.createOptimistic(() => durable(), {
+    ownedWrite: true
   });
-  const unsubscribe = observer.subscribe((result) => {
-    solidJs.runWithOwner(null, () => {
-      setState(() => ({
-        ...result,
-        mutate,
-        mutateAsync: result.mutate
-      }));
-    });
-  });
-  solidJs.onCleanup(unsubscribe);
-  solidJs.createRenderEffect(
+  const sync = () => {
+    const next = solidJs.untrack(() => read(solidJs.untrack(durable)));
+    setDurable(() => next);
+    setValue(() => next);
+  };
+  let unsubscribe = null;
+  const attach = () => {
+    unsubscribe ??= solidJs.untrack(() => subscribe(sync));
+  };
+  solidJs.onCleanup(() => unsubscribe?.());
+  solidJs.createEffect(
+    () => void 0,
     () => {
-      const isError = state.isError;
-      const error = state.error;
-      if (isError && queryCore.shouldThrowError(observer.options.throwOnError, [error])) {
-        throw error;
+      if (hydratedMount) {
+        attach();
+        sync();
       }
-    },
-    () => {
     }
   );
-  return state;
+  if (isServer3) return () => empty;
+  if (!hydratedMount) attach();
+  return value;
 }
-function useQueries(queriesOptions, queryClient) {
+
+// src/useIsFetching.ts
+function useIsFetching(filters, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
-  const isRestoring = exports.useIsRestoring();
-  const defaultedQueries = solidJs.createMemo(
-    () => queriesOptions().queries.map(
-      (options) => solidJs.merge(client().defaultQueryOptions(options), {
-        get _optimisticResults() {
-          return isRestoring() ? "isRestoring" : "optimistic";
-        }
-      })
-    )
+  return createCacheAggregate(
+    (onEvent) => client().getQueryCache().subscribe(onEvent),
+    () => client().isFetching(filters?.()),
+    0
   );
-  const observer = solidJs.untrack(
-    () => new queryCore.QueriesObserver(
-      client(),
-      defaultedQueries(),
-      queriesOptions().combine ? {
-        combine: queriesOptions().combine
-      } : void 0
-    )
-  );
-  const [, getCombinedResult] = solidJs.untrack(
-    () => observer.getOptimisticResult(
-      defaultedQueries(),
-      queriesOptions().combine
-    )
-  );
-  const initialResult = getCombinedResult();
-  const [state, setState] = solidJs.createStore(
-    Array.isArray(initialResult) ? initialResult : [initialResult]
+}
+function hasNextPage(options, data) {
+  if (!data || data.pages.length === 0) return false;
+  const lastIndex = data.pages.length - 1;
+  return options.getNextPageParam(
+    data.pages[lastIndex],
+    data.pages,
+    data.pageParams[lastIndex],
+    data.pageParams
+  ) != null;
+}
+function hasPreviousPage(options, data) {
+  if (!data || data.pages.length === 0 || !options.getPreviousPageParam)
+    return false;
+  return options.getPreviousPageParam(
+    data.pages[0],
+    data.pages,
+    data.pageParams[0],
+    data.pageParams
+  ) != null;
+}
+function useInfiniteQuery(options, queryClient) {
+  const layer = useBaseQueryLayer(
+    // `_type` is how query-core stamps a cache entry as infinite
+    // (`Query.setOptions` → `#queryType`), which makes every fetch attach
+    // `infiniteQueryBehavior`. Core only sets it inside
+    // `InfiniteQueryObserver.setOptions`, but the adapter's pull path can
+    // build and fetch the entry first (reactive key change recomputes the
+    // data memo before the deferred observer effect runs) — without the
+    // stamp that fetch would run as a plain query and corrupt the entry.
+    solidJs.createMemo(() => ({ ...options(), _type: "infinite" })),
+    queryCore.InfiniteQueryObserver,
+    queryClient
   );
-  let unsubscribe = queryCore.noop;
-  solidJs.createEffect(
-    () => {
-      if (!isRestoring()) {
-        unsubscribe = observer.subscribe((result) => {
-          solidJs.runWithOwner(null, () => {
-            setState(
-              solidJs.reconcile(
-                [...result],
-                // Use a key function that returns undefined so reconcile
-                // uses positional matching and recursively updates nested properties
-                () => void 0
-              )
-            );
-          });
-        });
+  const observer = layer.observer;
+  const direction = () => layer.query().state.fetchMeta?.fetchMore?.direction;
+  const pageOptions = () => layer.defaultedOptions();
+  const infiniteData = () => layer.query().state.data;
+  const isFetchingNextPage = () => layer.isFetching() && direction() === "forward";
+  const isFetchingPreviousPage = () => layer.isFetching() && direction() === "backward";
+  const isError = () => layer.status() === "error";
+  const result = Object.defineProperties(
+    {},
+    {
+      ...Object.getOwnPropertyDescriptors(layer.result),
+      fetchNextPage: {
+        value: (fetchOptions) => observer.fetchNextPage(fetchOptions),
+        enumerable: true
+      },
+      fetchPreviousPage: {
+        value: (fetchOptions) => observer.fetchPreviousPage(fetchOptions),
+        enumerable: true
+      },
+      hasNextPage: {
+        get: () => hasNextPage(pageOptions(), infiniteData()),
+        enumerable: true
+      },
+      hasPreviousPage: {
+        get: () => hasPreviousPage(pageOptions(), infiniteData()),
+        enumerable: true
+      },
+      isFetchingNextPage: {
+        get: isFetchingNextPage,
+        enumerable: true
+      },
+      isFetchingPreviousPage: {
+        get: isFetchingPreviousPage,
+        enumerable: true
+      },
+      isFetchNextPageError: {
+        get: () => isError() && direction() === "forward",
+        enumerable: true
+      },
+      isFetchPreviousPageError: {
+        get: () => isError() && direction() === "backward",
+        enumerable: true
+      },
+      isRefetching: {
+        get: () => layer.isFetching() && layer.status() !== "pending" && !isFetchingNextPage() && !isFetchingPreviousPage(),
+        enumerable: true
+      },
+      isRefetchError: {
+        get: () => {
+          const errored = isError() && layer.query().state.dataUpdatedAt !== 0;
+          return errored && direction() === void 0;
+        },
+        enumerable: true
       }
-    },
-    () => {
     }
   );
-  solidJs.onCleanup(() => {
-    unsubscribe();
-  });
-  solidJs.createMemo(() => {
-    const queries = defaultedQueries();
-    solidJs.runWithOwner(null, () => {
-      observer.setQueries(
-        queries,
-        queriesOptions().combine ? {
-          combine: queriesOptions().combine
-        } : void 0
-      );
-    });
-    return queries;
-  });
-  return state;
+  return result;
 }
-exports.QueryClient = class QueryClient extends queryCore.QueryClient {
-  constructor(config = {}) {
-    super(config);
-  }
-};
 
-// src/queryOptions.ts
-function queryOptions(options) {
+// src/infiniteQueryOptions.ts
+function infiniteQueryOptions(options) {
   return options;
 }
-function useIsFetching(filters, queryClient) {
+var isServer4 = typeof window === "undefined";
+var IDLE = {
+  status: "idle",
+  data: void 0,
+  error: null,
+  variables: void 0,
+  submittedAt: 0
+};
+async function drain(iterator) {
+  let input;
+  for (; ; ) {
+    const result = await iterator.next(input);
+    if (result.done) return result.value;
+    input = result.value != null ? await result.value : void 0;
+  }
+}
+function useMutation(options, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
-  const queryCache = solidJs.createMemo(() => client().getQueryCache());
-  const [fetches, setFetches] = solidJs.createSignal(
-    solidJs.untrack(() => client().isFetching(filters?.())),
-    { ownedWrite: true }
-  );
-  const unsubscribe = solidJs.untrack(
-    () => queryCache().subscribe(() => {
-      setFetches(client().isFetching(filters?.()));
-    })
+  const [flight, setFlight] = solidJs.createOptimistic(null);
+  const [settled, setSettled] = solidJs.createSignal(IDLE);
+  let activeMutation = null;
+  let unsubscribeFlight = null;
+  const [flightVersion, setFlightVersion] = solidJs.createSignal(0);
+  if (!isServer4)
+    solidJs.onCleanup(() => {
+      unsubscribeFlight?.();
+      unsubscribeFlight = null;
+    });
+  async function* run(variables) {
+    const opts = solidJs.untrack(options);
+    const callbackContext = {
+      client: solidJs.untrack(client),
+      meta: opts.meta,
+      mutationKey: opts.mutationKey
+    };
+    if (!isServer4) setFlight({ variables });
+    opts.onMutate?.(variables, callbackContext);
+    const c = solidJs.untrack(client);
+    const mutation = c.getMutationCache().build(c, {
+      ...opts,
+      // Options-level callbacks re-run below, inside the transaction —
+      // executing them here (inside the await gap) would let their
+      // cache writes and invalidations escape the atomic settle.
+      onMutate: void 0,
+      onSuccess: void 0,
+      onError: void 0,
+      onSettled: void 0
+    });
+    activeMutation = mutation;
+    if (!isServer4) {
+      unsubscribeFlight?.();
+      unsubscribeFlight = c.getMutationCache().subscribe((event) => {
+        if ("mutation" in event && event.mutation === activeMutation) {
+          setFlightVersion((v) => v + 1);
+        }
+      });
+    }
+    const settleFlight = () => {
+      if (activeMutation !== mutation) return;
+      activeMutation = null;
+      unsubscribeFlight?.();
+      unsubscribeFlight = null;
+    };
+    async function* settleFailure(error) {
+      try {
+        if (opts.onError)
+          yield opts.onError(error, variables, void 0, callbackContext);
+      } catch (callbackError) {
+        void Promise.reject(callbackError);
+      }
+      try {
+        if (opts.onSettled)
+          yield opts.onSettled(
+            void 0,
+            error,
+            variables,
+            void 0,
+            callbackContext
+          );
+      } catch (callbackError) {
+        void Promise.reject(callbackError);
+      }
+      if (!isServer4)
+        setSettled({
+          status: "error",
+          data: void 0,
+          error,
+          variables,
+          submittedAt: mutation.state.submittedAt
+        });
+      settleFlight();
+      throw error;
+    }
+    let result2;
+    try {
+      result2 = await mutation.execute(variables);
+    } catch (error) {
+      yield;
+      yield* settleFailure(error);
+      throw error;
+    }
+    yield;
+    try {
+      if (opts.onSuccess)
+        yield opts.onSuccess(
+          result2,
+          variables,
+          void 0,
+          callbackContext
+        );
+      if (opts.onSettled)
+        yield opts.onSettled(
+          result2,
+          null,
+          variables,
+          void 0,
+          callbackContext
+        );
+    } catch (callbackError) {
+      yield* settleFailure(callbackError);
+      throw callbackError;
+    }
+    if (!isServer4)
+      setSettled({
+        status: "success",
+        data: result2,
+        error: null,
+        variables,
+        submittedAt: mutation.state.submittedAt
+      });
+    settleFlight();
+    return result2;
+  }
+  const invoke = isServer4 ? (variables) => drain(run(variables)) : solidJs.action(run);
+  const mutate = (variables) => {
+    const promise = invoke(variables);
+    promise.catch(queryCore.noop);
+    return promise;
+  };
+  const status = () => flight() !== null ? "pending" : settled().status;
+  const isPending = () => flight() !== null;
+  solidJs.createRenderEffect(
+    () => {
+      const state = settled();
+      if (state.status === "error" && queryCore.shouldThrowError(solidJs.untrack(options).throwOnError, [state.error])) {
+        throw state.error;
+      }
+    },
+    () => {
+    }
   );
-  solidJs.onCleanup(unsubscribe);
-  return fetches;
-}
-
-// src/infiniteQueryOptions.ts
-function infiniteQueryOptions(options) {
-  return options;
+  const result = {
+    mutate,
+    get data() {
+      return settled().data;
+    },
+    get error() {
+      return flight() !== null ? null : settled().error;
+    },
+    get variables() {
+      return flight()?.variables ?? settled().variables;
+    },
+    get status() {
+      return status();
+    },
+    get isPending() {
+      return isPending();
+    },
+    get isIdle() {
+      return status() === "idle";
+    },
+    get isSuccess() {
+      return status() === "success";
+    },
+    get isError() {
+      return status() === "error";
+    },
+    get submittedAt() {
+      return flight() !== null ? (flightVersion(), activeMutation?.state.submittedAt ?? 0) : settled().submittedAt;
+    },
+    get failureCount() {
+      flightVersion();
+      return activeMutation?.state.failureCount ?? 0;
+    },
+    get failureReason() {
+      flightVersion();
+      return activeMutation?.state.failureReason ?? null;
+    },
+    get isPaused() {
+      flightVersion();
+      return activeMutation?.state.isPaused ?? false;
+    },
+    reset: () => {
+      setSettled(IDLE);
+    }
+  };
+  return result;
 }
 
 // src/mutationOptions.ts
@@ -609,18 +799,11 @@ function mutationOptions(options) {
 }
 function useIsMutating(filters, queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
-  const mutationCache = solidJs.createMemo(() => client().getMutationCache());
-  const [mutations, setMutations] = solidJs.createSignal(
-    solidJs.untrack(() => client().isMutating(filters?.())),
-    { ownedWrite: true }
-  );
-  const unsubscribe = solidJs.untrack(
-    () => mutationCache().subscribe((_result) => {
-      setMutations(client().isMutating(filters?.()));
-    })
+  return createCacheAggregate(
+    (onEvent) => client().getMutationCache().subscribe(onEvent),
+    () => client().isMutating(filters?.()),
+    0
   );
-  solidJs.onCleanup(unsubscribe);
-  return mutations;
 }
 function getResult(mutationCache, options) {
   return mutationCache.findAll(options.filters).map(
@@ -629,35 +812,57 @@ function getResult(mutationCache, options) {
 }
 function useMutationState(options = () => ({}), queryClient) {
   const client = solidJs.createMemo(() => exports.useQueryClient(queryClient?.()));
-  const mutationCache = solidJs.createMemo(() => client().getMutationCache());
-  const [result, setResult] = solidJs.createSignal(
-    solidJs.untrack(() => getResult(mutationCache(), options())),
-    { ownedWrite: true }
-  );
-  const unsubscribe = solidJs.untrack(
-    () => mutationCache().subscribe(() => {
-      setResult((prev) => {
-        const nextResult = queryCore.replaceEqualDeep(
-          prev,
-          getResult(mutationCache(), options())
-        );
-        return prev === nextResult ? prev : nextResult;
-      });
-    })
+  return createCacheAggregate(
+    (onEvent) => client().getMutationCache().subscribe(onEvent),
+    // Structural sharing against the previous committed value keeps
+    // unchanged mutation states referentially stable across syncs.
+    (prev) => queryCore.replaceEqualDeep(prev, getResult(client().getMutationCache(), options())),
+    []
   );
-  solidJs.onCleanup(unsubscribe);
-  return result;
+}
+function useQueries(queriesOptions, queryClient) {
+  const length = solidJs.createMemo(() => queriesOptions().queries.length);
+  const results = solidJs.repeat(length, (index) => {
+    let lastOptions;
+    return useBaseQuery(
+      () => {
+        const next = queriesOptions().queries[index];
+        if (next !== void 0) lastOptions = next;
+        return lastOptions;
+      },
+      queryCore.QueryObserver,
+      queryClient
+    );
+  });
+  const combined = solidJs.createMemo(() => {
+    const combine = queriesOptions().combine;
+    const list = results();
+    return combine ? combine(list) : list;
+  });
+  return new Proxy([], {
+    get(_, prop) {
+      if (prop === solidJs.$TRACK) return combined();
+      return Reflect.get(combined(), prop);
+    },
+    has(_, prop) {
+      if (prop === solidJs.$TRACK) return true;
+      return Reflect.has(combined(), prop);
+    },
+    ownKeys() {
+      return Reflect.ownKeys(combined());
+    },
+    getOwnPropertyDescriptor(_, prop) {
+      const descriptor = Reflect.getOwnPropertyDescriptor(
+        combined(),
+        prop
+      );
+      if (descriptor) descriptor.configurable = true;
+      return descriptor;
+    }
+  });
 }
 
-// src/index.ts
-exports.createQuery = useQuery;
-exports.createInfiniteQuery = useInfiniteQuery;
-exports.createMutation = useMutation;
-exports.createQueries = useQueries;
-
-exports.createIsFetching = useIsFetching;
-exports.createIsMutating = useIsMutating;
-exports.createMutationState = useMutationState;
+exports.dehydrateSettled = dehydrateSettled;
 exports.infiniteQueryOptions = infiniteQueryOptions;
 exports.mutationOptions = mutationOptions;
 exports.queryOptions = queryOptions;