Skip to content

Commit fceba12

Browse files
schmidt-sebastianschmidt-sebastian
committed
WIP Optional Views
1 parent 68802a3 commit fceba12

File tree

5 files changed

+29
-35
lines changed

5 files changed

+29
-35
lines changed

‎packages/firestore/exp/dependencies.json

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1220,7 +1220,6 @@
12201220
"tryGetCustomObjectType",
12211221
"typeOrder",
12221222
"uint8ArrayFromBinaryString",
1223-
"unlisten",
12241223
"validateArgType",
12251224
"validateDocumentPath",
12261225
"validateExactNumberOfArgs",
@@ -1349,7 +1348,7 @@
13491348
],
13501349
"variables": []
13511350
},
1352-
"sizeInBytes": 199893
1351+
"sizeInBytes": 198487
13531352
},
13541353
"arrayRemove": {
13551354
"dependencies": {
@@ -1889,7 +1888,6 @@
18891888
"transformOperationEquals",
18901889
"typeOrder",
18911890
"uint8ArrayFromBinaryString",
1892-
"unlisten",
18931891
"valueCompare",
18941892
"valueEquals",
18951893
"verifyNotTerminated",
@@ -2001,7 +1999,7 @@
20011999
],
20022000
"variables": []
20032001
},
2004-
"sizeInBytes": 182281
2002+
"sizeInBytes": 180875
20052003
},
20062004
"deleteField": {
20072005
"dependencies": {
@@ -2251,7 +2249,6 @@
22512249
"transformOperationEquals",
22522250
"typeOrder",
22532251
"uint8ArrayFromBinaryString",
2254-
"unlisten",
22552252
"valueCompare",
22562253
"valueEquals",
22572254
"verifyNotTerminated",
@@ -2361,7 +2358,7 @@
23612358
],
23622359
"variables": []
23632360
},
2364-
"sizeInBytes": 181899
2361+
"sizeInBytes": 180493
23652362
},
23662363
"doc": {
23672364
"dependencies": {
@@ -3132,7 +3129,6 @@
31323129
"transformOperationEquals",
31333130
"typeOrder",
31343131
"uint8ArrayFromBinaryString",
3135-
"unlisten",
31363132
"updateTrackedLimbos",
31373133
"updateView",
31383134
"upgradeMutationBatchSchemaAndMigrateData",
@@ -3303,7 +3299,7 @@
33033299
],
33043300
"variables": []
33053301
},
3306-
"sizeInBytes": 301114
3302+
"sizeInBytes": 299786
33073303
},
33083304
"enableNetwork": {
33093305
"dependencies": {
@@ -3511,7 +3507,6 @@
35113507
"transformOperationEquals",
35123508
"typeOrder",
35133509
"uint8ArrayFromBinaryString",
3514-
"unlisten",
35153510
"valueCompare",
35163511
"valueEquals",
35173512
"verifyNotTerminated",
@@ -3621,7 +3616,7 @@
36213616
],
36223617
"variables": []
36233618
},
3624-
"sizeInBytes": 181896
3619+
"sizeInBytes": 180490
36253620
},
36263621
"endAt": {
36273622
"dependencies": {
@@ -4094,6 +4089,7 @@
40944089
"typeOrder",
40954090
"uint8ArrayFromBinaryString",
40964091
"unlisten",
4092+
"unlisten$1",
40974093
"updateTrackedLimbos",
40984094
"updateView",
40994095
"validateArgType",
@@ -4233,7 +4229,7 @@
42334229
],
42344230
"variables": []
42354231
},
4236-
"sizeInBytes": 212161
4232+
"sizeInBytes": 212323
42374233
},
42384234
"getDocFromCache": {
42394235
"dependencies": {
@@ -4707,6 +4703,7 @@
47074703
"typeOrder",
47084704
"uint8ArrayFromBinaryString",
47094705
"unlisten",
4706+
"unlisten$1",
47104707
"updateTrackedLimbos",
47114708
"updateView",
47124709
"validateArgType",
@@ -4846,7 +4843,7 @@
48464843
],
48474844
"variables": []
48484845
},
4849-
"sizeInBytes": 212217
4846+
"sizeInBytes": 212379
48504847
},
48514848
"getDocs": {
48524849
"dependencies": {
@@ -5074,6 +5071,7 @@
50745071
"typeOrder",
50755072
"uint8ArrayFromBinaryString",
50765073
"unlisten",
5074+
"unlisten$1",
50775075
"updateTrackedLimbos",
50785076
"updateView",
50795077
"validateArgType",
@@ -5216,7 +5214,7 @@
52165214
],
52175215
"variables": []
52185216
},
5219-
"sizeInBytes": 214724
5217+
"sizeInBytes": 214886
52205218
},
52215219
"getDocsFromCache": {
52225220
"dependencies": {
@@ -5703,6 +5701,7 @@
57035701
"typeOrder",
57045702
"uint8ArrayFromBinaryString",
57055703
"unlisten",
5704+
"unlisten$1",
57065705
"updateTrackedLimbos",
57075706
"updateView",
57085707
"validateArgType",
@@ -5844,7 +5843,7 @@
58445843
],
58455844
"variables": []
58465845
},
5847-
"sizeInBytes": 214462
5846+
"sizeInBytes": 214624
58485847
},
58495848
"getFirestore": {
58505849
"dependencies": {
@@ -6293,6 +6292,7 @@
62936292
"typeOrder",
62946293
"uint8ArrayFromBinaryString",
62956294
"unlisten",
6295+
"unlisten$1",
62966296
"updateTrackedLimbos",
62976297
"updateView",
62986298
"validateArgType",
@@ -6435,7 +6435,7 @@
64356435
],
64366436
"variables": []
64376437
},
6438-
"sizeInBytes": 215807
6438+
"sizeInBytes": 215969
64396439
},
64406440
"onSnapshotsInSync": {
64416441
"dependencies": {
@@ -6644,7 +6644,6 @@
66446644
"transformOperationEquals",
66456645
"typeOrder",
66466646
"uint8ArrayFromBinaryString",
6647-
"unlisten",
66486647
"valueCompare",
66496648
"valueEquals",
66506649
"verifyNotTerminated",
@@ -6755,7 +6754,7 @@
67556754
],
67566755
"variables": []
67576756
},
6758-
"sizeInBytes": 182745
6757+
"sizeInBytes": 181339
67596758
},
67606759
"orderBy": {
67616760
"dependencies": {
@@ -7498,7 +7497,6 @@
74987497
"tryGetCustomObjectType",
74997498
"typeOrder",
75007499
"uint8ArrayFromBinaryString",
7501-
"unlisten",
75027500
"validateArgType",
75037501
"validateExactNumberOfArgs",
75047502
"validateNamedArrayAtLeastNumberOfElements",
@@ -7624,7 +7622,7 @@
76247622
],
76257623
"variables": []
76267624
},
7627-
"sizeInBytes": 198175
7625+
"sizeInBytes": 196769
76287626
},
76297627
"setLogLevel": {
76307628
"dependencies": {
@@ -8291,7 +8289,6 @@
82918289
"tryGetCustomObjectType",
82928290
"typeOrder",
82938291
"uint8ArrayFromBinaryString",
8294-
"unlisten",
82958292
"updateDoc",
82968293
"validateArgType",
82978294
"validateExactNumberOfArgs",
@@ -8420,7 +8417,7 @@
84208417
],
84218418
"variables": []
84228419
},
8423-
"sizeInBytes": 199674
8420+
"sizeInBytes": 198268
84248421
},
84258422
"waitForPendingWrites": {
84268423
"dependencies": {
@@ -8626,7 +8623,6 @@
86268623
"transformOperationEquals",
86278624
"typeOrder",
86288625
"uint8ArrayFromBinaryString",
8629-
"unlisten",
86308626
"valueCompare",
86318627
"valueEquals",
86328628
"verifyNotTerminated",
@@ -8737,7 +8733,7 @@
87378733
],
87388734
"variables": []
87398735
},
8740-
"sizeInBytes": 181688
8736+
"sizeInBytes": 180282
87418737
},
87428738
"where": {
87438739
"dependencies": {
@@ -9112,7 +9108,6 @@
91129108
"tryGetCustomObjectType",
91139109
"typeOrder",
91149110
"uint8ArrayFromBinaryString",
9115-
"unlisten",
91169111
"validateArgType",
91179112
"validateExactNumberOfArgs",
91189113
"validateNamedArrayAtLeastNumberOfElements",
@@ -9244,6 +9239,6 @@
92449239
],
92459240
"variables": []
92469241
},
9247-
"sizeInBytes": 203341
9242+
"sizeInBytes": 201935
92489243
}
92499244
}

‎packages/firestore/src/core/sync_engine.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ import {
7777
LimboDocumentChange,
7878
RemovedLimboDocument,
7979
View,
80-
ViewChange,
81-
ViewDocumentChanges
80+
ViewChange
8281
} from './view';
8382
import { ViewSnapshot } from './view_snapshot';
8483
import { wrapInUserErrorIfRecoverable } from '../util/async_queue';

‎packages/firestore/src/remote/remote_syncer.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import { BatchId, TargetId } from '../core/types';
1919
import { DocumentKeySet } from '../model/collections';
2020
import { MutationBatchResult } from '../model/mutation_batch';
2121
import { FirestoreError } from '../util/error';
22-
import { RemoteEvent } from './remote_event';
2322
import { User } from '../auth/user';
2423

2524
/**

‎packages/firestore/test/unit/core/event_manager.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ import {
2121
EventManager,
2222
listen,
2323
ListenOptions,
24-
QueryListener
24+
QueryListener,
25+
unlisten
2526
} from '../../../src/core/event_manager';
2627
import { Query } from '../../../src/core/query';
2728
import { OnlineState } from '../../../src/core/types';
@@ -73,17 +74,16 @@ describe('EventManager', () => {
7374
await listen(eventManager, fakeListener1);
7475
await listen(eventManager, fakeListener2);
7576

76-
await eventManager.unlisten(fakeListener2);
77-
await eventManager.unlisten(fakeListener1);
77+
await unlisten(eventManager, fakeListener2);
78+
await unlisten(eventManager, fakeListener1);
7879
});
7980

8081
it('handles unlisten on unknown listenable gracefully', async () => {
8182
const syncEngineSpy = makeSyncEngineSpy();
8283
const query1 = query('foo/bar');
8384
const fakeListener1 = fakeQueryListener(query1);
8485
const eventManager = new EventManager(syncEngineSpy);
85-
await eventManager.unlisten(fakeListener1);
86-
expect(syncEngineSpy.unlisten.callCount).to.equal(0);
86+
await unlisten(eventManager, fakeListener1);
8787
});
8888

8989
it('notifies listenables in the right order', async () => {

‎packages/firestore/test/unit/specs/spec_test_runner.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ import {
2424
EventManager,
2525
listen,
2626
Observer,
27-
QueryListener
27+
QueryListener,
28+
unlisten
2829
} from '../../../src/core/event_manager';
2930
import {
3031
canonifyQuery,
@@ -430,7 +431,7 @@ abstract class TestRunner {
430431
const eventEmitter = this.queryListeners.get(query);
431432
debugAssert(!!eventEmitter, 'There must be a query to unlisten too!');
432433
this.queryListeners.delete(query);
433-
await this.queue.enqueue(() => this.eventManager.unlisten(eventEmitter!));
434+
await this.queue.enqueue(() => unlisten(this.eventManager, eventEmitter!));
434435
}
435436

436437
private doSet(setSpec: SpecUserSet): Promise<void> {

0 commit comments

Comments
 (0)