@syncular/react 0.32.0 → 0.32.1

package/dist/runtime-version.d.ts

@@ -3,4 +3,4 @@
  * Vite HMR uses it to replace a worker owner after a Syncular package upgrade
  * even when the application's generated schema version did not change.
  */
-export declare const SYNCULAR_REACT_RUNTIME_VERSION = "0.32.0";
+export declare const SYNCULAR_REACT_RUNTIME_VERSION = "0.32.1";

package/dist/runtime-version.js

@@ -3,4 +3,4 @@
  * Vite HMR uses it to replace a worker owner after a Syncular package upgrade
  * even when the application's generated schema version did not change.
  */
-export const SYNCULAR_REACT_RUNTIME_VERSION = '0.32.0';
+export const SYNCULAR_REACT_RUNTIME_VERSION = '0.32.1';

package/dist/use-diagnostics.js

@@ -13,27 +13,42 @@ export function useDiagnostics(options = {}) {
         return expectedSubscriptions.length === 0 ? {} : { expectedSubscriptions };
     }, [requestKey]);
     const generation = useRef(0);
-    const [snapshot, setSnapshot] = useState();
-    const [isLoading, setIsLoading] = useState(true);
-    const [error, setError] = useState();
+    const [state, setState] = useState({
+        client,
+        requestKey,
+        snapshot: undefined,
+        error: undefined,
+        settled: false,
+    });
     const refresh = useCallback(() => {
         const current = ++generation.current;
-        setIsLoading(true);
+        setState((prev) => (prev.settled ? { ...prev, settled: false } : prev));
         void Promise.resolve()
             .then(() => client.diagnosticsSnapshot(request))
             .then((next) => {
             if (generation.current !== current)
                 return;
-            setSnapshot(next);
-            setError(undefined);
-            setIsLoading(false);
+            setState({
+                client,
+                requestKey,
+                snapshot: next,
+                error: undefined,
+                settled: true,
+            });
         }, (reason) => {
             if (generation.current !== current)
                 return;
-            setError(reason instanceof Error ? reason : new Error(String(reason)));
-            setIsLoading(false);
+            setState((prev) => ({
+                client,
+                requestKey,
+                snapshot: prev.client === client && prev.requestKey === requestKey
+                    ? prev.snapshot
+                    : undefined,
+                error: reason instanceof Error ? reason : new Error(String(reason)),
+                settled: true,
+            }));
         });
-    }, [client, request]);
+    }, [client, request, requestKey]);
     useEffect(() => {
         const unsubscribe = client.onDiagnostics(refresh);
         refresh();
@@ -42,5 +57,11 @@ export function useDiagnostics(options = {}) {
             unsubscribe();
         };
     }, [client, refresh]);
-    return { snapshot, isLoading, error, refresh };
+    const current = state.client === client && state.requestKey === requestKey;
+    return {
+        snapshot: current ? state.snapshot : undefined,
+        isLoading: !current || !state.settled,
+        error: current ? state.error : undefined,
+        refresh,
+    };
 }

package/dist/use-window.js

@@ -53,7 +53,7 @@ export function useWindow(base) {
     const stableBase = useMemo(() => base, [baseIdentity]);
     const entry = useMemo(() => store.window(stableBase), [store, stableBase]);
     const state = useSyncExternalStore(entry.subscribe, entry.getSnapshot, entry.getSnapshot);
-    useEffect(() => () => store.releaseWindowClaims(owner.current), [store]);
+    useEffect(() => () => store.releaseWindowClaims(owner.current), [stableBase, store]);
     const setWindow = useCallback((units) => store.setWindowClaim(owner.current, stableBase, units), [stableBase, store]);
     const isComplete = useCallback((unit) => windowComplete(state, unit), [state]);
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@syncular/react",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "description": "React hooks for Syncular offline-first sync",
   "license": "Apache-2.0",
   "author": "Benjamin Kniffler",
@@ -55,15 +55,15 @@
     "test": "bun test --preload ./test/setup.ts"
   },
   "dependencies": {
-    "@syncular/client": "0.32.0"
+    "@syncular/client": "0.32.1"
   },
   "peerDependencies": {
     "react": ">=18.0.0"
   },
   "devDependencies": {
     "@happy-dom/global-registrator": "^20.0.0",
-    "@syncular/core": "0.32.0",
-    "@syncular/server": "0.32.0",
+    "@syncular/core": "0.32.1",
+    "@syncular/server": "0.32.1",
     "@testing-library/react": "^16.1.0",
     "@types/react": "^18.3.0",
     "@types/react-dom": "^18.3.0",

package/src/runtime-version.ts

@@ -3,4 +3,4 @@
  * Vite HMR uses it to replace a worker owner after a Syncular package upgrade
  * even when the application's generated schema version did not change.
  */
-export const SYNCULAR_REACT_RUNTIME_VERSION = '0.32.0';
+export const SYNCULAR_REACT_RUNTIME_VERSION = '0.32.1';

package/src/use-diagnostics.ts

@@ -38,33 +38,51 @@ export function useDiagnostics(
     return expectedSubscriptions.length === 0 ? {} : { expectedSubscriptions };
   }, [requestKey]);
   const generation = useRef(0);
-  const [snapshot, setSnapshot] = useState<
-    ClientDiagnosticsSnapshot | undefined
-  >();
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState<Error | undefined>();
+  const [state, setState] = useState<{
+    readonly client: typeof client;
+    readonly requestKey: string;
+    readonly snapshot: ClientDiagnosticsSnapshot | undefined;
+    readonly error: Error | undefined;
+    readonly settled: boolean;
+  }>({
+    client,
+    requestKey,
+    snapshot: undefined,
+    error: undefined,
+    settled: false,
+  });
 
   const refresh = useCallback(() => {
     const current = ++generation.current;
-    setIsLoading(true);
+    setState((prev) => (prev.settled ? { ...prev, settled: false } : prev));
     void Promise.resolve()
       .then(() => client.diagnosticsSnapshot(request))
       .then(
         (next) => {
           if (generation.current !== current) return;
-          setSnapshot(next);
-          setError(undefined);
-          setIsLoading(false);
+          setState({
+            client,
+            requestKey,
+            snapshot: next,
+            error: undefined,
+            settled: true,
+          });
         },
         (reason: unknown) => {
           if (generation.current !== current) return;
-          setError(
-            reason instanceof Error ? reason : new Error(String(reason)),
-          );
-          setIsLoading(false);
+          setState((prev) => ({
+            client,
+            requestKey,
+            snapshot:
+              prev.client === client && prev.requestKey === requestKey
+                ? prev.snapshot
+                : undefined,
+            error: reason instanceof Error ? reason : new Error(String(reason)),
+            settled: true,
+          }));
         },
       );
-  }, [client, request]);
+  }, [client, request, requestKey]);
 
   useEffect(() => {
     const unsubscribe = client.onDiagnostics(refresh);
@@ -75,5 +93,11 @@ export function useDiagnostics(
     };
   }, [client, refresh]);
 
-  return { snapshot, isLoading, error, refresh };
+  const current = state.client === client && state.requestKey === requestKey;
+  return {
+    snapshot: current ? state.snapshot : undefined,
+    isLoading: !current || !state.settled,
+    error: current ? state.error : undefined,
+    refresh,
+  };
 }

package/src/use-window.ts

@@ -97,7 +97,10 @@ export function useWindow(base: WindowBase): UseWindowResult {
     entry.getSnapshot,
   );
 
-  useEffect(() => () => store.releaseWindowClaims(owner.current), [store]);
+  useEffect(
+    () => () => store.releaseWindowClaims(owner.current),
+    [stableBase, store],
+  );
 
   const setWindow = useCallback(
     (units: readonly string[]) =>