Linting and code cleanup

Author: MarkDuckworth

packages/firestore/src/api/pipeline_impl.ts

@@ -23,17 +23,17 @@ import {
   NextFn,
   PartialObserver
 } from '../api/observer';
+import { ListenerDataSource } from '../core/event_manager';
 import {
   firestoreClientExecutePipeline,
   firestoreClientListen
 } from '../core/firestore_client';
-import { ListenerDataSource } from '../core/event_manager';
 import { toCorePipeline } from '../core/pipeline-util';
-import { ViewSnapshot } from '../core/view_snapshot';
 import {
   StructuredPipeline,
   StructuredPipelineOptions
 } from '../core/structured_pipeline';
+import { ViewSnapshot } from '../core/view_snapshot';
 import { Pipeline as LitePipeline } from '../lite-api/pipeline';
 import { PipelineResult, PipelineSnapshot } from '../lite-api/pipeline-result';
 import { PipelineSource } from '../lite-api/pipeline-source';

packages/firestore/src/api/reference_impl.ts

@@ -35,7 +35,8 @@ import {
   firestoreClientListen,
   firestoreClientWrite
 } from '../core/firestore_client';
-import { QueryOrPipeline, toCorePipeline } from '../core/pipeline-util';
+import { CorePipeline } from '../core/pipeline';
+import { toCorePipeline } from '../core/pipeline-util';
 import { Query as InternalQuery, newQueryForPath } from '../core/query';
 import { ViewSnapshot } from '../core/view_snapshot';
 import { FieldPath } from '../lite-api/field_path';
@@ -66,6 +67,7 @@ import { Code, FirestoreError } from '../util/error';
 import { cast } from '../util/input_validation';
 
 import { ensureFirestoreConfigured, Firestore } from './database';
+import { RealtimePipeline } from './realtime_pipeline';
 import {
   DocumentSnapshot,
   FirestoreDataConverter,
@@ -74,8 +76,6 @@ import {
   SnapshotMetadata
 } from './snapshot';
 import { ExpUserDataWriter } from './user_data_writer';
-import { RealtimePipeline } from './realtime_pipeline';
-import { CorePipeline } from '../core/pipeline';
 
 /**
  * An options object that can be passed to {@link (onSnapshot:1)} and {@link

packages/firestore/src/api/snapshot.ts

@@ -16,8 +16,8 @@
  */
 
 import { BundleLoader } from '../core/bundle_impl';
-import { createBundleReaderSync } from '../core/firestore_client';
 import { ListenOptions } from '../core/event_manager';
+import { createBundleReaderSync } from '../core/firestore_client';
 import { CorePipeline } from '../core/pipeline';
 import { isPipeline } from '../core/pipeline-util';
 import { newPipelineComparator } from '../core/pipeline_run';
@@ -379,7 +379,7 @@ export class SnapshotMetadata {
 }
 
 /**
- * The type of a `DocumentChange` may be 'added', 'removed', or 'modified'.
+ * The type of `DocumentChange` may be 'added', 'removed', or 'modified'.
  */
 export type DocumentChangeType = 'added' | 'removed' | 'modified';
 

packages/firestore/src/core/expressions.ts

@@ -19,7 +19,6 @@ import {
   Constant,
   Expression,
   FunctionExpression,
-  AggregateFunction,
   ListOfExprs,
   BooleanConstant
 } from '../lite-api/expressions';
@@ -29,6 +28,11 @@ import {
   DOCUMENT_KEY_NAME,
   UPDATE_TIME_NAME
 } from '../model/path';
+import {
+  getLocalWriteTime,
+  getPreviousValue,
+  isServerTimestamp
+} from '../model/server_timestamps';
 import {
   FALSE_VALUE,
   getVectorValue,
@@ -58,11 +62,6 @@ import { objectSize } from '../util/obj';
 import { isNegativeZero } from '../util/types';
 
 import { EvaluationContext, PipelineInputOutput } from './pipeline_run';
-import {
-  getLocalWriteTime,
-  getPreviousValue,
-  isServerTimestamp
-} from '../model/server_timestamps';
 import { SnapshotVersion } from './snapshot_version';
 
 export type EvaluateResultType =
@@ -2380,14 +2379,14 @@ export class CoreCosineDistance extends DistanceBase {
   ): number | undefined {
     const values1 = vec1?.values ?? [];
     const values2 = vec2?.values ?? [];
-    if (values1.length === 0) return undefined; // Distance undefined for empty vectors
+    if (values1.length === 0) {return undefined;} // Distance undefined for empty vectors
 
     let dotProduct = 0;
     let magnitude1 = 0;
     let magnitude2 = 0;
     for (let i = 0; i < values1.length; i++) {
       // Error if any element is not a number
-      if (!isNumber(values1[i]) || !isNumber(values2[i])) return undefined;
+      if (!isNumber(values1[i]) || !isNumber(values2[i])) {return undefined;}
       const val1 = asDouble(values1[i] as { doubleValue: number | string });
       const val2 = asDouble(values2[i] as { doubleValue: number | string });
       dotProduct += val1 * val2;
@@ -2417,12 +2416,12 @@ export class CoreDotProduct extends DistanceBase {
   ): number | undefined {
     const values1 = vec1?.values ?? [];
     const values2 = vec2?.values ?? [];
-    if (values1.length === 0) return 0.0; // Dot product of empty vectors is 0
+    if (values1.length === 0) {return 0.0;} // Dot product of empty vectors is 0
 
     let dotProduct = 0;
     for (let i = 0; i < values1.length; i++) {
       // Error if any element is not a number
-      if (!isNumber(values1[i]) || !isNumber(values2[i])) return undefined;
+      if (!isNumber(values1[i]) || !isNumber(values2[i])) {return undefined;}
       const val1 = asDouble(values1[i] as { doubleValue: number | string });
       const val2 = asDouble(values2[i] as { doubleValue: number | string });
       dotProduct += val1 * val2;
@@ -2443,12 +2442,12 @@ export class CoreEuclideanDistance extends DistanceBase {
   ): number | undefined {
     const values1 = vec1?.values ?? [];
     const values2 = vec2?.values ?? [];
-    if (values1.length === 0) return 0.0; // Distance between empty vectors is 0
+    if (values1.length === 0) {return 0.0;} // Distance between empty vectors is 0
 
     let euclideanDistanceSq = 0;
     for (let i = 0; i < values1.length; i++) {
       // Error if any element is not a number
-      if (!isNumber(values1[i]) || !isNumber(values2[i])) return undefined;
+      if (!isNumber(values1[i]) || !isNumber(values2[i])) {return undefined;}
       const val1 = asDouble(values1[i] as { doubleValue: number | string });
       const val2 = asDouble(values2[i] as { doubleValue: number | string });
       euclideanDistanceSq += Math.pow(val1 - val2, 2);
@@ -2537,8 +2536,8 @@ function isTimestampInBounds(seconds: number, nanos: number) {
     return false;
   }
   // Additional check for min/max boundaries
-  if (sBig === TIMESTAMP_MIN_SECONDS && nanos !== 0) return false; // Min timestamp has 0 nanos
-  if (sBig === TIMESTAMP_MAX_SECONDS && nanos > 999_999_999) return false; // Max timestamp allows up to 999_999_999 nanos
+  if (sBig === TIMESTAMP_MIN_SECONDS && nanos !== 0) {return false;} // Min timestamp has 0 nanos
+  if (sBig === TIMESTAMP_MAX_SECONDS && nanos > 999_999_999) {return false;} // Max timestamp allows up to 999_999_999 nanos
 
   return true;
 }

packages/firestore/src/core/firestore_client.ts

@@ -24,7 +24,6 @@ import {
 } from '../api/credentials';
 import { RealtimePipeline } from '../api/realtime_pipeline';
 import { User } from '../auth/user';
-import { Pipeline as LitePipeline } from '../lite-api/pipeline';
 import { LocalStore } from '../local/local_store';
 import {
   localStoreConfigureFieldIndexes,

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { VectorValue } from '../api';
 import { RealtimePipeline } from '../api/realtime_pipeline';
 import { Firestore } from '../lite-api/database';
 import {
@@ -27,13 +28,9 @@ import {
   Ordering,
   lessThan,
   greaterThan,
-  lessThanOrEqual,
-  greaterThanOrEqual,
-  equal,
   field,
   FunctionExpression,
-  ListOfExprs,
-  AggregateFunction
+  ListOfExprs
 } from '../lite-api/expressions';
 import { Pipeline, Pipeline as ApiPipeline } from '../lite-api/pipeline';
 import { doc, DocumentReference } from '../lite-api/reference';
@@ -45,10 +42,8 @@ import {
   DatabaseSource,
   Distinct,
   DocumentsSource,
-  FindNearest,
   Limit,
   Offset,
-  Select,
   Sort,
   Stage,
   Where
@@ -59,14 +54,10 @@ import {
   ResourcePath,
   UPDATE_TIME_NAME
 } from '../model/path';
-import {
-  isNanValue,
-  isNullValue,
-  VECTOR_MAP_VECTORS_KEY
-} from '../model/values';
-import { debugAssert, fail } from '../util/assert';
+import { fail } from '../util/assert';
 
 import { Bound } from './bound';
+import { ListenOptions } from './event_manager';
 import {
   CompositeFilter as CompositeFilterInternal,
   CompositeOperator,
@@ -92,8 +83,6 @@ import {
   targetEquals,
   targetIsPipelineTarget
 } from './target';
-import { VectorValue } from '../api';
-import { ListenOptions } from './event_manager';
 
 /* eslint @typescript-eslint/no-explicit-any: 0 */
 

packages/firestore/src/core/pipeline.ts

@@ -27,8 +27,8 @@ import { ResourcePath } from '../model/path';
 import { JsonProtoSerializer } from '../remote/serializer';
 import { debugAssert } from '../util/assert';
 
-import { PipelineFlavor, PipelineSourceType } from './pipeline-util';
 import { ListenOptions } from './event_manager';
+import { PipelineFlavor, PipelineSourceType } from './pipeline-util';
 
 export class CorePipeline {
   isCorePipeline = true;

packages/firestore/src/core/pipeline_run.ts

@@ -37,9 +37,9 @@ import { JsonProtoSerializer } from '../remote/serializer';
 import { Code } from '../util/error';
 
 import { toEvaluable, valueOrUndefined } from './expressions';
+import { CorePipeline } from './pipeline';
 import { isPipeline, QueryOrPipeline } from './pipeline-util';
 import { queryMatches } from './query';
-import { CorePipeline } from './pipeline';
 
 export type PipelineInputOutput = MutableDocument;
 

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

@@ -36,7 +36,6 @@ import { Bytes } from './bytes';
 import { documentId as documentIdFieldPath, FieldPath } from './field_path';
 import { vector } from './field_value_impl';
 import { GeoPoint } from './geo_point';
-import { Pipeline } from './pipeline';
 import { DocumentReference } from './reference';
 import { Timestamp } from './timestamp';
 import { fieldPathFromArgument, parseData, UserData } from './user_data_reader';

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

@@ -17,6 +17,7 @@
 
 import { RealtimePipeline } from '../api/realtime_pipeline';
 import { SnapshotMetadata } from '../api/snapshot';
+import { ListenOptions } from '../core/event_manager';
 import { Document } from '../model/document';
 import { ObjectValue } from '../model/object_value';
 import { isOptionalEqual } from '../util/misc';
@@ -28,7 +29,6 @@ import { DocumentData, DocumentReference, refEqual } from './reference';
 import { Timestamp } from './timestamp';
 import { fieldPathFromArgument } from './user_data_reader';
 import { AbstractUserDataWriter } from './user_data_writer';
-import { ListenOptions } from '../core/event_manager';
 
 /**
  * @beta