review fix

Author: conico974

.changeset/grumpy-dingos-pretend.md

@@ -3,3 +3,31 @@
 ---
 
 Bump aws to 3.6.0
+
+Introduce support for the composable cache
+
+BREAKING CHANGE: The interface for the Incremental cache has changed. The new interface use a Cache type instead of a boolean to distinguish between the different types of caches. It also includes a new Cache type for the composable cache. The new interface is as follows:
+
+```ts
+export type CacheEntryType = "cache" | "fetch" | "composable";
+
+export type IncrementalCache = {
+  get<CacheType extends CacheEntryType = "cache">(
+    key: string,
+    cacheType?: CacheType,
+  ): Promise<WithLastModified<CacheValue<CacheType>> | null>;
+  set<CacheType extends CacheEntryType = "cache">(
+    key: string,
+    value: CacheValue<CacheType>,
+    isFetch?: CacheType,
+  ): Promise<void>;
+  delete(key: string): Promise<void>;
+  name: string;
+};
+```
+
+NextModeTagCache also get a new function `getLastRevalidated` used for the composable cache: 
+
+```ts
+  getLastRevalidated(tags: string[]): Promise<number>;
+```

packages/cloudflare/src/api/durable-objects/sharded-tag-cache.ts

@@ -15,13 +15,13 @@ export class DOShardedTagCache extends DurableObject<CloudflareEnv> {
     try {
       const result = this.sql
         .exec(
-          `SELECT revalidatedAt FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) ORDER BY revalidatedAt DESC LIMIT 1`,
+          `SELECT MAX(revalidatedAt) AS time FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")})`,
           ...tags
         )
         .toArray();
       if (result.length === 0) return 0;
       // We only care about the most recent revalidation
-      return result[0]?.revalidatedAt as number;
+      return result[0]?.time as number;
     } catch (e) {
       console.error(e);
       // By default we don't want to crash here, so we return 0

packages/cloudflare/src/api/overrides/tag-cache/d1-next-tag-cache.ts

@@ -19,13 +19,13 @@ export class D1NextModeTagCache implements NextModeTagCache {
     try {
       const result = await db
         .prepare(
-          `SELECT revalidatedAt FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")}) ORDER BY revalidatedAt DESC LIMIT 1`
+          `SELECT MAX(revalidatedAt) AS time FROM revalidations WHERE tag IN (${tags.map(() => "?").join(", ")})`
         )
         .run();
 
       if (result.results.length === 0) return 0;
       // We only care about the most recent revalidation
-      return (result.results[0]?.revalidatedAt ?? 0) as number;
+      return (result.results[0]?.time ?? 0) as number;
     } catch (e) {
       error(e);
       // By default we don't want to crash here, so we return false

packages/cloudflare/src/cli/build/patches/investigated/patch-cache.ts

@@ -34,7 +34,7 @@ CacheHandler = require('${normalizePath(cacheFile)}').default;
 export async function patchComposableCache(code: string, buildOpts: BuildOptions): Promise<string> {
   const { outputDir } = buildOpts;
 
-  // TODO: switch to cache.mjs
+  // TODO: switch to mjs
   const outputPath = path.join(outputDir, "server-functions/default");
   const cacheFile = path.join(outputPath, getPackagePath(buildOpts), "composable-cache.cjs");
   //TODO: Do we want to move this to the new CodePatcher ?