From ac26c031133e42c5db287c3c5070c78dcd0d58c7 Mon Sep 17 00:00:00 2001
From: Lauren Long <longlauren@google.com>
Date: Fri, 20 Apr 2018 21:21:27 -0700
Subject: [PATCH 1/2] Ensure cleanup is in type definition of module export.

---
 src/features.ts | 8 ++++++--
 src/index.ts    | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/features.ts b/src/features.ts
index 564af09..dbc2f33 100644
--- a/src/features.ts
+++ b/src/features.ts
@@ -7,7 +7,7 @@ import * as firestore from './providers/firestore';
 import * as pubsub from './providers/pubsub';
 import * as storage from './providers/storage';
 
-export interface FeaturesList {
+export interface LazyFeatures {
   mockConfig: typeof mockConfig;
   wrap: typeof wrap;
   makeChange: typeof makeChange;
@@ -20,7 +20,7 @@ export interface FeaturesList {
   storage: typeof storage;
 }
 
-export const features: FeaturesList = {
+export const features: LazyFeatures = {
   mockConfig,
   wrap,
   makeChange,
@@ -32,3 +32,7 @@ export const features: FeaturesList = {
   pubsub,
   storage,
 };
+
+export interface FeatureList extends LazyFeatures {
+  cleanup;
+}
diff --git a/src/index.ts b/src/index.ts
index ebbfcb4..3acc5d3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -24,7 +24,7 @@ import { AppOptions } from 'firebase-admin';
 import { merge } from 'lodash';
 
 import { FirebaseFunctionsTest } from './lifecycle';
-import { features as lazyFeatures, FeaturesList } from './features';
+import { features as lazyFeatures, FeatureList } from './features';
 
 export = (firebaseConfig?: AppOptions) => {
   const test = new FirebaseFunctionsTest();
@@ -35,5 +35,5 @@ export = (firebaseConfig?: AppOptions) => {
   features = merge({}, features, {
     cleanup: () => test.cleanup,
   });
-  return features;
+  return features as FeatureList;
 };

From b09d28625cd8a68fa65659d4e29d267995a500e3 Mon Sep 17 00:00:00 2001
From: Lauren Long <longlauren@google.com>
Date: Fri, 20 Apr 2018 21:25:03 -0700
Subject: [PATCH 2/2] Rename FeatureList to FeaturesList

---
 src/features.ts | 2 +-
 src/index.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features.ts b/src/features.ts
index dbc2f33..284e8c2 100644
--- a/src/features.ts
+++ b/src/features.ts
@@ -33,6 +33,6 @@ export const features: LazyFeatures = {
   storage,
 };
 
-export interface FeatureList extends LazyFeatures {
+export interface FeaturesList extends LazyFeatures {
   cleanup;
 }
diff --git a/src/index.ts b/src/index.ts
index 3acc5d3..2b69ce3 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -24,7 +24,7 @@ import { AppOptions } from 'firebase-admin';
 import { merge } from 'lodash';
 
 import { FirebaseFunctionsTest } from './lifecycle';
-import { features as lazyFeatures, FeatureList } from './features';
+import { features as lazyFeatures, FeaturesList } from './features';
 
 export = (firebaseConfig?: AppOptions) => {
   const test = new FirebaseFunctionsTest();
@@ -35,5 +35,5 @@ export = (firebaseConfig?: AppOptions) => {
   features = merge({}, features, {
     cleanup: () => test.cleanup,
   });
-  return features as FeatureList;
+  return features as FeaturesList;
 };