@dxos/echo-atom 0.8.4-main.d05673bc65 → 0.8.4-main.d9fc60f731

package/src/ref-utils.ts

@@ -21,19 +21,34 @@ export const loadRefTarget = <T, R>(
   get: Atom.Context,
   onTargetAvailable: (target: T) => R,
 ): R | undefined => {
+  // Accessing `ref.target` registers a resolution callback when the target is
+  // not yet loaded, so resolution can be observed via `ref.onResolved` below.
   const currentTarget = ref.target;
   if (currentTarget) {
     return onTargetAvailable(currentTarget);
   }
 
-  // Target not loaded yet - trigger async load.
+  // Subscribe to the ref's resolution event in case the target loads later
+  // (e.g. when a sibling client creates the linked object). Without this,
+  // a one-shot async load that fails because the document hasn't propagated
+  // would leave the atom permanently undefined.
+  const unsubscribe = ref.onResolved(() => {
+    const target = ref.target;
+    if (target) {
+      get.setSelf(onTargetAvailable(target));
+    }
+  });
+  get.addFinalizer(unsubscribe);
+
+  // Also try async load (e.g. for objects that need disk loading).
   void ref
     .load()
     .then((loadedTarget) => {
       get.setSelf(onTargetAvailable(loadedTarget));
     })
     .catch(() => {
-      // Loading failed, keep target as undefined.
+      // Loading failed; the resolution subscription above will pick up
+      // cross-client updates when they arrive.
     });
 
   return undefined;