@dxos/app-graph 0.8.4-main.84f28bd → 0.8.4-main.ae835ea

package/dist/lib/node-esm/index.mjs

@@ -2,7 +2,9 @@ import { createRequire } from 'node:module';const require = createRequire(import
 
 // src/graph.ts
 import { Registry, Rx } from "@effect-rx/rx-react";
-import { Option, pipe, Record } from "effect";
+import * as Function from "effect/Function";
+import * as Option from "effect/Option";
+import * as Record from "effect/Record";
 import { Event, Trigger } from "@dxos/async";
 import { todo } from "@dxos/debug";
 import { invariant } from "@dxos/invariant";
@@ -14,7 +16,7 @@ var getGraph = (node) => {
   const graph = node[graphSymbol];
   invariant(graph, "Node is not associated with a graph.", {
     F: __dxlog_file,
-    L: 25,
+    L: 27,
     S: void 0,
     A: [
       "graph",
@@ -28,90 +30,95 @@ var ROOT_TYPE = "dxos.org/type/GraphRoot";
 var ACTION_TYPE = "dxos.org/type/GraphAction";
 var ACTION_GROUP_TYPE = "dxos.org/type/GraphActionGroup";
 var Graph = class {
-  constructor({ registry, nodes, edges, onExpand, onRemoveNode } = {}) {
-    this.onNodeChanged = new Event();
-    this._expanded = Record.empty();
-    this._initialized = Record.empty();
-    this._initialEdges = Record.empty();
-    this._initialNodes = Record.fromEntries([
-      [
-        ROOT_ID,
-        this._constructNode({
-          id: ROOT_ID,
-          type: ROOT_TYPE,
-          data: null,
-          properties: {}
-        })
-      ]
-    ]);
-    /** @internal */
-    this._node = Rx.family((id) => {
-      const initial = Option.flatten(Record.get(this._initialNodes, id));
-      return Rx.make(initial).pipe(Rx.keepAlive, Rx.withLabel(`graph:node:${id}`));
-    });
-    this._nodeOrThrow = Rx.family((id) => {
-      return Rx.make((get) => {
-        const node = get(this._node(id));
-        invariant(Option.isSome(node), `Node not available: ${id}`, {
-          F: __dxlog_file,
-          L: 253,
-          S: this,
-          A: [
-            "Option.isSome(node)",
-            "`Node not available: ${id}`"
-          ]
-        });
-        return node.value;
+  onNodeChanged = new Event();
+  _onExpand;
+  _onInitialize;
+  _onRemoveNode;
+  _registry;
+  _expanded = Record.empty();
+  _initialized = Record.empty();
+  _initialEdges = Record.empty();
+  _initialNodes = Record.fromEntries([
+    [
+      ROOT_ID,
+      this._constructNode({
+        id: ROOT_ID,
+        type: ROOT_TYPE,
+        data: null,
+        properties: {}
+      })
+    ]
+  ]);
+  /** @internal */
+  _node = Rx.family((id) => {
+    const initial = Option.flatten(Record.get(this._initialNodes, id));
+    return Rx.make(initial).pipe(Rx.keepAlive, Rx.withLabel(`graph:node:${id}`));
+  });
+  _nodeOrThrow = Rx.family((id) => {
+    return Rx.make((get2) => {
+      const node = get2(this._node(id));
+      invariant(Option.isSome(node), `Node not available: ${id}`, {
+        F: __dxlog_file,
+        L: 254,
+        S: this,
+        A: [
+          "Option.isSome(node)",
+          "`Node not available: ${id}`"
+        ]
       });
+      return node.value;
     });
-    this._edges = Rx.family((id) => {
-      const initial = Record.get(this._initialEdges, id).pipe(Option.getOrElse(() => ({
-        inbound: [],
-        outbound: []
-      })));
-      return Rx.make(initial).pipe(Rx.keepAlive, Rx.withLabel(`graph:edges:${id}`));
-    });
-    // NOTE: Currently the argument to the family needs to be referentially stable for the rx to be referentially stable.
-    // TODO(wittjosiah): Rx feature request, support for something akin to `ComplexMap` to allow for complex arguments.
-    this._connections = Rx.family((key) => {
-      return Rx.make((get) => {
-        const [id, relation] = key.split("$");
-        const edges = get(this._edges(id));
-        return edges[relation].map((id2) => get(this._node(id2))).filter(Option.isSome).map((o) => o.value);
-      }).pipe(Rx.withLabel(`graph:connections:${key}`));
-    });
-    this._actions = Rx.family((id) => {
-      return Rx.make((get) => {
-        return get(this._connections(`${id}$outbound`)).filter((node) => node.type === ACTION_TYPE || node.type === ACTION_GROUP_TYPE);
-      }).pipe(Rx.withLabel(`graph:actions:${id}`));
-    });
-    this._json = Rx.family((id) => {
-      return Rx.make((get) => {
-        const toJSON = (node, seen = []) => {
-          const nodes = get(this.connections(node.id));
-          const obj = {
-            id: node.id.length > 32 ? `${node.id.slice(0, 32)}...` : node.id,
-            type: node.type
-          };
-          if (node.properties.label) {
-            obj.label = node.properties.label;
-          }
-          if (nodes.length) {
-            obj.nodes = nodes.map((n) => {
-              const nextSeen = [
-                ...seen,
-                node.id
-              ];
-              return nextSeen.includes(n.id) ? void 0 : toJSON(n, nextSeen);
-            }).filter(isNonNullable);
-          }
-          return obj;
+  });
+  _edges = Rx.family((id) => {
+    const initial = Record.get(this._initialEdges, id).pipe(Option.getOrElse(() => ({
+      inbound: [],
+      outbound: []
+    })));
+    return Rx.make(initial).pipe(Rx.keepAlive, Rx.withLabel(`graph:edges:${id}`));
+  });
+  // NOTE: Currently the argument to the family needs to be referentially stable for the rx to be referentially stable.
+  // TODO(wittjosiah): Rx feature request, support for something akin to `ComplexMap` to allow for complex arguments.
+  _connections = Rx.family((key) => {
+    return Rx.make((get2) => {
+      const [id, relation] = key.split("$");
+      const edges = get2(this._edges(id));
+      return edges[relation].map((id2) => get2(this._node(id2))).filter(Option.isSome).map((o) => o.value);
+    }).pipe(Rx.withLabel(`graph:connections:${key}`));
+  });
+  _actions = Rx.family((id) => {
+    return Rx.make((get2) => {
+      return get2(this._connections(`${id}$outbound`)).filter((node) => node.type === ACTION_TYPE || node.type === ACTION_GROUP_TYPE);
+    }).pipe(Rx.withLabel(`graph:actions:${id}`));
+  });
+  _json = Rx.family((id) => {
+    return Rx.make((get2) => {
+      const toJSON = (node, seen = []) => {
+        const nodes = get2(this.connections(node.id));
+        const obj = {
+          id: node.id,
+          type: node.type
         };
-        const root = get(this.nodeOrThrow(id));
-        return toJSON(root);
-      }).pipe(Rx.withLabel(`graph:json:${id}`));
-    });
+        if (node.properties.label) {
+          obj.label = node.properties.label;
+        }
+        if (nodes.length) {
+          obj.nodes = nodes.map((n) => {
+            const nextSeen = [
+              ...seen,
+              node.id
+            ];
+            return nextSeen.includes(n.id) ? void 0 : toJSON(n, nextSeen);
+          }).filter(isNonNullable);
+        }
+        return obj;
+      };
+      const root = get2(this.nodeOrThrow(id));
+      return toJSON(root);
+    }).pipe(Rx.withLabel(`graph:json:${id}`));
+  });
+  constructor({ registry, nodes, edges, onInitialize, onExpand, onRemoveNode } = {}) {
     this._registry = registry ?? Registry.make();
+    this._onInitialize = onInitialize;
     this._onExpand = onExpand;
     this._onRemoveNode = onRemoveNode;
     if (nodes) {
@@ -164,15 +171,22 @@ var Graph = class {
   getEdges(id) {
     return this._registry.get(this.edges(id));
   }
-  // TODO(wittjosiah): On initialize to restore state from cache.
-  // async initialize(id: string) {
-  //   const initialized = Record.get(this._initialized, id).pipe(Option.getOrElse(() => false));
-  //   log('initialize', { id, initialized });
-  //   if (!initialized) {
-  //     await this._onInitialize?.(id);
-  //     Record.set(this._initialized, id, true);
-  //   }
-  // }
+  async initialize(id) {
+    const initialized = Record.get(this._initialized, id).pipe(Option.getOrElse(() => false));
+    log("initialize", {
+      id,
+      initialized
+    }, {
+      F: __dxlog_file,
+      L: 386,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (!initialized) {
+      await this._onInitialize?.(id);
+      Record.set(this._initialized, id, true);
+    }
+  }
   expand(id, relation = "outbound") {
     const key = `${id}$${relation}`;
     const expanded = Record.get(this._expanded, key).pipe(Option.getOrElse(() => false));
@@ -181,7 +195,7 @@ var Graph = class {
       expanded
     }, {
       F: __dxlog_file,
-      L: 395,
+      L: 396,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -211,7 +225,7 @@ var Graph = class {
           propertiesChanged
         }, {
           F: __dxlog_file,
-          L: 417,
+          L: 418,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -223,7 +237,7 @@ var Graph = class {
             properties
           }, {
             F: __dxlog_file,
-            L: 419,
+            L: 420,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -251,7 +265,7 @@ var Graph = class {
           properties
         }, {
           F: __dxlog_file,
-          L: 426,
+          L: 427,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -322,7 +336,7 @@ var Graph = class {
         target: edgeArg.target
       }, {
         F: __dxlog_file,
-        L: 481,
+        L: 482,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -342,7 +356,7 @@ var Graph = class {
         target: edgeArg.target
       }, {
         F: __dxlog_file,
-        L: 488,
+        L: 489,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -425,7 +439,7 @@ var Graph = class {
     ]));
   }
   getPath({ source = "root", target }) {
-    return pipe(this.getNode(source), Option.flatMap((node) => {
+    return Function.pipe(this.getNode(source), Option.flatMap((node) => {
       let found = Option.none();
       this.traverse({
         source: node.id,
@@ -471,41 +485,49 @@ var Graph = class {
 // src/graph-builder.ts
 import { Registry as Registry2, Rx as Rx2 } from "@effect-rx/rx-react";
 import { effect } from "@preact/signals-core";
-import { Array, pipe as pipe2, Record as Record2 } from "effect";
+import * as Array from "effect/Array";
+import * as Function2 from "effect/Function";
+import * as Option2 from "effect/Option";
+import * as Record2 from "effect/Record";
 import { log as log2 } from "@dxos/log";
 import { byPosition, getDebugName, isNode, isNonNullable as isNonNullable2 } from "@dxos/util";
 
 // src/node.ts
 var isGraphNode = (data) => data && typeof data === "object" && "id" in data && "properties" in data && data.properties ? typeof data.properties === "object" && "data" in data : false;
-var isAction = (data) => isGraphNode(data) ? typeof data.data === "function" : false;
+var isAction = (data) => isGraphNode(data) ? typeof data.data === "function" && data.type === ACTION_TYPE : false;
 var actionGroupSymbol = Symbol("ActionGroup");
-var isActionGroup = (data) => isGraphNode(data) ? data.data === actionGroupSymbol : false;
+var isActionGroup = (data) => isGraphNode(data) ? data.data === actionGroupSymbol && data.type === ACTION_GROUP_TYPE : false;
 var isActionLike = (data) => isAction(data) || isActionGroup(data);
 
 // src/graph-builder.ts
 var __dxlog_file2 = "/__w/dxos/dxos/packages/sdk/app-graph/src/graph-builder.ts";
 var createExtension = (extension) => {
-  const { id, position = "static", relation = "outbound", connector: _connector, actions: _actions, actionGroups: _actionGroups } = extension;
+  const { id, position = "static", relation = "outbound", resolver: _resolver, connector: _connector, actions: _actions, actionGroups: _actionGroups } = extension;
   const getId = (key) => `${id}/${key}`;
+  const resolver = _resolver && Rx2.family((id2) => _resolver(id2).pipe(Rx2.withLabel(`graph-builder:_resolver:${id2}`)));
   const connector = _connector && Rx2.family((node) => _connector(node).pipe(Rx2.withLabel(`graph-builder:_connector:${id}`)));
   const actionGroups = _actionGroups && Rx2.family((node) => _actionGroups(node).pipe(Rx2.withLabel(`graph-builder:_actionGroups:${id}`)));
   const actions = _actions && Rx2.family((node) => _actions(node).pipe(Rx2.withLabel(`graph-builder:_actions:${id}`)));
   return [
-    // resolver ? { id: getId('resolver'), position, resolver } : undefined,
+    resolver ? {
+      id: getId("resolver"),
+      position,
+      resolver
+    } : void 0,
     connector ? {
       id: getId("connector"),
       position,
       relation,
-      connector: Rx2.family((node) => Rx2.make((get) => {
+      connector: Rx2.family((node) => Rx2.make((get2) => {
         try {
-          return get(connector(node));
+          return get2(connector(node));
         } catch {
           log2.warn("Error in connector", {
             id: getId("connector"),
             node
           }, {
             F: __dxlog_file2,
-            L: 101,
+            L: 112,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -517,9 +539,9 @@ var createExtension = (extension) => {
       id: getId("actionGroups"),
       position,
       relation: "outbound",
-      connector: Rx2.family((node) => Rx2.make((get) => {
+      connector: Rx2.family((node) => Rx2.make((get2) => {
         try {
-          return get(actionGroups(node)).map((arg) => ({
+          return get2(actionGroups(node)).map((arg) => ({
             ...arg,
             data: actionGroupSymbol,
             type: ACTION_GROUP_TYPE
@@ -530,7 +552,7 @@ var createExtension = (extension) => {
             node
           }, {
             F: __dxlog_file2,
-            L: 122,
+            L: 133,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -542,9 +564,9 @@ var createExtension = (extension) => {
       id: getId("actions"),
       position,
       relation: "outbound",
-      connector: Rx2.family((node) => Rx2.make((get) => {
+      connector: Rx2.family((node) => Rx2.make((get2) => {
         try {
-          return get(actions(node)).map((arg) => ({
+          return get2(actions(node)).map((arg) => ({
             ...arg,
             type: ACTION_TYPE
           }));
@@ -554,7 +576,7 @@ var createExtension = (extension) => {
             node
           }, {
             F: __dxlog_file2,
-            L: 139,
+            L: 150,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -578,32 +600,19 @@ var flattenExtensions = (extension, acc = []) => {
   }
 };
 var GraphBuilder = class _GraphBuilder {
+  // TODO(wittjosiah): Use Context.
+  _subscriptions = /* @__PURE__ */ new Map();
+  _extensions = Rx2.make(Record2.empty()).pipe(Rx2.keepAlive, Rx2.withLabel("graph-builder:extensions"));
+  _initialized = {};
+  _registry;
+  _graph;
   constructor({ registry, ...params } = {}) {
-    // TODO(wittjosiah): Use Context.
-    this._connectorSubscriptions = /* @__PURE__ */ new Map();
-    this._extensions = Rx2.make(Record2.empty()).pipe(Rx2.keepAlive, Rx2.withLabel("graph-builder:extensions"));
-    this._connectors = Rx2.family((key) => {
-      return Rx2.make((get) => {
-        const [id, relation] = key.split("+");
-        const node = this._graph.node(id);
-        return pipe2(
-          get(this._extensions),
-          Record2.values,
-          // TODO(wittjosiah): Sort on write rather than read.
-          Array.sortBy(byPosition),
-          Array.filter(({ relation: _relation = "outbound" }) => _relation === relation),
-          Array.map(({ connector }) => connector?.(node)),
-          Array.filter(isNonNullable2),
-          Array.flatMap((result) => get(result))
-        );
-      }).pipe(Rx2.withLabel(`graph-builder:connectors:${key}`));
-    });
     this._registry = registry ?? Registry2.make();
     this._graph = new Graph({
       ...params,
       registry: this._registry,
       onExpand: (id, relation) => this._onExpand(id, relation),
-      // onInitialize: (id) => this._onInitialize(id),
+      onInitialize: (id) => this._onInitialize(id),
       onRemoveNode: (id) => this._onRemoveNode(id)
     });
   }
@@ -673,9 +682,30 @@ var GraphBuilder = class _GraphBuilder {
     }
   }
   destroy() {
-    this._connectorSubscriptions.forEach((unsubscribe) => unsubscribe());
-    this._connectorSubscriptions.clear();
+    this._subscriptions.forEach((unsubscribe) => unsubscribe());
+    this._subscriptions.clear();
   }
+  _resolvers = Rx2.family((id) => {
+    return Rx2.make((get2) => {
+      return Function2.pipe(get2(this._extensions), Record2.values, Array.sortBy(byPosition), Array.map(({ resolver }) => resolver), Array.filter(isNonNullable2), Array.map((resolver) => get2(resolver(id))), Array.filter(isNonNullable2), Array.head);
+    });
+  });
+  _connectors = Rx2.family((key) => {
+    return Rx2.make((get2) => {
+      const [id, relation] = key.split("+");
+      const node = this._graph.node(id);
+      return Function2.pipe(
+        get2(this._extensions),
+        Record2.values,
+        // TODO(wittjosiah): Sort on write rather than read.
+        Array.sortBy(byPosition),
+        Array.filter(({ relation: _relation = "outbound" }) => _relation === relation),
+        Array.map(({ connector }) => connector?.(node)),
+        Array.filter(isNonNullable2),
+        Array.flatMap((result) => get2(result))
+      );
+    }).pipe(Rx2.withLabel(`graph-builder:connectors:${key}`));
+  });
   _onExpand(id, relation) {
     log2("onExpand", {
       id,
@@ -683,7 +713,7 @@ var GraphBuilder = class _GraphBuilder {
       registry: getDebugName(this._registry)
     }, {
       F: __dxlog_file2,
-      L: 301,
+      L: 327,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -700,7 +730,7 @@ var GraphBuilder = class _GraphBuilder {
         removed
       }, {
         F: __dxlog_file2,
-        L: 312,
+        L: 338,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -729,30 +759,58 @@ var GraphBuilder = class _GraphBuilder {
     }, {
       immediate: true
     });
-    this._connectorSubscriptions.set(id, cancel);
+    this._subscriptions.set(id, cancel);
+  }
+  // TODO(wittjosiah): If the same node is added by a connector, the resolver should probably cancel itself?
+  async _onInitialize(id) {
+    log2("onInitialize", {
+      id
+    }, {
+      F: __dxlog_file2,
+      L: 375,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const resolver = this._resolvers(id);
+    const cancel = this._registry.subscribe(resolver, (node) => {
+      const trigger = this._initialized[id];
+      Option2.match(node, {
+        onSome: (node2) => {
+          this._graph.addNodes([
+            node2
+          ]);
+          trigger?.wake();
+        },
+        onNone: () => {
+          trigger?.wake();
+          this._graph.removeNodes([
+            id
+          ]);
+        }
+      });
+    }, {
+      immediate: true
+    });
+    this._subscriptions.set(id, cancel);
   }
-  // TODO(wittjosiah): On initialize to restore state from cache.
-  // private async _onInitialize(id: string) {
-  //   log('onInitialize', { id });
-  // }
   _onRemoveNode(id) {
-    this._connectorSubscriptions.get(id)?.();
-    this._connectorSubscriptions.delete(id);
+    this._subscriptions.get(id)?.();
+    this._subscriptions.delete(id);
   }
 };
 var rxFromSignal = (cb) => {
-  return Rx2.make((get) => {
+  return Rx2.make((get2) => {
     const dispose = effect(() => {
-      get.setSelf(cb());
+      get2.setSelf(cb());
     });
-    get.addFinalizer(() => dispose());
+    get2.addFinalizer(() => dispose());
     return cb();
   });
 };
 var observableFamily = Rx2.family((observable) => {
-  return Rx2.make((get) => {
-    const subscription = observable.subscribe((value) => get.setSelf(value));
-    get.addFinalizer(() => subscription.unsubscribe());
+  return Rx2.make((get2) => {
+    const subscription = observable.subscribe((value) => get2.setSelf(value));
+    get2.addFinalizer(() => subscription.unsubscribe());
     return observable.get();
   });
 });