@@ -7,7 +7,7 @@ import { expectTypeOf } from "expect-type";
 
 describe("Client", () => {
   describe("params", () => {
-    it("should make apply named path params", async () => {
+    it("should apply named path params correctly", async () => {
       const id = "one";
       const expectedPath = `/api/users/${id}`;
       const expectedParams = { id };
@@ -27,7 +27,7 @@ describe("Client", () => {
       expect(actual.params).toEqual(expectedParams);
     });
 
-    it("should make apply anonymous wildcard path params", async () => {
+    it("should apply anonymous wildcard path params correctly", async () => {
       const id = "one";
       const expectedPath = `/api/users/${id}`;
       const expectedParams = { "**": id };
@@ -45,7 +45,7 @@ describe("Client", () => {
       expect(actual.params).toEqual(expectedParams);
     });
 
-    it("should make apply named wildcard path params", async () => {
+    it("should apply named wildcard path params correctly", async () => {
       const id = "one";
       const expectedPath = `/api/users/${id}`;
       const expectedParams = { id };
 
@@ -128,11 +128,12 @@ describe("Types", () => {
   });
 
   describe("GetRequestParamsInputFromDef", () => {
-    it("should get input type for all fields, ignoring a single response", () => {
+    it("should get input type for all fields, ignoring other fields on the definition", () => {
       type Def = {
         query: z.ZodObject<{ asc: z.ZodCoercedBoolean<string> }>;
         params: z.ZodObject<{ id: z.ZodString }>;
         body: z.ZodObject<{ id: z.ZodString; user: z.ZodString }>;
+        operationId: string;
         responses: z.ZodArray<
           z.ZodObject<{ id: z.ZodString; user: z.ZodString }>
         >;
@@ -148,27 +149,6 @@ describe("Types", () => {
       expectTypeOf<Actual>().toEqualTypeOf<Expected>();
     });
 
-    it("should get input type for all fields, ignoring multiple responses", () => {
-      type Def = {
-        query: z.ZodObject<{ asc: z.ZodCoercedBoolean<string> }>;
-        params: z.ZodObject<{ id: z.ZodString }>;
-        body: z.ZodObject<{ id: z.ZodString; user: z.ZodString }>;
-        responses: {
-          200: z.ZodArray<z.ZodObject<{ id: z.ZodString; user: z.ZodString }>>;
-          400: typeof ErrorResponse;
-        };
-      };
-      type Expected = {
-        query: { asc: string };
-        params: { id: string };
-        body: { id: string; user: string };
-      };
-
-      type Actual = t.GetRequestParamsInputFromDef<Def>;
-
-      expectTypeOf<Actual>().toEqualTypeOf<Expected>();
-    });
-
     it("should include only the body", () => {
       type Def = {
         body: z.ZodObject<{ id: z.ZodString; user: z.ZodString }>;
 
@@ -751,10 +751,7 @@ export type BuildHandlerContext<
   TPath extends BasePath,
   TRouteDef extends RouteDef,
 > = Simplify<
-  Omit<
-    OnBeforeHandleContext<GetAppDataCtx<TAppData>>,
-    "body" | "query" | "params" | "headers"
-  > & {
+  Omit<OnBeforeHandleContext<GetAppDataCtx<TAppData>>, InputParams> & {
     route: TPath;
   } & GetRequestParamsOutputFromDef<TRouteDef> & {
       status: StatusFn<GetResponseStatusMap<TRouteDef>>;
@@ -972,10 +969,14 @@ export type GetResponseOutput<
   ? GetResponseOutputFromDef<TRoutes[TMethod][TPath]>
   : never;
 
+type InputParams = "headers" | "params" | "query" | "body";
+
 /**
- * Given a route definition, return the same type minus the response.
+ * Given a route definition, return an object with only the input parameeters.
  */
-type GetDefParams<TRouteDef extends RouteDef> = Omit<TRouteDef, "responses">;
+type GetDefParams<TRouteDef extends RouteDef> = {
+  [key in InputParams & keyof TRouteDef]: TRouteDef[key];
+};
 
 //
 // SCHEMA ADAPTER