Skip to content

Commit a7f750f

Browse files
committed
chore: add compatibility with newer Firestore library versions
1 parent 887934e commit a7f750f

File tree

5 files changed

+73
-59
lines changed

5 files changed

+73
-59
lines changed

.prettierrc.json

-3
This file was deleted.

prettier.config.js

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/**
2+
* @type {import("prettier").Config}
3+
* @see https://prettier.io/docs/en/options.html
4+
*/
5+
module.exports = {
6+
proseWrap: "always",
7+
};

src/firestore/FirestoreDocument/deserialize.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,9 @@ function deserializeFirestoreQuery(
156156
const {
157157
parentPath,
158158
collectionId,
159+
// `fieldFilters` has been renamed to `filters`
159160
fieldFilters = [],
161+
filters = fieldFilters,
160162
fieldOrders = [],
161163
startAt,
162164
endAt,
@@ -168,7 +170,7 @@ function deserializeFirestoreQuery(
168170
const path = `${parentPath.segments.join("/")}/${collectionId}`;
169171
let ref: Query = firestore.collection(path);
170172

171-
fieldFilters.forEach(({ field, op, value }) => {
173+
filters.forEach(({ field, op, value }) => {
172174
if (op === "OPERATOR_UNSPECIFIED") return;
173175
const path = field.segments.join(".");
174176
switch (op) {

src/firestore/FirestoreDocument/types.ts

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import type { Timestamp } from "@google-cloud/firestore/build/src/timestamp";
22
import type { GeoPoint } from "@google-cloud/firestore/build/src/geo-point";
33

4-
// @ts-ignore
5-
import type {
6-
DocumentReference,
7-
Query,
8-
QueryOptions,
9-
} from "@google-cloud/firestore/build/src/reference";
4+
import type { Query } from "@google-cloud/firestore/build/src/reference/query";
5+
import type { QueryOptions } from "@google-cloud/firestore/build/src/reference/query-options";
6+
import type { DocumentReference } from "@google-cloud/firestore/build/src/reference/document-reference";
107

118
import * as protos from "@google-cloud/firestore/build/protos/firestore_v1_proto_api";
129

@@ -70,7 +67,9 @@ export interface SerializedQuery {
7067
collectionId: string;
7168
// converter: any;
7269
// allDescendants: boolean;
73-
fieldFilters: _FieldFilter[];
70+
/** @deprecated */
71+
fieldFilters?: _FieldFilter[];
72+
filters?: _FieldFilter[];
7473
fieldOrders: _FieldOrder[];
7574
startAt?: _QueryCursor;
7675
endAt?: _QueryCursor;

0 commit comments

Comments
 (0)