fix

Author: panteliselef

packages/shared/src/react/hooks/createCacheKeys.ts

@@ -11,8 +11,6 @@ export function createCacheKeys<
   authenticated: boolean;
   tracked: T;
   untracked: U extends { args: Params } ? U : never;
-
-  //U extends undefined ? never : U extends { args: Params } ? U['args'] : never;
 }) {
   return {
     queryKey: [params.stablePrefix, params.authenticated, params.tracked, params.untracked] as const,

packages/shared/src/react/hooks/usePageOrInfinite.types.ts

@@ -4,39 +4,6 @@ export type ArrayType<DataArray> = DataArray extends Array<infer ElementType> ?
 
 export type ExtractData<Type> = Type extends { data: infer Data } ? ArrayType<Data> : Type;
 
-// export type UsePagesOrInfiniteSignature = <
-//   Params extends PagesOrInfiniteOptions,
-//   FetcherReturnData extends Record<string, any>,
-//   TCacheKeys extends {
-//     stableKey: string;
-//     trackedKeys: {
-//       [key: string]: unknown;
-//       args?: Record<string, unknown>;
-//     };
-//     untrackedKeys: {
-//       [key: string]: unknown;
-//       args?: Record<string, unknown>;
-//     };
-//   },
-//   CacheKeys extends Record<string, unknown> = Record<string, unknown>,
-//   TConfig extends PagesOrInfiniteConfig = PagesOrInfiniteConfig,
-// >(
-//   /**
-//    * The parameters will be passed to the fetcher.
-//    */
-//   params: Params,
-//   /**
-//    * A Promise returning function to fetch your data.
-//    */
-//   fetcher: ((p: Params) => FetcherReturnData | Promise<FetcherReturnData>) | undefined,
-//   acacheKeys: TCacheKeys,
-//   /**
-//    * Internal configuration of the hook.
-//    */
-//   config: TConfig,
-//   cacheKeys: CacheKeys,
-// ) => PaginatedResources<ExtractData<FetcherReturnData>, TConfig['infinite']>;
-
 type Config = PagesOrInfiniteConfig & PagesOrInfiniteOptions;
 
 interface Register {
@@ -76,26 +43,9 @@ export type UsePagesOrInfiniteSignature = <
     invalidationKey: AnyQueryKey;
     stableKey: string;
   },
-  // CacheKeys extends Record<string, unknown> = Record<string, unknown>,
   TConfig extends Config = Config,
->(
-  // /**
-  //  * The parameters will be passed to the fetcher.
-  //  */
-  // params: Params,
-  // /**
-  //  * A Promise returning function to fetch your data.
-  //  */
-  // fetcher: ((p: Params) => FetcherReturnData | Promise<FetcherReturnData>) | undefined,
-  // acacheKeys: TCacheKeys,
-  // /**
-  //  * Internal configuration of the hook.
-  //  */
-  // config: TConfig,
-  // cacheKeys: CacheKeys,
-  params: {
-    fetcher: ((p: Params) => FetcherReturnData | Promise<FetcherReturnData>) | undefined;
-    config: TConfig;
-    keys: TCacheKeys;
-  },
-) => PaginatedResources<ExtractData<FetcherReturnData>, TConfig['infinite']>;
+>(params: {
+  fetcher: ((p: Params) => FetcherReturnData | Promise<FetcherReturnData>) | undefined;
+  config: TConfig;
+  keys: TCacheKeys;
+}) => PaginatedResources<ExtractData<FetcherReturnData>, TConfig['infinite']>;

packages/shared/src/react/hooks/usePagesOrInfinite.rq.tsx

@@ -72,8 +72,6 @@ export const usePagesOrInfinite: UsePagesOrInfiniteSignature = params => {
         return undefined as any;
       }
 
-      // Why do we need this ? can we just specify which `args` to use in the key ?
-      // const requestParams = getDifferentKeys(key, cacheKeys);
       return fetcher(args);
     },
     staleTime: 60_000,
@@ -116,14 +114,14 @@ export const usePagesOrInfinite: UsePagesOrInfiniteSignature = params => {
     const isNowSignedOut = isSignedIn === false;
 
     if (previousIsSignedIn && isNowSignedOut) {
-      // Clear ALL queries matching the base query keys (including old userId)
-      // Use predicate to match queries that start with 'clerk-pages' or 'clerk-pages-infinite'
-
       queryClient.removeQueries({
         predicate: query => {
-          const key = query.queryKey;
-          // Clear all queries that are marked as authenticated
-          return Array.isArray(key) && key[1] === true;
+          const [stablePrefix, authenticated] = query.queryKey;
+          return (
+            authenticated === true &&
+            typeof stablePrefix === 'string' &&
+            (stablePrefix === keys.queryKey[0] || stablePrefix === keys.queryKey[0] + '-inf')
+          );
         },
       });