Adding support for observables.

package.json

@@ -30,40 +30,43 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "argparse": "^1.0.10",
-    "debug": "^4.1.1",
-    "fs-extra-promise": "^1.0.1",
-    "glob": "^7.1.6",
-    "lodash": "^4.17.15",
-    "merge": "^1.2.1",
-    "minimatch": "^3.0.4",
-    "mkdirp": "^0.5.1",
-    "path": "^0.12.7",
-    "swagger2openapi": "^5.3.3",
-    "typescript": "^3.7.5",
-    "typescript-rest": "^2.2.6",
-    "yamljs": "^0.2.10",
     "@types/argparse": "^1.0.38",
-    "@types/jest": "^24.0.21",
     "@types/debug": "^4.1.5",
     "@types/fs-extra-promise": "^1.0.8",
     "@types/glob": "^7.1.1",
-    "jest": "^24.9.0",
+    "@types/jest": "^24.0.21",
     "@types/lodash": "^4.14.149",
     "@types/minimatch": "^3.0.3",
     "@types/mkdirp": "^0.3.29",
     "@types/yamljs": "^0.2.30",
+    "argparse": "^1.0.10",
     "coveralls": "^3.0.9",
     "cross-env": "^4.0.0",
+    "debug": "^4.1.1",
+    "express": "^4.17.1",
+    "fs-extra-promise": "^1.0.1",
+    "glob": "^7.1.6",
+    "jest": "^24.9.0",
     "jsonata": "^1.8.1",
+    "lodash": "^4.17.15",
+    "merge": "^1.2.1",
+    "minimatch": "^3.0.4",
+    "mkdirp": "^0.5.1",
     "mocha": "^5.2.0",
+    "path": "^0.12.7",
     "rimraf": "^2.7.1",
+    "rxjs": "^6.5.4",
     "source-map-support": "^0.4.14",
+    "swagger-ui-express": "^4.1.4",
+    "swagger2openapi": "^5.3.3",
     "ts-jest": "^24.1.0",
     "ts-loader": "^5.3.3",
     "ts-node": "^8.6.2",
     "tslint": "^5.20.1",
-    "tslint-config-prettier": "^1.17.0"
+    "tslint-config-prettier": "^1.17.0",
+    "typescript": "^3.7.5",
+    "typescript-rest": "^2.2.6",
+    "yamljs": "^0.2.10"
   },
   "repository": {
     "type": "git",

src/metadata/resolveType.ts

@@ -55,10 +55,11 @@ export function resolveType(typeNode?: ts.TypeNode, genericTypeMap?: Map<String,
     if (typeName === 'DownloadBinaryData') { return { typeName: 'buffer' }; }
     if (typeName === 'DownloadResource') { return { typeName: 'buffer' }; }
 
-    if (typeName === 'Promise') {
+    if (typeName === 'Promise' || typeName === 'Observable') {
         typeReference = typeReference.typeArguments[0];
         return resolveType(typeReference, genericTypeMap);
     }
+
     if (typeName === 'Array') {
         typeReference = typeReference.typeArguments[0];
         return {

test/data/apis.ts

@@ -1,5 +1,6 @@
 'use strict';
 
+import {Observable, of} from "rxjs";
 import {
     Accept, DELETE, FormParam, GET, Path,
     PathParam, POST, PUT, QueryParam,
@@ -464,3 +465,47 @@ export class ResponseController {
         return 'OK';
     }
 }
+
+@Path('observable')
+export class ObservableController {
+    @GET
+    public get(): Observable<string> {
+        return of('hello');
+    }
+
+    @GET
+    @Path('array')
+    public getArray(): Observable<Array<string>> {
+        return of([]);
+    }
+
+    @GET
+    @Path('person')
+    public getPerson(): Observable<Person> {
+        return of({
+            address: {
+                street: 'Fleet Street'
+            } as Address,
+            name: 'Jon'
+        } as Person);
+    }
+
+    @GET
+    @Path('population')
+    public getPersons(): Observable<Array<Person>> {
+        return of([
+            {
+                address: {
+                    street: 'Fleet Street'
+                } as Address,
+                name: 'Jon'
+            },
+            {
+                address: {
+                    street: 'Cannon Street'
+                } as Address,
+                name: 'Jessica'
+            }
+        ]);
+    }
+}

test/server/server.js

@@ -0,0 +1,10 @@
+express = require("express");
+swaggerUi = require('swagger-ui-express'),
+swaggerDocument = require('../dist/swagger.json');
+
+app = express();
+
+app.use('/api-docs', swaggerUi.serve, swaggerUi.setup(swaggerDocument));
+app.listen(3000, () => {
+    console.log("Server running on port 3000");
+});

test/unit/definitions.spec.ts

@@ -432,4 +432,12 @@ describe('Definition generation', () => {
     });
   });
 
+  describe('Should support observables', () => {
+    it('', () => {
+      expect(spec.paths).toHaveProperty('/observable');
+      expect(spec.paths).toHaveProperty('/observable/array');
+      expect(spec.paths).toHaveProperty('/observable/person');
+      expect(spec.paths).toHaveProperty('/observable/population');
+    });
+  });
 });