From c047d9dc9b97b7878b02fc0e981d4a7458b58a0a Mon Sep 17 00:00:00 2001
From: Ed Yu <edyu@users.noreply.github.com>
Date: Thu, 22 Jun 2023 11:54:01 -0700
Subject: [PATCH] Revert Context changes in middleware_with_endpoint by fixing
 middleware MixContexts

---
 .../middleware_with_endpoint/middleware_with_endpoint.zig | 8 ++++----
 src/middleware.zig                                        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/middleware_with_endpoint/middleware_with_endpoint.zig b/examples/middleware_with_endpoint/middleware_with_endpoint.zig
index fe9f0cd..f22397f 100644
--- a/examples/middleware_with_endpoint/middleware_with_endpoint.zig
+++ b/examples/middleware_with_endpoint/middleware_with_endpoint.zig
@@ -20,10 +20,10 @@ const SharedAllocator = struct {
 };
 
 // create a combined context struct
-const Context = struct {
-    user: ?UserMiddleWare.User = null,
-    session: ?SessionMiddleWare.Session = null,
-};
+const Context = zap.Middleware.MixContexts(.{
+    .{ .name = "?user", .type = UserMiddleWare.User },
+    .{ .name = "?session", .type = SessionMiddleWare.Session },
+});
 
 // we create a Handler type based on our Context
 const Handler = zap.Middleware.Handler(Context);
diff --git a/src/middleware.zig b/src/middleware.zig
index 81c498e..b435701 100644
--- a/src/middleware.zig
+++ b/src/middleware.zig
@@ -22,7 +22,7 @@ pub fn MixContexts(comptime context_tuple: anytype) type {
         fields[i] = .{
             .name = fieldName,
             .type = fieldType,
-            .default_value = if (isOptional) &null else null,
+            .default_value = if (isOptional) &@as(fieldType, null) else null,
             .is_comptime = false,
             .alignment = 0,
         };