@dxos/app-graph 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-graph",
-  "version": "0.8.4-main.406dc2a",
+  "version": "0.8.4-main.548089c",
   "description": "Constructs knowledge graphs for the purpose of building applications on top of",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -27,41 +27,41 @@
   "dependencies": {
     "@preact/signals-core": "^1.12.1",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/async": "0.8.4-main.406dc2a",
-    "@dxos/debug": "0.8.4-main.406dc2a",
-    "@dxos/echo": "0.8.4-main.406dc2a",
-    "@dxos/echo-signals": "0.8.4-main.406dc2a",
-    "@dxos/invariant": "0.8.4-main.406dc2a",
-    "@dxos/util": "0.8.4-main.406dc2a",
-    "@dxos/live-object": "0.8.4-main.406dc2a",
-    "@dxos/log": "0.8.4-main.406dc2a"
+    "@dxos/debug": "0.8.4-main.548089c",
+    "@dxos/async": "0.8.4-main.548089c",
+    "@dxos/echo": "0.8.4-main.548089c",
+    "@dxos/echo-signals": "0.8.4-main.548089c",
+    "@dxos/invariant": "0.8.4-main.548089c",
+    "@dxos/log": "0.8.4-main.548089c",
+    "@dxos/util": "0.8.4-main.548089c",
+    "@dxos/live-object": "0.8.4-main.548089c"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.42.4",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "0.92.1",
     "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/echo-db": "0.8.4-main.406dc2a",
-    "@dxos/random": "0.8.4-main.406dc2a",
-    "@dxos/react-client": "0.8.4-main.406dc2a",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-tabs": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-list": "0.8.4-main.406dc2a",
-    "@dxos/storybook-utils": "0.8.4-main.406dc2a"
+    "@dxos/echo-db": "0.8.4-main.548089c",
+    "@dxos/random": "0.8.4-main.548089c",
+    "@dxos/react-client": "0.8.4-main.548089c",
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c",
+    "@dxos/storybook-utils": "0.8.4-main.548089c",
+    "@dxos/react-ui-list": "0.8.4-main.548089c",
+    "@dxos/react-ui-tabs": "0.8.4-main.548089c"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "3.14.21",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c"
   },
   "publishConfig": {
     "access": "public"

package/src/graph-builder.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Registry, Rx } from '@effect-rx/rx-react';
+import { Atom, Registry } from '@effect-atom/atom-react';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 import { describe, expect, onTestFinished, test } from 'vitest';
@@ -34,7 +34,7 @@ describe('GraphBuilder', () => {
           id: 'resolver',
           resolver: () => {
             console.log('resolver');
-            return Rx.make({ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: 1 });
+            return Atom.make({ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: 1 });
           },
         }),
       );
@@ -51,11 +51,11 @@ describe('GraphBuilder', () => {
     test('updates', async () => {
       const registry = Registry.make();
       const builder = new GraphBuilder({ registry });
-      const name = Rx.make('default');
+      const name = Atom.make('default');
       builder.addExtension(
         createExtension({
           id: 'resolver',
-          resolver: () => Rx.make((get) => ({ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: get(name) })),
+          resolver: () => Atom.make((get) => ({ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: get(name) })),
         }),
       );
       const graph = builder.graph;
@@ -82,14 +82,14 @@ describe('GraphBuilder', () => {
       builder.addExtension(
         createExtension({
           id: 'outbound-connector',
-          connector: () => Rx.make([{ id: 'child', type: EXAMPLE_TYPE, data: 2 }]),
+          connector: () => Atom.make([{ id: 'child', type: EXAMPLE_TYPE, data: 2 }]),
         }),
       );
       builder.addExtension(
         createExtension({
           id: 'inbound-connector',
           relation: 'inbound',
-          connector: () => Rx.make([{ id: 'parent', type: EXAMPLE_TYPE, data: 0 }]),
+          connector: () => Atom.make([{ id: 'parent', type: EXAMPLE_TYPE, data: 0 }]),
         }),
       );
 
@@ -111,11 +111,11 @@ describe('GraphBuilder', () => {
     test('updates', () => {
       const registry = Registry.make();
       const builder = new GraphBuilder({ registry });
-      const state = Rx.make(0);
+      const state = Atom.make(0);
       builder.addExtension(
         createExtension({
           id: 'connector',
-          connector: () => Rx.make((get) => [{ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: get(state) }]),
+          connector: () => Atom.make((get) => [{ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: get(state) }]),
         }),
       );
       const graph = builder.graph;
@@ -136,11 +136,11 @@ describe('GraphBuilder', () => {
     test('subscribes to updates', () => {
       const registry = Registry.make();
       const builder = new GraphBuilder({ registry });
-      const state = Rx.make(0);
+      const state = Atom.make(0);
       builder.addExtension(
         createExtension({
           id: 'connector',
-          connector: () => Rx.make((get) => [{ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: get(state) }]),
+          connector: () => Atom.make((get) => [{ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: get(state) }]),
         }),
       );
       const graph = builder.graph;
@@ -167,7 +167,7 @@ describe('GraphBuilder', () => {
       builder.addExtension(
         createExtension({
           id: 'connector',
-          connector: () => Rx.make([{ id: EXAMPLE_ID, type: EXAMPLE_TYPE }]),
+          connector: () => Atom.make([{ id: EXAMPLE_ID, type: EXAMPLE_TYPE }]),
         }),
       );
       const graph = builder.graph;
@@ -190,7 +190,7 @@ describe('GraphBuilder', () => {
       builder.addExtension(
         createExtension({
           id: 'connector-2',
-          connector: () => Rx.make([{ id: exampleId(2), type: EXAMPLE_TYPE }]),
+          connector: () => Atom.make([{ id: exampleId(2), type: EXAMPLE_TYPE }]),
         }),
       );
       expect(nodes).has.length(2);
@@ -200,14 +200,14 @@ describe('GraphBuilder', () => {
     test('removes', () => {
       const registry = Registry.make();
       const builder = new GraphBuilder({ registry });
-      const nodes = Rx.make([
+      const nodes = Atom.make([
         { id: exampleId(1), type: EXAMPLE_TYPE },
         { id: exampleId(2), type: EXAMPLE_TYPE },
       ]);
       builder.addExtension(
         createExtension({
           id: 'connector',
-          connector: () => Rx.make((get) => get(nodes)),
+          connector: () => Atom.make((get) => get(nodes)),
         }),
       );
       const graph = builder.graph;
@@ -232,13 +232,13 @@ describe('GraphBuilder', () => {
     test('nodes are updated when removed', () => {
       const registry = Registry.make();
       const builder = new GraphBuilder({ registry });
-      const name = Rx.make('removed');
+      const name = Atom.make('removed');
 
       builder.addExtension([
         createExtension({
           id: 'root',
           connector: (node) =>
-            Rx.make((get) =>
+            Atom.make((get) =>
               Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === 'root' ? Option.some(get(name)) : Option.none())),
@@ -280,7 +280,7 @@ describe('GraphBuilder', () => {
     test('sort edges', async () => {
       const registry = Registry.make();
       const builder = new GraphBuilder({ registry });
-      const nodes = Rx.make([
+      const nodes = Atom.make([
         { id: exampleId(1), type: EXAMPLE_TYPE, data: 1 },
         { id: exampleId(2), type: EXAMPLE_TYPE, data: 2 },
         { id: exampleId(3), type: EXAMPLE_TYPE, data: 3 },
@@ -288,7 +288,7 @@ describe('GraphBuilder', () => {
       builder.addExtension(
         createExtension({
           id: 'connector',
-          connector: () => Rx.make((get) => get(nodes)),
+          connector: () => Atom.make((get) => get(nodes)),
         }),
       );
       const graph = builder.graph;
@@ -323,14 +323,14 @@ describe('GraphBuilder', () => {
     test('updates are constrained', () => {
       const registry = Registry.make();
       const builder = new GraphBuilder({ registry });
-      const name = Rx.make('default');
-      const sub = Rx.make('default');
+      const name = Atom.make('default');
+      const sub = Atom.make('default');
 
       builder.addExtension([
         createExtension({
           id: 'root',
           connector: (node) =>
-            Rx.make((get) =>
+            Atom.make((get) =>
               Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === 'root' ? Option.some(get(name)) : Option.none())),
@@ -343,7 +343,7 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector1',
           connector: (node) =>
-            Rx.make((get) =>
+            Atom.make((get) =>
               Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === EXAMPLE_ID ? Option.some(get(sub)) : Option.none())),
@@ -355,7 +355,7 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector2',
           connector: (node) =>
-            Rx.make((get) =>
+            Atom.make((get) =>
               Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === EXAMPLE_ID ? Option.some(node.data) : Option.none())),
@@ -411,7 +411,7 @@ describe('GraphBuilder', () => {
       expect(dependentCount).to.equal(2);
 
       // Independent count should update if its state changes even if the parent is removed.
-      Rx.batch(() => {
+      Atom.batch(() => {
         registry.set(name, 'removed');
         registry.set(sub, 'batch');
       });
@@ -439,7 +439,7 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector',
           connector: (node) => {
-            return Rx.make((get) =>
+            return Atom.make((get) =>
               Function.pipe(
                 get(node),
                 Option.map((node) => (node.data ? node.data + 1 : 1)),
@@ -475,7 +475,7 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector',
           connector: (node) =>
-            Rx.make((get) =>
+            Atom.make((get) =>
               Function.pipe(
                 get(node),
                 Option.map((node) => (node.data ? node.data + 1 : 1)),

package/src/graph-builder.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Registry, Rx } from '@effect-rx/rx-react';
+import { Atom, Registry } from '@effect-atom/atom-react';
 import { effect } from '@preact/signals-core';
 import * as Array from 'effect/Array';
 import * as Function from 'effect/Function';
@@ -19,28 +19,28 @@ import { type ActionData, type Node, type NodeArg, type Relation, actionGroupSym
 /**
  * Graph builder extension for adding nodes to the graph based on a node id.
  */
-export type ResolverExtension = (id: string) => Rx.Rx<NodeArg<any> | null>;
+export type ResolverExtension = (id: string) => Atom.Atom<NodeArg<any> | null>;
 
 /**
  * Graph builder extension for adding nodes to the graph based on a connection to an existing node.
  *
  * @param params.node The existing node the returned nodes will be connected to.
  */
-export type ConnectorExtension = (node: Rx.Rx<Option.Option<Node>>) => Rx.Rx<NodeArg<any>[]>;
+export type ConnectorExtension = (node: Atom.Atom<Option.Option<Node>>) => Atom.Atom<NodeArg<any>[]>;
 
 /**
  * Constrained case of the connector extension for more easily adding actions to the graph.
  */
 export type ActionsExtension = (
-  node: Rx.Rx<Option.Option<Node>>,
-) => Rx.Rx<Omit<NodeArg<ActionData>, 'type' | 'nodes' | 'edges'>[]>;
+  node: Atom.Atom<Option.Option<Node>>,
+) => Atom.Atom<Omit<NodeArg<ActionData>, 'type' | 'nodes' | 'edges'>[]>;
 
 /**
  * Constrained case of the connector extension for more easily adding action groups to the graph.
  */
 export type ActionGroupsExtension = (
-  node: Rx.Rx<Option.Option<Node>>,
-) => Rx.Rx<Omit<NodeArg<typeof actionGroupSymbol>, 'type' | 'data' | 'nodes' | 'edges'>[]>;
+  node: Atom.Atom<Option.Option<Node>>,
+) => Atom.Atom<Omit<NodeArg<typeof actionGroupSymbol>, 'type' | 'data' | 'nodes' | 'edges'>[]>;
 
 /**
  * A graph builder extension is used to add nodes to the graph.
@@ -79,23 +79,25 @@ export const createExtension = (extension: CreateExtensionOptions): BuilderExten
   const getId = (key: string) => `${id}/${key}`;
 
   const resolver =
-    _resolver && Rx.family((id: string) => _resolver(id).pipe(Rx.withLabel(`graph-builder:_resolver:${id}`)));
+    _resolver && Atom.family((id: string) => _resolver(id).pipe(Atom.withLabel(`graph-builder:_resolver:${id}`)));
 
   const connector =
     _connector &&
-    Rx.family((node: Rx.Rx<Option.Option<Node>>) =>
-      _connector(node).pipe(Rx.withLabel(`graph-builder:_connector:${id}`)),
+    Atom.family((node: Atom.Atom<Option.Option<Node>>) =>
+      _connector(node).pipe(Atom.withLabel(`graph-builder:_connector:${id}`)),
     );
 
   const actionGroups =
     _actionGroups &&
-    Rx.family((node: Rx.Rx<Option.Option<Node>>) =>
-      _actionGroups(node).pipe(Rx.withLabel(`graph-builder:_actionGroups:${id}`)),
+    Atom.family((node: Atom.Atom<Option.Option<Node>>) =>
+      _actionGroups(node).pipe(Atom.withLabel(`graph-builder:_actionGroups:${id}`)),
     );
 
   const actions =
     _actions &&
-    Rx.family((node: Rx.Rx<Option.Option<Node>>) => _actions(node).pipe(Rx.withLabel(`graph-builder:_actions:${id}`)));
+    Atom.family((node: Atom.Atom<Option.Option<Node>>) =>
+      _actions(node).pipe(Atom.withLabel(`graph-builder:_actions:${id}`)),
+    );
 
   return [
     resolver ? { id: getId('resolver'), position, resolver } : undefined,
@@ -104,15 +106,15 @@ export const createExtension = (extension: CreateExtensionOptions): BuilderExten
           id: getId('connector'),
           position,
           relation,
-          connector: Rx.family((node) =>
-            Rx.make((get) => {
+          connector: Atom.family((node) =>
+            Atom.make((get) => {
               try {
                 return get(connector(node));
               } catch {
                 log.warn('Error in connector', { id: getId('connector'), node });
                 return [];
               }
-            }).pipe(Rx.withLabel(`graph-builder:connector:${id}`)),
+            }).pipe(Atom.withLabel(`graph-builder:connector:${id}`)),
           ),
         } satisfies BuilderExtension)
       : undefined,
@@ -121,8 +123,8 @@ export const createExtension = (extension: CreateExtensionOptions): BuilderExten
           id: getId('actionGroups'),
           position,
           relation: 'outbound',
-          connector: Rx.family((node) =>
-            Rx.make((get) => {
+          connector: Atom.family((node) =>
+            Atom.make((get) => {
               try {
                 return get(actionGroups(node)).map((arg) => ({
                   ...arg,
@@ -133,7 +135,7 @@ export const createExtension = (extension: CreateExtensionOptions): BuilderExten
                 log.warn('Error in actionGroups', { id: getId('actionGroups'), node });
                 return [];
               }
-            }).pipe(Rx.withLabel(`graph-builder:connector:actionGroups:${id}`)),
+            }).pipe(Atom.withLabel(`graph-builder:connector:actionGroups:${id}`)),
           ),
         } satisfies BuilderExtension)
       : undefined,
@@ -142,15 +144,15 @@ export const createExtension = (extension: CreateExtensionOptions): BuilderExten
           id: getId('actions'),
           position,
           relation: 'outbound',
-          connector: Rx.family((node) =>
-            Rx.make((get) => {
+          connector: Atom.family((node) =>
+            Atom.make((get) => {
               try {
                 return get(actions(node)).map((arg) => ({ ...arg, type: ACTION_TYPE }));
               } catch {
                 log.warn('Error in actions', { id: getId('actions'), node });
                 return [];
               }
-            }).pipe(Rx.withLabel(`graph-builder:connector:actions:${id}`)),
+            }).pipe(Atom.withLabel(`graph-builder:connector:actions:${id}`)),
           ),
         } satisfies BuilderExtension)
       : undefined,
@@ -169,7 +171,7 @@ export type BuilderExtension = Readonly<{
   position: Position;
   relation?: Relation; // Only for connector.
   resolver?: ResolverExtension;
-  connector?: (node: Rx.Rx<Option.Option<Node>>) => Rx.Rx<NodeArg<any>[]>;
+  connector?: (node: Atom.Atom<Option.Option<Node>>) => Atom.Atom<NodeArg<any>[]>;
 }>;
 
 export type BuilderExtensions = BuilderExtension | BuilderExtension[] | BuilderExtensions[];
@@ -191,9 +193,9 @@ export const flattenExtensions = (extension: BuilderExtensions, acc: BuilderExte
 export class GraphBuilder {
   // TODO(wittjosiah): Use Context.
   private readonly _subscriptions = new Map<string, CleanupFn>();
-  private readonly _extensions = Rx.make(Record.empty<string, BuilderExtension>()).pipe(
-    Rx.keepAlive,
-    Rx.withLabel('graph-builder:extensions'),
+  private readonly _extensions = Atom.make(Record.empty<string, BuilderExtension>()).pipe(
+    Atom.keepAlive,
+    Atom.withLabel('graph-builder:extensions'),
   );
   private readonly _initialized: Record<string, Trigger> = {};
   private readonly _registry: Registry.Registry;
@@ -290,8 +292,8 @@ export class GraphBuilder {
     this._subscriptions.clear();
   }
 
-  private readonly _resolvers = Rx.family<string, Rx.Rx<Option.Option<NodeArg<any>>>>((id) => {
-    return Rx.make((get) => {
+  private readonly _resolvers = Atom.family<string, Atom.Atom<Option.Option<NodeArg<any>>>>((id) => {
+    return Atom.make((get) => {
       return Function.pipe(
         get(this._extensions),
         Record.values,
@@ -305,8 +307,8 @@ export class GraphBuilder {
     });
   });
 
-  private readonly _connectors = Rx.family<string, Rx.Rx<NodeArg<any>[]>>((key) => {
-    return Rx.make((get) => {
+  private readonly _connectors = Atom.family<string, Atom.Atom<NodeArg<any>[]>>((key) => {
+    return Atom.make((get) => {
       const [id, relation] = key.split('+');
       const node = this._graph.node(id);
 
@@ -320,7 +322,7 @@ export class GraphBuilder {
         Array.filter(isNonNullable),
         Array.flatMap((result) => get(result)),
       );
-    }).pipe(Rx.withLabel(`graph-builder:connectors:${key}`));
+    }).pipe(Atom.withLabel(`graph-builder:connectors:${key}`));
   });
 
   private _onExpand(id: string, relation: Relation): void {
@@ -337,7 +339,7 @@ export class GraphBuilder {
 
         log('update', { id, relation, ids, removed });
         const update = () => {
-          Rx.batch(() => {
+          Atom.batch(() => {
             this._graph.removeEdges(
               removed.map((target) => ({ source: id, target })),
               true,
@@ -403,11 +405,11 @@ export class GraphBuilder {
 }
 
 /**
- * Creates an Rx.Rx<T> from a callback which accesses signals.
+ * Creates an Atom.Atom<T> from a callback which accesses signals.
  * Will return a new rx instance each time.
  */
-export const rxFromSignal = <T>(cb: () => T): Rx.Rx<T> => {
-  return Rx.make((get) => {
+export const rxFromSignal = <T>(cb: () => T): Atom.Atom<T> => {
+  return Atom.make((get) => {
     const dispose = effect(() => {
       get.setSelf(cb());
     });
@@ -418,8 +420,8 @@ export const rxFromSignal = <T>(cb: () => T): Rx.Rx<T> => {
   });
 };
 
-const observableFamily = Rx.family((observable: MulticastObservable<any>) => {
-  return Rx.make((get) => {
+const observableFamily = Atom.family((observable: MulticastObservable<any>) => {
+  return Atom.make((get) => {
     const subscription = observable.subscribe((value) => get.setSelf(value));
 
     get.addFinalizer(() => subscription.unsubscribe());
@@ -429,9 +431,9 @@ const observableFamily = Rx.family((observable: MulticastObservable<any>) => {
 });
 
 /**
- * Creates an Rx.Rx<T> from a MulticastObservable<T>
+ * Creates an Atom.Atom<T> from a MulticastObservable<T>
  * Will return the same rx instance for the same observable.
  */
-export const rxFromObservable = <T>(observable: MulticastObservable<T>): Rx.Rx<T> => {
-  return observableFamily(observable) as Rx.Rx<T>;
+export const rxFromObservable = <T>(observable: MulticastObservable<T>): Atom.Atom<T> => {
+  return observableFamily(observable) as Atom.Atom<T>;
 };

package/src/graph.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Registry, Rx } from '@effect-rx/rx-react';
+import { Atom, Registry } from '@effect-atom/atom-react';
 import * as Option from 'effect/Option';
 import { assert, describe, expect, onTestFinished, test } from 'vitest';
 
@@ -238,7 +238,7 @@ describe('Graph', () => {
     expect(count).toEqual(5);
 
     // Batching the edge and node updates fires a single update.
-    Rx.batch(() => {
+    Atom.batch(() => {
       graph.addEdge({ source: exampleId(1), target: exampleId(6) });
       graph.addNode({ id: exampleId(6), type: EXAMPLE_TYPE });
     });