[swaggerize-express] Add RequestHandler array to RouteSegment i/f (De…

…finitelyTyped#20001) * Added RequestHandler array to RouteSegment i/f Also replaced a couple of String declarations with string. * Removed spread operators to downgrade to TypeScript 2.0
alexandre-melard · Oct 2, 2017 · bfafb5f · bfafb5f
1 parent aeea74d
commit bfafb5f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 25 deletions.
diff --git a/types/swaggerize-express/index.d.ts b/types/swaggerize-express/index.d.ts
@@ -224,13 +224,13 @@ declare namespace swaggerize {
     }
 
     export interface RouteSegment {
-        [urlSegment: string]: RouteSegment | express.RequestHandler;
+        [urlSegment: string]: RouteSegment | express.RequestHandler | express.RequestHandler[];
     }
 
     export interface Options {
         api: Swagger.ApiDefinition
-        docspath: String
-        handlers: String | RouteSegment
+        docspath: string
+        handlers: string | RouteSegment
     }
 
     export interface IConfig {

diff --git a/types/swaggerize-express/swaggerize-express-tests.ts b/types/swaggerize-express/swaggerize-express-tests.ts
@@ -2,35 +2,26 @@ import http = require('http');
 import express = require('express');
 import swaggerize = require('swaggerize-express');
 
+const api = {
+    swagger: "2.0",
+    host: "localhost:8080",
+    info: {
+        title: "swaggerize-express.d.ts test",
+        version: "1"
+    },
+    paths: {
+    }
+};
+
 var app = express();
 app.use(swaggerize(<swaggerize.Options>{
-    api: {
-        swagger: "2.0",
-        host: "localhost:8080",
-        info: {
-            title: "swaggerize-express.d.ts test",
-            version: "1"
-        },
-        paths: {
-
-        }
-    },
+    api,
     docspath: '/api-docs',
     handlers: './handlers'
 }));
 
 app.use(swaggerize(<swaggerize.Options>{
-    api: {
-        swagger: "2.0",
-        host: "localhost:8080",
-        info: {
-            title: "swaggerize-express.d.ts test",
-            version: "1"
-        },
-        paths: {
-
-        }
-    },
+    api,
     docspath: '/api-docs',
     handlers: {
         'api': {
@@ -43,6 +34,21 @@ app.use(swaggerize(<swaggerize.Options>{
     }
 }));
 
+app.use(swaggerize(<swaggerize.Options>{
+    api,
+    docspath: '/api-docs',
+    handlers: {
+        'api': {
+            'authenticated-path': {
+                '$get': [
+                    (req: express.Request, res: express.Response, next: express.NextFunction) => next(),
+                    (req: express.Request, res: express.Response) => res.send('v1'),
+                ]
+            }
+        }
+    }
+}));
+
 var server = app.listen(18888, 'localhost', function () {
     (<swaggerize.SwaggerizedExpress>app).swagger.api.host = server.address().address + ':' + server.address().port;
 });