Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 18, 2020
Merged

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

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
05bb427
Move test code without touching
schmidt-sebastian Mar 17, 2020
d69fe94
Rename proto_values->values, create values.test.ts
schmidt-sebastian Mar 17, 2020
c5d598b
Fix field_value.test.ts
schmidt-sebastian Mar 17, 2020
51503ca
Clean up imports
schmidt-sebastian Mar 17, 2020
47b1379
Merge
schmidt-sebastian Mar 17, 2020
39ff5bc
Lint
schmidt-sebastian Mar 17, 2020
6a33327
Merge
schmidt-sebastian Mar 18, 2020
5f0779d
Fix build
schmidt-sebastian Mar 18, 2020
a4b4b53
Fix import
schmidt-sebastian Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/firestore/src/api/user_data_writer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions packages/firestore/src/model/document_key.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/src/model/proto_field_value.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
8 changes: 6 additions & 2 deletions packages/firestore/src/model/proto_values.ts → packages/firestore/src/model/values.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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) {
Expand All @@ -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();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this break existing canonical IDs?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but the feature branch includes the schema migration.

}

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.
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/src/remote/serializer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ import {
normalizeByteString,
normalizeNumber,
normalizeTimestamp
} from '../model/proto_values';
} from '../model/values';

const DIRECTIONS = (() => {
const dirs: { [dir: string]: api.OrderDirection } = {};
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/src/util/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function isNullOrUndefined(value: unknown): boolean {
}

/** Returns whether the value represents -0. */
export function isNegativeZero(value: number) : boolean {
export function isNegativeZero(value: number): boolean {
// Detect if the value is -0.0. Based on polyfill from
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
return value === -0 && 1 / value === 1 / -0;
Expand Down
Loading