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

package/dist/lib/browser/index.mjs

@@ -1,6 +1,8 @@
 // src/graph.ts
-import { Registry, Rx } from "@effect-rx/rx-react";
-import { Option, Record, pipe } from "effect";
+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";
 import { Event, Trigger } from "@dxos/async";
 import { todo } from "@dxos/debug";
 import { invariant } from "@dxos/invariant";
@@ -12,7 +14,7 @@ var getGraph = (node) => {
   const graph = node[graphSymbol];
   invariant(graph, "Node is not associated with a graph.", {
     F: __dxlog_file,
-    L: 25,
+    L: 29,
     S: void 0,
     A: [
       "graph",
@@ -46,16 +48,16 @@ var Graph = class {
     ]
   ]);
   /** @internal */
-  _node = Rx.family((id) => {
+  _node = Atom.family((id) => {
     const initial = Option.flatten(Record.get(this._initialNodes, id));
-    return Rx.make(initial).pipe(Rx.keepAlive, Rx.withLabel(`graph:node:${id}`));
+    return Atom.make(initial).pipe(Atom.keepAlive, Atom.withLabel(`graph:node:${id}`));
   });
-  _nodeOrThrow = Rx.family((id) => {
-    return Rx.make((get) => {
-      const node = get(this._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: 252,
+        L: 267,
         S: this,
         A: [
           "Option.isSome(node)",
@@ -65,33 +67,33 @@ var Graph = class {
       return node.value;
     });
   });
-  _edges = Rx.family((id) => {
+  _edges = Atom.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}`));
+    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 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((get) => {
+  // 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 = 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}`));
+      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 = 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}`));
+  _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 = Rx.family((id) => {
-    return Rx.make((get) => {
+  _json = Atom.family((id) => {
+    return Atom.make((get2) => {
       const toJSON = (node, seen = []) => {
-        const nodes = get(this.connections(node.id));
+        const nodes = get2(this.connections(node.id));
         const obj = {
-          id: node.id.length > 32 ? `${node.id.slice(0, 32)}...` : node.id,
+          id: node.id,
           type: node.type
         };
         if (node.properties.label) {
@@ -108,9 +110,9 @@ var Graph = class {
         }
         return obj;
       };
-      const root = get(this.nodeOrThrow(id));
+      const root = get2(this.nodeOrThrow(id));
       return toJSON(root);
-    }).pipe(Rx.withLabel(`graph:json:${id}`));
+    }).pipe(Atom.withLabel(`graph:json:${id}`));
   });
   constructor({ registry, nodes, edges, onInitialize, onExpand, onRemoveNode } = {}) {
     this._registry = registry ?? Registry.make();
@@ -174,7 +176,7 @@ var Graph = class {
       initialized
     }, {
       F: __dxlog_file,
-      L: 384,
+      L: 399,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -191,7 +193,7 @@ var Graph = class {
       expanded
     }, {
       F: __dxlog_file,
-      L: 394,
+      L: 409,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -201,14 +203,14 @@ var Graph = class {
     }
   }
   addNodes(nodes) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       nodes.map((node) => this.addNode(node));
     });
   }
   addNode({ nodes, edges, ...nodeArg }) {
     const { id, type, data = null, properties = {} } = nodeArg;
-    const nodeRx = this._node(id);
-    const node = this._registry.get(nodeRx);
+    const nodeAtom = this._node(id);
+    const node = this._registry.get(nodeAtom);
     Option.match(node, {
       onSome: (node2) => {
         const typeChanged = node2.type !== type;
@@ -221,7 +223,7 @@ var Graph = class {
           propertiesChanged
         }, {
           F: __dxlog_file,
-          L: 416,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -233,7 +235,7 @@ var Graph = class {
             properties
           }, {
             F: __dxlog_file,
-            L: 418,
+            L: 438,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -246,7 +248,7 @@ var Graph = class {
               ...properties
             }
           });
-          this._registry.set(nodeRx, newNode);
+          this._registry.set(nodeAtom, newNode);
           this.onNodeChanged.emit({
             id,
             node: newNode
@@ -261,7 +263,7 @@ var Graph = class {
           properties
         }, {
           F: __dxlog_file,
-          L: 425,
+          L: 450,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -271,7 +273,7 @@ var Graph = class {
           data,
           properties
         });
-        this._registry.set(nodeRx, newNode);
+        this._registry.set(nodeAtom, newNode);
         this.onNodeChanged.emit({
           id,
           node: newNode
@@ -291,13 +293,13 @@ var Graph = class {
     }
   }
   removeNodes(ids, edges = false) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       ids.map((id) => this.removeNode(id, edges));
     });
   }
   removeNode(id, edges = false) {
-    const nodeRx = this._node(id);
-    this._registry.set(nodeRx, Option.none());
+    const nodeAtom = this._node(id);
+    this._registry.set(nodeAtom, Option.none());
     this.onNodeChanged.emit({
       id,
       node: Option.none()
@@ -319,24 +321,24 @@ var Graph = class {
     this._onRemoveNode?.(id);
   }
   addEdges(edges) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       edges.map((edge) => this.addEdge(edge));
     });
   }
   addEdge(edgeArg) {
-    const sourceRx = this._edges(edgeArg.source);
-    const source = this._registry.get(sourceRx);
+    const sourceAtom = this._edges(edgeArg.source);
+    const source = this._registry.get(sourceAtom);
     if (!source.outbound.includes(edgeArg.target)) {
       log("add outbound edge", {
         source: edgeArg.source,
         target: edgeArg.target
       }, {
         F: __dxlog_file,
-        L: 480,
+        L: 505,
         S: this,
         C: (f, a) => f(...a)
       });
-      this._registry.set(sourceRx, {
+      this._registry.set(sourceAtom, {
         inbound: source.inbound,
         outbound: [
           ...source.outbound,
@@ -344,19 +346,19 @@ var Graph = class {
         ]
       });
     }
-    const targetRx = this._edges(edgeArg.target);
-    const target = this._registry.get(targetRx);
+    const targetAtom = this._edges(edgeArg.target);
+    const target = this._registry.get(targetAtom);
     if (!target.inbound.includes(edgeArg.source)) {
       log("add inbound edge", {
         source: edgeArg.source,
         target: edgeArg.target
       }, {
         F: __dxlog_file,
-        L: 487,
+        L: 518,
         S: this,
         C: (f, a) => f(...a)
       });
-      this._registry.set(targetRx, {
+      this._registry.set(targetAtom, {
         inbound: [
           ...target.inbound,
           edgeArg.source
@@ -366,30 +368,30 @@ var Graph = class {
     }
   }
   removeEdges(edges, removeOrphans = false) {
-    Rx.batch(() => {
+    Atom.batch(() => {
       edges.map((edge) => this.removeEdge(edge, removeOrphans));
     });
   }
   removeEdge(edgeArg, removeOrphans = false) {
-    const sourceRx = this._edges(edgeArg.source);
-    const source = this._registry.get(sourceRx);
+    const sourceAtom = this._edges(edgeArg.source);
+    const source = this._registry.get(sourceAtom);
     if (source.outbound.includes(edgeArg.target)) {
-      this._registry.set(sourceRx, {
+      this._registry.set(sourceAtom, {
         inbound: source.inbound,
         outbound: source.outbound.filter((id) => id !== edgeArg.target)
       });
     }
-    const targetRx = this._edges(edgeArg.target);
-    const target = this._registry.get(targetRx);
+    const targetAtom = this._edges(edgeArg.target);
+    const target = this._registry.get(targetAtom);
     if (target.inbound.includes(edgeArg.source)) {
-      this._registry.set(targetRx, {
+      this._registry.set(targetAtom, {
         inbound: target.inbound.filter((id) => id !== edgeArg.source),
         outbound: target.outbound
       });
     }
     if (removeOrphans) {
-      const source2 = this._registry.get(sourceRx);
-      const target2 = this._registry.get(targetRx);
+      const source2 = this._registry.get(sourceAtom);
+      const target2 = this._registry.get(targetAtom);
       if (source2.outbound.length === 0 && source2.inbound.length === 0 && edgeArg.source !== ROOT_ID) {
         this.removeNodes([
           edgeArg.source
@@ -403,15 +405,15 @@ var Graph = class {
     }
   }
   sortEdges(id, relation, order) {
-    const edgesRx = this._edges(id);
-    const edges = this._registry.get(edgesRx);
+    const edgesAtom = this._edges(id);
+    const edges = this._registry.get(edgesAtom);
     const unsorted = edges[relation].filter((id2) => !order.includes(id2)) ?? [];
     const sorted = order.filter((id2) => edges[relation].includes(id2)) ?? [];
     edges[relation].splice(0, edges[relation].length, ...[
       ...sorted,
       ...unsorted
     ]);
-    this._registry.set(edgesRx, edges);
+    this._registry.set(edgesAtom, edges);
   }
   traverse({ visitor, source = ROOT_ID, relation = "outbound" }, path = []) {
     if (path.includes(source)) {
@@ -435,7 +437,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,
@@ -479,9 +481,12 @@ var Graph = class {
 };
 
 // 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 { Array, Option as Option2, Record as Record2, pipe as pipe2 } 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";
 
@@ -497,10 +502,10 @@ 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"),
@@ -511,30 +516,30 @@ var createExtension = (extension) => {
       id: getId("connector"),
       position,
       relation,
-      connector: Rx2.family((node) => Rx2.make((get) => {
+      connector: Atom2.family((node) => Atom2.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: 109,
+            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((get) => {
+      connector: Atom2.family((node) => Atom2.make((get2) => {
         try {
-          return get(actionGroups(node)).map((arg) => ({
+          return get2(actionGroups(node)).map((arg) => ({
             ...arg,
             data: actionGroupSymbol,
             type: ACTION_GROUP_TYPE
@@ -545,21 +550,21 @@ var createExtension = (extension) => {
             node
           }, {
             F: __dxlog_file2,
-            L: 130,
+            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((get) => {
+      connector: Atom2.family((node) => Atom2.make((get2) => {
         try {
-          return get(actions(node)).map((arg) => ({
+          return get2(actions(node)).map((arg) => ({
             ...arg,
             type: ACTION_TYPE
           }));
@@ -569,13 +574,13 @@ var createExtension = (extension) => {
             node
           }, {
             F: __dxlog_file2,
-            L: 147,
+            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);
 };
@@ -595,7 +600,7 @@ 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"));
+  _extensions = Atom2.make(Record2.empty()).pipe(Atom2.keepAlive, Atom2.withLabel("graph-builder:extensions"));
   _initialized = {};
   _registry;
   _graph;
@@ -678,26 +683,26 @@ var GraphBuilder = class _GraphBuilder {
     this._subscriptions.forEach((unsubscribe) => unsubscribe());
     this._subscriptions.clear();
   }
-  _resolvers = Rx2.family((id) => {
-    return Rx2.make((get) => {
-      return pipe2(get(this._extensions), Record2.values, Array.sortBy(byPosition), Array.map(({ resolver }) => resolver), Array.filter(isNonNullable2), Array.map((resolver) => get(resolver(id))), Array.filter(isNonNullable2), Array.head);
+  _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 = Rx2.family((key) => {
-    return Rx2.make((get) => {
+  _connectors = Atom2.family((key) => {
+    return Atom2.make((get2) => {
       const [id, relation] = key.split("+");
       const node = this._graph.node(id);
-      return pipe2(
-        get(this._extensions),
+      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) => get(result))
+        Array.flatMap((result) => get2(result))
       );
-    }).pipe(Rx2.withLabel(`graph-builder:connectors:${key}`));
+    }).pipe(Atom2.withLabel(`graph-builder:connectors:${key}`));
   });
   _onExpand(id, relation) {
     log2("onExpand", {
@@ -706,7 +711,7 @@ var GraphBuilder = class _GraphBuilder {
       registry: getDebugName(this._registry)
     }, {
       F: __dxlog_file2,
-      L: 324,
+      L: 329,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -723,12 +728,12 @@ var GraphBuilder = class _GraphBuilder {
         removed
       }, {
         F: __dxlog_file2,
-        L: 335,
+        L: 340,
         S: this,
         C: (f, a) => f(...a)
       });
       const update = () => {
-        Rx2.batch(() => {
+        Atom2.batch(() => {
           this._graph.removeEdges(removed.map((target) => ({
             source: id,
             target
@@ -760,7 +765,7 @@ var GraphBuilder = class _GraphBuilder {
       id
     }, {
       F: __dxlog_file2,
-      L: 372,
+      L: 377,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -791,23 +796,23 @@ var GraphBuilder = class _GraphBuilder {
     this._subscriptions.delete(id);
   }
 };
-var rxFromSignal = (cb) => {
-  return Rx2.make((get) => {
+var atomFromSignal = (cb) => {
+  return Atom2.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());
+var observableFamily = Atom2.family((observable) => {
+  return Atom2.make((get2) => {
+    const subscription = observable.subscribe((value) => get2.setSelf(value));
+    get2.addFinalizer(() => subscription.unsubscribe());
     return observable.get();
   });
 });
-var rxFromObservable = (observable) => {
+var atomFromObservable = (observable) => {
   return observableFamily(observable);
 };
 export {
@@ -818,14 +823,14 @@ export {
   ROOT_ID,
   ROOT_TYPE,
   actionGroupSymbol,
+  atomFromObservable,
+  atomFromSignal,
   createExtension,
   flattenExtensions,
   getGraph,
   isAction,
   isActionGroup,
   isActionLike,
-  isGraphNode,
-  rxFromObservable,
-  rxFromSignal
+  isGraphNode
 };
 //# sourceMappingURL=index.mjs.map