Minor fixes

Author: fabioh8010

API-INTERNAL.md

@@ -114,17 +114,6 @@ If the requested key is a collection, it will return an object with all the coll
 <dt><a href="#getCollectionDataAndSendAsObject">getCollectionDataAndSendAsObject()</a></dt>
 <dd><p>Gets the data for a given an array of matching keys, combines them into an object, and sends the result back to the subscriber.</p>
 </dd>
-<dt><a href="#prepareSubscriberUpdate">prepareSubscriberUpdate(callback)</a></dt>
-<dd><p>Delays promise resolution until the next macrotask to prevent race condition if the key subscription is in progress.</p>
-</dd>
-<dt><a href="#scheduleSubscriberUpdate">scheduleSubscriberUpdate()</a></dt>
-<dd><p>Schedules an update that will be appended to the macro task queue (so it doesn&#39;t update the subscribers immediately).</p>
-</dd>
-<dt><a href="#scheduleNotifyCollectionSubscribers">scheduleNotifyCollectionSubscribers()</a></dt>
-<dd><p>This method is similar to scheduleSubscriberUpdate but it is built for working specifically with collections
-so that keysChanged() is triggered for the collection and not keyChanged(). If this was not done, then the
-subscriber callbacks receive the data in a different format than they normally expect and it breaks code.</p>
-</dd>
 <dt><a href="#remove">remove()</a></dt>
 <dd><p>Remove a key from Onyx and update the subscribers</p>
 </dd>
@@ -463,35 +452,6 @@ Sends the data obtained from the keys to the connection.
 ## getCollectionDataAndSendAsObject()
 Gets the data for a given an array of matching keys, combines them into an object, and sends the result back to the subscriber.
 
-**Kind**: global function  
-<a name="prepareSubscriberUpdate"></a>
-
-## prepareSubscriberUpdate(callback)
-Delays promise resolution until the next macrotask to prevent race condition if the key subscription is in progress.
-
-**Kind**: global function  
-
-| Param | Description |
-| --- | --- |
-| callback | The keyChanged/keysChanged callback |
-
-<a name="scheduleSubscriberUpdate"></a>
-
-## scheduleSubscriberUpdate()
-Schedules an update that will be appended to the macro task queue (so it doesn't update the subscribers immediately).
-
-**Kind**: global function  
-**Example**  
-```js
-scheduleSubscriberUpdate(key, value, subscriber => subscriber.initWithStoredValues === false)
-```
-<a name="scheduleNotifyCollectionSubscribers"></a>
-
-## scheduleNotifyCollectionSubscribers()
-This method is similar to scheduleSubscriberUpdate but it is built for working specifically with collections
-so that keysChanged() is triggered for the collection and not keyChanged(). If this was not done, then the
-subscriber callbacks receive the data in a different format than they normally expect and it breaks code.
-
 **Kind**: global function  
 <a name="remove"></a>
 

lib/OnyxConnectionManager.ts

@@ -247,7 +247,7 @@ class OnyxConnectionManager {
      * Disconnect all subscribers from Onyx.
      */
     disconnectAll(): void {
-        for (const [, connectionMetadata] of this.connectionsMap.entries()) {
+        for (const connectionMetadata of this.connectionsMap.values()) {
             OnyxUtils.unsubscribeFromKey(connectionMetadata.subscriptionID);
         }
 

lib/OnyxSnapshotCache.ts

@@ -60,7 +60,7 @@ class OnyxSnapshotCache {
      * - `selector`: Different selectors produce different results, so each selector needs its own cache entry
      * - `initWithStoredValues`: This flag changes the initial loading behavior and affects the returned fetch status
      *
-     * Other options like `reuseConnection` and `allowDynamicKey` don't affect the data transformation
+     * Other options like `reuseConnection` don't affect the data transformation
      * or timing behavior of getSnapshot, so they're excluded from the cache key for better cache hit rates.
      */
     registerConsumer<TKey extends OnyxKey, TReturnValue>(options: Pick<UseOnyxOptions<TKey, TReturnValue>, 'selector' | 'initWithStoredValues'>): string {

lib/OnyxUtils.ts

@@ -739,8 +739,7 @@ function retryOperation<TMethod extends RetriableOnyxOperation>(error: Error, on
 
     if (nextRetryAttempt > MAX_STORAGE_OPERATION_RETRY_ATTEMPTS) {
         Logger.logAlert(`Storage operation failed after ${MAX_STORAGE_OPERATION_RETRY_ATTEMPTS} retries. Error: ${error}. onyxMethod: ${onyxMethod.name}.`);
-        reportStorageQuota();
-        return Promise.resolve();
+        return reportStorageQuota();
     }
 
     // @ts-expect-error No overload matches this call.
@@ -872,7 +871,7 @@ function initializeWithDefaultKeyStates(): Promise<void> {
     // 2. All subsequent reads are synchronous cache hits
     return Storage.getAll()
         .then((pairs) => {
-            const allDataFromStorage: Record<string, unknown> = {};
+            const allDataFromStorage: Record<OnyxKey, OnyxValue<OnyxKey>> = {};
             for (const [key, value] of pairs) {
                 // RAM-only keys should never be loaded from storage as they may have stale persisted data
                 // from before the key was migrated to RAM-only.
@@ -902,7 +901,6 @@ function initializeWithDefaultKeyStates(): Promise<void> {
 
             // Only notify subscribers for default key states — same as before.
             // Other keys will be picked up by subscribers when they connect.
-            // FIXME: Maybe we dont need this, but some tests in E/App are failing if we remove it.
             for (const [key, value] of Object.entries(merged ?? {})) keyChanged(key, value);
         })
         .catch((error) => {
@@ -916,6 +914,7 @@ function initializeWithDefaultKeyStates(): Promise<void> {
             // Boot with defaults so the app renders instead of deadlocking.
             // Users will get a fresh-install experience but the app won't be bricked.
             cache.merge(defaultKeyStates);
+            for (const [key, value] of Object.entries(defaultKeyStates)) keyChanged(key, value);
         });
 }
 

tests/unit/useOnyxTest.ts

@@ -107,18 +107,16 @@ describe('useOnyx', () => {
         });
 
         it('should return loaded state after an Onyx.clear() call while connecting and loading from cache', async () => {
-            // Write directly to storage so the data is not in cache when Onyx.clear() is called
-            // TODO: Check if this test still makes sense
-            await StorageMock.setItem(ONYXKEYS.TEST_KEY, 'test');
+            await Onyx.set(ONYXKEYS.TEST_KEY, 'test');
 
             Onyx.clear();
 
             const {result: result1} = renderHook(() => useOnyx(ONYXKEYS.TEST_KEY));
             const {result: result2} = renderHook(() => useOnyx(ONYXKEYS.TEST_KEY));
 
-            expect(result1.current[0]).toBeUndefined();
+            expect(result1.current[0]).toEqual('test');
             expect(result1.current[1].status).toEqual('loaded');
-            expect(result2.current[0]).toBeUndefined();
+            expect(result2.current[0]).toEqual('test');
             expect(result2.current[1].status).toEqual('loaded');
 
             Onyx.merge(ONYXKEYS.TEST_KEY, 'test2');
@@ -848,8 +846,7 @@ describe('useOnyx', () => {
         });
 
         it('should always return undefined when subscribing to a skippable collection member id', async () => {
-            // TODO: Check if this test still makes sense
-            await StorageMock.setItem<string>(`${ONYXKEYS.COLLECTION.TEST_KEY}skippable-id`, 'skippable-id_value');
+            await Onyx.set(`${ONYXKEYS.COLLECTION.TEST_KEY}skippable-id`, 'skippable-id_value');
 
             const {result} = renderHook(() => useOnyx(`${ONYXKEYS.COLLECTION.TEST_KEY}skippable-id`));