apply a single rule

Author: dario-piotrowicz

packages/cloudflare/src/cli/build/patches/plugins/fetch-cache-wait-until.spec.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "vitest";
 
 import { patchCode } from "../ast/util.js";
-import { ruleForMinifiedCode, ruleForNonMinifiedCode } from "./fetch-cache-wait-until.js";
+import { rule } from "./fetch-cache-wait-until.js";
 
 describe("patchFetchCacheSetMissingWaitUntil", () => {
   test("on minified code", () => {
@@ -15,7 +15,7 @@ describe("patchFetchCacheSetMissingWaitUntil", () => {
   }).catch((e4) => console.warn("Failed to set fetch cache", u4, e4)).finally(X), a2;
 }`;
 
-    expect(patchCode(code, ruleForMinifiedCode)).toMatchInlineSnapshot(`
+    expect(patchCode(code, rule)).toMatchInlineSnapshot(`
       "{
         let [o4, a2] = (0, d2.cloneResponse)(e3);
         globalThis.__openNextAls?.getStore()?.waitUntil?.(o4.arrayBuffer().then(async (e4) => {
@@ -66,7 +66,7 @@ describe("patchFetchCacheSetMissingWaitUntil", () => {
       return cloned2;
     `;
 
-    expect(patchCode(code, ruleForNonMinifiedCode)).toMatchInlineSnapshot(`
+    expect(patchCode(code, rule)).toMatchInlineSnapshot(`
       "// We're cloning the response using this utility because there
             // exists a bug in the undici library around response cloning.
             // See the following pull request for more details:

packages/cloudflare/src/cli/build/patches/plugins/fetch-cache-wait-until.ts

@@ -24,40 +24,21 @@ export function patchFetchCacheSetMissingWaitUntil(updater: ContentUpdater) {
       ),
       contentFilter: /arrayBuffer\(\)\s*\.then/,
     },
-    ({ contents }) => {
-      contents = patchCode(contents, ruleForMinifiedCode);
-      return patchCode(contents, ruleForNonMinifiedCode);
-    }
+    ({ contents }) => patchCode(contents, rule)
   );
 }
 
-export const ruleForMinifiedCode = `
+export const rule = `
 rule:
-  pattern: return $PROMISE, $CLONED2
-  regex: Failed to set fetch cache
-  follows:
-    kind: lexical_declaration
-    pattern: let [$CLONED1, $CLONED2]
+  kind: call_expression
+  pattern: $PROMISE
+  all:
+    - has: { pattern: "$$$_.then($$$_)", stopBy: end }
+    - has: { pattern: "Buffer.from", stopBy: end }
+    - has: { regex: "CachedRouteKind.FETCH" }
+    - has: { regex: "finally(.*?)$" }
 
-fix: |
-  globalThis.__openNextAls?.getStore()?.waitUntil?.($PROMISE);
-  return $CLONED2;
-`;
-
-export const ruleForNonMinifiedCode = `
-rule:
-  regex: Failed to set fetch cache
-  pattern: $PROMISE;
-  follows:
-    kind: comment
-    follows:
-      kind: comment
-      follows:
-        kind: comment
-        follows:
-          kind: lexical_declaration
-          pattern: const [cloned1, cloned2]
 
 fix: |
-  globalThis.__openNextAls?.getStore()?.waitUntil?.($PROMISE);
+  globalThis.__openNextAls.getStore().waitUntil($PROMISE)
 `;