Cleanup

Author: schmidt-sebastian

packages/firestore/src/api/database.ts

@@ -119,6 +119,7 @@ import {
   DocumentData,
   DocumentReference as PublicDocumentReference,
   DocumentSnapshot as PublicDocumentSnapshot,
+  FieldPath as PublicFieldPath,
   FirebaseFirestore as PublicFirestore,
   FirestoreDataConverter,
   GetOptions,
@@ -823,15 +824,15 @@ export class DocumentReference<T = DocumentData>
 
   update(value: UpdateData): Promise<void>;
   update(
-    field: string | ExternalFieldPath,
+    field: string | PublicFieldPath,
     value: unknown,
     ...moreFieldsAndValues: unknown[]
   ): Promise<void>;
   update(
     fieldOrUpdateData:
       | string
-      | ExternalFieldPath
-      | Compat<ExternalFieldPath>
+      | PublicFieldPath
+      | Compat<PublicFieldPath>
       | UpdateData,
     value?: unknown,
     ...moreFieldsAndValues: unknown[]
@@ -1082,7 +1083,7 @@ export class DocumentSnapshot<T = DocumentData>
   }
 
   get(
-    fieldPath: string | ExternalFieldPath,
+    fieldPath: string | PublicFieldPath,
     options: PublicSnapshotOptions = {}
   ): unknown {
     if (this._document) {
@@ -1558,7 +1559,7 @@ export class Query<T = DocumentData> implements PublicQuery<T> {
   }
 
   where(
-    field: string | ExternalFieldPath,
+    field: string | PublicFieldPath,
     opStr: WhereFilterOp,
     value: unknown
   ): PublicQuery<T> {
@@ -1580,7 +1581,7 @@ export class Query<T = DocumentData> implements PublicQuery<T> {
   }
 
   orderBy(
-    field: string | ExternalFieldPath,
+    field: string | PublicFieldPath,
     directionStr?: OrderByDirection
   ): PublicQuery<T> {
     let direction: Direction;

packages/firestore/src/api/user_data_reader.ts

@@ -792,7 +792,7 @@ function validatePlainObject(
  */
 export function fieldPathFromArgument(
   methodName: string,
-  path: unknown,
+  path: string | PublicFieldPath | Compat<PublicFieldPath>,
   targetDoc?: DocumentKey
 ): InternalFieldPath {
   // If required, replace the FieldPath Compat class with with the firestore-exp