JS: Update Express test

Author: asgerf

javascript/ql/test/library-tests/frameworks/Express/src/express3.js

@@ -1,7 +1,7 @@
 var express = require('express');
 var app = express();
 
-app.get('/some/path', function(req, res) {  
+app.get('/some/path', function(req, res) {
   res.header(req.param("header"), req.param("val"));
   res.send("val");
 });
@@ -10,3 +10,8 @@ function getHandler() {
     return function (req, res){}
 }
 app.use(getHandler());
+
+function getHandler2() {
+  return function (req, res){}
+}
+app.use([getHandler2()]);

javascript/ql/test/library-tests/frameworks/Express/tests.expected

@@ -745,7 +745,14 @@ test_RouterDefinition_getMiddlewareStackAt
 | src/express2.js:5:11:5:13 | e() | src/express2.js:6:1:6:15 | app.use(router) | src/express2.js:6:9:6:14 | router |
 | src/express2.js:5:11:5:13 | e() | src/express2.js:7:1:7:0 | exit node of <toplevel> | src/express2.js:6:9:6:14 | router |
 | src/express3.js:2:11:2:19 | express() | src/express3.js:12:1:12:21 | app.use ... dler()) | src/express3.js:12:9:12:20 | getHandler() |
-| src/express3.js:2:11:2:19 | express() | src/express3.js:13:1:13:0 | exit node of <toplevel> | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:14:1:16:1 | functio ... es){}\\n} | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:17:1:17:3 | app | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:17:1:17:7 | app.use | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:17:1:17:25 | app.use ... r2()]); | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:17:5:17:7 | use | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:17:9:17:23 | [getHandler2()] | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:17:10:17:20 | getHandler2 | src/express3.js:12:9:12:20 | getHandler() |
+| src/express3.js:2:11:2:19 | express() | src/express3.js:17:10:17:22 | getHandler2() | src/express3.js:12:9:12:20 | getHandler() |
 | src/express.js:2:11:2:19 | express() | src/express.js:39:1:39:21 | app.use ... dler()) | src/express.js:39:9:39:20 | getHandler() |
 | src/express.js:2:11:2:19 | express() | src/express.js:41:1:43:1 | functio ...  f();\\n} | src/express.js:39:9:39:20 | getHandler() |
 | src/express.js:2:11:2:19 | express() | src/express.js:44:1:44:3 | app | src/express.js:39:9:39:20 | getHandler() |
@@ -965,6 +972,9 @@ test_isRequest
 | src/route-collection.js:3:7:3:9 | req |
 | src/route-collection.js:3:32:3:34 | req |
 | src/route.js:5:21:5:23 | req |
+| typed_src/tst.ts:5:15:5:15 | x |
+| typed_src/tst.ts:5:15:5:15 | x |
+| typed_src/tst.ts:6:3:6:3 | x |
 test_RouteSetup_getRouter
 | src/advanced-routehandler-registration.js:10:3:10:24 | app.get ... es0[p]) | src/advanced-routehandler-registration.js:2:11:2:19 | express() |
 | src/advanced-routehandler-registration.js:19:3:19:18 | app.use(handler) | src/advanced-routehandler-registration.js:2:11:2:19 | express() |
@@ -1005,6 +1015,7 @@ test_RouteSetup_getRouter
 | src/express2.js:6:1:6:15 | app.use(router) | src/express2.js:5:11:5:13 | e() |
 | src/express3.js:4:1:7:2 | app.get ... l");\\n}) | src/express3.js:2:11:2:19 | express() |
 | src/express3.js:12:1:12:21 | app.use ... dler()) | src/express3.js:2:11:2:19 | express() |
+| src/express3.js:17:1:17:24 | app.use ... er2()]) | src/express3.js:2:11:2:19 | express() |
 | src/express4.js:4:1:9:2 | app.get ... c1);\\n}) | src/express4.js:2:11:2:19 | express() |
 | src/express.js:4:1:9:2 | app.get ... es);\\n}) | src/express.js:2:11:2:19 | express() |
 | src/express.js:16:3:18:4 | router. ... );\\n  }) | src/express.js:2:11:2:19 | express() |
@@ -1633,6 +1644,7 @@ test_RouteSetup_handlesAllRequestMethods
 | src/csurf-example.js:18:1:18:31 | app.use ... rue })) |
 | src/express2.js:6:1:6:15 | app.use(router) |
 | src/express3.js:12:1:12:21 | app.use ... dler()) |
+| src/express3.js:17:1:17:24 | app.use ... er2()]) |
 | src/express.js:39:1:39:21 | app.use ... dler()) |
 | src/express.js:44:1:44:26 | app.use ... dler()) |
 | src/middleware-flow.js:13:5:13:25 | router. ... tallDb) |
@@ -2140,6 +2152,10 @@ test_isResponse
 | src/route-collection.js:2:12:2:14 | res |
 | src/route-collection.js:3:12:3:14 | res |
 | src/route.js:5:26:5:28 | res |
+| typed_src/tst.ts:5:35:5:37 | res |
+| typed_src/tst.ts:5:35:5:37 | res |
+| typed_src/tst.ts:7:3:7:5 | res |
+| typed_src/tst.ts:7:3:7:17 | res.status(404) |
 test_ResponseBody
 | src/csurf-example.js:22:35:22:49 | req.csrfToken() | src/csurf-example.js:20:18:23:1 | functio ... () })\\n} |
 | src/csurf-example.js:26:12:26:42 | 'csrf w ... t here' | src/csurf-example.js:25:22:27:1 | functio ... ere')\\n} |
@@ -2622,7 +2638,6 @@ test_RouterDefinition_getMiddlewareStack
 | src/auth.js:1:13:1:32 | require('express')() | src/auth.js:4:9:4:52 | basicAu ... rd' }}) |
 | src/csurf-example.js:7:11:7:19 | express() | src/csurf-example.js:18:9:18:30 | csrf({  ... true }) |
 | src/express2.js:5:11:5:13 | e() | src/express2.js:6:9:6:14 | router |
-| src/express3.js:2:11:2:19 | express() | src/express3.js:12:9:12:20 | getHandler() |
 | src/express.js:2:11:2:19 | express() | src/express.js:44:9:44:25 | getArrowHandler() |
 | src/subrouter.js:2:11:2:19 | express() | src/subrouter.js:5:14:5:28 | makeSubRouter() |
 test_RouteHandler

javascript/ql/test/library-tests/frameworks/Express/typed_src/shim.d.ts

@@ -2,10 +2,13 @@ declare namespace ServeStaticCore {
   interface Request {
     body: any;
   }
+  interface Response {
+  }
 }
 
 declare module 'express' {
   interface Request extends ServeStaticCore.Request {}
+  interface Response extends ServeStaticCore.Response {}
 }
 
 declare module 'express-serve-static-core' {

javascript/ql/test/library-tests/frameworks/Express/typed_src/tst.ts

@@ -2,6 +2,7 @@
 
 import * as express from 'express';
 
-function test(x: express.Request) {
+function test(x: express.Request, res: express.Response) {
   x.body;
+  res.status(404);
 }