@dxos/app-graph 0.8.4-main.e8ec1fe → 0.8.4-main.ef1bc66f44

package/src/stories/EchoGraph.stories.tsx

@@ -6,33 +6,25 @@ import { Atom, type Registry, RegistryContext, useAtomValue } from '@effect-atom
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
-import React, { type PropsWithChildren, useCallback, useContext, useEffect, useMemo, useState } from 'react';
-
-import {
-  Expando,
-  Filter,
-  type Live,
-  Query,
-  type QueryResult,
-  type Space,
-  SpaceState,
-  isSpace,
-  live,
-} from '@dxos/client/echo';
-import { Obj, Type } from '@dxos/echo';
+import React, { type PropsWithChildren, useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+
+import { Filter, type Space, SpaceState, isSpace } from '@dxos/client/echo';
+import { Obj, Query } from '@dxos/echo';
+import { TestSchema } from '@dxos/echo/testing';
+import { AtomObj, AtomQuery } from '@dxos/echo-atom';
 import { faker } from '@dxos/random';
 import { type Client, useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Icon, IconButton, Input, Select } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
 import { Path, Tree } from '@dxos/react-ui-list';
-import { getSize, mx } from '@dxos/react-ui-theme';
+import { getSize, mx } from '@dxos/ui-theme';
 import { byPosition, isNonNullable, safeParseInt } from '@dxos/util';
 
-import { type ExpandableGraph, ROOT_ID } from '../graph';
-import { GraphBuilder, atomFromObservable, createExtension } from '../graph-builder';
-import { type Node } from '../node';
-import { atomFromQuery } from '../testing';
+import * as CreateAtom from '../atoms';
+import * as Graph from '../graph';
+import * as GraphBuilder from '../graph-builder';
+import * as Node from '../node';
 
 import { JsonTree } from './Tree';
 
@@ -56,45 +48,44 @@ const actionWeights = {
   [Action.RENAME_OBJECT]: 4,
 };
 
-const createGraph = (client: Client, registry: Registry.Registry): ExpandableGraph => {
-  const spaceBuilderExtension = createExtension({
+const createGraph = (client: Client, registry: Registry.Registry): Graph.ExpandableGraph => {
+  const spaceBuilderExtension = GraphBuilder.createExtensionRaw({
     id: 'space',
     connector: (node) =>
       Atom.make((get) =>
         Function.pipe(
           get(node),
-          Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
+          Option.flatMap((node) => (node.id === Node.RootId ? Option.some(node) : Option.none())),
           Option.map(() => {
-            const spaces = get(atomFromObservable(client.spaces)) ?? [];
+            const spaces = get(CreateAtom.fromObservable(client.spaces)) ?? [];
             return spaces
-              .filter((space) => get(atomFromObservable(space.state)) === SpaceState.SPACE_READY)
-              .map((space) => ({
-                id: space.id,
-                type: 'dxos.org/type/Space',
-                properties: {
-                  label: get(atomFromObservable(space.properties.name)),
-                },
-                data: space,
-              }));
+              .filter((space: any) => get(CreateAtom.fromObservable(space.state)) === SpaceState.SPACE_READY)
+              .map((space) => {
+                const propertiesSnapshot = get(AtomObj.make(space.properties));
+                return {
+                  id: space.id,
+                  type: 'dxos.org/type/Space',
+                  properties: {
+                    label: propertiesSnapshot.name,
+                  },
+                  data: space,
+                };
+              });
           }),
           Option.getOrElse(() => []),
         ),
       ),
   });
 
-  const objectBuilderExtension = createExtension({
+  const objectBuilderExtension = GraphBuilder.createExtensionRaw({
     id: 'object',
     connector: (node) => {
-      let query: QueryResult<Live<Expando>> | undefined;
       return Atom.make((get) =>
         Function.pipe(
           get(node),
           Option.flatMap((node) => (isSpace(node.data) ? Option.some(node.data) : Option.none())),
           Option.map((space) => {
-            if (!query) {
-              query = space.db.query(Query.type(Expando, { type: 'test' }));
-            }
-            const objects = get(atomFromQuery(query));
+            const objects = get(AtomQuery.make(space.db, Query.type(TestSchema.Expando, { type: 'test' })));
             return objects.map((object) => ({
               id: object.id,
               type: 'dxos.org/type/test',
@@ -108,15 +99,15 @@ const createGraph = (client: Client, registry: Registry.Registry): ExpandableGra
     },
   });
 
-  const graph = new GraphBuilder({ registry })
-    .addExtension(spaceBuilderExtension)
-    .addExtension(objectBuilderExtension).graph;
+  const builder = GraphBuilder.make({ registry });
+  GraphBuilder.addExtension(builder, spaceBuilderExtension);
+  GraphBuilder.addExtension(builder, objectBuilderExtension);
+  const graph = builder.graph;
   graph.onNodeChanged.on(({ id }) => {
-    graph.expand(id);
+    Graph.expand(graph, id);
   });
-  graph.expand(ROOT_ID);
+  Graph.expand(graph, Node.RootId);
   (window as any).graph = graph;
-
   return graph;
 };
 
@@ -136,9 +127,9 @@ const getRandomSpace = (client: Client): Space | undefined => {
 const getSpaceWithObjects = async (client: Client): Promise<Space | undefined> => {
   const readySpaces = client.spaces.get().filter((space) => space.state.get() === SpaceState.SPACE_READY);
   const spaceQueries = await Promise.all(
-    readySpaces.map((space) => space.db.query(Filter.type(Expando, { type: 'test' })).run()),
+    readySpaces.map((space) => space.db.query(Filter.type(TestSchema.Expando, { type: 'test' })).run()),
   );
-  const spaces = readySpaces.filter((space, index) => spaceQueries[index].objects.length > 0);
+  const spaces = readySpaces.filter((space, index) => spaceQueries[index].length > 0);
   return spaces[Math.floor(Math.random() * spaces.length)];
 };
 
@@ -155,14 +146,16 @@ const runAction = async (client: Client, action: Action) => {
     case Action.RENAME_SPACE: {
       const space = getRandomSpace(client);
       if (space) {
-        space.properties.name = faker.commerce.productName();
+        Obj.change(space.properties, (p) => {
+          p.name = faker.commerce.productName();
+        });
       }
       break;
     }
 
     case Action.ADD_OBJECT:
       getRandomSpace(client)?.db.add(
-        Obj.make(Type.Expando, {
+        Obj.make(TestSchema.Expando, {
           type: 'test',
           name: faker.commerce.productName(),
         }),
@@ -172,7 +165,7 @@ const runAction = async (client: Client, action: Action) => {
     case Action.REMOVE_OBJECT: {
       const space = await getSpaceWithObjects(client);
       if (space) {
-        const { objects } = await space.db.query(Filter.type(Expando, { type: 'test' })).run();
+        const objects = await space.db.query(Filter.type(TestSchema.Expando, { type: 'test' })).run();
         space.db.remove(objects[Math.floor(Math.random() * objects.length)]);
       }
       break;
@@ -181,8 +174,11 @@ const runAction = async (client: Client, action: Action) => {
     case Action.RENAME_OBJECT: {
       const space = await getSpaceWithObjects(client);
       if (space) {
-        const { objects } = await space.db.query(Filter.type(Expando, { type: 'test' })).run();
-        objects[Math.floor(Math.random() * objects.length)].name = faker.commerce.productName();
+        const objects = await space.db.query(Filter.type(TestSchema.Expando, { type: 'test' })).run();
+        const object = objects[Math.floor(Math.random() * objects.length)];
+        Obj.change(object, (o) => {
+          o.name = faker.commerce.productName();
+        });
       }
       break;
     }
@@ -256,7 +252,7 @@ const Controls = ({ children }: PropsWithChildren) => {
 const meta = {
   title: 'sdk/app-graph/EchoGraph',
   decorators: [
-    withTheme,
+    withTheme(),
     withClientProvider({
       createIdentity: true,
       onCreateIdentity: async ({ client }) => {
@@ -292,26 +288,37 @@ export const TreeView: Story = {
     const client = useClient();
     const registry = useContext(RegistryContext);
     const graph = useMemo(() => createGraph(client, registry), [client, registry]);
-    const state = useMemo(() => new Map<string, Live<{ open: boolean; current: boolean }>>(), []);
+    const stateRef = useRef(new Map<string, Atom.Writable<{ open: boolean; current: boolean }>>());
+
+    const getOrCreateState = useMemo(
+      () => (path: string) => {
+        let atom = stateRef.current.get(path);
+        if (!atom) {
+          atom = Atom.make({ open: true, current: false }).pipe(Atom.keepAlive);
+          stateRef.current.set(path, atom);
+        }
+        return atom;
+      },
+      [],
+    );
 
     const useItems = useCallback(
-      (node?: Node, options?: { disposition?: string; sort?: boolean }) => {
-        const connections = useAtomValue(graph.connections(node?.id ?? ROOT_ID));
+      (node?: Node.Node, options?: { disposition?: string; sort?: boolean }) => {
+        const connections = useAtomValue(graph.connections(node?.id ?? Node.RootId));
         return options?.sort ? connections.toSorted((a, b) => byPosition(a.properties, b.properties)) : connections;
       },
       [graph],
     );
 
     const getProps = useCallback(
-      (node: Node, path: string[]) => {
-        const children = graph
-          .getConnections(node.id, 'outbound')
+      (node: Node.Node, path: string[]) => {
+        const children = Graph.getConnections(graph, node.id, 'outbound')
           .map((n) => {
             // Break cycles.
             const nextPath = [...path, node.id];
-            return nextPath.includes(n.id) ? undefined : (n as Node);
+            return nextPath.includes(n.id) ? undefined : (n as Node.Node);
           })
-          .filter(isNonNullable) as Node[];
+          .filter(isNonNullable) as Node.Node[];
         const parentOf =
           children.length > 0 ? children.map(({ id }) => id) : node.properties.role === 'branch' ? [] : undefined;
         return {
@@ -324,59 +331,54 @@ export const TreeView: Story = {
       [graph],
     );
 
-    const isOpen = useCallback(
-      (_path: string[]) => {
-        const path = Path.create(..._path);
-        const object = state.get(path) ?? live({ open: true, current: false });
-        if (!state.has(path)) {
-          state.set(path, object);
-        }
-
-        return object.open;
-      },
-      [state],
-    );
+    // Hook that subscribes to item state via Atom.
+    const useItemState = (_path: string[]) => {
+      const path = useMemo(() => Path.create(..._path), [_path.join('~')]);
+      const atom = getOrCreateState(path);
+      return useAtomValue(atom);
+    };
 
-    const isCurrent = useCallback(
-      (_path: string[]) => {
-        const path = Path.create(..._path);
-        const object = state.get(path) ?? live({ open: false, current: false });
-        if (!state.has(path)) {
-          state.set(path, object);
-        }
+    const useIsOpen = (_path: string[]) => {
+      return useItemState(_path).open;
+    };
 
-        return object.current;
-      },
-      [state],
-    );
+    const useIsCurrent = (_path: string[]) => {
+      return useItemState(_path).current;
+    };
 
     const onOpenChange = useCallback(
       ({ path: _path, open }: { path: string[]; open: boolean }) => {
         const path = Path.create(..._path);
-        const object = state.get(path);
-        object!.open = open;
+        const atom = stateRef.current.get(path);
+        if (atom) {
+          const prev = registry.get(atom);
+          registry.set(atom, { ...prev, open });
+        }
       },
-      [state],
+      [registry],
     );
 
     const onSelect = useCallback(
       ({ path: _path, current }: { path: string[]; current: boolean }) => {
         const path = Path.create(..._path);
-        const object = state.get(path);
-        object!.current = current;
+        const atom = stateRef.current.get(path);
+        if (atom) {
+          const prev = registry.get(atom);
+          registry.set(atom, { ...prev, current });
+        }
       },
-      [state],
+      [registry],
     );
 
     return (
       <>
         <Controls />
         <Tree
-          id={ROOT_ID}
+          id={Node.RootId}
           useItems={useItems}
           getProps={getProps}
-          isOpen={isOpen}
-          isCurrent={isCurrent}
+          useIsOpen={useIsOpen}
+          useIsCurrent={useIsCurrent}
           onOpenChange={onOpenChange}
           onSelect={onSelect}
         />

package/src/stories/Tree.tsx

@@ -4,7 +4,7 @@
 
 import React, { type FC, type HTMLAttributes, useState } from 'react';
 
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 // TODO(burdon): Copied form devtools.
 

package/dist/types/src/experimental/graph-projections.test.d.ts

@@ -1,25 +0,0 @@
-type Cb = () => void;
-interface Query {
-    id?: string[];
-    typename?: string[];
-}
-/**
- * Lazy query result that can be executed.
- * Does not run without the run function being called.
- */
-interface QueryResult<T> {
-    /**
-     * Execute the query and subscribe to the result.
-     * @param next Called at least once with the first value (maybe synchronously) and then for every subsequent update.
-     * @param error Called on error. `next` is never called after that.
-     * @returns Function to dispose the query and unsubscribe.
-     */
-    run(onData: (value?: T[]) => void, onError: (err: Error) => void): Cb;
-}
-declare const QueryResult: Readonly<{
-    fromPromise: <T>(run: (onDispose: (cb: Cb) => void) => Promise<T[]>) => QueryResult<T>;
-}>;
-interface _Resolver<T> {
-    query(query: Query): QueryResult<T>;
-}
-//# sourceMappingURL=graph-projections.test.d.ts.map

package/dist/types/src/experimental/graph-projections.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"graph-projections.test.d.ts","sourceRoot":"","sources":["../../../../src/experimental/graph-projections.test.ts"],"names":[],"mappings":"AAIA,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC;AAErB,UAAU,KAAK;IACb,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED;;;GAGG;AACH,UAAU,WAAW,CAAC,CAAC;IACrB;;;;;OAKG;IACH,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,KAAK,KAAK,IAAI,GAAG,EAAE,CAAC;CACvE;AAED,QAAA,MAAM,WAAW;kBACD,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,IAAI,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,KAAG,WAAW,CAAC,CAAC,CAAC;EAyBpF,CAAC;AAEH,UAAU,SAAS,CAAC,CAAC;IACnB,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;CACrC"}

package/dist/types/src/signals-integration.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=signals-integration.test.d.ts.map

package/dist/types/src/signals-integration.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"signals-integration.test.d.ts","sourceRoot":"","sources":["../../../src/signals-integration.test.ts"],"names":[],"mappings":""}

package/dist/types/src/testing.d.ts

@@ -1,5 +0,0 @@
-import { Atom } from '@effect-atom/atom-react';
-import { type AnyEchoObject } from '@dxos/echo/internal';
-import { type QueryResult } from '@dxos/echo-db';
-export declare const atomFromQuery: <T extends AnyEchoObject>(query: QueryResult<T>) => Atom.Atom<T[]>;
-//# sourceMappingURL=testing.d.ts.map

package/dist/types/src/testing.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/testing.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS,aAAa,EAAE,OAAO,WAAW,CAAC,CAAC,CAAC,KAAG,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAU3F,CAAC"}

package/src/experimental/graph-projections.test.ts

@@ -1,56 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-type Cb = () => void;
-
-interface Query {
-  id?: string[];
-  typename?: string[];
-}
-
-/**
- * Lazy query result that can be executed.
- * Does not run without the run function being called.
- */
-interface QueryResult<T> {
-  /**
-   * Execute the query and subscribe to the result.
-   * @param next Called at least once with the first value (maybe synchronously) and then for every subsequent update.
-   * @param error Called on error. `next` is never called after that.
-   * @returns Function to dispose the query and unsubscribe.
-   */
-  run(onData: (value?: T[]) => void, onError: (err: Error) => void): Cb;
-}
-
-const QueryResult = Object.freeze({
-  fromPromise: <T>(run: (onDispose: (cb: Cb) => void) => Promise<T[]>): QueryResult<T> => {
-    return {
-      run: (onData, onError) => {
-        const cbs: Cb[] = [];
-        let disposed = false;
-        const dispose = () => {
-          cbs.forEach((cb) => cb());
-          disposed = true;
-        };
-        run((cb) => (disposed ? cb() : cbs.push(cb))).then(
-          (data) => {
-            if (disposed) {
-              return;
-            }
-            onData(data);
-          },
-          (err) => {
-            dispose();
-            onError(err);
-          },
-        );
-        return dispose;
-      },
-    };
-  },
-});
-
-interface _Resolver<T> {
-  query(query: Query): QueryResult<T>;
-}

package/src/signals-integration.test.ts

@@ -1,219 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Atom, Registry } from '@effect-atom/atom-react';
-import { signal } from '@preact/signals-core';
-import { afterEach, beforeEach, describe, expect, onTestFinished, test } from 'vitest';
-
-import { Trigger } from '@dxos/async';
-import { Obj, Type } from '@dxos/echo';
-import { Ref } from '@dxos/echo/internal';
-import { Filter } from '@dxos/echo-db';
-import { EchoTestBuilder } from '@dxos/echo-db/testing';
-import { registerSignalsRuntime } from '@dxos/echo-signals';
-
-import { ROOT_ID } from './graph';
-import { GraphBuilder, atomFromSignal, createExtension } from './graph-builder';
-import { atomFromQuery } from './testing';
-
-registerSignalsRuntime();
-
-const EXAMPLE_TYPE = 'dxos.org/type/example';
-
-describe('signals integration', () => {
-  test('creating atom from signal', () => {
-    const registry = Registry.make();
-    const state = signal<number>(0);
-    const value = atomFromSignal(() => state.value);
-    const inline = Atom.make((get) => {
-      // NOTE: This will create a new atom instance each time.
-      // This test is verifying that this behaves the same as using a stable atom instance.
-      // The parent will remain subscribed to one instance until the new one is created.
-      // The old one will then be garbage collected because it is no longer referenced.
-      const atom = atomFromSignal(() => get(value));
-      return get(atom);
-    });
-
-    let count = 0;
-    const cancel = registry.subscribe(value, (value) => {
-      count = value;
-    });
-    onTestFinished(() => cancel());
-
-    let inlineCount = 0;
-    const inlineCancel = registry.subscribe(inline, (value) => {
-      inlineCount = value;
-    });
-    onTestFinished(() => inlineCancel());
-
-    registry.get(value);
-    registry.get(inline);
-    expect(count).to.eq(0);
-    expect(inlineCount).to.eq(0);
-
-    state.value = 1;
-    expect(count).to.eq(1);
-    expect(inlineCount).to.eq(1);
-
-    state.value = 2;
-    expect(count).to.eq(2);
-    expect(inlineCount).to.eq(2);
-  });
-
-  describe('echo', () => {
-    let dbBuilder: EchoTestBuilder;
-
-    beforeEach(async () => {
-      dbBuilder = await new EchoTestBuilder().open();
-    });
-
-    afterEach(async () => {
-      await dbBuilder.close();
-    });
-
-    test('atom references are loaded lazily and receive signal notifications', async () => {
-      const registry = Registry.make();
-      await using peer = await dbBuilder.createPeer();
-
-      let outerId: string;
-      {
-        await using db = await peer.createDatabase();
-        const inner = db.add({ name: 'inner' });
-        const outer = db.add({ inner: Ref.make(inner) });
-        outerId = outer.id;
-        await db.flush();
-      }
-
-      await peer.reload();
-      {
-        await using db = await peer.openLastDatabase();
-        const outer = (await db.query(Filter.ids(outerId)).first()) as any;
-        const innerAtom = atomFromSignal(() => outer.inner.target);
-        const loaded = new Trigger();
-
-        let count = 0;
-        const cancel = registry.subscribe(innerAtom, (inner) => {
-          count++;
-          if (inner) {
-            loaded.wake();
-          }
-        });
-
-        onTestFinished(() => cancel());
-
-        expect(registry.get(innerAtom)).to.eq(undefined);
-        expect(count).to.eq(1);
-
-        await loaded.wait();
-        expect(registry.get(innerAtom)).to.include({ name: 'inner' });
-        expect(count).to.eq(2);
-      }
-    });
-
-    test('references graph builder', async () => {
-      const registry = Registry.make();
-      await using peer = await dbBuilder.createPeer();
-
-      let outerId, innerId: string;
-      {
-        await using db = await peer.createDatabase();
-        const inner = db.add({ name: 'inner' });
-        const outer = db.add({ inner: Ref.make(inner) });
-        innerId = inner.id;
-        outerId = outer.id;
-        await db.flush();
-      }
-
-      await peer.reload();
-
-      {
-        await using db = await peer.openLastDatabase();
-        const outer = (await db.query(Filter.ids(outerId)).first()) as any;
-        const innerAtom = atomFromSignal(() => outer.inner.target);
-        const inner = registry.get(innerAtom);
-        expect(inner).to.eq(undefined);
-
-        const builder = new GraphBuilder({ registry });
-        builder.addExtension(
-          createExtension({
-            id: 'outbound-connector',
-            connector: () =>
-              Atom.make((get) => {
-                const inner = get(innerAtom) as any;
-                return inner ? [{ id: inner.id, type: EXAMPLE_TYPE, data: inner.name }] : [];
-              }),
-          }),
-        );
-
-        const graph = builder.graph;
-
-        const loaded = new Trigger();
-        let count = 0;
-        const cancel = registry.subscribe(graph.connections(ROOT_ID), (nodes) => {
-          count++;
-          if (nodes.length > 0) {
-            loaded.wake();
-          }
-        });
-        onTestFinished(() => cancel());
-        registry.get(graph.connections(ROOT_ID));
-        expect(count).to.eq(1);
-
-        graph.expand(ROOT_ID);
-        await loaded.wait();
-        expect(count).to.eq(2);
-
-        const nodes = registry.get(graph.connections(ROOT_ID));
-        expect(nodes).has.length(1);
-        expect(nodes[0].id).to.eq(innerId);
-        expect(nodes[0].data).to.eq('inner');
-      }
-    });
-
-    test('query graph builder', async () => {
-      const registry = Registry.make();
-      await using peer = await dbBuilder.createPeer();
-      await using db = await peer.createDatabase();
-      db.add(Obj.make(Type.Expando, { name: 'a' }));
-      db.add(Obj.make(Type.Expando, { name: 'b' }));
-
-      const builder = new GraphBuilder({ registry });
-      builder.addExtension(
-        createExtension({
-          id: 'expando',
-          connector: () => {
-            const query = db.query(Filter.type(Type.Expando));
-
-            return Atom.make((get) => {
-              const objects = get(atomFromQuery(query));
-              return objects.map((object) => ({ id: object.id, type: EXAMPLE_TYPE, data: object.name }));
-            });
-          },
-        }),
-      );
-
-      const graph = builder.graph;
-      let count = 0;
-      const cancel = registry.subscribe(graph.connections(ROOT_ID), (nodes) => {
-        count = nodes.length;
-      });
-      onTestFinished(() => cancel());
-
-      registry.get(graph.connections(ROOT_ID));
-      expect(count).to.eq(0);
-
-      graph.expand(ROOT_ID);
-      expect(count).to.eq(2);
-
-      const object = db.add(Obj.make(Type.Expando, { name: 'c' }));
-      await db.flush();
-      expect(count).to.eq(3);
-
-      // NOTE: This graph builder is not reactive to the object update.
-      object.name = 'updated';
-      await db.flush();
-      expect(count).to.eq(3);
-    });
-  });
-});

package/src/testing.ts

@@ -1,20 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { Atom } from '@effect-atom/atom-react';
-
-import { type AnyEchoObject } from '@dxos/echo/internal';
-import { type QueryResult } from '@dxos/echo-db';
-
-export const atomFromQuery = <T extends AnyEchoObject>(query: QueryResult<T>): Atom.Atom<T[]> => {
-  return Atom.make((get) => {
-    const unsubscribe = query.subscribe((result) => {
-      get.setSelf(result.objects);
-    });
-
-    get.addFinalizer(() => unsubscribe());
-
-    return query.objects;
-  });
-};