Renaming other less critical but consistent entities.

RobinTail · RobinTail · commit 59c1f3110cdd · 2025-11-29T17:09:33.000+01:00
diff --git a/express-zod-api/src/common-helpers.ts b/express-zod-api/src/common-helpers.ts
@@ -36,10 +36,10 @@ export const routePathParamsRegex = /:([A-Za-z0-9_]+)/g;
 export const getRoutePathParams = (path: string): string[] =>
   path.match(routePathParamsRegex)?.map((param) => param.slice(1)) || [];
 
-const areFilesAvailable = (request: Request): boolean => {
-  const contentType = request.header("content-type") || "";
+const areFilesAvailable = (req: Request): boolean => {
+  const contentType = req.header("content-type") || "";
   const isUpload = contentType.toLowerCase().startsWith(contentTypes.upload);
-  return "files" in request && isUpload;
+  return "files" in req && isUpload;
 };
 
 export const defaultInputSources: InputSources = {
@@ -51,8 +51,8 @@ export const defaultInputSources: InputSources = {
 };
 const fallbackInputSources: InputSource[] = ["body", "query", "params"];
 
-export const getActualMethod = (request: Request) =>
-  request.method.toLowerCase() as SomeMethod;
+export const getActualMethod = (req: Request) =>
+  req.method.toLowerCase() as SomeMethod;
 
 export const getInputSources = (
   actualMethod: SomeMethod,
diff --git a/express-zod-api/src/middleware.ts b/express-zod-api/src/middleware.ts
@@ -112,12 +112,12 @@ export class ExpressMiddleware<
 > extends Middleware<FlatObject, RET, string> {
   constructor(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any -- issue #2824, assignment compatibility fix
-    nativeMw: (request: R, response: S, next: NextFunction) => any,
+    nativeMw: (req: R, res: S, next: NextFunction) => any,
     {
       provider = () => ({}) as RET,
       transformer = (err: Error) => err,
     }: {
-      provider?: (request: R, response: S) => RET | Promise<RET>;
+      provider?: (req: R, res: S) => RET | Promise<RET>;
       transformer?: (err: Error) => Error;
     } = {},
   ) {
diff --git a/express-zod-api/src/server-helpers.ts b/express-zod-api/src/server-helpers.ts
@@ -22,7 +22,7 @@ type EquippedRequest = Request<
 >;
 
 /** @desc Returns child logger for the given request (if configured) or the configured logger otherwise */
-export type GetLogger = (request?: Request) => ActualLogger;
+export type GetLogger = (req?: Request) => ActualLogger;
 
 interface HandlerCreatorParams {
   errorHandler: AbstractResultHandler;
@@ -136,8 +136,8 @@ export const createLoggingMiddleware =
 
 export const makeGetLogger =
   (fallback: ActualLogger): GetLogger =>
-  (request) =>
-    (request as EquippedRequest | undefined)?.res?.locals[localsID]?.logger ||
+  (req) =>
+    (req as EquippedRequest | undefined)?.res?.locals[localsID]?.logger ||
     fallback;
 
 export const installDeprecationListener = (logger: ActualLogger) =>
diff --git a/express-zod-api/src/sse.ts b/express-zod-api/src/sse.ts
@@ -47,9 +47,9 @@ export const formatEvent = <E extends EventsMap>(
     .parse({ event, data });
 
 const headersTimeout = 1e4; // 10s to respond with a status code other than 200
-export const ensureStream = (response: Response) =>
-  response.headersSent ||
-  response.writeHead(200, {
+export const ensureStream = (res: Response) =>
+  res.headersSent ||
+  res.writeHead(200, {
     connection: "keep-alive",
     "content-type": contentTypes.sse,
     "cache-control": "no-cache",
