Move apps and utilities into common

firebase · inlined · Jun 27, 2022 · Jun 17, 2022 · Jun 17, 2022 · Jun 18, 2022
commit 97e6526385b45eb54ca465956e72922fda37eca5
diff --git a/spec/common/providers/https.spec.ts b/spec/common/providers/https.spec.ts
@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import * as firebase from 'firebase-admin';
 import * as sinon from 'sinon';
 
-import { apps as appsNamespace } from '../../../src/apps';
+import { apps as appsNamespace } from '../../../src/common/apps';
 import * as debug from '../../../src/common/debug';
 import * as https from '../../../src/common/providers/https';
 import * as mocks from '../../fixtures/credential/key.json';

diff --git a/spec/common/providers/tasks.spec.ts b/spec/common/providers/tasks.spec.ts
@@ -23,7 +23,7 @@
 import { expect } from 'chai';
 import * as firebase from 'firebase-admin';
 
-import { apps as appsNamespace } from '../../../src/apps';
+import { apps as appsNamespace } from '../../../src/common/apps';
 import * as https from '../../../src/common/providers/https';
 import {
   onDispatchHandler,

diff --git a/spec/utilities/path-pattern.spec.ts → spec/common/utilities/path-pattern.spec.ts b/spec/utilities/path-pattern.spec.ts → spec/common/utilities/path-pattern.spec.ts
@@ -20,7 +20,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 import { expect } from 'chai';
-import * as pathPattern from '../../src/utilities/path-pattern';
+import * as pathPattern from '../../../src/common/utilities/path-pattern';
 
 describe('path-pattern', () => {
   describe('trimParam', () => {

diff --git a/spec/utilities/path.spec.ts → spec/common/utilities/path.spec.ts b/spec/utilities/path.spec.ts → spec/common/utilities/path.spec.ts
@@ -1,5 +1,5 @@
 import { expect } from 'chai';
-import { normalizePath, pathParts } from '../../src/utilities/path';
+import { normalizePath, pathParts } from '../../../src/common/utilities/path';
 
 describe('utilities', () => {
   describe('path', () => {

diff --git a/spec/v1/apps.spec.ts b/spec/v1/apps.spec.ts
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 import { expect } from 'chai';
-import { apps as appsNamespace } from '../../src/apps';
+import { apps as appsNamespace } from '../../src/common/apps';
 
 import * as firebase from 'firebase-admin';
 import * as _ from 'lodash';

diff --git a/spec/v1/providers/database.spec.ts b/spec/v1/providers/database.spec.ts
@@ -21,9 +21,9 @@
 // SOFTWARE.
 
 import { expect } from 'chai';
-import { apps as appsNamespace } from '../../../src/apps';
+import { apps as appsNamespace } from '../../../src/common/apps';
 import * as config from '../../../src/common/config';
-import { applyChange } from '../../../src/utils';
+import { applyChange } from '../../../src/common/utilities/utils';
 import * as functions from '../../../src/v1';
 import * as database from '../../../src/v1/providers/database';
 

diff --git a/spec/v1/utils.spec.ts b/spec/v1/utils.spec.ts
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 import { expect } from 'chai';
-import { applyChange } from '../../src/utils';
+import { applyChange } from '../../src/common/utilities/utils';
 
 describe('utils', () => {
   describe('.applyChange(from: any, to: any): any', () => {

diff --git a/spec/v2/providers/database.spec.ts b/spec/v2/providers/database.spec.ts
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 import { expect } from 'chai';
-import { PathPattern } from '../../../src/utilities/path-pattern';
+import { PathPattern } from '../../../src/common/utilities/path-pattern';
 import * as database from '../../../src/v2/providers/database';
 
 const RAW_RTDB_EVENT: database.RawRTDBCloudEvent = {

diff --git a/src/apps.ts → src/common/apps.ts b/src/apps.ts → src/common/apps.ts
@@ -22,7 +22,7 @@
 
 import * as firebase from 'firebase-admin';
 import * as _ from 'lodash';
-import { firebaseConfig } from './common/config';
+import { firebaseConfig } from './config';
 
 export function apps(): apps.Apps {
   if (typeof apps.singleton === 'undefined') {

diff --git a/src/common/providers/database.ts b/src/common/providers/database.ts
@@ -21,7 +21,7 @@
 // SOFTWARE.
 
 import * as firebase from 'firebase-admin';
-import { joinPath, pathParts } from '../../utilities/path';
+import { joinPath, pathParts } from '../../common/utilities/path';
 import { firebaseConfig } from '../config';
 
 /**

diff --git a/src/common/providers/https.ts b/src/common/providers/https.ts
@@ -29,7 +29,7 @@ import * as logger from '../../logger';
 
 // TODO(inlined): Decide whether we want to un-version apps or whether we want a
 // different strategy
-import { apps } from '../../apps';
+import { apps } from '../apps';
 import { isDebugFeatureEnabled } from '../debug';
 import { TaskContext } from './tasks';
 

diff --git a/src/common/providers/identity.ts b/src/common/providers/identity.ts
@@ -22,9 +22,9 @@
 
 import * as express from 'express';
 import * as firebase from 'firebase-admin';
-import { apps } from '../../apps';
 import * as logger from '../../logger';
 import { EventContext } from '../../v1/cloud-functions';
+import { apps } from '../apps';
 import { isDebugFeatureEnabled } from '../debug';
 import { HttpsError, unsafeDecodeToken } from './https';
 

diff --git a/src/utilities/assertions.ts → src/common/utilities/assertions.ts b/src/utilities/assertions.ts → src/common/utilities/assertions.ts
diff --git a/src/utilities/encoder.ts → src/common/utilities/encoder.ts b/src/utilities/encoder.ts → src/common/utilities/encoder.ts
diff --git a/src/utilities/path-pattern.ts → src/common/utilities/path-pattern.ts b/src/utilities/path-pattern.ts → src/common/utilities/path-pattern.ts
diff --git a/src/utilities/path.ts → src/common/utilities/path.ts b/src/utilities/path.ts → src/common/utilities/path.ts
diff --git a/src/utils.ts → src/common/utilities/utils.ts b/src/utils.ts → src/common/utilities/utils.ts
diff --git a/src/v1/handler-builder.ts b/src/v1/handler-builder.ts
@@ -22,7 +22,7 @@
 
 import * as express from 'express';
 
-import { apps } from '../apps';
+import { apps } from '../common/apps';
 import { CloudFunction, EventContext, HttpsFunction } from './cloud-functions';
 import * as analytics from './providers/analytics';
 import * as auth from './providers/auth';

diff --git a/src/v1/index.ts b/src/v1/index.ts
@@ -32,7 +32,7 @@ import * as storage from './providers/storage';
 import * as tasks from './providers/tasks';
 import * as testLab from './providers/testLab';
 
-import * as apps from '../apps';
+import * as apps from '../common/apps';
 import * as logger from '../logger';
 import { handler } from './handler-builder';
 

diff --git a/src/v1/providers/database.ts b/src/v1/providers/database.ts
@@ -20,11 +20,11 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { apps } from '../../apps';
+import { apps } from '../../common/apps';
 import { firebaseConfig } from '../../common/config';
 import { DataSnapshot } from '../../common/providers/database';
-import { normalizePath } from '../../utilities/path';
-import { applyChange } from '../../utils';
+import { normalizePath } from '../../common/utilities/path';
+import { applyChange } from '../../common/utilities/utils';
 import {
   Change,
   CloudFunction,

diff --git a/src/v1/providers/firestore.ts b/src/v1/providers/firestore.ts
@@ -24,9 +24,9 @@ import * as firebase from 'firebase-admin';
 import * as _ from 'lodash';
 
 import { posix } from 'path';
-import { apps } from '../../apps';
+import { apps } from '../../common/apps';
+import { dateToTimestampProto } from '../../common/utilities/encoder';
 import * as logger from '../../logger';
-import { dateToTimestampProto } from '../../utilities/encoder';
 import {
   Change,
   CloudFunction,

diff --git a/src/v2/providers/database.ts b/src/v2/providers/database.ts
@@ -20,12 +20,12 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import { apps } from '../../apps';
+import { apps } from '../../common/apps';
 import { DataSnapshot } from '../../common/providers/database';
+import { normalizePath } from '../../common/utilities/path';
+import { PathPattern } from '../../common/utilities/path-pattern';
+import { applyChange } from '../../common/utilities/utils';
 import { ManifestEndpoint } from '../../runtime/manifest';
-import { normalizePath } from '../../utilities/path';
-import { PathPattern } from '../../utilities/path-pattern';
-import { applyChange } from '../../utils';
 import { Change } from '../../v1/cloud-functions';
 import { CloudEvent, CloudFunction } from '../core';
 import * as options from '../options';