Feedback

Author: schmidt-sebastian

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

@@ -17,7 +17,7 @@
 
 import * as firestore from '../../index';
 
-import { tryCast } from './util';
+import { cast } from './util';
 import {
   DOCUMENT_KEY_NAME,
   FieldPath as InternalFieldPath
@@ -54,21 +54,20 @@ export class FieldPath implements firestore.FieldPath {
       1
     );
 
-    for (let i = 0; i < fieldNames.length; ++i) {
-      if (fieldNames[i].length === 0) {
-        throw new FirestoreError(
-          Code.INVALID_ARGUMENT,
-          `Invalid field name at argument $(i + 1). ` +
-            'Field names must not be empty.'
-        );
-      }
+    const emptyElement = fieldNames.indexOf('');
+    if (emptyElement !== -1) {
+      throw new FirestoreError(
+        Code.INVALID_ARGUMENT,
+        `Invalid field name at argument $(i + 1). ` +
+          'Field names must not be empty.'
+      );
     }
 
     this._internalPath = new InternalFieldPath(fieldNames);
   }
 
   isEqual(other: firestore.FieldPath): boolean {
-    const path = tryCast(other, FieldPath);
+    const path = cast(other, FieldPath);
     return this._internalPath.isEqual(path._internalPath);
   }
 }

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

@@ -20,7 +20,7 @@ import * as firestore from '../../index';
 import { Firestore } from './database';
 import { DocumentReference } from './reference';
 import { FieldPath } from './field_path';
-import { tryCast } from './util';
+import { cast } from './util';
 import { DocumentKey } from '../../../src/model/document_key';
 import { Document } from '../../../src/model/document';
 import { UserDataWriter } from '../../../src/api/user_data_writer';
@@ -60,25 +60,23 @@ export class DocumentSnapshot<T = firestore.DocumentData>
   data(): T | undefined {
     if (!this._document) {
       return undefined;
-    } else {
+    } else if (this._converter) {
       // We only want to use the converter and create a new DocumentSnapshot
       // if a converter has been provided.
-      if (this._converter) {
-        const snapshot = new QueryDocumentSnapshot(
-          this._firestore,
-          this._key,
-          this._document
-        );
-        return this._converter.fromFirestore(snapshot);
-      } else {
-        const userDataWriter = new UserDataWriter(
-          this._firestore._databaseId,
-          /* timestampsInSnapshots= */ false,
-          /* serverTimestampBehavior=*/ 'none',
-          key => new DocumentReference(this._firestore, key)
-        );
-        return userDataWriter.convertValue(this._document.toProto()) as T;
-      }
+      const snapshot = new QueryDocumentSnapshot(
+        this._firestore,
+        this._key,
+        this._document
+      );
+      return this._converter.fromFirestore(snapshot);
+    } else {
+      const userDataWriter = new UserDataWriter(
+        this._firestore._databaseId,
+        /* timestampsInSnapshots= */ false,
+        /* serverTimestampBehavior=*/ 'none',
+        key => new DocumentReference(this._firestore, key)
+      );
+      return userDataWriter.convertValue(this._document.toProto()) as T;
     }
   }
 
@@ -119,7 +117,7 @@ export function fieldPathFromArgument(
   if (typeof arg === 'string') {
     return fieldPathFromDotSeparatedString(methodName, arg);
   } else {
-    const path = tryCast(arg, FieldPath);
+    const path = cast(arg, FieldPath);
     return path._internalPath;
   }
 }