Constrained the parameters of the query() function implementation. It's still compatible with the overload signatures, but the constrained parameters simplfies the implementation.

Author: MarkDuckworth

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

@@ -155,24 +155,18 @@ export function query<T>(
 
 export function query<T>(
   query: Query<T>,
+  filterOrQueryConstraint: QueryCompositeFilterConstraint | QueryConstraint | undefined,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  filterOrQueryConstraints: any,
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  ...nonFilters: any
+  ...nonFilters: (QueryConstraint | QueryNonFilterConstraint)[]
 ): Query<T> {
   let queryConstraints: AppliableConstraint[] = [];
-  if (filterOrQueryConstraints instanceof AppliableConstraint) {
-    queryConstraints.push(filterOrQueryConstraints);
-  } else if (Array.isArray(filterOrQueryConstraints)) {
-    queryConstraints.concat(filterOrQueryConstraints as AppliableConstraint[]);
-  }
 
-  if (nonFilters !== undefined) {
-    queryConstraints = queryConstraints.concat(
-      nonFilters as AppliableConstraint[]
-    );
+  if (filterOrQueryConstraint instanceof AppliableConstraint) {
+    queryConstraints.push(filterOrQueryConstraint);
   }
 
+  queryConstraints = queryConstraints.concat(nonFilters);
+
   validateQueryConstraintArray(queryConstraints);
 
   for (const constraint of queryConstraints) {