@isograph/react-disposable-state 0.0.0-main-dbb17f5b → 0.0.0-main-4adb5045

package/.turbo/turbo-compile-libs.log

@@ -1,5 +1,5 @@
 ../..                                    |  WARN  Unsupported engine: wanted: {"node":"22.9.0"} (current: {"node":"v22.21.1","pnpm":"10.15.0"})
 
-> @isograph/react-disposable-state@0.0.0-main-dbb17f5b compile-libs /home/runner/work/isograph/isograph/libs/isograph-react-disposable-state
+> @isograph/react-disposable-state@0.0.0-main-4adb5045 compile-libs /home/runner/work/isograph/isograph/libs/isograph-react-disposable-state
 > rimraf dist && tsc -p tsconfig.pkg.json
 

package/dist/ParentCache.js

@@ -43,7 +43,7 @@ class ParentCache {
             : null;
     }
     getOrPopulateAndTemporaryRetain() {
-        return this.__cacheItem === null
+        return this.__cacheItem == null
             ? this.__populateAndTemporaryRetain()
             : temporaryRetain(this.__cacheItem);
     }
@@ -79,7 +79,7 @@ class ParentCache {
         return this.__factory;
     }
     isEmpty() {
-        return this.__cacheItem === null;
+        return this.__cacheItem == null;
     }
 }
 exports.ParentCache = ParentCache;

package/dist/useCachedResponsivePrecommitValue.js

@@ -62,14 +62,14 @@ function useCachedResponsivePrecommitValue(parentCache, onCommit) {
         // After the above, we have a non-disposed item and a cleanup function, which we
         // can pass to onCommit.
         const undisposedPair = cacheItem.permanentRetainIfNotDisposed(disposeOfTemporaryRetain);
-        if (undisposedPair !== null) {
+        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();
-            if (existingCacheItemCleanupPair !== null) {
+            if (existingCacheItemCleanupPair != null) {
                 onCommit(existingCacheItemCleanupPair);
             }
             else {

package/dist/useDisposableState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDisposableState.d.ts","sourceRoot":"","sources":["../src/useDisposableState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAEL,eAAe,EAEhB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,sCAAsC,CAAC,CAAC,IAAI;IAC/C,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,KAAK,IAAI,CAAC;CACxE,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,KAAK,EAC1C,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAC1B,sCAAsC,CAAC,CAAC,CAAC,CAgE3C"}
+{"version":3,"file":"useDisposableState.d.ts","sourceRoot":"","sources":["../src/useDisposableState.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAEL,eAAe,EAEhB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,sCAAsC,CAAC,CAAC,IAAI;IAC/C,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,IAAI,EAAE,eAAe,CAAC,OAAO,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,KAAK,IAAI,CAAC;CACxE,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,CAAC,GAAG,KAAK,EAC1C,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,GAC1B,sCAAsC,CAAC,CAAC,CAAC,CAqE3C"}

package/dist/useDisposableState.js

@@ -15,7 +15,7 @@ function useDisposableState(parentCache) {
     const { state: stateFromDisposableStateHook, setState } = (0, useUpdatableDisposableState_1.useUpdatableDisposableState)();
     (0, react_1.useEffect)(function cleanupItemCleanupPairRefAfterSetState() {
         if (stateFromDisposableStateHook !== useUpdatableDisposableState_1.UNASSIGNED_STATE) {
-            if (itemCleanupPairRef.current !== null) {
+            if (itemCleanupPairRef.current != null) {
                 itemCleanupPairRef.current[1]();
                 itemCleanupPairRef.current = null;
             }
@@ -27,12 +27,21 @@ function useDisposableState(parentCache) {
     }, [stateFromDisposableStateHook]);
     (0, react_1.useEffect)(function cleanupItemCleanupPairRefIfSetStateNotCalled() {
         return () => {
-            if (itemCleanupPairRef.current !== null) {
+            if (itemCleanupPairRef.current != null) {
                 itemCleanupPairRef.current[1]();
                 itemCleanupPairRef.current = null;
             }
         };
     }, []);
+    const state = (_b = (_a = (stateFromDisposableStateHook !== useUpdatableDisposableState_1.UNASSIGNED_STATE
+        ? stateFromDisposableStateHook
+        : null)) !== null && _a !== void 0 ? _a : preCommitItem === null || preCommitItem === void 0 ? void 0 : preCommitItem.state) !== null && _b !== void 0 ? _b : (_c = itemCleanupPairRef.current) === null || _c === void 0 ? void 0 : _c[0];
+    if (state != null) {
+        return {
+            state: state,
+            setState,
+        };
+    }
     // Safety: we can be in one of three states. Pre-commit, in which case
     // preCommitItem is assigned, post-commit but before setState has been
     // called, in which case itemCleanupPairRef.current is assigned, or
@@ -46,13 +55,7 @@ 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 = (_b = (_a = (stateFromDisposableStateHook != useUpdatableDisposableState_1.UNASSIGNED_STATE
-        ? stateFromDisposableStateHook
-        : null)) !== null && _a !== void 0 ? _a : preCommitItem === null || preCommitItem === void 0 ? void 0 : preCommitItem.state) !== null && _b !== void 0 ? _b : (_c = itemCleanupPairRef.current) === null || _c === void 0 ? void 0 : _c[0];
-    return {
-        state: state,
-        setState,
-    };
+    throw new Error('state was unexpectedly null. This indicates a bug in react-disposable-state.');
 }
 // @ts-ignore
 function tsTests() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@isograph/react-disposable-state",
-  "version": "0.0.0-main-dbb17f5b",
+  "version": "0.0.0-main-4adb5045",
   "description": "Primitives for managing disposable state in React",
   "homepage": "https://isograph.dev",
   "main": "dist/index.js",
@@ -8,7 +8,7 @@
   "author": "Isograph Labs",
   "license": "MIT",
   "dependencies": {
-    "@isograph/disposable-types": "0.0.0-main-dbb17f5b"
+    "@isograph/disposable-types": "0.0.0-main-4adb5045"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0"

package/src/CacheItem.test.ts

@@ -298,7 +298,7 @@ describe('CacheItem', () => {
       assert(state.kind === 'NotInParentCacheAndDisposed');
 
       assert(
-        cacheItem.permanentRetainIfNotDisposed(disposeTemporaryRetain) === null,
+        cacheItem.permanentRetainIfNotDisposed(disposeTemporaryRetain) == null,
       );
 
       expect(() => {

package/src/ParentCache.test.ts

@@ -26,7 +26,7 @@ describe('ParentCache', () => {
       assert(getValue(parentCache) != null, 'Parent cache should not be empty');
 
       parentCache.empty();
-      assert(getValue(parentCache) === null);
+      assert(getValue(parentCache) == null);
 
       parentCache.getOrPopulateAndTemporaryRetain();
       expect(factory.mock.calls.length).toBe(2);
@@ -50,7 +50,7 @@ describe('ParentCache', () => {
       parentCache.getOrPopulateAndTemporaryRetain();
     clearTemporaryRetain();
 
-    assert(getValue(parentCache) === null);
+    assert(getValue(parentCache) == null);
   });
 
   test('Clearing one of two temporary retains does not remove the item from the parent cache', () => {
@@ -69,6 +69,6 @@ describe('ParentCache', () => {
     assert(getValue(parentCache) != null);
 
     clearTemporaryRetain2();
-    assert(getValue(parentCache) === null);
+    assert(getValue(parentCache) == null);
   });
 });

package/src/ParentCache.ts

@@ -51,7 +51,7 @@ export class ParentCache<T> {
   }
 
   getOrPopulateAndTemporaryRetain(): [CacheItem<T>, T, CleanupFn] {
-    return this.__cacheItem === null
+    return this.__cacheItem == null
       ? this.__populateAndTemporaryRetain()
       : temporaryRetain(this.__cacheItem);
   }
@@ -93,7 +93,7 @@ export class ParentCache<T> {
   }
 
   isEmpty(): boolean {
-    return this.__cacheItem === null;
+    return this.__cacheItem == null;
   }
 }
 

package/src/useCachedResponsivePrecommitValue.test.tsx

@@ -158,7 +158,7 @@ describe('useCachedResponsivePrecommitValue', () => {
       setState = _setState;
       const value = useCachedResponsivePrecommitValue(cache, hookOnCommit);
 
-      if (initialRender && value !== null) {
+      if (initialRender && value != null) {
         initialRender = false;
         expect(value).toEqual({ state: 1 });
       } else {

package/src/useCachedResponsivePrecommitValue.ts

@@ -70,14 +70,14 @@ export function useCachedResponsivePrecommitValue<T>(
     const undisposedPair = cacheItem.permanentRetainIfNotDisposed(
       disposeOfTemporaryRetain,
     );
-    if (undisposedPair !== null) {
+    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();
-      if (existingCacheItemCleanupPair !== null) {
+      if (existingCacheItemCleanupPair != null) {
         onCommit(existingCacheItemCleanupPair);
       } else {
         // We did not find an item in the parent cache, create a new one.

package/src/useDisposableState.ts

@@ -32,7 +32,7 @@ export function useDisposableState<T = never>(
   useEffect(
     function cleanupItemCleanupPairRefAfterSetState() {
       if (stateFromDisposableStateHook !== UNASSIGNED_STATE) {
-        if (itemCleanupPairRef.current !== null) {
+        if (itemCleanupPairRef.current != null) {
           itemCleanupPairRef.current[1]();
           itemCleanupPairRef.current = null;
         } else {
@@ -48,12 +48,25 @@ export function useDisposableState<T = never>(
 
   useEffect(function cleanupItemCleanupPairRefIfSetStateNotCalled() {
     return () => {
-      if (itemCleanupPairRef.current !== null) {
+      if (itemCleanupPairRef.current != null) {
         itemCleanupPairRef.current[1]();
         itemCleanupPairRef.current = null;
       }
     };
   }, []);
+  const state: T | undefined =
+    (stateFromDisposableStateHook !== UNASSIGNED_STATE
+      ? stateFromDisposableStateHook
+      : null) ??
+    preCommitItem?.state ??
+    itemCleanupPairRef.current?.[0];
+
+  if (state != null) {
+    return {
+      state: state,
+      setState,
+    };
+  }
 
   // Safety: we can be in one of three states. Pre-commit, in which case
   // preCommitItem is assigned, post-commit but before setState has been
@@ -68,17 +81,9 @@ export function useDisposableState<T = never>(
   // 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: T | undefined =
-    (stateFromDisposableStateHook != UNASSIGNED_STATE
-      ? stateFromDisposableStateHook
-      : null) ??
-    preCommitItem?.state ??
-    itemCleanupPairRef.current?.[0];
-
-  return {
-    state: state!,
-    setState,
-  };
+  throw new Error(
+    'state was unexpectedly null. This indicates a bug in react-disposable-state.',
+  );
 }
 
 // @ts-ignore

package/src/useLazyDisposableState.test.tsx

@@ -47,7 +47,7 @@ describe('useLazyDisposableState', async () => {
       }, []);
 
       useEffect(() => {
-        if (state == 1) return;
+        if (state === 1) return;
         committed.resolve();
       }, [state]);