fix: import

psteinroe · Sep 12, 2023 · f80f8a4 · f80f8a4
1 parent b474b26
commit f80f8a4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/.changeset/rotten-rings-listen.md b/.changeset/rotten-rings-listen.md
@@ -0,0 +1,6 @@
+---
+"@supabase-cache-helpers/postgrest-react-query": patch
+"@supabase-cache-helpers/postgrest-swr": patch
+---
+
+fix: use new exports from core package
diff --git a/packages/postgrest-react-query/src/lib/use-queries-for-table-loader.ts b/packages/postgrest-react-query/src/lib/use-queries-for-table-loader.ts
@@ -1,4 +1,4 @@
-import { BuildQueryOps } from '@supabase-cache-helpers/postgrest-core';
+import { BuildNormalizedQueryOps } from '@supabase-cache-helpers/postgrest-core';
 import { useQueryClient } from '@tanstack/react-query';
 
 import { decode } from './key';
@@ -13,11 +13,14 @@ export const useQueriesForTableLoader = (table: string) => {
       .getQueryCache()
       .getAll()
       .map((c) => c.queryKey)
-      .reduce<ReturnType<BuildQueryOps['queriesForTable']>>((prev, curr) => {
-        const decodedKey = decode(curr);
-        if (decodedKey?.table === table) {
-          prev.push(getPostgrestFilter(decodedKey.queryKey).params);
-        }
-        return prev;
-      }, []);
+      .reduce<ReturnType<BuildNormalizedQueryOps['queriesForTable']>>(
+        (prev, curr) => {
+          const decodedKey = decode(curr);
+          if (decodedKey?.table === table) {
+            prev.push(getPostgrestFilter(decodedKey.queryKey).params);
+          }
+          return prev;
+        },
+        []
+      );
 };
diff --git a/packages/postgrest-react-query/src/subscribe/use-subscription-query.ts b/packages/postgrest-react-query/src/subscribe/use-subscription-query.ts
@@ -1,5 +1,5 @@
 import {
-  buildQuery,
+  buildNormalizedQuery,
   PostgrestMutatorOpts,
 } from '@supabase-cache-helpers/postgrest-core';
 import { GetResult } from '@supabase/postgrest-js/dist/module/select-query-parser';
@@ -105,7 +105,7 @@ function useSubscriptionQuery<
         filter,
         async (payload) => {
           let data: T['Row'] | R = payload.new ?? payload.old;
-          const selectQuery = buildQuery({ queriesForTable, query });
+          const selectQuery = buildNormalizedQuery({ queriesForTable, query });
           if (
             payload.eventType !==
               REALTIME_POSTGRES_CHANGES_LISTEN_EVENT.DELETE &&

diff --git a/packages/postgrest-swr/src/lib/use-queries-for-table-loader.ts b/packages/postgrest-swr/src/lib/use-queries-for-table-loader.ts
@@ -1,4 +1,4 @@
-import { BuildQueryOps } from '@supabase-cache-helpers/postgrest-core';
+import { BuildNormalizedQueryOps } from '@supabase-cache-helpers/postgrest-core';
 import { useSWRConfig } from 'swr';
 
 import { decode } from './decode';
@@ -10,7 +10,7 @@ export const useQueriesForTableLoader = (table: string) => {
 
   return () =>
     Array.from(cache.keys()).reduce<
-      ReturnType<BuildQueryOps['queriesForTable']>
+      ReturnType<BuildNormalizedQueryOps['queriesForTable']>
     >((prev, curr) => {
       const decodedKey = decode(curr);
       if (decodedKey?.table === table) {

diff --git a/packages/postgrest-swr/src/subscribe/use-subscription-query.ts b/packages/postgrest-swr/src/subscribe/use-subscription-query.ts
@@ -1,5 +1,5 @@
 import {
-  buildQuery,
+  buildNormalizedQuery,
   PostgrestMutatorOpts,
   QueryWithoutWildcard,
 } from '@supabase-cache-helpers/postgrest-core';
@@ -108,7 +108,7 @@ function useSubscriptionQuery<
         filter,
         async (payload) => {
           let data: T['Row'] | R = payload.new ?? payload.old;
-          const selectQuery = buildQuery({ queriesForTable, query });
+          const selectQuery = buildNormalizedQuery({ queriesForTable, query });
           if (
             payload.eventType !==
               REALTIME_POSTGRES_CHANGES_LISTEN_EVENT.DELETE &&