review

Author: conico974

packages/open-next/src/adapters/cache.ts

@@ -7,6 +7,8 @@ import { getTagsFromValue, hasBeenRevalidated, writeTags } from "utils/cache";
 import { isBinaryContentType } from "../utils/binary";
 import { debug, error, warn } from "./logger";
 
+export const SOFT_TAG_PREFIX = "_N_T_/";
+
 function isFetchCache(
   options?:
     | boolean
@@ -75,15 +77,15 @@ export default class Cache {
         // Then we need to find the path for the given key
         const path = softTags?.find(
           (tag) =>
-            tag.startsWith("_N_T_/") &&
+            tag.startsWith(SOFT_TAG_PREFIX) &&
             !tag.endsWith("layout") &&
             !tag.endsWith("page"),
         );
         if (path) {
           const hasPathBeenUpdated = cachedEntry.shouldBypassTagCache
             ? false
             : await hasBeenRevalidated(
-                path.replace("_N_T_/", ""),
+                path.replace(SOFT_TAG_PREFIX, ""),
                 [],
                 cachedEntry,
               );
@@ -356,11 +358,11 @@ export default class Cache {
         }));
 
         // If the tag is a soft tag, we should also revalidate the hard tags
-        if (tag.startsWith("_N_T_/")) {
+        if (tag.startsWith(SOFT_TAG_PREFIX)) {
           for (const path of paths) {
             // We need to find all hard tags for a given path
             const _tags = await globalThis.tagCache.getByPath(path);
-            const hardTags = _tags.filter((t) => !t.startsWith("_N_T_/"));
+            const hardTags = _tags.filter((t) => !t.startsWith(SOFT_TAG_PREFIX));
             // For every hard tag, we need to find all paths and revalidate them
             for (const hardTag of hardTags) {
               const _paths = await globalThis.tagCache.getByTag(hardTag);
@@ -384,7 +386,7 @@ export default class Cache {
           new Set(
             toInsert
               // We need to filter fetch cache key as they are not in the CDN
-              .filter((t) => t.tag.startsWith("_N_T_/"))
+              .filter((t) => t.tag.startsWith(SOFT_TAG_PREFIX))
               .map((t) => `/${t.path}`),
           ),
         );

packages/tests-unit/tests/adapters/cache.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable sonarjs/no-duplicate-string */
-import Cache from "@opennextjs/aws/adapters/cache.js";
+import Cache, {SOFT_TAG_PREFIX} from "@opennextjs/aws/adapters/cache.js";
 import { vi } from "vitest";
 
 declare global {
@@ -553,13 +553,13 @@ describe("CacheHandler", () => {
     it("Should call invalidateCdnHandler.invalidatePaths", async () => {
       globalThis.tagCache.getByTag.mockResolvedValueOnce(["/path"]);
       globalThis.tagCache.getByPath.mockResolvedValueOnce([]);
-      await cache.revalidateTag("_N_T_/path");
+      await cache.revalidateTag(`${SOFT_TAG_PREFIX}path`);
 
       expect(tagCache.writeTags).toHaveBeenCalledTimes(1);
       expect(tagCache.writeTags).toHaveBeenCalledWith([
         {
           path: "/path",
-          tag: "_N_T_/path",
+          tag: `${SOFT_TAG_PREFIX}path`,
         },
       ]);
 
@@ -731,7 +731,7 @@ describe("CacheHandler", () => {
 
         const result = await cache.get("key", {
           kind: "FETCH",
-          softTags: ["_N_T_/path"],
+          softTags: [`${SOFT_TAG_PREFIX}path`],
         });
 
         expect(getFetchCacheSpy).toHaveBeenCalled();