diff --git a/types/body-parser/index.d.ts b/types/body-parser/index.d.ts index 2056c89b22..497f3c8dc7 100644 --- a/types/body-parser/index.d.ts +++ b/types/body-parser/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/expressjs/body-parser // Definitions by: Santi Albo , Vilic Vane , Jonathan Häberle , Gevik Babakhani , Tomasz Łaziuk // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 /// diff --git a/types/documentdb-session/index.d.ts b/types/documentdb-session/index.d.ts index 69914bdc6c..ed64df8921 100644 --- a/types/documentdb-session/index.d.ts +++ b/types/documentdb-session/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/dwhieb/documentdb-session#readme // Definitions by: Daniel Rosenwasser // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import session = require("express-session"); diff --git a/types/egg/index.d.ts b/types/egg/index.d.ts index badb306c08..fe0539e4c1 100644 --- a/types/egg/index.d.ts +++ b/types/egg/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/eggjs/egg // Definitions by: Eward Song // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import * as accepts from 'accepts'; import * as KoaApplication from 'koa'; diff --git a/types/express-brute-redis/index.d.ts b/types/express-brute-redis/index.d.ts index 72d0458ddd..a03c589123 100644 --- a/types/express-brute-redis/index.d.ts +++ b/types/express-brute-redis/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/AdamPflug/express-brute-redis // Definitions by: Scott Harwell // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import { ClientOpts } from "redis"; diff --git a/types/express-enforces-ssl/index.d.ts b/types/express-enforces-ssl/index.d.ts index f4c1d424a4..271485b61c 100644 --- a/types/express-enforces-ssl/index.d.ts +++ b/types/express-enforces-ssl/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/aredo/express-enforces-ssl // Definitions by: Kevin Stubbs // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import { Request, Response, NextFunction } from 'express'; diff --git a/types/express-mongo-sanitize/index.d.ts b/types/express-mongo-sanitize/index.d.ts index 354b6830dd..c7c76d32c5 100644 --- a/types/express-mongo-sanitize/index.d.ts +++ b/types/express-mongo-sanitize/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/fiznool/express-mongo-sanitize#readme // Definitions by: Eric Byers // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import express = require('express'); diff --git a/types/express-rate-limit/index.d.ts b/types/express-rate-limit/index.d.ts index 5ae2013aef..cb0d16ec61 100644 --- a/types/express-rate-limit/index.d.ts +++ b/types/express-rate-limit/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/nfriedly/express-rate-limit // Definitions by: Cyril Schumacher , makepost // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import express = require("express"); diff --git a/types/express-sanitized/index.d.ts b/types/express-sanitized/index.d.ts index abb6be788a..c120c3b09f 100644 --- a/types/express-sanitized/index.d.ts +++ b/types/express-sanitized/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/askhogan/express-sanitized // Definitions by: Chris Barth // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import * as express from "express"; diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts index 00597aa17c..22ec0d01ee 100644 --- a/types/express-serve-static-core/index.d.ts +++ b/types/express-serve-static-core/index.d.ts @@ -174,7 +174,12 @@ interface RequestRanges extends Array { type: string; } interface Errback { (err: Error): void; } -interface Request extends http.IncomingMessage, Express.Request { +interface Request< + Body = any, + Query = any, + Params = any, + Cookies = any +> extends http.IncomingMessage, Express.Request { /** * Return request header. @@ -435,14 +440,14 @@ interface Request extends http.IncomingMessage, Express.Request { xhr: boolean; //body: { username: string; password: string; remember: boolean; title: string; }; - body: any; + body: Body; //cookies: { string; remember: boolean; }; - cookies: any; + cookies: Cookies; method: string; - params: any; + params: Params; /** * Clear cookie `name`. @@ -452,7 +457,7 @@ interface Request extends http.IncomingMessage, Express.Request { */ clearCookie(name: string, options?: any): Response; - query: any; + query: Query; route: any; diff --git a/types/express-session/index.d.ts b/types/express-session/index.d.ts index 1a4d473a44..8c5faa7873 100644 --- a/types/express-session/index.d.ts +++ b/types/express-session/index.d.ts @@ -3,6 +3,7 @@ // Definitions by: Hiroki Horiuchi // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // Definitions by: Jacob Bogers diff --git a/types/express/express-tests.ts b/types/express/express-tests.ts index 0c1081b49b..d578a24886 100644 --- a/types/express/express-tests.ts +++ b/types/express/express-tests.ts @@ -17,9 +17,10 @@ namespace express_tests { next(); }); - app.use((err: any, req: express.Request, res: express.Response, next: express.NextFunction) => { - console.error(err); - next(err); + app.use((err: any, req: express.Request<{ hello: string; }>, res: express.Response, next: express.NextFunction) => { + console.log(req.body.hello); + console.error(err); + next(err); }); app.get('/', (req, res) => { diff --git a/types/express/index.d.ts b/types/express/index.d.ts index 59f60e92df..66bf4180c8 100644 --- a/types/express/index.d.ts +++ b/types/express/index.d.ts @@ -2,7 +2,7 @@ // Project: http://expressjs.com // Definitions by: Boris Yankov // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 /* =================== USAGE =================== @@ -76,7 +76,12 @@ declare namespace e { interface IRouterMatcher extends core.IRouterMatcher { } interface MediaType extends core.MediaType { } interface NextFunction extends core.NextFunction { } - interface Request extends core.Request { } + interface Request< + Body = any, + Query = any, + Params = any, + Cookies = any + > extends core.Request { } interface RequestHandler extends core.RequestHandler { } interface RequestParamHandler extends core.RequestParamHandler { } export interface Response extends core.Response { } diff --git a/types/i18n/index.d.ts b/types/i18n/index.d.ts index 03dceb40e9..0ddc39ffbf 100644 --- a/types/i18n/index.d.ts +++ b/types/i18n/index.d.ts @@ -3,6 +3,7 @@ // Definitions by: Maxime LUCE // FindQ // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 declare namespace i18n { interface ConfigurationOptions { diff --git a/types/koa-morgan/index.d.ts b/types/koa-morgan/index.d.ts index b4be38122b..f52baa788c 100644 --- a/types/koa-morgan/index.d.ts +++ b/types/koa-morgan/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/koa-modules/morgan // Definitions by: Vesa Poikajärvi // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.1 +// TypeScript Version: 2.3 import { IncomingMessage, ServerResponse } from 'http'; import * as Koa from 'koa'; diff --git a/types/morgan/index.d.ts b/types/morgan/index.d.ts index 097758465a..1558f24ee4 100644 --- a/types/morgan/index.d.ts +++ b/types/morgan/index.d.ts @@ -3,7 +3,7 @@ // Definitions by: James Roland Cabresos // Paolo Scanferla // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import express = require('express'); diff --git a/types/multer/index.d.ts b/types/multer/index.d.ts index d6e73f9ddf..5c300a5585 100644 --- a/types/multer/index.d.ts +++ b/types/multer/index.d.ts @@ -6,7 +6,7 @@ // Michael Ledin // HyunSeob Lee // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.1 +// TypeScript Version: 2.3 import * as express from 'express'; diff --git a/types/node-common-errors/index.d.ts b/types/node-common-errors/index.d.ts index 7ee4f0450e..06bcb9e754 100644 --- a/types/node-common-errors/index.d.ts +++ b/types/node-common-errors/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/shutterstock/node-errors // Definitions by: Ian Copp // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import * as express from 'express'; diff --git a/types/node-ral/index.d.ts b/types/node-ral/index.d.ts index 27bad13293..5714de2bb8 100644 --- a/types/node-ral/index.d.ts +++ b/types/node-ral/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/fex-team/node-ral // Definitions by: ssddi456 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import { EventEmitter } from 'events'; import { Request, Response, NextFunction } from "express"; diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts index 74f93e81b1..93e3e9398b 100644 --- a/types/oauth2-server/index.d.ts +++ b/types/oauth2-server/index.d.ts @@ -3,6 +3,7 @@ // Definitions by: Robbie Van Gorkom , // Charles Irick // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import { Request, RequestHandler } from "express"; diff --git a/types/optics-agent/index.d.ts b/types/optics-agent/index.d.ts index 83f7817bb9..496437994f 100644 --- a/types/optics-agent/index.d.ts +++ b/types/optics-agent/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/apollostack/optics-agent-js#readme // Definitions by: Crevil // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import { GraphQLSchema } from "graphql"; import { Request, Response } from "express"; diff --git a/types/passport-client-cert/index.d.ts b/types/passport-client-cert/index.d.ts index 8428545a8f..7ec8153651 100644 --- a/types/passport-client-cert/index.d.ts +++ b/types/passport-client-cert/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/ripjar/passport-client-cert // Definitions by: Sean Warner // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.1 +// TypeScript Version: 2.3 import { Strategy as PassportStrategy } from 'passport-strategy'; import { Request } from 'express'; diff --git a/types/passport-discord/index.d.ts b/types/passport-discord/index.d.ts index 8cc99df36d..66b9474a2d 100644 --- a/types/passport-discord/index.d.ts +++ b/types/passport-discord/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/nicholastay/passport-discord#readme // Definitions by: Gonthier Renaud // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 /** Declaration file generated by dts-gen */ import * as passport from 'passport'; diff --git a/types/passport-facebook/index.d.ts b/types/passport-facebook/index.d.ts index 184e4711e2..5d20f0d39c 100644 --- a/types/passport-facebook/index.d.ts +++ b/types/passport-facebook/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/jaredhanson/passport-facebook // Definitions by: James Roland Cabresos , Lucas Acosta // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import passport = require('passport'); import express = require('express'); diff --git a/types/passport-github/index.d.ts b/types/passport-github/index.d.ts index 0b0880bb05..c4a253016f 100644 --- a/types/passport-github/index.d.ts +++ b/types/passport-github/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/jaredhanson/passport-github // Definitions by: Yasunori Ohoka // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import passport = require('passport'); import express = require('express'); diff --git a/types/passport-github2/index.d.ts b/types/passport-github2/index.d.ts index 45d50bb7e0..b0310a6f3b 100644 --- a/types/passport-github2/index.d.ts +++ b/types/passport-github2/index.d.ts @@ -3,7 +3,7 @@ // Definitions by: Yasunori Ohoka // Maarten Mulders // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import passport = require('passport'); import express = require('express'); diff --git a/types/passport-oauth2/index.d.ts b/types/passport-oauth2/index.d.ts index 6be0c6ad44..09facb2ef7 100644 --- a/types/passport-oauth2/index.d.ts +++ b/types/passport-oauth2/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/jaredhanson/passport-oauth2#readme // Definitions by: Pasi Eronen // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import { Request } from 'express'; import { Strategy } from 'passport'; diff --git a/types/passport-saml/index.d.ts b/types/passport-saml/index.d.ts index aae361373b..e93869ca87 100644 --- a/types/passport-saml/index.d.ts +++ b/types/passport-saml/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/bergie/passport-saml // Definitions by: Chris Barth // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import passport = require('passport'); import express = require('express'); diff --git a/types/passport-unique-token/index.d.ts b/types/passport-unique-token/index.d.ts index ace65042f1..081a85b29d 100644 --- a/types/passport-unique-token/index.d.ts +++ b/types/passport-unique-token/index.d.ts @@ -3,7 +3,7 @@ // Definitions by: briman0094 // Maxime LUCE // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import passport = require('passport'); import express = require('express'); diff --git a/types/swagger-node-runner/index.d.ts b/types/swagger-node-runner/index.d.ts index 92ee7919dd..89af13679d 100644 --- a/types/swagger-node-runner/index.d.ts +++ b/types/swagger-node-runner/index.d.ts @@ -2,7 +2,7 @@ // Project: https://www.npmjs.com/package/swagger-node-runner // Definitions by: Michael Mrowetz // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 /* =================== USAGE =================== diff --git a/types/yog-log/index.d.ts b/types/yog-log/index.d.ts index ff30bc4b8a..28430cf71e 100644 --- a/types/yog-log/index.d.ts +++ b/types/yog-log/index.d.ts @@ -2,7 +2,7 @@ // Project: https://github.com/fex-team/yog-log // Definitions by: ssddi456 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 +// TypeScript Version: 2.3 import { Request, Response, NextFunction } from "express"; diff --git a/types/yog2-kernel/index.d.ts b/types/yog2-kernel/index.d.ts index 9b1076dd7b..ea12cc4da9 100644 --- a/types/yog2-kernel/index.d.ts +++ b/types/yog2-kernel/index.d.ts @@ -2,6 +2,7 @@ // Project: https://github.com/fex-team/yog2-kernel // Definitions by: ssddi456 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped +// TypeScript Version: 2.3 import * as express from "express"; import * as _ from "lodash";