Extract configuration to break dependency cycle

Author: merlinnot

src/cloud-functions.ts

@@ -23,7 +23,7 @@
 import { Request, Response } from 'express';
 import * as _ from 'lodash';
 import { apps } from './apps';
-import { DeploymentOptions } from './function-builder';
+import { DeploymentOptions, Schedule } from './function-configuration';
 export { Request, Response };
 
 const WILDCARD_REGEX = new RegExp('{[^/{}]*}', 'g');
@@ -168,20 +168,6 @@ export interface TriggerAnnotated {
  };
 }
 
-export interface ScheduleRetryConfig {
- retryCount?: number;
- maxRetryDuration?: string;
- minBackoffDuration?: string;
- maxBackoffDuration?: string;
- maxDoublings?: number;
-}
-
-export interface Schedule {
- schedule: string;
- timeZone?: string;
- retryConfig?: ScheduleRetryConfig;
-}
-
 /** A Runnable has a `run` method which directly invokes the user-defined function - useful for unit testing. */
 export interface Runnable<T> {
  run: (data: T, context: any) => PromiseLike<any> | any;

src/function-builder.ts

@@ -20,9 +20,17 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import * as _ from 'lodash';
 import * as express from 'express';
+import * as _ from 'lodash';
 
+import { CloudFunction, EventContext } from './cloud-functions';
+import {
+ DeploymentOptions,
+ MAX_TIMEOUT_SECONDS,
+ RuntimeOptions,
+ SUPPORTED_REGIONS,
+ VALID_MEMORY_OPTIONS,
+} from './function-configuration';
 import * as analytics from './providers/analytics';
 import * as auth from './providers/auth';
 import * as crashlytics from './providers/crashlytics';
@@ -32,35 +40,6 @@ import * as https from './providers/https';
 import * as pubsub from './providers/pubsub';
 import * as remoteConfig from './providers/remoteConfig';
 import * as storage from './providers/storage';
-import { CloudFunction, EventContext, Schedule } from './cloud-functions';
-
-/**
- * List of all regions supported by Cloud Functions.
- */
-const SUPPORTED_REGIONS = [
- 'us-central1',
- 'us-east1',
- 'us-east4',
- 'europe-west1',
- 'europe-west2',
- 'asia-east2',
- 'asia-northeast1',
-];
-
-/**
- * List of available memory options supported by Cloud Functions.
- */
-const VALID_MEMORY_OPTS = ['128MB', '256MB', '512MB', '1GB', '2GB'];
-
-// Adding this memory type here to error on compile for TS users.
-// Unfortunately I have not found a way to merge this with VALID_MEMORY_OPS
-// without it being super ugly. But here they are right next to each other at least.
-type Memory = '128MB' | '256MB' | '512MB' | '1GB' | '2GB';
-
-/**
- * Cloud Functions max timeout value.
- */
-const MAX_TIMEOUT_SECONDS = 540;
 
 /**
  * Assert that the runtime options passed in are valid.
@@ -70,10 +49,10 @@ const MAX_TIMEOUT_SECONDS = 540;
 function assertRuntimeOptionsValid(runtimeOptions: RuntimeOptions): boolean {
  if (
  runtimeOptions.memory &&
- !_.includes(VALID_MEMORY_OPTS, runtimeOptions.memory)
+ !_.includes(VALID_MEMORY_OPTIONS, runtimeOptions.memory)
  ) {
  throw new Error(
- `The only valid memory allocation values are: ${VALID_MEMORY_OPTS.join(
+ `The only valid memory allocation values are: ${VALID_MEMORY_OPTIONS.join(
  ', '
  )}`
  );
@@ -130,18 +109,6 @@ export function runWith(runtimeOptions: RuntimeOptions): FunctionBuilder {
  }
 }
 
-export interface RuntimeOptions {
- timeoutSeconds?: number;
- memory?: Memory;
-}
-
-export interface DeploymentOptions {
- regions?: string[];
- timeoutSeconds?: number;
- memory?: Memory;
- schedule?: Schedule;
-}
-
 export class FunctionBuilder {
  constructor(private options: DeploymentOptions) {}
 

src/function-configuration.ts

@@ -0,0 +1,63 @@
+/**
+ * List of all regions supported by Cloud Functions.
+ */
+export const SUPPORTED_REGIONS = [
+ 'us-central1',
+ 'us-east1',
+ 'us-east4',
+ 'europe-west1',
+ 'europe-west2',
+ 'asia-east2',
+ 'asia-northeast1',
+];
+
+/**
+ * Cloud Functions min timeout value.
+ */
+export const MIN_TIMEOUT_SECONDS = 0;
+
+/**
+ * Cloud Functions max timeout value.
+ */
+export const MAX_TIMEOUT_SECONDS = 540;
+
+/**
+ * List of available memory options supported by Cloud Functions.
+ */
+export const VALID_MEMORY_OPTIONS = [
+ '128MB',
+ '256MB',
+ '512MB',
+ '1GB',
+ '2GB',
+] as const;
+
+export interface ScheduleRetryConfig {
+ retryCount?: number;
+ maxRetryDuration?: string;
+ minBackoffDuration?: string;
+ maxBackoffDuration?: string;
+ maxDoublings?: number;
+}
+
+export interface Schedule {
+ schedule: string;
+ timeZone?: string;
+ retryConfig?: ScheduleRetryConfig;
+}
+
+export interface RuntimeOptions {
+ /**
+ * Amount of memory to allocate to the function.
+ */
+ memory?: typeof VALID_MEMORY_OPTIONS[number];
+ /**
+ * Timeout for the function in seconds, possible values are 0 to 540.
+ */
+ timeoutSeconds?: number;
+}
+
+export interface DeploymentOptions extends RuntimeOptions {
+ regions?: string[];
+ schedule?: Schedule;
+}

src/index.ts

@@ -23,15 +23,15 @@
 // Providers:
 import * as analytics from './providers/analytics';
 import * as auth from './providers/auth';
-
-import * as apps from './apps';
 import * as crashlytics from './providers/crashlytics';
 import * as database from './providers/database';
 import * as firestore from './providers/firestore';
 import * as https from './providers/https';
 import * as pubsub from './providers/pubsub';
 import * as remoteConfig from './providers/remoteConfig';
 import * as storage from './providers/storage';
+
+import * as apps from './apps';
 import { handler } from './handler-builder';
 import { setup } from './setup';
 
@@ -52,8 +52,9 @@ export {
 };
 
 // Exported root types:
-export * from './config';
 export * from './cloud-functions';
+export * from './config';
 export * from './function-builder';
+export * from './function-configuration';
 
 setup();

src/providers/analytics.ts

@@ -23,12 +23,12 @@
 import * as _ from 'lodash';
 
 import {
- makeCloudFunction,
  CloudFunction,
  Event,
  EventContext,
+ makeCloudFunction,
 } from '../cloud-functions';
-import { DeploymentOptions } from '../function-builder';
+import { DeploymentOptions } from '../function-configuration';
 
 /** @internal */
 export const provider = 'google.analytics';

src/providers/auth.ts

@@ -20,15 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+import * as firebase from 'firebase-admin';
+import * as _ from 'lodash';
 import {
- makeCloudFunction,
  CloudFunction,
- EventContext,
  Event,
+ EventContext,
+ makeCloudFunction,
 } from '../cloud-functions';
-import * as firebase from 'firebase-admin';
-import * as _ from 'lodash';
-import { DeploymentOptions } from '../function-builder';
+import { DeploymentOptions } from '../function-configuration';
 
 /** @internal */
 export const provider = 'google.firebase.auth';

src/providers/crashlytics.ts

@@ -21,11 +21,11 @@
 // SOFTWARE.
 
 import {
- makeCloudFunction,
  CloudFunction,
  EventContext,
+ makeCloudFunction,
 } from '../cloud-functions';
-import { DeploymentOptions } from '../function-builder';
+import { DeploymentOptions } from '../function-configuration';
 
 /** @internal */
 export const provider = 'google.firebase.crashlytics';

src/providers/database.ts

@@ -32,7 +32,7 @@ import {
 import { normalizePath, applyChange, pathParts, joinPath } from '../utils';
 import * as firebase from 'firebase-admin';
 import { firebaseConfig } from '../config';
-import { DeploymentOptions } from '../function-builder';
+import { DeploymentOptions } from '../function-configuration';
 
 /** @internal */
 export const provider = 'google.firebase.database';

src/providers/firestore.ts

@@ -20,19 +20,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { posix } from 'path';
-import * as _ from 'lodash';
 import * as firebase from 'firebase-admin';
+import * as _ from 'lodash';
+import { posix } from 'path';
 import { apps } from '../apps';
 import {
- makeCloudFunction,
- CloudFunction,
  Change,
+ CloudFunction,
  Event,
  EventContext,
+ makeCloudFunction,
 } from '../cloud-functions';
 import { dateToTimestampProto } from '../encoder';
-import { DeploymentOptions } from '../function-builder';
+import { DeploymentOptions } from '../function-configuration';
 
 /** @internal */
 export const provider = 'google.firestore';

src/providers/https.ts

@@ -20,13 +20,13 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+import * as cors from 'cors';
 import * as express from 'express';
 import * as firebase from 'firebase-admin';
 import * as _ from 'lodash';
-import * as cors from 'cors';
 import { apps } from '../apps';
 import { HttpsFunction, optsToTrigger, Runnable } from '../cloud-functions';
-import { DeploymentOptions } from '../function-builder';
+import { DeploymentOptions } from '../function-configuration';
 
 /**
  *