[pull] master from DefinitelyTyped:master

types/express-serve-static-core/express-serve-static-core-tests.ts

@@ -351,3 +351,6 @@ app.router.stack;
 app.on("mount", (app) => {
     app; // $ExpectType Application<Record<string,any>
 });
+
+// QUERY method presence depends on environment
+app.query?.("/foo/bar", (req) => req.method);

types/express-serve-static-core/index.d.ts

@@ -124,7 +124,7 @@ type ParseRouteParameters<Route extends string> = string extends Route ? ParamsD
 /* eslint-disable @definitelytyped/no-unnecessary-generics */
 export interface IRouterMatcher<
     T,
-    Method extends "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head" = any,
+    Method extends "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head" | "query" = any,
 > {
     <
         Route extends string | RegExp,
@@ -268,6 +268,11 @@ export interface IRouter extends RequestHandler {
     patch: IRouterMatcher<this, "patch">;
     options: IRouterMatcher<this, "options">;
     head: IRouterMatcher<this, "head">;
+    /**
+     * Requires Node.js >=20.19.3 <21 || >=22.2.0
+     * @see https://expressjs.com/en/5x/api/application/#appquery
+     */
+    query?: IRouterMatcher<this, "query">;
 
     checkout: IRouterMatcher<this>;
     connect: IRouterMatcher<this>;

types/express-serve-static-core/v4/express-serve-static-core-tests.ts

@@ -311,3 +311,6 @@ app.get("/:readonly", req => {
     // @ts-expect-error
     req.xhr = true;
 });
+
+// QUERY method presence depends on environment
+app.query?.("/foo/bar", (req) => req.method);

types/express-serve-static-core/v4/index.d.ts

@@ -110,7 +110,7 @@ export type RouteParameters<Route extends string> = string extends Route ? Param
 /* eslint-disable @definitelytyped/no-unnecessary-generics */
 export interface IRouterMatcher<
     T,
-    Method extends "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head" = any,
+    Method extends "all" | "get" | "post" | "put" | "delete" | "patch" | "options" | "head" | "query" = any,
 > {
     <
         Route extends string,
@@ -261,6 +261,11 @@ export interface IRouter extends RequestHandler {
     patch: IRouterMatcher<this, "patch">;
     options: IRouterMatcher<this, "options">;
     head: IRouterMatcher<this, "head">;
+    /**
+     * Requires Node.js >=20.19.3 <21 || >=22.2.0
+     * @see https://expressjs.com/en/4x/api/application/#appquery
+     */
+    query?: IRouterMatcher<this, "query">;
 
     checkout: IRouterMatcher<this>;
     connect: IRouterMatcher<this>;

types/express/express-tests.ts

@@ -61,14 +61,17 @@ namespace express_tests {
     router.put(path);
     router.post(path);
     router.delete(path);
+    router.query?.(path);
     router.get(pathStr);
     router.put(pathStr);
     router.post(pathStr);
     router.delete(pathStr);
+    router.query?.(pathStr);
     router.get(pathRE);
     router.put(pathRE);
     router.post(pathRE);
     router.delete(pathRE);
+    router.query?.(pathRE);
 
     router.use((req, res, next) => {
         next();

types/express/v4/express-tests.ts

@@ -68,14 +68,17 @@ namespace express_tests {
     router.put(path);
     router.post(path);
     router.delete(path);
+    router.query?.(path);
     router.get(pathStr);
     router.put(pathStr);
     router.post(pathStr);
     router.delete(pathStr);
+    router.query?.(pathStr);
     router.get(pathRE);
     router.put(pathRE);
     router.post(pathRE);
     router.delete(pathRE);
+    router.query?.(pathRE);
 
     router.use((req, res, next) => {
         next();