From 8e56989cde700682aaf6b383ca8b821220e8309d Mon Sep 17 00:00:00 2001
From: Yusuke Wada <yusuke@kamawada.com>
Date: Sun, 8 Sep 2024 15:45:53 +0900
Subject: [PATCH] feat(cloudflare-pages): enable `c.env.eventContext` in
 `handleMiddleware` (#3332)

---
 src/adapter/cloudflare-pages/handler.test.ts | 12 ++++++++++++
 src/adapter/cloudflare-pages/handler.ts      | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/adapter/cloudflare-pages/handler.test.ts b/src/adapter/cloudflare-pages/handler.test.ts
index d08e31dc..747d11e0 100644
--- a/src/adapter/cloudflare-pages/handler.test.ts
+++ b/src/adapter/cloudflare-pages/handler.test.ts
@@ -230,6 +230,18 @@ describe('Middleware adapter for Cloudflare Pages', () => {
     await expect(handler(eventContext)).rejects.toThrowError('Something went wrong')
     expect(next).not.toHaveBeenCalled()
   })
+
+  it('Should set the data in eventContext.data', async () => {
+    const next = vi.fn()
+    const eventContext = createEventContext({ next })
+    const handler = handleMiddleware(async (c, next) => {
+      c.env.eventContext.data.user = 'Joe'
+      await next()
+    })
+    expect(eventContext.data.user).toBeUndefined()
+    await handler(eventContext)
+    expect(eventContext.data.user).toBe('Joe')
+  })
 })
 
 describe('serveStatic()', () => {
diff --git a/src/adapter/cloudflare-pages/handler.ts b/src/adapter/cloudflare-pages/handler.ts
index a3b98857..6eb7df40 100644
--- a/src/adapter/cloudflare-pages/handler.ts
+++ b/src/adapter/cloudflare-pages/handler.ts
@@ -9,7 +9,7 @@ import type { BlankSchema, Env, Input, MiddlewareHandler, Schema } from '../../t
 type Params<P extends string = any> = Record<P, string | string[]>
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type EventContext<Env = {}, P extends string = any, Data = {}> = {
+export type EventContext<Env = {}, P extends string = any, Data = Record<string, unknown>> = {
   request: Request
   functionPath: string
   waitUntil: (promise: Promise<unknown>) => void
@@ -43,12 +43,20 @@ export const handle =
   }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function handleMiddleware<E extends Env = any, P extends string = any, I extends Input = {}>(
-  middleware: MiddlewareHandler<E, P, I>
+export function handleMiddleware<E extends Env = {}, P extends string = any, I extends Input = {}>(
+  middleware: MiddlewareHandler<
+    E & {
+      Bindings: {
+        eventContext: EventContext
+      }
+    },
+    P,
+    I
+  >
 ): PagesFunction<E['Bindings']> {
   return async (executionCtx) => {
     const context = new Context(executionCtx.request, {
-      env: executionCtx.env,
+      env: { ...executionCtx.env, eventContext: executionCtx },
       executionCtx,
     })