@dxos/app-graph 0.6.3-main.9e4e207 → 0.6.3-main.a95c491

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

@@ -7,7 +7,7 @@ export declare const ACTION_GROUP_TYPE = "dxos.org/type/GraphActionGroup";
 export type NodesOptions<T = any, U extends Record<string, any> = Record<string, any>> = {
     relation?: Relation;
     filter?: NodeFilter<T, U>;
-    onlyLoaded?: boolean;
+    expansion?: boolean;
     type?: string;
 };
 export type GraphTraversalOptions = {
@@ -30,9 +30,9 @@ export type GraphTraversalOptions = {
      */
     relation?: Relation;
     /**
-     * Only traverse nodes that are already loaded.
+     * Allow traversal to trigger expansion of the graph via `onInitialNodes`.
      */
-    onlyLoaded?: boolean;
+    expansion?: boolean;
 };
 /**
  * The Graph represents the structure of the application constructed via plugins.
@@ -60,10 +60,9 @@ export declare class Graph {
     /**
      * Convert the graph to a JSON object.
      */
-    toJSON({ id, maxLength, onlyLoaded, }?: {
+    toJSON({ id, maxLength }?: {
         id?: string;
         maxLength?: number;
-        onlyLoaded?: boolean;
     }): any;
     /**
      * Find the node with the given id in the graph.
@@ -71,7 +70,7 @@ export declare class Graph {
      * If a node is not found within the graph and an `onInitialNode` callback is provided,
      * it is called with the id and type of the node, potentially initializing the node.
      */
-    findNode(id: string, type?: string): Node | undefined;
+    findNode(id: string): Node | undefined;
     /**
      * Wait for a node to be added to the graph.
      *
@@ -99,14 +98,15 @@ export declare class Graph {
     /**
      * Actions or action groups that this node is connected to in default order.
      */
-    actions(node: Node, { onlyLoaded }?: {
-        onlyLoaded?: boolean;
+    actions(node: Node, { expansion }?: {
+        expansion?: boolean;
     }): Readonly<{
         id: string;
         type: string;
         properties: Readonly<Record<string, any>>;
         data: any;
     }>[];
+    expand(node: Node, relation?: Relation, type?: string): Promise<void>;
     /**
      * Recursive depth-first traversal of the graph.
      *
@@ -114,7 +114,7 @@ export declare class Graph {
      * @param options.relation The relation to traverse graph edges.
      * @param options.visitor A callback which is called for each node visited during traversal.
      */
-    traverse({ visitor, node, relation, onlyLoaded }: GraphTraversalOptions, path?: string[]): void;
+    traverse({ visitor, node, relation, expansion }: GraphTraversalOptions, path?: string[]): void;
     /**
      * Recursive depth-first traversal of the graph wrapping each visitor call in an effect.
      *
@@ -122,7 +122,7 @@ export declare class Graph {
      * @param options.relation The relation to traverse graph edges.
      * @param options.visitor A callback which is called for each node visited during traversal.
      */
-    subscribeTraverse({ visitor, node, relation, onlyLoaded }: GraphTraversalOptions, currentPath?: string[]): () => void;
+    subscribeTraverse({ visitor, node, relation, expansion }: GraphTraversalOptions, currentPath?: string[]): () => void;
     /**
      * Get the path between two nodes in the graph.
      */

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

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../src/graph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../../src/graph.ts"],"names":[],"mappings":"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"}

package/dist/types/src/stories/EchoGraph.stories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EchoGraph.stories.d.ts","sourceRoot":"","sources":["../../../../src/stories/EchoGraph.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,CAAC;;;;;AA4BpB,wBAGE;AAuNF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}
+{"version":3,"file":"EchoGraph.stories.d.ts","sourceRoot":"","sources":["../../../../src/stories/EchoGraph.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,YAAY,CAAC;;;;;AA4BpB,wBAGE;AA6NF,eAAO,MAAM,OAAO;;CAEnB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-graph",
-  "version": "0.6.3-main.9e4e207",
+  "version": "0.6.3-main.a95c491",
   "description": "Constructs knowledge graphs for the purpose of building applications on top of",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -22,13 +22,13 @@
   "dependencies": {
     "@preact/signals-core": "^1.6.0",
     "main-thread-scheduling": "^14.1.1",
-    "@dxos/debug": "0.6.3-main.9e4e207",
-    "@dxos/echo-schema": "0.6.3-main.9e4e207",
-    "@dxos/echo-signals": "0.6.3-main.9e4e207",
-    "@dxos/async": "0.6.3-main.9e4e207",
-    "@dxos/invariant": "0.6.3-main.9e4e207",
-    "@dxos/log": "0.6.3-main.9e4e207",
-    "@dxos/util": "0.6.3-main.9e4e207"
+    "@dxos/async": "0.6.3-main.a95c491",
+    "@dxos/debug": "0.6.3-main.a95c491",
+    "@dxos/echo-schema": "0.6.3-main.a95c491",
+    "@dxos/invariant": "0.6.3-main.a95c491",
+    "@dxos/echo-signals": "0.6.3-main.a95c491",
+    "@dxos/log": "0.6.3-main.a95c491",
+    "@dxos/util": "0.6.3-main.a95c491"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -37,11 +37,11 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "vite": "^5.2.9",
-    "@dxos/react-client": "0.6.3-main.9e4e207",
-    "@dxos/react-ui": "0.6.3-main.9e4e207",
-    "@dxos/react-ui-theme": "0.6.3-main.9e4e207",
-    "@dxos/random": "0.6.3-main.9e4e207",
-    "@dxos/storybook-utils": "0.6.3-main.9e4e207"
+    "@dxos/react-client": "0.6.3-main.a95c491",
+    "@dxos/random": "0.6.3-main.a95c491",
+    "@dxos/react-ui": "0.6.3-main.a95c491",
+    "@dxos/react-ui-theme": "0.6.3-main.a95c491",
+    "@dxos/storybook-utils": "0.6.3-main.a95c491"
   },
   "peerDependencies": {
     "react": "^18.2.0",

package/src/graph-builder.test.ts

@@ -3,7 +3,8 @@
 //
 
 import { signal } from '@preact/signals-core';
-import { expect } from 'chai';
+import chai, { expect } from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 
 import { describe, test } from '@dxos/test';
 
@@ -11,13 +12,15 @@ import { ACTION_TYPE } from './graph';
 import { GraphBuilder, createExtension, memoize } from './graph-builder';
 import { type Node } from './node';
 
+chai.use(chaiAsPromised);
+
 const exampleId = (id: number) => `dx:test:${id}`;
 const EXAMPLE_ID = exampleId(1);
 const EXAMPLE_TYPE = 'dxos.org/type/example';
 
 describe('GraphBuilder', () => {
   describe('resolver', () => {
-    test('works', () => {
+    test('works', async () => {
       const builder = new GraphBuilder();
       const graph = builder.graph;
 
@@ -31,14 +34,14 @@ describe('GraphBuilder', () => {
       );
 
       {
-        const node = graph.findNode(EXAMPLE_ID);
+        const node = await graph.waitForNode(EXAMPLE_ID);
         expect(node?.id).to.equal(EXAMPLE_ID);
         expect(node?.type).to.equal(EXAMPLE_TYPE);
         expect(node?.data).to.equal(1);
       }
     });
 
-    test('updates', () => {
+    test('updates', async () => {
       const builder = new GraphBuilder();
       const name = signal('default');
       builder.addExtension(
@@ -46,14 +49,14 @@ describe('GraphBuilder', () => {
       );
       const graph = builder.graph;
 
-      const node = graph.findNode(EXAMPLE_ID);
+      const node = await graph.waitForNode(EXAMPLE_ID);
       expect(node?.data).to.equal('default');
 
       name.value = 'updated';
       expect(node?.data).to.equal('updated');
     });
 
-    test('memoize', () => {
+    test('memoize', async () => {
       const builder = new GraphBuilder();
       const name = signal('default');
       let count = 0;
@@ -73,7 +76,7 @@ describe('GraphBuilder', () => {
       );
       const graph = builder.graph;
 
-      const node = graph.findNode(EXAMPLE_ID);
+      const node = await graph.waitForNode(EXAMPLE_ID);
       expect(node?.data).to.equal('default');
       expect(count).to.equal(1);
       expect(memoizedCount).to.equal(1);
@@ -89,9 +92,8 @@ describe('GraphBuilder', () => {
   });
 
   describe('connector', () => {
-    test('works', () => {
+    test('works', async () => {
       const builder = new GraphBuilder();
-      const graph = builder.graph;
       builder.addExtension(
         createExtension({
           id: 'outbound-connector',
@@ -106,6 +108,10 @@ describe('GraphBuilder', () => {
         }),
       );
 
+      const graph = builder.graph;
+      await graph.expand(graph.root);
+      await graph.expand(graph.root, 'inbound');
+
       const outbound = graph.nodes(graph.root);
       const inbound = graph.nodes(graph.root, { relation: 'inbound' });
 
@@ -117,7 +123,7 @@ describe('GraphBuilder', () => {
       expect(inbound?.[0].data).to.equal(0);
     });
 
-    test('updates', () => {
+    test('updates', async () => {
       const name = signal('default');
       const builder = new GraphBuilder();
       builder.addExtension(
@@ -127,6 +133,7 @@ describe('GraphBuilder', () => {
         }),
       );
       const graph = builder.graph;
+      await graph.expand(graph.root);
 
       const [node] = graph.nodes(graph.root);
       expect(node.properties.label).to.equal('default');
@@ -135,7 +142,7 @@ describe('GraphBuilder', () => {
       expect(node.properties.label).to.equal('updated');
     });
 
-    test('removes', () => {
+    test('removes', async () => {
       const nodes = signal([
         { id: exampleId(1), type: EXAMPLE_TYPE, data: 1 },
         { id: exampleId(2), type: EXAMPLE_TYPE, data: 2 },
@@ -149,6 +156,7 @@ describe('GraphBuilder', () => {
         }),
       );
       const graph = builder.graph;
+      await graph.expand(graph.root);
 
       {
         const nodes = graph.nodes(graph.root);
@@ -166,7 +174,7 @@ describe('GraphBuilder', () => {
       }
     });
 
-    test('filters by type', () => {
+    test('filters by type', async () => {
       const builder = new GraphBuilder();
       builder.addExtension(
         createExtension({
@@ -177,21 +185,22 @@ describe('GraphBuilder', () => {
       );
       const graph = builder.graph;
 
+      await graph.expand(graph.root, 'outbound', ACTION_TYPE);
       const actions = graph.actions(graph.root);
       expect(actions).has.length(1);
       expect(actions?.[0].id).to.equal('action');
       expect(actions?.[0].type).to.equal(ACTION_TYPE);
 
-      const node = graph.findNode('not-action', EXAMPLE_TYPE);
-      expect(node).to.be.undefined;
+      await expect(graph.waitForNode('not-action', 10)).to.be.rejected;
 
+      await graph.expand(graph.root);
       const nodes = graph.nodes(graph.root);
       expect(nodes).has.length(1);
       expect(nodes?.[0].id).to.equal('not-action');
       expect(nodes?.[0].data).to.equal(1);
     });
 
-    test('filters by callback', () => {
+    test('filters by callback', async () => {
       const builder = new GraphBuilder();
       builder.addExtension(
         createExtension({
@@ -201,6 +210,7 @@ describe('GraphBuilder', () => {
         }),
       );
       const graph = builder.graph;
+      await graph.expand(graph.root);
 
       const [node1] = graph.nodes(graph.root);
       expect(node1?.id).to.equal(EXAMPLE_ID);
@@ -209,7 +219,7 @@ describe('GraphBuilder', () => {
       expect(nodes).has.length(0);
     });
 
-    test('memoize', () => {
+    test('memoize', async () => {
       const builder = new GraphBuilder();
       const name = signal('default');
       let count = 0;
@@ -228,6 +238,7 @@ describe('GraphBuilder', () => {
         }),
       );
       const graph = builder.graph;
+      await graph.expand(graph.root);
 
       const [node] = graph.nodes(graph.root);
       expect(node.properties.label).to.equal('default');
@@ -271,7 +282,7 @@ describe('GraphBuilder', () => {
   });
 
   describe('multiples', () => {
-    test('one of each with multiple memos', () => {
+    test('one of each with multiple memos', async () => {
       const name = signal('default');
       const builder = new GraphBuilder();
       builder.addExtension(
@@ -291,8 +302,9 @@ describe('GraphBuilder', () => {
       );
       const graph = builder.graph;
 
-      const one = graph.findNode(EXAMPLE_ID);
+      const one = await graph.waitForNode(EXAMPLE_ID);
       const initialData = one!.data;
+      await graph.expand(one!);
       const two = graph.nodes(one!)[0];
       const initialA = two?.data.a;
       const initialB = two?.data.b;

package/src/graph-builder.ts

@@ -194,7 +194,7 @@ export class GraphBuilder {
 
   constructor() {
     this._graph = new Graph({
-      onInitialNode: (id, type) => this._onInitialNode(id, type),
+      onInitialNode: (id) => this._onInitialNode(id),
       onInitialNodes: (node, relation, type) => this._onInitialNodes(node, relation, type),
       onRemoveNode: (id) => this._onRemoveNode(id),
     });
@@ -263,11 +263,11 @@ export class GraphBuilder {
     await Promise.all(nodes.map((n) => this.traverse({ node: n, relation, visitor }, [...path, node.id])));
   }
 
-  private _onInitialNode(nodeId: string, nodeType?: string) {
+  private async _onInitialNode(nodeId: string) {
     this._nodeChanged[nodeId] = this._nodeChanged[nodeId] ?? signal({});
-    let initialized: NodeArg<any> | undefined;
-    for (const { id, type, resolver } of Object.values(this._extensions)) {
-      if (!resolver || (nodeType && type !== nodeType)) {
+    let resolved = false;
+    for (const { id, resolver } of Object.values(this._extensions)) {
+      if (resolved || !resolver) {
         continue;
       }
 
@@ -277,30 +277,27 @@ export class GraphBuilder {
         BuilderInternal.currentDispatcher = this._dispatcher;
         const node = resolver({ id: nodeId });
         BuilderInternal.currentDispatcher = undefined;
-        if (node && initialized) {
+        if (node) {
+          resolved = true;
           this.graph._addNodes([node]);
-          if (this._nodeChanged[initialized.id]) {
-            this._nodeChanged[initialized.id].value = {};
+          if (this._nodeChanged[node.id]) {
+            this._nodeChanged[node.id].value = {};
           }
-        } else if (node) {
-          initialized = node;
         }
       });
 
-      if (initialized) {
+      if (resolved) {
+        this._resolverSubscriptions.get(nodeId)?.();
         this._resolverSubscriptions.set(nodeId, unsubscribe);
         break;
       } else {
         unsubscribe();
       }
     }
-
-    return initialized;
   }
 
-  private _onInitialNodes(node: Node, nodesRelation: Relation, nodesType?: string) {
+  private async _onInitialNodes(node: Node, nodesRelation: Relation, nodesType?: string) {
     this._nodeChanged[node.id] = this._nodeChanged[node.id] ?? signal({});
-    let initialized: NodeArg<any>[] | undefined;
     let previous: string[] = [];
     this._connectorSubscriptions.set(
       node.id,
@@ -332,30 +329,28 @@ export class GraphBuilder {
         const removed = previous.filter((id) => !ids.includes(id));
         previous = ids;
 
-        if (initialized) {
-          this.graph._removeNodes(removed, true);
-          this.graph._addNodes(nodes);
-          this.graph._addEdges(nodes.map(({ id }) => ({ source: node.id, target: id })));
-          this.graph._sortEdges(
-            node.id,
-            'outbound',
-            nodes.map(({ id }) => id),
-          );
-          nodes.forEach((n) => {
-            if (this._nodeChanged[n.id]) {
-              this._nodeChanged[n.id].value = {};
-            }
-          });
-        } else {
-          initialized = nodes;
-        }
+        this.graph._removeNodes(removed, true);
+        this.graph._addNodes(nodes);
+        this.graph._addEdges(
+          nodes.map(({ id }) =>
+            nodesRelation === 'outbound' ? { source: node.id, target: id } : { source: id, target: node.id },
+          ),
+        );
+        this.graph._sortEdges(
+          node.id,
+          nodesRelation,
+          nodes.map(({ id }) => id),
+        );
+        nodes.forEach((n) => {
+          if (this._nodeChanged[n.id]) {
+            this._nodeChanged[n.id].value = {};
+          }
+        });
       }),
     );
-
-    return initialized;
   }
 
-  private _onRemoveNode(nodeId: string) {
+  private async _onRemoveNode(nodeId: string) {
     this._resolverSubscriptions.get(nodeId)?.();
     this._connectorSubscriptions.get(nodeId)?.();
     this._resolverSubscriptions.delete(nodeId);