Test after master merge

Author: schmidt-sebastian

packages/firestore/exp/src/api/snapshot.ts

@@ -83,7 +83,11 @@ export class DocumentSnapshot<T = firestore.DocumentData>
         /* timestampsInSnapshots= */ true,
         options.serverTimestamps || DEFAULT_SERVER_TIMESTAMP_BEHAVIOR,
         key =>
-          new DocumentReference(this._firestore, key, /* converter= */ null)
+          new DocumentReference(
+            this._firestore,
+            key.path,
+            /* converter= */ null
+          )
       );
       return userDataWriter.convertValue(this._document.toProto()) as T;
     }
@@ -102,7 +106,8 @@ export class DocumentSnapshot<T = firestore.DocumentData>
           this._firestoreImpl._databaseId,
           /* timestampsInSnapshots= */ true,
           options.serverTimestamps || DEFAULT_SERVER_TIMESTAMP_BEHAVIOR,
-          key => new DocumentReference(this._firestore, key, this._converter)
+          key =>
+            new DocumentReference(this._firestore, key.path, this._converter)
         );
         return userDataWriter.convertValue(value);
       }

packages/firestore/lite/src/api/reference.ts

@@ -78,24 +78,24 @@ export class DocumentReference<T = firestore.DocumentData>
 
   constructor(
     readonly firestore: Firestore,
-    key: DocumentKey,
+    readonly _path: ResourcePath,
     readonly _converter: firestore.FirestoreDataConverter<T> | null
   ) {
-    super(firestore._databaseId, key, _converter);
+    super(firestore._databaseId, new DocumentKey(_path), _converter);
   }
 
   get id(): string {
-    return this._key.path.lastSegment();
+    return this._path.lastSegment();
   }
 
   get path(): string {
-    return this._key.path.canonicalString();
+    return this._path.canonicalString();
   }
 
   withConverter<U>(
     converter: firestore.FirestoreDataConverter<U>
   ): firestore.DocumentReference<U> {
-    return new DocumentReference<U>(this.firestore, this._key, converter);
+    return new DocumentReference<U>(this.firestore, this._path, converter);
   }
 }
 
@@ -320,8 +320,8 @@ export function collection(
           'a DocumentReference or FirebaseFirestore'
       );
     }
-    const absolutePath = ResourcePath.fromString(
-      `${parent.path}/${relativePath}`
+    const absolutePath = ResourcePath.fromString(parent.path).child(
+      ResourcePath.fromString(relativePath)
     );
     validateCollectionPath(absolutePath);
     return new CollectionReference(
@@ -385,11 +385,7 @@ export function doc<T>(
   if (parent instanceof Firestore) {
     const absolutePath = ResourcePath.fromString(relativePath!);
     validateDocumentPath(absolutePath);
-    return new DocumentReference(
-      parent,
-      new DocumentKey(absolutePath),
-      /* converter= */ null
-    );
+    return new DocumentReference(parent, absolutePath, /* converter= */ null);
   } else {
     if (
       !(parent instanceof DocumentReference) &&
@@ -401,13 +397,13 @@ export function doc<T>(
           'a DocumentReference or FirebaseFirestore'
       );
     }
-    const absolutePath = ResourcePath.fromString(
-      `${parent.path}/${relativePath}`
+    const absolutePath = parent._path.child(
+      ResourcePath.fromString(relativePath!)
     );
     validateDocumentPath(absolutePath);
     return new DocumentReference(
       parent.firestore,
-      new DocumentKey(absolutePath),
+      absolutePath,
       parent instanceof CollectionReference ? parent._converter : null
     );
   }
@@ -429,7 +425,7 @@ export function parent<T>(
     } else {
       return new DocumentReference(
         child.firestore,
-        new DocumentKey(parentPath),
+        parentPath,
         /* converter= */ null
       );
     }

packages/firestore/lite/src/api/snapshot.ts

@@ -52,7 +52,7 @@ export class DocumentSnapshot<T = firestore.DocumentData>
   get ref(): firestore.DocumentReference<T> {
     return new DocumentReference<T>(
       this._firestore,
-      this._key,
+      this._key.path,
       this._converter
     );
   }
@@ -80,7 +80,11 @@ export class DocumentSnapshot<T = firestore.DocumentData>
         /* timestampsInSnapshots= */ true,
         /* serverTimestampBehavior=*/ 'none',
         key =>
-          new DocumentReference(this._firestore, key, /* converter= */ null)
+          new DocumentReference(
+            this._firestore,
+            key.path,
+            /* converter= */ null
+          )
       );
       return userDataWriter.convertValue(this._document.toProto()) as T;
     }
@@ -96,7 +100,8 @@ export class DocumentSnapshot<T = firestore.DocumentData>
           this._firestore._databaseId,
           /* timestampsInSnapshots= */ true,
           /* serverTimestampBehavior=*/ 'none',
-          key => new DocumentReference(this._firestore, key, this._converter)
+          key =>
+            new DocumentReference(this._firestore, key.path, this._converter)
         );
         return userDataWriter.convertValue(value);
       }