@dxos/app-graph 0.6.3-main.9e4e207 → 0.6.3-next.2f65b78

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

@@ -2,49 +2,58 @@ import { type MaybePromise, type MakeOptional } from '@dxos/util';
 /**
  * Represents a node in the graph.
  */
-export type Node<TData = any, TProperties extends Record<string, any> = Record<string, any>> = Readonly<{
+export type NodeBase<TData = any, TProperties extends Record<string, any> = Record<string, any>> = {
     /**
      * Globally unique ID.
      */
     id: string;
-    /**
-     * Typename of the data the node represents.
-     */
-    type: string;
     /**
      * Properties of the node relevant to displaying the node.
      */
-    properties: Readonly<TProperties>;
+    properties: TProperties;
     /**
      * Data the node represents.
      */
     data: TData;
-}>;
+};
 export type NodeFilter<T = any, U extends Record<string, any> = Record<string, any>> = (node: Node<unknown, Record<string, any>>, connectedNode: Node) => node is Node<T, U>;
-export type Relation = 'outbound' | 'inbound';
-export declare const isGraphNode: (data: unknown) => data is Readonly<{
+export type EdgeDirection = 'outbound' | 'inbound';
+export type ConnectedNodes = {
     /**
-     * Globally unique ID.
+     * Edges that this node is connected to in default order.
      */
-    id: string;
+    edges(params?: {
+        direction?: EdgeDirection;
+    }): Readonly<string[]>;
     /**
-     * Typename of the data the node represents.
+     * Nodes that this node is connected to in default order.
      */
-    type: string;
+    nodes<T = any, U extends Record<string, any> = Record<string, any>>(params?: {
+        direction?: EdgeDirection;
+        filter?: NodeFilter<T, U>;
+    }): Node<T>[];
     /**
-     * Properties of the node relevant to displaying the node.
+     * Get a specific connected node by id.
      */
-    properties: Readonly<Record<string, any>>;
+    node(id: string): Node | undefined;
+};
+export type ConnectedActions = {
     /**
-     * Data the node represents.
+     * Actions or action groups that this node is connected to in default order.
      */
-    data: any;
-}>;
-export type NodeArg<TData, TProperties extends Record<string, any> = Record<string, any>> = MakeOptional<Node<TData, TProperties>, 'data' | 'properties'> & {
+    actions(): ActionLike[];
+};
+export type Node<TData = any, TProperties extends Record<string, any> = Record<string, any>> = Readonly<Omit<NodeBase<TData, TProperties>, 'properties'> & {
+    properties: Readonly<TProperties>;
+} & ConnectedNodes & ConnectedActions>;
+export declare const isGraphNode: (data: unknown) => data is Readonly<Omit<NodeBase<any, Record<string, any>>, "properties"> & {
+    properties: Readonly<Record<string, any>>;
+} & ConnectedNodes & ConnectedActions>;
+export type NodeArg<TData, TProperties extends Record<string, any> = Record<string, any>> = MakeOptional<NodeBase<TData, TProperties>, 'data' | 'properties'> & {
     /** Will automatically add nodes with an edge from this node to each. */
     nodes?: NodeArg<unknown>[];
     /** Will automatically add specified edges. */
-    edges?: [string, Relation][];
+    edges?: [string, EdgeDirection][];
 };
 export type InvokeParams = {
     /** Node the invoked action is connected to. */
@@ -52,91 +61,23 @@ export type InvokeParams = {
     caller?: string;
 };
 export type ActionData = (params: InvokeParams) => MaybePromise<void>;
-export type Action<TProperties extends Record<string, any> = Record<string, any>> = Readonly<Omit<Node<ActionData, TProperties>, 'properties'> & {
+export type Action<TProperties extends Record<string, any> = Record<string, any>> = Readonly<Omit<NodeBase<ActionData, TProperties>, 'properties'> & {
     properties: Readonly<TProperties>;
-}>;
-export declare const isAction: (data: unknown) => data is Readonly<Omit<Readonly<{
-    /**
-     * Globally unique ID.
-     */
-    id: string;
-    /**
-     * Typename of the data the node represents.
-     */
-    type: string;
-    /**
-     * Properties of the node relevant to displaying the node.
-     */
-    properties: Readonly<Record<string, any>>;
-    /**
-     * Data the node represents.
-     */
-    data: ActionData;
-}>, "properties"> & {
+} & ConnectedNodes>;
+export declare const isAction: (data: unknown) => data is Readonly<Omit<NodeBase<ActionData, Record<string, any>>, "properties"> & {
     properties: Readonly<Record<string, any>>;
-}>;
+} & ConnectedNodes>;
 export declare const actionGroupSymbol: unique symbol;
-export type ActionGroup = Readonly<Omit<Node<typeof actionGroupSymbol, Record<string, any>>, 'properties'> & {
+export type ActionGroup = Readonly<Omit<NodeBase<typeof actionGroupSymbol, Record<string, any>>, 'properties'> & {
     properties: Readonly<Record<string, any>>;
-}>;
-export declare const isActionGroup: (data: unknown) => data is Readonly<Omit<Readonly<{
-    /**
-     * Globally unique ID.
-     */
-    id: string;
-    /**
-     * Typename of the data the node represents.
-     */
-    type: string;
-    /**
-     * Properties of the node relevant to displaying the node.
-     */
-    properties: Readonly<Record<string, any>>;
-    /**
-     * Data the node represents.
-     */
-    data: typeof actionGroupSymbol;
-}>, "properties"> & {
+} & ConnectedActions>;
+export declare const isActionGroup: (data: unknown) => data is Readonly<Omit<NodeBase<typeof actionGroupSymbol, Record<string, any>>, "properties"> & {
     properties: Readonly<Record<string, any>>;
-}>;
+} & ConnectedActions>;
 export type ActionLike = Action | ActionGroup;
-export declare const isActionLike: (data: unknown) => data is Readonly<Omit<Readonly<{
-    /**
-     * Globally unique ID.
-     */
-    id: string;
-    /**
-     * Typename of the data the node represents.
-     */
-    type: string;
-    /**
-     * Properties of the node relevant to displaying the node.
-     */
-    properties: Readonly<Record<string, any>>;
-    /**
-     * Data the node represents.
-     */
-    data: ActionData;
-}>, "properties"> & {
-    properties: Readonly<Record<string, any>>;
-}> | Readonly<Omit<Readonly<{
-    /**
-     * Globally unique ID.
-     */
-    id: string;
-    /**
-     * Typename of the data the node represents.
-     */
-    type: string;
-    /**
-     * Properties of the node relevant to displaying the node.
-     */
+export declare const isActionLike: (data: unknown) => data is Readonly<Omit<NodeBase<ActionData, Record<string, any>>, "properties"> & {
     properties: Readonly<Record<string, any>>;
-    /**
-     * Data the node represents.
-     */
-    data: typeof actionGroupSymbol;
-}>, "properties"> & {
+} & ConnectedNodes> | Readonly<Omit<NodeBase<typeof actionGroupSymbol, Record<string, any>>, "properties"> & {
     properties: Readonly<Record<string, any>>;
-}>;
+} & ConnectedActions>;
 //# sourceMappingURL=node.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node.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;;;;;AAsBpB,wBAGE;AA+OF,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-next.2f65b78",
   "description": "Constructs knowledge graphs for the purpose of building applications on top of",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -21,14 +21,12 @@
   ],
   "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-next.2f65b78",
+    "@dxos/debug": "0.6.3-next.2f65b78",
+    "@dxos/echo-signals": "0.6.3-next.2f65b78",
+    "@dxos/echo-schema": "0.6.3-next.2f65b78",
+    "@dxos/util": "0.6.3-next.2f65b78",
+    "@dxos/invariant": "0.6.3-next.2f65b78"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -37,11 +35,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/random": "0.6.3-next.2f65b78",
+    "@dxos/react-client": "0.6.3-next.2f65b78",
+    "@dxos/react-ui": "0.6.3-next.2f65b78",
+    "@dxos/react-ui-theme": "0.6.3-next.2f65b78",
+    "@dxos/storybook-utils": "0.6.3-next.2f65b78"
   },
   "peerDependencies": {
     "react": "^18.2.0",

package/src/graph-builder.ts

@@ -2,219 +2,24 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Signal, effect, signal } from '@preact/signals-core';
-// import { yieldOrContinue } from 'main-thread-scheduling';
+import { EventSubscriptions, type UnsubscribeCallback } from '@dxos/async';
 
-import { type UnsubscribeCallback } from '@dxos/async';
-import { create } from '@dxos/echo-schema';
-import { invariant } from '@dxos/invariant';
-import { nonNullable } from '@dxos/util';
+import { Graph } from './graph';
 
-import { ACTION_GROUP_TYPE, ACTION_TYPE, Graph } from './graph';
-import { type Relation, type NodeArg, type Node, type ActionData, actionGroupSymbol } from './node';
-
-/**
- * Graph builder extension for adding nodes to the graph based on just the node id.
- * This is useful for creating the first node in a graph or for hydrating cached nodes with data.
- *
- * @param params.id The id of the node to resolve.
- */
-export type ResolverExtension = (params: { id: string }) => NodeArg<any> | undefined;
-
-/**
- * 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<T = any> = (params: { node: Node<T> }) => NodeArg<any>[] | undefined;
-
-/**
- * Constrained case of the connector extension for more easily adding actions to the graph.
- */
-export type ActionsExtension<T = any> = (params: {
-  node: Node<T>;
-}) => Omit<NodeArg<ActionData>, 'type' | 'nodes' | 'edges'>[] | undefined;
-
-/**
- * Constrained case of the connector extension for more easily adding action groups to the graph.
- */
-export type ActionGroupsExtension<T = any> = (params: {
-  node: Node<T>;
-}) => Omit<NodeArg<typeof actionGroupSymbol>, 'type' | 'data' | 'nodes' | 'edges'>[] | undefined;
-
-type GuardedNodeType<T> = T extends (value: any) => value is infer N ? (N extends Node<infer D> ? D : unknown) : never;
-
-/**
- * A graph builder extension is used to add nodes to the graph.
- *
- * @param params.id The unique id of the extension.
- * @param params.relation The relation the graph is being expanded from the existing node.
- * @param params.type If provided, all nodes returned are expected to have this type.
- * @param params.filter A filter function to determine if an extension should act on a node.
- * @param params.resolver A function to add nodes to the graph based on just the node id.
- * @param params.connector A function to add nodes to the graph based on a connection to an existing node.
- * @param params.actions A function to add actions to the graph based on a connection to an existing node.
- * @param params.actionGroups A function to add action groups to the graph based on a connection to an existing node.
- */
-export type CreateExtensionOptions<T = any> = {
-  id: string;
-  relation?: Relation;
-  type?: string;
-  filter?: (node: Node) => node is Node<T>;
-  resolver?: ResolverExtension;
-  connector?: ConnectorExtension<GuardedNodeType<CreateExtensionOptions<T>['filter']>>;
-  actions?: ActionsExtension<GuardedNodeType<CreateExtensionOptions<T>['filter']>>;
-  actionGroups?: ActionGroupsExtension<GuardedNodeType<CreateExtensionOptions<T>['filter']>>;
-};
-
-/**
- * Create a graph builder extension.
- */
-export const createExtension = <T = any>(extension: CreateExtensionOptions<T>): BuilderExtension[] => {
-  const { id, resolver, connector, actions, actionGroups, ...rest } = extension;
-  const getId = (key: string) => `${id}/${key}`;
-  return [
-    resolver ? { id: getId('resolver'), resolver } : undefined,
-    connector ? { ...rest, id: getId('connector'), connector } : undefined,
-    actionGroups
-      ? ({
-          ...rest,
-          id: getId('actionGroups'),
-          type: ACTION_GROUP_TYPE,
-          relation: 'outbound',
-          connector: ({ node }) =>
-            actionGroups({ node })?.map((arg) => ({ ...arg, data: actionGroupSymbol, type: ACTION_GROUP_TYPE })),
-        } satisfies BuilderExtension)
-      : undefined,
-    actions
-      ? ({
-          ...rest,
-          id: getId('actions'),
-          type: ACTION_TYPE,
-          relation: 'outbound',
-          connector: ({ node }) => actions({ node })?.map((arg) => ({ ...arg, type: ACTION_TYPE })),
-        } satisfies BuilderExtension)
-      : undefined,
-  ].filter(nonNullable);
-};
-
-export type GraphBuilderTraverseOptions = {
-  node: Node;
-  relation?: Relation;
-  visitor: (node: Node, path: string[]) => void;
-};
-
-/**
- * The dispatcher is used to keep track of the current extension and state when memoizing functions.
- */
-class Dispatcher {
-  currentExtension?: string;
-  stateIndex = 0;
-  state: Record<string, any[]> = {};
-  cleanup: (() => void)[] = [];
-}
-
-class BuilderInternal {
-  // This must be static to avoid passing the dispatcher instance to every memoized function.
-  // If the dispatcher is not set that means that the memoized function is being called outside of the graph builder.
-  static currentDispatcher?: Dispatcher;
-}
-
-/**
- * Allows code to be memoized within the context of a graph builder extension.
- * This is useful for creating instances which should be subscribed to rather than recreated.
- */
-export const memoize = <T>(fn: () => T, key = 'result'): T => {
-  const dispatcher = BuilderInternal.currentDispatcher;
-  invariant(dispatcher?.currentExtension, 'memoize must be called within an extension');
-  const all = dispatcher.state[dispatcher.currentExtension][dispatcher.stateIndex] ?? {};
-  const current = all[key];
-  const result = current ? current.result : fn();
-  dispatcher.state[dispatcher.currentExtension][dispatcher.stateIndex] = { ...all, [key]: { result } };
-  dispatcher.stateIndex++;
-  return result;
-};
-
-/**
- * Register a cleanup function to be called when the graph builder is destroyed.
- */
-export const cleanup = (fn: () => void): void => {
-  memoize(() => {
-    const dispatcher = BuilderInternal.currentDispatcher;
-    invariant(dispatcher, 'cleanup must be called within an extension');
-    dispatcher.cleanup.push(fn);
-  });
-};
-
-/**
- * Convert a subscribe/get pair into a signal.
- */
-export const toSignal = <T>(
-  subscribe: (onChange: () => void) => () => void,
-  get: () => T | undefined,
-  key?: string,
-) => {
-  const thisSignal = memoize(() => {
-    return signal(get());
-  }, key);
-  const unsubscribe = memoize(() => {
-    return subscribe(() => (thisSignal.value = get()));
-  }, key);
-  cleanup(() => {
-    unsubscribe();
-  });
-  return thisSignal.value;
-};
-
-export type BuilderExtension = {
-  id: string;
-  resolver?: ResolverExtension;
-  connector?: ConnectorExtension;
-  // Only for connector.
-  relation?: Relation;
-  type?: string;
-  filter?: (node: Node) => boolean;
-};
-
-type ExtensionArg = BuilderExtension | BuilderExtension[] | ExtensionArg[];
+export type BuilderExtension = (graph: Graph) => UnsubscribeCallback | void;
 
 /**
  * The builder provides an extensible way to compose the construction of the graph.
  */
-// TODO(wittjosiah): Add api for setting subscription set and/or radius.
-//   Should unsubscribe from nodes that are not in the set/radius.
-//   Should track LRU nodes that are not in the set/radius and remove them beyond a certain threshold.
 export class GraphBuilder {
-  private readonly _dispatcher = new Dispatcher();
-  private readonly _extensions = create<Record<string, BuilderExtension>>({});
-  private readonly _resolverSubscriptions = new Map<string, UnsubscribeCallback>();
-  private readonly _connectorSubscriptions = new Map<string, UnsubscribeCallback>();
-  private readonly _nodeChanged: Record<string, Signal<{}>> = {};
-  private _graph: Graph;
-
-  constructor() {
-    this._graph = new Graph({
-      onInitialNode: (id, type) => this._onInitialNode(id, type),
-      onInitialNodes: (node, relation, type) => this._onInitialNodes(node, relation, type),
-      onRemoveNode: (id) => this._onRemoveNode(id),
-    });
-  }
-
-  get graph() {
-    return this._graph;
-  }
+  private readonly _extensions = new Map<string, BuilderExtension>();
+  private readonly _unsubscribe = new EventSubscriptions();
 
   /**
    * Register a node builder which will be called in order to construct the graph.
    */
-  addExtension(extension: ExtensionArg): GraphBuilder {
-    if (Array.isArray(extension)) {
-      extension.forEach((ext) => this.addExtension(ext));
-      return this;
-    }
-
-    this._dispatcher.state[extension.id] = [];
-    this._extensions[extension.id] = extension;
+  addExtension(id: string, extension: BuilderExtension): GraphBuilder {
+    this._extensions.set(id, extension);
     return this;
   }
 
@@ -222,143 +27,25 @@ export class GraphBuilder {
    * Remove a node builder from the graph builder.
    */
   removeExtension(id: string): GraphBuilder {
-    delete this._extensions[id];
+    this._extensions.delete(id);
     return this;
   }
 
-  destroy() {
-    this._dispatcher.cleanup.forEach((fn) => fn());
-    this._resolverSubscriptions.forEach((unsubscribe) => unsubscribe());
-    this._connectorSubscriptions.forEach((unsubscribe) => unsubscribe());
-    this._resolverSubscriptions.clear();
-    this._connectorSubscriptions.clear();
-  }
-
   /**
-   * Traverse a graph using just the connector extensions, without subscribing to any signals or persisting any nodes.
+   * Construct the graph, starting by calling all registered extensions.
+   * @param previousGraph If provided, the graph will be updated in place.
    */
-  // TODO(wittjosiah): Rename? This is not traversing the graph proper.
-  async traverse({ node, relation = 'outbound', visitor }: GraphBuilderTraverseOptions, path: string[] = []) {
-    // Break cycles.
-    if (path.includes(node.id)) {
-      return;
-    }
+  build(previousGraph?: Graph): Graph {
+    // Clear previous extension subscriptions.
+    this._unsubscribe.clear();
 
-    // TODO(wittjosiah): Failed in test environment. ESM only?
-    // await yieldOrContinue('idle');
-    visitor(node, [...path, node.id]);
+    const graph: Graph = previousGraph ?? new Graph();
 
-    const nodes = Object.values(this._extensions)
-      .filter((extension) => relation === (extension.relation ?? 'outbound'))
-      .flatMap((extension) => extension.connector?.({ node }) ?? [])
-      .map(
-        (arg): Node => ({
-          id: arg.id,
-          type: arg.type,
-          data: arg.data ?? null,
-          properties: arg.properties ?? {},
-        }),
-      );
-
-    await Promise.all(nodes.map((n) => this.traverse({ node: n, relation, visitor }, [...path, node.id])));
-  }
-
-  private _onInitialNode(nodeId: string, nodeType?: 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)) {
-        continue;
-      }
-
-      const unsubscribe = effect(() => {
-        this._dispatcher.currentExtension = id;
-        this._dispatcher.stateIndex = 0;
-        BuilderInternal.currentDispatcher = this._dispatcher;
-        const node = resolver({ id: nodeId });
-        BuilderInternal.currentDispatcher = undefined;
-        if (node && initialized) {
-          this.graph._addNodes([node]);
-          if (this._nodeChanged[initialized.id]) {
-            this._nodeChanged[initialized.id].value = {};
-          }
-        } else if (node) {
-          initialized = node;
-        }
-      });
-
-      if (initialized) {
-        this._resolverSubscriptions.set(nodeId, unsubscribe);
-        break;
-      } else {
-        unsubscribe();
-      }
-    }
-
-    return initialized;
-  }
-
-  private _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,
-      effect(() => {
-        // Subscribe to extensions being added.
-        Object.keys(this._extensions);
-        // Subscribe to connected node changes.
-        this._nodeChanged[node.id].value;
-
-        // TODO(wittjosiah): Consider allowing extensions to collaborate on the same node by merging their results.
-        const nodes: NodeArg<any>[] = [];
-        for (const { id, connector, filter, type, relation = 'outbound' } of Object.values(this._extensions)) {
-          if (
-            !connector ||
-            relation !== nodesRelation ||
-            (nodesType && type !== nodesType) ||
-            (filter && !filter(node))
-          ) {
-            continue;
-          }
-
-          this._dispatcher.currentExtension = id;
-          this._dispatcher.stateIndex = 0;
-          BuilderInternal.currentDispatcher = this._dispatcher;
-          nodes.push(...(connector({ node }) ?? []));
-          BuilderInternal.currentDispatcher = undefined;
-        }
-        const ids = nodes.map((n) => n.id);
-        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;
-        }
-      }),
-    );
-
-    return initialized;
-  }
+    Array.from(this._extensions.values()).forEach((builder) => {
+      const unsubscribe = builder(graph);
+      unsubscribe && this._unsubscribe.add(unsubscribe);
+    });
 
-  private _onRemoveNode(nodeId: string) {
-    this._resolverSubscriptions.get(nodeId)?.();
-    this._connectorSubscriptions.get(nodeId)?.();
-    this._resolverSubscriptions.delete(nodeId);
-    this._connectorSubscriptions.delete(nodeId);
+    return graph;
   }
 }