Page MenuHomePhabricator
Differential D10041

[Flow202][native][skip-ci] [57/x] Avoid looking up nullable type in non-nullable Set in ChatRouter
ClosedPublic
Actions

Authored by ashoat on Nov 27 2023, 1:30 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 16, 2:39 AM
Unknown Object (File)
Wed, Apr 16, 2:33 AM
Unknown Object (File)
Tue, Apr 15, 9:03 PM
Unknown Object (File)
Mon, Apr 14, 9:33 PM
Unknown Object (File)
Sun, Apr 6, 9:32 AM
Unknown Object (File)
Tue, Apr 1, 10:41 PM
Unknown Object (File)
Mar 19 2025, 4:28 PM
Unknown Object (File)
Feb 27 2025, 9:14 AM
View All 79 Files
Subscribers
None

Details

Reviewers
tomek
Commits
rCOMM38aec99263ed: [Flow202][native][skip-ci] [57/x] Avoid looking up nullable type in non…
Summary

Flow doesn't like that we're calling Set<string>.has with a ?string. To avoid this, I check the type before calling has() here.

NOTE: CI will fail on this diff. I considered the possibility of fixing Flow errors BEFORE upgrading Flow, but it wasn't possible... in some cases, the fixes to support the new version of Flow caused errors in the old version. I could have hidden these type errors with $FlowFixMe lines and then later revert those, but that seemed like too much busy work.

Depends on D10040

Test Plan

Confirm the Flow errors go away

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 24483
Build 210214: arc lint + arc unit

Revision Contents
Changeset List

PathSize
native/
chat/
10 lines

Diff 33686

View Options

native/chat/chat-router.js

Show First 20 Lines • Show All 861 Lines • ▼ Show 20 Lines
// persisted. However, we aren't able to specify nested keys in `blacklist`. // persisted. However, we aren't able to specify nested keys in `blacklist`.
// As a result, if we want to prevent nested keys from being persisted we'll // As a result, if we want to prevent nested keys from being persisted we'll
// need to use `createTransform(...)` to specify an `inbound` function that // need to use `createTransform(...)` to specify an `inbound` function that
// allows us to modify the `state` object before it's passed through // allows us to modify the `state` object before it's passed through
// `JSON.stringify(...)` and written to disk. We specify the keys for which // `JSON.stringify(...)` and written to disk. We specify the keys for which
// this transformation should be executed in the `whitelist` property of the // this transformation should be executed in the `whitelist` property of the
// `config` object that's passed to `createTransform(...)`. // `config` object that's passed to `createTransform(...)`.
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
type PersistedThreadMessageInfo = {
+startReached: boolean,
};
type PersistedMessageStore = { type PersistedMessageStore = {
+local: { +[id: string]: LocalMessageInfo }, +local: { +[id: string]: LocalMessageInfo },
+currentAsOf: { +[keyserverID: string]: number }, +currentAsOf: { +[keyserverID: string]: number },
+threads: { +[threadID: string]: PersistedThreadMessageInfo },
}; };
const messageStoreMessagesBlocklistTransform: Transform = createTransform( const messageStoreMessagesBlocklistTransform: Transform = createTransform(
(state: MessageStore): PersistedMessageStore => { (state: MessageStore): PersistedMessageStore => {
const { messages, threads, ...messageStoreSansMessages } = state; const { messages, threads, ...messageStoreSansMessages } = state;
// We also do not want to persist `messageStore.threads[ID].messageIDs` return { ...messageStoreSansMessages };
// because they can be deterministically computed based on messages we have
// from SQLite
const threadsToPersist = {};
for (const threadID in threads) {
const { messageIDs, ...threadsData } = threads[threadID];
threadsToPersist[threadID] = threadsData;
}
return { ...messageStoreSansMessages, threads: threadsToPersist };
}, },
(state: MessageStore): MessageStore => { (state: MessageStore): MessageStore => {
const { threads: persistedThreads, ...messageStore } = state;
const threads = {};
for (const threadID in persistedThreads) {
threads[threadID] = { ...persistedThreads[threadID], messageIDs: [] };
}
// We typically expect `messageStore.messages` to be `undefined` because // We typically expect `messageStore.messages` to be `undefined` because
// messages are persisted in the SQLite `messages` table rather than via // messages are persisted in the SQLite `messages` table rather than via
// `redux-persist`. In this case we want to set `messageStore.messages` // `redux-persist`. In this case we want to set `messageStore.messages`
// to {} so we don't run into issues with `messageStore.messages` being // to {} so we don't run into issues with `messageStore.messages` being
// `undefined` (https://phab.comm.dev/D5545). // `undefined` (https://phab.comm.dev/D5545).
// //
// However, in the case that a user is upgrading from a client where // However, in the case that a user is upgrading from a client where
// `persistConfig.version` < 31, we expect `messageStore.messages` to // `persistConfig.version` < 31, we expect `messageStore.messages` to
// contain messages stored via `redux-persist` that we need in order // contain messages stored via `redux-persist` that we need in order
// to correctly populate the SQLite `messages` table in migration 31 // to correctly populate the SQLite `messages` table in migration 31
// (https://phab.comm.dev/D2600). // (https://phab.comm.dev/D2600).
// //
// However, because `messageStoreMessagesBlocklistTransform` modifies // However, because `messageStoreMessagesBlocklistTransform` modifies
// `messageStore` before migrations are run, we need to make sure we aren't // `messageStore` before migrations are run, we need to make sure we aren't
// inadvertently clearing `messageStore.messages` (by setting to {}) before // inadvertently clearing `messageStore.messages` (by setting to {}) before
// messages are stored in SQLite (https://linear.app/comm/issue/ENG-2377). // messages are stored in SQLite (https://linear.app/comm/issue/ENG-2377).
return { ...messageStore, threads, messages: messageStore.messages ?? {} }; return {
...state,
threads: state.threads ?? {},
messages: state.messages ?? {},
};
}, },
{ whitelist: ['messageStore'] }, { whitelist: ['messageStore'] },
); );
type PersistedReportStore = $Diff< type PersistedReportStore = $Diff<
ReportStore, ReportStore,
{ +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> }, { +queuedReports: $ReadOnlyArray<ClientReportCreationRequest> },
>; >;
▲ Show 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
}; };
const codeVersion: number = commCoreModule.getCodeVersion(); const codeVersion: number = commCoreModule.getCodeVersion();
// This local exists to avoid a circular dependency where redux-setup needs to // This local exists to avoid a circular dependency where redux-setup needs to
// import all the navigation and screen stuff, but some of those screens want to // import all the navigation and screen stuff, but some of those screens want to
// access the persistor to purge its state. // access the persistor to purge its state.
let storedPersistor = null; let storedPersistor = null;
atulUnsubmitted
Not Done
Inline Actions

Is your editor auto formatter maybe adding these newlines? Feel free to disregard if intentional, but noticed these D9682 as well.

atul: Is your editor auto formatter maybe adding these newlines? Feel free to disregard if…
kamilAuthorUnsubmitted
Done
Inline Actions

looks like it's my IDE fault, it is adding this while committing, I'll take a look

kamil: looks like it's my IDE fault, it is adding this while committing, I'll take a look
atulUnsubmitted
Not Done
Inline Actions

Sweet, thanks for taking a look!

Not a huge deal regardless, guess it clutters up git blame history a bit.. but not end of the world

atul: Sweet, thanks for taking a look! Not a huge deal regardless, guess it clutters up `git blame`…
function setPersistor(persistor: *) { function setPersistor(persistor: *) {
storedPersistor = persistor; storedPersistor = persistor;
} }
function getPersistor(): empty { function getPersistor(): empty {
invariant(storedPersistor, 'should be set'); invariant(storedPersistor, 'should be set');
return storedPersistor; return storedPersistor;
} }
export { persistConfig, codeVersion, setPersistor, getPersistor }; export { persistConfig, codeVersion, setPersistor, getPersistor };