Cleanup: lint

Author: MarkDuckworth

packages/firestore/src/core/query.ts

@@ -24,10 +24,8 @@ import {
   Bound,
   canonifyTarget,
   Direction,
-  FieldFilter,
   Filter,
   newTarget,
-  Operator,
   OrderBy,
   boundSortsBeforeDocument,
   stringifyTarget,
@@ -323,8 +321,8 @@ export function queryToTarget(query: Query): Target {
 }
 
 export function queryWithAddedFilter(query: Query, filter: Filter): Query {
-  let newInequalityField = filter.getFirstInequalityField();
-  let queryInequalityField = getInequalityFilterField(query);
+  const newInequalityField = filter.getFirstInequalityField();
+  const queryInequalityField = getInequalityFilterField(query);
 
   debugAssert(
     queryInequalityField == null ||

packages/firestore/src/core/target.ts

@@ -697,15 +697,15 @@ export class FieldFilter extends Filter {
     );
   }
 
-  public getFlattenedFilters(): FieldFilter[] {
+  getFlattenedFilters(): FieldFilter[] {
     return [this];
   }
 
-  public getFilters(): Filter[] {
+  getFilters(): Filter[] {
     return [this];
   }
 
-  public getFirstInequalityField(): FieldPath | null {
+  getFirstInequalityField(): FieldPath | null {
     if (this.isInequality()) {
       return this.field;
     }
@@ -738,7 +738,7 @@ export class CompositeFilter extends Filter {
     }
   }
 
-  public getFlattenedFilters(): FieldFilter[] {
+  getFlattenedFilters(): FieldFilter[] {
     // TODO(orquery): memoize this result if this method is used more than once
     let result: FieldFilter[] = [];
     result = this.filters.reduce((result, subfilter) => {
@@ -747,16 +747,16 @@ export class CompositeFilter extends Filter {
     return result;
   }
 
-  public getFilters(): Filter[] {
+  getFilters(): Filter[] {
     return this.filters;
   }
 
-  public getOperator(): CompositeOperator {
+  getOperator(): CompositeOperator {
     return this.op;
   }
 
-  public getFirstInequalityField(): FieldPath | null {
-    let found = this.findFirstMatchingFilter(filter => filter.isInequality());
+  getFirstInequalityField(): FieldPath | null {
+    const found = this.findFirstMatchingFilter(filter => filter.isInequality());
 
     if (found !== null) {
       return found.field;
@@ -786,7 +786,7 @@ export class CompositeFilter extends Filter {
     return null;
   }
 
-  public isConjunction(): boolean {
+  isConjunction(): boolean {
     return this.op === CompositeOperator.AND;
   }
 }

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

@@ -47,7 +47,6 @@ import { FieldPath as InternalFieldPath, ResourcePath } from '../model/path';
 import { isServerTimestamp } from '../model/server_timestamps';
 import { refValue } from '../model/values';
 import { Value as ProtoValue } from '../protos/firestore_proto_api';
-import { debugAssert } from '../util/assert';
 import { Code, FirestoreError } from '../util/error';
 import {
   validatePositiveNumber,
@@ -217,7 +216,7 @@ class QueryCompositeFilterConstraint extends QueryConstraint {
       })
       .filter(parsedFilter => parsedFilter.getFilters().length > 0);
 
-    if (parsedFilters.length == 1) {
+    if (parsedFilters.length === 1) {
       return parsedFilters[0];
     }
 
@@ -239,12 +238,12 @@ class QueryCompositeFilterConstraint extends QueryConstraint {
     );
   }
 
-  public getQueryConstraints(): QueryConstraint[] {
+  getQueryConstraints(): QueryConstraint[] {
     return this._queryConstraints;
   }
 
-  public getOperator(): CompositeOperator {
-    return this.type == 'and' ? CompositeOperator.AND : CompositeOperator.OR;
+  getOperator(): CompositeOperator {
+    return this.type === 'and' ? CompositeOperator.AND : CompositeOperator.OR;
   }
 }
 
@@ -890,8 +889,6 @@ function validateNewFieldFilter(
   query: InternalQuery,
   fieldFilter: FieldFilter
 ): void {
-  const filterOp = fieldFilter.op;
-
   if (fieldFilter.isInequality()) {
     const existingInequality = getInequalityFilterField(query);
     const newInequality = fieldFilter.field;
@@ -944,7 +941,7 @@ function validateNewFieldFilter(
 function validateNewFilter(query: InternalQuery, filter: Filter): void {
   let testQuery = query;
   const subFilters = filter.getFlattenedFilters();
-  for (let subFilter of subFilters) {
+  for (const subFilter of subFilters) {
     validateNewFieldFilter(testQuery, subFilter);
     testQuery = queryWithAddedFilter(testQuery, subFilter);
   }