fix: swr types

psteinroe · Jul 5, 2023 · 07ecafd · 07ecafd
1 parent 7b77145
commit 07ecafd
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 32 deletions.
diff --git a/.changeset/shy-islands-breathe.md b/.changeset/shy-islands-breathe.md
@@ -0,0 +1,5 @@
+---
+"@supabase-cache-helpers/postgrest-swr": patch
+---
+
+fix: swr types
diff --git a/packages/postgrest-swr/package.json b/packages/postgrest-swr/package.json
@@ -47,7 +47,7 @@
     "directory": "packages/postgrest-swr"
   },
   "peerDependencies": {
-    "swr": "^2.0.0",
+    "swr": "^2.2.0",
     "react": "^16.11.0 || ^17.0.0 || ^18.0.0",
     "@supabase/postgrest-js": "^1.0.0"
   },

diff --git a/packages/postgrest-swr/src/lib/middleware.ts b/packages/postgrest-swr/src/lib/middleware.ts
@@ -1,6 +1,5 @@
 import { PostgrestParser } from '@supabase-cache-helpers/postgrest-filter';
 import { isPostgrestBuilder } from '@supabase-cache-helpers/postgrest-shared';
-import { BareFetcher, Key, Middleware, SWRConfiguration, SWRHook } from 'swr';
 import {
   SWRInfiniteConfiguration,
   SWRInfiniteFetcher,
@@ -10,26 +9,6 @@ import {
 
 import { encode } from './encode';
 
-export const middleware: Middleware = <Result>(useSWRNext: SWRHook) => {
-  return (
-    key: Key,
-    fetcher: BareFetcher<Result> | null,
-    config: SWRConfiguration
-  ) => {
-    if (!fetcher) throw new Error('No fetcher provided');
-
-    if (key !== null && !isPostgrestBuilder<Result>(key)) {
-      throw new Error('Key is not a PostgrestBuilder');
-    }
-
-    return useSWRNext(
-      key ? encode(new PostgrestParser<Result>(key), false) : null,
-      () => fetcher(key),
-      config
-    );
-  };
-};
-
 export const infiniteMiddleware = <Result>(
   useSWRInfiniteNext: SWRInfiniteHook
 ) => {

diff --git a/packages/postgrest-swr/src/mutate/types.ts b/packages/postgrest-swr/src/mutate/types.ts
@@ -70,6 +70,6 @@ export type UsePostgrestSWRMutationOpts<
   SWRMutationConfiguration<
     GetReturnType<S, T, Relationships, O, Q, R>,
     PostgrestError,
-    GetInputType<T, O>,
-    string
+    string,
+    GetInputType<T, O>
   > & { disableAutoQuery?: boolean } & GetFetcherOptions<S, T, O>;
diff --git a/packages/postgrest-swr/src/mutate/use-delete-mutation.ts b/packages/postgrest-swr/src/mutate/use-delete-mutation.ts
@@ -36,7 +36,7 @@ function useDeleteMutation<
   primaryKeys: (keyof T['Row'])[],
   query?: QueryWithoutWildcard<Q> | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'DeleteOne', Q, R>
-): SWRMutationResponse<R | null, PostgrestError, Partial<T['Row']>> {
+): SWRMutationResponse<R | null, PostgrestError, string, Partial<T['Row']>> {
   const key = useRandomKey();
   const queriesForTable = useQueriesForTableLoader(getTable(qb));
   const deleteItem = useDeleteItem({

diff --git a/packages/postgrest-swr/src/mutate/use-insert-mutation.ts b/packages/postgrest-swr/src/mutate/use-insert-mutation.ts
@@ -37,7 +37,7 @@ function useInsertMutation<
   primaryKeys: (keyof T['Row'])[],
   query?: QueryWithoutWildcard<Q> | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'Insert', Q, R>
-): SWRMutationResponse<R[] | null, PostgrestError, T['Insert'][]> {
+): SWRMutationResponse<R[] | null, PostgrestError, string, T['Insert'][]> {
   const key = useRandomKey();
   const queriesForTable = useQueriesForTableLoader(getTable(qb));
   const upsertItem = useUpsertItem({

diff --git a/packages/postgrest-swr/src/mutate/use-update-mutation.ts b/packages/postgrest-swr/src/mutate/use-update-mutation.ts
@@ -36,7 +36,7 @@ function useUpdateMutation<
   primaryKeys: (keyof T['Row'])[],
   query?: QueryWithoutWildcard<Q> | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'UpdateOne', Q, R>
-): SWRMutationResponse<R | null, PostgrestError, T['Update']> {
+): SWRMutationResponse<R | null, PostgrestError, string, T['Update']> {
   const key = useRandomKey();
   const queriesForTable = useQueriesForTableLoader(getTable(qb));
   const upsertItem = useUpsertItem({

diff --git a/packages/postgrest-swr/src/mutate/use-upsert-mutation.ts b/packages/postgrest-swr/src/mutate/use-upsert-mutation.ts
@@ -37,7 +37,7 @@ function useUpsertMutation<
   primaryKeys: (keyof T['Row'])[],
   query?: QueryWithoutWildcard<Q> | null,
   opts?: UsePostgrestSWRMutationOpts<S, T, Re, 'Upsert', Q, R>
-): SWRMutationResponse<R[] | null, PostgrestError, T['Insert'][], string> {
+): SWRMutationResponse<R[] | null, PostgrestError, string, T['Insert'][]> {
   const key = useRandomKey();
   const queriesForTable = useQueriesForTableLoader(getTable(qb));
   const upsertItem = useUpsertItem({

diff --git a/packages/postgrest-swr/src/query/use-query.ts b/packages/postgrest-swr/src/query/use-query.ts
@@ -1,3 +1,4 @@
+import { PostgrestParser } from '@supabase-cache-helpers/postgrest-filter';
 import {
   AnyPostgrestResponse,
   isPostgrestBuilder,
@@ -10,7 +11,7 @@ import {
 } from '@supabase/postgrest-js';
 import useSWR, { SWRConfiguration, SWRResponse } from 'swr';
 
-import { middleware } from '../lib';
+import { encode } from '../lib';
 
 /**
  * The return type of `useQuery` for `.single()` record results
@@ -112,7 +113,25 @@ function useQuery<Result>(
     },
     {
       ...config,
-      use: [...(config?.use ?? []), middleware],
+      use: [
+        ...(config?.use ?? []),
+        (useSWRNext) => {
+          return (key, fetcher, config) => {
+            if (!fetcher) throw new Error('No fetcher provided');
+
+            if (key !== null && !isPostgrestBuilder<Result>(key)) {
+              throw new Error('Key is not a PostgrestBuilder');
+            }
+
+            // eslint-disable-next-line react-hooks/rules-of-hooks
+            return useSWRNext(
+              key ? encode(new PostgrestParser<Result>(key), false) : null,
+              () => fetcher(key),
+              config
+            );
+          };
+        },
+      ],
     }
   );
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml