Linting and formatting

Author: MarkDuckworth

packages/firestore/lite/pipelines/pipelines.ts

@@ -53,10 +53,7 @@ export { PipelineResult } from '../../src/lite-api/pipeline-result';
 
 export { Pipeline } from '../../src/lite-api/pipeline';
 
-export {
-  pipeline,
-  execute
-} from '../../src/lite-api/pipeline_impl';
+export { pipeline, execute } from '../../src/lite-api/pipeline_impl';
 
 export {
   Stage,

packages/firestore/src/api/pipeline.ts

@@ -15,43 +15,18 @@
  * limitations under the License.
  */
 
+import { firestoreClientExecutePipeline } from '../core/firestore_client';
 import { Pipeline as LitePipeline } from '../lite-api/pipeline';
 import { PipelineResult } from '../lite-api/pipeline-result';
-import { DocumentData, DocumentReference } from '../lite-api/reference';
+import { DocumentReference } from '../lite-api/reference';
 import { Stage } from '../lite-api/stage';
 import { UserDataReader } from '../lite-api/user_data_reader';
 import { AbstractUserDataWriter } from '../lite-api/user_data_writer';
-import { DocumentKey } from '../model/document_key';
+import { cast } from '../util/input_validation';
 
-import {ensureFirestoreConfigured, Firestore} from './database';
-import {cast} from "../util/input_validation";
-import {firestoreClientExecutePipeline} from "../core/firestore_client";
-
-export class Pipeline<
-  AppModelType = DocumentData
-> extends LitePipeline {
-  /**
-   * @internal
-   * @private
-   * @param db
-   * @param userDataReader
-   * @param userDataWriter
-   * @param stages
-   */
-  constructor(
-    db: Firestore,
-    userDataReader: UserDataReader,
-    userDataWriter: AbstractUserDataWriter,
-    stages: Stage[]
-  ) {
-    super(
-      db,
-      userDataReader,
-      userDataWriter,
-      stages
-    );
-  }
+import { ensureFirestoreConfigured, Firestore } from './database';
 
+export class Pipeline extends LitePipeline {
   /**
    * @internal
    * @private
@@ -69,12 +44,7 @@ export class Pipeline<
     stages: Stage[],
     converter: unknown = {}
   ): Pipeline {
-    return new Pipeline(
-      db,
-      userDataReader,
-      userDataWriter,
-      stages
-    );
+    return new Pipeline(db, userDataReader, userDataWriter, stages);
   }
 
   /**
@@ -108,7 +78,7 @@ export class Pipeline<
    *
    * @return A Promise representing the asynchronous pipeline execution.
    */
-  execute(): Promise<Array<PipelineResult>> {
+  execute(): Promise<PipelineResult[]> {
     const firestore = cast(this._db, Firestore);
     const client = ensureFirestoreConfigured(firestore);
     return firestoreClientExecutePipeline(client, this).then(result => {

packages/firestore/src/api/pipeline_impl.ts

@@ -16,18 +16,16 @@
  */
 
 import { Pipeline } from '../api/pipeline';
-import { PipelineSource } from '../lite-api/pipeline-source';
-import { firestoreClientExecutePipeline } from '../core/firestore_client';
 import { Pipeline as LitePipeline } from '../lite-api/pipeline';
 import { PipelineResult } from '../lite-api/pipeline-result';
+import { PipelineSource } from '../lite-api/pipeline-source';
+import { Stage } from '../lite-api/stage';
 import { newUserDataReader } from '../lite-api/user_data_reader';
-import { DocumentKey } from '../model/document_key';
 import { cast } from '../util/input_validation';
 
-import { Firestore, ensureFirestoreConfigured } from './database';
-import { DocumentReference, Query } from './reference';
+import { Firestore } from './database';
+import { Query } from './reference';
 import { ExpUserDataWriter } from './user_data_writer';
-import {Stage} from "../lite-api/stage";
 
 declare module './database' {
   interface Firestore {
@@ -57,7 +55,8 @@ export function pipeline(
         firestore,
         newUserDataReader(firestore),
         new ExpUserDataWriter(firestore),
-        stages);
+        stages
+      );
     });
   } else {
     let result;
@@ -76,9 +75,7 @@ export function pipeline(
   }
 }
 
-export function execute(
-  pipeline: LitePipeline
-): Promise<Array<PipelineResult>> {
+export function execute(pipeline: LitePipeline): Promise<PipelineResult[]> {
   return pipeline.execute();
 }
 

packages/firestore/src/core/pipeline-util.ts

@@ -17,7 +17,6 @@
 
 import {
   Constant,
-  Expr,
   Field,
   FilterCondition,
   not,
@@ -172,9 +171,7 @@ export function isFirestoreValue(obj: any): obj is ProtoValue {
   return false;
 }
 
-export function toPipelineFilterCondition(
-  f: FilterInternal
-): FilterCondition {
+export function toPipelineFilterCondition(f: FilterInternal): FilterCondition {
   if (f instanceof FieldFilterInternal) {
     const field = Field.of(f.field.toString());
     if (isNanValue(f.value)) {

packages/firestore/src/lite-api/pipeline-source.ts

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import { Pipeline } from './pipeline';
 import { DocumentReference } from './reference';
 import {
   CollectionGroupSource,
   CollectionSource,
   DatabaseSource,
-  DocumentsSource, Stage
+  DocumentsSource,
+  Stage
 } from './stage';
 
 /**
@@ -43,26 +43,18 @@ export class PipelineSource<PipelineType> {
   ) {}
 
   collection(collectionPath: string): PipelineType {
-    return this._createPipeline(
-      [new CollectionSource(collectionPath)]
-    );
+    return this._createPipeline([new CollectionSource(collectionPath)]);
   }
 
   collectionGroup(collectionId: string): PipelineType {
-    return this._createPipeline(
-      [new CollectionGroupSource(collectionId)]
-    );
+    return this._createPipeline([new CollectionGroupSource(collectionId)]);
   }
 
   database(): PipelineType {
-    return this._createPipeline(
-      [new DatabaseSource()]
-    );
+    return this._createPipeline([new DatabaseSource()]);
   }
 
   documents(docs: DocumentReference[]): PipelineType {
-    return this._createPipeline(
-      [DocumentsSource.of(docs)]
-    );
+    return this._createPipeline([DocumentsSource.of(docs)]);
   }
 }

packages/firestore/src/lite-api/pipeline.ts

@@ -17,19 +17,20 @@
 
 /* eslint @typescript-eslint/no-explicit-any: 0 */
 
-import { DocumentKey } from '../model/document_key';
 import { ObjectValue } from '../model/object_value';
 import {
   ExecutePipelineRequest,
   StructuredPipeline,
   Stage as ProtoStage
 } from '../protos/firestore_proto_api';
+import { invokeExecutePipeline } from '../remote/datastore';
 import {
   getEncodedDatabaseId,
   JsonProtoSerializer,
   ProtoSerializable
 } from '../remote/serializer';
 
+import { getDatastore } from './components';
 import { Firestore } from './database';
 import {
   Accumulator,
@@ -43,7 +44,7 @@ import {
   Selectable
 } from './expressions';
 import { PipelineResult } from './pipeline-result';
-import { DocumentData, DocumentReference } from './reference';
+import { DocumentReference } from './reference';
 import {
   AddFields,
   Aggregate,
@@ -64,12 +65,6 @@ import {
   UserDataSource
 } from './user_data_reader';
 import { AbstractUserDataWriter } from './user_data_writer';
-import {cast} from "../util/input_validation";
-import {ensureFirestoreConfigured} from "../api/database";
-import {firestoreClientExecutePipeline} from "../core/firestore_client";
-import {getDatastore} from "./components";
-import {invokeExecutePipeline} from "../remote/datastore";
-import {firestore} from "../../test/util/api_helpers";
 
 interface ReadableUserData {
   _readUserData(dataReader: UserDataReader): void;
@@ -125,9 +120,7 @@ function isReadableUserData(value: any): value is ReadableUserData {
 /**
  * Base-class implementation
  */
-export class Pipeline
-  implements ProtoSerializable<ExecutePipelineRequest>
-{
+export class Pipeline implements ProtoSerializable<ExecutePipelineRequest> {
   /**
    * @internal
    * @private
@@ -299,12 +292,7 @@ export class Pipeline
     stages: Stage[],
     converter: unknown = {}
   ): Pipeline {
-    return new Pipeline(
-      db,
-      userDataReader,
-      userDataWriter,
-      stages
-    );
+    return new Pipeline(db, userDataReader, userDataWriter, stages);
   }
 
   /**
@@ -723,7 +711,7 @@ export class Pipeline
    *
    * @return A Promise representing the asynchronous pipeline execution.
    */
-  execute(): Promise<Array<PipelineResult>> {
+  execute(): Promise<PipelineResult[]> {
     const datastore = getDatastore(this._db);
     return invokeExecutePipeline(datastore, this).then(result => {
       const docs = result
@@ -735,7 +723,7 @@ export class Pipeline
             new PipelineResult(
               this._userDataWriter,
               element.key?.path
-                ? new DocumentReference(this._db, null,element.key)
+                ? new DocumentReference(this._db, null, element.key)
                 : undefined,
               element.fields,
               element.executionTime?.toTimestamp(),

packages/firestore/src/lite-api/pipeline_impl.ts

@@ -15,18 +15,14 @@
  * limitations under the License.
  */
 
-import { DocumentKey } from '../model/document_key';
-import { invokeExecutePipeline } from '../remote/datastore';
-
-import { getDatastore } from './components';
 import { Firestore } from './database';
 import { Pipeline } from './pipeline';
 import { PipelineResult } from './pipeline-result';
 import { PipelineSource } from './pipeline-source';
-import { DocumentReference, Query } from './reference';
+import { Query } from './reference';
 import { LiteUserDataWriter } from './reference_impl';
+import { Stage } from './stage';
 import { newUserDataReader } from './user_data_reader';
-import {Stage} from "./stage";
 
 declare module './database' {
   interface Firestore {
@@ -45,9 +41,7 @@ declare module './reference' {
  * @param pipeline Execute this pipeline.
  * @beta
  */
-export function execute(
-  pipeline: Pipeline
-): Promise<Array<PipelineResult>> {
+export function execute(pipeline: Pipeline): Promise<PipelineResult[]> {
   return pipeline.execute();
 }
 
@@ -71,11 +65,7 @@ export function pipeline(
     const userDataWriter = new LiteUserDataWriter(db);
     const userDataReader = newUserDataReader(db);
     return new PipelineSource<Pipeline>((stages: Stage[]) => {
-      return  new Pipeline(
-        db,
-        userDataReader,
-        userDataWriter,
-        stages);
+      return new Pipeline(db, userDataReader, userDataWriter, stages);
     });
   } else {
     let pipeline;