review fix

Author: conico974

.changeset/neat-hornets-call.md

@@ -2,4 +2,4 @@
 "@opennextjs/cloudflare": patch
 ---
 
-Add a new `withFilter` tag cache to allow to filter the tag cache used
+Add a new `withFilter` tag cache to allow to filter the tags used

packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.spec.ts

@@ -20,7 +20,7 @@ describe("withFilter", () => {
 
   it("should filter out tags based on writeTags", async () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn,
     });
 
@@ -32,7 +32,7 @@ describe("withFilter", () => {
 
   it("should not call writeTags if no tags are valid", async () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn,
     });
     const tags = ["invalid_tag"];
@@ -42,7 +42,7 @@ describe("withFilter", () => {
 
   it("should filter out tags based on hasBeenRevalidated", async () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn,
     });
 
@@ -55,7 +55,7 @@ describe("withFilter", () => {
 
   it("should not call hasBeenRevalidated if no tags are valid", async () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn,
     });
     const tags = ["invalid_tag"];
@@ -66,7 +66,7 @@ describe("withFilter", () => {
 
   it("should filter out tags based on getPathsByTags", async () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn,
     });
 
@@ -78,7 +78,7 @@ describe("withFilter", () => {
 
   it("should not call getPathsByTags if no tags are valid", async () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn,
     });
     const tags = ["invalid_tag"];
@@ -88,7 +88,7 @@ describe("withFilter", () => {
 
   it("should return the correct name", () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn,
     });
 
@@ -97,7 +97,7 @@ describe("withFilter", () => {
 
   it("should not create a function if getPathsByTags is not defined", async () => {
     const tagCache = withFilter({
-      originalTagCache: {
+      tagCache: {
         ...mockedTagCache,
         getPathsByTags: undefined,
       },
@@ -107,9 +107,9 @@ describe("withFilter", () => {
     expect(tagCache.getPathsByTags).toBeUndefined();
   });
 
-  it("should properly filter soft tags", () => {
+  it("should filter soft tags", () => {
     const tagCache = withFilter({
-      originalTagCache: mockedTagCache,
+      tagCache: mockedTagCache,
       filterFn: softTagFilter,
     });
 

packages/cloudflare/src/api/overrides/tag-cache/tag-cache-filter.ts

@@ -5,45 +5,45 @@ interface WithFilterOptions {
    * The original tag cache.
    * Call to this will receive only the filtered tags.
    */
-  originalTagCache: NextModeTagCache;
+  tagCache: NextModeTagCache;
   /**
    * The function to filter tags.
    * @param tag The tag to filter.
-   * @returns true if the tag should be forwarde, false otherwise.
+   * @returns true if the tag should be forwarded, false otherwise.
    */
   filterFn: (tag: string) => boolean;
 }
 
 /**
  * Creates a new tag cache that filters tags based on the provided filter function.
- * This is usefult to remove tags that are not used by the app, this could reduce the number of request to the underlying tag cache.
+ * This is useful to remove tags that are not used by the app, this could reduce the number of requests to the underlying tag cache.
  */
-export function withFilter({ originalTagCache, filterFn }: WithFilterOptions): NextModeTagCache {
+export function withFilter({ tagCache, filterFn }: WithFilterOptions): NextModeTagCache {
   return {
-    name: `filtered-${originalTagCache.name}`,
+    name: `filtered-${tagCache.name}`,
     mode: "nextMode",
-    getPathsByTags: originalTagCache.getPathsByTags
+    getPathsByTags: tagCache.getPathsByTags
       ? async (tags) => {
           const filteredTags = tags.filter(filterFn);
           if (filteredTags.length === 0) {
             return [];
           }
-          return originalTagCache.getPathsByTags!(filteredTags);
+          return tagCache.getPathsByTags!(filteredTags);
         }
       : undefined,
     hasBeenRevalidated: async (tags, lastModified) => {
       const filteredTags = tags.filter(filterFn);
       if (filteredTags.length === 0) {
         return false;
       }
-      return originalTagCache.hasBeenRevalidated(filteredTags, lastModified);
+      return tagCache.hasBeenRevalidated(filteredTags, lastModified);
     },
     writeTags: async (tags) => {
       const filteredTags = tags.filter(filterFn);
       if (filteredTags.length === 0) {
         return;
       }
-      return originalTagCache.writeTags(filteredTags);
+      return tagCache.writeTags(filteredTags);
     },
   };
 }