Rename proto_values->values, create values.test.ts

Author: schmidt-sebastian

packages/firestore/src/api/user_data_writer.ts

@@ -78,7 +78,9 @@ export class UserDataWriter<T> {
   private convertServerTimestamp(value: ServerTimestampValue): unknown {
     switch (this.serverTimestampBehavior) {
       case 'previous':
-        return value.previousValue ? this.convertValue(value.previousValue) : null;
+        return value.previousValue
+          ? this.convertValue(value.previousValue)
+          : null;
       case 'estimate':
         return this.convertTimestamp(value.localWriteTime);
       default:

packages/firestore/src/model/document_key.ts

@@ -28,6 +28,10 @@ export class DocumentKey {
     );
   }
 
+  static fromName(name: string): DocumentKey {
+    return new DocumentKey(ResourcePath.fromString(name).popFirst(5));
+  }
+
   /** Returns true if the document is in the specified collectionId. */
   hasCollectionId(collectionId: string): boolean {
     return (

packages/firestore/src/model/proto_field_value.ts

@@ -33,7 +33,7 @@ import {
   normalizeByteString,
   normalizeTimestamp,
   typeOrder
-} from './proto_values';
+} from './values';
 import { Blob } from '../api/blob';
 import { GeoPoint } from '../api/geo_point';
 import { Timestamp } from '../api/timestamp';

packages/firestore/src/model/proto_values.ts renamed to packages/firestore/src/model/values.ts

@@ -21,6 +21,7 @@ import { TypeOrder } from './field_value';
 import { assert, fail } from '../util/assert';
 import { forEach, keys, size } from '../util/obj';
 import { ByteString } from '../util/byte_string';
+import { DocumentKey } from './document_key';
 import {
   numericComparator,
   numericEquals,
@@ -359,8 +360,7 @@ function canonifyValue(value: api.Value): string {
   } else if ('bytesValue' in value) {
     return canonifyByteString(value.bytesValue!);
   } else if ('referenceValue' in value) {
-    // TODO(mrschmidt): Use document key only
-    return value.referenceValue!;
+    return canonifyReference(value.referenceValue!);
   } else if ('geoPointValue' in value) {
     return canonifyGeoPoint(value.geoPointValue!);
   } else if ('arrayValue' in value) {
@@ -385,6 +385,10 @@ function canonifyGeoPoint(geoPoint: api.LatLng): string {
   return `geo(${geoPoint.latitude},${geoPoint.longitude})`;
 }
 
+function canonifyReference(referenceValue: string): string {
+  return DocumentKey.fromName(referenceValue).toString();
+}
+
 function canonifyMap(mapValue: api.MapValue): string {
   // Iteration order in JavaScript is not guaranteed. To ensure that we generate
   // matching canonical IDs for identical maps, we need to sort the keys.

packages/firestore/src/remote/serializer.ts

@@ -76,7 +76,7 @@ import {
   normalizeByteString,
   normalizeNumber,
   normalizeTimestamp
-} from '../model/proto_values';
+} from '../model/values';
 
 const DIRECTIONS = (() => {
   const dirs: { [dir: string]: api.OrderDirection } = {};

packages/firestore/test/unit/model/field_value.test.ts

@@ -396,5 +396,4 @@ describe('FieldValue', () => {
       .delete(field(fieldPath))
       .build();
   }
-
 });