@dxos/echo-react 0.8.4-main.c85a9c8dae → 0.8.4-main.e00bdcdb52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-react",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.e00bdcdb52",
   "description": "React integration for ECHO.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,9 +20,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
@@ -30,8 +27,8 @@
   "dependencies": {
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
-    "@dxos/echo": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-atom": "0.8.4-main.c85a9c8dae"
+    "@dxos/echo": "0.8.4-main.e00bdcdb52",
+    "@dxos/echo-atom": "0.8.4-main.e00bdcdb52"
   },
   "devDependencies": {
     "@testing-library/react": "^16.3.0",
@@ -39,7 +36,7 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/echo-db": "0.8.4-main.c85a9c8dae"
+    "@dxos/echo-db": "0.8.4-main.e00bdcdb52"
   },
   "peerDependencies": {
     "react": "~19.2.3"

package/src/useObject.test.tsx

@@ -2,15 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Registry from '@effect-atom/atom/Registry';
 import { RegistryContext } from '@effect-atom/atom-react';
+import * as Registry from '@effect-atom/atom/Registry';
 import { renderHook, waitFor } from '@testing-library/react';
 import React, { type PropsWithChildren } from 'react';
 import { describe, expect, test } from 'vitest';
 
 import { Obj, Ref } from '@dxos/echo';
-import { TestSchema } from '@dxos/echo/testing';
 import { createObject } from '@dxos/echo-db';
+import { TestSchema } from '@dxos/echo/testing';
 
 import { useObject } from './useObject';
 
@@ -46,7 +46,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(obj, 'name'), { wrapper });
-
     const [value] = result.current;
     expect(value).toBe('Test');
   });
@@ -59,12 +58,11 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(obj, 'name'), { wrapper });
-
     expect(result.current[0]).toBe('Test');
 
-    // Update the property via Obj.change
-    Obj.change(obj, (o) => {
-      o.name = 'Updated';
+    // Update the property via Obj.update
+    Obj.update(obj, (obj) => {
+      obj.name = 'Updated';
     });
 
     // Wait for reactivity to update
@@ -81,12 +79,11 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(obj), { wrapper });
-
     expect(result.current[0].name).toBe('Test');
 
-    // Update a property via Obj.change
-    Obj.change(obj, (o) => {
-      o.name = 'Updated';
+    // Update a property via Obj.update
+    Obj.update(obj, (obj) => {
+      obj.name = 'Updated';
     });
 
     // Wait for reactivity to update
@@ -103,12 +100,11 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(obj, 'name'), { wrapper });
-
     expect(result.current[0]).toBe('Test');
 
-    // Update a different property via Obj.change
-    Obj.change(obj, (o) => {
-      o.email = 'newemail@example.com';
+    // Update a different property via Obj.update
+    Obj.update(obj, (obj) => {
+      obj.email = 'newemail@example.com';
     });
 
     // Wait a bit to ensure no update happens
@@ -142,7 +138,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(obj), { wrapper });
-
     const [value, updateCallback] = result.current;
     expect(value.name).toBe('Test');
 
@@ -165,7 +160,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(obj, 'name'), { wrapper });
-
     const [value, updateCallback] = result.current;
     expect(value).toBe('Test');
 
@@ -186,7 +180,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(obj, 'name'), { wrapper });
-
     const [value, updateCallback] = result.current;
     expect(value).toBe('Test');
 
@@ -207,7 +200,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result, rerender } = renderHook(() => useObject(obj, 'name'), { wrapper });
-
     const [, firstUpdateCallback] = result.current;
 
     rerender();
@@ -233,7 +225,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(undefined as TestSchema.Person | undefined, 'name'), { wrapper });
-
     const [value] = result.current;
     expect(value).toBeUndefined();
   });
@@ -243,7 +234,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result } = renderHook(() => useObject(undefined as TestSchema.Person | undefined), { wrapper });
-
     const [, updateCallback] = result.current;
 
     // Should not throw when calling update on undefined object.
@@ -262,7 +252,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result, rerender } = renderHook(() => useObject(obj), { wrapper });
-
     const [firstSnapshot] = result.current;
     expect(firstSnapshot).toBeDefined();
 
@@ -286,7 +275,6 @@ describe('useObject', () => {
     const wrapper = createWrapper(registry);
 
     const { result, rerender } = renderHook(() => useObject(person.employer!), { wrapper });
-
     const [firstSnapshot] = result.current;
     expect(firstSnapshot).toBeDefined();
 

package/src/useObject.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Atom from '@effect-atom/atom/Atom';
 import { useAtomValue } from '@effect-atom/atom-react';
+import * as Atom from '@effect-atom/atom/Atom';
 import { useCallback, useMemo } from 'react';
 
 import { Obj, Ref } from '@dxos/echo';
@@ -123,20 +123,20 @@ export const useObject: {
       if (obj === undefined) {
         return;
       }
-      Obj.change(obj, (o: any) => {
+      Obj.update(obj, (obj: any) => {
         if (typeof updateOrValue === 'function') {
-          const returnValue = updateOrValue(property !== undefined ? o[property] : o);
+          const returnValue = updateOrValue(property !== undefined ? obj[property] : obj);
           if (returnValue !== undefined) {
             if (property === undefined) {
               throw new Error('Cannot re-assign the entire object');
             }
-            o[property] = returnValue;
+            obj[property] = returnValue;
           }
         } else {
           if (property === undefined) {
             throw new Error('Cannot re-assign the entire object');
           }
-          o[property] = updateOrValue;
+          obj[property] = updateOrValue;
         }
       });
     },
@@ -148,8 +148,9 @@ export const useObject: {
     // TODO(dxos): Property subscriptions on refs may not update correctly until the ref loads.
     useObjectValue(objOrRef);
     return [useObjectProperty(liveObj, property as any), callback];
+  } else {
+    return [useObjectValue(objOrRef), callback];
   }
-  return [useObjectValue(objOrRef), callback];
 }) as any;
 
 /**

package/src/useQuery.ts

@@ -24,6 +24,8 @@ interface UseQueryFn {
 
 /**
  * Create subscription.
+ *
+ * @param queryOrFilter - The query or filter to apply. Query is memoized based on the AST. No need to call useMemo.
  */
 export const useQuery: UseQueryFn = (
   resource: Database.Queryable | undefined,