Fix firestore source paths

firebase · Oct 3, 2017 · d45f0b8 · d45f0b8
1 parent 35835ab
commit d45f0b8
Show file tree

Hide file tree

Showing 60 changed files with 288 additions and 288 deletions.
diff --git a/packages/firestore/test/integration/api/database.test.ts b/packages/firestore/test/integration/api/database.test.ts
@@ -17,7 +17,7 @@
 import { expect } from 'chai';
 import * as firestore from 'firestore';
 
-import { Deferred } from '../../../../src/firestore/util/promise';
+import { Deferred } from '../../../src/util/promise';
 import { asyncIt } from '../../util/helpers';
 import firebase from '../util/firebase_export';
 import { apiDescribe, withTestCollection, withTestDb } from '../util/helpers';

diff --git a/packages/firestore/test/integration/api/transactions.test.ts b/packages/firestore/test/integration/api/transactions.test.ts
@@ -16,7 +16,7 @@
 
 import { expect } from 'chai';
 import * as firestore from 'firestore';
-import { Deferred } from '../../../../src/firestore/util/promise';
+import { Deferred } from '../../../src/util/promise';
 import * as testHelpers from '../../util/helpers';
 import firebase from '../util/firebase_export';
 import * as integrationHelpers from '../util/helpers';

diff --git a/packages/firestore/test/integration/browser/webchannel.test.ts b/packages/firestore/test/integration/browser/webchannel.test.ts
@@ -15,11 +15,11 @@
  */
 
 import { expect } from 'chai';
-import { WebChannelConnection } from '../../../../src/firestore/platform_browser/webchannel_connection';
+import { WebChannelConnection } from '../../../src/platform_browser/webchannel_connection';
 import {
   DatabaseId,
   DatabaseInfo
-} from '../../../../src/firestore/core/database_info';
+} from '../../../src/core/database_info';
 import * as utilHelpers from '../util/helpers';
 
 describe('WebChannel', () => {

diff --git a/packages/firestore/test/integration/remote/remote.test.ts b/packages/firestore/test/integration/remote/remote.test.ts
@@ -15,21 +15,21 @@
  */
 
 import { expect } from 'chai';
-import { EmptyCredentialsProvider } from '../../../../src/firestore/api/credentials';
+import { EmptyCredentialsProvider } from '../../../src/api/credentials';
 import {
   DatabaseId,
   DatabaseInfo
-} from '../../../../src/firestore/core/database_info';
-import { SnapshotVersion } from '../../../../src/firestore/core/snapshot_version';
+} from '../../../src/core/database_info';
+import { SnapshotVersion } from '../../../src/core/snapshot_version';
 import {
   Document,
   MaybeDocument,
   NoDocument
-} from '../../../../src/firestore/model/document';
-import { MutationResult } from '../../../../src/firestore/model/mutation';
-import { PlatformSupport } from '../../../../src/firestore/platform/platform';
-import { Datastore } from '../../../../src/firestore/remote/datastore';
-import { AsyncQueue } from '../../../../src/firestore/util/async_queue';
+} from '../../../src/model/document';
+import { MutationResult } from '../../../src/model/mutation';
+import { PlatformSupport } from '../../../src/platform/platform';
+import { Datastore } from '../../../src/remote/datastore';
+import { AsyncQueue } from '../../../src/util/async_queue';
 import { addEqualityMatcher } from '../../util/equality_matcher';
 import { asyncIt, key, setMutation } from '../../util/helpers';
 import { DEFAULT_PROJECT_ID, getDefaultDatabaseInfo } from '../util/helpers';

diff --git a/packages/firestore/test/integration/util/firebase_export.ts b/packages/firestore/test/integration/util/firebase_export.ts
@@ -19,7 +19,7 @@
 // swap in a version that loads firebase from the npm module instead.
 
 import firebaseNamespace from '../../../../src/app';
-import '../../../../src/firestore';
+import '../../../src';
 
 // TODO(b/66917182): This "as any" removes all of our type-checking in tests and
 // is therefore pretty bad. But I can't figure out how to avoid it right now.

diff --git a/packages/firestore/test/integration/util/helpers.ts b/packages/firestore/test/integration/util/helpers.ts
@@ -19,7 +19,7 @@ import * as firestore from 'firestore';
 import {
   DatabaseId,
   DatabaseInfo
-} from '../../../../src/firestore/core/database_info';
+} from '../../../src/core/database_info';
 
 import firebase from './firebase_export';
 

diff --git a/packages/firestore/test/unit/api/blob.test.ts b/packages/firestore/test/unit/api/blob.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { expect } from 'chai';
-import { Blob, PublicBlob } from '../../../../src/firestore/api/blob';
+import { Blob, PublicBlob } from '../../../src/api/blob';
 import { blob, expectCorrectComparisons } from '../../util/helpers';
 
 describe('Blob', () => {

diff --git a/packages/firestore/test/unit/api/document_change.test.ts b/packages/firestore/test/unit/api/document_change.test.ts
@@ -19,12 +19,12 @@ import {
   changesFromSnapshot,
   DocumentSnapshot,
   Firestore
-} from '../../../../src/firestore/api/database';
-import { Query } from '../../../../src/firestore/core/query';
-import { View } from '../../../../src/firestore/core/view';
-import { documentKeySet } from '../../../../src/firestore/model/collections';
-import { Document } from '../../../../src/firestore/model/document';
-import { DocumentKey } from '../../../../src/firestore/model/document_key';
+} from '../../../src/api/database';
+import { Query } from '../../../src/core/query';
+import { View } from '../../../src/core/view';
+import { documentKeySet } from '../../../src/model/collections';
+import { Document } from '../../../src/model/document';
+import { DocumentKey } from '../../../src/model/document_key';
 import {
   applyDocChanges,
   doc,

diff --git a/packages/firestore/test/unit/api/geo_point.test.ts b/packages/firestore/test/unit/api/geo_point.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { expect } from 'chai';
-import { GeoPoint } from '../../../../src/firestore/api/geo_point';
+import { GeoPoint } from '../../../src/api/geo_point';
 import { expectCorrectComparisons } from '../../util/helpers';
 
 describe('GeoPoint', () => {

diff --git a/packages/firestore/test/unit/core/event_manager.test.ts b/packages/firestore/test/unit/core/event_manager.test.ts
@@ -20,16 +20,16 @@ import {
   EventManager,
   ListenOptions,
   QueryListener
-} from '../../../../src/firestore/core/event_manager';
-import { Query } from '../../../../src/firestore/core/query';
-import { OnlineState } from '../../../../src/firestore/core/types';
-import { View } from '../../../../src/firestore/core/view';
+} from '../../../src/core/event_manager';
+import { Query } from '../../../src/core/query';
+import { OnlineState } from '../../../src/core/types';
+import { View } from '../../../src/core/view';
 import {
   ChangeType,
   ViewSnapshot
-} from '../../../../src/firestore/core/view_snapshot';
-import { documentKeySet } from '../../../../src/firestore/model/collections';
-import { DocumentSet } from '../../../../src/firestore/model/document_set';
+} from '../../../src/core/view_snapshot';
+import { documentKeySet } from '../../../src/model/collections';
+import { DocumentSet } from '../../../src/model/document_set';
 import { addEqualityMatcher } from '../../util/equality_matcher';
 import {
   ackTarget,

diff --git a/packages/firestore/test/unit/core/query.test.ts b/packages/firestore/test/unit/core/query.test.ts
@@ -15,11 +15,11 @@
  */
 
 import { expect } from 'chai';
-import { Query } from '../../../../src/firestore/core/query';
+import { Query } from '../../../src/core/query';
 import {
   DOCUMENT_KEY_NAME,
   ResourcePath
-} from '../../../../src/firestore/model/path';
+} from '../../../src/model/path';
 import { addEqualityMatcher } from '../../util/equality_matcher';
 import {
   bound,

diff --git a/packages/firestore/test/unit/core/target_id_generator.test.ts b/packages/firestore/test/unit/core/target_id_generator.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { expect } from 'chai';
-import { TargetIdGenerator } from '../../../../src/firestore/core/target_id_generator';
+import { TargetIdGenerator } from '../../../src/core/target_id_generator';
 
 describe('TargetIdGenerator', () => {
   it('can initialize with increment and "after value"', () => {

diff --git a/packages/firestore/test/unit/core/timestamp.test.ts b/packages/firestore/test/unit/core/timestamp.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { expect } from 'chai';
-import { Timestamp } from '../../../../src/firestore/core/timestamp';
+import { Timestamp } from '../../../src/core/timestamp';
 import { addEqualityMatcher } from '../../util/equality_matcher';
 
 describe('Timestamp', () => {

diff --git a/packages/firestore/test/unit/core/view.test.ts b/packages/firestore/test/unit/core/view.test.ts
@@ -15,10 +15,10 @@
  */
 
 import { expect } from 'chai';
-import { Query } from '../../../../src/firestore/core/query';
-import { View } from '../../../../src/firestore/core/view';
-import { ChangeType } from '../../../../src/firestore/core/view_snapshot';
-import { documentKeySet } from '../../../../src/firestore/model/collections';
+import { Query } from '../../../src/core/query';
+import { View } from '../../../src/core/view';
+import { ChangeType } from '../../../src/core/view_snapshot';
+import { documentKeySet } from '../../../src/model/collections';
 import {
   ackTarget,
   addTargetMapping,

diff --git a/packages/firestore/test/unit/local/eager_garbage_collector.test.ts b/packages/firestore/test/unit/local/eager_garbage_collector.test.ts
@@ -15,8 +15,8 @@
  */
 
 import { expect } from 'chai';
-import { EagerGarbageCollector } from '../../../../src/firestore/local/eager_garbage_collector';
-import { ReferenceSet } from '../../../../src/firestore/local/reference_set';
+import { EagerGarbageCollector } from '../../../src/local/eager_garbage_collector';
+import { ReferenceSet } from '../../../src/local/reference_set';
 import { expectSetToEqual, key } from '../../util/helpers';
 import { asyncIt } from '../../util/helpers';
 

diff --git a/packages/firestore/test/unit/local/encoded_resource_path.test.ts b/packages/firestore/test/unit/local/encoded_resource_path.test.ts
@@ -15,17 +15,17 @@
  */
 
 import { expect } from 'chai';
-import * as EncodedResourcePath from '../../../../src/firestore/local/encoded_resource_path';
-import { PersistenceTransaction } from '../../../../src/firestore/local/persistence';
-import { Persistence } from '../../../../src/firestore/local/persistence';
-import { PersistencePromise } from '../../../../src/firestore/local/persistence_promise';
+import * as EncodedResourcePath from '../../../src/local/encoded_resource_path';
+import { PersistenceTransaction } from '../../../src/local/persistence';
+import { Persistence } from '../../../src/local/persistence';
+import { PersistencePromise } from '../../../src/local/persistence_promise';
 import {
   SimpleDb,
   SimpleDbStore,
   SimpleDbTransaction
-} from '../../../../src/firestore/local/simple_db';
-import { ResourcePath } from '../../../../src/firestore/model/path';
-import { fail } from '../../../../src/firestore/util/assert';
+} from '../../../src/local/simple_db';
+import { ResourcePath } from '../../../src/model/path';
+import { fail } from '../../../src/util/assert';
 import { path } from '../../util/helpers';
 import { asyncIt } from '../../util/helpers';
 

diff --git a/packages/firestore/test/unit/local/local_store.test.ts b/packages/firestore/test/unit/local/local_store.test.ts
@@ -15,47 +15,47 @@
  */
 
 import { expect } from 'chai';
-import { User } from '../../../../src/firestore/auth/user';
-import { Query } from '../../../../src/firestore/core/query';
-import { Timestamp } from '../../../../src/firestore/core/timestamp';
-import { TargetId } from '../../../../src/firestore/core/types';
-import { EagerGarbageCollector } from '../../../../src/firestore/local/eager_garbage_collector';
-import { IndexedDbPersistence } from '../../../../src/firestore/local/indexeddb_persistence';
+import { User } from '../../../src/auth/user';
+import { Query } from '../../../src/core/query';
+import { Timestamp } from '../../../src/core/timestamp';
+import { TargetId } from '../../../src/core/types';
+import { EagerGarbageCollector } from '../../../src/local/eager_garbage_collector';
+import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
 import {
   LocalStore,
   LocalWriteResult
-} from '../../../../src/firestore/local/local_store';
-import { LocalViewChanges } from '../../../../src/firestore/local/local_view_changes';
-import { NoOpGarbageCollector } from '../../../../src/firestore/local/no_op_garbage_collector';
-import { Persistence } from '../../../../src/firestore/local/persistence';
+} from '../../../src/local/local_store';
+import { LocalViewChanges } from '../../../src/local/local_view_changes';
+import { NoOpGarbageCollector } from '../../../src/local/no_op_garbage_collector';
+import { Persistence } from '../../../src/local/persistence';
 import {
   DocumentMap,
   MaybeDocumentMap
-} from '../../../../src/firestore/model/collections';
+} from '../../../src/model/collections';
 import {
   Document,
   MaybeDocument,
   NoDocument
-} from '../../../../src/firestore/model/document';
+} from '../../../src/model/document';
 import {
   DeleteMutation,
   Mutation,
   MutationResult,
   PatchMutation,
   SetMutation
-} from '../../../../src/firestore/model/mutation';
+} from '../../../src/model/mutation';
 import {
   MutationBatch,
   MutationBatchResult
-} from '../../../../src/firestore/model/mutation_batch';
-import { emptyByteString } from '../../../../src/firestore/platform/platform';
-import { RemoteEvent } from '../../../../src/firestore/remote/remote_event';
+} from '../../../src/model/mutation_batch';
+import { emptyByteString } from '../../../src/platform/platform';
+import { RemoteEvent } from '../../../src/remote/remote_event';
 import {
   WatchChangeAggregator,
   WatchTargetChange,
   WatchTargetChangeState
-} from '../../../../src/firestore/remote/watch_change';
-import { assert, fail } from '../../../../src/firestore/util/assert';
+} from '../../../src/remote/watch_change';
+import { assert, fail } from '../../../src/util/assert';
 import { addEqualityMatcher } from '../../util/equality_matcher';
 import {
   asyncIt,

diff --git a/packages/firestore/test/unit/local/mutation_queue.test.ts b/packages/firestore/test/unit/local/mutation_queue.test.ts
@@ -15,20 +15,20 @@
  */
 
 import { expect } from 'chai';
-import { User } from '../../../../src/firestore/auth/user';
-import { Query } from '../../../../src/firestore/core/query';
-import { BatchId } from '../../../../src/firestore/core/types';
-import { EagerGarbageCollector } from '../../../../src/firestore/local/eager_garbage_collector';
-import { IndexedDbMutationQueue } from '../../../../src/firestore/local/indexeddb_mutation_queue';
-import { IndexedDbPersistence } from '../../../../src/firestore/local/indexeddb_persistence';
-import { DbMutationBatch } from '../../../../src/firestore/local/indexeddb_schema';
-import { Persistence } from '../../../../src/firestore/local/persistence';
-import { SimpleDbTransaction } from '../../../../src/firestore/local/simple_db';
+import { User } from '../../../src/auth/user';
+import { Query } from '../../../src/core/query';
+import { BatchId } from '../../../src/core/types';
+import { EagerGarbageCollector } from '../../../src/local/eager_garbage_collector';
+import { IndexedDbMutationQueue } from '../../../src/local/indexeddb_mutation_queue';
+import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
+import { DbMutationBatch } from '../../../src/local/indexeddb_schema';
+import { Persistence } from '../../../src/local/persistence';
+import { SimpleDbTransaction } from '../../../src/local/simple_db';
 import {
   BATCHID_UNKNOWN,
   MutationBatch
-} from '../../../../src/firestore/model/mutation_batch';
-import { emptyByteString } from '../../../../src/firestore/platform/platform';
+} from '../../../src/model/mutation_batch';
+import { emptyByteString } from '../../../src/platform/platform';
 import {
   asyncIt,
   expectEqualArrays,

diff --git a/packages/firestore/test/unit/local/persistence_promise.test.ts b/packages/firestore/test/unit/local/persistence_promise.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { expect } from 'chai';
-import { PersistencePromise } from '../../../../src/firestore/local/persistence_promise';
+import { PersistencePromise } from '../../../src/local/persistence_promise';
 
 describe('PersistencePromise', () => {
   function async<R>(value: R): PersistencePromise<R> {

diff --git a/packages/firestore/test/unit/local/persistence_test_helpers.ts b/packages/firestore/test/unit/local/persistence_test_helpers.ts
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-import { DatabaseId } from '../../../../src/firestore/core/database_info';
-import { IndexedDbPersistence } from '../../../../src/firestore/local/indexeddb_persistence';
-import { MemoryPersistence } from '../../../../src/firestore/local/memory_persistence';
-import { SimpleDb } from '../../../../src/firestore/local/simple_db';
-import { JsonProtoSerializer } from '../../../../src/firestore/remote/serializer';
+import { DatabaseId } from '../../../src/core/database_info';
+import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
+import { MemoryPersistence } from '../../../src/local/memory_persistence';
+import { SimpleDb } from '../../../src/local/simple_db';
+import { JsonProtoSerializer } from '../../../src/remote/serializer';
 
 /**
  * Creates and starts an IndexedDbPersistence instance for testing, destroying

diff --git a/packages/firestore/test/unit/local/query_cache.test.ts b/packages/firestore/test/unit/local/query_cache.test.ts
@@ -15,17 +15,17 @@
  */
 
 import { expect } from 'chai';
-import { Query } from '../../../../src/firestore/core/query';
-import { SnapshotVersion } from '../../../../src/firestore/core/snapshot_version';
-import { TargetId } from '../../../../src/firestore/core/types';
-import { EagerGarbageCollector } from '../../../../src/firestore/local/eager_garbage_collector';
-import { IndexedDbPersistence } from '../../../../src/firestore/local/indexeddb_persistence';
-import { MemoryQueryCache } from '../../../../src/firestore/local/memory_query_cache';
-import { Persistence } from '../../../../src/firestore/local/persistence';
+import { Query } from '../../../src/core/query';
+import { SnapshotVersion } from '../../../src/core/snapshot_version';
+import { TargetId } from '../../../src/core/types';
+import { EagerGarbageCollector } from '../../../src/local/eager_garbage_collector';
+import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
+import { MemoryQueryCache } from '../../../src/local/memory_query_cache';
+import { Persistence } from '../../../src/local/persistence';
 import {
   QueryData,
   QueryPurpose
-} from '../../../../src/firestore/local/query_data';
+} from '../../../src/local/query_data';
 import { addEqualityMatcher } from '../../util/equality_matcher';
 import {
   asyncIt,

diff --git a/packages/firestore/test/unit/local/reference_set.test.ts b/packages/firestore/test/unit/local/reference_set.test.ts
@@ -15,7 +15,7 @@
  */
 
 import { expect } from 'chai';
-import { ReferenceSet } from '../../../../src/firestore/local/reference_set';
+import { ReferenceSet } from '../../../src/local/reference_set';
 import { asyncIt, expectSetToEqual, key } from '../../util/helpers';
 
 describe('ReferenceSet', () => {

diff --git a/packages/firestore/test/unit/local/remote_document_cache.test.ts b/packages/firestore/test/unit/local/remote_document_cache.test.ts
@@ -15,10 +15,10 @@
  */
 
 import { expect } from 'chai';
-import { Query } from '../../../../src/firestore/core/query';
-import { IndexedDbPersistence } from '../../../../src/firestore/local/indexeddb_persistence';
-import { Persistence } from '../../../../src/firestore/local/persistence';
-import { MaybeDocument } from '../../../../src/firestore/model/document';
+import { Query } from '../../../src/core/query';
+import { IndexedDbPersistence } from '../../../src/local/indexeddb_persistence';
+import { Persistence } from '../../../src/local/persistence';
+import { MaybeDocument } from '../../../src/model/document';
 import {
   asyncIt,
   deletedDoc,