@opennextjs/cloudflare 1.2.1 → 1.3.1

package/dist/cli/args.d.ts

@@ -1,3 +1,4 @@
+import type { ParseArgsConfig } from "node:util";
 import type { WranglerTarget } from "./utils/run-wrangler.js";
 export type Arguments = ({
     command: "build";
@@ -17,3 +18,4 @@ export type Arguments = ({
     outputDir?: string;
 };
 export declare function getArgs(): Arguments;
+export declare function getPassthroughArgs<T extends ParseArgsConfig>(args: string[], { options }: T): string[];

package/dist/cli/args.js

@@ -2,28 +2,30 @@ import { mkdirSync, statSync } from "node:fs";
 import { resolve } from "node:path";
 import { parseArgs } from "node:util";
 import { getWranglerEnvironmentFlag, isWranglerTarget } from "./utils/run-wrangler.js";
+// Config for parsing CLI arguments
+const config = {
+    allowPositionals: true,
+    strict: false,
+    options: {
+        skipBuild: { type: "boolean", short: "s", default: false },
+        output: { type: "string", short: "o" },
+        noMinify: { type: "boolean", default: false },
+        skipWranglerConfigCheck: { type: "boolean", default: false },
+        cacheChunkSize: { type: "string" },
+    },
+};
 export function getArgs() {
-    const { positionals, values } = parseArgs({
-        options: {
-            skipBuild: { type: "boolean", short: "s", default: false },
-            output: { type: "string", short: "o" },
-            noMinify: { type: "boolean", default: false },
-            skipWranglerConfigCheck: { type: "boolean", default: false },
-            cacheChunkSize: { type: "string" },
-        },
-        allowPositionals: true,
-    });
-    const outputDir = values.output ? resolve(values.output) : undefined;
+    const { positionals, values } = parseArgs(config);
+    const outputDir = typeof values.output === "string" ? resolve(values.output) : undefined;
     if (outputDir)
         assertDirArg(outputDir, "output", true);
-    const passthroughArgs = getPassthroughArgs();
     switch (positionals[0]) {
         case "build":
             return {
                 command: "build",
                 outputDir,
-                skipNextBuild: values.skipBuild || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD)),
-                skipWranglerConfigCheck: values.skipWranglerConfigCheck ||
+                skipNextBuild: !!values.skipBuild || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD)),
+                skipWranglerConfigCheck: !!values.skipWranglerConfigCheck ||
                     ["1", "true", "yes"].includes(String(process.env.SKIP_WRANGLER_CONFIG_CHECK)),
                 minify: !values.noMinify,
             };
@@ -33,7 +35,7 @@ export function getArgs() {
             return {
                 command: positionals[0],
                 outputDir,
-                passthroughArgs,
+                passthroughArgs: getPassthroughArgs(process.argv, config),
                 ...(values.cacheChunkSize && { cacheChunkSize: Number(values.cacheChunkSize) }),
             };
         case "populateCache":
@@ -44,16 +46,32 @@ export function getArgs() {
                 command: "populateCache",
                 outputDir,
                 target: positionals[1],
-                environment: getWranglerEnvironmentFlag(passthroughArgs),
+                environment: getWranglerEnvironmentFlag(process.argv),
                 ...(values.cacheChunkSize && { cacheChunkSize: Number(values.cacheChunkSize) }),
             };
         default:
             throw new Error("Error: invalid command, expected 'build' | 'preview' | 'deploy' | 'upload' | 'populateCache'");
     }
 }
-function getPassthroughArgs() {
-    const passthroughPos = process.argv.indexOf("--");
-    return passthroughPos === -1 ? [] : process.argv.slice(passthroughPos + 1);
+export function getPassthroughArgs(args, { options = {} }) {
+    const passthroughArgs = [];
+    for (let i = 0; i < args.length; i++) {
+        if (args[i] === "--") {
+            passthroughArgs.push(...args.slice(i + 1));
+            return passthroughArgs;
+        }
+        // look for `--arg(=value)`, `-arg(=value)`
+        const [, name] = /^--?(\w[\w-]*)(=.+)?$/.exec(args[i]) ?? [];
+        if (name && !(name in options)) {
+            passthroughArgs.push(args[i]);
+            // Array args can have multiple values
+            // ref https://github.com/yargs/yargs-parser/blob/main/README.md#greedy-arrays
+            while (i < args.length - 1 && !args[i + 1]?.startsWith("-")) {
+                passthroughArgs.push(args[++i]);
+            }
+        }
+    }
+    return passthroughArgs;
 }
 function assertDirArg(path, argName, make) {
     let dirStats;

package/dist/cli/build/build.d.ts

@@ -1,4 +1,4 @@
-import { BuildOptions } from "@opennextjs/aws/build/helper.js";
+import * as buildHelper from "@opennextjs/aws/build/helper.js";
 import { OpenNextConfig } from "../../api/config.js";
 import type { ProjectOptions } from "../project-options.js";
 /**
@@ -10,4 +10,4 @@ import type { ProjectOptions } from "../project-options.js";
  * @param config The OpenNext config
  * @param projectOpts The options for the project
  */
-export declare function build(options: BuildOptions, config: OpenNextConfig, projectOpts: ProjectOptions): Promise<void>;
+export declare function build(options: buildHelper.BuildOptions, config: OpenNextConfig, projectOpts: ProjectOptions): Promise<void>;

package/dist/cli/build/build.js

@@ -8,6 +8,7 @@ import logger from "@opennextjs/aws/logger.js";
 import { bundleServer } from "./bundle-server.js";
 import { compileCacheAssetsManifestSqlFile } from "./open-next/compile-cache-assets-manifest.js";
 import { compileEnvFiles } from "./open-next/compile-env-files.js";
+import { compileImages } from "./open-next/compile-images.js";
 import { compileInit } from "./open-next/compile-init.js";
 import { compileDurableObjects } from "./open-next/compileDurableObjects.js";
 import { createServerBundle } from "./open-next/createServerBundle.js";
@@ -52,6 +53,8 @@ export async function build(options, config, projectOpts) {
     compileEnvFiles(options);
     // Compile workerd init
     compileInit(options);
+    // Compile image helpers
+    compileImages(options);
     // Compile middleware
     await createMiddleware(options, { forceOnlyBuildOnce: true });
     createStaticAssets(options, { useBasePath: true });

package/dist/cli/build/bundle-server.d.ts

@@ -4,7 +4,7 @@ import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
  */
 export declare function bundleServer(buildOpts: BuildOptions): Promise<void>;
 /**
- * This function applies patches required for the code to run on workers.
+ * This function apply updates to the bundled code.
  */
 export declare function updateWorkerBundledCode(workerOutputFile: string): Promise<void>;
 /**

package/dist/cli/build/bundle-server.js

@@ -8,7 +8,6 @@ import { build } from "esbuild";
 import { getOpenNextConfig } from "../../api/config.js";
 import { patchVercelOgLibrary } from "./patches/ast/patch-vercel-og-library.js";
 import { patchWebpackRuntime } from "./patches/ast/webpack-runtime.js";
-import * as patches from "./patches/index.js";
 import { inlineDynamicRequires } from "./patches/plugins/dynamic-requires.js";
 import { inlineFindDir } from "./patches/plugins/find-dir.js";
 import { patchInstrumentation } from "./patches/plugins/instrumentation.js";
@@ -21,7 +20,7 @@ import { patchDepdDeprecations } from "./patches/plugins/patch-depd-deprecations
 import { fixRequire } from "./patches/plugins/require.js";
 import { shimRequireHook } from "./patches/plugins/require-hook.js";
 import { setWranglerExternal } from "./patches/plugins/wrangler-external.js";
-import { needsExperimentalReact, normalizePath, patchCodeWithValidations } from "./utils/index.js";
+import { copyPackageCliFiles, needsExperimentalReact, normalizePath } from "./utils/index.js";
 /** The dist directory of the Cloudflare adapter package */
 const packageDistDir = path.join(path.dirname(fileURLToPath(import.meta.url)), "../..");
 /**
@@ -41,7 +40,7 @@ const optionalDependencies = [
  * Bundle the Open Next server.
  */
 export async function bundleServer(buildOpts) {
-    patches.copyPackageCliFiles(packageDistDir, buildOpts);
+    copyPackageCliFiles(packageDistDir, buildOpts);
     const { appPath, outputDir, monorepoRoot, debug } = buildOpts;
     const baseManifestPath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next");
     const serverFiles = path.join(baseManifestPath, "required-server-files.json");
@@ -142,13 +141,11 @@ export async function bundleServer(buildOpts) {
     console.log(`\x1b[35mWorker saved in \`${path.relative(buildOpts.appPath, getOutputWorkerPath(buildOpts))}\` 🚀\n\x1b[0m`);
 }
 /**
- * This function applies patches required for the code to run on workers.
+ * This function apply updates to the bundled code.
  */
 export async function updateWorkerBundledCode(workerOutputFile) {
     const code = await readFile(workerOutputFile, "utf8");
-    const patchedCode = await patchCodeWithValidations(code, [
-        ["require", patches.patchRequire, { isOptional: true }],
-    ]);
+    const patchedCode = code.replace(/__require\d?\(/g, "require(").replace(/__require\d?\./g, "require.");
     await writeFile(workerOutputFile, patchedCode);
 }
 /**

package/dist/cli/build/open-next/compile-images.d.ts

@@ -0,0 +1,5 @@
+import type { BuildOptions } from "@opennextjs/aws/build/helper.js";
+/**
+ * Compiles the initialization code for the workerd runtime
+ */
+export declare function compileImages(options: BuildOptions): Promise<void>;

package/dist/cli/build/open-next/compile-images.js

@@ -0,0 +1,29 @@
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { build } from "esbuild";
+/**
+ * Compiles the initialization code for the workerd runtime
+ */
+export async function compileImages(options) {
+    const currentDir = path.join(path.dirname(fileURLToPath(import.meta.url)));
+    const templatesDir = path.join(currentDir, "../../templates");
+    const imagesPath = path.join(templatesDir, "images.js");
+    const imagesManifestPath = path.join(options.appBuildOutputPath, ".next/images-manifest.json");
+    const imagesManifest = fs.existsSync(imagesManifestPath)
+        ? JSON.parse(fs.readFileSync(imagesManifestPath, { encoding: "utf-8" }))
+        : {};
+    await build({
+        entryPoints: [imagesPath],
+        outdir: path.join(options.outputDir, "cloudflare"),
+        bundle: false,
+        minify: false,
+        format: "esm",
+        target: "esnext",
+        platform: "node",
+        define: {
+            __IMAGES_REMOTE_PATTERNS__: JSON.stringify(imagesManifest?.images?.remotePatterns ?? []),
+            __IMAGES_LOCAL_PATTERNS__: JSON.stringify(imagesManifest?.images?.localPatterns ?? []),
+        },
+    });
+}

package/dist/cli/build/open-next/createServerBundle.js

@@ -138,7 +138,6 @@ async function generateBundle(name, options, fnOptions, codeCustomization) {
         awsPatches.patchNextServer,
         awsPatches.patchEnvVars,
         awsPatches.patchBackgroundRevalidation,
-        awsPatches.patchDropBabel,
         // Cloudflare specific patches
         patchResRevalidate,
         patchUseCacheIO,

package/dist/cli/build/patches/plugins/next-server.d.ts

@@ -4,14 +4,12 @@
  * Note: we will probably need to revisit the patches when the Next adapter API lands
  *
  * - Inline `getBuildId` as it relies on `readFileSync` that is not supported by workerd
- * - Inline the middleware manifest
  * - Override the cache and composable cache handlers
  */
 import { type BuildOptions } from "@opennextjs/aws/build/helper.js";
 import type { ContentUpdater, Plugin } from "@opennextjs/aws/plugins/content-updater.js";
 export declare function patchNextServer(updater: ContentUpdater, buildOpts: BuildOptions): Plugin;
 export declare const buildIdRule = "\nrule:\n  pattern:\n    selector: method_definition\n    context: \"class { getBuildId($$$PARAMS) { $$$_ } }\"\nfix: |-\n  getBuildId($$$PARAMS) {\n    return process.env.NEXT_BUILD_ID;\n  }\n";
-export declare function createMiddlewareManifestRule(manifest: unknown): string;
 /**
  * The cache handler used by Next.js is normally defined in the config file as a path. At runtime,
  * Next.js would then do a dynamic require on a transformed version of the path to retrieve the

package/dist/cli/build/patches/plugins/next-server.js

@@ -4,10 +4,8 @@
  * Note: we will probably need to revisit the patches when the Next adapter API lands
  *
  * - Inline `getBuildId` as it relies on `readFileSync` that is not supported by workerd
- * - Inline the middleware manifest
  * - Override the cache and composable cache handlers
  */
-import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { getPackagePath } from "@opennextjs/aws/build/helper.js";
 import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
@@ -24,11 +22,6 @@ export function patchNextServer(updater, buildOpts) {
                 callback: async ({ contents }) => {
                     const { outputDir } = buildOpts;
                     contents = patchCode(contents, buildIdRule);
-                    const manifestPath = path.join(outputDir, "server-functions/default", getPackagePath(buildOpts), ".next/server/middleware-manifest.json");
-                    const manifest = existsSync(manifestPath)
-                        ? JSON.parse(await readFileSync(manifestPath, "utf-8"))
-                        : {};
-                    contents = patchCode(contents, createMiddlewareManifestRule(manifest));
                     const outputPath = path.join(outputDir, "server-functions/default");
                     const cacheHandler = path.join(outputPath, getPackagePath(buildOpts), "cache.cjs");
                     contents = patchCode(contents, createCacheHandlerRule(cacheHandler));
@@ -50,18 +43,6 @@ fix: |-
     return process.env.NEXT_BUILD_ID;
   }
 `;
-export function createMiddlewareManifestRule(manifest) {
-    return `
-rule:
-  pattern:
-    selector: method_definition
-    context: "class { getMiddlewareManifest($$$PARAMS) { $$$_ } }"
-fix: |-
-  getMiddlewareManifest($$$PARAMS) {
-    return ${JSON.stringify(manifest)};
-  }
-`;
-}
 /**
  * The cache handler used by Next.js is normally defined in the config file as a path. At runtime,
  * Next.js would then do a dynamic require on a transformed version of the path to retrieve the

package/dist/cli/build/{patches/investigated → utils}/copy-package-cli-files.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { getOutputWorkerPath } from "../../bundle-server.js";
+import { getOutputWorkerPath } from "../bundle-server.js";
 /**
  * Copies
  * - the template files present in the cloudflare adapter package to `.open-next/cloudflare-templates`

package/dist/cli/build/utils/index.d.ts

@@ -1,4 +1,4 @@
-export * from "./apply-patches.js";
+export * from "./copy-package-cli-files.js";
 export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";

package/dist/cli/build/utils/index.js

@@ -1,4 +1,4 @@
-export * from "./apply-patches.js";
+export * from "./copy-package-cli-files.js";
 export * from "./create-config-files.js";
 export * from "./ensure-cf-config.js";
 export * from "./extract-project-env-vars.js";

package/dist/cli/build/utils/test-patch.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Compute the diff resulting of applying the `rule` to `src`.
+ *
+ * @param filename Filename used in the patch output
+ * @param src Content of the source code
+ * @param rule ASTgrep rule
+ * @returns diff in unified diff format
+ */
+export declare function computePatchDiff(filename: string, src: string, rule: string): string;

package/dist/cli/build/utils/test-patch.js

@@ -0,0 +1,14 @@
+import { patchCode } from "@opennextjs/aws/build/patch/astCodePatcher.js";
+import { createPatch } from "diff";
+/**
+ * Compute the diff resulting of applying the `rule` to `src`.
+ *
+ * @param filename Filename used in the patch output
+ * @param src Content of the source code
+ * @param rule ASTgrep rule
+ * @returns diff in unified diff format
+ */
+export function computePatchDiff(filename, src, rule) {
+    const dst = patchCode(src, rule);
+    return createPatch(filename, src, dst);
+}

package/dist/cli/build/utils/workerd.js

@@ -60,7 +60,9 @@ export async function copyWorkerdPackages(options, nodePackages) {
     const isNodeModuleRegex = getCrossPlatformPathRegex(`.*/node_modules/(?<pkg>.*)`, { escape: false });
     // Copy full external packages when they use "workerd" build condition
     const nextConfig = loadConfig(path.join(options.appBuildOutputPath, ".next"));
-    const externalPackages = nextConfig.serverExternalPackages ?? [];
+    const externalPackages = 
+    // @ts-expect-error In Next 14 its under experimental.serverComponentsExternalPackages
+    nextConfig.serverExternalPackages ?? nextConfig.experimental.serverComponentsExternalPackages ?? [];
     for (const [src, dst] of nodePackages.entries()) {
         try {
             const pkgJson = JSON.parse(await fs.readFile(path.join(src, "package.json"), "utf8"));

package/dist/cli/templates/images.d.ts

@@ -0,0 +1,24 @@
+export type RemotePattern = {
+    protocol?: "http" | "https";
+    hostname: string;
+    port?: string;
+    pathname: string;
+    search?: string;
+};
+export type LocalPattern = {
+    pathname: string;
+    search?: string;
+};
+/**
+ * Fetches an images.
+ *
+ * Local images (starting with a '/' as fetched using the passed fetcher).
+ * Remote images should match the configured remote patterns or a 404 response is returned.
+ */
+export declare function fetchImage(fetcher: Fetcher | undefined, imageUrl: string): Response | Promise<Response> | undefined;
+export declare function matchRemotePattern(pattern: RemotePattern, url: URL): boolean;
+export declare function matchLocalPattern(pattern: LocalPattern, url: URL): boolean;
+declare global {
+    var __IMAGES_REMOTE_PATTERNS__: RemotePattern[];
+    var __IMAGES_LOCAL_PATTERNS__: LocalPattern[];
+}

package/dist/cli/templates/images.js

@@ -0,0 +1,82 @@
+/**
+ * Fetches an images.
+ *
+ * Local images (starting with a '/' as fetched using the passed fetcher).
+ * Remote images should match the configured remote patterns or a 404 response is returned.
+ */
+export function fetchImage(fetcher, imageUrl) {
+    // https://github.com/vercel/next.js/blob/d76f0b1/packages/next/src/server/image-optimizer.ts#L208
+    if (!imageUrl || imageUrl.length > 3072 || imageUrl.startsWith("//")) {
+        return getUrlErrorResponse();
+    }
+    // Local
+    if (imageUrl.startsWith("/")) {
+        let pathname;
+        let url;
+        try {
+            // We only need pathname and search
+            url = new URL(imageUrl, "http://n");
+            pathname = decodeURIComponent(url.pathname);
+        }
+        catch {
+            return getUrlErrorResponse();
+        }
+        if (/\/_next\/image($|\/)/.test(pathname)) {
+            return getUrlErrorResponse();
+        }
+        // If localPatterns are not defined all local images are allowed.
+        if (__IMAGES_LOCAL_PATTERNS__.length > 0 &&
+            !__IMAGES_LOCAL_PATTERNS__.some((p) => matchLocalPattern(p, url))) {
+            return getUrlErrorResponse();
+        }
+        return fetcher?.fetch(`http://assets.local${imageUrl}`);
+    }
+    // Remote
+    let url;
+    try {
+        url = new URL(imageUrl);
+    }
+    catch {
+        return getUrlErrorResponse();
+    }
+    if (url.protocol !== "http:" && url.protocol !== "https:") {
+        return getUrlErrorResponse();
+    }
+    // The remotePatterns is used to allow images from specific remote external paths and block all others.
+    if (!__IMAGES_REMOTE_PATTERNS__.some((p) => matchRemotePattern(p, url))) {
+        return getUrlErrorResponse();
+    }
+    return fetch(imageUrl, { cf: { cacheEverything: true } });
+}
+export function matchRemotePattern(pattern, url) {
+    // https://github.com/vercel/next.js/blob/d76f0b1/packages/next/src/shared/lib/match-remote-pattern.ts
+    if (pattern.protocol !== undefined &&
+        pattern.protocol.replace(/:$/, "") !== url.protocol.replace(/:$/, "")) {
+        return false;
+    }
+    if (pattern.port !== undefined && pattern.port !== url.port) {
+        return false;
+    }
+    if (pattern.hostname === undefined || !new RegExp(pattern.hostname).test(url.hostname)) {
+        return false;
+    }
+    if (pattern.search !== undefined && pattern.search !== url.search) {
+        return false;
+    }
+    // Should be the same as writeImagesManifest()
+    return new RegExp(pattern.pathname).test(url.pathname);
+}
+export function matchLocalPattern(pattern, url) {
+    // https://github.com/vercel/next.js/blob/d76f0b1/packages/next/src/shared/lib/match-local-pattern.ts
+    if (pattern.search !== undefined && pattern.search !== url.search) {
+        return false;
+    }
+    return new RegExp(pattern.pathname).test(url.pathname);
+}
+/**
+ * @returns same error as Next.js when the url query parameter is not accepted.
+ */
+function getUrlErrorResponse() {
+    return new Response(`"url" parameter is not allowed`, { status: 400 });
+}
+/* eslint-enable no-var */

package/dist/cli/templates/worker.js

@@ -1,4 +1,6 @@
 //@ts-expect-error: Will be resolved by wrangler build
+import { fetchImage } from "./cloudflare/images.js";
+//@ts-expect-error: Will be resolved by wrangler build
 import { runWithCloudflareRequestContext } from "./cloudflare/init.js";
 // @ts-expect-error: Will be resolved by wrangler build
 import { handler as middlewareHandler } from "./middleware/handler.mjs";
@@ -27,9 +29,7 @@ export default {
             // Fallback for the Next default image loader.
             if (url.pathname === `${globalThis.__NEXT_BASE_PATH__}/_next/image`) {
                 const imageUrl = url.searchParams.get("url") ?? "";
-                return imageUrl.startsWith("/")
-                    ? env.ASSETS?.fetch(`http://assets.local${imageUrl}`)
-                    : fetch(imageUrl, { cf: { cacheEverything: true } });
+                return fetchImage(env.ASSETS, imageUrl);
             }
             // - `Request`s are handled by the Next server
             const reqOrResp = await middlewareHandler(request, env, ctx);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@opennextjs/cloudflare",
   "description": "Cloudflare builder for next apps",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "type": "module",
   "bin": {
     "opennextjs-cloudflare": "dist/cli/index.js"
@@ -43,7 +43,7 @@
   "homepage": "https://github.com/opennextjs/opennextjs-cloudflare",
   "dependencies": {
     "@dotenvx/dotenvx": "1.31.0",
-    "@opennextjs/aws": "3.6.5",
+    "@opennextjs/aws": "3.6.6",
     "enquirer": "^2.4.1",
     "glob": "^11.0.0",
     "ts-tqdm": "^0.8.6"
@@ -54,6 +54,8 @@
     "@tsconfig/strictest": "^2.0.5",
     "@types/mock-fs": "^4.13.4",
     "@types/node": "^22.2.0",
+    "@types/picomatch": "^4.0.0",
+    "diff": "^8.0.2",
     "esbuild": "^0.25.4",
     "eslint": "^9.11.1",
     "eslint-plugin-import": "^2.31.0",
@@ -62,6 +64,7 @@
     "globals": "^15.9.0",
     "mock-fs": "^5.4.1",
     "next": "~14.2.24",
+    "picomatch": "^4.0.2",
     "rimraf": "^6.0.1",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.7.0",

package/dist/api/durable-objects/bucket-cache-purge.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/api/durable-objects/bucket-cache-purge.spec.js

@@ -1,121 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-import * as internal from "../overrides/internal";
-import { BucketCachePurge } from "./bucket-cache-purge";
-vi.mock("cloudflare:workers", () => ({
-    DurableObject: class {
-        ctx;
-        env;
-        constructor(ctx, env) {
-            this.ctx = ctx;
-            this.env = env;
-        }
-    },
-}));
-const createBucketCachePurge = () => {
-    const mockState = {
-        waitUntil: vi.fn(),
-        blockConcurrencyWhile: vi.fn().mockImplementation(async (fn) => fn()),
-        storage: {
-            setAlarm: vi.fn(),
-            getAlarm: vi.fn(),
-            sql: {
-                exec: vi.fn().mockImplementation(() => ({
-                    one: vi.fn(),
-                    toArray: vi.fn().mockReturnValue([]),
-                })),
-            },
-        },
-    };
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return new BucketCachePurge(mockState, {});
-};
-describe("BucketCachePurge", () => {
-    it("should block concurrency while creating the table", async () => {
-        const cache = createBucketCachePurge();
-        // @ts-expect-error - testing private method
-        expect(cache.ctx.blockConcurrencyWhile).toHaveBeenCalled();
-        // @ts-expect-error - testing private method
-        expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(expect.stringContaining("CREATE TABLE IF NOT EXISTS cache_purge"));
-    });
-    describe("purgeCacheByTags", () => {
-        it("should insert tags into the sql table", async () => {
-            const cache = createBucketCachePurge();
-            const tags = ["tag1", "tag2"];
-            await cache.purgeCacheByTags(tags);
-            // @ts-expect-error - testing private method
-            expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(expect.stringContaining("INSERT OR REPLACE INTO cache_purge"), [tags[0]]);
-            // @ts-expect-error - testing private method
-            expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(expect.stringContaining("INSERT OR REPLACE INTO cache_purge"), [tags[1]]);
-        });
-        it("should set an alarm if no alarm is set", async () => {
-            const cache = createBucketCachePurge();
-            // @ts-expect-error - testing private method
-            cache.ctx.storage.getAlarm.mockResolvedValueOnce(null);
-            await cache.purgeCacheByTags(["tag"]);
-            // @ts-expect-error - testing private method
-            expect(cache.ctx.storage.setAlarm).toHaveBeenCalled();
-        });
-        it("should not set an alarm if one is already set", async () => {
-            const cache = createBucketCachePurge();
-            // @ts-expect-error - testing private method
-            cache.ctx.storage.getAlarm.mockResolvedValueOnce(true);
-            await cache.purgeCacheByTags(["tag"]);
-            // @ts-expect-error - testing private method
-            expect(cache.ctx.storage.setAlarm).not.toHaveBeenCalled();
-        });
-    });
-    describe("alarm", () => {
-        it("should purge cache by tags and delete them from the sql table", async () => {
-            const cache = createBucketCachePurge();
-            // @ts-expect-error - testing private method
-            cache.ctx.storage.sql.exec.mockReturnValueOnce({
-                toArray: () => [{ tag: "tag1" }, { tag: "tag2" }],
-            });
-            await cache.alarm();
-            // @ts-expect-error - testing private method
-            expect(cache.ctx.storage.sql.exec).toHaveBeenCalledWith(expect.stringContaining("DELETE FROM cache_purge"), ["tag1", "tag2"]);
-        });
-        it("should not purge cache if no tags are found", async () => {
-            const cache = createBucketCachePurge();
-            // @ts-expect-error - testing private method
-            cache.ctx.storage.sql.exec.mockReturnValueOnce({
-                toArray: () => [],
-            });
-            await cache.alarm();
-            // @ts-expect-error - testing private method
-            expect(cache.ctx.storage.sql.exec).not.toHaveBeenCalledWith(expect.stringContaining("DELETE FROM cache_purge"), []);
-        });
-        it("should call internalPurgeCacheByTags with the correct tags", async () => {
-            const cache = createBucketCachePurge();
-            const tags = ["tag1", "tag2"];
-            // @ts-expect-error - testing private method
-            cache.ctx.storage.sql.exec.mockReturnValueOnce({
-                toArray: () => tags.map((tag) => ({ tag })),
-            });
-            const internalPurgeCacheByTagsSpy = vi.spyOn(internal, "internalPurgeCacheByTags");
-            await cache.alarm();
-            expect(internalPurgeCacheByTagsSpy).toHaveBeenCalledWith(
-            // @ts-expect-error - testing private method
-            cache.env, tags);
-            // @ts-expect-error - testing private method 1st is constructor, 2nd is to get the tags and 3rd is to delete them
-            expect(cache.ctx.storage.sql.exec).toHaveBeenCalledTimes(3);
-        });
-        it("should continue until all tags are purged", async () => {
-            const cache = createBucketCachePurge();
-            const tags = Array.from({ length: 100 }, (_, i) => `tag${i}`);
-            // @ts-expect-error - testing private method
-            cache.ctx.storage.sql.exec.mockReturnValueOnce({
-                toArray: () => tags.map((tag) => ({ tag })),
-            });
-            const internalPurgeCacheByTagsSpy = vi.spyOn(internal, "internalPurgeCacheByTags");
-            await cache.alarm();
-            expect(internalPurgeCacheByTagsSpy).toHaveBeenCalledWith(
-            // @ts-expect-error - testing private method
-            cache.env, tags);
-            // @ts-expect-error - testing private method 1st is constructor, 2nd is to get the tags and 3rd is to delete them, 4th is to get the next 100 tags
-            expect(cache.ctx.storage.sql.exec).toHaveBeenCalledTimes(4);
-            // @ts-expect-error - testing private method
-            expect(cache.ctx.storage.sql.exec).toHaveBeenLastCalledWith(expect.stringContaining("SELECT * FROM cache_purge LIMIT 100"));
-        });
-    });
-});

package/dist/api/durable-objects/queue.spec.d.ts

@@ -1 +0,0 @@
-export {};