New cache revalidation system

app/(api)/_actions/handleApolloRequest.ts

@@ -1,13 +1,10 @@
 'use server';
 
-import { revalidatePath, revalidateTag } from 'next/cache';
-
 import handler from '@datalib/apolloServer';
 
 export default async function handleApolloRequest(
   query: string,
-  variables: object,
-  revalidateCache?: { path?: string; type?: 'page' | 'layout'; tag?: string }
+  variables: object
 ) {
   const headers = {
     'Content-Type': 'application/json',
@@ -25,12 +22,5 @@ export default async function handleApolloRequest(
 
   const res = await handler(req);
 
-  if (revalidateCache?.path) {
-    revalidatePath(revalidateCache.path, revalidateCache.type);
-  }
-  if (revalidateCache?.tag) {
-    revalidateTag(revalidateCache.tag);
-  }
-
   return res.json();
 }

app/(api)/_actions/revalidateCache.ts

@@ -0,0 +1,12 @@
+'use server';
+
+import { revalidatePath } from 'next/cache';
+import revalidationPaths, { RevalidationKey } from '@cache/revalidationPaths';
+
+export default async function revalidateCache(keys: RevalidationKey[]) {
+  for (const key of keys) {
+    for (const path of revalidationPaths[key]) {
+      revalidatePath(path);
+    }
+  }
+}

app/(api)/_cache/revalidationPaths.ts

@@ -0,0 +1,9 @@
+export type RevalidationKey = 'users' | 'playlists' | 'songs';
+
+const revalidationPaths = {
+  users: ['/'],
+  playlists: ['/'],
+  songs: ['/'],
+};
+
+export default revalidationPaths;

app/(api)/_datalib/_services/Playlists.ts

@@ -1,5 +1,6 @@
 import prisma from '../_prisma/client';
 import { PlaylistInput } from '@datatypes/Playlist';
+import revalidateCache from '@actions/revalidateCache';
 
 export default class Playlists {
   // CREATE
@@ -11,6 +12,7 @@ export default class Playlists {
         name,
       },
     });
+    revalidateCache(['playlists']);
     return playlist;
   }
 
@@ -32,6 +34,7 @@ export default class Playlists {
           songId,
         },
       });
+      revalidateCache(['playlists', 'songs']);
       return true;
     } catch (e) {
       return false;
@@ -54,7 +57,7 @@ export default class Playlists {
         },
       },
     });
-
+    revalidateCache(['playlists', 'songs']);
     return songs;
   }
 }

app/(api)/_datalib/_services/Songs.ts

@@ -1,5 +1,6 @@
 import prisma from '../_prisma/client';
 import { SongInput } from '@datatypes/Song';
+import revalidateCache from '@actions/revalidateCache';
 
 export default class Songs {
   // CREATE
@@ -10,6 +11,7 @@ export default class Songs {
         name,
       },
     });
+    revalidateCache(['songs']);
     return song;
   }
 

app/(api)/_datalib/_services/Users.ts

@@ -1,5 +1,6 @@
 import { UserInput } from '@datatypes/User';
 import prisma from '../_prisma/client';
+import revalidateCache from '@actions/revalidateCache';
 
 export default class Users {
   // CREATE
@@ -10,6 +11,7 @@ export default class Users {
         name,
       },
     });
+    revalidateCache(['users']);
     return user;
   }
 
@@ -42,6 +44,7 @@ export default class Users {
         },
         data: input,
       });
+      revalidateCache(['users']);
       return user;
     } catch (e) {
       return null;
@@ -56,6 +59,7 @@ export default class Users {
           id,
         },
       });
+      revalidateCache(['users']);
       return true;
     } catch (e) {
       return false;

app/(pages)/_utils/sendApolloRequest.ts

@@ -4,8 +4,7 @@ import handleApolloRequest from '@actions/handleApolloRequest';
 
 export default async function sendApolloRequest(
   query: DocumentNode,
-  variables: object,
-  revalidateCache?: { path?: string; type?: 'page' | 'layout'; tag?: string }
+  variables: object
 ) {
-  return handleApolloRequest(print(query), variables, revalidateCache);
+  return handleApolloRequest(print(query), variables);
 }

app/(pages)/graphql-example/_components/Example/ExampleClientComponent.tsx

@@ -16,9 +16,9 @@ const query = gql`
 // Example IDs
 const variables = {
   ids: [
-    '7bae85c0-7862-4d8e-b991-41c73d51936d',
-    '9e327de1-38f1-4324-9427-48ec9a670ca3',
-    '47ca283a-2178-4760-814f-7f847f580af3',
+    // '7bae85c0-7862-4d8e-b991-41c73d51936d',
+    // '9e327de1-38f1-4324-9427-48ec9a670ca3',
+    // '47ca283a-2178-4760-814f-7f847f580af3',
   ],
 };
 

app/(pages)/graphql-example/_components/Example/ExampleServerComponent.tsx

@@ -13,9 +13,9 @@ const query = gql`
 // Example IDs
 const variables = {
   ids: [
-    '7bae85c0-7862-4d8e-b991-41c73d51936d',
-    '9e327de1-38f1-4324-9427-48ec9a670ca3',
-    '47ca283a-2178-4760-814f-7f847f580af3',
+    // '7bae85c0-7862-4d8e-b991-41c73d51936d',
+    // '9e327de1-38f1-4324-9427-48ec9a670ca3',
+    // '47ca283a-2178-4760-814f-7f847f580af3',
   ],
 };
 

tsconfig.json

@@ -29,6 +29,7 @@
     "@actions/*": ["./app/(api)/_actions/*"],
     "@datalib/*": ["./app/(api)/_datalib/*"],
     "@datatypes/*": ["./app/(api)/_types/*"],
+    "@cache/*": ["./app/(api)/_cache/*"],
     }
   },
   "include": ["nextEnv.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],