@dxos/app-graph 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-graph",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fffef41",
   "description": "Constructs knowledge graphs for the purpose of building applications on top of",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -24,46 +25,43 @@
     "src"
   ],
   "dependencies": {
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/echo": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/echo-signals": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@dxos/async": "0.8.4-main.fffef41",
+    "@dxos/debug": "0.8.4-main.fffef41",
+    "@dxos/echo": "0.8.4-main.fffef41",
+    "@dxos/echo-signals": "0.8.4-main.fffef41",
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41",
+    "@dxos/live-object": "0.8.4-main.fffef41"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
-    "@phosphor-icons/react": "^2.1.5",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.16.13",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/echo-db": "0.8.4-main.f9ba587",
-    "@dxos/random": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-list": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-tabs": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "@effect-atom/atom-react": "^0.3.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@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.fffef41",
+    "@dxos/random": "0.8.4-main.fffef41",
+    "@dxos/react-client": "0.8.4-main.fffef41",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/react-ui-list": "0.8.4-main.fffef41",
+    "@dxos/react-ui-tabs": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41",
+    "@dxos/storybook-utils": "0.8.4-main.fffef41"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
     "effect": "3.14.21",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41"
   },
   "publishConfig": {
     "access": "public"

package/src/graph-builder.test.ts

@@ -2,14 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Registry, Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+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';
 
-import { sleep, Trigger } from '@dxos/async';
+import { Trigger, sleep } from '@dxos/async';
 
 import { ROOT_ID } from './graph';
-import { createExtension, GraphBuilder } from './graph-builder';
+import { GraphBuilder, createExtension } from './graph-builder';
 import { type Node } from './node';
 
 const exampleId = (id: number) => `dx:test:${id}`;
@@ -17,6 +18,63 @@ const EXAMPLE_ID = exampleId(1);
 const EXAMPLE_TYPE = 'dxos.org/type/example';
 
 describe('GraphBuilder', () => {
+  describe('resolver', () => {
+    test('works', async () => {
+      const registry = Registry.make();
+      const builder = new GraphBuilder({ registry });
+      const graph = builder.graph;
+
+      {
+        const node = graph.getNode(EXAMPLE_ID).pipe(Option.getOrNull);
+        expect(node).to.be.null;
+      }
+
+      builder.addExtension(
+        createExtension({
+          id: 'resolver',
+          resolver: () => {
+            console.log('resolver');
+            return Atom.make({ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: 1 });
+          },
+        }),
+      );
+      await graph.initialize(EXAMPLE_ID);
+
+      {
+        const node = graph.getNode(EXAMPLE_ID).pipe(Option.getOrNull);
+        expect(node?.id).to.equal(EXAMPLE_ID);
+        expect(node?.type).to.equal(EXAMPLE_TYPE);
+        expect(node?.data).to.equal(1);
+      }
+    });
+
+    test('updates', async () => {
+      const registry = Registry.make();
+      const builder = new GraphBuilder({ registry });
+      const name = Atom.make('default');
+      builder.addExtension(
+        createExtension({
+          id: 'resolver',
+          resolver: () => Atom.make((get) => ({ id: EXAMPLE_ID, type: EXAMPLE_TYPE, data: get(name) })),
+        }),
+      );
+      const graph = builder.graph;
+      await graph.initialize(EXAMPLE_ID);
+
+      {
+        const node = graph.getNode(EXAMPLE_ID).pipe(Option.getOrNull);
+        expect(node?.data).to.equal('default');
+      }
+
+      registry.set(name, 'updated');
+
+      {
+        const node = graph.getNode(EXAMPLE_ID).pipe(Option.getOrNull);
+        expect(node?.data).to.equal('updated');
+      }
+    });
+  });
+
   describe('connector', () => {
     test('works', () => {
       const registry = Registry.make();
@@ -24,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 }]),
         }),
       );
 
@@ -53,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;
@@ -78,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;
@@ -109,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;
@@ -132,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);
@@ -142,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;
@@ -174,14 +232,14 @@ 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) =>
-              pipe(
+            Atom.make((get) =>
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === 'root' ? Option.some(get(name)) : Option.none())),
                 Option.filter((name) => name !== 'removed'),
@@ -222,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 },
@@ -230,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;
@@ -265,15 +323,15 @@ 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) =>
-              pipe(
+            Atom.make((get) =>
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === 'root' ? Option.some(get(name)) : Option.none())),
                 Option.filter((name) => name !== 'removed'),
@@ -285,8 +343,8 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector1',
           connector: (node) =>
-            Rx.make((get) =>
-              pipe(
+            Atom.make((get) =>
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === EXAMPLE_ID ? Option.some(get(sub)) : Option.none())),
                 Option.map((sub) => [{ id: exampleId(2), type: EXAMPLE_TYPE, data: sub }]),
@@ -297,8 +355,8 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector2',
           connector: (node) =>
-            Rx.make((get) =>
-              pipe(
+            Atom.make((get) =>
+              Function.pipe(
                 get(node),
                 Option.flatMap((node) => (node.id === EXAMPLE_ID ? Option.some(node.data) : Option.none())),
                 Option.map((data) => [{ id: exampleId(3), type: EXAMPLE_TYPE, data }]),
@@ -353,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');
       });
@@ -381,8 +439,8 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector',
           connector: (node) => {
-            return Rx.make((get) =>
-              pipe(
+            return Atom.make((get) =>
+              Function.pipe(
                 get(node),
                 Option.map((node) => (node.data ? node.data + 1 : 1)),
                 Option.filter((data) => data <= 5),
@@ -417,8 +475,8 @@ describe('GraphBuilder', () => {
         createExtension({
           id: 'connector',
           connector: (node) =>
-            Rx.make((get) =>
-              pipe(
+            Atom.make((get) =>
+              Function.pipe(
                 get(node),
                 Option.map((node) => (node.data ? node.data + 1 : 1)),
                 Option.filter((data) => data <= 5),