@isograph/react-disposable-state 0.0.0-main-6d83b6a2 → 0.0.0-main-f524690b

package/dist/useDisposableState.js

@@ -44,7 +44,9 @@ function useDisposableState(parentCache) {
     // Note that in the post-commit post-setState state, itemCleanupPairRef
     // can still be assigned, during the render before the
     // cleanupItemCleanupPairRefAfterSetState effect is called.
-    const state = (_c = (_a = (stateFromDisposableStateHook != useUpdatableDisposableState_1.UNASSIGNED_STATE ? stateFromDisposableStateHook : null)) !== null && _a !== void 0 ? _a : (_b = itemCleanupPairRef.current) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : preCommitItem === null || preCommitItem === void 0 ? void 0 : preCommitItem.state;
+    const state = (_c = (_a = (stateFromDisposableStateHook != useUpdatableDisposableState_1.UNASSIGNED_STATE
+        ? stateFromDisposableStateHook
+        : null)) !== null && _a !== void 0 ? _a : (_b = itemCleanupPairRef.current) === null || _b === void 0 ? void 0 : _b[0]) !== null && _c !== void 0 ? _c : preCommitItem === null || preCommitItem === void 0 ? void 0 : preCommitItem.state;
     return {
         state: state,
         setState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react-disposable-state",
-  "version": "0.0.0-main-6d83b6a2",
+  "version": "0.0.0-main-f524690b",
   "description": "Primitives for managing disposable state in React",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,7 +16,7 @@
     "prepack": "yarn run compile"
   },
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-6d83b6a2",
+    "@isograph/disposable-types": "0.0.0-main-f524690b",
     "react": "^18.2.0"
   },
   "devDependencies": {

package/src/CacheItem.test.ts

@@ -1,5 +1,17 @@
-import { describe, assert, test, vi, beforeEach, afterEach, expect } from 'vitest';
-import { CacheItem, CacheItemState, createTemporarilyRetainedCacheItem } from './CacheItem';
+import {
+  describe,
+  assert,
+  test,
+  vi,
+  beforeEach,
+  afterEach,
+  expect,
+} from 'vitest';
+import {
+  CacheItem,
+  CacheItemState,
+  createTemporarilyRetainedCacheItem,
+} from './CacheItem';
 import { ItemCleanupPair } from '@isograph/disposable-types';
 
 function getState<T>(cacheItem: CacheItem<T>): CacheItemState<T> {
@@ -22,10 +34,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, _disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, _disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       expect(factory.mock.calls.length).toEqual(1);
 
@@ -47,10 +60,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       expect(factory.mock.calls.length).toEqual(1);
 
@@ -71,10 +85,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, _disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, _disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       expect(factory.mock.calls.length).toEqual(1);
 
@@ -95,10 +110,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       expect(factory.mock.calls.length).toEqual(1);
 
@@ -123,10 +139,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       expect(factory.mock.calls.length).toEqual(1);
 
@@ -152,18 +169,18 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       const mockedDisposeTemporaryRetain = vi.fn(disposeTemporaryRetain);
 
       expect(factory.mock.calls.length).toEqual(1);
 
-      const [item, _disposePermanentRetain] = cacheItem.permanentRetainIfNotDisposed(
-        mockedDisposeTemporaryRetain,
-      )!;
+      const [item, _disposePermanentRetain] =
+        cacheItem.permanentRetainIfNotDisposed(mockedDisposeTemporaryRetain)!;
 
       expect(item).toEqual(1);
       expect(mockedDisposeTemporaryRetain.mock.calls.length).toEqual(1);
@@ -186,10 +203,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       expect(factory.mock.calls.length).toEqual(1);
 
@@ -209,18 +227,18 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       const mockedDisposeTemporaryRetain = vi.fn(disposeTemporaryRetain);
 
       expect(factory.mock.calls.length).toEqual(1);
 
-      const [item, disposePermanentRetain] = cacheItem.permanentRetainIfNotDisposed(
-        mockedDisposeTemporaryRetain,
-      )!;
+      const [item, disposePermanentRetain] =
+        cacheItem.permanentRetainIfNotDisposed(mockedDisposeTemporaryRetain)!;
 
       disposePermanentRetain();
 
@@ -238,18 +256,18 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       const mockedDisposeTemporaryRetain = vi.fn(disposeTemporaryRetain);
 
       expect(factory.mock.calls.length).toEqual(1);
 
-      const [item, disposePermanentRetain] = cacheItem.permanentRetainIfNotDisposed(
-        mockedDisposeTemporaryRetain,
-      )!;
+      const [item, disposePermanentRetain] =
+        cacheItem.permanentRetainIfNotDisposed(mockedDisposeTemporaryRetain)!;
 
       disposePermanentRetain();
       expect(() => {
@@ -265,10 +283,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       expect(factory.mock.calls.length).toEqual(1);
 
@@ -278,7 +297,9 @@ describe('CacheItem', () => {
 
       assert(state.kind === 'NotInParentCacheAndDisposed');
 
-      assert(cacheItem.permanentRetainIfNotDisposed(disposeTemporaryRetain) === null);
+      assert(
+        cacheItem.permanentRetainIfNotDisposed(disposeTemporaryRetain) === null,
+      );
 
       expect(() => {
         cacheItem.permanentRetain();
@@ -293,10 +314,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       const [_value, disposeOfPermanentRetain1] =
         cacheItem.permanentRetainIfNotDisposed(disposeTemporaryRetain1)!;
@@ -316,10 +338,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, _disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, _disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
 
@@ -346,10 +369,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -375,10 +399,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -398,10 +423,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -420,10 +446,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       const disposeTemporaryRetain2 = cacheItem.temporaryRetain();
       const state1 = getState(cacheItem);
@@ -445,10 +472,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       const disposeTemporaryRetain2 = cacheItem.temporaryRetain();
       const state1 = getState(cacheItem);
@@ -470,10 +498,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, _disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, _disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -502,10 +531,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -529,10 +559,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -560,10 +591,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -591,10 +623,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -618,10 +651,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -644,10 +678,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -670,10 +705,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -696,10 +732,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const _disposeTemporaryRetain2 = cacheItem.temporaryRetain();
@@ -724,10 +761,11 @@ describe('CacheItem', () => {
         const ret: ItemCleanupPair<number> = [1, disposeItem];
         return ret;
       });
-      const [cacheItem, disposeTemporaryRetain1] = createTemporarilyRetainedCacheItem<number>(
-        factory,
-        removeFromParentCache,
-      );
+      const [cacheItem, disposeTemporaryRetain1] =
+        createTemporarilyRetainedCacheItem<number>(
+          factory,
+          removeFromParentCache,
+        );
 
       vi.advanceTimersByTime(1000);
       const disposeTemporaryRetain2 = cacheItem.temporaryRetain();

package/src/CacheItem.ts

@@ -1,4 +1,8 @@
-import { CleanupFn, Factory, ItemCleanupPair } from '@isograph/disposable-types';
+import {
+  CleanupFn,
+  Factory,
+  ItemCleanupPair,
+} from '@isograph/disposable-types';
 
 const DEFAULT_TEMPORARY_RETAIN_TIME = 5000;
 
@@ -103,7 +107,9 @@ export class CacheItem<T> {
     }
   }
 
-  permanentRetainIfNotDisposed(disposeOfTemporaryRetain: CleanupFn): ItemCleanupPair<T> | null {
+  permanentRetainIfNotDisposed(
+    disposeOfTemporaryRetain: CleanupFn,
+  ): ItemCleanupPair<T> | null {
     switch (this.__state.kind) {
       case 'InParentCacheAndNotDisposed': {
         let cleared = false;
@@ -127,7 +133,9 @@ export class CacheItem<T> {
               }
               case 'NotInParentCacheAndNotDisposed': {
                 this.__state.permanentRetainCount--;
-                this.__maybeExitNotInParentCacheAndNotDisposedState(this.__state);
+                this.__maybeExitNotInParentCacheAndNotDisposedState(
+                  this.__state,
+                );
                 return;
               }
               default: {
@@ -157,7 +165,9 @@ export class CacheItem<T> {
             switch (this.__state.kind) {
               case 'NotInParentCacheAndNotDisposed': {
                 this.__state.permanentRetainCount--;
-                this.__maybeExitNotInParentCacheAndNotDisposedState(this.__state);
+                this.__maybeExitNotInParentCacheAndNotDisposedState(
+                  this.__state,
+                );
                 return;
               }
               default: {
@@ -178,7 +188,10 @@ export class CacheItem<T> {
   }
 
   temporaryRetain(): CleanupFn {
-    type TemporaryRetainStatus = 'Uncleared' | 'ClearedByCallback' | 'ClearedByTimeout';
+    type TemporaryRetainStatus =
+      | 'Uncleared'
+      | 'ClearedByCallback'
+      | 'ClearedByTimeout';
 
     switch (this.__state.kind) {
       case 'InParentCacheAndNotDisposed': {
@@ -308,7 +321,9 @@ export class CacheItem<T> {
     }
   }
 
-  private __maybeExitInParentCacheAndNotDisposedState(state: InParentCacheAndNotDisposed<T>) {
+  private __maybeExitInParentCacheAndNotDisposedState(
+    state: InParentCacheAndNotDisposed<T>,
+  ) {
     if (state.temporaryRetainCount === 0 && state.permanentRetainCount === 0) {
       state.removeFromParentCache();
       state.disposeValue();
@@ -326,7 +341,9 @@ export class CacheItem<T> {
     }
   }
 
-  private __maybeExitNotInParentCacheAndNotDisposedState(state: NotInParentCacheAndNotDisposed<T>) {
+  private __maybeExitNotInParentCacheAndNotDisposedState(
+    state: NotInParentCacheAndNotDisposed<T>,
+  ) {
     if (state.permanentRetainCount === 0) {
       state.disposeValue();
       this.__state = {

package/src/ParentCache.test.ts

@@ -15,7 +15,8 @@ describe('ParentCache', () => {
     });
     const parentCache = new ParentCache<number>(factory);
 
-    const [_cacheItem, value, clearTemporaryRetain] = parentCache.getOrPopulateAndTemporaryRetain();
+    const [_cacheItem, value, clearTemporaryRetain] =
+      parentCache.getOrPopulateAndTemporaryRetain();
 
     expect(factory.mock.calls.length).toBe(1);
     assert(value === 1);

package/src/ParentCache.ts

@@ -1,5 +1,9 @@
 import { CacheItem, createTemporarilyRetainedCacheItem } from './CacheItem';
-import { CleanupFn, Factory, ItemCleanupPair } from '@isograph/disposable-types';
+import {
+  CleanupFn,
+  Factory,
+  ItemCleanupPair,
+} from '@isograph/disposable-types';
 
 // TODO convert cache impl to a getter and setter and free functions
 // TODO accept options that get passed to CacheItem
@@ -51,9 +55,8 @@ export class ParentCache<T> {
   }
 
   private __populateAndTemporaryRetain(): [CacheItem<T>, T, CleanupFn] {
-    const pair: ItemCleanupPair<CacheItem<T>> = createTemporarilyRetainedCacheItem(
-      this.__factory,
-      () => {
+    const pair: ItemCleanupPair<CacheItem<T>> =
+      createTemporarilyRetainedCacheItem(this.__factory, () => {
         // We are doing this check because we don't want to remove the cache item
         // if it is not the one that was created when the temporary retain was created.
         //
@@ -70,8 +73,7 @@ export class ParentCache<T> {
         if (this.__cacheItem === pair[0]) {
           this.empty();
         }
-      },
-    );
+      });
 
     // We deconstruct this here instead of at the definition site because otherwise,
     // typescript thinks that cacheItem is any, because it's referenced in the closure.

package/src/useCachedPrecommitValue.test.tsx

@@ -52,7 +52,10 @@ function promiseAndResolver() {
 // The fact that sometimes we need to render in concurrent mode and sometimes
 // not is a bit worrisome.
 async function awaitableCreate(Component, isConcurrent) {
-  const element = create(Component, isConcurrent ? { unstable_isConcurrent: true } : undefined);
+  const element = create(
+    Component,
+    isConcurrent ? { unstable_isConcurrent: true } : undefined,
+  );
   await shortPromise();
   return element;
 }
@@ -65,7 +68,10 @@ describe('useCachedPrecommitValue', () => {
       return pair;
     });
     const cache = new ParentCache(factory);
-    const getOrPopulateAndTemporaryRetain = vi.spyOn(cache, 'getOrPopulateAndTemporaryRetain');
+    const getOrPopulateAndTemporaryRetain = vi.spyOn(
+      cache,
+      'getOrPopulateAndTemporaryRetain',
+    );
 
     const componentCommits = vi.fn();
     const hookOnCommit = vi.fn();
@@ -189,7 +195,10 @@ describe('useCachedPrecommitValue', () => {
         return pair;
       });
       const cache = new ParentCache(factory);
-      const getOrPopulateAndTemporaryRetain = vi.spyOn(cache, 'getOrPopulateAndTemporaryRetain');
+      const getOrPopulateAndTemporaryRetain = vi.spyOn(
+        cache,
+        'getOrPopulateAndTemporaryRetain',
+      );
 
       const componentCommits = vi.fn();
       const hookOnCommit = vi.fn();
@@ -203,7 +212,9 @@ describe('useCachedPrecommitValue', () => {
         expect(factory).toHaveBeenCalledTimes(1);
 
         renderCount++;
-        expect(getOrPopulateAndTemporaryRetain).toHaveBeenCalledTimes(renderCount);
+        expect(getOrPopulateAndTemporaryRetain).toHaveBeenCalledTimes(
+          renderCount,
+        );
 
         React.useEffect(() => {
           componentCommits();
@@ -249,7 +260,10 @@ describe('useCachedPrecommitValue', () => {
       });
       const cache = new ParentCache(factory);
 
-      const getOrPopulateAndTemporaryRetain = vi.spyOn(cache, 'getOrPopulateAndTemporaryRetain');
+      const getOrPopulateAndTemporaryRetain = vi.spyOn(
+        cache,
+        'getOrPopulateAndTemporaryRetain',
+      );
 
       const componentCommits = vi.fn();
       const hookOnCommit = vi.fn();
@@ -318,8 +332,14 @@ describe('useCachedPrecommitValue', () => {
         return pair;
       });
       const cache = new ParentCache(factory);
-      const getOrPopulateAndTemporaryRetain = vi.spyOn(cache, 'getOrPopulateAndTemporaryRetain');
-      const getAndPermanentRetainIfPresent = vi.spyOn(cache, 'getAndPermanentRetainIfPresent');
+      const getOrPopulateAndTemporaryRetain = vi.spyOn(
+        cache,
+        'getOrPopulateAndTemporaryRetain',
+      );
+      const getAndPermanentRetainIfPresent = vi.spyOn(
+        cache,
+        'getAndPermanentRetainIfPresent',
+      );
 
       const componentCommits = vi.fn();
       const hookOnCommit = vi.fn();
@@ -333,7 +353,9 @@ describe('useCachedPrecommitValue', () => {
           componentCommits();
           expect(getOrPopulateAndTemporaryRetain).toHaveBeenCalledTimes(1);
           expect(getAndPermanentRetainIfPresent).toHaveBeenCalledTimes(1);
-          expect(getAndPermanentRetainIfPresent.mock.results[0].value).toBe(null);
+          expect(getAndPermanentRetainIfPresent.mock.results[0].value).toBe(
+            null,
+          );
           expect(factory).toHaveBeenCalledTimes(2);
           expect(cache.isEmpty()).toBe(true);
           expect(hookOnCommit).toHaveBeenCalledTimes(1);
@@ -403,7 +425,10 @@ describe('useCachedPrecommitValue', () => {
         return pair;
       });
       const cache = new ParentCache(factory);
-      const getAndPermanentRetainIfPresent = vi.spyOn(cache, 'getAndPermanentRetainIfPresent');
+      const getAndPermanentRetainIfPresent = vi.spyOn(
+        cache,
+        'getAndPermanentRetainIfPresent',
+      );
 
       const componentCommits = vi.fn();
       const hookOnCommit = vi.fn();
@@ -417,7 +442,9 @@ describe('useCachedPrecommitValue', () => {
           // Note that we called getOrPopulateAndTemporaryRetain during CodeExecutor, hence 2
           expect(getOrPopulateAndTemporaryRetain).toHaveBeenCalledTimes(2);
           expect(getAndPermanentRetainIfPresent).toHaveBeenCalledTimes(1);
-          expect(getAndPermanentRetainIfPresent.mock.results[0].value[0]).toBe(2);
+          expect(getAndPermanentRetainIfPresent.mock.results[0].value[0]).toBe(
+            2,
+          );
           expect(factory).toHaveBeenCalledTimes(2);
           expect(hookOnCommit).toHaveBeenCalledTimes(1);
           expect(hookOnCommit.mock.calls[0][0][0]).toBe(2);
@@ -426,7 +453,10 @@ describe('useCachedPrecommitValue', () => {
         return <div />;
       }
 
-      const getOrPopulateAndTemporaryRetain = vi.spyOn(cache, 'getOrPopulateAndTemporaryRetain');
+      const getOrPopulateAndTemporaryRetain = vi.spyOn(
+        cache,
+        'getOrPopulateAndTemporaryRetain',
+      );
 
       // wat is going on?
       //

package/src/useCachedPrecommitValue.ts

@@ -65,13 +65,16 @@ export function useCachedPrecommitValue<T>(
     //
     // After the above, we have a non-disposed item and a cleanup function, which we
     // can pass to onCommit.
-    const undisposedPair = cacheItem.permanentRetainIfNotDisposed(disposeOfTemporaryRetain);
+    const undisposedPair = cacheItem.permanentRetainIfNotDisposed(
+      disposeOfTemporaryRetain,
+    );
     if (undisposedPair !== null) {
       onCommit(undisposedPair);
     } else {
       // The cache item we created during render has been disposed. Check if the parent
       // cache is populated.
-      const existingCacheItemCleanupPair = parentCache.getAndPermanentRetainIfPresent();
+      const existingCacheItemCleanupPair =
+        parentCache.getAndPermanentRetainIfPresent();
       if (existingCacheItemCleanupPair !== null) {
         onCommit(existingCacheItemCleanupPair);
       } else {
@@ -94,7 +97,8 @@ export function useCachedPrecommitValue<T>(
 
   // Safety: item is only safe to use (i.e. guaranteed not to have disposed)
   // during this tick.
-  const [cacheItem, item, disposeOfTemporaryRetain] = parentCache.getOrPopulateAndTemporaryRetain();
+  const [cacheItem, item, disposeOfTemporaryRetain] =
+    parentCache.getOrPopulateAndTemporaryRetain();
 
   return { state: item };
 }

package/src/useDisposableState.ts

@@ -22,7 +22,8 @@ export function useDisposableState<T = never>(
     itemCleanupPairRef.current = pair;
   });
 
-  const { state: stateFromDisposableStateHook, setState } = useUpdatableDisposableState<T>();
+  const { state: stateFromDisposableStateHook, setState } =
+    useUpdatableDisposableState<T>();
 
   useEffect(
     function cleanupItemCleanupPairRefAfterSetState() {
@@ -64,7 +65,9 @@ export function useDisposableState<T = never>(
   // can still be assigned, during the render before the
   // cleanupItemCleanupPairRefAfterSetState effect is called.
   const state: T | undefined =
-    (stateFromDisposableStateHook != UNASSIGNED_STATE ? stateFromDisposableStateHook : null) ??
+    (stateFromDisposableStateHook != UNASSIGNED_STATE
+      ? stateFromDisposableStateHook
+      : null) ??
     itemCleanupPairRef.current?.[0] ??
     preCommitItem?.state;
 

package/src/useUpdatableDisposableState.test.tsx

@@ -1,7 +1,10 @@
 import { describe, test, vi, expect } from 'vitest';
 import React from 'react';
 import { create } from 'react-test-renderer';
-import { useUpdatableDisposableState, UNASSIGNED_STATE } from './useUpdatableDisposableState';
+import {
+  useUpdatableDisposableState,
+  UNASSIGNED_STATE,
+} from './useUpdatableDisposableState';
 
 function Suspender({ promise, isResolvedRef }) {
   if (!isResolvedRef.current) {
@@ -41,7 +44,10 @@ function promiseAndResolver() {
 // The fact that sometimes we need to render in concurrent mode and sometimes
 // not is a bit worrisome.
 async function awaitableCreate(Component, isConcurrent) {
-  const element = create(Component, isConcurrent ? { unstable_isConcurrent: true } : undefined);
+  const element = create(
+    Component,
+    isConcurrent ? { unstable_isConcurrent: true } : undefined,
+  );
   await shortPromise();
   return element;
 }
@@ -446,7 +452,10 @@ describe('useUpdatableDisposableState', () => {
 
     const shouldMountRef = { current: true };
 
-    await awaitableCreate(<ParentComponent shouldMountRef={shouldMountRef} />, true);
+    await awaitableCreate(
+      <ParentComponent shouldMountRef={shouldMountRef} />,
+      true,
+    );
 
     expect(render).toHaveBeenCalledTimes(1);
     expect(componentCommits).toHaveBeenCalledTimes(1);

package/src/useUpdatableDisposableState.ts

@@ -66,7 +66,9 @@ export function useUpdatableDisposableState<
   const undisposedICIs = useRef(new Set<ICI<T>>());
   const setStateCountRef = useRef(0);
 
-  const [stateICI, setStateICI] = useState<ICI<T> | UnassignedState>(UNASSIGNED_STATE);
+  const [stateICI, setStateICI] = useState<ICI<T> | UnassignedState>(
+    UNASSIGNED_STATE,
+  );
 
   const setStateAfterCommit = useCallback(
     (itemCleanupPair: ItemCleanupPair<T>) => {