diff --git a/types/express-unless/express-unless-tests.ts b/types/express-unless/express-unless-tests.ts index b4d579e742..56d1a72574 100644 --- a/types/express-unless/express-unless-tests.ts +++ b/types/express-unless/express-unless-tests.ts @@ -9,3 +9,9 @@ var middleware: unless.RequestHandler = function(req, res, next) { middleware.unless = unless; app.use(middleware.unless({ method: "OPTIONS" })); app.use(middleware.unless(req => req.path === "test")); + +app.use(middleware.unless({ path: "/index", useOriginalUrl: true })); +app.use(middleware.unless({ path: /home/g, ext: ".jpg" })); +app.use(middleware.unless({ path: { url: "/index" }, ext: [ ".html", ".htm" ] })); +app.use(middleware.unless({ path: { url: "/index", methods: [ "GET", "POST" ] } })); +app.use(middleware.unless({ path: [ "/index", "/home", /home/i, { url: "/main", methods: [ "GET" ] }, { url: /home/i } ] })); \ No newline at end of file diff --git a/types/express-unless/index.d.ts b/types/express-unless/index.d.ts index 79eb870cb3..c98516a411 100644 --- a/types/express-unless/index.d.ts +++ b/types/express-unless/index.d.ts @@ -2,6 +2,7 @@ // Project: https://www.npmjs.org/package/express-unless // Definitions by: Wonshik Kim // Joao Vieira +// Michal Kaminski // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.3 @@ -11,11 +12,14 @@ declare function unless(options: unless.Options): express.RequestHandler; declare function unless(options: unless.Options["custom"]): express.RequestHandler; declare namespace unless { + type pathFilter = string | RegExp | { url: string | RegExp, methods?: string[] }; + export interface Options { custom?: (req: express.Request) => boolean; - path?: string | string[]; + path?: pathFilter | pathFilter[]; ext?: string | string[]; method?: string | string[]; + useOriginalUrl?: boolean; } export interface RequestHandler extends express.RequestHandler { unless?: typeof unless;