Skip to content

Commit 810d63b

Browse files
milaGGLmilaGGL
committed
Revert "Merge branch 'master' into mila/BloomFilter-add-BloomFilter-class"
This reverts commit c5616d7, reversing changes made to 0d919c1.
1 parent 8529ae7 commit 810d63b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1192
-5006
lines changed

‎.changeset/breezy-wombats-care.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.changeset/empty-doors-brush.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.changeset/lucky-games-arrive.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎common/api-review/firestore-lite.api.md

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,16 @@ export class DocumentSnapshot<T = DocumentData> {
140140
export { EmulatorMockTokenOptions }
141141

142142
// @public
143-
export function endAt(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
143+
export function endAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
144144

145145
// @public
146-
export function endAt(...fieldValues: unknown[]): QueryEndAtConstraint;
146+
export function endAt(...fieldValues: unknown[]): QueryConstraint;
147147

148148
// @public
149-
export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
149+
export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
150150

151151
// @public
152-
export function endBefore(...fieldValues: unknown[]): QueryEndAtConstraint;
152+
export function endBefore(...fieldValues: unknown[]): QueryConstraint;
153153

154154
// @public
155155
export class FieldPath {
@@ -222,10 +222,10 @@ export function increment(n: number): FieldValue;
222222
export function initializeFirestore(app: FirebaseApp, settings: Settings): Firestore;
223223

224224
// @public
225-
export function limit(limit: number): QueryLimitConstraint;
225+
export function limit(limit: number): QueryConstraint;
226226

227227
// @public
228-
export function limitToLast(limit: number): QueryLimitConstraint;
228+
export function limitToLast(limit: number): QueryConstraint;
229229

230230
export { LogLevel }
231231

@@ -235,7 +235,7 @@ export type NestedUpdateFields<T extends Record<string, unknown>> = UnionToInter
235235
}[keyof T & string]>;
236236

237237
// @public
238-
export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryOrderByConstraint;
238+
export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryConstraint;
239239

240240
// @public
241241
export type OrderByDirection = 'desc' | 'asc';
@@ -275,32 +275,9 @@ export class QueryDocumentSnapshot<T = DocumentData> extends DocumentSnapshot<T>
275275
data(): T;
276276
}
277277

278-
// @public
279-
export class QueryEndAtConstraint extends QueryConstraint {
280-
readonly type: 'endBefore' | 'endAt';
281-
}
282-
283278
// @public
284279
export function queryEqual<T>(left: Query<T>, right: Query<T>): boolean;
285280

286-
// @public
287-
export class QueryFieldFilterConstraint extends QueryConstraint {
288-
readonly type = "where";
289-
}
290-
291-
// @public
292-
export class QueryLimitConstraint extends QueryConstraint {
293-
readonly type: 'limit' | 'limitToLast';
294-
}
295-
296-
// @public
297-
export type QueryNonFilterConstraint = QueryOrderByConstraint | QueryLimitConstraint | QueryStartAtConstraint | QueryEndAtConstraint;
298-
299-
// @public
300-
export class QueryOrderByConstraint extends QueryConstraint {
301-
readonly type = "orderBy";
302-
}
303-
304281
// @public
305282
export class QuerySnapshot<T = DocumentData> {
306283
get docs(): Array<QueryDocumentSnapshot<T>>;
@@ -310,11 +287,6 @@ export class QuerySnapshot<T = DocumentData> {
310287
get size(): number;
311288
}
312289

313-
// @public
314-
export class QueryStartAtConstraint extends QueryConstraint {
315-
readonly type: 'startAt' | 'startAfter';
316-
}
317-
318290
// @public
319291
export function refEqual<T>(left: DocumentReference<T> | CollectionReference<T>, right: DocumentReference<T> | CollectionReference<T>): boolean;
320292

@@ -351,16 +323,16 @@ export interface Settings {
351323
export function snapshotEqual<T>(left: DocumentSnapshot<T> | QuerySnapshot<T>, right: DocumentSnapshot<T> | QuerySnapshot<T>): boolean;
352324

353325
// @public
354-
export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
326+
export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
355327

356328
// @public
357-
export function startAfter(...fieldValues: unknown[]): QueryStartAtConstraint;
329+
export function startAfter(...fieldValues: unknown[]): QueryConstraint;
358330

359331
// @public
360-
export function startAt(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
332+
export function startAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
361333

362334
// @public
363-
export function startAt(...fieldValues: unknown[]): QueryStartAtConstraint;
335+
export function startAt(...fieldValues: unknown[]): QueryConstraint;
364336

365337
// @public
366338
export function terminate(firestore: Firestore): Promise<void>;
@@ -416,7 +388,7 @@ export function updateDoc<T>(reference: DocumentReference<T>, data: UpdateData<T
416388
export function updateDoc(reference: DocumentReference<unknown>, field: string | FieldPath, value: unknown, ...moreFieldsAndValues: unknown[]): Promise<void>;
417389

418390
// @public
419-
export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryFieldFilterConstraint;
391+
export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryConstraint;
420392

421393
// @public
422394
export type WhereFilterOp = '<' | '<=' | '==' | '!=' | '>=' | '>' | 'array-contains' | 'in' | 'array-contains-any' | 'not-in';

‎common/api-review/firestore.api.md

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,16 @@ export function enableMultiTabIndexedDbPersistence(firestore: Firestore): Promis
170170
export function enableNetwork(firestore: Firestore): Promise<void>;
171171

172172
// @public
173-
export function endAt(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
173+
export function endAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
174174

175175
// @public
176-
export function endAt(...fieldValues: unknown[]): QueryEndAtConstraint;
176+
export function endAt(...fieldValues: unknown[]): QueryConstraint;
177177

178178
// @public
179-
export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
179+
export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
180180

181181
// @public
182-
export function endBefore(...fieldValues: unknown[]): QueryEndAtConstraint;
182+
export function endBefore(...fieldValues: unknown[]): QueryConstraint;
183183

184184
// @public
185185
export class FieldPath {
@@ -298,10 +298,10 @@ export interface IndexField {
298298
export function initializeFirestore(app: FirebaseApp, settings: FirestoreSettings, databaseId?: string): Firestore;
299299

300300
// @public
301-
export function limit(limit: number): QueryLimitConstraint;
301+
export function limit(limit: number): QueryConstraint;
302302

303303
// @public
304-
export function limitToLast(limit: number): QueryLimitConstraint;
304+
export function limitToLast(limit: number): QueryConstraint;
305305

306306
// @public
307307
export function loadBundle(firestore: Firestore, bundleData: ReadableStream<Uint8Array> | ArrayBuffer | string): LoadBundleTask;
@@ -383,7 +383,7 @@ export function onSnapshotsInSync(firestore: Firestore, observer: {
383383
export function onSnapshotsInSync(firestore: Firestore, onSync: () => void): Unsubscribe;
384384

385385
// @public
386-
export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryOrderByConstraint;
386+
export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryConstraint;
387387

388388
// @public
389389
export type OrderByDirection = 'desc' | 'asc';
@@ -428,32 +428,9 @@ export class QueryDocumentSnapshot<T = DocumentData> extends DocumentSnapshot<T>
428428
data(options?: SnapshotOptions): T;
429429
}
430430

431-
// @public
432-
export class QueryEndAtConstraint extends QueryConstraint {
433-
readonly type: 'endBefore' | 'endAt';
434-
}
435-
436431
// @public
437432
export function queryEqual<T>(left: Query<T>, right: Query<T>): boolean;
438433

439-
// @public
440-
export class QueryFieldFilterConstraint extends QueryConstraint {
441-
readonly type = "where";
442-
}
443-
444-
// @public
445-
export class QueryLimitConstraint extends QueryConstraint {
446-
readonly type: 'limit' | 'limitToLast';
447-
}
448-
449-
// @public
450-
export type QueryNonFilterConstraint = QueryOrderByConstraint | QueryLimitConstraint | QueryStartAtConstraint | QueryEndAtConstraint;
451-
452-
// @public
453-
export class QueryOrderByConstraint extends QueryConstraint {
454-
readonly type = "orderBy";
455-
}
456-
457434
// @public
458435
export class QuerySnapshot<T = DocumentData> {
459436
docChanges(options?: SnapshotListenOptions): Array<DocumentChange<T>>;
@@ -465,11 +442,6 @@ export class QuerySnapshot<T = DocumentData> {
465442
get size(): number;
466443
}
467444

468-
// @public
469-
export class QueryStartAtConstraint extends QueryConstraint {
470-
readonly type: 'startAt' | 'startAfter';
471-
}
472-
473445
// @public
474446
export function refEqual<T>(left: DocumentReference<T> | CollectionReference<T>, right: DocumentReference<T> | CollectionReference<T>): boolean;
475447

@@ -522,16 +494,16 @@ export interface SnapshotOptions {
522494
}
523495

524496
// @public
525-
export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
497+
export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
526498

527499
// @public
528-
export function startAfter(...fieldValues: unknown[]): QueryStartAtConstraint;
500+
export function startAfter(...fieldValues: unknown[]): QueryConstraint;
529501

530502
// @public
531-
export function startAt(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
503+
export function startAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
532504

533505
// @public
534-
export function startAt(...fieldValues: unknown[]): QueryStartAtConstraint;
506+
export function startAt(...fieldValues: unknown[]): QueryConstraint;
535507

536508
// @public
537509
export type TaskState = 'Error' | 'Running' | 'Success';
@@ -598,7 +570,7 @@ export function updateDoc(reference: DocumentReference<unknown>, field: string |
598570
export function waitForPendingWrites(firestore: Firestore): Promise<void>;
599571

600572
// @public
601-
export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryFieldFilterConstraint;
573+
export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryConstraint;
602574

603575
// @public
604576
export type WhereFilterOp = '<' | '<=' | '==' | '!=' | '>=' | '>' | 'array-contains' | 'in' | 'array-contains-any' | 'not-in';

‎packages/database-compat/test/query.test.ts

Lines changed: 10 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -375,76 +375,34 @@ describe('Query Tests', () => {
375375
expect(queryId(path)).to.equal('default');
376376

377377
expect(queryId(path.startAt('pri', 'name'))).to.equal(
378-
'{"sin":true,"sn":"name","sp":"pri"}'
378+
'{"sn":"name","sp":"pri"}'
379379
);
380380
expect(queryId(path.startAfter('pri', 'name'))).to.equal(
381-
'{"sin":false,"sn":"name","sp":"pri"}'
381+
'{"sn":"name-","sp":"pri"}'
382382
);
383-
expect(queryId(path.endAt('pri', 'name'))).to.equal(
384-
'{"ein":true,"en":"name","ep":"pri"}'
385-
);
386-
expect(queryId(path.endBefore('pri', 'name'))).to.equal(
387-
'{"ein":false,"en":"name","ep":"pri"}'
388-
);
389-
390383
expect(queryId(path.startAt('spri').endAt('epri'))).to.equal(
391-
'{"ein":true,"ep":"epri","sin":true,"sp":"spri"}'
392-
);
393-
expect(queryId(path.startAt('spri').endBefore('epri'))).to.equal(
394-
'{"ein":false,"en":"[MIN_NAME]","ep":"epri","sin":true,"sp":"spri"}'
384+
'{"ep":"epri","sp":"spri"}'
395385
);
396386
expect(queryId(path.startAfter('spri').endAt('epri'))).to.equal(
397-
'{"ein":true,"ep":"epri","sin":false,"sn":"[MAX_NAME]","sp":"spri"}'
398-
);
399-
expect(queryId(path.startAfter('spri').endBefore('epri'))).to.equal(
400-
'{"ein":false,"en":"[MIN_NAME]","ep":"epri","sin":false,"sn":"[MAX_NAME]","sp":"spri"}'
387+
'{"ep":"epri","sn":"[MAX_NAME]","sp":"spri"}'
401388
);
402-
403389
expect(
404390
queryId(path.startAt('spri', 'sname').endAt('epri', 'ename'))
405-
).to.equal(
406-
'{"ein":true,"en":"ename","ep":"epri","sin":true,"sn":"sname","sp":"spri"}'
407-
);
408-
expect(
409-
queryId(path.startAt('spri', 'sname').endBefore('epri', 'ename'))
410-
).to.equal(
411-
'{"ein":false,"en":"ename","ep":"epri","sin":true,"sn":"sname","sp":"spri"}'
412-
);
391+
).to.equal('{"en":"ename","ep":"epri","sn":"sname","sp":"spri"}');
413392
expect(
414393
queryId(path.startAfter('spri', 'sname').endAt('epri', 'ename'))
415-
).to.equal(
416-
'{"ein":true,"en":"ename","ep":"epri","sin":false,"sn":"sname","sp":"spri"}'
417-
);
418-
expect(
419-
queryId(path.startAfter('spri', 'sname').endBefore('epri', 'ename'))
420-
).to.equal(
421-
'{"ein":false,"en":"ename","ep":"epri","sin":false,"sn":"sname","sp":"spri"}'
422-
);
423-
394+
).to.equal('{"en":"ename","ep":"epri","sn":"sname-","sp":"spri"}');
424395
expect(queryId(path.startAt('pri').limitToFirst(100))).to.equal(
425-
'{"l":100,"sin":true,"sp":"pri","vf":"l"}'
396+
'{"l":100,"sp":"pri","vf":"l"}'
426397
);
427398
expect(queryId(path.startAfter('pri').limitToFirst(100))).to.equal(
428-
'{"l":100,"sin":false,"sn":"[MAX_NAME]","sp":"pri","vf":"l"}'
429-
);
430-
expect(queryId(path.endAt('pri').limitToLast(100))).to.equal(
431-
'{"ein":true,"ep":"pri","l":100,"vf":"r"}'
399+
'{"l":100,"sn":"[MAX_NAME]","sp":"pri","vf":"l"}'
432400
);
433-
expect(queryId(path.endBefore('pri').limitToLast(100))).to.equal(
434-
'{"ein":false,"en":"[MIN_NAME]","ep":"pri","l":100,"vf":"r"}'
435-
);
436-
437401
expect(queryId(path.startAt('bar').orderByChild('foo'))).to.equal(
438-
'{"i":"foo","sin":true,"sp":"bar"}'
402+
'{"i":"foo","sp":"bar"}'
439403
);
440404
expect(queryId(path.startAfter('bar').orderByChild('foo'))).to.equal(
441-
'{"i":"foo","sin":false,"sn":"[MAX_NAME]","sp":"bar"}'
442-
);
443-
expect(queryId(path.endAt('bar').orderByChild('foo'))).to.equal(
444-
'{"ein":true,"ep":"bar","i":"foo"}'
445-
);
446-
expect(queryId(path.endBefore('bar').orderByChild('foo'))).to.equal(
447-
'{"ein":false,"en":"[MIN_NAME]","ep":"bar","i":"foo"}'
405+
'{"i":"foo","sn":"[MAX_NAME]","sp":"bar"}'
448406
);
449407
});
450408

0 commit comments

Comments
 (0)