Fix encoding of CSI keys in Safari

packages/firestore/package.json

@@ -36,8 +36,8 @@
     "test:browser:emulator": "karma start --targetBackend=emulator",
     "test:browser:nightly": "karma start --targetBackend=nightly",
     "test:browser:prod": "karma start --targetBackend=prod",
-    "test:webkit:prod": "BROWSERS=WebkitHeadless karma start --targetBackend=prod --browsers=WebkitHeadless",
-    "test:webkit:unit": "BROWSERS=WebkitHeadless karma start --unit --targetBackend=prod --browsers=WebkitHeadless",
+    "test:webkit:prod": "BROWSERS=WebkitHeadless karma start --targetBackend=prod",
+    "test:webkit:unit": "BROWSERS=WebkitHeadless karma start --unit --targetBackend=prod",
     "test:browser:prod:nameddb": "karma start --targetBackend=prod --databaseId=test-db",
     "test:browser:unit": "karma start --unit",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",

packages/firestore/src/index/index_entry.ts

@@ -79,13 +79,14 @@ export class IndexEntry {
     orderedDocumentKey: Uint8Array,
     documentKey: DocumentKey
   ): DbIndexEntryKey {
+    const entry = this.dbIndexEntry(uid, orderedDocumentKey, documentKey);
     return [
-      this._indexId,
-      uid,
-      encodeKeySafeBytes(this._arrayValue),
-      encodeKeySafeBytes(this._directionalValue),
-      encodeKeySafeBytes(orderedDocumentKey),
-      documentKey.path.toArray()
+      entry.indexId,
+      entry.uid,
+      entry.arrayValue,
+      entry.directionalValue,
+      entry.orderedDocumentKey,
+      entry.documentKey
     ];
   }
 }
@@ -130,15 +131,15 @@ export function compareByteArrays(left: Uint8Array, right: Uint8Array): number {
  * Otherwise, the input array will be returned in its original type.
  */
 export function encodeKeySafeBytes(array: Uint8Array): KeySafeBytes {
-  if (isSafariOrWebkit() && !Array.isArray(array)) {
+  if (isSafariOrWebkit()) {
     return encodeUint8ArrayToSortableString(array);
   }
   return array;
 }
 
 /**
  * Reverts the key safe representation of Uint8Array (created by
- * indexSafeUint8Array) to a normal Uint8Array.
+ * encodeKeySafeBytes) to a normal Uint8Array.
  */
 export function decodeKeySafeBytes(input: KeySafeBytes): Uint8Array {
   if (typeof input !== 'string') {