@dxos/app-graph 0.8.4-main.c85a9c8dae → 0.8.4-main.d05673bc65

package/dist/lib/browser/index.mjs

@@ -59,7 +59,7 @@ import * as Pipeable from "effect/Pipeable";
 import * as Record from "effect/Record";
 import { Event, Trigger } from "@dxos/async";
 import { todo } from "@dxos/debug";
-import { invariant } from "@dxos/invariant";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { log } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
 
@@ -80,9 +80,9 @@ __export(node_exports, {
   relation: () => relation
 });
 var RootId = "root";
-var RootType = "dxos.org/type/GraphRoot";
-var ActionType = "dxos.org/type/GraphAction";
-var ActionGroupType = "dxos.org/type/GraphActionGroup";
+var RootType = "org.dxos.type.graph-root";
+var ActionType = "org.dxos.type.graph-action";
+var ActionGroupType = "org.dxos.type.graph-action-group";
 var relation = (kind, direction = "outbound") => ({
   kind,
   direction
@@ -96,9 +96,12 @@ var isActionGroup = (data) => isGraphNode(data) ? data.data === actionGroupSymbo
 var isActionLike = (data) => isAction(data) || isActionGroup(data);
 
 // src/util.ts
+import { invariant } from "@dxos/invariant";
+var __dxlog_file = "/__w/dxos/dxos/packages/sdk/app-graph/src/util.ts";
 var Separators = {
   primary: "
",
-  secondary: ""
+  secondary: "",
+  path: "/"
 };
 var normalizeRelation = (relation2) => relation2 == null ? childRelation() : typeof relation2 === "string" ? relation(relation2) : relation2;
 var shallowEqual = (a, b) => {
@@ -120,14 +123,26 @@ var nodeArgsUnchanged = (prev, next) => {
     return prevNode.id === nextNode.id && prevNode.type === nextNode.type && shallowEqual(prevNode.data, nextNode.data) && shallowEqual(prevNode.properties, nextNode.properties);
   });
 };
+var qualifyId = (parentId, segmentId) => `${parentId}${Separators.path}${segmentId}`;
+var validateSegmentId = (id) => {
+  invariant(!id.includes(Separators.path), `Node segment ID must not contain '${Separators.path}': ${id}`, {
+    F: __dxlog_file,
+    L: 70,
+    S: void 0,
+    A: [
+      "!id.includes(Separators.path)",
+      "`Node segment ID must not contain '${Separators.path}': ${id}`"
+    ]
+  });
+};
 
 // src/graph.ts
-var __dxlog_file = "/__w/dxos/dxos/packages/sdk/app-graph/src/graph.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/sdk/app-graph/src/graph.ts";
 var graphSymbol = /* @__PURE__ */ Symbol("graph");
 var getGraph = (node) => {
   const graph = node[graphSymbol];
-  invariant(graph, "Node is not associated with a graph.", {
-    F: __dxlog_file,
+  invariant2(graph, "Node is not associated with a graph.", {
+    F: __dxlog_file2,
     L: 33,
     S: void 0,
     A: [
@@ -173,8 +188,8 @@ var GraphImpl = class {
   _nodeOrThrow = Atom2.family((id) => {
     return Atom2.make((get2) => {
       const node = get2(this._node(id));
-      invariant(Option.isSome(node), `Node not available: ${id}`, {
-        F: __dxlog_file,
+      invariant2(Option.isSome(node), `Node not available: ${id}`, {
+        F: __dxlog_file2,
         L: 172,
         S: this,
         A: [
@@ -193,6 +208,9 @@ var GraphImpl = class {
   // TODO(wittjosiah): Atom feature request, support for something akin to `ComplexMap` to allow for complex arguments.
   _connections = Atom2.family((key) => {
     return Atom2.make((get2) => {
+      if (!key || key.indexOf(Separators.primary) <= 0) {
+        return [];
+      }
       const { id, relation: relation2 } = relationFromConnectionKey(key);
       const edges = get2(this._edges(id));
       return (edges[relationKey(relation2)] ?? []).map((id2) => get2(this._node(id2))).filter(Option.isSome).map((o) => o.value);
@@ -200,6 +218,9 @@ var GraphImpl = class {
   });
   _actions = Atom2.family((id) => {
     return Atom2.make((get2) => {
+      if (!id) {
+        return [];
+      }
       return get2(this._connections(connectionKey(id, actionRelation())));
     }).pipe(Atom2.withLabel(`graph:actions:${id}`));
   });
@@ -345,9 +366,9 @@ function getConnections(graphOrId, idOrRelation, relation2) {
   } else {
     const graph = graphOrId;
     const id = idOrRelation;
-    invariant(relation2 !== void 0, "Relation is required.", {
-      F: __dxlog_file,
-      L: 440,
+    invariant2(relation2 !== void 0, "Relation is required.", {
+      F: __dxlog_file2,
+      L: 446,
       S: this,
       A: [
         "relation !== undefined",
@@ -397,14 +418,25 @@ var traverseImpl = (graph, options, path = []) => {
   if (shouldContinue === false) {
     return;
   }
-  Object.values(getConnections(graph, source, relation2)).forEach((child) => traverseImpl(graph, {
-    source: child.id,
-    relation: relation2,
-    visitor
-  }, [
-    ...path,
-    source
-  ]));
+  const relations = Array.isArray(relation2) ? relation2 : [
+    relation2
+  ];
+  const seen = /* @__PURE__ */ new Set();
+  for (const rel of relations) {
+    for (const connected of getConnections(graph, source, rel)) {
+      if (!seen.has(connected.id)) {
+        seen.add(connected.id);
+        traverseImpl(graph, {
+          source: connected.id,
+          relation: relation2,
+          visitor
+        }, [
+          ...path,
+          source
+        ]);
+      }
+    }
+  }
 };
 function traverse(graphOrOptions, optionsOrPath, path) {
   if (typeof graphOrOptions === "object" && "visitor" in graphOrOptions) {
@@ -480,8 +512,8 @@ var initializeImpl = async (graph, id) => {
     id,
     initialized
   }, {
-    F: __dxlog_file,
-    L: 655,
+    F: __dxlog_file2,
+    L: 668,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -511,8 +543,8 @@ var expandImpl = (graph, id, relation2) => {
       key,
       deferred: true
     }, {
-      F: __dxlog_file,
-      L: 701,
+      F: __dxlog_file2,
+      L: 714,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -523,8 +555,8 @@ var expandImpl = (graph, id, relation2) => {
     key,
     expanded
   }, {
-    F: __dxlog_file,
-    L: 706,
+    F: __dxlog_file2,
+    L: 719,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -542,9 +574,9 @@ function expand(graphOrId, idOrRelation, relation2) {
   } else {
     const graph = graphOrId;
     const id = idOrRelation;
-    invariant(relation2 !== void 0, "Relation is required.", {
-      F: __dxlog_file,
-      L: 742,
+    invariant2(relation2 !== void 0, "Relation is required.", {
+      F: __dxlog_file2,
+      L: 755,
       S: this,
       A: [
         "relation !== undefined",
@@ -620,8 +652,8 @@ var addNodeImpl = (graph, nodeArg) => {
         dataChanged,
         propertiesChanged
       }, {
-        F: __dxlog_file,
-        L: 864,
+        F: __dxlog_file2,
+        L: 877,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -632,8 +664,8 @@ var addNodeImpl = (graph, nodeArg) => {
           data,
           properties
         }, {
-          F: __dxlog_file,
-          L: 871,
+          F: __dxlog_file2,
+          L: 884,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -661,8 +693,8 @@ var addNodeImpl = (graph, nodeArg) => {
         data,
         properties
       }, {
-        F: __dxlog_file,
-        L: 884,
+        F: __dxlog_file2,
+        L: 897,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -808,8 +840,8 @@ var addEdgeImpl = (graph, edgeArg) => {
       target: edgeArg.target,
       relation: relationId
     }, {
-      F: __dxlog_file,
-      L: 1068,
+      F: __dxlog_file2,
+      L: 1081,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -830,8 +862,8 @@ var addEdgeImpl = (graph, edgeArg) => {
       target: edgeArg.target,
       relation: inverseId
     }, {
-      F: __dxlog_file,
-      L: 1076,
+      F: __dxlog_file2,
+      L: 1089,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -934,9 +966,9 @@ var relationKey = (relation2) => {
 };
 var relationFromKey = (encoded) => {
   const separatorIndex = encoded.lastIndexOf(Separators.secondary);
-  invariant(separatorIndex > 0 && separatorIndex < encoded.length - 1, `Invalid relation key: ${encoded}`, {
-    F: __dxlog_file,
-    L: 1221,
+  invariant2(separatorIndex > 0 && separatorIndex < encoded.length - 1, `Invalid relation key: ${encoded}`, {
+    F: __dxlog_file2,
+    L: 1234,
     S: void 0,
     A: [
       "separatorIndex > 0 && separatorIndex < encoded.length - 1",
@@ -945,9 +977,9 @@ var relationFromKey = (encoded) => {
   });
   const kind = encoded.slice(0, separatorIndex);
   const directionRaw = encoded.slice(separatorIndex + 1);
-  invariant(directionRaw === "outbound" || directionRaw === "inbound", `Invalid relation direction: ${directionRaw}`, {
-    F: __dxlog_file,
-    L: 1224,
+  invariant2(directionRaw === "outbound" || directionRaw === "inbound", `Invalid relation direction: ${directionRaw}`, {
+    F: __dxlog_file2,
+    L: 1237,
     S: void 0,
     A: [
       "directionRaw === 'outbound' || directionRaw === 'inbound'",
@@ -959,9 +991,9 @@ var relationFromKey = (encoded) => {
 var connectionKey = (id, relation2) => `${id}${Separators.primary}${relationKey(relation2)}`;
 var relationFromConnectionKey = (key) => {
   const separatorIndex = key.indexOf(Separators.primary);
-  invariant(separatorIndex > 0 && separatorIndex < key.length - 1, `Invalid connection key: ${key}`, {
-    F: __dxlog_file,
-    L: 1233,
+  invariant2(separatorIndex > 0 && separatorIndex < key.length - 1, `Invalid connection key: ${key}`, {
+    F: __dxlog_file2,
+    L: 1246,
     S: void 0,
     A: [
       "separatorIndex > 0 && separatorIndex < key.length - 1",
@@ -1050,7 +1082,7 @@ var whenEchoObjectMatches = (node) => Obj.isObject(node.data) ? Option2.some(nod
 var whenNot = (matcher) => (node) => Option2.isNone(matcher(node)) ? Option2.some(node) : Option2.none();
 
 // src/graph-builder.ts
-var __dxlog_file2 = "/__w/dxos/dxos/packages/sdk/app-graph/src/graph-builder.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/sdk/app-graph/src/graph-builder.ts";
 var GraphBuilderTypeId = /* @__PURE__ */ Symbol.for("@dxos/app-graph/GraphBuilder");
 var GraphBuilderImpl = class {
   [GraphBuilderTypeId] = GraphBuilderTypeId;
@@ -1058,15 +1090,25 @@ var GraphBuilderImpl = class {
     return Pipeable2.pipeArguments(this, arguments);
   }
   // TODO(wittjosiah): Use Context.
+  /** Active subscriptions keyed by composite ID, cleaned up on node removal. */
   _subscriptions = /* @__PURE__ */ new Map();
+  /** Connector updates pending flush, keyed by connector key. */
   _dirtyConnectors = /* @__PURE__ */ new Map();
+  /** Last-flushed node IDs per connector key, used for edge removal on update. */
   _connectorPrevious = /* @__PURE__ */ new Map();
+  /** Last-flushed node args per connector key, used for change detection. */
   _connectorPreviousArgs = /* @__PURE__ */ new Map();
+  /** Whether a dirty-flush task is already scheduled. */
   _flushScheduled = false;
+  /** Resolves when the current flush completes. */
   _flushPromise = Promise.resolve();
+  /** Registered builder extensions keyed by extension ID. */
   _extensions = Atom3.make(Record2.empty()).pipe(Atom3.keepAlive, Atom3.withLabel("graph-builder:extensions"));
+  /** Triggers signalling that a node's resolver has fired at least once. */
   _initialized = {};
+  /** Shared atom registry for reactive subscriptions. */
   _registry;
+  /** Backing graph with internal accessors for node atoms and construction. */
   _graph;
   constructor({ registry, ...params } = {}) {
     this._registry = registry ?? Registry2.make();
@@ -1159,8 +1201,8 @@ var GraphBuilderImpl = class {
       relation: relation2,
       registry: getDebugName(this._registry)
     }, {
-      F: __dxlog_file2,
-      L: 251,
+      F: __dxlog_file3,
+      L: 261,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1172,7 +1214,8 @@ var GraphBuilderImpl = class {
   _expandRelation(id, relation2) {
     const key = connectorKey(id, relation2);
     const connectors = this._connectors(key);
-    const cancel = this._registry.subscribe(connectors, (nodes) => {
+    const cancel = this._registry.subscribe(connectors, (rawNodes) => {
+      const nodes = qualifyNodeArgs(id)(rawNodes);
       const previous = this._connectorPrevious.get(key) ?? [];
       const ids = nodes.map((n) => n.id);
       if (ids.length === previous.length && ids.every((nodeId, idx) => nodeId === previous[idx])) {
@@ -1186,8 +1229,8 @@ var GraphBuilderImpl = class {
         relation: relation2,
         ids
       }, {
-        F: __dxlog_file2,
-        L: 277,
+        F: __dxlog_file3,
+        L: 288,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1206,8 +1249,8 @@ var GraphBuilderImpl = class {
     log2("onInitialize", {
       id
     }, {
-      F: __dxlog_file2,
-      L: 289,
+      F: __dxlog_file3,
+      L: 300,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1216,9 +1259,14 @@ var GraphBuilderImpl = class {
       const trigger = this._initialized[id];
       Option3.match(node, {
         onSome: (node2) => {
-          addNodes(this._graph, [
-            node2
-          ]);
+          const connectorOwned = [
+            ...this._connectorPrevious.values()
+          ].some((ids) => ids.includes(id));
+          if (!connectorOwned) {
+            addNodes(this._graph, [
+              node2
+            ]);
+          }
           trigger?.wake();
         },
         onNone: () => {
@@ -1306,7 +1354,7 @@ var exploreImpl = async (builder, options, path = []) => {
   if (shouldContinue === false) {
     return;
   }
-  const nodes = Object.values(internal._registry.get(internal._extensions)).filter((extension) => relationKey(extension.relation ?? "child") === relationKey(relation2)).map((extension) => extension.connector).filter(isNonNullable2).flatMap((connector) => registry.get(connector(internal._graph.node(source))));
+  const nodes = Function2.pipe(internal._registry.get(internal._extensions), Record2.values, Array2.map((extension) => extension.connector), Array2.filter(isNonNullable2), Array2.flatMap((connector) => registry.get(connector(internal._graph.node(source)))), qualifyNodeArgs(source));
   await Promise.all(nodes.map((nodeArg) => {
     registry.set(internal._graph._node(nodeArg.id), internal._graph._constructNode(nodeArg));
     return exploreImpl(builder, {
@@ -1378,8 +1426,8 @@ var createExtensionRaw = (extension) => {
             node,
             error
           }, {
-            F: __dxlog_file2,
-            L: 579,
+            F: __dxlog_file3,
+            L: 596,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1404,8 +1452,8 @@ var createExtensionRaw = (extension) => {
             node,
             error
           }, {
-            F: __dxlog_file2,
-            L: 600,
+            F: __dxlog_file3,
+            L: 617,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1429,8 +1477,8 @@ var createExtensionRaw = (extension) => {
             node,
             error
           }, {
-            F: __dxlog_file2,
-            L: 617,
+            F: __dxlog_file3,
+            L: 634,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -1446,8 +1494,8 @@ var runEffectSyncWithFallback = (effect, context2, extensionId, fallback) => {
       extension: extensionId,
       error
     }, {
-      F: __dxlog_file2,
-      L: 660,
+      F: __dxlog_file3,
+      L: 677,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -1489,6 +1537,15 @@ var createTypeExtension = (options) => {
     position
   });
 };
+var qualifyNodeArgs = (parentId) => (nodes) => nodes.map((node) => {
+  validateSegmentId(node.id);
+  const qualified = qualifyId(parentId, node.id);
+  return {
+    ...node,
+    id: qualified,
+    nodes: node.nodes ? qualifyNodeArgs(qualified)(node.nodes) : void 0
+  };
+});
 var connectorKey = (id, relation2) => `${id}${Separators.primary}${relationKey(relation2)}`;
 var relationFromConnectorKey = (key) => {
   const separatorIndex = key.indexOf(Separators.primary);