Merge pull request #123 from FirebasePrivate/inlined.http-functions

Define functions.HttpsFunction type

Author: inlined

src/cloud-functions.ts

@@ -22,6 +22,8 @@
 
 import { apps } from './apps';
 import * as _ from 'lodash';
+import { Request, Response } from 'express';
+export { Request, Response };
 
 /** An event to be handled in a developer's Cloud Function */
 export interface Event<T> {
@@ -47,6 +49,12 @@ export interface TriggerAnnotated {
   };
 }
 
+/**
+ * An HttpsFunction is both an object that exports its trigger definitions at __trigger and
+ * can be called as a function that takes an express.js Request and Response object.
+ */
+export type HttpsFunction = TriggerAnnotated & ((req: Request, resp: Response) => void);
+
 /**
  * A CloudFunction is both an object that exports its trigger definitions at __trigger and
  * can be called as a function using the raw JS API for Google Cloud Functions.

src/providers/https.ts

@@ -20,13 +20,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { TriggerAnnotated } from '../cloud-functions';
-import {Request, Response} from 'express';
-export {Request, Response};
+import { HttpsFunction } from '../cloud-functions';
+import { Request, Response } from 'express';
 
-export function onRequest(
-  handler: (req: Request, resp: Response) => void
-): ((req: Request, resp: Response) => void) & TriggerAnnotated {
+export function onRequest(handler: (req: Request, resp: Response) => void): HttpsFunction {
   // lets us add __trigger without altering handler:
   let cloudFunction: any = (req, res) => { handler(req, res); };
   cloudFunction.__trigger = {httpsTrigger: {}};