Skip to content

Add OnyxStore as a standalone, inert module - #833

Merged
roryabraham merged 11 commits into
Expensify:mainfrom
callstack-internal:feature/onyx-store-pr-4
Sep 9, 2026
Merged

Add OnyxStore as a standalone, inert module#833
roryabraham merged 11 commits into
Expensify:mainfrom
callstack-internal:feature/onyx-store-pr-4

Conversation

@fabioh8010

@fabioh8010 fabioh8010 commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Details

Coming from https://expensify.slack.com/archives/C05LX9D6E07/p1788270903471539.

Adds OnyxStore, a standalone listener registry that will back Onyx subscriptions in the store-based redesign. Nothing calls it yet, so this PR is inert and changes no behavior.

OnyxStore keeps a single Map<key, Set<listener>>. Subscribing is a Set.add, unsubscribing a Set.delete, and a write looks up only the affected key's listeners:

  • subscribe(key, listener) registers an exact-key listener (a single key, a collection root, or a collection member) and returns an unsubscribe function.
  • getState(key) reads the eager cache: the frozen collection object for collection keys, the cached value otherwise.
  • notifyKey(key, value) dispatches a single-key write and routes to the parent collection's listeners when the key is a collection member.
  • notifyCollection(key, partial, previous) dispatches a batch update, firing collection listeners once and member listeners only for members whose value reference actually changed.

A throwing listener is caught and logged so it can't stop the others. The module depends only on OnyxCache and OnyxKeys.

The next PR wires the subscription layer onto OnyxStore and deletes the old per-subscription bookkeeping. Full context is in the proposal thread.

Related Issues

Expensify/App#100271

Linked E/App PR

Expensify/App#100316

Automated Tests

Tests were added for the new module.

Manual Tests

There is nothing to test right now as we are just adding a new module without using it.

Author Checklist

  • I linked the correct issue in the ### Related Issues section above
  • I linked the corresponding Expensify/App PR in the ### Linked E/App PR section above, and verified this change against it (E/App CI passed and manual testing completed)
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

fabioh8010 and others added 3 commits June 11, 2026 14:48
Introduce lib/OnyxStore.ts: a single listener registry (keyListeners
Map<key, Set<listener>>) with subscribe / notifyKey / notifyCollection /
getState / hasListenersForKey / clearAll. Built on the existing
structural-sharing cache (cache.getCollectionData frozen snapshots).

This module is inert — nothing imports it yet. The subscription and
notification paths (Onyx.connect, useOnyx, OnyxUtils.notify*) are wired
onto it in a later change. Adding it alone has zero behavioral impact.

Includes tests/unit/OnyxStoreTest.ts (20 tests) covering exact-key and
collection-snapshot routing, ref-equality member skips, hasListenersForKey,
clearAll, and listener error isolation.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@fabioh8010

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Keep it up!

Reviewed commit: 4f99ddf015

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@fabioh8010 fabioh8010 changed the title [WIP][POC] Add OnyxStore as a standalone, inert module Add OnyxStore as a standalone, inert module Sep 3, 2026
@fabioh8010
fabioh8010 marked this pull request as ready for review September 3, 2026 15:38
@fabioh8010
fabioh8010 requested a review from a team as a code owner September 3, 2026 15:38
@melvin-bot
melvin-bot Bot requested review from Gonals and removed request for a team September 3, 2026 15:38

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 28179abee4

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread lib/OnyxStore.ts Outdated
@roryabraham
roryabraham self-requested a review September 3, 2026 17:37
Comment thread lib/OnyxSubscriptionManager.ts
Comment thread lib/OnyxStore.ts Outdated
Comment thread lib/OnyxStore.ts Outdated
Comment thread lib/OnyxStore.ts Outdated
Comment thread lib/OnyxSubscriptionManager.ts
Comment thread lib/OnyxStore.ts Outdated
@roryabraham
roryabraham requested a review from huult September 4, 2026 17:42
Comment thread lib/OnyxSubscriptionManager.ts
Comment thread lib/OnyxStore.ts Outdated
fabioh8010 and others added 3 commits September 7, 2026 14:12
Co-Authored-By: Claude Code <noreply@anthropic.com>
Co-Authored-By: Claude Code <noreply@anthropic.com>
…evious collection

A removed member reads undefined on both sides when partialPreviousCollection is omitted, so the ref-equality skip must only apply when previous actually carries the member. Adds regression test plus getState coverage for both the single-key and collection-key paths.

Co-Authored-By: Claude Code <noreply@anthropic.com>
@huult

huult commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

@fabioh8010 Could you take a look at the comments above?

No production call site sets it: collection-batch write paths route members through a single notifyCollection(), so per-member notifyKey calls always want the collection-root routing. Drops the option, the NotifyKeyOptions type, and the now-dead suppression test.

Co-Authored-By: Claude Code <noreply@anthropic.com>
}
}

// 2. Collection-level routing. Only fires when the write is to a member key.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Not sure if you missed this from my last review. if direct writes to a collection root are an unsupported anti-pattern, why not prevent them at compile time?

diff --git a/lib/OnyxSubscriptionManager.ts b/lib/OnyxSubscriptionManager.ts
index 7e61ec7e..8bc43472 100644
--- a/lib/OnyxSubscriptionManager.ts
+++ b/lib/OnyxSubscriptionManager.ts
@@ -78,7 +78,7 @@ class OnyxSubscriptionManager {
      *   2. If key is a collection member, keyListeners.get(collectionKey): collection
      *      listeners for the parent collection.
      */
-    notifyKey<TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>): void {
+    notifyKey<TKey extends Exclude<OnyxKey, CollectionKeyBase>>(key: TKey, value: OnyxValue<TKey>): void {
         // 1. Exact-key listeners
         const exact = this.keyListeners.get(key);
         if (exact && exact.size > 0) {

@fabioh8010 fabioh8010 Sep 8, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sorry, forgot to answer about this one. While it makes sense for external consumers like E/App (if we exported this module), it breaks completely internally because OnyxKey and CollectionKeyBase are both string from library's own perspective – external consumers will augment Onyx types with the correct keys but internally we set them to string, see TypeOptions type. Since they are both string, Exclude<string, string> will resolve to never and any call of this function inside the repo will break.

We shouldn't worry about this though, this module isn't supposed to be exported or used externally by consumers.

@roryabraham

roryabraham commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

@huult @Gonals back to you (though there's nothing to test here yet)

@huult

huult commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@huult huult left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM.

@roryabraham
roryabraham merged commit 983ed08 into Expensify:main Sep 9, 2026
12 of 18 checks passed
@os-botify

os-botify Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Published to npm in 3.0.111 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants