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

package/dist/lib/browser/index.mjs

@@ -1,5 +1,5 @@
 // src/graph.ts
-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 * as Record from "effect/Record";
@@ -8,26 +8,13 @@ import { todo } from "@dxos/debug";
 import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file = "/__w/dxos/dxos/packages/sdk/app-graph/src/graph.ts";
 var graphSymbol = Symbol("graph");
 var getGraph = (node) => {
   const graph = node[graphSymbol];
   invariant(graph, "Node is not associated with a graph.", {
     F: __dxlog_file,
-    L: 27,
+    L: 29,
     S: void 0,
     A: [
       "graph",
@@ -41,6 +28,108 @@ 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 {
+  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 = Atom.family((id) => {
+    const initial = Option.flatten(Record.get(this._initialNodes, id));
+    return Atom.make(initial).pipe(Atom.keepAlive, Atom.withLabel(`graph:node:${id}`));
+  });
+  _nodeOrThrow = Atom.family((id) => {
+    return Atom.make((get2) => {
+      const node = get2(this._node(id));
+      invariant(Option.isSome(node), `Node not available: ${id}`, {
+        F: __dxlog_file,
+        L: 267,
+        S: this,
+        A: [
+          "Option.isSome(node)",
+          "`Node not available: ${id}`"
+        ]
+      });
+      return node.value;
+    });
+  });
+  _edges = Atom.family((id) => {
+    const initial = Record.get(this._initialEdges, id).pipe(Option.getOrElse(() => ({
+      inbound: [],
+      outbound: []
+    })));
+    return Atom.make(initial).pipe(Atom.keepAlive, Atom.withLabel(`graph:edges:${id}`));
+  });
+  // NOTE: Currently the argument to the family needs to be referentially stable for the atom to be referentially stable.
+  // TODO(wittjosiah): Atom feature request, support for something akin to `ComplexMap` to allow for complex arguments.
+  _connections = Atom.family((key) => {
+    return Atom.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(Atom.withLabel(`graph:connections:${key}`));
+  });
+  _actions = Atom.family((id) => {
+    return Atom.make((get2) => {
+      return get2(this._connections(`${id}$outbound`)).filter((node) => node.type === ACTION_TYPE || node.type === ACTION_GROUP_TYPE);
+    }).pipe(Atom.withLabel(`graph:actions:${id}`));
+  });
+  _json = Atom.family((id) => {
+    return Atom.make((get2) => {
+      const toJSON = (node, seen = []) => {
+        const nodes = get2(this.connections(node.id));
+        const obj = {
+          id: 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;
+      };
+      const root = get2(this.nodeOrThrow(id));
+      return toJSON(root);
+    }).pipe(Atom.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) {
+      nodes.forEach((node) => {
+        Record.set(this._initialNodes, node.id, this._constructNode(node));
+      });
+    }
+    if (edges) {
+      Object.entries(edges).forEach(([source, edges2]) => {
+        Record.set(this._initialEdges, source, edges2);
+      });
+    }
+  }
   toJSON(id = ROOT_ID) {
     return this._registry.get(this._json(id));
   }
@@ -87,7 +176,7 @@ var Graph = class {
       initialized
     }, {
       F: __dxlog_file,
-      L: 386,
+      L: 399,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -104,7 +193,7 @@ var Graph = class {
       expanded
     }, {
       F: __dxlog_file,
-      L: 396,
+      L: 409,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -114,7 +203,7 @@ var Graph = class {
     }
   }
   addNodes(nodes) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       nodes.map((node) => this.addNode(node));
     });
   }
@@ -134,7 +223,7 @@ var Graph = class {
           propertiesChanged
         }, {
           F: __dxlog_file,
-          L: 418,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -146,7 +235,7 @@ var Graph = class {
             properties
           }, {
             F: __dxlog_file,
-            L: 420,
+            L: 438,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -174,7 +263,7 @@ var Graph = class {
           properties
         }, {
           F: __dxlog_file,
-          L: 427,
+          L: 450,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -204,7 +293,7 @@ var Graph = class {
     }
   }
   removeNodes(ids, edges = false) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       ids.map((id) => this.removeNode(id, edges));
     });
   }
@@ -232,7 +321,7 @@ var Graph = class {
     this._onRemoveNode?.(id);
   }
   addEdges(edges) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       edges.map((edge) => this.addEdge(edge));
     });
   }
@@ -245,7 +334,7 @@ var Graph = class {
         target: edgeArg.target
       }, {
         F: __dxlog_file,
-        L: 482,
+        L: 505,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -265,7 +354,7 @@ var Graph = class {
         target: edgeArg.target
       }, {
         F: __dxlog_file,
-        L: 489,
+        L: 518,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -279,7 +368,7 @@ var Graph = class {
     }
   }
   removeEdges(edges, removeOrphans = false) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       edges.map((edge) => this.removeEdge(edge, removeOrphans));
     });
   }
@@ -389,109 +478,10 @@ var Graph = class {
       ...node
     });
   }
-  constructor({ registry, nodes, edges, onInitialize, onExpand, onRemoveNode } = {}) {
-    _define_property(this, "onNodeChanged", new Event());
-    _define_property(this, "_onExpand", void 0);
-    _define_property(this, "_onInitialize", void 0);
-    _define_property(this, "_onRemoveNode", void 0);
-    _define_property(this, "_registry", void 0);
-    _define_property(this, "_expanded", Record.empty());
-    _define_property(this, "_initialized", Record.empty());
-    _define_property(this, "_initialEdges", Record.empty());
-    _define_property(this, "_initialNodes", Record.fromEntries([
-      [
-        ROOT_ID,
-        this._constructNode({
-          id: ROOT_ID,
-          type: ROOT_TYPE,
-          data: null,
-          properties: {}
-        })
-      ]
-    ]));
-    _define_property(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}`));
-    }));
-    _define_property(this, "_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;
-      });
-    }));
-    _define_property(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}`));
-    }));
-    _define_property(this, "_connections", Rx.family((key) => {
-      return Rx.make((get2) => {
-        const [id, relation] = key.split("$");
-        const edges2 = get2(this._edges(id));
-        return edges2[relation].map((id2) => get2(this._node(id2))).filter(Option.isSome).map((o) => o.value);
-      }).pipe(Rx.withLabel(`graph:connections:${key}`));
-    }));
-    _define_property(this, "_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}`));
-    }));
-    _define_property(this, "_json", Rx.family((id) => {
-      return Rx.make((get2) => {
-        const toJSON = (node, seen = []) => {
-          const nodes2 = get2(this.connections(node.id));
-          const obj = {
-            id: node.id,
-            type: node.type
-          };
-          if (node.properties.label) {
-            obj.label = node.properties.label;
-          }
-          if (nodes2.length) {
-            obj.nodes = nodes2.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}`));
-    }));
-    this._registry = registry ?? Registry.make();
-    this._onInitialize = onInitialize;
-    this._onExpand = onExpand;
-    this._onRemoveNode = onRemoveNode;
-    if (nodes) {
-      nodes.forEach((node) => {
-        Record.set(this._initialNodes, node.id, this._constructNode(node));
-      });
-    }
-    if (edges) {
-      Object.entries(edges).forEach(([source, edges2]) => {
-        Record.set(this._initialEdges, source, edges2);
-      });
-    }
-  }
 };
 
 // src/graph-builder.ts
-import { Registry as Registry2, Rx as Rx2 } from "@effect-rx/rx-react";
+import { Atom as Atom2, Registry as Registry2 } from "@effect-atom/atom-react";
 import { effect } from "@preact/signals-core";
 import * as Array from "effect/Array";
 import * as Function2 from "effect/Function";
@@ -508,27 +498,14 @@ var isActionGroup = (data) => isGraphNode(data) ? data.data === actionGroupSymbo
 var isActionLike = (data) => isAction(data) || isActionGroup(data);
 
 // src/graph-builder.ts
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file2 = "/__w/dxos/dxos/packages/sdk/app-graph/src/graph-builder.ts";
 var createExtension = (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}`)));
+  const resolver = _resolver && Atom2.family((id2) => _resolver(id2).pipe(Atom2.withLabel(`graph-builder:_resolver:${id2}`)));
+  const connector = _connector && Atom2.family((node) => _connector(node).pipe(Atom2.withLabel(`graph-builder:_connector:${id}`)));
+  const actionGroups = _actionGroups && Atom2.family((node) => _actionGroups(node).pipe(Atom2.withLabel(`graph-builder:_actionGroups:${id}`)));
+  const actions = _actions && Atom2.family((node) => _actions(node).pipe(Atom2.withLabel(`graph-builder:_actions:${id}`)));
   return [
     resolver ? {
       id: getId("resolver"),
@@ -539,7 +516,7 @@ var createExtension = (extension) => {
       id: getId("connector"),
       position,
       relation,
-      connector: Rx2.family((node) => Rx2.make((get2) => {
+      connector: Atom2.family((node) => Atom2.make((get2) => {
         try {
           return get2(connector(node));
         } catch {
@@ -548,19 +525,19 @@ var createExtension = (extension) => {
             node
           }, {
             F: __dxlog_file2,
-            L: 112,
+            L: 114,
             S: void 0,
             C: (f, a) => f(...a)
           });
           return [];
         }
-      }).pipe(Rx2.withLabel(`graph-builder:connector:${id}`)))
+      }).pipe(Atom2.withLabel(`graph-builder:connector:${id}`)))
     } : void 0,
     actionGroups ? {
       id: getId("actionGroups"),
       position,
       relation: "outbound",
-      connector: Rx2.family((node) => Rx2.make((get2) => {
+      connector: Atom2.family((node) => Atom2.make((get2) => {
         try {
           return get2(actionGroups(node)).map((arg) => ({
             ...arg,
@@ -573,19 +550,19 @@ var createExtension = (extension) => {
             node
           }, {
             F: __dxlog_file2,
-            L: 133,
+            L: 135,
             S: void 0,
             C: (f, a) => f(...a)
           });
           return [];
         }
-      }).pipe(Rx2.withLabel(`graph-builder:connector:actionGroups:${id}`)))
+      }).pipe(Atom2.withLabel(`graph-builder:connector:actionGroups:${id}`)))
     } : void 0,
     actions ? {
       id: getId("actions"),
       position,
       relation: "outbound",
-      connector: Rx2.family((node) => Rx2.make((get2) => {
+      connector: Atom2.family((node) => Atom2.make((get2) => {
         try {
           return get2(actions(node)).map((arg) => ({
             ...arg,
@@ -597,13 +574,13 @@ var createExtension = (extension) => {
             node
           }, {
             F: __dxlog_file2,
-            L: 150,
+            L: 152,
             S: void 0,
             C: (f, a) => f(...a)
           });
           return [];
         }
-      }).pipe(Rx2.withLabel(`graph-builder:connector:actions:${id}`)))
+      }).pipe(Atom2.withLabel(`graph-builder:connector:actions:${id}`)))
     } : void 0
   ].filter(isNonNullable2);
 };
@@ -621,6 +598,22 @@ var flattenExtensions = (extension, acc = []) => {
   }
 };
 var GraphBuilder = class _GraphBuilder {
+  // TODO(wittjosiah): Use Context.
+  _subscriptions = /* @__PURE__ */ new Map();
+  _extensions = Atom2.make(Record2.empty()).pipe(Atom2.keepAlive, Atom2.withLabel("graph-builder:extensions"));
+  _initialized = {};
+  _registry;
+  _graph;
+  constructor({ registry, ...params } = {}) {
+    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),
+      onRemoveNode: (id) => this._onRemoveNode(id)
+    });
+  }
   static from(pickle, registry) {
     if (!pickle) {
       return new _GraphBuilder({
@@ -690,6 +683,27 @@ var GraphBuilder = class _GraphBuilder {
     this._subscriptions.forEach((unsubscribe) => unsubscribe());
     this._subscriptions.clear();
   }
+  _resolvers = Atom2.family((id) => {
+    return Atom2.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 = Atom2.family((key) => {
+    return Atom2.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(Atom2.withLabel(`graph-builder:connectors:${key}`));
+  });
   _onExpand(id, relation) {
     log2("onExpand", {
       id,
@@ -697,7 +711,7 @@ var GraphBuilder = class _GraphBuilder {
       registry: getDebugName(this._registry)
     }, {
       F: __dxlog_file2,
-      L: 327,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -714,12 +728,12 @@ var GraphBuilder = class _GraphBuilder {
         removed
       }, {
         F: __dxlog_file2,
-        L: 338,
+        L: 340,
         S: this,
         C: (f, a) => f(...a)
       });
       const update = () => {
-        Rx2.batch(() => {
+        Atom2.batch(() => {
           this._graph.removeEdges(removed.map((target) => ({
             source: id,
             target
@@ -751,7 +765,7 @@ var GraphBuilder = class _GraphBuilder {
       id
     }, {
       F: __dxlog_file2,
-      L: 375,
+      L: 377,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -781,45 +795,9 @@ var GraphBuilder = class _GraphBuilder {
     this._subscriptions.get(id)?.();
     this._subscriptions.delete(id);
   }
-  constructor({ registry, ...params } = {}) {
-    _define_property2(this, "_subscriptions", /* @__PURE__ */ new Map());
-    _define_property2(this, "_extensions", Rx2.make(Record2.empty()).pipe(Rx2.keepAlive, Rx2.withLabel("graph-builder:extensions")));
-    _define_property2(this, "_initialized", {});
-    _define_property2(this, "_registry", void 0);
-    _define_property2(this, "_graph", void 0);
-    _define_property2(this, "_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);
-      });
-    }));
-    _define_property2(this, "_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}`));
-    }));
-    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),
-      onRemoveNode: (id) => this._onRemoveNode(id)
-    });
-  }
 };
 var rxFromSignal = (cb) => {
-  return Rx2.make((get2) => {
+  return Atom2.make((get2) => {
     const dispose = effect(() => {
       get2.setSelf(cb());
     });
@@ -827,8 +805,8 @@ var rxFromSignal = (cb) => {
     return cb();
   });
 };
-var observableFamily = Rx2.family((observable) => {
-  return Rx2.make((get2) => {
+var observableFamily = Atom2.family((observable) => {
+  return Atom2.make((get2) => {
     const subscription = observable.subscribe((value) => get2.setSelf(value));
     get2.addFinalizer(() => subscription.unsubscribe());
     return observable.get();